Changeset 3809 for CMDI-Interoperability

Timestamp:

10/18/13 15:52:58 (11 years ago)

Author:

mwindhouwer

Message:

M data/general.ttl

• added cmdm:containsAttribute
• resurrected rdfs:Literal

M xsl/CMDRecord2RDF.xsl

• use cmdm:containsAttribute

Location:

CMDI-Interoperability/CMD2RDF/trunk

Files:

• data/general.ttl (modified) (3 diffs)
• xsl/CMDRecord2RDF.xsl (modified) (2 diffs)

CMDI-Interoperability/CMD2RDF/trunk/data/general.ttl

@@ -23 +23 @@
 
 :contains rdf:type rdf:Property;
+           rdfs:domain :Component;
+           rdfs:range :Component, :Element.
+
+:containsAttribute rdf:type rdf:Property;
            rdfs:domain :Component, :Element;
-           rdfs:range :Component, :Element, :Attribute.
-#CHECK: this would allow:
-# _:element :contains _:component. !
+           rdfs:range :Attribute.
 
 :Entity a rdfs:Class.
@@ -32 +34 @@
 ###  http://www.clarin.eu/cmd/general.rdf#hasElementValue
 :hasElementValue rdf:type rdf:Property;
-              rdfs:domain :Element.
-#CHECK: can you specify that the range can be any XS literal?
-# COMMENT: the proposal was rdfs:Literal.
+              rdfs:domain :Element;
+              rdfs:domain rdfs:Literal.
 
 # add a parallel separate property for the resolved entities 
@@ -43 +44 @@
 ###  http://www.clarin.eu/cmd/general.rdf#hasAttribute
 :hasAttributeValue rdf:type rdf:Property;
-              rdfs:domain :Attribute.
-#CHECK: can you specify that the range can be any XS literal?
-# COMMENT[matej]: rdfs:Literal?
+              rdfs:domain :Attribute;
+              rdfs:range rdfs:Literal.
 
 # And then consequently also for attribute 

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

@@ -170 +170 @@
         <!-- find the matching instances -->
         <xsl:for-each select="$instance/@*[local-name()=$name]">
-            <cmdm:contains>
+            <cmdm:containsAttribute>
                 <xsl:element name="{$id}" namespace="{$ns}">
                     <xsl:attribute name="rdf:about" select="concat('#',generate-id(.))"/>
@@ -185 +185 @@
                     </xsl:if>
                 </xsl:element>
-            </cmdm:contains>
+            </cmdm:containsAttribute>
         </xsl:for-each>
     </xsl:template>