[tdwg-tapir] r890 - tapir/dev/schema
svn at rs.tdwg.org
svn at rs.tdwg.org
Sat Feb 24 13:34:11 CET 2007
Author: RenatoDeGiovanni
Date: 2007-02-24 13:34:05 +0100 (Sat, 24 Feb 2007)
New Revision: 890
Modified:
tapir/dev/schema/tapir.xsd
Log:
Created new type for the global element "variable" and extended the elements "concept" and "variable" in the output model mapping to
include the new optional attribute called "required".
Modified: tapir/dev/schema/tapir.xsd
===================================================================
--- tapir/dev/schema/tapir.xsd 2007-02-24 11:54:43 UTC (rev 889)
+++ tapir/dev/schema/tapir.xsd 2007-02-24 12:34:05 UTC (rev 890)
@@ -281,9 +281,25 @@
<xsd:annotation>
<xsd:documentation>Multiple mappings represent concatenation.</xsd:documentation>
</xsd:annotation>
- <xsd:element ref="concept"/>
+ <xsd:element name="concept">
+ <xsd:complexType>
+ <xsd:complexContent>
+ <xsd:extension base="conceptType">
+ <xsd:attribute name="required" type="xsd:boolean" use="optional" default="false"/>
+ </xsd:extension>
+ </xsd:complexContent>
+ </xsd:complexType>
+ </xsd:element>
<xsd:element ref="literal"/>
- <xsd:element ref="variable"/>
+ <xsd:element name="variable">
+ <xsd:complexType>
+ <xsd:complexContent>
+ <xsd:extension base="variableType">
+ <xsd:attribute name="required" type="xsd:boolean" use="optional" default="false"/>
+ </xsd:extension>
+ </xsd:complexContent>
+ </xsd:complexType>
+ </xsd:element>
</xsd:choice>
<xsd:attribute name="path" type="simpleXPathType" use="required"/>
</xsd:complexType>
@@ -673,15 +689,6 @@
</xsd:annotation>
</xsd:element>
<!-- ===== ENVIRONMENT VARIABLE EXPRESSIONS ===== -->
- <xsd:element name="variable" substitutionGroup="expression">
- <xsd:annotation>
- <xsd:documentation>An element to represent specific values
- from the service local environment.</xsd:documentation>
- </xsd:annotation>
- <xsd:complexType>
- <xsd:attribute name="name" type="variableNameType" use="required"/>
- </xsd:complexType>
- </xsd:element>
<xsd:simpleType name="predefinedVariableNamesType">
<xsd:restriction base="xsd:string">
<xsd:enumeration value="date">
@@ -714,6 +721,15 @@
<xsd:simpleType name="variableNameType">
<xsd:union memberTypes="predefinedVariableNamesType xsd:string"/>
</xsd:simpleType>
+ <xsd:complexType name="variableType">
+ <xsd:attribute name="name" type="variableNameType" use="required"/>
+ </xsd:complexType>
+ <xsd:element name="variable" type="variableType" substitutionGroup="expression">
+ <xsd:annotation>
+ <xsd:documentation>An element to represent specific values
+ from the service local environment.</xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
<!-- ============================================= -->
<!--REQUEST TYPE DEFINITIONS-->
<!-- ============================================= -->
More information about the tdwg-tag
mailing list