--- a/D001-1table1column1row/mappedb.nq Mon Mar 26 20:32:56 2012 +0200
+++ b/D001-1table1column1row/mappedb.nq Thu Mar 29 11:27:08 2012 +0200
@@ -1,1 +1,1 @@
-_:students/Venus <http://xmlns.com/foaf/0.1/name> "Venus" .
+_:Venus <http://xmlns.com/foaf/0.1/name> "Venus" .
--- a/D001-1table1column1row/r2rmlb.ttl Mon Mar 26 20:32:56 2012 +0200
+++ b/D001-1table1column1row/r2rmlb.ttl Thu Mar 29 11:27:08 2012 +0200
@@ -9,7 +9,7 @@
rr:logicalTable [ rr:tableName "\"Student\"" ];
- rr:subjectMap [ rr:template "students/{\"Name\"}"; rr:termType rr:BlankNode ];
+ rr:subjectMap [ rr:template "{\"Name\"}"; rr:termType rr:BlankNode ];
rr:predicateObjectMap
[
--- a/D002-1table2columns1row/mappedb.nq Mon Mar 26 20:32:56 2012 +0200
+++ b/D002-1table2columns1row/mappedb.nq Thu Mar 29 11:27:08 2012 +0200
@@ -1,1 +1,1 @@
-_:students/10 <http://xmlns.com/foaf/0.1/name> "Venus" .
+_:students-10 <http://xmlns.com/foaf/0.1/name> "Venus" .
--- a/D002-1table2columns1row/r2rmlb.ttl Mon Mar 26 20:32:56 2012 +0200
+++ b/D002-1table2columns1row/r2rmlb.ttl Thu Mar 29 11:27:08 2012 +0200
@@ -9,7 +9,7 @@
rr:logicalTable [ rr:tableName "\"Student\""; ];
- rr:subjectMap [ rr:template "students/{\"ID\"}"; rr:termType rr:BlankNode; ];
+ rr:subjectMap [ rr:template "students-{\"ID\"}"; rr:termType rr:BlankNode; ];
rr:predicateObjectMap
[
--- a/D009-2tables1primarykey1foreignkey/mappedb.nq Mon Mar 26 20:32:56 2012 +0200
+++ b/D009-2tables1primarykey1foreignkey/mappedb.nq Thu Mar 29 11:27:08 2012 +0200
@@ -1,7 +1,7 @@
-<http://example.com/resource/student_10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/ontology/Student> <http://example.org/graph/students> .
-<http://example.com/resource/student_10> <http://xmlns.com/foaf/0.1/name> "Venus Williams" <http://example.org/graph/students> .
-<http://example.com/resource/student_20> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/ontology/Student> <http://example.org/graph/students> .
-<http://example.com/resource/student_20> <http://xmlns.com/foaf/0.1/name> "Demi Moore" <http://example.org/graph/students> .
-<http://example.com/resource/sport_100> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/ontology/Sport> <http://example.org/graph/sports> .
-<http://example.com/resource/sport_100> <http://www.w3.org/2000/01/rdf-schema#label> "Tennis" <http://example.org/graph/sports> .
-<http://example.com/resource/student_10> <http://example.com/ontology/practises> <http://example.com/resource/sport_100> <http://example.org/graph/practise> .
\ No newline at end of file
+<http://example.com/resource/student_10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/ontology/Student> <http://example.com/graph/students> .
+<http://example.com/resource/student_10> <http://xmlns.com/foaf/0.1/name> "Venus Williams" <http://example.com/graph/students> .
+<http://example.com/resource/student_20> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/ontology/Student> <http://example.com/graph/students> .
+<http://example.com/resource/student_20> <http://xmlns.com/foaf/0.1/name> "Demi Moore" <http://example.com/graph/students> .
+<http://example.com/resource/sport_100> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/ontology/Sport> <http://example.com/graph/sports> .
+<http://example.com/resource/sport_100> <http://www.w3.org/2000/01/rdf-schema#label> "Tennis" <http://example.com/graph/sports> .
+<http://example.com/resource/student_10> <http://example.com/ontology/practises> <http://example.com/resource/sport_100> <http://example.com/graph/practise> .
\ No newline at end of file
--- a/D009-2tables1primarykey1foreignkey/r2rmla.ttl Mon Mar 26 20:32:56 2012 +0200
+++ b/D009-2tables1primarykey1foreignkey/r2rmla.ttl Thu Mar 29 11:27:08 2012 +0200
@@ -22,11 +22,12 @@
[
rr:predicate <http://example.com/ontology/practises> ;
rr:objectMap [
+ a rr:RefObjectMap ;
rr:parentTriplesMap <TriplesMap2>;
rr:joinCondition [
rr:child "\"Sport\"" ;
rr:parent "\"ID\"" ;
- ]
+ ]
];
];
.
--- a/D009-2tables1primarykey1foreignkey/r2rmlb.ttl Mon Mar 26 20:32:56 2012 +0200
+++ b/D009-2tables1primarykey1foreignkey/r2rmlb.ttl Thu Mar 29 11:27:08 2012 +0200
@@ -28,6 +28,7 @@
[
rr:predicate <http://example.com/ontology/practises> ;
rr:objectMap [
+ a rr:RefObjectMap ;
rr:parentTriplesMap <TriplesMap2>;
rr:joinCondition [
rr:child "\"Sport\"" ;
--- a/D011-M2MRelations/r2rmla.ttl Mon Mar 26 20:32:56 2012 +0200
+++ b/D011-M2MRelations/r2rmla.ttl Thu Mar 29 11:27:08 2012 +0200
@@ -48,19 +48,19 @@
<TriplesMap2>
a rr:TriplesMap;
- rr:logicalTable [ rr:tableName "Sport" ];
+ rr:logicalTable [ rr:tableName "\"Sport\"" ];
- rr:subjectMap [ rr:template "http://example.com/{ID}/{Description}"; ];
+ rr:subjectMap [ rr:template "http://example.com/{\"ID\"}/{\"Description\"}"; ];
rr:predicateObjectMap
[
rr:predicate ex:id ;
- rr:objectMap [ rr:column "ID"; ]
+ rr:objectMap [ rr:column "\"ID\""; ]
];
rr:predicateObjectMap
[
rr:predicate ex:description ;
- rr:objectMap [ rr:column "Description" ]
+ rr:objectMap [ rr:column "\"Description\"" ]
]
.
--- a/D014-3tables1primarykey1foreignkey/mappedb.nq Mon Mar 26 20:32:56 2012 +0200
+++ b/D014-3tables1primarykey1foreignkey/mappedb.nq Thu Mar 29 11:27:08 2012 +0200
@@ -1,4 +1,3 @@
-<http://example.com/emp/7369> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/ns#emp> .
<http://example.com/emp/7369> <http://example.com/emp#jobtype> <http://example.com/emp/job/CLERK> .
<http://example.com/emp/7369> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/emp/job/CLERK> .
<http://example.com/emp/7369> <http://example.com/emp#emptype> <http://example.com/emp/etype/PART_TIME> .
@@ -7,9 +6,8 @@
<http://example.com/emp/7369> <http://example.com/emp#name> "SMITH" .
<http://example.com/emp/7369> <http://example.com/emp#job> "CLERK" .
<http://example.com/emp/7369> <http://example.com/emp#deptNum> "10"^^<http://www.w3.org/2001/XMLSchema#integer> .
-<http://example.com/emp/7369> <http://example.com/emp#etype> "PART TIME" .
+<http://example.com/emp/7369> <http://example.com/emp#etype> "PART_TIME" .
<http://example.com/emp/7369> <http://example.com/emp#c_ref_deptno> _:Department10 .
-<http://example.com/emp/7369> <http://example.com/emp#name> "SMITH" .
_:Department10 <http://example.com/dept#deptno> "10"^^<http://www.w3.org/2001/XMLSchema#integer> .
_:Department10 <http://example.com/dept#name> "APPSERVER" .
_:Department10 <http://example.com/dept#location> "NEW YORK" .
--- a/D014-3tables1primarykey1foreignkey/r2rmlb.ttl Mon Mar 26 20:32:56 2012 +0200
+++ b/D014-3tables1primarykey1foreignkey/r2rmlb.ttl Thu Mar 29 11:27:08 2012 +0200
@@ -66,25 +66,25 @@
rr:predicateObjectMap
[
rr:predicate emp:jobtype ;
- rr:objectMap [ rr:column "jobTypeURI" ]
+ rr:objectMap [ rr:column "jobTypeURI" rr:termType rr:IRI; ]
];
rr:predicateObjectMap
[
rr:predicate rdf:type ;
- rr:objectMap [ rr:column "jobTypeURI" ]
+ rr:objectMap [ rr:column "jobTypeURI" rr:termType rr:IRI; ]
];
rr:predicateObjectMap
[
rr:predicate emp:emptype ;
- rr:objectMap [ rr:column "empTypeURI" ]
+ rr:objectMap [ rr:column "empTypeURI" rr:termType rr:IRI; ]
];
rr:predicateObjectMap
[
rr:predicate rdf:type ;
- rr:objectMap [ rr:column "empTypeURI" ]
+ rr:objectMap [ rr:column "empTypeURI" rr:termType rr:IRI; ]
];
rr:predicateObjectMap
@@ -120,6 +120,7 @@
rr:predicateObjectMap [
rr:predicate emp:c_ref_deptno ;
rr:objectMap [
+ a rr:RefObjectMap ;
rr:parentTriplesMap <TriplesMap1>;
rr:joinCondition [
rr:child "\"deptno\"";
--- a/D014-3tables1primarykey1foreignkey/r2rmlc.ttl Mon Mar 26 20:32:56 2012 +0200
+++ b/D014-3tables1primarykey1foreignkey/r2rmlc.ttl Thu Mar 29 11:27:08 2012 +0200
@@ -18,7 +18,7 @@
""" ];
rr:subjectMap [ rr:column "deptId"; rr:termType rr:BlankNode;
- rr:inverseExpression "{"deptno"} = substr({deptId},length('Department')+1)"];
+ rr:inverseExpression "{\"deptno\"} = substr({deptId},length('Department')+1)"];
rr:predicateObjectMap
[
@@ -120,6 +120,7 @@
rr:predicateObjectMap [
rr:predicate emp:c_ref_deptno ;
rr:objectMap [
+ a rr:RefObjectMap ;
rr:parentTriplesMap <TriplesMap1>;
rr:joinCondition [
rr:child "\"deptno\"";
--- a/D014-3tables1primarykey1foreignkey/r2rmld.ttl Mon Mar 26 20:32:56 2012 +0200
+++ b/D014-3tables1primarykey1foreignkey/r2rmld.ttl Thu Mar 29 11:27:08 2012 +0200
@@ -14,7 +14,7 @@
WHEN 'CLERK' THEN 'general-office'
WHEN 'NIGHTGUARD' THEN 'security'
WHEN 'ENGINEER' THEN 'engineering'
- END) ROLE FROM "EMP"
+ END) AS ROLE FROM "EMP"
""" ];
rr:subjectMap [
--- a/D020-1table1column5rows/create.sql Mon Mar 26 20:32:56 2012 +0200
+++ b/D020-1table1column5rows/create.sql Thu Mar 29 11:27:08 2012 +0200
@@ -1,5 +1,5 @@
CREATE TABLE "Student" (
-"Name" VARCHAR(50),
+"Name" VARCHAR(50)
);
INSERT INTO "Student" ("Name") VALUES ('http://company.com/Alice');
Binary file ts1.zip has changed