Changeset 6833

Timestamp:

11/23/15 06:37:21 (8 years ago)

Author:

Menzo Windhouwer

Message:

M toolkit/src/main/resources/toolkit/xslt/comp2schema.xsl

• fixed generation of the XSD enumeration
• propagate Attribute/@Required to xs:attribute/@use

File:

• metadata/trunk/toolkit/src/main/resources/toolkit/xslt/comp2schema.xsl (modified) (4 diffs)

metadata/trunk/toolkit/src/main/resources/toolkit/xslt/comp2schema.xsl

@@ -135 +135 @@
     <xsl:template match="Element/ValueScheme[exists(Vocabulary/enumeration)]" mode="types">
         
+        <xsl:message>DBG: create complex types</xsl:message>
+        
         <!-- only handle the ValueScheme if this is the first occurence of the Component -->
         <xsl:variable name="Component" select="ancestor::Component[exists(@ComponentId)]"/>
         <xsl:if test="empty($Component/preceding::Component[@ComponentId=$Component/@ComponentId])">
-
+            <xsl:message>DBG: first occurence</xsl:message>
+            
             <!-- create a unique suffix (the path to the element) to ensure the unicity of the types to be created -->
             <xsl:variable name="uniquePath" select="cmd:getComponentId(..)"/>
@@ -146 +149 @@
                 <xs:restriction base="xs:string">
                     <xsl:apply-templates select="pattern"/>
-                    <xsl:apply-templates select="enumeration"/>
+                    <xsl:apply-templates select="Vocabulary/enumeration"/>
                 </xs:restriction>
             </xs:simpleType>
@@ -300 +303 @@
     <xsl:template match="AttributeList/Attribute">
         <xs:attribute name="{@name}">
+            
+            <!-- a mandatory attribute? -->
+            <xsl:if test="@Required='true'">
+                <xsl:attribute name="use" select="'required'"/>
+            </xsl:if>
 
             <!-- Add a cmd:ConceptLink if a ConceptLink element is found -->
@@ -312 +320 @@
 
                 <!-- complex situation: CV or regex -->
-                <xsl:when test="exists(./ValueScheme/(Vocabulary/enumeration|pattern))">
+                <xsl:when test="exists(./ValueScheme/((Vocabulary/enumeration)|pattern))">
 
                     <xs:annotation>