Changeset 3801 for CMDI-Interoperability

Timestamp:

10/18/13 11:39:14 (11 years ago)

Author:

mwindhouwer

Message:

M xsl/CMDRecord2RDF.xsl
M xsl/Component2RDF.xsl

• added intermediate Attribute node

Location:

CMDI-Interoperability/CMD2RDF/trunk/xsl

Files:

• CMDRecord2RDF.xsl (modified) (1 diff)
• Component2RDF.xsl (modified) (2 diffs)

CMDI-Interoperability/CMD2RDF/trunk/xsl/CMDRecord2RDF.xsl

@@ -170 +170 @@
         <!-- find the matching instances -->
         <xsl:for-each select="$instance/@*[local-name()=$name]">
-            <xsl:element name="{$has}Value" namespace="{$ns}">
-                <!-- map the CMD XSD datatype to a datatype supported by RDF -->
-                <xsl:attribute name="rdf:datatype" select="concat('&xsd;',cmd:datatype($profile/Type))"/>
-                <!-- copy the literal -->
-                <xsl:value-of select="."/>
-            </xsl:element>
-            <xsl:if test="exists($profile/ValueScheme/enumeration)">
-                <xsl:element name="{$has}Entity" namespace="{$ns}">
-                    <xsl:attribute name="rdf:resource" select="concat($ns,$id,'ValueScheme',$STEP,replace(.,'\s',''))"/>
+            <cmdm:contains>
+                <xsl:element name="{$id}" namespace="{$ns}">
+                    <xsl:attribute name="rdf:about" select="concat('#',generate-id(.))"/>
+                    <xsl:element name="{$has}Value" namespace="{$ns}">
+                        <!-- map the CMD XSD datatype to a datatype supported by RDF -->
+                        <xsl:attribute name="rdf:datatype" select="concat('&xsd;',cmd:datatype($profile/Type))"/>
+                        <!-- copy the literal -->
+                        <xsl:value-of select="."/>
+                    </xsl:element>
+                    <xsl:if test="exists($profile/ValueScheme/enumeration)">
+                        <xsl:element name="{$has}Entity" namespace="{$ns}">
+                            <xsl:attribute name="rdf:resource" select="concat($ns,$id,'ValueScheme',$STEP,replace(.,'\s',''))"/>
+                        </xsl:element>
+                    </xsl:if>
                 </xsl:element>
-            </xsl:if>
+            </cmdm:contains>
         </xsl:for-each>
     </xsl:template>

CMDI-Interoperability/CMD2RDF/trunk/xsl/Component2RDF.xsl

@@ -146 +146 @@
         <xsl:variable name="id" select="concat(cmd:path($context,Name),'Attribute')"/>
         <xsl:variable name="has" select="concat(cmd:path($context,concat('has',Name)),'Attribute')"/>
+        <!-- element becomes a class to be able to group attributes and value together -->
+        <rdfs:Class rdf:about="{$id}">
+            <rdfs:subClassOf rdf:resource="&cmdm;Attribute"/>
+            <xsl:call-template name="generic"/>
+        </rdfs:Class>
         <!-- an attribute becomes a property -->
         <rdf:Property rdf:about="{$has}Value">
             <rdfs:subPropertyOf rdf:resource="&cmdm;hasAttributeValue"/>
-            <xsl:call-template name="generic"/>
             <!-- the domain is the CMD element RDF class --> 
-            <rdfs:domain rdf:resource="{$context}"/>
+            <rdfs:domain rdf:resource="{$id}"/>
             <xsl:choose>
                 <!-- if the value scheme is an enumeration the range is the labels -->
@@ -172 +176 @@
                 <rdfs:subPropertyOf rdf:resource="&cmdm;hasAttributeEntity"/>
                 <!-- the domain is the CMD element RDF class --> 
-                <rdfs:domain rdf:resource="{$context}"/>
+                <rdfs:domain rdf:resource="{id}"/>
                 <!-- the range consists of a superclass for the specific value classes -->
                 <rdfs:range rdf:resource="{$id}Value"/>