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

[tdwg-tapir at lists.tdwg.org]

Author: renato
Date: 2006-01-05 18:32:48 +0100 (Thu, 05 Jan 2006)
New Revision: 392

Modified:
   trunk/protocol/tapir.xsd
Log:
* Reincluded the "view" operation which will be completely dedicated to the usage of queryTemples. This operation will only be accessible through GET whithout using XML requests, and it will not accept the "filter" and "partial" parameters. 
* Moved /response/capabilities/operations/search/queryTemplates to /response/capabilities/operations/view/queryTemplates.
* Included a new <predefinedOutputModels> element in /response/capabilities/operations/search.


Modified: trunk/protocol/tapir.xsd
===================================================================
--- trunk/protocol/tapir.xsd	2006-01-05 17:19:49 UTC (rev 391)
+++ trunk/protocol/tapir.xsd	2006-01-05 17:32:48 UTC (rev 392)
@@ -787,18 +787,30 @@
 						<xsd:element name="capabilities">
 							<xsd:complexType/>
 						</xsd:element>
+						<xsd:element name="view" minOccurs="0">
+							<xsd:complexType>
+								<xsd:sequence>
+									<xsd:element name="queryTemplates">
+										<xsd:complexType>
+											<xsd:sequence>
+												<xsd:element name="queryTemplate" type="externalResourceType" maxOccurs="unbounded"/>
+											</xsd:sequence>
+										</xsd:complexType>
+									</xsd:element>
+								</xsd:sequence>
+							</xsd:complexType>
+						</xsd:element>
 						<xsd:element name="inventory" minOccurs="0">
 							<xsd:complexType/>
 						</xsd:element>
 						<xsd:element name="search" minOccurs="0">
 							<xsd:complexType>
 								<xsd:sequence>
-									<xsd:element name="queryTemplates">
+									<xsd:element name="predefinedOutputModels">
 										<xsd:complexType>
 											<xsd:sequence>
-												<xsd:element name="queryTemplate" type="externalResourceType" minOccurs="0" maxOccurs="unbounded"/>
+												<xsd:element name="outputModel" type="externalResourceType" minOccurs="0" maxOccurs="unbounded"/>
 											</xsd:sequence>
-											<xsd:attribute name="default" type="xsd:string" use="optional"/>
 										</xsd:complexType>
 									</xsd:element>
 									<xsd:element name="customOutputModels">
@@ -815,111 +827,6 @@
 											<xsd:attribute name="accepted" type="xsd:boolean" use="required"/>
 										</xsd:complexType>
 									</xsd:element>
-									<xsd:element name="variables">
-										<xsd:complexType>
-											<xsd:sequence>
-												<xsd:element name="environment" minOccurs="0">
-													<xsd:complexType>
-														<xsd:sequence minOccurs="0">
-															<xsd:element name="accessPoint" minOccurs="0">
-																<xsd:annotation>
-																	<xsd:documentation>An element to
-												represent the access point
-												of the datasource.
-												Substitutes an abstract
-												environment expression
-												element.</xsd:documentation>
-																</xsd:annotation>
-																<xsd:complexType/>
-															</xsd:element>
-															<xsd:element name="datasourceName" minOccurs="0">
-																<xsd:annotation>
-																	<xsd:documentation>An element to
-												represent the name of the
-												datasource. Substitutes an
-												abstract environment
-												expression
-												element.</xsd:documentation>
-																</xsd:annotation>
-																<xsd:complexType/>
-															</xsd:element>
-															<xsd:element name="lastUpdate" minOccurs="0">
-																<xsd:annotation>
-																	<xsd:documentation>An element to
-												represent the timestamp of
-												the last update of the
-												datasource. Substitutes an
-												abstract environment
-												expression
-												element.</xsd:documentation>
-																</xsd:annotation>
-																<xsd:complexType/>
-															</xsd:element>
-															<xsd:element name="date" minOccurs="0">
-																<xsd:annotation>
-																	<xsd:documentation>An element to
-												represent ISO date like
-												2005-07-21. Substitutes an
-												abstract environment
-												expression
-												element.</xsd:documentation>
-																</xsd:annotation>
-																<xsd:complexType/>
-															</xsd:element>
-															<xsd:element name="timestamp" minOccurs="0">
-																<xsd:annotation>
-																	<xsd:documentation>An element to
-												represent an ISO timestamp
-												like 2005-07-20 17:01:38.
-												Substitutes an abstract
-												environment expression
-												element.</xsd:documentation>
-																</xsd:annotation>
-																<xsd:complexType/>
-															</xsd:element>
-															<xsd:element name="metadata" minOccurs="0">
-																<xsd:annotation>
-																	<xsd:documentation>Variables
-												taken from the metadata
-												response
-												definition.</xsd:documentation>
-																</xsd:annotation>
-																<xsd:complexType/>
-															</xsd:element>
-															<xsd:element name="custom" minOccurs="0">
-																<xsd:annotation>
-																	<xsd:documentation>Information
-												about the local
-												configuration of a
-												datasource.</xsd:documentation>
-																</xsd:annotation>
-																<xsd:complexType>
-																	<xsd:sequence>
-																		<xsd:any minOccurs="0" maxOccurs="unbounded">
-																			<xsd:annotation>
-																				<xsd:documentation>For
-												any custom
-												extension. E.g
-												what security
-												related
-												capabilities
-												does the
-												provider have?
-												Encryption,
-												access
-												restriction,
-												etc.</xsd:documentation>
-																			</xsd:annotation>
-																		</xsd:any>
-																	</xsd:sequence>
-																</xsd:complexType>
-															</xsd:element>
-														</xsd:sequence>
-													</xsd:complexType>
-												</xsd:element>
-											</xsd:sequence>
-										</xsd:complexType>
-									</xsd:element>
 								</xsd:sequence>
 							</xsd:complexType>
 						</xsd:element>