Changeset 1167

Timestamp:

03/14/11 15:20:11 (13 years ago)

Author:

mwindhouwer

Message:

Upgrade to CMD version 1.1, which introduces to CMDI instance documents:

• the CMD default namespace (​http://www.clarin.eu/cmd/), and
• the required CMDVersion attribute, which value should for now be 1.1, to the CMD root element.

Location:

metadata/trunk/toolkit

Files:

• xsd/minimal-cmdi.xsd (modified) (2 diffs)
• xslt/comp2schema-v2/cleanup-xsd.xsl (modified) (2 diffs)
• xslt/comp2schema-v2/comp2schema-header.xsl (modified) (1 diff)
• xslt/comp2schema-v2/comp2schema.xsl (modified) (6 diffs)

metadata/trunk/toolkit/xsd/minimal-cmdi.xsd

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:dcr="http://www.isocat.org" targetNamespace="http://www.clarin.eu/cmd/" attributeFormDefault="unqualified" elementFormDefault="qualified">
-
    <xs:element name="CMD">
       <xs:complexType>
@@ -101 +100 @@
                </xs:complexType>
             </xs:element>
-
          </xs:sequence>
+         <xs:attribute name="CMDVersion" fixed="1.1" use="required"/>
       </xs:complexType>
-
    </xs:element>
 </xs:schema>

metadata/trunk/toolkit/xslt/comp2schema-v2/cleanup-xsd.xsl

@@ -7 +7 @@
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0"
-    xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:dcr="http://www.isocat.org"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:dcr="http://www.isocat.org/ns/dcr"
     xmlns:ann="http://www.clarin.eu">
     <xsl:strip-space elements="*"/>
@@ -14 +14 @@
 
     <xsl:template match="/xs:schema">
-        <xs:schema>
+        <xs:schema xmlns:cmd="http://www.clarin.eu/cmd/">
+            <xsl:copy-of select="@*"/>
             <xsl:apply-templates select="xs:import"/>
             <!-- Remove double entries for named simpleType and complexType definitions at the begin of the XSD.  -->

metadata/trunk/toolkit/xslt/comp2schema-v2/comp2schema-header.xsl

@@ -60 +60 @@
                                                 <xs:complexType>                                                
                                                     <xs:simpleContent>
-                                                        <xs:extension base="Resourcetype_simple">
+                                                        <xs:extension base="cmd:Resourcetype_simple">
                                                             <xs:attribute name="mimetype" type="xs:string"/>
                                                         </xs:extension>

metadata/trunk/toolkit/xslt/comp2schema-v2/comp2schema.xsl

@@ -9 +9 @@
     xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:dcr="http://www.isocat.org/ns/dcr"
     xmlns:ann="http://www.clarin.eu">
+    
+    <xsl:variable name="CMDVersion" select="'1.1'"/>
 
     <xsl:strip-space elements="*"/>
@@ -55 +57 @@
     <xsl:template match="/CMD_ComponentSpec">
 
-        <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:dcr="http://www.isocat.org/ns/dcr">
+        <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:dcr="http://www.isocat.org/ns/dcr" xmlns:cmd="http://www.clarin.eu/cmd/" targetNamespace="http://www.clarin.eu/cmd/" elementFormDefault="qualified">
 
             <!-- import this for the use of the xml:lang attribute -->
@@ -71 +73 @@
             <xs:element name="CMD">
                 <xs:complexType>
-
+                    
                     <xs:sequence>
 
@@ -90 +92 @@
                         <!-- Generate the footer -->
                     </xs:sequence>
+                    
+                    <!-- CMD version -->
+                    <xs:attribute name="CMDVersion" fixed="{$CMDVersion}" use="required"/>
+                    
                 </xs:complexType>
             </xs:element>
@@ -130 +136 @@
         <xs:complexType name="complextype{$uniquePath}">
             <xs:simpleContent>
-                <xs:extension base="simpletype{$uniquePath}">
+                <xs:extension base="cmd:simpletype{$uniquePath}">
                     <!-- now look at the attribute list of the CMD_Element parent of this ValueScheme-->
                     <xsl:apply-templates select="parent::node()/AttributeList/Attribute"/>
@@ -287 +293 @@
 
         <xsl:attribute name="type">
-            <xsl:text>complextype</xsl:text>
+            <xsl:text>cmd:complextype</xsl:text>
             <xsl:value-of select="$uniquePath"/>
         </xsl:attribute>