Mentions légales du service

Skip to content
Snippets Groups Projects
Commit 5d1051f9 authored by Jérôme Euzenat's avatar Jérôme Euzenat
Browse files

- harmonised documentation and implementation on comparator

parent 11996f9e
No related branches found
No related tags found
No related merge requests found
...@@ -4,6 +4,8 @@ ...@@ -4,6 +4,8 @@
<!ENTITY wine "http://www.w3.org/TR/2003/CR-owl-guide-20030818/wine#"> <!ENTITY wine "http://www.w3.org/TR/2003/CR-owl-guide-20030818/wine#">
<!ENTITY vin "http://ontology.deri.org/vin#"> <!ENTITY vin "http://ontology.deri.org/vin#">
<!ENTITY proton "http://proton.semanticweb.org/"> <!ENTITY proton "http://proton.semanticweb.org/">
<!ENTITY edoal "http://ns.inria.org/edoal/1.0/#">
<!ENTITY fn "http://www.w3.org/2005/xpath-functions">
]> ]>
<rdf:RDF xmlns="http://knowledgeweb.semanticweb.org/heterogeneity/alignment#" <rdf:RDF xmlns="http://knowledgeweb.semanticweb.org/heterogeneity/alignment#"
...@@ -143,7 +145,7 @@ ...@@ -143,7 +145,7 @@
<edoal:onAttribute> <edoal:onAttribute>
<edoal:Relation rdf:about="&wine;hasTerroir"/> <edoal:Relation rdf:about="&wine;hasTerroir"/>
</edoal:onAttribute> </edoal:onAttribute>
<edoal:comparator rdf:resource="&xsd;lower-than"/> <edoal:comparator rdf:resource="&edoal;lower-than"/>
<edoal:value>12</edoal:value> <edoal:value>12</edoal:value>
</edoal:AttributeOccurenceRestriction> </edoal:AttributeOccurenceRestriction>
<edoal:Class rdf:about="&wine;Bordeaux7"/> <edoal:Class rdf:about="&wine;Bordeaux7"/>
...@@ -158,14 +160,14 @@ ...@@ -158,14 +160,14 @@
<edoal:onAttribute> <edoal:onAttribute>
<edoal:Relation rdf:about="&vin;hasTerroir"/> <edoal:Relation rdf:about="&vin;hasTerroir"/>
</edoal:onAttribute> </edoal:onAttribute>
<edoal:comparator rdf:resource="&xsd;equals"/> <edoal:comparator rdf:resource="&edoal;equals"/>
<edoal:value><edoal:Instance rdf:about="&vin;Aquitaine"/></edoal:value> <edoal:value><edoal:Instance rdf:about="&vin;Aquitaine"/></edoal:value>
</edoal:AttributeValueRestriction> </edoal:AttributeValueRestriction>
<edoal:AttributeOccurenceRestriction> <edoal:AttributeOccurenceRestriction>
<edoal:onAttribute> <edoal:onAttribute>
<edoal:Relation rdf:about="&proton;locatedIn"/> <edoal:Relation rdf:about="&proton;locatedIn"/>
</edoal:onAttribute> </edoal:onAttribute>
<edoal:comparator rdf:resource="&xsd;greater-than"/> <edoal:comparator rdf:resource="&edoal;greater-than"/>
<edoal:value>4</edoal:value> <edoal:value>4</edoal:value>
</edoal:AttributeOccurenceRestriction> </edoal:AttributeOccurenceRestriction>
</edoal:and> </edoal:and>
...@@ -219,7 +221,7 @@ ...@@ -219,7 +221,7 @@
<edoal:onAttribute> <edoal:onAttribute>
<edoal:Relation rdf:about="&wine;hasTerroir"/> <edoal:Relation rdf:about="&wine;hasTerroir"/>
</edoal:onAttribute> </edoal:onAttribute>
<edoal:comparator rdf:resource="&xsd;equals"/> <edoal:comparator rdf:resource="&edoal;equals"/>
<edoal:value><edoal:Instance rdf:about="&wine;Bordelais"/></edoal:value> <edoal:value><edoal:Instance rdf:about="&wine;Bordelais"/></edoal:value>
</edoal:AttributeValueRestriction> </edoal:AttributeValueRestriction>
<edoal:Class rdf:about="&wine;Bordeaux7"/> <edoal:Class rdf:about="&wine;Bordeaux7"/>
...@@ -234,7 +236,7 @@ ...@@ -234,7 +236,7 @@
<edoal:onAttribute> <edoal:onAttribute>
<edoal:Relation rdf:about="&wine;hasTerroir"/> <edoal:Relation rdf:about="&wine;hasTerroir"/>
</edoal:onAttribute> </edoal:onAttribute>
<edoal:comparator rdf:resource="&xsd;equals"/> <edoal:comparator rdf:resource="&edoal;equals"/>
<edoal:value><edoal:Literal edoal:string="33"/></edoal:value> <edoal:value><edoal:Literal edoal:string="33"/></edoal:value>
</edoal:AttributeValueRestriction> </edoal:AttributeValueRestriction>
</edoal:and> </edoal:and>
...@@ -415,7 +417,7 @@ ...@@ -415,7 +417,7 @@
<edoal:Property><edoal:compose rdf:parseType="Collection"/></edoal:Property> <edoal:Property><edoal:compose rdf:parseType="Collection"/></edoal:Property>
</edoal:entity1> </edoal:entity1>
<edoal:entity2> <edoal:entity2>
<edoal:Apply edoal:operator="concat"> <edoal:Apply edoal:operator="&fn;concat">
<edoal:arguments rdf:parseType="Collection"> <edoal:arguments rdf:parseType="Collection">
<edoal:Property rdf:about="vcard:firstname"/> <edoal:Property rdf:about="vcard:firstname"/>
<edoal:Literal edoal:string=" "/> <edoal:Literal edoal:string=" "/>
......
...@@ -4,6 +4,8 @@ ...@@ -4,6 +4,8 @@
<!ENTITY wine "http://www.w3.org/TR/2003/CR-owl-guide-20030818/wine#"> <!ENTITY wine "http://www.w3.org/TR/2003/CR-owl-guide-20030818/wine#">
<!ENTITY vin "http://ontology.deri.org/vin#"> <!ENTITY vin "http://ontology.deri.org/vin#">
<!ENTITY proton "http://proton.semanticweb.org/"> <!ENTITY proton "http://proton.semanticweb.org/">
<!ENTITY edoal "http://ns.inria.org/edoal/1.0/#">
<!ENTITY fn "http://www.w3.org/2005/xpath-functions">
]> ]>
<!-- JE2010: With the "#" in the end, this is parsed (by the RDF parser...) <!-- JE2010: With the "#" in the end, this is parsed (by the RDF parser...)
...@@ -158,7 +160,7 @@ ...@@ -158,7 +160,7 @@
</edoal:or> </edoal:or>
</edoal:Relation> </edoal:Relation>
</edoal:onAttribute> </edoal:onAttribute>
<edoal:comparator rdf:resource="&xsd;lower-than"/> <edoal:comparator rdf:resource="&edoal;lower-than"/>
<edoal:value>12</edoal:value> <edoal:value>12</edoal:value>
</edoal:AttributeOccurenceRestriction> </edoal:AttributeOccurenceRestriction>
<edoal:Class rdf:about="&wine;Bordeaux7"/> <edoal:Class rdf:about="&wine;Bordeaux7"/>
...@@ -178,7 +180,7 @@ ...@@ -178,7 +180,7 @@
</edoal:compose> </edoal:compose>
</edoal:Relation> </edoal:Relation>
</edoal:onAttribute> </edoal:onAttribute>
<edoal:comparator rdf:resource="&xsd;equals"/> <edoal:comparator rdf:resource="&edoal;equals"/>
<edoal:value><edoal:Instance rdf:about="&vin;Aquitaine"/></edoal:value> <edoal:value><edoal:Instance rdf:about="&vin;Aquitaine"/></edoal:value>
</edoal:AttributeValueRestriction> </edoal:AttributeValueRestriction>
<edoal:AttributeOccurenceRestriction> <edoal:AttributeOccurenceRestriction>
...@@ -190,7 +192,7 @@ ...@@ -190,7 +192,7 @@
</edoal:and> </edoal:and>
</edoal:Relation> </edoal:Relation>
</edoal:onAttribute> </edoal:onAttribute>
<edoal:comparator rdf:resource="&xsd;greater-than"/> <edoal:comparator rdf:resource="&edoal;greater-than"/>
<edoal:value>4</edoal:value> <edoal:value>4</edoal:value>
</edoal:AttributeOccurenceRestriction> </edoal:AttributeOccurenceRestriction>
</edoal:and> </edoal:and>
...@@ -259,7 +261,7 @@ ...@@ -259,7 +261,7 @@
</edoal:compose> </edoal:compose>
</edoal:Relation> </edoal:Relation>
</edoal:onAttribute> </edoal:onAttribute>
<edoal:comparator rdf:resource="&xsd;equals"/> <edoal:comparator rdf:resource="&edoal;equals"/>
<edoal:value><edoal:Instance rdf:about="&wine;Bordelais"/></edoal:value> <edoal:value><edoal:Instance rdf:about="&wine;Bordelais"/></edoal:value>
</edoal:AttributeValueRestriction> </edoal:AttributeValueRestriction>
<edoal:AttributeValueRestriction> <edoal:AttributeValueRestriction>
...@@ -271,7 +273,7 @@ ...@@ -271,7 +273,7 @@
</edoal:compose> </edoal:compose>
</edoal:Property> </edoal:Property>
</edoal:onAttribute> </edoal:onAttribute>
<edoal:comparator rdf:resource="&xsd;equals"/> <edoal:comparator rdf:resource="&edoal;equals"/>
<edoal:value><edoal:Literal edoal:type="&xsd;int" edoal:string="33"/></edoal:value> <edoal:value><edoal:Literal edoal:type="&xsd;int" edoal:string="33"/></edoal:value>
</edoal:AttributeValueRestriction> </edoal:AttributeValueRestriction>
<edoal:AttributeValueRestriction> <edoal:AttributeValueRestriction>
...@@ -283,7 +285,7 @@ ...@@ -283,7 +285,7 @@
</edoal:or> </edoal:or>
</edoal:Relation> </edoal:Relation>
</edoal:onAttribute> </edoal:onAttribute>
<edoal:comparator rdf:resource="&xsd;equals"/> <edoal:comparator rdf:resource="&edoal;equals"/>
<edoal:value><edoal:Relation rdf:about="&wine;location"/></edoal:value> <edoal:value><edoal:Relation rdf:about="&wine;location"/></edoal:value>
</edoal:AttributeValueRestriction> </edoal:AttributeValueRestriction>
<edoal:Class rdf:about="&wine;Bordeaux7"/> <edoal:Class rdf:about="&wine;Bordeaux7"/>
...@@ -303,7 +305,7 @@ ...@@ -303,7 +305,7 @@
</edoal:compose> </edoal:compose>
</edoal:Property> </edoal:Property>
</edoal:onAttribute> </edoal:onAttribute>
<edoal:comparator rdf:resource="&xsd;equals"/> <edoal:comparator rdf:resource="&edoal;equals"/>
<edoal:value><edoal:Property rdf:about="&vin;matrid"/></edoal:value> <edoal:value><edoal:Property rdf:about="&vin;matrid"/></edoal:value>
</edoal:AttributeValueRestriction> </edoal:AttributeValueRestriction>
<edoal:AttributeValueRestriction> <edoal:AttributeValueRestriction>
...@@ -315,7 +317,7 @@ ...@@ -315,7 +317,7 @@
</edoal:and> </edoal:and>
</edoal:Relation> </edoal:Relation>
</edoal:onAttribute> </edoal:onAttribute>
<edoal:comparator rdf:resource="&xsd;equals"/> <edoal:comparator rdf:resource="&edoal;equals"/>
<edoal:value> <edoal:value>
<edoal:Apply edoal:operator="http://example.org/mydummyoperation/"> <edoal:Apply edoal:operator="http://example.org/mydummyoperation/">
<edoal:arguments rdf:parseType="Collection"> <edoal:arguments rdf:parseType="Collection">
...@@ -665,7 +667,7 @@ ...@@ -665,7 +667,7 @@
</edoal:compose> </edoal:compose>
</edoal:Relation> </edoal:Relation>
</edoal:onAttribute> </edoal:onAttribute>
<edoal:comparator rdf:resource="&xsd;equals"/> <edoal:comparator rdf:resource="&edoal;equals"/>
<edoal:value><edoal:Instance rdf:about="&vin;Aquitaine"/></edoal:value> <edoal:value><edoal:Instance rdf:about="&vin;Aquitaine"/></edoal:value>
</edoal:AttributeValueRestriction> </edoal:AttributeValueRestriction>
</edoal:and> </edoal:and>
...@@ -713,7 +715,7 @@ ...@@ -713,7 +715,7 @@
<edoal:Property><edoal:compose rdf:parseType="Collection"/></edoal:Property> <edoal:Property><edoal:compose rdf:parseType="Collection"/></edoal:Property>
</edoal:entity1> </edoal:entity1>
<edoal:entity2> <edoal:entity2>
<edoal:Apply edoal:operator="concat"> <edoal:Apply edoal:operator="&fn;concat">
<edoal:arguments rdf:parseType="Collection"> <edoal:arguments rdf:parseType="Collection">
<edoal:Property rdf:about="vcard:firstname"/> <edoal:Property rdf:about="vcard:firstname"/>
<edoal:Literal edoal:type="&xsd;string" edoal:string=" "/> <edoal:Literal edoal:type="&xsd;string" edoal:string=" "/>
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
<!ENTITY wine "http://www.w3.org/TR/2003/CR-owl-guide-20030818/wine#"> <!ENTITY wine "http://www.w3.org/TR/2003/CR-owl-guide-20030818/wine#">
<!ENTITY vin "http://ontology.deri.org/vin#"> <!ENTITY vin "http://ontology.deri.org/vin#">
<!ENTITY proton "http://proton.semanticweb.org/"> <!ENTITY proton "http://proton.semanticweb.org/">
<!ENTITY edoal "http://ns.inria.org/edoal/1.0/#">
]> ]>
<!-- JE2010: With the "#" in the end, this is parsed (by the RDF parser...) <!-- JE2010: With the "#" in the end, this is parsed (by the RDF parser...)
...@@ -87,7 +88,7 @@ ...@@ -87,7 +88,7 @@
</edoal:compose> </edoal:compose>
</edoal:Relation> </edoal:Relation>
</edoal:onAttribute> </edoal:onAttribute>
<edoal:comparator rdf:resource="&xsd;equals"/> <edoal:comparator rdf:resource="&edoal;equals"/>
<!--edoal:value>loc:Aquitaine</edoal:value--> <!--edoal:value>loc:Aquitaine</edoal:value-->
<edoal:value><edoal:Instance rdf:about="&vin;Aquitaine"/></edoal:value> <edoal:value><edoal:Instance rdf:about="&vin;Aquitaine"/></edoal:value>
</edoal:AttributeValueRestriction> </edoal:AttributeValueRestriction>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment