David Price

Merge branch 'tq-mprxsd'

1 +2013-07-19 David Price and David Leal
2 +
3 +1) NEW Introduced new anyUoM enumeration:
4 +
5 + <xsd:simpleType name="anyUom">
6 + <xsd:annotation>
7 + <xsd:documentation>areaUom is not specified elsewhere, so not included here.</xsd:documentation>
8 + </xsd:annotation>
9 +
10 + Merged in all UoM enum values from : witsml:pressureUom witsml:volumeUom
11 + witsml:thermodynamicTemperatureUom witsml:lengthUom witsml:densityUom witsml:lengthPerLengthUom
12 + witsml:timeUom
13 +
14 + </xsd:simpleType>
15 +
16 +and changed generalQualifiedMeasure to use it rather than <xsd:attribute name="uom" type="witsml:uomString" use="required">
17 +
18 +<xsd:complexType name="generalQualifiedMeasure">
19 + ...
20 + <xsd:attribute name="uom" type="witsml:anyUom" use="required">
21 + <xsd:annotation>
22 + <xsd:documentation>The unit of measure for the value. This value must conform to the values allowed by the measure class. The scheme has been updated to make this the union of all the UOM enumerations.</xsd:documentation>
23 + </xsd:annotation>
24 + </xsd:attribute>
25 +
26 + ...
27 + </xsd:complexType>
...\ No newline at end of file ...\ No newline at end of file