Changeset 174

Timestamp:

04/06/11 15:36:46 (13 years ago)

Author:

yaolu

Message:

did some changes so the XSD will work with the old XML test report.

Location:

projects/DailyDrillingReport_1.2/XML/HTMLreport

Files:

• WITSML_drillReport_profiled_schema_2011_01_29.xsd (modified) (3 diffs)
• testDocumet_2011_02_07.xml (modified) (2 diffs)

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

@@ -168 +168 @@
                 </xsd:annotation>
                 <xsd:sequence>
+                        <xsd:element name="numBit" type="witsml:str32" minOccurs="1" maxOccurs="1" sawsdl:modelReference="http://rds.posccaesar.org/2008/02/XML/RDL/RDS17831262">
+                                <!--PROFILE: Changed minOccurs from 0 to 1 for element numBit.-->
+
+                                <xsd:annotation>
+                                        <xsd:documentation>Bit number and rerun number e.g. "4.1" for the first rerun of bit 4.</xsd:documentation>
+                                </xsd:annotation>
+                        </xsd:element>
                         <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.-->
@@ -175 +182 @@
                                 </xsd:annotation>
                         </xsd:element>
-                        <xsd:element name="numBit" type="witsml:str32" minOccurs="1" maxOccurs="1" sawsdl:modelReference="http://rds.posccaesar.org/2008/02/XML/RDL/RDS17831262">
-                                <!--PROFILE: Changed minOccurs from 0 to 1 for element numBit.-->
-
-                                <xsd:annotation>
-                                        <xsd:documentation>Bit number and rerun number e.g. "4.1" for the first rerun of bit 4.</xsd:documentation>
-                                </xsd:annotation>
-                        </xsd:element>
                         <!--PROFILE: Deleted element diaPassThru.-->
                         <!--PROFILE: Deleted element diaPilot.-->
-                        <!--PROFILE: Deleted element manufacturer.-->
+                        <xsd:element name="manufacturer" type="witsml:nameString" minOccurs="0" maxOccurs="1"
+         sawsdl:modelReference="http://rds.posccaesar.org/2008/02/XML/RDL/RDS17831532">
+            <!--PROFILE: Changed minOccurs from 0 to 1 for element manufacturer.-->
+            <xsd:annotation>
+               <xsd:documentation>Manufacturer / supplier of the item.</xsd:documentation>
+            </xsd:annotation>
+         </xsd:element>
                         <!--PROFILE: Deleted element typeBit.-->
                         <!--PROFILE: Deleted element cost.-->
@@ -221 +227 @@
                         <!--PROFILE: Deleted element extensionAny.-->
                         <!--PROFILE: Deleted element extensionNameValue.-->
-                        <xsd:element name="bitRun" type="witsml:cs_drillingParams">
+                        <xsd:element name="bitRun" type="witsml:cs_drillingParams" minOccurs="0" maxOccurs="1">
                                 <xsd:annotation>
                                         <xsd:documentation>information about a bit run.</xsd:documentation>

projects/DailyDrillingReport_1.2/XML/HTMLreport/testDocumet_2011_02_07.xml

@@ -94 +94 @@
                 </witsml:statusInfo>
                 <witsml:bitRecord>
+                        <witsml:numBit>1</witsml:numBit>
                         <witsml:diaBit uom="in">24.6</witsml:diaBit>
-                        <witsml:numBit>1</witsml:numBit>
                         <witsml:codeMfg>SSB</witsml:codeMfg>
                         <witsml:dullGrade>2/3/NO/A/X/I/NO/DTF</witsml:dullGrade>
@@ -111 +111 @@
                 </witsml:bitRecord>
                 <witsml:bitRecord>
+                        <witsml:numBit>2</witsml:numBit>
                         <witsml:diaBit uom="in">12.2</witsml:diaBit>
-                        <witsml:numBit>2</witsml:numBit>
                         <witsml:codeMfg>SSB</witsml:codeMfg>
                         <witsml:dullGrade>0/4/BT/B/X/I/BU/DTF</witsml:dullGrade>