Update procedures and dictionary element type

DIGGSml · Mar 20, 2024 · 2fd1f73 · 2fd1f73
1 parent f9a505c
commit 2fd1f73
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 12 deletions.
diff --git a/BetaProcedures.xsd b/BetaProcedures.xsd
@@ -730,12 +730,6 @@
             </extension>
         </complexContent>
     </complexType>
-    <element name="FlameIonizationDetectorTest" type="diggs:AbstractLaboratoryTestProcedureType"
-        abstract="false" substitutionGroup="diggs:AbstractLaboratoryTestProcedure">
-        <annotation>
-            <documentation>Flame Ionization Detector Test detects total concentrations of organic gases and vapors.  Gases and vapors are ionized in a flame; a current is produced in proportion to the number of carbon atoms present.</documentation>
-        </annotation>
-    </element>
     <element name="InsituResistivityTest" type="diggs:AbstractInsituTestProcedureType"
         abstract="false" substitutionGroup="diggs:AbstractInsituTestProcedure">
         <annotation>
@@ -890,6 +884,6 @@
         <complexContent>
             <extension base="diggs:AbstractLaboratoryTestProcedureType"> </extension>
         </complexContent>
-    </complexType>
+    </complexType>    
 
 </schema>
diff --git a/Construction.xsd b/Construction.xsd
@@ -3961,6 +3961,19 @@
     <simpleType name="GroutSpecimentExtractionLocationExtEnumType">
         <union memberTypes="diggs:OtherNameType diggs:GroutSpecimenExtractionLocationEnumType"/>
     </simpleType>
+    <element name="SetTimeTest" type="diggs:SetTimeTestType"
+        substitutionGroup="diggs:AbstractMaterialTestProcedure">
+        <annotation>
+            <documentation>A test procedure object that holds intermediate data and metadata for a set time test.</documentation>
+        </annotation>
+    </element>
+    <complexType name="SetTimeTestType">
+        <complexContent>
+            <extension base="diggs:AbstractMaterialTestlProcedureType">
+                <sequence> </sequence>
+            </extension>
+        </complexContent>
+    </complexType>
     <element name="ViscometerTest" type="diggs:ViscometerTestType"
         substitutionGroup="diggs:AbstractMaterialTestProcedure">
         <annotation>

diff --git a/Dictionary_diggs.xsd b/Dictionary_diggs.xsd
@@ -54,12 +54,12 @@
     </complexType>
     <complexType name="OccurrenceType">
         <sequence>
-            <element name="sourceElementXpath" type="anyURI">
+            <element name="sourceElementXpath" type="string">
                 <annotation>
                     <documentation>An XPATH string identifying the element within an instance where the identifier is an allowable value.</documentation>
                 </annotation>
             </element>
-            <element minOccurs="0" name="conditionalElementXpath" type="anyURI">
+            <element minOccurs="0" name="conditionalElementXpath" type="string">
                 <annotation>
                     <documentation>An XPATH identifying an element(and potential element value) that must be present for the identifier to be validly used.
 </documentation>

diff --git a/Diggs_geo_deprecated.xsd b/Diggs_geo_deprecated.xsd
@@ -680,5 +680,29 @@
             </extension>
         </complexContent>
     </complexType>
-
+    <element name="FlameIonizationDetectorTest" type="diggs_geo:FlameIonizationDetectorTestType"
+        abstract="false" substitutionGroup="diggs:AbstractLaboratoryTestProcedure">
+        <annotation>
+            <documentation>Flame Ionization Detector Test detects total concentrations of organic gases and vapors.  Gases and vapors are ionized in a flame; a current is produced in proportion to the number of carbon atoms present.</documentation>
+        </annotation>
+    </element>
+    <complexType name="FlameIonizationDetectorTestType">
+        <complexContent>
+            <extension base="diggs:AbstractLaboratoryTestProcedureType">
+                <sequence/>
+            </extension>
+        </complexContent>
+    </complexType>
+
+    <element name="PhotoIonizationDtectorTest" type="diggs_geo:PhotoIonizationDetectorTestType"
+        substitutionGroup="diggs:AbstractLaboratoryTestProcedure"/>
+    <complexType name="PhotoIonizationDetectorTestType">
+        <complexContent>
+            <extension base="diggs:AbstractLaboratoryTestProcedureType">
+                <sequence/>
+            </extension>
+        </complexContent>
+    </complexType>
+
+
 </schema>
diff --git a/Geotechnical.xsd b/Geotechnical.xsd
@@ -32,6 +32,7 @@
                 between each state can be defined based on a change in the soil's behavior. The
                 Atterberg limits can be used to distinguish between silt and clay, and it can
                 distinguish between different types of silts and clays.</documentation>
+            <documentation source="name">Atterberg Limits Test</documentation>
         </annotation>
     </element>
     <complexType name="AtterbergLimitsTestType">
@@ -2652,18 +2653,19 @@ consolidation (ch) and in situ horizontal coefficient of permeability (kh)</docu
 	-->
     <element abstract="false" name="EnvironmentalScreeningTest"
         substitutionGroup="diggs:AbstractLaboratoryTestProcedure"
-        type="diggs_geo:PhotoIonizationDetectorTestType">
+        type="diggs_geo:EnvironmentalScreeningTestType">
         <annotation>
             <documentation>An object to be used for describing metadata properties of any type of field environmental screening tests, such as a photo ionization or flame ionization tests for gas screening or XRF testing for metals. No specific properties are identified, use otherTestProperty to populate metadata</documentation>
         </annotation>
     </element>
-    <complexType name="PhotoIonizationDetectorTestType">
+    <complexType name="EnvironmentalScreeningTestType">
         <complexContent>
             <extension base="diggs:AbstractLaboratoryTestProcedureType">
                 <sequence/>
             </extension>
         </complexContent>
     </complexType>
+
     <element name="SpecificGravityTest" type="diggs_geo:SpecificGravityTestType" abstract="false"
         substitutionGroup="diggs:AbstractLaboratoryTestProcedure">
         <annotation>