[tdwg-tapir] r1280 - tapir/dev/schema

svn at rs.tdwg.org svn at rs.tdwg.org
Thu Aug 2 00:33:59 CEST 2007


Author: RenatoDeGiovanni
Date: 2007-08-02 00:33:54 +0200 (Thu, 02 Aug 2007)
New Revision: 1280

Modified:
   tapir/dev/schema/tapir.xsd
Log:
Moved environment variable elements from specific xsd:group to the local sequence of the "environment" element. 
Removed the xsd:group.


Modified: tapir/dev/schema/tapir.xsd
===================================================================
--- tapir/dev/schema/tapir.xsd	2007-08-01 22:33:10 UTC (rev 1279)
+++ tapir/dev/schema/tapir.xsd	2007-08-01 22:33:54 UTC (rev 1280)
@@ -8,7 +8,7 @@
 	xmlns:geo="http://www.w3.org/2003/01/geo/wgs84_pos#"
 	xmlns:vcard="http://www.w3.org/2001/vcard-rdf/3.0#"
 	elementFormDefault="qualified" 
-	attributeFormDefault="unqualified" version="1.01" xml:lang="EN" >
+	attributeFormDefault="unqualified" version="1.0.2" xml:lang="EN" >
 	<xsd:annotation>
 		<xsd:documentation xml:lang="en">
 			TAPIR XML Schema. TAPIR is an acronym for TDWG Access Protocol for Information Retrieval.
@@ -1073,7 +1073,22 @@
 						<xsd:element name="environment" minOccurs="0">
 							<xsd:complexType>
 								<xsd:sequence>
-									<xsd:group ref="tapirEnvironmentVariables"/>
+									<xsd:element name="date" type="supportedVariableType" minOccurs="0"/>
+									<xsd:element name="timestamp" type="supportedVariableType" minOccurs="0"/>
+									<xsd:element name="dataSourceName" type="supportedVariableType" minOccurs="0"/>
+									<xsd:element name="accessPoint" type="supportedVariableType" minOccurs="0"/>
+									<xsd:element name="lastUpdate" type="supportedVariableType" minOccurs="0"/>
+									<xsd:element name="dateCreated" type="supportedVariableType" minOccurs="0"/>
+									<xsd:element name="dataSourceDescription" type="supportedVariableType" minOccurs="0"/>
+									<xsd:element name="rights" type="supportedVariableType" minOccurs="0"/>
+									<xsd:element name="subject" type="supportedVariableType" minOccurs="0"/>
+									<xsd:element name="bibliographicCitation" type="supportedVariableType" minOccurs="0"/>
+									<xsd:element name="metadataLanguage" type="supportedVariableType" minOccurs="0"/>
+									<xsd:element name="dataSourceLanguage" type="supportedVariableType" minOccurs="0"/>
+									<xsd:element name="technicalContactName" type="supportedVariableType" minOccurs="0"/>
+									<xsd:element name="technicalContactEmail" type="supportedVariableType" minOccurs="0"/>
+									<xsd:element name="contentContactName" type="supportedVariableType" minOccurs="0"/>
+									<xsd:element name="contentContactEmail" type="supportedVariableType" minOccurs="0"/>
 									<xsd:element ref="custom" minOccurs="0"/>
 								</xsd:sequence>
 							</xsd:complexType>
@@ -1568,26 +1583,6 @@
 			</xsd:element>
 		</xsd:sequence>
 	</xsd:complexType>
-	<xsd:group name="tapirEnvironmentVariables">
-		<xsd:sequence>
-			<xsd:element name="date" type="supportedVariableType" minOccurs="0"/>
-			<xsd:element name="timestamp" type="supportedVariableType" minOccurs="0"/>
-			<xsd:element name="dataSourceName" type="supportedVariableType" minOccurs="0"/>
-			<xsd:element name="accessPoint" type="supportedVariableType" minOccurs="0"/>
-			<xsd:element name="lastUpdate" type="supportedVariableType" minOccurs="0"/>
-			<xsd:element name="dateCreated" type="supportedVariableType" minOccurs="0"/>
-			<xsd:element name="dataSourceDescription" type="supportedVariableType" minOccurs="0"/>
-			<xsd:element name="rights" type="supportedVariableType" minOccurs="0"/>
-			<xsd:element name="subject" type="supportedVariableType" minOccurs="0"/>
-			<xsd:element name="bibliographicCitation" type="supportedVariableType" minOccurs="0"/>
-			<xsd:element name="metadataLanguage" type="supportedVariableType" minOccurs="0"/>
-			<xsd:element name="dataSourceLanguage" type="supportedVariableType" minOccurs="0"/>
-			<xsd:element name="technicalContactName" type="supportedVariableType" minOccurs="0"/>
-			<xsd:element name="technicalContactEmail" type="supportedVariableType" minOccurs="0"/>
-			<xsd:element name="contentContactName" type="supportedVariableType" minOccurs="0"/>
-			<xsd:element name="contentContactEmail" type="supportedVariableType" minOccurs="0"/>
-		</xsd:sequence>
-	</xsd:group>
 	<xsd:complexType name="supportedVariableType"/>
 	<!-- ===== METADATA ===== -->
 	<xsd:element name="metadata" type="metadataResultType">




More information about the tdwg-tag mailing list