Author: renato Date: 2006-01-05 19:41:13 +0100 (Thu, 05 Jan 2006) New Revision: 397

Modified: trunk/protocol/tapir.xsd Log: * Renamed global element <environment> to <variable>. * Reincluded the previous /response/capabilities/search/variables in a new place (/response/capabilities/variables) since they can be used in both mappings and filters. * Removed redefinition of all variables in the capabilities response by referencing the existing variable element defintion. * Removed the empty /response/capabilities/search/variables/environment/metadata element.

Modified: trunk/protocol/tapir.xsd =================================================================== --- trunk/protocol/tapir.xsd 2006-01-05 18:31:19 UTC (rev 396) +++ trunk/protocol/tapir.xsd 2006-01-05 18:41:13 UTC (rev 397) @@ -243,7 +243,7 @@ </xsd:annotation> <xsd:element ref="concept"/> <xsd:element ref="literal"/> - <xsd:element ref="environment"/> + <xsd:element ref="variable"/> </xsd:choice> <xsd:attribute name="path" type="simpleXPath" use="required"/> </xsd:complexType> @@ -591,45 +591,45 @@ xsd:documentationThe or logical operator.</xsd:documentation> </xsd:annotation> </xsd:element> - <!-- ===== ENVIRONMENT EXPRESSIONS ===== --> - <xsd:element name="environment" abstract="true" substitutionGroup="expression"> + <!-- ===== ENVIRONMENT VARIABLE EXPRESSIONS ===== --> + <xsd:element name="variable" abstract="true" substitutionGroup="expression"> xsd:annotation xsd:documentationAn abstract element to represent datasource specific values taken from the datasource environment by the wrapper.</xsd:documentation> </xsd:annotation> </xsd:element> - <xsd:element name="date" substitutionGroup="environment"> + <xsd:element name="date" substitutionGroup="variable"> xsd:annotation xsd:documentationAn element to represent ISO date like 2005-07-21. Substitutes an - abstract environment expression element.</xsd:documentation> + abstract environment variable element.</xsd:documentation> </xsd:annotation> xsd:complexType/ </xsd:element> - <xsd:element name="timestamp" substitutionGroup="environment"> + <xsd:element name="timestamp" substitutionGroup="variable"> xsd:annotation xsd:documentationAn element to represent an ISO timestamp like 2005-07-20 17:01:38. - Substitutes an abstract environment expression element.</xsd:documentation> + Substitutes an abstract environment variable element.</xsd:documentation> </xsd:annotation> xsd:complexType/ </xsd:element> - <xsd:element name="datasourceName" substitutionGroup="environment"> + <xsd:element name="datasourceName" substitutionGroup="variable"> xsd:annotation xsd:documentationAn element to represent the name of the datasource. Substitutes an - abstract environment expression element.</xsd:documentation> + abstract environment variable element.</xsd:documentation> </xsd:annotation> xsd:complexType/ </xsd:element> - <xsd:element name="accessPoint" substitutionGroup="environment"> + <xsd:element name="accessPoint" substitutionGroup="variable"> xsd:annotation xsd:documentationAn element to represent the access point of the datasource. - Substitutes an abstract environment expression element.</xsd:documentation> + Substitutes an abstract environment variable element.</xsd:documentation> </xsd:annotation> xsd:complexType/ </xsd:element> - <xsd:element name="lastUpdate"> + <xsd:element name="lastUpdate" substitutionGroup="variable"> xsd:annotation xsd:documentationAn element to represent the timestamp of the last update of the - datasource. Substitutes an abstract environment expression + datasource. Substitutes an abstract variable expression element.</xsd:documentation> </xsd:annotation> xsd:complexType/ @@ -897,6 +897,29 @@ </xsd:sequence> </xsd:complexType> </xsd:element> + <xsd:element name="variables"> + xsd:complexType + xsd:sequence + <xsd:element name="environment" minOccurs="0"> + xsd:complexType + xsd:sequence + <xsd:element ref="variable"/> + <xsd:element name="custom" minOccurs="0"> + xsd:annotation + xsd:documentationExtension slot for other variables.</xsd:documentation> + </xsd:annotation> + xsd:complexType + xsd:sequence + <xsd:any minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + </xsd:complexType> + </xsd:element> + </xsd:sequence> + </xsd:complexType> + </xsd:element> + </xsd:sequence> + </xsd:complexType> + </xsd:element> <xsd:element name="settings"> xsd:annotation xsd:documentationInformation about the local configuration of a