--- a/D000-1table1column0rows/r2rml.ttl Mon Mar 12 01:47:30 2012 +0100
+++ b/D000-1table1column0rows/r2rml.ttl Mon Mar 12 15:49:43 2012 +0100
@@ -13,7 +13,7 @@
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant foaf:name ];
- rr:objectMap [ rr:column "\"Name\"" ]
+ rr:predicate foaf:name ;
+ rr:objectMap [ rr:column "\"Name\"" ]
]
.
\ No newline at end of file
--- a/D001-1table1column1row/r2rmla.ttl Mon Mar 12 01:47:30 2012 +0100
+++ b/D001-1table1column1row/r2rmla.ttl Mon Mar 12 15:49:43 2012 +0100
@@ -13,7 +13,7 @@
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant foaf:name ];
+ rr:predicate foaf:name ;
rr:objectMap [ rr:column "\"Name\"" ]
]
.
--- a/D001-1table1column1row/r2rmlb.ttl Mon Mar 12 01:47:30 2012 +0100
+++ b/D001-1table1column1row/r2rmlb.ttl Mon Mar 12 15:49:43 2012 +0100
@@ -13,7 +13,7 @@
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant foaf:name ];
+ rr:predicate foaf:name;
rr:objectMap [ rr:column "\"Name\"" ]
]
.
--- a/D002-1table2columns1row/manifest.ttl Mon Mar 12 01:47:30 2012 +0100
+++ b/D002-1table2columns1row/manifest.ttl Mon Mar 12 15:49:43 2012 +0100
@@ -53,6 +53,7 @@
test:reviewStatus test:unreviewed ;
rdb2rdftest:database <d002> ;
rdb2rdftest:hasExpectedOutput false ;
+ rdb2rdftest:failMessage "non-conforming R2RML mapping";
rdb2rdftest:mappingDocument "r2rmlc.ttl" ;
.
@@ -76,6 +77,7 @@
test:reviewStatus test:unreviewed ;
rdb2rdftest:database <d002> ;
rdb2rdftest:hasExpectedOutput false ;
+ rdb2rdftest:failMessage "non-conforming R2RML mapping";
rdb2rdftest:mappingDocument "r2rmle.ttl" ;
.
@@ -99,6 +101,7 @@
test:reviewStatus test:unreviewed ;
rdb2rdftest:database <d002> ;
rdb2rdftest:hasExpectedOutput false ;
+ rdb2rdftest:failMessage "non-conforming R2RML mapping";
rdb2rdftest:mappingDocument "r2rmlg.ttl" ;
.
--- a/D002-1table2columns1row/r2rmla.ttl Mon Mar 12 01:47:30 2012 +0100
+++ b/D002-1table2columns1row/r2rmla.ttl Mon Mar 12 15:49:43 2012 +0100
@@ -14,13 +14,13 @@
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant ex:id ];
- rr:objectMap [ rr:column "\"ID\""; rr:datatype xsd:integer ]
+ rr:predicate ex:id ;
+ rr:objectMap [ rr:column "\"ID\""; rr:datatype xsd:integer ]
];
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant foaf:name ];
- rr:objectMap [ rr:column "\"Name\"" ]
+ rr:predicate foaf:name ;
+ rr:objectMap [ rr:column "\"Name\"" ]
]
.
--- a/D002-1table2columns1row/r2rmlb.ttl Mon Mar 12 01:47:30 2012 +0100
+++ b/D002-1table2columns1row/r2rmlb.ttl Mon Mar 12 15:49:43 2012 +0100
@@ -13,7 +13,7 @@
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant foaf:name ];
- rr:objectMap [ rr:column "\"Name\"" ]
+ rr:predicate foaf:name ;
+ rr:objectMap [ rr:column "\"Name\"" ]
]
.
--- a/D002-1table2columns1row/r2rmlc.ttl Mon Mar 12 01:47:30 2012 +0100
+++ b/D002-1table2columns1row/r2rmlc.ttl Mon Mar 12 15:49:43 2012 +0100
@@ -13,8 +13,8 @@
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant ex:id ];
- rr:objectMap [ rr:column "\"IDs\""; ]
+ rr:predicate ex:id ;
+ rr:objectMap [ rr:column "\"IDs\""; ]
]
.
--- a/D002-1table2columns1row/r2rmld.ttl Mon Mar 12 01:47:30 2012 +0100
+++ b/D002-1table2columns1row/r2rmld.ttl Mon Mar 12 15:49:43 2012 +0100
@@ -20,7 +20,7 @@
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant foaf:name ];
- rr:objectMap [ rr:column "\"Name\"" ]
+ rr:predicate foaf:name ;
+ rr:objectMap [ rr:column "\"Name\"" ]
]
.
--- a/D002-1table2columns1row/r2rmle.ttl Mon Mar 12 01:47:30 2012 +0100
+++ b/D002-1table2columns1row/r2rmle.ttl Mon Mar 12 15:49:43 2012 +0100
@@ -13,8 +13,8 @@
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant ex:id ];
- rr:objectMap [ rr:column "\"ID\""; ]
+ rr:predicate ex:id ;
+ rr:objectMap [ rr:column "\"ID\""; ]
];
.
--- a/D002-1table2columns1row/r2rmlf.ttl Mon Mar 12 01:47:30 2012 +0100
+++ b/D002-1table2columns1row/r2rmlf.ttl Mon Mar 12 15:49:43 2012 +0100
@@ -14,13 +14,13 @@
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant ex:id ];
- rr:objectMap [ rr:column "\"ID\""; rr:datatype xsd:integer ]
+ rr:predicate ex:id ;
+ rr:objectMap [ rr:column "\"ID\""; rr:datatype xsd:integer ]
];
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant foaf:name ];
- rr:objectMap [ rr:column "\"Name\"" ]
+ rr:predicate foaf:name ;
+ rr:objectMap [ rr:column "\"Name\"" ]
]
.
--- a/D002-1table2columns1row/r2rmlg.ttl Mon Mar 12 01:47:30 2012 +0100
+++ b/D002-1table2columns1row/r2rmlg.ttl Mon Mar 12 15:49:43 2012 +0100
@@ -17,7 +17,7 @@
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant ex:id ];
- rr:objectMap [ rr:column "\"ID\""; ]
+ rr:predicate ex:id ;
+ rr:objectMap [ rr:column "\"ID\""; ]
];
.
--- a/D002-1table2columns1row/r2rmlh.ttl Mon Mar 12 01:47:30 2012 +0100
+++ b/D002-1table2columns1row/r2rmlh.ttl Mon Mar 12 15:49:43 2012 +0100
@@ -21,8 +21,8 @@
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant ex:id ];
- rr:objectMap [ rr:column "\"ID\""; ]
+ rr:predicate ex:id ;
+ rr:objectMap [ rr:column "\"ID\""; ]
];
.
--- a/D002-1table2columns1row/r2rmlj.ttl Mon Mar 12 01:47:30 2012 +0100
+++ b/D002-1table2columns1row/r2rmlj.ttl Mon Mar 12 15:49:43 2012 +0100
@@ -18,7 +18,7 @@
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant foaf:name ];
- rr:objectMap [ rr:column "\"Name\"" ]
+ rr:predicate foaf:name ;
+ rr:objectMap [ rr:column "\"Name\"" ]
]
.
--- a/D003-1table3columns1row/r2rmla.ttl Mon Mar 12 01:47:30 2012 +0100
+++ b/D003-1table3columns1row/r2rmla.ttl Mon Mar 12 15:49:43 2012 +0100
@@ -14,19 +14,19 @@
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant ex:id ];
- rr:objectMap [ rr:column "\"ID\""; rr:datatype xsd:integer ]
+ rr:predicate ex:id ;
+ rr:objectMap [ rr:column "\"ID\""; rr:datatype xsd:integer ]
];
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant foaf:firstName ];
- rr:objectMap [ rr:column "\"FirstName\"" ]
+ rr:predicate foaf:firstName ;
+ rr:objectMap [ rr:column "\"FirstName\"" ]
];
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant foaf:lastName ];
- rr:objectMap [ rr:column "\"LastName\"" ]
+ rr:predicate foaf:lastName ;
+ rr:objectMap [ rr:column "\"LastName\"" ]
]
.
--- a/D003-1table3columns1row/r2rmlb.ttl Mon Mar 12 01:47:30 2012 +0100
+++ b/D003-1table3columns1row/r2rmlb.ttl Mon Mar 12 15:49:43 2012 +0100
@@ -19,7 +19,7 @@
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant foaf:name ];
- rr:objectMap [ rr:column "Name" ]
+ rr:predicate foaf:name ;
+ rr:objectMap [ rr:column "Name" ]
]
.
--- a/D003-1table3columns1row/r2rmlc.ttl Mon Mar 12 01:47:30 2012 +0100
+++ b/D003-1table3columns1row/r2rmlc.ttl Mon Mar 12 15:49:43 2012 +0100
@@ -13,7 +13,7 @@
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant foaf:name ];
- rr:objectMap [ rr:template "{\"FirstName\"} {\"LastName\"}"; rr:termType rr:Literal; ]
+ rr:predicate foaf:name ;
+ rr:objectMap [ rr:template "{\"FirstName\"} {\"LastName\"}"; rr:termType rr:Literal; ]
]
.
--- a/D003-1table3columns1row/r2rmld.ttl Mon Mar 12 01:47:30 2012 +0100
+++ b/D003-1table3columns1row/r2rmld.ttl Mon Mar 12 15:49:43 2012 +0100
@@ -21,21 +21,21 @@
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant ex:id ];
- rr:objectMap [ rr:column "\"ID\""; rr:datatype xsd:integer ]
+ rr:predicate ex:id ;
+ rr:objectMap [ rr:column "\"ID\""; rr:datatype xsd:integer ]
];
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant ex:firstName ];
- rr:objectMap [ rr:template "http://example.com/data/{\"FirstName\"}";
+ rr:predicate ex:firstName ;
+ rr:objectMap [ rr:template "http://example.com/data/{\"FirstName\"}";
rr:termType rr:IRI ]
];
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant ex:lastName ];
- rr:objectMap [ rr:template "http://example.com/data/{\"LastName\"}";
+ rr:predicate ex:lastName ;
+ rr:objectMap [ rr:template "http://example.com/data/{\"LastName\"}";
rr:termType rr:IRI ]
]
.
--- a/D004-1table2columns1row/r2rmla.ttl Mon Mar 12 01:47:30 2012 +0100
+++ b/D004-1table2columns1row/r2rmla.ttl Mon Mar 12 15:49:43 2012 +0100
@@ -14,8 +14,8 @@
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant foaf:name ];
- rr:objectMap [ rr:column "\"Student\"" ]
+ rr:predicate foaf:name ;
+ rr:objectMap [ rr:column "\"Student\"" ]
]
.
@@ -29,7 +29,7 @@
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant foaf:name ];
- rr:objectMap [ rr:column "\"Sport\"" ]
+ rr:predicat foaf:name ;
+ rr:objectMap [ rr:column "\"Sport\"" ]
]
.
\ No newline at end of file
--- a/D004-1table2columns1row/r2rmlb.ttl Mon Mar 12 01:47:30 2012 +0100
+++ b/D004-1table2columns1row/r2rmlb.ttl Mon Mar 12 15:49:43 2012 +0100
@@ -19,8 +19,8 @@
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant foaf:name ];
- rr:objectMap [ rr:column "\"Student\"" ]
+ rr:predicate foaf:name ;
+ rr:objectMap [ rr:column "\"Student\"" ]
]
.
@@ -39,7 +39,7 @@
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant foaf:name ];
- rr:objectMap [ rr:column "\"Sport\"" ]
+ rr:predicate foaf:name ;
+ rr:objectMap [ rr:column "\"Sport\"" ]
]
.
\ No newline at end of file
--- a/D005-1table3columns3rows2duplicates/r2rmla.ttl Mon Mar 12 01:47:30 2012 +0100
+++ b/D005-1table3columns3rows2duplicates/r2rmla.ttl Mon Mar 12 15:49:43 2012 +0100
@@ -14,8 +14,8 @@
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant ex:owes ];
- rr:objectMap [ rr:column "\"amount\""; ]
+ rr:predicate ex:owes ;
+ rr:objectMap [ rr:column "\"amount\""; ]
];
.
--- a/D007-1table1primarykey2columns1row/r2rmla.ttl Mon Mar 12 01:47:30 2012 +0100
+++ b/D007-1table1primarykey2columns1row/r2rmla.ttl Mon Mar 12 15:49:43 2012 +0100
@@ -12,25 +12,25 @@
rr:logicalTable [ rr:tableName "\"Student\"" ];
rr:subjectMap [ rr:template "http://example.com/Student{\"ID\"}{\"Name\"}";
- rr:graphMap [ rr:constant ex:PersonGraph; ]
+ rr:graph ex:PersonGraph;
];
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant rdf:type; ];
- rr:objectMap [ rr:constant foaf:Person; ]
+ rr:predicate rdf:type ;
+ rr:object foaf:Person;
];
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant ex:id; ];
+ rr:predicate ex:id ;
rr:objectMap [ rr:column "\"ID\""; rr:datatype xsd:integer ]
];
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant foaf:firstName; ];
- rr:objectMap [ rr:column "\"Name\"" ]
+ rr:predicate foaf:firstName ;
+ rr:objectMap [ rr:column "\"Name\"" ]
]
.
--- a/D007-1table1primarykey2columns1row/r2rmlb.ttl Mon Mar 12 01:47:30 2012 +0100
+++ b/D007-1table1primarykey2columns1row/r2rmlb.ttl Mon Mar 12 15:49:43 2012 +0100
@@ -17,20 +17,20 @@
rr:predicateObjectMap
[
- rr:predicate rdf:type;
- rr:object foaf:Person;
+ rr:predicate rdf:type;
+ rr:object foaf:Person;
];
rr:predicateObjectMap
[
- rr:predicate ex:id;
+ rr:predicate ex:id;
rr:objectMap [ rr:column "\"ID\""; rr:datatype xsd:integer ]
];
rr:predicateObjectMap
[
- rr:predicate foaf:firstName;
- rr:objectMap [ rr:column "\"Name\"" ]
+ rr:predicate foaf:firstName;
+ rr:objectMap [ rr:column "\"Name\"" ]
]
.
--- a/D007-1table1primarykey2columns1row/r2rmlc.ttl Mon Mar 12 01:47:30 2012 +0100
+++ b/D007-1table1primarykey2columns1row/r2rmlc.ttl Mon Mar 12 15:49:43 2012 +0100
@@ -18,14 +18,14 @@
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant ex:id; ];
- rr:objectMap [ rr:column "\"ID\""; rr:datatype xsd:integer ]
+ rr:predicate ex:id ;
+ rr:objectMap [ rr:column "\"ID\""; rr:datatype xsd:integer ]
];
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant foaf:firstName; ];
- rr:objectMap [ rr:column "\"Name\"" ]
+ rr:predicate foaf:firstName ;
+ rr:objectMap [ rr:column "\"Name\"" ]
]
.
--- a/D007-1table1primarykey2columns1row/r2rmld.ttl Mon Mar 12 01:47:30 2012 +0100
+++ b/D007-1table1primarykey2columns1row/r2rmld.ttl Mon Mar 12 15:49:43 2012 +0100
@@ -17,26 +17,26 @@
rr:predicateObjectMap
[
- rr:predicate rdf:type;
- rr:object foaf:Person;
+ rr:predicate rdf:type;
+ rr:object foaf:Person;
];
rr:predicateObjectMap
[
- rr:predicate rdf:type;
- rr:object ex:Student;
+ rr:predicate rdf:type;
+ rr:object ex:Student;
];
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant ex:id; ];
+ rr:predicate ex:id ;
rr:objectMap [ rr:column "\"ID\""; rr:datatype xsd:integer ]
];
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant foaf:firstName; ];
- rr:objectMap [ rr:column "\"Name\"" ]
+ rr:predicate foaf:firstName ;
+ rr:objectMap [ rr:column "\"Name\"" ]
]
.
--- a/D007-1table1primarykey2columns1row/r2rmle.ttl Mon Mar 12 01:47:30 2012 +0100
+++ b/D007-1table1primarykey2columns1row/r2rmle.ttl Mon Mar 12 15:49:43 2012 +0100
@@ -12,20 +12,20 @@
rr:logicalTable [ rr:tableName "\"Student\"" ];
rr:subjectMap [ rr:template "http://example.com/Student{\"ID\"}{\"Name\"}";
- rr:graphMap [ rr:constant ex:PersonGraph];
+ rr:graph ex:PersonGraph ;
rr:class foaf:Person
];
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant ex:id; ];
- rr:objectMap [ rr:column "\"ID\""; rr:datatype xsd:integer ]
+ rr:predicate ex:id ;
+ rr:objectMap [ rr:column "\"ID\""; rr:datatype xsd:integer ]
];
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant foaf:firstName; ];
- rr:objectMap [ rr:column "\"Name\"" ]
+ rr:predicate foaf:firstName ;
+ rr:objectMap [ rr:column "\"Name\"" ]
]
.
\ No newline at end of file
--- a/D007-1table1primarykey2columns1row/r2rmlf.ttl Mon Mar 12 01:47:30 2012 +0100
+++ b/D007-1table1primarykey2columns1row/r2rmlf.ttl Mon Mar 12 15:49:43 2012 +0100
@@ -12,25 +12,24 @@
rr:logicalTable [ rr:tableName "\"Student\"" ];
rr:subjectMap [ rr:template "http://example.com/Student{\"ID\"}{\"Name\"}";
- rr:graphMap [ rr:constant ex:PersonGraph];
+ rr:graph ex:PersonGraph ;
];
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant rdf:type; ];
- rr:objectMap [ rr:constant foaf:Person; ];
+ rr:predicate rdf:type ;
+ rr:object foaf:Person ;
];
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant ex:id; ];
+ rr:predicate ex:id ;
rr:objectMap [ rr:column "\"ID\""; rr:datatype xsd:integer ]
];
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant foaf:firstName; ];
- rr:objectMap [ rr:column "\"Name\"" ]
+ rr:predicate foaf:firstName ;
+ rr:objectMap [ rr:column "\"Name\"" ]
]
-
.
\ No newline at end of file
--- a/D008-1table1compositeprimarykey3columns1row/r2rmla.ttl Mon Mar 12 01:47:30 2012 +0100
+++ b/D008-1table1compositeprimarykey3columns1row/r2rmla.ttl Mon Mar 12 15:49:43 2012 +0100
@@ -17,25 +17,25 @@
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant rdf:type; ];
- rr:objectMap [ rr:constant foaf:Person; ]
+ rr:predicate rdf:type ;
+ rr:object foaf:Person;
];
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant ex:id; ];
+ rr:predicate ex:id ;
rr:objectMap [ rr:column "\"ID\""; rr:datatype xsd:integer ]
];
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant foaf:name; ];
- rr:objectMap [ rr:column "\"Name\"" ]
+ rr:predicate foaf:name ;
+ rr:objectMap [ rr:column "\"Name\"" ]
];
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant ex:Sport; ];
+ rr:predicate ex:Sport ;
rr:objectMap [ rr:column "\"Sport\"" ]
]
--- a/D008-1table1compositeprimarykey3columns1row/r2rmlb.ttl Mon Mar 12 01:47:30 2012 +0100
+++ b/D008-1table1compositeprimarykey3columns1row/r2rmlb.ttl Mon Mar 12 15:49:43 2012 +0100
@@ -14,8 +14,8 @@
rr:subjectMap [ rr:template "http://example.com/{\"Sport\"}"; ];
rr:predicateObjectMap [
- rr:predicateMap [rr:constant rdf:type ];
- rr:objectMap [rr:constant activity:Sport ]
+ rr:predicate rdf:type ;
+ rr:object activity:Sport ;
];
.
@@ -29,26 +29,26 @@
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant rdf:type; ];
- rr:objectMap [ rr:constant foaf:Person; ]
+ rr:predicate rdf:type ;
+ rr:object foaf:Person ;
];
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant ex:id; ];
+ rr:predicate ex:id ;
rr:objectMap [ rr:column "\"ID\""; rr:datatype xsd:integer ]
];
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant foaf:name; ];
- rr:objectMap [ rr:column "\"Name\"" ]
+ rr:predicate foaf:name ;
+ rr:objectMap [ rr:column "\"Name\"" ]
];
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant ex:Sport; ];
- rr:objectMap <RefObjectMap1>
+ rr:predicate ex:Sport ;
+ rr:objectMap <RefObjectMap1>
]
.
--- a/D008-1table1compositeprimarykey3columns1row/r2rmlc.ttl Mon Mar 12 01:47:30 2012 +0100
+++ b/D008-1table1compositeprimarykey3columns1row/r2rmlc.ttl Mon Mar 12 15:49:43 2012 +0100
@@ -16,26 +16,26 @@
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant rdf:type; ];
- rr:objectMap [ rr:constant foaf:Person; ]
+ rr:predicate rdf:type ;
+ rr:object foaf:Person ;
];
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant ex:id; ];
+ rr:predicate ex:id ;
rr:objectMap [ rr:column "\"ID\""; rr:datatype xsd:integer ]
];
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant foaf:name; ];
- rr:predicateMap [ rr:constant ex:name; ];
+ rr:predicate foaf:name ;
+ rr:predicate ex:name ;
rr:objectMap [ rr:column "\"Name\"" ]
];
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant ex:Sport; ];
+ rr:predicate ex:Sport ;
rr:objectMap [ rr:column "\"Sport\"" ]
]
--- a/D009-2tables1primarykey1foreignkey/manifest.ttl Mon Mar 12 01:47:30 2012 +0100
+++ b/D009-2tables1primarykey1foreignkey/manifest.ttl Mon Mar 12 15:49:43 2012 +0100
@@ -53,6 +53,7 @@
test:reviewStatus test:unreviewed ;
rdb2rdftest:database <d009> ;
rdb2rdftest:hasExpectedOutput false ;
+ rdb2rdftest:failMessage "non-conforming R2RML mapping";
rdb2rdftest:mappingDocument "r2rmlc.ttl" ;
.
--- a/D009-2tables1primarykey1foreignkey/r2rmla.ttl Mon Mar 12 01:47:30 2012 +0100
+++ b/D009-2tables1primarykey1foreignkey/r2rmla.ttl Mon Mar 12 15:49:43 2012 +0100
@@ -19,7 +19,7 @@
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant foaf:name ];
+ rr:predicate foaf:name ;
rr:objectMap [
rr:column "\"Name\"";
rr:termType rr:Literal;
@@ -28,7 +28,7 @@
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant <http://example.com/ontology/practises> ];
+ rr:predicate <http://example.com/ontology/practises> ;
rr:objectMap [
rr:parentTriplesMap <TriplesMap2>;
rr:joinCondition [
@@ -53,7 +53,7 @@
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant rdfs:label ];
+ rr:predicate rdfs:label ;
rr:objectMap [
rr:column "\"Name\"";
rr:termType rr:Literal;
--- a/D009-2tables1primarykey1foreignkey/r2rmlb.ttl Mon Mar 12 01:47:30 2012 +0100
+++ b/D009-2tables1primarykey1foreignkey/r2rmlb.ttl Mon Mar 12 15:49:43 2012 +0100
@@ -15,22 +15,22 @@
rr:template "http://example.com/resource/student_{\"ID\"}";
rr:termType rr:IRI;
rr:class <http://example.com/ontology/Student>;
- rr:graphMap [ rr:constant <http://example.com/graph/students> ] ;
+ rr:graph <http://example.com/graph/students> ;
];
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant foaf:name ];
+ rr:predicate foaf:name ;
rr:objectMap [
rr:column "\"Name\"";
rr:termType rr:Literal;
];
- rr:graphMap [ rr:constant <http://example.com/graph/students> ];
+ rr:graph <http://example.com/graph/students> ;
];
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant <http://example.com/ontology/practises> ];
+ rr:predicate <http://example.com/ontology/practises> ;
rr:objectMap [
rr:parentTriplesMap <TriplesMap2>;
rr:joinCondition [
@@ -38,7 +38,7 @@
rr:parent "\"ID\"" ;
]
];
- rr:graphMap [ rr:constant <http://example.com/graph/practise> ];
+ rr:graph <http://example.com/graph/practise> ;
];
.
@@ -53,12 +53,12 @@
rr:template "http://example.com/resource/sport_{\"ID\"}";
rr:termType rr:IRI;
rr:class <http://example.com/ontology/Sport>;
- rr:graphMap [ rr:constant <http://example.com/graph/sports> ];
+ rr:graph <http://example.com/graph/sports> ;
];
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant rdfs:label ];
+ rr:predicate rdfs:label ;
rr:objectMap [
rr:column "\"Name\"";
rr:termType rr:Literal;
--- a/D009-2tables1primarykey1foreignkey/r2rmlc.ttl Mon Mar 12 01:47:30 2012 +0100
+++ b/D009-2tables1primarykey1foreignkey/r2rmlc.ttl Mon Mar 12 15:49:43 2012 +0100
@@ -23,7 +23,7 @@
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant foaf:name ];
+ rr:predicate foaf:name ;
rr:objectMap [
rr:column "\"Name\"";
rr:termType rr:Literal;
--- a/D009-2tables1primarykey1foreignkey/r2rmld.ttl Mon Mar 12 01:47:30 2012 +0100
+++ b/D009-2tables1primarykey1foreignkey/r2rmld.ttl Mon Mar 12 15:49:43 2012 +0100
@@ -23,7 +23,7 @@
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant foaf:name ];
+ rr:predicate foaf:name ;
rr:objectMap [
rr:column "\"Name\"";
rr:termType rr:Literal;
@@ -32,7 +32,7 @@
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant ex:numSport ];
+ rr:predicate ex:numSport ;
rr:objectMap [
rr:column "SPORTCOUNT";
rr:datatype xsd:integer;
--- a/D010-1table1primarykey3colums3rows/r2rmla.ttl Mon Mar 12 01:47:30 2012 +0100
+++ b/D010-1table1primarykey3colums3rows/r2rmla.ttl Mon Mar 12 15:49:43 2012 +0100
@@ -13,7 +13,7 @@
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant ex:name ];
- rr:objectMap [ rr:column "\"Name\"" ]
+ rr:predicate ex:name ;
+ rr:objectMap [ rr:column "\"Name\"" ]
]
.
\ No newline at end of file
--- a/D010-1table1primarykey3colums3rows/r2rmlb.ttl Mon Mar 12 01:47:30 2012 +0100
+++ b/D010-1table1primarykey3colums3rows/r2rmlb.ttl Mon Mar 12 15:49:43 2012 +0100
@@ -13,7 +13,7 @@
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant ex:name ];
+ rr:predicate ex:name ;
rr:objectMap [ rr:column "\"Name\"" ]
]
.
\ No newline at end of file
--- a/D010-1table1primarykey3colums3rows/r2rmlc.ttl Mon Mar 12 01:47:30 2012 +0100
+++ b/D010-1table1primarykey3colums3rows/r2rmlc.ttl Mon Mar 12 15:49:43 2012 +0100
@@ -13,7 +13,7 @@
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant ex:code ];
+ rr:predicate ex:code ;
rr:objectMap [ rr:template "\\{\\{\\{ {\"ISO 3166\"} \\}\\}\\}"; rr:termType rr:Literal; ]
]
.
\ No newline at end of file
--- a/D011-M2MRelations/r2rmla.ttl Mon Mar 12 01:47:30 2012 +0100
+++ b/D011-M2MRelations/r2rmla.ttl Mon Mar 12 15:49:43 2012 +0100
@@ -22,25 +22,25 @@
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant ex:id ];
+ rr:predicate ex:id ;
rr:objectMap [ rr:column "ID"; rr:datatype xsd:integer ]
];
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant foaf:firstName ];
+ rr:predicate foaf:firstName ;
rr:objectMap [ rr:column "FirstName" ]
];
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant foaf:lastName ];
+ rr:predicate foaf:lastName ;
rr:objectMap [ rr:column "LastName" ]
];
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant ex:plays ];
+ rr:predicate ex:plays ;
rr:objectMap [ rr:template "http://example.com/{Sport_ID}{Description}" ]
]
.
@@ -57,13 +57,13 @@
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant ex:id ];
+ rr:predicate ex:id ;
rr:objectMap [ rr:column "ID"; rr:datatype xsd:integer ]
];
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant ex:description ];
+ rr:predicate ex:description ;
rr:objectMap [ rr:column "Description" ]
]
.
--- a/D011-M2MRelations/r2rmlb.ttl Mon Mar 12 01:47:30 2012 +0100
+++ b/D011-M2MRelations/r2rmlb.ttl Mon Mar 12 15:49:43 2012 +0100
@@ -13,13 +13,13 @@
];
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant foaf:firstName ];
+ rr:predicate foaf:firstName ;
rr:objectMap [ rr:column "\"FirstName\"" ]
];
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant foaf:lastName ];
+ rr:predicate foaf:lastName ;
rr:objectMap [ rr:column "\"LastName\"" ]
]
.
@@ -33,13 +33,13 @@
];
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant ex:id ];
+ rr:predicate ex:id ;
rr:objectMap [ rr:column "\"ID\""; rr:datatype xsd:integer ]
];
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant ex:description ];
+ rr:predicate ex:description ;
rr:objectMap [ rr:column "\"Description\"" ]
]
.
@@ -52,7 +52,7 @@
rr:subjectMap [ rr:template "http://example.com/student/{\"ID_Student\"}" ];
rr:predicateObjectMap [
- rr:predicateMap [ rr:constant ex:plays ];
+ rr:predicate ex:plays ;
rr:objectMap [ rr:template "http://example.com/sport/{\"ID_Sport\"}" ];
].
--- a/D012-2tables2duplicates0nulls/manifest.ttl Mon Mar 12 01:47:30 2012 +0100
+++ b/D012-2tables2duplicates0nulls/manifest.ttl Mon Mar 12 15:49:43 2012 +0100
@@ -53,6 +53,7 @@
test:reviewStatus test:unreviewed ;
rdb2rdftest:database <d012> ;
rdb2rdftest:hasExpectedOutput false ;
+ rdb2rdftest:failMessage "non-conforming R2RML mapping";
rdb2rdftest:mappingDocument "r2rmlc.ttl" ;
.
@@ -64,5 +65,6 @@
test:reviewStatus test:unreviewed ;
rdb2rdftest:database <d012> ;
rdb2rdftest:hasExpectedOutput false ;
+ rdb2rdftest:failMessage "non-conforming R2RML mapping";
rdb2rdftest:mappingDocument "r2rmld.ttl" ;
.
--- a/D012-2tables2duplicates0nulls/r2rmla.ttl Mon Mar 12 01:47:30 2012 +0100
+++ b/D012-2tables2duplicates0nulls/r2rmla.ttl Mon Mar 12 15:49:43 2012 +0100
@@ -17,7 +17,7 @@
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant foaf:name ];
+ rr:predicate foaf:name ;
rr:objectMap [
rr:template "{\"fname\"} {\"lname\"}";
rr:termType rr:Literal ;
@@ -26,7 +26,7 @@
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant ex:amount ];
+ rr:predicate ex:amount ;
rr:objectMap [
rr:column "\"amount\"";
rr:termType rr:Literal ;
--- a/D012-2tables2duplicates0nulls/r2rmlb.ttl Mon Mar 12 01:47:30 2012 +0100
+++ b/D012-2tables2duplicates0nulls/r2rmlb.ttl Mon Mar 12 15:49:43 2012 +0100
@@ -17,7 +17,7 @@
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant foaf:name ];
+ rr:predicate foaf:name ;
rr:objectMap [
rr:template "{\"fname\"} {\"lname\"}";
rr:termType rr:Literal ;
@@ -37,7 +37,7 @@
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant ex:city ];
+ rr:predicate ex:city ;
rr:objectMap [
rr:column "\"city\"";
rr:termType rr:Literal ;
--- a/D012-2tables2duplicates0nulls/r2rmlc.ttl Mon Mar 12 01:47:30 2012 +0100
+++ b/D012-2tables2duplicates0nulls/r2rmlc.ttl Mon Mar 12 15:49:43 2012 +0100
@@ -11,7 +11,7 @@
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant foaf:name ];
+ rr:predicate foaf:name ;
rr:objectMap [
rr:template "{\"fname\"} {\"lname\"}";
rr:termType rr:Literal ;
@@ -20,7 +20,7 @@
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant ex:amount ];
+ rr:predicate ex:amount ;
rr:objectMap [
rr:column "\"amount\"";
rr:termType rr:Literal ;
--- a/D012-2tables2duplicates0nulls/r2rmld.ttl Mon Mar 12 01:47:30 2012 +0100
+++ b/D012-2tables2duplicates0nulls/r2rmld.ttl Mon Mar 12 15:49:43 2012 +0100
@@ -23,7 +23,7 @@
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant foaf:name ];
+ rr:predicate foaf:name ;
rr:objectMap [
rr:template "{\"fname\"} {\"lname\"}";
rr:termType rr:Literal ;
@@ -32,7 +32,7 @@
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant ex:amount ];
+ rr:predicate ex:amount ;
rr:objectMap [
rr:column "\"amount\"";
rr:termType rr:Literal ;
--- a/D013-1table1primarykey3columns2rows1nullvalue/r2rmla.ttl Mon Mar 12 01:47:30 2012 +0100
+++ b/D013-1table1primarykey3columns2rows1nullvalue/r2rmla.ttl Mon Mar 12 15:49:43 2012 +0100
@@ -15,26 +15,25 @@
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant rdf:type; ];
- rr:objectMap [ rr:constant foaf:Person; ]
+ rr:predicate rdf:type ;
+ rr:object foaf:Person ;
];
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant ex:id; ];
+ rr:predicate ex:id ;
rr:objectMap [ rr:column "\"ID\""; rr:datatype xsd:integer ]
];
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant foaf:name; ];
+ rr:predicate foaf:name ;
rr:objectMap [ rr:column "\"Name\"" ]
];
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant ex:BirthDay; ];
+ rr:predicate ex:BirthDay ;
rr:objectMap [ rr:column "\"DateOfBirth\"" ]
]
-
.
--- a/D014-3tables1primarykey1foreignkey/r2rmla.ttl Mon Mar 12 01:47:30 2012 +0100
+++ b/D014-3tables1primarykey1foreignkey/r2rmla.ttl Mon Mar 12 15:49:43 2012 +0100
@@ -18,30 +18,30 @@
rr:subjectMap [ rr:column "\"deptId\""; rr:termType rr:BlankNode;
rr:class ex:dept;
- rr:graphMap [ rr:graph ex:DeptGraph; ];
+ rr:graph ex:DeptGraph ;
rr:inverseExpression "{\"deptno\"} = substr({\"deptId\"},length('Department')+1)"];
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant dept:deptno ];
+ rr:predicate dept:deptno ;
rr:objectMap [ rr:column "\"deptno\""; rr:datatype xsd:positiveInteger ]
];
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant dept:name ];
+ rr:predicate dept:name ;
rr:objectMap [ rr:column "\"dname\"" ]
];
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant dept:location ];
+ rr:predicate dept:location ;
rr:objectMap [ rr:column "\"loc\"" ]
];
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant dept:COMPANY ];
+ rr:predicate dept:COMPANY ;
rr:objectMap [ rr:object "EXAMPLE Corporation" ]
]
.
\ No newline at end of file
--- a/D014-3tables1primarykey1foreignkey/r2rmlb.ttl Mon Mar 12 01:47:30 2012 +0100
+++ b/D014-3tables1primarykey1foreignkey/r2rmlb.ttl Mon Mar 12 15:49:43 2012 +0100
@@ -20,38 +20,38 @@
rr:subjectMap [ rr:column "deptId"; rr:termType rr:BlankNode;
rr:class ex:dept;
- rr:graphMap [ rr:constant ex:DeptGraph; ];
+ rr:graph ex:DeptGraph ;
rr:inverseExpression "{\"deptno\"} = substr({"deptId"},length('Department')+1)"];
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant dept:deptno ];
+ rr:predicate dept:deptno ;
rr:objectMap [ rr:column "\"deptno\""; rr:datatype xsd:positiveInteger ]
];
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant dept:name ];
+ rr:predicate dept:name ;
rr:objectMap [ rr:column "\"dname\"" ]
];
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant dept:location ];
+ rr:predicate dept:location ;
rr:objectMap [ rr:column "\"loc\"" ]
];
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant dept:COMPANY ];
- rr:objectMap [ rr:constant "EXAMPLE Corporation" ]
+ rr:predicate dept:COMPANY ;
+ rr:object "EXAMPLE Corporation"
]
.
<TriplesMap2>
a rr:TriplesMap;
rr:logicalTable [ rr:sqlQuery """
- Select ('http://example.com/emp/' || "empno") AS empURI
+ SELECT ('http://example.com/emp/' || "empno") AS empURI
, "empno"
, "ename"
, ('http://example.com/emp/job/'|| "job") AS jobTypeURI
@@ -60,7 +60,7 @@
, ('http://example.com/emp/etype/'|| "etype") AS empTypeURI
, "etype"
, ('http://example.com/graph/'|| "job" || '/' || "etype") AS graphURI
- from "EMP"
+ FROM "EMP"
""" ];
rr:subjectMap [ rr:column "empURI";
@@ -69,61 +69,61 @@
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant emp:jobtype ];
+ rr:predicate emp:jobtype ;
rr:objectMap [ rr:column "jobTypeURI" ]
];
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant rdf:type ];
+ rr:predicate rdf:type ;
rr:objectMap [ rr:column "jobTypeURI" ]
];
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant emp:emptype ];
- rr:objectMap [ rr:column "empTypeURI" ]
- ];
-
- rr:predicateObjectMap
- [
- rr:predicateMap [ rr:constant rdf:type ];
+ rr:predicate emp:emptype ;
rr:objectMap [ rr:column "empTypeURI" ]
];
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant emp:empno ];
+ rr:predicate rdf:type ;
+ rr:objectMap [ rr:column "empTypeURI" ]
+ ];
+
+ rr:predicateObjectMap
+ [
+ rr:predicate emp:empno ;
rr:objectMap [ rr:column "\"empno\"" ]
];
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant emp:name ];
+ rr:predicate emp:name ;
rr:objectMap [ rr:column "\"ename\"" ];
- rr:graphMap [ rr:constant emp:empNameGraph ];
+ rr:graph emp:empNameGraph ;
];
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant emp:job ];
+ rr:predicate emp:job ;
rr:objectMap [ rr:column "\"job\"" ]
];
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant emp:deptNum ];
+ rr:predicate emp:deptNum ;
rr:objectMap [ rr:column "\"deptno\"" ]
];
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant emp:etype ];
+ rr:predicate emp:etype ;
rr:objectMap [ rr:column "\"etype\"" ]
];
rr:predicateObjectMap [
- rr:predicateMap [ rr:constant emp:c_ref_deptno ];
+ rr:predicate emp:c_ref_deptno ;
rr:objectMap [
rr:parentTriplesMap <TriplesMap1>;
rr:joinCondition [
--- a/D014-3tables1primarykey1foreignkey/r2rmlc.ttl Mon Mar 12 01:47:30 2012 +0100
+++ b/D014-3tables1primarykey1foreignkey/r2rmlc.ttl Mon Mar 12 15:49:43 2012 +0100
@@ -12,40 +12,40 @@
<TriplesMap1>
a rr:TriplesMap;
rr:logicalTable [ rr:sqlQuery """
- Select ('Department' || "deptno") AS deptId
+ SELECT ('Department' || "deptno") AS deptId
, "deptno"
, "dname"
, "loc"
- from "DEPT"
+ FROM "DEPT"
""" ];
rr:subjectMap [ rr:column "deptId"; rr:termType rr:BlankNode;
rr:class ex:dept;
- rr:graphMap [ rr:constant ex:DeptGraph; ];
+ rr:graph ex:DeptGraph ;
rr:inverseExpression "{\"deptno\"} = substr({deptId},length('Department')+1)"];
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant dept:deptno ];
+ rr:predicate dept:deptno ;
rr:objectMap [ rr:column "\"deptno\""; rr:datatype xsd:positiveInteger ]
];
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant dept:name ];
+ rr:predicate dept:name ;
rr:objectMap [ rr:column "\"dname\"" ]
];
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant dept:location ];
+ rr:predicate dept:location ;
rr:objectMap [ rr:column "\"loc\"" ]
];
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant dept:COMPANY ];
- rr:objectMap [ rr:constant "EXAMPLE Corporation" ]
+ rr:predicate dept:COMPANY ;
+ rr:object "EXAMPLE Corporation"
]
.
@@ -61,61 +61,61 @@
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant emp:jobtype ];
+ rr:predicate emp:jobtype ;
rr:objectMap [ rr:template "http://example.com/emp/job/{\"job\"}" ]
];
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant rdf:type ];
+ rr:predicate rdf:type ;
rr:objectMap [ rr:template "http://example.com/emp/job/{\"job\"}" ]
];
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant emp:emptype ];
- rr:objectMap [ rr:template "http://example.com/emp/etype/{\"etype\"}" ]
- ];
-
- rr:predicateObjectMap
- [
- rr:predicateMap [ rr:constant rdf:type ];
+ rr:predicate emp:emptype ;
rr:objectMap [ rr:template "http://example.com/emp/etype/{\"etype\"}" ]
];
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant emp:empno ];
+ rr:predicate rdf:type ;
+ rr:objectMap [ rr:template "http://example.com/emp/etype/{\"etype\"}" ]
+ ];
+
+ rr:predicateObjectMap
+ [
+ rr:predicate emp:empno ;
rr:objectMap [ rr:column "\"empno\"" ]
];
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant emp:name ];
- rr:objectMap [ rr:column "\"ename\"" ];
- rr:graphMap [ rr:constant emp:empNameGraph ];
+ rr:predicate emp:name ;
+ rr:objectMap [ rr:column "\"ename\"" ];
+ rr:graph emp:empNameGraph ;
];
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant emp:job ];
+ rr:predicate emp:job ;
rr:objectMap [ rr:column "\"job\"" ]
];
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant emp:deptNum ];
+ rr:predicate emp:deptNum ;
rr:objectMap [ rr:column "\"deptno\"" ]
];
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant emp:etype ];
+ rr:predicate emp:etype ;
rr:objectMap [ rr:column "\"etype\"" ]
];
rr:predicateObjectMap [
- rr:predicateMap [ rr:constant emp:c_ref_deptno ];
+ rr:predicate emp:c_ref_deptno ;
rr:objectMap [
rr:parentTriplesMap <TriplesMap1>;
rr:joinCondition [
--- a/D014-3tables1primarykey1foreignkey/r2rmld.ttl Mon Mar 12 01:47:30 2012 +0100
+++ b/D014-3tables1primarykey1foreignkey/r2rmld.ttl Mon Mar 12 15:49:43 2012 +0100
@@ -19,31 +19,31 @@
rr:subjectMap [ rr:column "deptId"; rr:termType rr:BlankNode;
rr:class ex:dept;
- rr:graphMap [ rr:constant ex:DeptGraph; ];
+ rr:graph ex:DeptGraph ;
rr:inverseExpression "{"deptno"} = substr({deptId},length('Department')+1)"];
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant dept:deptno ];
+ rr:predicate dept:deptno ;
rr:objectMap [ rr:column "\"deptno\""; rr:datatype xsd:positiveInteger ]
];
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant dept:name ];
+ rr:predicate dept:name ;
rr:objectMap [ rr:column "\"dname\"" ]
];
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant dept:location ];
+ rr:predicate dept:location ;
rr:objectMap [ rr:column "\"loc\"" ]
];
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant dept:COMPANY ];
- rr:objectMap [ rr:constant "EXAMPLE Corporation" ]
+ rr:predicate dept:COMPANY ;
+ rr:object "EXAMPLE Corporation"
]
.
@@ -70,61 +70,61 @@
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant emp:jobtype ];
+ rr:predicate emp:jobtype ;
rr:objectMap <jobtypeObjectMap>
];
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant rdf:type ];
+ rr:predicate rdf:type ;
rr:objectMap <jobtypeObjectMap>
];
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant emp:emptype ];
- rr:objectMap <emptypeObjectMap>
- ];
-
- rr:predicateObjectMap
- [
- rr:predicateMap [ rr:constant rdf:type ];
+ rr:predicate emp:emptype ;
rr:objectMap <emptypeObjectMap>
];
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant emp:empno ];
+ rr:predicate rdf:type ;
+ rr:objectMap <emptypeObjectMap>
+ ];
+
+ rr:predicateObjectMap
+ [
+ rr:predicate emp:empno ;
rr:objectMap [ rr:column "\"empno\"" ]
];
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant emp:name ];
+ rr:predicate emp:name ;
rr:objectMap [ rr:column "\"ename\"" ];
- rr:graphMap [ rr:constant emp:empNameGraph ];
+ rr:graph emp:empNameGraph ;
];
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant emp:job ];
+ rr:predicate emp:job ;
rr:objectMap [ rr:column "\"job\"" ]
];
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant emp:deptNum ];
+ rr:predicate emp:deptNum ;
rr:objectMap [ rr:column "\"deptno\"" ]
];
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant emp:etype ];
+ rr:predicate emp:etype ;
rr:objectMap [ rr:column "\"etype\"" ]
];
rr:predicateObjectMap [
- rr:predicateMap [ rr:constant emp:c_ref_deptno ];
+ rr:predicate emp:c_ref_deptno ;
rr:objectMap [
rr:parentTriplesMap <TriplesMap1>;
rr:joinCondition [
--- a/D014-3tables1primarykey1foreignkey/r2rmle.ttl Mon Mar 12 01:47:30 2012 +0100
+++ b/D014-3tables1primarykey1foreignkey/r2rmle.ttl Mon Mar 12 15:49:43 2012 +0100
@@ -10,15 +10,15 @@
<TriplesMap3>
a rr:TriplesMap;
rr:logicalTable [ rr:sqlQuery """
- Select ('http://example.com/emp/' || "id") AS empId
+ SELECT ('http://example.com/emp/' || "id") AS empId
, ('http://example.com/emp/likes/' || "likeType") AS empLikes
, "likedObj"
- from "LIKES"
+ FROM "LIKES"
""" ];
rr:subjectMap [
rr:column "empId";
- rr:graphMap [ rr:constant ex:LikesGraph ];
+ rr:graph ex:LikesGraph ;
];
rr:predicateObjectMap
--- a/D015-1table3columns1composityeprimarykey3rows2languages/manifest.ttl Mon Mar 12 01:47:30 2012 +0100
+++ b/D015-1table3columns1composityeprimarykey3rows2languages/manifest.ttl Mon Mar 12 15:49:43 2012 +0100
@@ -41,5 +41,6 @@
test:reviewStatus test:unreviewed ;
rdb2rdftest:database <d015> ;
rdb2rdftest:hasExpectedOutput false ;
+ rdb2rdftest:failMessage "non-conforming R2RML mapping";
rdb2rdftest:mappingDocument "r2rmlb.ttl" ;
.
--- a/D015-1table3columns1composityeprimarykey3rows2languages/r2rmlb.ttl Mon Mar 12 01:47:30 2012 +0100
+++ b/D015-1table3columns1composityeprimarykey3rows2languages/r2rmlb.ttl Mon Mar 12 15:49:43 2012 +0100
@@ -19,8 +19,8 @@
rr:predicateObjectMap
[
- rr:predicate rdfs:label;
- rr:objectMap [ rr:column "\"Name\""; rr:language "english" ]
+ rr:predicate rdfs:label;
+ rr:objectMap [ rr:column "\"Name\""; rr:language "english" ]
]
.
@@ -37,7 +37,7 @@
rr:predicateObjectMap
[
- rr:predicate rdfs:label;
- rr:objectMap [ rr:column "\"Name\""; rr:language "spanish" ]
+ rr:predicate rdfs:label;
+ rr:objectMap [ rr:column "\"Name\""; rr:language "spanish" ]
]
.
\ No newline at end of file
--- a/D016-1table1primarykey10columns3rowsSQLdatatypes/r2rmla.ttl Mon Mar 12 01:47:30 2012 +0100
+++ b/D016-1table1primarykey10columns3rowsSQLdatatypes/r2rmla.ttl Mon Mar 12 15:49:43 2012 +0100
@@ -15,32 +15,32 @@
rr:predicateObjectMap
[
- rr:predicate rdf:type;
- rr:object foaf:Person;
+ rr:predicate rdf:type;
+ rr:object foaf:Person;
];
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant ex:id; ];
+ rr:predicate ex:id ;
rr:objectMap [ rr:column "\"ID\""; rr:datatype xsd:integer ]
];
rr:predicateObjectMap
[
- rr:predicate foaf:firstName;
- rr:objectMap [ rr:column "\"FirstName\""; rr:datatype xsd:string ]
+ rr:predicate foaf:firstName;
+ rr:objectMap [ rr:column "\"FirstName\""; rr:datatype xsd:string ]
];
rr:predicateObjectMap
[
- rr:predicate foaf:lastName;
- rr:objectMap [ rr:column "\"LastName\""; rr:datatype xsd:string ]
+ rr:predicate foaf:lastName;
+ rr:objectMap [ rr:column "\"LastName\""; rr:datatype xsd:string ]
];
rr:predicateObjectMap
[
- rr:predicate foaf:gender;
- rr:objectMap [ rr:column "\"Sex\""; rr:datatype xsd:string ]
+ rr:predicate foaf:gender;
+ rr:objectMap [ rr:column "\"Sex\""; rr:datatype xsd:string ]
];
.
--- a/D016-1table1primarykey10columns3rowsSQLdatatypes/r2rmlc.ttl Mon Mar 12 01:47:30 2012 +0100
+++ b/D016-1table1primarykey10columns3rowsSQLdatatypes/r2rmlc.ttl Mon Mar 12 15:49:43 2012 +0100
@@ -15,20 +15,20 @@
rr:predicateObjectMap
[
- rr:predicate rdf:type;
- rr:object foaf:Person;
+ rr:predicate rdf:type;
+ rr:object foaf:Person;
];
rr:predicateObjectMap
[
- rr:predicate ex:birthdate;
- rr:objectMap [ rr:column "\"BirthDate\""; rr:datatype xsd:date ]
+ rr:predicate ex:birthdate;
+ rr:objectMap [ rr:column "\"BirthDate\""; rr:datatype xsd:date ]
];
rr:predicateObjectMap
[
- rr:predicate ex:entrancedate;
- rr:objectMap [ rr:column "\"EntranceDate\""; rr:datatype xsd:dateTime ]
+ rr:predicate ex:entrancedate;
+ rr:objectMap [ rr:column "\"EntranceDate\""; rr:datatype xsd:dateTime ]
];
.
--- a/D016-1table1primarykey10columns3rowsSQLdatatypes/r2rmld.ttl Mon Mar 12 01:47:30 2012 +0100
+++ b/D016-1table1primarykey10columns3rowsSQLdatatypes/r2rmld.ttl Mon Mar 12 15:49:43 2012 +0100
@@ -15,14 +15,14 @@
rr:predicateObjectMap
[
- rr:predicate rdf:type;
- rr:object foaf:Person;
+ rr:predicate rdf:type;
+ rr:object foaf:Person;
];
rr:predicateObjectMap
[
- rr:predicate ex:paid;
- rr:objectMap [ rr:column "\"PaidInAdvance\""; rr:datatype xsd:boolean ]
+ rr:predicate ex:paid;
+ rr:objectMap [ rr:column "\"PaidInAdvance\""; rr:datatype xsd:boolean ]
];
.
--- a/D016-1table1primarykey10columns3rowsSQLdatatypes/r2rmle.ttl Mon Mar 12 01:47:30 2012 +0100
+++ b/D016-1table1primarykey10columns3rowsSQLdatatypes/r2rmle.ttl Mon Mar 12 15:49:43 2012 +0100
@@ -15,14 +15,14 @@
rr:predicateObjectMap
[
- rr:predicate rdf:type;
- rr:object foaf:Person;
+ rr:predicate rdf:type;
+ rr:object foaf:Person;
];
rr:predicateObjectMap
[
- rr:predicate ex:photo;
- rr:objectMap [ rr:template "data:image/png;base64,{\"Photo\"}"; ];
+ rr:predicate ex:photo;
+ rr:objectMap [ rr:template "data:image/png;base64,{\"Photo\"}"; ];
];
.
--- a/D018-1table1primarykey2columns3rows/r2rmla.ttl Mon Mar 12 01:47:30 2012 +0100
+++ b/D018-1table1primarykey2columns3rows/r2rmla.ttl Mon Mar 12 15:49:43 2012 +0100
@@ -14,13 +14,13 @@
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant ex:id ];
- rr:objectMap [ rr:column "\"ID\""; rr:datatype xsd:integer ]
+ rr:predicate ex:id ;
+ rr:objectMap [ rr:column "\"ID\""; rr:datatype xsd:integer ]
];
rr:predicateObjectMap
[
- rr:predicateMap [ rr:constant foaf:name ];
- rr:objectMap [ rr:column "\"Name\"" ]
+ rr:predicate foaf:name ;
+ rr:objectMap [ rr:column "\"Name\"" ]
]
.
\ No newline at end of file
--- a/D019-1table1primarykey3columns3rows/manifest.ttl Mon Mar 12 01:47:30 2012 +0100
+++ b/D019-1table1primarykey3columns3rows/manifest.ttl Mon Mar 12 15:49:43 2012 +0100
@@ -30,5 +30,6 @@
test:reviewStatus test:unreviewed ;
rdb2rdftest:database <d019> ;
rdb2rdftest:hasExpectedOutput false ;
+ rdb2rdftest:failMessage "Conforming R2RML mapping with data error";
rdb2rdftest:mappingDocument "r2rmlb.ttl" ;
.
--- a/D019-1table1primarykey3columns3rows/r2rmla.ttl Mon Mar 12 01:47:30 2012 +0100
+++ b/D019-1table1primarykey3columns3rows/r2rmla.ttl Mon Mar 12 15:49:43 2012 +0100
@@ -17,7 +17,7 @@
rr:subjectMap [ rr:column "\"FirstName\"" ];
rr:predicateObjectMap
[
- rr:predicate foaf:name;
- rr:objectMap [ rr:column "\"FirstName\"" ];
+ rr:predicate foaf:name;
+ rr:objectMap [ rr:column "\"FirstName\"" ];
];
.
--- a/D019-1table1primarykey3columns3rows/r2rmlb.ttl Mon Mar 12 01:47:30 2012 +0100
+++ b/D019-1table1primarykey3columns3rows/r2rmlb.ttl Mon Mar 12 15:49:43 2012 +0100
@@ -10,7 +10,7 @@
rr:subjectMap [ rr:column "\"FirstName\"" ];
rr:predicateObjectMap
[
- rr:predicate foaf:name;
- rr:objectMap [ rr:column "\"FirstName\"" ];
+ rr:predicate foaf:name;
+ rr:objectMap [ rr:column "\"FirstName\"" ];
];
.
Binary file ts1.zip has changed