(no commit message)

diff --git a/cdmlib-io/src/main/resources/schema/cdm/agent.xsd b/cdmlib-io/src/main/resources/schema/cdm/agent.xsd
index b90774709cb6dabcb4a1ade15f1a0b2a29a2e05e..f577ef846f913fefd55340fc889aaf5ae568fe67 100644 (file)
--- a/cdmlib-io/src/main/resources/schema/cdm/agent.xsd
+++ b/cdmlib-io/src/main/resources/schema/cdm/agent.xsd
@@ -24,25 +24,9 @@
                        </jxb:schemaBindings>
                </xs:appinfo>
        </xs:annotation>
-       <xs:element name="Address">
-               <xs:complexType>
-                       <xs:complexContent>
-                               <xs:extension base="common:VersionableEntity">
-                                       <xs:sequence>
-                                               <xs:element name="POBox" type="xs:string" minOccurs="0" />
-                                               <xs:element name="Street" type="xs:string" minOccurs="0" />
-                                               <xs:element name="Postcode" type="xs:string" minOccurs="0" />
-                                               <xs:element name="Locality" type="xs:string" />
-                                               <xs:element name="Region" type="xs:string" minOccurs="0" />
-                                               <xs:element name="Country" type="xs:IDREF" minOccurs="0" />
-                                               <xs:element name="Location" type="location:Point"
-                                                       minOccurs="0" />
-                                       </xs:sequence>
-                               </xs:extension>
-                       </xs:complexContent>
-               </xs:complexType>
-       </xs:element>
-
+       
+       <xs:element name="Address" type="agent:Address" />
+       
        <xs:element name="Contact" type="agent:Contact" />
 
        <xs:element name="Institution" type="agent:Institution" />
@@ -50,53 +34,57 @@
        <xs:element name="InstitutionType" type="agent:InstitutionType" />
 
        <xs:element name="InstitutionalMembership" type="agent:InstitutionalMembership" />
-
-       <xs:element name="Person">
-               <xs:complexType>
-                       <xs:complexContent>
-                               <xs:extension base="agent:TeamOrPersonBase">
-                                       <xs:sequence>
-                                               <xs:element name="Prefix" type="xs:string" minOccurs="0" />
-                                               <xs:element name="FirstName" type="xs:string"
-                                                       minOccurs="0" />
-                                               <xs:element name="LastName" type="xs:string" minOccurs="0" />
-                                               <xs:element name="Suffix" type="xs:string" minOccurs="0" />
-                                               <xs:element name="Lifespan" type="common:TimePeriod"
-                                                       minOccurs="0" />
-                                               <xs:element name="InstitutionalMemberships" minOccurs="0">
-                                                       <xs:complexType>
-                                                               <xs:sequence>
-                                                                       <xs:element ref="agent:InstitutionalMembership"
-                                                                               minOccurs="0" maxOccurs="unbounded" />
-                                                               </xs:sequence>
-                                                       </xs:complexType>
-                                               </xs:element>
-                                               <xs:element name="Keywords" minOccurs="0">
-                                                       <xs:complexType>
-                                                               <xs:sequence>
-                                                                       <xs:element name="Keyword" type="xs:IDREF"
-                                                                               minOccurs="0" maxOccurs="unbounded" />
-                                                               </xs:sequence>
-                                                       </xs:complexType>
-                                               </xs:element>
-                                       </xs:sequence>
-                               </xs:extension>
-                       </xs:complexContent>
-               </xs:complexType>
-       </xs:element>
-
+       
+       <xs:element name="Person" type="agent:Person"/>
+       
        <xs:element name="Team" type="agent:Team" />
 
-       <xs:complexType name="TeamOrPersonBase" abstract="true">
-               <xs:complexContent>
-                       <xs:extension base="agent:AgentBase">
-                               <xs:sequence>
-                                       <xs:element name="NomenclaturalTitle" type="xs:string"
-                                               minOccurs="0" />
-                               </xs:sequence>
-                       </xs:extension>
-               </xs:complexContent>
-       </xs:complexType>
+
+       <xs:complexType name="Address">
+    <xs:complexContent>
+      <xs:extension base="common:VersionableEntity">
+        <xs:sequence>
+          <xs:element name="POBox" type="xs:string" minOccurs="0"/>
+          <xs:element name="Street" type="xs:string" minOccurs="0"/>
+          <xs:element name="Postcode" type="xs:string" minOccurs="0"/>
+          <xs:element name="Locality" type="xs:string"/>
+          <xs:element name="Region" type="xs:string" minOccurs="0"/>
+          <xs:element name="Country" type="xs:IDREF" minOccurs="0"/>
+          <xs:element name="Location" type="location:Point" minOccurs="0"/>
+        </xs:sequence>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+       
+        <xs:complexType name="Person">
+    <xs:complexContent>
+      <xs:extension base="agent:TeamOrPersonBase">
+        <xs:sequence>
+          <xs:element name="Prefix" type="xs:string" minOccurs="0"/>
+          <xs:element name="FirstName" type="xs:string" minOccurs="0"/>
+          <xs:element name="LastName" type="xs:string" minOccurs="0"/>
+          <xs:element name="Suffix" type="xs:string" minOccurs="0"/>
+          <xs:element name="Lifespan" type="common:TimePeriod" minOccurs="0"/>
+          <xs:element name="InstitutionalMemberships" minOccurs="0">
+            <xs:complexType>
+              <xs:sequence>
+                <xs:element ref="agent:InstitutionalMembership" minOccurs="0" maxOccurs="unbounded"/>
+              </xs:sequence>
+            </xs:complexType>
+          </xs:element>
+          <xs:element name="Keywords" minOccurs="0">
+            <xs:complexType>
+              <xs:sequence>
+                <xs:element name="Keyword" type="xs:IDREF" minOccurs="0" maxOccurs="unbounded"/>
+              </xs:sequence>
+            </xs:complexType>
+          </xs:element>
+        </xs:sequence>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  
+       
 
        <xs:complexType name="AgentBase" abstract="true">
                <xs:complexContent>
@@ -204,7 +192,17 @@
                        </xs:element>
                </xs:sequence>
        </xs:complexType>
-
+       
+       <xs:complexType name="TeamOrPersonBase" abstract="true">
+    <xs:complexContent>
+      <xs:extension base="agent:AgentBase">
+        <xs:sequence>
+          <xs:element name="NomenclaturalTitle" type="xs:string" minOccurs="0"/>
+        </xs:sequence>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+       
        <xs:complexType name="Team">
                <xs:complexContent>
                        <xs:extension base="agent:TeamOrPersonBase">

diff --git a/cdmlib-io/src/main/resources/schema/cdm/cdm.xsd b/cdmlib-io/src/main/resources/schema/cdm/cdm.xsd
index bd7526064b771e812df336a1fc8faf48424fa7db..2057736aa979b5ed6d9e11f3f168f809682b8fee 100644 (file)
--- a/cdmlib-io/src/main/resources/schema/cdm/cdm.xsd
+++ b/cdmlib-io/src/main/resources/schema/cdm/cdm.xsd
@@ -71,6 +71,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"/>
@@ -199,6 +200,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>

diff --git a/cdmlib-io/src/main/resources/schema/cdm/common.xsd b/cdmlib-io/src/main/resources/schema/cdm/common.xsd
index a515e07cb411463a4ce748cb6dba144d56d9d106..1697fd3c6f71aa6342c2f615c52a52b4679955a5 100644 (file)
--- a/cdmlib-io/src/main/resources/schema/cdm/common.xsd
+++ b/cdmlib-io/src/main/resources/schema/cdm/common.xsd
@@ -163,7 +163,7 @@
 
   <xs:complexType name="TermBase" abstract="true">
     <xs:complexContent>
-      <xs:extension base="common:VersionableEntity">
+      <xs:extension base="common:IdentifiableEntity">
         <xs:sequence>
           <xs:element name="URI" type="xs:anyURI" minOccurs="0"/>
           <xs:element name="Representations" minOccurs="0">
@@ -183,6 +183,7 @@
       <xs:extension base="common:CdmBase">
         <xs:sequence>
           <xs:element name="UpdatedBy" type="xs:IDREF" minOccurs="0"/>
+          <xs:element name="Updated" type="xs:string" minOccurs="0"/>
         </xs:sequence>
       </xs:extension>
     </xs:complexContent>
@@ -320,6 +321,24 @@
               </xs:sequence>
             </xs:complexType>
           </xs:element>
+          <xs:element name="Credits" minOccurs="0">
+            <xs:complexType>
+              <xs:sequence>
+                <xs:element name="Credit" type="common:Credit" minOccurs="0" maxOccurs="unbounded"/>
+              </xs:sequence>
+            </xs:complexType>
+          </xs:element>
+        </xs:sequence>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:complexType name="Credit">
+    <xs:complexContent>
+      <xs:extension base="common:LanguageStringBase">
+        <xs:sequence>
+          <xs:element name="Agent" type="xs:IDREF" minOccurs="0"/>
+          <xs:element name="AbbreviatedText" type="xs:string" minOccurs="0"/>
         </xs:sequence>
       </xs:extension>
     </xs:complexContent>
@@ -496,6 +515,7 @@
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
+  
   <xs:complexType name="LSIDAuthority">
     <xs:sequence>
       <xs:element name="Authority" type="xs:string"/>
@@ -505,6 +525,7 @@
       <xs:element name="Namespaces" type="common:Namespaces"/>
     </xs:sequence>
   </xs:complexType>
+  
   <xs:complexType name="Namespaces">
     <xs:sequence>
       <xs:element ref="common:Namespace" minOccurs="1" maxOccurs="unbounded"/>
@@ -517,11 +538,13 @@
       <xs:element name="Class" type="xs:string"/>
     </xs:sequence>
   </xs:complexType>
+  
   <xs:complexType name="MultilanguageText">
     <xs:sequence>
-      <xs:element ref="common:LanguageString" minOccurs="1" maxOccurs="unbounded"/>
+      <xs:element ref="common:LanguageString" minOccurs="0" maxOccurs="unbounded"/>
     </xs:sequence>
   </xs:complexType>
+  
   <xs:simpleType name="UUID">
         <xs:annotation>
             <xs:appinfo>

diff --git a/cdmlib-io/src/main/resources/schema/cdm/description.xsd b/cdmlib-io/src/main/resources/schema/cdm/description.xsd
index ece51605b9f0bd81b32305897bf46f14b1492228..36edd8c510cc2651519f7e54d6ce3f1bd90254fc 100644 (file)
--- a/cdmlib-io/src/main/resources/schema/cdm/description.xsd
+++ b/cdmlib-io/src/main/resources/schema/cdm/description.xsd
@@ -87,7 +87,7 @@
 
   <xs:element name="TextFormat" type="description:TextFormat"/>
   
-  <xs:complexType name="MediaKey">
+       <xs:complexType name="MediaKey">
     <xs:complexContent>
       <xs:extension base="media:Media">
         <xs:sequence>
@@ -105,10 +105,24 @@
               </xs:sequence>
             </xs:complexType>
           </xs:element>
-          <xs:element name="GeoScopes" minOccurs="0">
+          <xs:element name="GeographicalScope" minOccurs="0">
             <xs:complexType>
               <xs:sequence>
-                <xs:element name="GeoScope" type="xs:IDREF" minOccurs="0" maxOccurs="unbounded"/>
+                <xs:element name="Area" type="xs:IDREF" minOccurs="0" maxOccurs="unbounded"/>
+              </xs:sequence>
+            </xs:complexType>
+          </xs:element>
+          <xs:element name="ScopeRestrictions" minOccurs="0">
+            <xs:complexType>
+              <xs:sequence>
+                <xs:element name="Restriction" type="xs:IDREF" minOccurs="0" maxOccurs="unbounded"/>
+              </xs:sequence>
+            </xs:complexType>
+          </xs:element>
+          <xs:element name="KeyRepresentations" minOccurs="0">
+            <xs:complexType>
+              <xs:sequence>
+                <xs:element name="KeyRepresentation" type="xs:IDREF" minOccurs="0" maxOccurs="unbounded"/>
               </xs:sequence>
             </xs:complexType>
           </xs:element>
@@ -178,6 +192,13 @@
               </xs:sequence>
             </xs:complexType>
           </xs:element>
+           <xs:element name="RecommendedMeasurementUnits" minOccurs="0">
+            <xs:complexType>
+              <xs:sequence>
+                <xs:element name="RecommendedMeasurementUnit" type="xs:IDREF" minOccurs="0" maxOccurs="unbounded"/>
+              </xs:sequence>
+            </xs:complexType>
+          </xs:element>
         </xs:sequence>
       </xs:extension>
     </xs:complexContent>
@@ -275,6 +296,13 @@
               </xs:sequence>
             </xs:complexType>
           </xs:element>
+          <xs:element name="DescriptiveSystem" minOccurs="0">
+            <xs:complexType>
+              <xs:sequence>
+                <xs:element ref="description:Feature" minOccurs="0" maxOccurs="unbounded"/>
+              </xs:sequence>
+            </xs:complexType>
+          </xs:element>
           <xs:element name="DescriptionElements" minOccurs="0">
             <xs:complexType>
               <xs:sequence>
@@ -290,6 +318,7 @@
               </xs:sequence>
             </xs:complexType>
           </xs:element>
+          <xs:element name="ImageGallery" type="xs:boolean"/>
         </xs:sequence>
       </xs:extension>
     </xs:complexContent>
@@ -365,6 +394,7 @@
             </xs:complexType>
           </xs:element>
           <xs:element name="InDescription" type="xs:IDREF" minOccurs="0"/>
+          <xs:element name="nameUsedInReference" type="xs:IDREF" minOccurs="0"/>
         </xs:sequence>
       </xs:extension>
     </xs:complexContent>
@@ -480,11 +510,11 @@
     </xs:complexContent>
   </xs:complexType>
 
-  <xs:complexType name="FeatureNode">
+   <xs:complexType name="FeatureNode">
     <xs:complexContent>
       <xs:extension base="common:VersionableEntity">
         <xs:sequence>
-          <xs:element name="Feature" type="xs:IDREF" minOccurs="0"/>
+          <xs:element ref="description:Feature" minOccurs="0"/>
           <xs:element name="Parent" type="xs:IDREF" minOccurs="0"/>
           <xs:element name="Children" minOccurs="0">
             <xs:complexType>
@@ -493,6 +523,28 @@
               </xs:sequence>
             </xs:complexType>
           </xs:element>
+          <xs:element name="OnlyApplicableIf" minOccurs="0">
+            <xs:complexType>
+              <xs:sequence>
+                <xs:element name="OnlyApplicableIf" type="xs:IDREF" minOccurs="0" maxOccurs="unbounded"/>
+              </xs:sequence>
+            </xs:complexType>
+          </xs:element>
+          <xs:element name="InapplicableIf" minOccurs="0">
+            <xs:complexType>
+              <xs:sequence>
+                <xs:element name="InapplicableIf" type="xs:IDREF" minOccurs="0" maxOccurs="unbounded"/>
+              </xs:sequence>
+            </xs:complexType>
+          </xs:element>
+          <xs:element name="Questions" minOccurs="0">
+            <xs:complexType>
+              <xs:sequence>
+                <xs:element name="Question" type="common:Representation" minOccurs="0" maxOccurs="unbounded"/>
+              </xs:sequence>
+            </xs:complexType>
+          </xs:element>
+          <xs:element name="Taxon" type="xs:IDREF" minOccurs="0"/>
         </xs:sequence>
       </xs:extension>
     </xs:complexContent>

diff --git a/cdmlib-io/src/main/resources/schema/cdm/location.xsd b/cdmlib-io/src/main/resources/schema/cdm/location.xsd
index 75195d51dfb7f288c102c69bb3dfbff09dd55928..91b6cb9ab8f8f7d370efe97374fb849a329943e7 100644 (file)
--- a/cdmlib-io/src/main/resources/schema/cdm/location.xsd
+++ b/cdmlib-io/src/main/resources/schema/cdm/location.xsd
@@ -34,6 +34,8 @@
   <xs:element name="Point" type="location:Point"/>
 
   <xs:element name="ReferenceSystem" type="location:ReferenceSystem"/>
+  
+  <xs:element name="TdwgArea" type="location:TdwgArea"/>
 
   <xs:element name="WaterbodyOrCountry" type="location:WaterbodyOrCountry"/>
 
@@ -119,5 +121,13 @@
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
+  
+  <xs:complexType name="TdwgArea">
+    <xs:complexContent>
+      <xs:extension base="location:NamedArea">
+        <xs:sequence/>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
 </xs:schema>
 

diff --git a/cdmlib-io/src/main/resources/schema/cdm/media.xsd b/cdmlib-io/src/main/resources/schema/cdm/media.xsd
index a6f19aa1ec6e94f4f59eb3a4da414a42b1d13fa8..89781fbcdd7cc2b7ce214592691c982e12352001 100644 (file)
--- a/cdmlib-io/src/main/resources/schema/cdm/media.xsd
+++ b/cdmlib-io/src/main/resources/schema/cdm/media.xsd
@@ -33,6 +33,8 @@
 
   <xs:element name="MovieFile" type="media:MovieFile"/>
 
+  <xs:element name="ReferencedMedia" type="media:ReferencedMedia"/>
+
   <xs:element name="Rights" type="media:Rights"/>
 
   <xs:element name="RightsTerm" type="media:RightsTerm"/>
@@ -166,5 +168,16 @@
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
+  
+  <xs:complexType name="ReferencedMedia" abstract="true">
+    <xs:complexContent>
+      <xs:extension base="media:Media">
+        <xs:sequence>
+          <xs:element name="CitationMicroReference" type="xs:string" minOccurs="0"/>
+          <xs:element name="Citation" type="xs:IDREF" minOccurs="0"/>
+        </xs:sequence>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
 </xs:schema>
 

diff --git a/cdmlib-io/src/main/resources/schema/cdm/molecular.xsd b/cdmlib-io/src/main/resources/schema/cdm/molecular.xsd
index 0eef2767082ed4a51f74503073029c9d42f5c0a6..c1382940b221a00b7c7cc4f38751b2ffb38a2595 100644 (file)
--- a/cdmlib-io/src/main/resources/schema/cdm/molecular.xsd
+++ b/cdmlib-io/src/main/resources/schema/cdm/molecular.xsd
@@ -33,6 +33,8 @@
 
   <xs:element name="Locus" type="molecular:Locus"/>
 
+  <xs:element name="PhylogeneticTree" type="molecular:PhylogeneticTree"/>
+
   <xs:element name="Sequence" type="molecular:Sequence"/>
 
   <xs:complexType name="DnaSample">
@@ -109,5 +111,22 @@
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
+  
+  <xs:complexType name="PhylogeneticTree">
+    <xs:complexContent>
+      <xs:extension base="media:ReferencedMedia">
+        <xs:sequence>
+          <xs:element name="UsedSequences" minOccurs="0">
+            <xs:complexType>
+              <xs:sequence>
+                <xs:element name="UsedSequence" type="xs:IDREF" minOccurs="0" maxOccurs="unbounded"/>
+              </xs:sequence>
+            </xs:complexType>
+          </xs:element>
+        </xs:sequence>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  
 </xs:schema>
 

diff --git a/cdmlib-io/src/main/resources/schema/cdm/name.xsd b/cdmlib-io/src/main/resources/schema/cdm/name.xsd
index ed2185a32006d2acbfe04a9ff78e1b7842e04a4d..49ed0278143913eb6cb5a2df98fa6d617d2b855f 100644 (file)
--- a/cdmlib-io/src/main/resources/schema/cdm/name.xsd
+++ b/cdmlib-io/src/main/resources/schema/cdm/name.xsd
@@ -8,6 +8,7 @@
   xmlns:xs="http://www.w3.org/2001/XMLSchema" 
   xmlns:reference="http://etaxonomy.eu/cdm/model/reference/1.0" 
   xmlns:agent="http://etaxonomy.eu/cdm/model/agent/1.0"
+  xmlns:taxon="http://etaxonomy.eu/cdm/model/taxon/1.0"
   xmlns:jxb="http://java.sun.com/xml/ns/jaxb"
   xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"
   jxb:extensionBindingPrefixes="xjc"
@@ -22,6 +23,7 @@
   <xs:import namespace="http://etaxonomy.eu/cdm/model/description/1.0" schemaLocation="description.xsd"/>
   <xs:import namespace="http://etaxonomy.eu/cdm/model/occurrence/1.0" schemaLocation="occurrence.xsd"/>
   <xs:import namespace="http://etaxonomy.eu/cdm/model/agent/1.0" schemaLocation="agent.xsd"/>
+  <xs:import namespace="http://etaxonomy.eu/cdm/model/taxon/1.0" schemaLocation="taxon.xsd"/>
   <xs:annotation>
     <xs:appinfo>
       <jxb:schemaBindings>
@@ -63,6 +65,8 @@
   <xs:element name="NameRelationshipType" type="name:NameRelationshipType"/>
 
   <xs:element name="NameTypeDesignation" type="name:NameTypeDesignation"/>
+  
+  <xs:element name="NameTypeDesignationStatus" type="name:NameTypeDesignationStatus"/>
 
   <xs:element name="NomenclaturalCode" type="name:NomenclaturalCode"/>
 
@@ -73,7 +77,7 @@
   <xs:element name="Rank" type="name:Rank"/>
 
   <xs:element name="SpecimenTypeDesignation" type="name:SpecimenTypeDesignation"/>
-
+       
   <xs:element name="TaxonNameBase" type="name:TaxonNameBase"/>
 
   <xs:element name="TypeDesignationBase" type="name:TypeDesignationBase"/>
@@ -139,7 +143,7 @@
 
   <xs:complexType name="SpecimenTypeDesignationStatus">
     <xs:complexContent>
-      <xs:extension base="common:OrderedTermBase">
+      <xs:extension base="name:TypeDesignationStatusBase">
         <xs:sequence/>
       </xs:extension>
     </xs:complexContent>
@@ -199,7 +203,7 @@
             </xs:complexType>
           </xs:element>
         </xs:sequence>
-        <xs:attribute name="hasProblem" type="xs:boolean" use="required"/>
+        <xs:attribute name="parsingProblem" type="xs:int" use="required"/>
         <xs:attribute name="problemStarts" type="xs:int" use="required"/>
         <xs:attribute name="problemEnds" type="xs:int" use="required"/>
       </xs:extension>
@@ -276,10 +280,26 @@
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
+  
+  <xs:complexType name="TypeDesignationStatusBase" abstract="true">
+    <xs:complexContent>
+      <xs:extension base="common:OrderedTermBase">
+        <xs:sequence/>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  
+  <xs:complexType name="NameTypeDesignationStatus">
+    <xs:complexContent>
+      <xs:extension base="name:TypeDesignationStatusBase">
+        <xs:sequence/>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
 
   <xs:complexType name="SpecimenTypeDesignation">
     <xs:complexContent>
-      <xs:extension base="name:TypeDesignationBase">
+      <xs:extension base="name:TypeDesignationStatusBase">
         <xs:sequence>
           <xs:element name="TypeSpecimen" type="xs:IDREF" minOccurs="0"/>
           <xs:element name="TypeStatus" type="xs:IDREF" minOccurs="0"/>
@@ -304,6 +324,13 @@
           <xs:element name="AuthorshipCache" type="xs:string" minOccurs="0"/>
           <xs:element name="ProtectedAuthorshipCache" type="xs:boolean"/>
           <xs:element name="ProtectedNameCache" type="xs:boolean"/>
+          <xs:element name="HybridRelationships" minOccurs="0">
+            <xs:complexType>
+              <xs:sequence>
+                <xs:element name="HybridRelationship" type="name:HybridRelationship" minOccurs="0" maxOccurs="unbounded"/>
+              </xs:sequence>
+            </xs:complexType>
+          </xs:element>
         </xs:sequence>
       </xs:extension>
     </xs:complexContent>
@@ -318,14 +345,7 @@
           <xs:element name="IsBinomHybrid" type="xs:boolean"/>
           <xs:element name="IsTrinomHybrid" type="xs:boolean"/>
           <xs:element name="IsAnamorphic" type="xs:boolean"/>
-          <xs:element name="HybridRelationships" minOccurs="0">
-            <xs:complexType>
-              <xs:sequence>
-                <xs:element name="HybridRelationship" type="name:HybridRelationship" minOccurs="0" maxOccurs="unbounded"/>
-              </xs:sequence>
-            </xs:complexType>
-          </xs:element>
-        </xs:sequence>
+         </xs:sequence>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>

diff --git a/cdmlib-io/src/main/resources/schema/cdm/occurrence.xsd b/cdmlib-io/src/main/resources/schema/cdm/occurrence.xsd
index f5f89c0c6d9368c6f335b35d3f30126527dbf83d..c0aa2958da985b68ef81672bdadca08fb8fed9a3 100644 (file)
--- a/cdmlib-io/src/main/resources/schema/cdm/occurrence.xsd
+++ b/cdmlib-io/src/main/resources/schema/cdm/occurrence.xsd
@@ -44,8 +44,12 @@
   <xs:element name="DerivationEvent" type="occurrence:DerivationEvent"/>
 
   <xs:element name="DerivationEventType" type="occurrence:DerivationEventType"/>
+  
+  <xs:element name="DerivedUnit" type="occurrence:derivedUnit"/>
 
   <xs:element name="DerivedUnitBase" type="occurrence:DerivedUnitBase"/>
+  
+  <xs:element name="DeterminationEvent" type="occurrence:DeterminationEvent"/>
 
   <xs:element name="DeterminationModifier" type="occurrence:DeterminationModifier"/>
 
@@ -90,6 +94,14 @@
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
+  
+  <xs:complexType name="derivedUnit">
+    <xs:complexContent>
+      <xs:extension base="occurrence:DerivedUnitBase">
+        <xs:sequence/>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
 
   <xs:complexType name="Collection">
     <xs:complexContent>

diff --git a/cdmlib-io/src/main/resources/schema/cdm/reference.xsd b/cdmlib-io/src/main/resources/schema/cdm/reference.xsd
index 3f1ea44e087ba8d2ea1ac10826daabc205b71f0e..7c865d442706d79ba2c4cc92e3a485c976f327b3 100644 (file)
--- a/cdmlib-io/src/main/resources/schema/cdm/reference.xsd
+++ b/cdmlib-io/src/main/resources/schema/cdm/reference.xsd
@@ -77,7 +77,7 @@
           <xs:element name="IsNomenclaturallyRelevant" type="xs:boolean"/>
           <xs:element name="AuthorTeam" type="xs:IDREF" minOccurs="0"/>
         </xs:sequence>
-        <xs:attribute name="hasProblem" type="xs:boolean" use="required"/>
+        <xs:attribute name="parsingProblem" type="xs:int" use="required"/>
         <xs:attribute name="problemStarts" type="xs:int" use="required"/>
         <xs:attribute name="problemEnds" type="xs:int" use="required"/>
       </xs:extension>

diff --git a/cdmlib-io/src/main/resources/schema/cdm/taxon.xsd b/cdmlib-io/src/main/resources/schema/cdm/taxon.xsd
index ab6883ec9ccbe4927721625f044537996a3d1ac1..192372ac1fdf5cd3de69000ff764f482aea9845f 100644 (file)
--- a/cdmlib-io/src/main/resources/schema/cdm/taxon.xsd
+++ b/cdmlib-io/src/main/resources/schema/cdm/taxon.xsd
@@ -34,10 +34,14 @@
   <xs:element name="SynonymRelationshipType" type="taxon:SynonymRelationshipType"/>
 
   <xs:element name="Taxon" type="taxon:Taxon"/>
+  
+  <xs:element name="TaxonNode" type="taxon:TaxonNode"/>
 
   <xs:element name="TaxonRelationship" type="taxon:TaxonRelationship"/>
 
   <xs:element name="TaxonRelationshipType" type="taxon:TaxonRelationshipType"/>
+  
+  <xs:element name="TaxonomicTree" type="taxon:TaxonomicTree"/>
 
   <xs:complexType name="SynonymRelationshipType">
     <xs:complexContent>
@@ -60,6 +64,13 @@
       <xs:extension base="taxon:TaxonBase">
         <xs:sequence>
           <xs:element name="TaxonomicParentCache" type="xs:IDREF" minOccurs="0"/>
+          <xs:element name="taxonNodes" minOccurs="0">
+            <xs:complexType>
+              <xs:sequence>
+                <xs:element name="taxonNode" type="taxon:TaxonNode" minOccurs="0" maxOccurs="unbounded"/>
+              </xs:sequence>
+            </xs:complexType>
+          </xs:element>
           <xs:element name="TaxonomicChildrenCount" type="xs:int"/>
           <xs:element name="SynonymRelations" minOccurs="0">
             <xs:complexType>
@@ -90,6 +101,7 @@
             </xs:complexType>
           </xs:element>
         </xs:sequence>
+        <xs:attribute name="taxonStatusUnknown" type="xs:boolean" use="required"/>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
@@ -105,6 +117,48 @@
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
+  
+  <xs:complexType name="TaxonomicTree">
+    <xs:complexContent>
+      <xs:extension base="common:IdentifiableEntity">
+        <xs:sequence>
+          <xs:element name="taxTreeName" type="xs:IDREF" minOccurs="0"/>
+          <xs:element name="rootNodes" minOccurs="0">
+            <xs:complexType>
+              <xs:sequence>
+                <xs:element name="rootNode" type="xs:IDREF" minOccurs="0" maxOccurs="unbounded"/>
+              </xs:sequence>
+            </xs:complexType>
+          </xs:element>
+          <xs:element name="reference" type="xs:IDREF" minOccurs="0"/>
+          <xs:element name="microReference" type="xs:string" minOccurs="0"/>
+        </xs:sequence>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+ 
+  <xs:complexType name="TaxonNode">
+    <xs:complexContent>
+      <xs:extension base="common:AnnotatableEntity">
+        <xs:sequence>
+          <xs:element name="taxon" type="xs:IDREF" minOccurs="0"/>
+          <xs:element name="parent" type="xs:IDREF" minOccurs="0"/>
+          <xs:element name="taxonomicTree" type="xs:IDREF" minOccurs="0"/>
+          <xs:element name="childNodes" minOccurs="0">
+            <xs:complexType>
+              <xs:sequence>
+                <xs:element name="childNode" type="xs:IDREF" minOccurs="0" maxOccurs="unbounded"/>
+              </xs:sequence>
+            </xs:complexType>
+          </xs:element>
+          <xs:element name="reference" type="xs:IDREF" minOccurs="0"/>
+          <xs:element name="microReference" type="xs:string" minOccurs="0"/>
+          <xs:element name="countChildren" type="xs:int"/>
+          <xs:element name="synonymToBeUsed" type="xs:IDREF" minOccurs="0"/>
+        </xs:sequence>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
 
   <xs:complexType name="SynonymRelationship">
     <xs:complexContent>