From 5d1051f9f343c83db5e9ba1aecc734667c4a343d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Euzenat?= <Jerome.Euzenat@inria.fr> Date: Wed, 9 May 2012 20:43:11 +0000 Subject: [PATCH] - harmonised documentation and implementation on comparator --- examples/omwg/total-owlable.xml | 14 ++++++++------ examples/omwg/total.xml | 22 ++++++++++++---------- examples/omwg/wine.xml | 3 ++- 3 files changed, 22 insertions(+), 17 deletions(-) diff --git a/examples/omwg/total-owlable.xml b/examples/omwg/total-owlable.xml index fff73869..0037fee0 100644 --- a/examples/omwg/total-owlable.xml +++ b/examples/omwg/total-owlable.xml @@ -4,6 +4,8 @@ <!ENTITY wine "http://www.w3.org/TR/2003/CR-owl-guide-20030818/wine#"> <!ENTITY vin "http://ontology.deri.org/vin#"> <!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#" @@ -143,7 +145,7 @@ <edoal:onAttribute> <edoal:Relation rdf:about="&wine;hasTerroir"/> </edoal:onAttribute> - <edoal:comparator rdf:resource="&xsd;lower-than"/> + <edoal:comparator rdf:resource="&edoal;lower-than"/> <edoal:value>12</edoal:value> </edoal:AttributeOccurenceRestriction> <edoal:Class rdf:about="&wine;Bordeaux7"/> @@ -158,14 +160,14 @@ <edoal:onAttribute> <edoal:Relation rdf:about="&vin;hasTerroir"/> </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:AttributeValueRestriction> <edoal:AttributeOccurenceRestriction> <edoal:onAttribute> <edoal:Relation rdf:about="&proton;locatedIn"/> </edoal:onAttribute> - <edoal:comparator rdf:resource="&xsd;greater-than"/> + <edoal:comparator rdf:resource="&edoal;greater-than"/> <edoal:value>4</edoal:value> </edoal:AttributeOccurenceRestriction> </edoal:and> @@ -219,7 +221,7 @@ <edoal:onAttribute> <edoal:Relation rdf:about="&wine;hasTerroir"/> </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:AttributeValueRestriction> <edoal:Class rdf:about="&wine;Bordeaux7"/> @@ -234,7 +236,7 @@ <edoal:onAttribute> <edoal:Relation rdf:about="&wine;hasTerroir"/> </edoal:onAttribute> - <edoal:comparator rdf:resource="&xsd;equals"/> + <edoal:comparator rdf:resource="&edoal;equals"/> <edoal:value><edoal:Literal edoal:string="33"/></edoal:value> </edoal:AttributeValueRestriction> </edoal:and> @@ -415,7 +417,7 @@ <edoal:Property><edoal:compose rdf:parseType="Collection"/></edoal:Property> </edoal:entity1> <edoal:entity2> - <edoal:Apply edoal:operator="concat"> + <edoal:Apply edoal:operator="&fn;concat"> <edoal:arguments rdf:parseType="Collection"> <edoal:Property rdf:about="vcard:firstname"/> <edoal:Literal edoal:string=" "/> diff --git a/examples/omwg/total.xml b/examples/omwg/total.xml index 77f1f270..46029d50 100644 --- a/examples/omwg/total.xml +++ b/examples/omwg/total.xml @@ -4,6 +4,8 @@ <!ENTITY wine "http://www.w3.org/TR/2003/CR-owl-guide-20030818/wine#"> <!ENTITY vin "http://ontology.deri.org/vin#"> <!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...) @@ -158,7 +160,7 @@ </edoal:or> </edoal:Relation> </edoal:onAttribute> - <edoal:comparator rdf:resource="&xsd;lower-than"/> + <edoal:comparator rdf:resource="&edoal;lower-than"/> <edoal:value>12</edoal:value> </edoal:AttributeOccurenceRestriction> <edoal:Class rdf:about="&wine;Bordeaux7"/> @@ -178,7 +180,7 @@ </edoal:compose> </edoal:Relation> </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:AttributeValueRestriction> <edoal:AttributeOccurenceRestriction> @@ -190,7 +192,7 @@ </edoal:and> </edoal:Relation> </edoal:onAttribute> - <edoal:comparator rdf:resource="&xsd;greater-than"/> + <edoal:comparator rdf:resource="&edoal;greater-than"/> <edoal:value>4</edoal:value> </edoal:AttributeOccurenceRestriction> </edoal:and> @@ -259,7 +261,7 @@ </edoal:compose> </edoal:Relation> </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:AttributeValueRestriction> <edoal:AttributeValueRestriction> @@ -271,7 +273,7 @@ </edoal:compose> </edoal:Property> </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:AttributeValueRestriction> <edoal:AttributeValueRestriction> @@ -283,7 +285,7 @@ </edoal:or> </edoal:Relation> </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:AttributeValueRestriction> <edoal:Class rdf:about="&wine;Bordeaux7"/> @@ -303,7 +305,7 @@ </edoal:compose> </edoal:Property> </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:AttributeValueRestriction> <edoal:AttributeValueRestriction> @@ -315,7 +317,7 @@ </edoal:and> </edoal:Relation> </edoal:onAttribute> - <edoal:comparator rdf:resource="&xsd;equals"/> + <edoal:comparator rdf:resource="&edoal;equals"/> <edoal:value> <edoal:Apply edoal:operator="http://example.org/mydummyoperation/"> <edoal:arguments rdf:parseType="Collection"> @@ -665,7 +667,7 @@ </edoal:compose> </edoal:Relation> </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:AttributeValueRestriction> </edoal:and> @@ -713,7 +715,7 @@ <edoal:Property><edoal:compose rdf:parseType="Collection"/></edoal:Property> </edoal:entity1> <edoal:entity2> - <edoal:Apply edoal:operator="concat"> + <edoal:Apply edoal:operator="&fn;concat"> <edoal:arguments rdf:parseType="Collection"> <edoal:Property rdf:about="vcard:firstname"/> <edoal:Literal edoal:type="&xsd;string" edoal:string=" "/> diff --git a/examples/omwg/wine.xml b/examples/omwg/wine.xml index e66370d2..d5213261 100644 --- a/examples/omwg/wine.xml +++ b/examples/omwg/wine.xml @@ -4,6 +4,7 @@ <!ENTITY wine "http://www.w3.org/TR/2003/CR-owl-guide-20030818/wine#"> <!ENTITY vin "http://ontology.deri.org/vin#"> <!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...) @@ -87,7 +88,7 @@ </edoal:compose> </edoal:Relation> </edoal:onAttribute> - <edoal:comparator rdf:resource="&xsd;equals"/> + <edoal:comparator rdf:resource="&edoal;equals"/> <!--edoal:value>loc:Aquitaine</edoal:value--> <edoal:value><edoal:Instance rdf:about="&vin;Aquitaine"/></edoal:value> </edoal:AttributeValueRestriction> -- GitLab