[tdwg-tapir] Schema modification: r513 - trunk/protocol

tdwg-tapir at lists.tdwg.org tdwg-tapir at lists.tdwg.org
Mon Mar 13 12:04:21 CET 2006


Author: markus
Date: 2006-03-13 12:04:20 +0100 (Mon, 13 Mar 2006)
New Revision: 513

Modified:
   trunk/protocol/tapir.xsd
Log:
incorporates 3 changes:
1) Allow any number of concept name servers, but require 1 (capabilities)
2) simpleXpathType is a string now
3) partial element from search request integrated into searchTemplateType. So partial is now part of a searhc template as well as a search request.

Modified: trunk/protocol/tapir.xsd
===================================================================
--- trunk/protocol/tapir.xsd	2006-03-10 18:21:20 UTC (rev 512)
+++ trunk/protocol/tapir.xsd	2006-03-13 11:04:20 UTC (rev 513)
@@ -8,12 +8,9 @@
 	<!-- ============================================= -->
 	<xsd:simpleType name="simpleXPathType">
 		<xsd:annotation>
-			<xsd:documentation>A simple XPath expression used to reference XML
-			nodes.</xsd:documentation>
+			<xsd:documentation>A simple XPath expression used to reference XML  nodes.</xsd:documentation>
 		</xsd:annotation>
-		<xsd:restriction base="xsd:string">
-			<xsd:pattern value="(/[a-zA-Z0-9_\-]+)+(@[a-zA-Z0-9_\-]+)?"/>
-		</xsd:restriction>
+		<xsd:restriction base="xsd:string"/>
 	</xsd:simpleType>
 	<xsd:simpleType name="qualifiedConceptIdType">
 		<xsd:annotation>
@@ -256,35 +253,59 @@
 	<xsd:complexType name="searchTemplateType">
 		<xsd:complexContent>
 			<xsd:extension base="extResourceDocumentationType">
-					<xsd:sequence>
-			<xsd:element name="outputModel" type="externalResourceType"/>
-			<xsd:element ref="filter" minOccurs="0"/>
-			<xsd:element name="orderBy" minOccurs="0">
-				<xsd:annotation>
-					<xsd:documentation>A list of qualified concepts to be used for ordering the view
-						results.</xsd:documentation>
-				</xsd:annotation>
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="concept" maxOccurs="unbounded">
-							<xsd:annotation>
-								<xsd:documentation>A single concept to be used for ordering the
-									view. If the attribute "descend" is set to true, a descending
-									ordering will be used instead of the default ascending
-								one.</xsd:documentation>
-							</xsd:annotation>
-							<xsd:complexType>
-								<xsd:complexContent>
-									<xsd:extension base="conceptType">
-										<xsd:attribute name="descend" type="xsd:boolean" use="optional" default="false"/>
-									</xsd:extension>
-								</xsd:complexContent>
-							</xsd:complexType>
-						</xsd:element>
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-		</xsd:sequence>
+				<xsd:sequence>
+					<xsd:element name="outputModel" type="externalResourceType"/>
+					<xsd:element name="partial" minOccurs="0">
+						<xsd:annotation>
+							<xsd:documentation>Select only a subset of the
+								entire response structure to be used in the
+								response. Useful for working with large cached
+								external structures referenced via URLs. Select
+								branch nodes if you want all concepts below
+								included. A partial search must take care that
+								response documents still validate. Thus
+								mandatory elements or attributes of the response
+								structure, which are not listed in the partial
+								search ,must be included in the response
+								content.</xsd:documentation>
+						</xsd:annotation>
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="node" type="nodeReferenceType" maxOccurs="unbounded">
+									<xsd:annotation>
+										<xsd:documentation>A node taken from the response structure definition.</xsd:documentation>
+									</xsd:annotation>
+								</xsd:element>
+							</xsd:sequence>
+						</xsd:complexType>
+					</xsd:element>
+					<xsd:element ref="filter" minOccurs="0"/>
+					<xsd:element name="orderBy" minOccurs="0">
+						<xsd:annotation>
+							<xsd:documentation>A list of qualified concepts to be used for ordering the view
+								results.</xsd:documentation>
+						</xsd:annotation>
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="concept" maxOccurs="unbounded">
+									<xsd:annotation>
+										<xsd:documentation>A single concept to be used for ordering the
+											view. If the attribute "descend" is set to true, a descending
+											ordering will be used instead of the default ascending
+										one.</xsd:documentation>
+									</xsd:annotation>
+									<xsd:complexType>
+										<xsd:complexContent>
+											<xsd:extension base="conceptType">
+												<xsd:attribute name="descend" type="xsd:boolean" use="optional" default="false"/>
+											</xsd:extension>
+										</xsd:complexContent>
+									</xsd:complexType>
+								</xsd:element>
+							</xsd:sequence>
+						</xsd:complexType>
+					</xsd:element>
+				</xsd:sequence>
 			</xsd:extension>
 		</xsd:complexContent>
 	</xsd:complexType>
@@ -665,36 +686,8 @@
 					<xsd:complexType>
 						<xsd:complexContent>
 							<xsd:extension base="searchTemplateType">
-						<xsd:sequence>
-							<xsd:element name="partial" minOccurs="0">
-								<xsd:annotation>
-									<xsd:documentation>Select only a subset of the
-												entire response structure to be used in the
-												response. Useful for working with large cached
-												external structures referenced via URLs. Select
-												branch nodes if you want all concepts below
-												included. A partial search must take care that
-												response documents still validate. Thus
-												mandatory elements or attributes of the response
-												structure, which are not listed in the partial
-												search ,must be included in the response
-												content.</xsd:documentation>
-								</xsd:annotation>
-								<xsd:complexType>
-									<xsd:sequence>
-										<xsd:element name="node" type="nodeReferenceType" maxOccurs="unbounded">
-											<xsd:annotation>
-												<xsd:documentation>A node taken from the
-												response structure
-												definition.</xsd:documentation>
-											</xsd:annotation>
-										</xsd:element>
-									</xsd:sequence>
-								</xsd:complexType>
-							</xsd:element>
-						</xsd:sequence>
-						<xsd:attributeGroup ref="operationRequestGroup"/>
-						<xsd:attributeGroup ref="pagingParametersGroup"/>
+								<xsd:attributeGroup ref="operationRequestGroup"/>
+								<xsd:attributeGroup ref="pagingParametersGroup"/>
 							</xsd:extension>
 						</xsd:complexContent>
 					</xsd:complexType>
@@ -851,8 +844,11 @@
 							</xsd:annotation>
 							<xsd:complexType>
 								<xsd:sequence>
-									<xsd:element name="primary" type="externalResourceType" minOccurs="0"/>
-									<xsd:element name="secondary" type="externalResourceType" minOccurs="0"/>
+									<xsd:element name="server" type="externalResourceType" minOccurs="1" maxOccurs="unbounded">
+										<xsd:annotation>
+											<xsd:documentation>Multiple servers allowed. Ordered list with the first server(s) having priority over the following ones.</xsd:documentation>
+										</xsd:annotation>
+									</xsd:element>
 								</xsd:sequence>
 							</xsd:complexType>
 						</xsd:element>





More information about the tdwg-tag mailing list