Changeset 2326 for cats/ISOcat/trunk/mod-ISOcat-interface-rest/representations/dcs2/xsd.xsl

Timestamp:

10/23/12 12:01:03 (12 years ago)

Author:

mwindhouwer

Message:

M mod-ISOcat-access-data/dbms/ISOcat-schema-init.sql

• add SCHEMAcat reference as a new rule type

M mod-ISOcat-interface-rest/representations/dcs2/xsd.xsl

• add a SCHEMAcat reference as an appinfo

M mod-ISOcat-interface-rest/representations/dcs2/rng.xsl

• add a SCHEMAcat reference as an annotation

File:

• cats/ISOcat/trunk/mod-ISOcat-interface-rest/representations/dcs2/xsd.xsl (modified) (3 diffs)

cats/ISOcat/trunk/mod-ISOcat-interface-rest/representations/dcs2/xsd.xsl

@@ -96 +96 @@
     <xsl:template match="dcif:dataCategory[@type='simple']"/>
 
-    <xsl:template match="*" mode="nonscopy">
-        <xsl:element name="{local-name(.)}" namespace="{namespace-uri()}">
-            <xsl:copy-of select="@*"/>
-            <xsl:apply-templates mode="nonscopy"/>
-        </xsl:element>
-    </xsl:template>
-
     <xsl:template name="conceptualDomainTemplate">
         <xsl:choose>
@@ -109 +102 @@
                 <xs:simpleType>
                     <xs:restriction base="xs:{$datatype}">
-                        <xsl:apply-templates
-                            select="(dcif:conceptualDomain[dcif:ruleType='XML Schema facet']/dcif:rule/*)[1]"
-                            mode="nonscopy"/>
+                        <xsl:copy-of
+                            select="(dcif:conceptualDomain[dcif:ruleType='XML Schema facet']/dcif:rule/*)[1]"/>
                     </xs:restriction>
                 </xs:simpleType>
@@ -128 +120 @@
                 <xsl:variable name="datatype" select="(dcif:conceptualDomain/dcif:dataType)[1]"/>
                 <xsl:attribute name="type" select="concat('xs:',$datatype)"/>
-                <xsl:apply-templates
-                    select="(dcif:conceptualDomain[dcif:ruleType='Schematron rule']/dcif:rule/*)[1]"
-                    mode="nonscopy"/>
+                <xsl:copy-of
+                    select="(dcif:conceptualDomain[dcif:ruleType='Schematron rule']/dcif:rule/*)[1]"/>
+            </xsl:when>
+            <xsl:when test="dcif:conceptualDomain[dcif:ruleType='SCHEMAcat reference']">
+                <xsl:variable name="datatype" select="(dcif:conceptualDomain/dcif:dataType)[1]"/>
+                <xsl:attribute name="type" select="concat('xs:',$datatype)"/>
+                <xs:annotation>
+                    <xs:appinfo>
+                        <xsl:copy-of
+                            select="(dcif:conceptualDomain[dcif:ruleType='SCHEMAcat reference']/dcif:rule/*)[1]"/>
+                    </xs:appinfo>
+                </xs:annotation>
             </xsl:when>
             <xsl:otherwise>