--- a/D002-1table2columns1row/directGraph.nt Sat Aug 06 21:33:16 2011 +0100
+++ b/D002-1table2columns1row/directGraph.nt Mon Aug 08 01:12:58 2011 +0100
@@ -1,3 +1,3 @@
_:a a <Student> .
-_:a <Student#id> 10 .
-_:a <Student#name> "Venus" .
+_:a <Student#ID> 10 .
+_:a <Student#Name> "Venus" .
--- a/D004-1table2columnsprojection/r2rmlb.ttl Sat Aug 06 21:33:16 2011 +0100
+++ b/D004-1table2columnsprojection/r2rmlb.ttl Mon Aug 08 01:12:58 2011 +0100
@@ -8,12 +8,12 @@
a rr:TriplesMap;
rr:logicalTable [ rr:SQLQuery """
- Select ('Student' || Student) AS StudentId
+ Select ('Student' || Student) AS StudentId, Student
from Student_Sport
""";
] ;
- rr:subjectMap [ rr:column "StudentId"; rr:termtype rr:BlankNode;
+ rr:subjectMap [ rr:column "StudentId"; rr:termType rr:BlankNode;
rr:class ex:Student ];
rr:predicateObjectMap
@@ -27,11 +27,11 @@
a rr:TriplesMap;
rr:SQLQuery """
- Select ('Sport' || Sport) AS SportId
+ Select ('Sport' || Sport) AS SportId, Sport
from Student_Sport
""";
- rr:subjectMap [ rr:column "SportId"; rr:termtype rr:BlankNode;
+ rr:subjectMap [ rr:column "SportId"; rr:termType rr:BlankNode;
rr:class ex:Sport ];
rr:predicateObjectMap
--- a/D009-2tables1primarykey1foreingkey/r2rml.ttl Sat Aug 06 21:33:16 2011 +0100
+++ b/D009-2tables1primarykey1foreingkey/r2rml.ttl Mon Aug 08 01:12:58 2011 +0100
@@ -28,9 +28,9 @@
rr:graphMap [ rr:graph <http://example.com/graph/students> ];
];
- rr:refPredicateObjectMap
+ rr:predicateObjectMap
[
- rr:refPredicateMap [ rr:predicate <http://example.com/ontology/practises> ];
+ rr:predicateMap [ rr:predicate <http://example.com/ontology/practises> ];
rr:refObjectMap [
rr:parentTriplesMap <TriplesMap2>;
rr:joinCondition [
@@ -43,7 +43,7 @@
.
<TriplesMap2>
- a rr:TriplesMapClass;
+ a rr:TriplesMap;
rr:logicalTable [ rr:tableName "Sport" ];
--- a/D011-M2MRelations/mappeda.nq Sat Aug 06 21:33:16 2011 +0100
+++ b/D011-M2MRelations/mappeda.nq Mon Aug 08 01:12:58 2011 +0100
@@ -1,17 +1,20 @@
<http://example.com/110Tennis> <http://example.com/description> "Tennis" .
<http://example.com/110Tennis> <http://example.com/id> "110"^^<http://www.w3.org/2001/XMLSchema#integer> .
+<http://example.com/110Tennis> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/Sport> .
<http://example.com/10VenusWilliams> <http://example.com/plays> <http://example.com/110Tennis> .
<http://example.com/10VenusWilliams> <http://xmlns.com/foaf/0.1/lastName> "Williams" .
<http://example.com/10VenusWilliams> <http://xmlns.com/foaf/0.1/firstName> "Venus" .
<http://example.com/10VenusWilliams> <http://example.com/id> "10"^^<http://www.w3.org/2001/XMLSchema#integer> .
<http://example.com/111Football> <http://example.com/description> "Football" .
<http://example.com/111Football> <http://example.com/id> "111"^^<http://www.w3.org/2001/XMLSchema#integer> .
+<http://example.com/111Football> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/Sport> .
<http://example.com/12DavidVilla> <http://example.com/plays> <http://example.com/111Football> .
<http://example.com/12DavidVilla> <http://xmlns.com/foaf/0.1/lastName> "Villa" .
<http://example.com/12DavidVilla> <http://xmlns.com/foaf/0.1/firstName> "David" .
<http://example.com/12DavidVilla> <http://example.com/id> "12"^^<http://www.w3.org/2001/XMLSchema#integer> .
<http://example.com/112Formula1> <http://example.com/description> "Formula1" .
<http://example.com/112Formula1> <http://example.com/id> "112"^^<http://www.w3.org/2001/XMLSchema#integer> .
+<http://example.com/112Formula1> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/Sport> .
<http://example.com/11FernandoAlonso> <http://example.com/plays> <http://example.com/112Formula1> .
<http://example.com/11FernandoAlonso> <http://example.com/plays> <http://example.com/111Football> .
<http://example.com/11FernandoAlonso> <http://xmlns.com/foaf/0.1/lastName> "Alonso" .
--- a/D011-M2MRelations/r2rmlb.ttl Sat Aug 06 21:33:16 2011 +0100
+++ b/D011-M2MRelations/r2rmlb.ttl Mon Aug 08 01:12:58 2011 +0100
@@ -5,7 +5,8 @@
@base <http://mappingpedia.org/rdb2rdf/r2rml/tc/> .
<TriplesMap1>
- rr:logicalTable [ rr:tableName "Student"; ]
+ a rr:TriplesMap;
+ rr:logicalTable [ rr:tableName "Student"; ] ;
rr:subjectMap [
rr:template "http://example.com/student/{ID}";
rr:class ex:Student;
@@ -24,7 +25,8 @@
.
<TriplesMap2>
- rr:logicalTable [ rr:tableName "Sport"; ]
+ a rr:TriplesMap;
+ rr:logicalTable [ rr:tableName "Sport"; ] ;
rr:subjectMap [
rr:template "http://example.com/sport/{ID}";
rr:class ex:Sport;
@@ -43,7 +45,7 @@
.
<LinkMap_1_2>
-
+ a rr:TriplesMap;
rr:logicalTable [ rr:tableName "Student_Sport" ];
rr:subjectMap [ rr:template "http://example.com/student/{ID_Student}" ];
--- a/D012-2tables2duplicates0nulls/r2rmla.ttl Sat Aug 06 21:33:16 2011 +0100
+++ b/D012-2tables2duplicates0nulls/r2rmla.ttl Mon Aug 08 01:12:58 2011 +0100
@@ -11,7 +11,7 @@
rr:subjectMap [
rr:template "{fname}_{lname}_{amount}";
- rr:termtype rr:BlankNode;
+ rr:termType rr:BlankNode;
rr:class ex:IOU;
];
@@ -20,7 +20,7 @@
rr:predicateMap [ rr:predicate foaf:name ];
rr:objectMap [
rr:template "{fname} {lname}";
- rr:termtype rr:Literal ;
+ rr:termType rr:Literal ;
]
];
@@ -29,7 +29,7 @@
rr:predicateMap [ rr:predicate ex:amount ];
rr:objectMap [
rr:column "amount";
- rr:termtype rr:Literal ;
+ rr:termType rr:Literal ;
rr:datatype xsd:float ;
]
];
--- a/D012-2tables2duplicates0nulls/r2rmlb.ttl Sat Aug 06 21:33:16 2011 +0100
+++ b/D012-2tables2duplicates0nulls/r2rmlb.ttl Mon Aug 08 01:12:58 2011 +0100
@@ -11,7 +11,7 @@
rr:subjectMap [
rr:template "{fname}_{lname}";
- rr:termtype rr:BlankNode ;
+ rr:termType rr:BlankNode ;
rr:class ex:IOU;
];
@@ -20,7 +20,7 @@
rr:predicateMap [ rr:predicate foaf:name ];
rr:objectMap [
rr:template "{fname} {lname}";
- rr:termtype rr:Literal ;
+ rr:termType rr:Literal ;
]
];
.
@@ -31,8 +31,8 @@
rr:subjectMap [
rr:template "{fname}_{lname}";
- rr:termtype rr:BlankNode;
- rr:class ex:IOU;
+ rr:termType rr:BlankNode;
+ rr:class ex:Lives;
];
rr:predicateObjectMap
@@ -40,7 +40,7 @@
rr:predicateMap [ rr:predicate ex:city ];
rr:objectMap [
rr:column "city";
- rr:termtype rr:Literal ;
+ rr:termType rr:Literal ;
]
];
.
\ No newline at end of file
--- a/D013-1table3columns2rows1nullvalue/directGraph.nt Sat Aug 06 21:33:16 2011 +0100
+++ b/D013-1table3columns2rows1nullvalue/directGraph.nt Mon Aug 08 01:12:58 2011 +0100
@@ -3,8 +3,10 @@
<Person#DateOfBirth> rdfs:domain <Person> .
<Person/ID=1> a <Person> .
+<Person/ID=1> <Person#ID> 1 .
<Person/ID=1> <Person#Name> "Alice" .
<Person/ID=2> a <Person> .
+<Person/ID=2> <Person#ID> 2 .
<Person/ID=2> <Person#Name> "Bob" .
<Person/ID=2> <Person#DateOfBirth> "September, 2010" .
\ No newline at end of file
--- a/D014-3tablesExample/r2rmla.ttl Sat Aug 06 21:33:16 2011 +0100
+++ b/D014-3tablesExample/r2rmla.ttl Mon Aug 08 01:12:58 2011 +0100
@@ -9,11 +9,11 @@
<TriplesMap1>
a rr:TriplesMap;
rr:logicalTable [ rr:sqlQuery """
- Select ('Department' || "deptno") AS "deptId"
- , "deptno"
- , "dname"
- , "loc"
- from SCOTT.DEPT
+ Select ('Department' || deptno) AS deptId
+ , deptno
+ , dname
+ , loc
+ from DEPT
""" ];
rr:subjectMap [ rr:column "deptId"; rr:termType rr:BlankNode;
--- a/D014-3tablesExample/r2rmlb.ttl Sat Aug 06 21:33:16 2011 +0100
+++ b/D014-3tablesExample/r2rmlb.ttl Mon Aug 08 01:12:58 2011 +0100
@@ -60,7 +60,7 @@
, ('http://example.com/emp/etype/'|| etype) AS empTypeURI
, etype
, ('http://example.com/graph/'|| job || '/' || etype) AS graphURI
- from SCOTT.EMP
+ from EMP
""" ];
rr:subjectMap [ rr:column "empURI";