Author: RenatoDeGiovanni Date: 2007-07-23 00:56:16 +0200 (Mon, 23 Jul 2007) New Revision: 1250

Modified: tapir/dev/schema/tapir.xsd Log: Replaced xsd:any by the official list of TAPIR environment variables and a custom slot, just to enforce validation.

Modified: tapir/dev/schema/tapir.xsd =================================================================== --- tapir/dev/schema/tapir.xsd 2007-07-22 22:53:26 UTC (rev 1249) +++ tapir/dev/schema/tapir.xsd 2007-07-22 22:56:16 UTC (rev 1250) @@ -698,7 +698,7 @@ xsd:documentationCurrent timestamp in ISO format like 2005-07-20 17:01:38</xsd:documentation> </xsd:annotation> </xsd:enumeration> - <xsd:enumeration value="datasourceName"> + <xsd:enumeration value="dataSourceName"> xsd:annotation xsd:documentationThe name of the datasource (dc:title metadata).</xsd:documentation> </xsd:annotation> @@ -740,7 +740,7 @@ </xsd:enumeration> <xsd:enumeration value="metadataLanguage"> xsd:annotation - xsd:documentationThe language in which the content of the following variables are expressed: datasourceName, dataSourceDescription, rights, subject and bibliographicCitation.</xsd:documentation> + xsd:documentationThe language in which the content of the following variables are expressed: dataSourceName, dataSourceDescription, rights, subject and bibliographicCitation.</xsd:documentation> </xsd:annotation> </xsd:enumeration> <xsd:enumeration value="dataSourceLanguage"> @@ -1073,7 +1073,8 @@ <xsd:element name="environment" minOccurs="0"> xsd:complexType xsd:sequence - <xsd:any maxOccurs="unbounded" processContents="skip"/> + <xsd:group ref="tapirEnvironmentVariables"/> + <xsd:element ref="custom" minOccurs="0"/> </xsd:sequence> </xsd:complexType> </xsd:element> @@ -1567,6 +1568,27 @@ </xsd:element> </xsd:sequence> </xsd:complexType> + <xsd:group name="tapirEnvironmentVariables"> + xsd:all + <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:all> + </xsd:group> + <xsd:complexType name="supportedVariableType"/> <!-- ===== METADATA ===== --> <xsd:element name="metadata" type="metadataResultType"> xsd:annotation