Changeset 171 for projects/DailyDrillingReport_1.2/XML/HTMLreport/WITSML_drillReport_profiled_schema_2011_01_29.xsd

Timestamp:

04/06/11 13:28:32 (13 years ago)

Author:

yaolu

Message:

Fixed the errors and design faults

Files:

• projects/DailyDrillingReport_1.2/XML/HTMLreport/WITSML_drillReport_profiled_schema_2011_01_29.xsd (modified) (7 diffs)

projects/DailyDrillingReport_1.2/XML/HTMLreport/WITSML_drillReport_profiled_schema_2011_01_29.xsd

@@ -168 +168 @@
                 </xsd:annotation>
                 <xsd:sequence>
-                        <xsd:element name="diaBit" type="witsml:lengthMeasureInch" minOccurs="1" maxOccurs="1" sawsdl:modelReference="http://rds.posccaesar.org/2008/02/XML/RDL/RDS17831442">
+                        <xsd:element name="diaBit" type="witsml:lengthMeasure" minOccurs="1" maxOccurs="1" sawsdl:modelReference="http://rds.posccaesar.org/2008/02/XML/RDL/RDS17831442">
                                 <!--PROFILE: Changed type from witsml:lengthMeasure to witsml:lengthMeasureInch for element diaBit.-->
 
@@ -364 +364 @@
                                 </xsd:annotation>
                         </xsd:element>
-                        <xsd:element name="jobType" type="witsml:cementJobType" minOccurs="0" maxOccurs="1">
+                        <xsd:element name="jobType" type="witsml:cementJobTypes" minOccurs="0" maxOccurs="1">
                                 <!-- PROFILE: Added element jobType -->
                                 <xsd:annotation>
@@ -1886 +1886 @@
                                 </xsd:annotation>
                         </xsd:element>
-                        <xsd:element name="rigType" type="witsml:rigTypes" minOccurs="0" maxOccurs="1">
+                        <xsd:element name="fixedRig" type="witsml:logicalBoolean" minOccurs="0" maxOccurs="1">
                                 <!-- PROFILE: Added element rigType -->
                                 <xsd:annotation>
@@ -1936 +1936 @@
                 </xsd:attribute>
         </xsd:complexType>
-        <!-- Rig types -->
-        <xsd:simpleType name="rigTypes">
-                <xsd:annotation>
-                        <xsd:documentation>The classification of rig types.</xsd:documentation>
-                </xsd:annotation>
-                <xsd:restriction base="witsml:abstractTypeEnum">
-                        <xsd:enumeration value="Fixed rig">
-                                <xsd:annotation>
-                                        <xsd:documentation>Fixed rig</xsd:documentation>
-                                </xsd:annotation>
-                        </xsd:enumeration>
-                        <xsd:enumeration value="Moveable rig">
-                                <xsd:annotation>
-                                        <xsd:documentation>Moveable rig</xsd:documentation>
-                                </xsd:annotation>
-                        </xsd:enumeration>
-                </xsd:restriction>
-        </xsd:simpleType>
         <xsd:complexType name="cs_drillReportStratInfo">
                 <xsd:annotation>
@@ -5561 +5543 @@
                 <xsd:restriction base="witsml:abstractUomEnum">
                         <xsd:enumeration value="ft3/sack94"/>
+                        <xsd:enumeration value="ft3/sack"/>
                 </xsd:restriction>
         </xsd:simpleType>
@@ -5573 +5556 @@
                 <xsd:restriction base="witsml:abstractUomEnum">
                         <xsd:enumeration value="galUS/sack94"/>
+                        <xsd:enumeration value="gal/sack"/>
                 </xsd:restriction>
         </xsd:simpleType>
@@ -5895 +5879 @@
         <xsd:simpleType name="specificVolumeUom">
                 <xsd:restriction base="witsml:abstractUomEnum">
+                        <xsd:enumeration value="ft3/sack"/>
                         <xsd:enumeration value="ft3/sack94"/>
+                        <xsd:enumeration value="gal/sack"/>
                         <xsd:enumeration value="galUS/sack94"/>
                 </xsd:restriction>