(no commit message)

[cdmlib.git] / cdmlib-io / src / main / resources / schema / cdm / cdm.xsd

diff --git a/cdmlib-io/src/main/resources/schema/cdm/cdm.xsd b/cdmlib-io/src/main/resources/schema/cdm/cdm.xsd
index eac1b2df50194caa9204dc33b3f34b3f96350404..73bc1524c17454da241689e2f558eb367eceaaed 100644 (file)
--- a/cdmlib-io/src/main/resources/schema/cdm/cdm.xsd
+++ b/cdmlib-io/src/main/resources/schema/cdm/cdm.xsd
@@ -52,7 +52,6 @@
               <xs:choice minOccurs="0" maxOccurs="unbounded">
                 <xs:element ref="description:AbsenceTerm"/>
                 <xs:element ref="common:AnnotationType"/>
-                <xs:element ref="reference:BibtexEntryType"/>
                 <xs:element ref="location:Continent"/>
                 <xs:element ref="occurrence:DerivationEventType"/>
                 <xs:element ref="occurrence:DeterminationModifier"/>
@@ -60,7 +59,6 @@
                 <xs:element ref="description:Feature"/>
                 <xs:element ref="name:HybridRelationshipType"/>
                 <xs:element ref="agent:InstitutionType"/>
-                <xs:element ref="common:Keyword"/>
                 <xs:element ref="common:Language"/>
                 <xs:element ref="common:MarkerType"/>
                 <xs:element ref="description:MeasurementUnit"/>
@@ -71,6 +69,7 @@
                 <xs:element ref="name:NameRelationshipType"/>
                 <xs:element ref="name:NomenclaturalCode"/>
                 <xs:element ref="name:NomenclaturalStatusType"/>
+                <xs:element ref="name:NameTypeDesignationStatus"/>
                 <xs:element ref="description:PresenceTerm"/>
                 <xs:element ref="occurrence:PreservationMethod"/>
                 <xs:element ref="name:Rank"/>
@@ -126,6 +125,7 @@
           <xs:complexType>
             <xs:sequence>
               <xs:choice minOccurs="0" maxOccurs="unbounded">
+                <xs:element ref="occurrence:DerivedUnit"/>
                 <xs:element ref="occurrence:DnaSample"/>
                 <xs:element ref="occurrence:FieldObservation"/>
                 <xs:element ref="occurrence:Fossil"/>
@@ -152,22 +152,23 @@
           <xs:complexType>
             <xs:sequence>
               <xs:choice minOccurs="0" maxOccurs="unbounded">
-                <xs:element ref="reference:Article"/>
-                <xs:element ref="reference:Book"/>
-                <xs:element ref="reference:BookSection"/>
-                <xs:element ref="reference:CdDvd"/>
-                <xs:element ref="reference:Database"/>
-                <xs:element ref="reference:Generic"/>
-                <xs:element ref="reference:InProceedings"/>
-                <xs:element ref="reference:Journal"/>
-                <xs:element ref="reference:Map"/>
-                <xs:element ref="reference:Patent"/>
-                <xs:element ref="reference:PersonalCommunication"/>
-                <xs:element ref="reference:PrintSeries"/>
-                <xs:element ref="reference:Proceedings"/>
-                <xs:element ref="reference:Report"/>
-                <xs:element ref="reference:Thesis"/>
-                <xs:element ref="reference:WebPage"/>
+                       <xs:element ref="reference:ReferenceBase"/>
+<!--                <xs:element ref="reference:Article"/>-->
+<!--                <xs:element ref="reference:Book"/>-->
+<!--                <xs:element ref="reference:BookSection"/>-->
+<!--                <xs:element ref="reference:CdDvd"/>-->
+<!--                <xs:element ref="reference:Database"/>-->
+<!--                <xs:element ref="reference:Generic"/>-->
+<!--                <xs:element ref="reference:InProceedings"/>-->
+<!--                <xs:element ref="reference:Journal"/>-->
+<!--                <xs:element ref="reference:Map"/>-->
+<!--                <xs:element ref="reference:Patent"/>-->
+<!--                <xs:element ref="reference:PersonalCommunication"/>-->
+<!--                <xs:element ref="reference:PrintSeries"/>-->
+<!--                <xs:element ref="reference:Proceedings"/>-->
+<!--                <xs:element ref="reference:Report"/>-->
+<!--                <xs:element ref="reference:Thesis"/>-->
+<!--                <xs:element ref="reference:WebPage"/>-->
               </xs:choice>
             </xs:sequence>
             <xs:attribute ref="xml:base"/>
@@ -192,6 +193,14 @@
             <xs:attribute ref="xml:base"/>
           </xs:complexType>
         </xs:element>
+        <xs:element name="TaxonomicTrees" minOccurs="0">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element ref="taxon:TaxonomicTree" minOccurs="0" maxOccurs="unbounded"/>
+            </xs:sequence>
+            <xs:attribute ref="xml:base"/>
+          </xs:complexType>
+        </xs:element>
         <xs:element name="TaxonomicNames" minOccurs="0">
           <xs:complexType>
             <xs:sequence>
@@ -199,6 +208,7 @@
                 <xs:element ref="name:BacterialName"/>
                 <xs:element ref="name:BotanicalName"/>
                 <xs:element ref="name:CultivarPlantName"/>
+                <xs:element ref="name:NonViralName"/>
                 <xs:element ref="name:ViralName"/>
                 <xs:element ref="name:ZoologicalName"/>
               </xs:choice>
@@ -230,7 +240,7 @@
             <xs:sequence>
               <xs:choice minOccurs="0" maxOccurs="unbounded">
                 <xs:element ref="media:Media" minOccurs="0" maxOccurs="unbounded"/>
-                <xs:element ref="description:IdentificationKey" minOccurs="0" maxOccurs="unbounded"/>
+                <xs:element ref="description:MediaKey" minOccurs="0" maxOccurs="unbounded"/>
               </xs:choice>
             </xs:sequence>
             <xs:attribute ref="xml:base"/>