New TCs, and new zip file with the tcs
authorBoris Villazon-Terrazas <bvillazon@fi.upm.es>
Fri, 10 Feb 2012 19:44:24 +0100
changeset 35 6dd133d4e29f
parent 34 b65581772625
child 36 888851fe3896
New TCs, and new zip file with the tcs
D001-1table1row/mappedb.nq
D002-1table2columns1row/mappedb.nq
D002-1table2columns1row/mappedi.nq
D007-1table1primarykey2columns1row/manifest.ttl
D007-1table1primarykey2columns1row/mappede.nq
D007-1table1primarykey2columns1row/mappedf.nq
D007-1table1primarykey2columns1row/mappedg.nq
D007-1table1primarykey2columns1row/r2rmlb.ttl
D007-1table1primarykey2columns1row/r2rmlg.ttl
D009-2tables1primarykey1foreingkey/manifest.ttl
D009-2tables1primarykey1foreingkey/mappedc.nq
D009-2tables1primarykey1foreingkey/mappedd.nq
D009-2tables1primarykey1foreingkey/r2rmlb.ttl
D009-2tables1primarykey1foreingkey/r2rmlc.ttl
D009-2tables1primarykey1foreingkey/r2rmld.ttl
D011-M2MRelations/mappeda.nq
D011-M2MRelations/r2rmlb.ttl
D012-2tables2duplicates0nulls/mappeda.nq
D012-2tables2duplicates0nulls/mappedb.nq
D014-3tablesExample/mappedb.nq
D014-3tablesExample/mappedc.nq
D014-3tablesExample/mappedd.nq
D014-3tablesExample/r2rmlb.ttl
D014-3tablesExample/r2rmlc.ttl
D014-3tablesExample/r2rmld.ttl
D014-3tablesExample/r2rmle.ttl
ts1.zip
--- a/D001-1table1row/mappedb.nq	Tue Nov 01 02:47:49 2011 +0100
+++ b/D001-1table1row/mappedb.nq	Fri Feb 10 19:44:24 2012 +0100
@@ -1,1 +1,1 @@
-_:AX2dX38ec05dcX3aX131488bea58X3aXX2dX7fff <http://xmlns.com/foaf/0.1/name> "Venus" .
+_:Venus <http://xmlns.com/foaf/0.1/name> "Venus" .
--- a/D002-1table2columns1row/mappedb.nq	Tue Nov 01 02:47:49 2011 +0100
+++ b/D002-1table2columns1row/mappedb.nq	Fri Feb 10 19:44:24 2012 +0100
@@ -1,3 +1,3 @@
-_:AX2dX38ec05dcX3aX131488bea58X3aXX2dX7ffd <http://xmlns.com/foaf/0.1/name> "Venus" .
-_:AX2dX38ec05dcX3aX131488bea58X3aXX2dX7ffd <http://example.com/id> "10"^^<http://www.w3.org/2001/XMLSchema#integer> .
-_:AX2dX38ec05dcX3aX131488bea58X3aXX2dX7ffd <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
+_:Student10 <http://xmlns.com/foaf/0.1/name> "Venus" .
+_:Student10 <http://example.com/id> "10"^^<http://www.w3.org/2001/XMLSchema#integer> .
+_:Student10 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
--- a/D002-1table2columns1row/mappedi.nq	Tue Nov 01 02:47:49 2011 +0100
+++ b/D002-1table2columns1row/mappedi.nq	Fri Feb 10 19:44:24 2012 +0100
@@ -1,3 +1,3 @@
-_:AX2dX38ec05dcX3aX131488bea58X3aXX2dX7ffd <http://xmlns.com/foaf/0.1/name> "Venus" .
-_:AX2dX38ec05dcX3aX131488bea58X3aXX2dX7ffd <http://example.com/id> "10"^^<http://www.w3.org/2001/XMLSchema#integer> .
-_:AX2dX38ec05dcX3aX131488bea58X3aXX2dX7ffd <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
+_:Student10 <http://xmlns.com/foaf/0.1/name> "Venus" .
+_:Student10 <http://example.com/id> "10"^^<http://www.w3.org/2001/XMLSchema#integer> .
+_:Student10 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
--- a/D007-1table1primarykey2columns1row/manifest.ttl	Tue Nov 01 02:47:49 2011 +0100
+++ b/D007-1table1primarykey2columns1row/manifest.ttl	Fri Feb 10 19:44:24 2012 +0100
@@ -7,7 +7,7 @@
 	dcterms:title "One table, one column, one primary key" ;
 	dcterms:identifier "D007-1table1primarykey2columns1row" ;
 	rdb2rdftest:sqlScriptFile "create.sql";
-	rdb2rdftest:relatedTestCase <dg0007>, <tc0007a>, <tc0007b>, <tc0007c>, <tc0007d>, <tc0007e>, <tc0007f>  ;
+	rdb2rdftest:relatedTestCase <dg0007>, <tc0007a>, <tc0007b>, <tc0007c>, <tc0007d>, <tc0007e>, <tc0007f>, <tc0007g>  ;
 .
 
 <dg0007> a rdb2rdftest:DirectMapping ;	
@@ -92,3 +92,15 @@
 	rdb2rdftest:hasExpectedOutput true ;
 	rdb2rdftest:mappingDocument "r2rmlf.ttl" ;
 .
+
+<tc0007g> a rdb2rdftest:R2RML ;	
+	dcterms:title "Empty R2RML mapping file" ; 
+	dcterms:identifier "R2RMLTC0007g" ;
+	test:purpose "Tests an empty R2RML mapping file that generates an empty output dataset" ;
+	test:specificationReference "#generated-rdf" ;
+	test:reviewStatus test:unreviewed ;
+	rdb2rdftest:database <d007> ;
+	rdb2rdftest:output "mappedg.nq" ;
+	rdb2rdftest:hasExpectedOutput true ;
+	rdb2rdftest:mappingDocument "r2rmlg.ttl" ;
+.
--- a/D007-1table1primarykey2columns1row/mappede.nq	Tue Nov 01 02:47:49 2011 +0100
+++ b/D007-1table1primarykey2columns1row/mappede.nq	Fri Feb 10 19:44:24 2012 +0100
@@ -1,3 +1,3 @@
-<http://example.com/Student10Venus> <http://example.com/id> "10"^^http://www.w3.org/2001/XMLSchema#integer <http://example.com/PersonGraph> .
+<http://example.com/Student10Venus> <http://example.com/id> "10"^^<http://www.w3.org/2001/XMLSchema#integer> <http://example.com/PersonGraph> .
 <http://example.com/Student10Venus> <http://xmlns.com/foaf/0.1/firstName> "Venus" <http://example.com/PersonGraph> .
 <http://example.com/Student10Venus> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> <http://example.com/PersonGraph> .
--- a/D007-1table1primarykey2columns1row/mappedf.nq	Tue Nov 01 02:47:49 2011 +0100
+++ b/D007-1table1primarykey2columns1row/mappedf.nq	Fri Feb 10 19:44:24 2012 +0100
@@ -1,3 +1,3 @@
 <http://example.com/Student10Venus> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> <http://example.com/PersonGraph> .
 <http://example.com/Student10Venus> <http://xmlns.com/foaf/0.1/firstName> "Venus" <http://example.com/PersonGraph> .
-<http://example.com/Student10Venus> <http://example.com/id> "10"^^http://www.w3.org/2001/XMLSchema#integer <http://example.com/PersonGraph> .
+<http://example.com/Student10Venus> <http://example.com/id> "10"^^<http://www.w3.org/2001/XMLSchema#integer> <http://example.com/PersonGraph> .
--- a/D007-1table1primarykey2columns1row/r2rmlb.ttl	Tue Nov 01 02:47:49 2011 +0100
+++ b/D007-1table1primarykey2columns1row/r2rmlb.ttl	Fri Feb 10 19:44:24 2012 +0100
@@ -9,7 +9,7 @@
 <TriplesMap1>
      a rr:TriplesMap;
 
-	rr:tableName "Student";
+	rr:logicalTable [ rr:tableName "Student"; ];
 
     rr:subjectMap [ rr:template "http://example.com/Student{ID}{Name}"; 
 				    rr:graph ex:PersonGraph;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/D007-1table1primarykey2columns1row/r2rmlg.ttl	Fri Feb 10 19:44:24 2012 +0100
@@ -0,0 +1,5 @@
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@base <http://mappingpedia.org/rdb2rdf/r2rml/tc/> .
+
+
--- a/D009-2tables1primarykey1foreingkey/manifest.ttl	Tue Nov 01 02:47:49 2011 +0100
+++ b/D009-2tables1primarykey1foreingkey/manifest.ttl	Fri Feb 10 19:44:24 2012 +0100
@@ -7,7 +7,7 @@
 	dcterms:title "Two tables 1 primary key 1 foreing key" ;
 	dcterms:identifier "D009-2tables1primarykey1foreingkey" ;
 	rdb2rdftest:sqlScriptFile "create.sql";
-	rdb2rdftest:relatedTestCase <dg0009>, <tc0009a>, <tc0009b> ;
+	rdb2rdftest:relatedTestCase <dg0009>, <tc0009a>, <tc0009b>, <tc0009c>, <tc0009d> ;
 .
 
 <dg0009> a rdb2rdftest:DirectMapping ;	
@@ -44,3 +44,27 @@
 	rdb2rdftest:hasExpectedOutput true ;
 	rdb2rdftest:mappingDocument "r2rmlb.ttl" ;
 .
+
+<tc0009c> a rdb2rdftest:R2RML ;	
+	dcterms:title "Unamed column in logical table" ; 
+	dcterms:identifier "R2RMLTC0009c" ;
+	test:purpose "Test a logical table with unamed column." ;
+	test:specificationReference "#dfn-logical-table" ;
+	test:reviewStatus test:unreviewed ;
+	rdb2rdftest:database <d009> ;
+	rdb2rdftest:output "mappedc.nq" ;
+	rdb2rdftest:hasExpectedOutput false ;
+	rdb2rdftest:mappingDocument "r2rmlc.ttl" ;
+.
+
+<tc0009d> a rdb2rdftest:R2RML ;	
+	dcterms:title "Named column in logical table" ; 
+	dcterms:identifier "R2RMLTC0009d" ;
+	test:purpose "Test a logical table named column." ;
+	test:specificationReference "#dfn-logical-table" ;
+	test:reviewStatus test:unreviewed ;
+	rdb2rdftest:database <d009> ;
+	rdb2rdftest:output "mappedd.nq" ;
+	rdb2rdftest:hasExpectedOutput true ;
+	rdb2rdftest:mappingDocument "r2rmld.ttl" ;
+.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/D009-2tables1primarykey1foreingkey/mappedd.nq	Fri Feb 10 19:44:24 2012 +0100
@@ -0,0 +1,8 @@
+<http://example.com/resource/student_Venus%20Williams> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/ontology/Student> .
+<http://example.com/resource/student_Venus%20Williams> <http://xmlns.com/foaf/0.1/name> "Venus Williams" . 
+<http://example.com/resource/student_Venus%20Williams> <http://example.com/numSport> "1"^^<http://www.w3.org/2001/XMLSchema#integer> . 
+<http://example.com/resource/student_Demi%20Moore> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/ontology/Student> .
+<http://example.com/resource/student_Demi%20Moore> <http://xmlns.com/foaf/0.1/name> "Demi Moore" . 
+<http://example.com/resource/student_Demi%20Moore> <http://example.com/numSport> "0"^^<http://www.w3.org/2001/XMLSchema#integer> . 
+
+
--- a/D009-2tables1primarykey1foreingkey/r2rmlb.ttl	Tue Nov 01 02:47:49 2011 +0100
+++ b/D009-2tables1primarykey1foreingkey/r2rmlb.ttl	Fri Feb 10 19:44:24 2012 +0100
@@ -15,7 +15,7 @@
         rr:template "http://example.com/resource/student_{ID}";
         rr:termType rr:IRI;
         rr:class <http://example.com/ontology/Student>;
-        rr:graphMap [ rr:graph <http://example.com/graph/students> ] ;
+        rr:graphMap [ rr:constant <http://example.com/graph/students> ] ;
     ]; 
 	
     rr:predicateObjectMap
@@ -25,7 +25,7 @@
              rr:column "Name";
              rr:termType rr:Literal;
       ];
-      rr:graphMap [ rr:graph <http://example.com/graph/students> ];
+      rr:graphMap [ rr:constant <http://example.com/graph/students> ];
     ];
 
     rr:predicateObjectMap
@@ -38,12 +38,12 @@
 				rr:parent "ID" ;
 		   ]
       ];
-      rr:graphMap [ rr:graph <http://example.com/graph/practise> ];
+      rr:graphMap [ rr:constant <http://example.com/graph/practise> ];
     ];
     .
 
 <TriplesMap2>
-    a rr:TriplesMapClass;
+    a rr:TriplesMap;
         
 		
 	rr:logicalTable [ rr:tableName  "Sport" ];
@@ -53,7 +53,7 @@
         rr:template "http://example.com/resource/sport_{ID}";
         rr:termType rr:IRI;
         rr:class <http://example.com/ontology/Sport>;
-        rr:graphMap [ rr:graph <http://example.com/graph/sports> ];
+        rr:graphMap [ rr:constant <http://example.com/graph/sports> ];
     ]; 
 	
     rr:predicateObjectMap
@@ -63,6 +63,6 @@
              rr:column "Name"; 
              rr:termType rr:Literal;
       ];
-      rr:graphMap [ rr:graph <http://example.com/graph/sports> ];
+      
     ];
 	.
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/D009-2tables1primarykey1foreingkey/r2rmlc.ttl	Fri Feb 10 19:44:24 2012 +0100
@@ -0,0 +1,33 @@
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
+@base <http://mappingpedia.org/rdb2rdf/r2rml/tc/> .
+
+<TriplesMap1>
+   a rr:TriplesMap;
+        
+   rr:logicalTable [ rr:sqlQuery """
+        SELECT Name, COUNT(Sport)
+        FROM Student
+        GROUP BY Name
+        """ ];
+	
+    rr:subjectMap 
+    [ 
+        rr:template "http://example.com/resource/student_{Name}";
+        rr:termType rr:IRI;
+        rr:class <http://example.com/ontology/Student>;
+    ]; 
+	
+    rr:predicateObjectMap
+    [ 
+      rr:predicateMap [ rr:constant foaf:name ]; 
+      rr:objectMap    [ 
+             rr:column "Name";
+             rr:termType rr:Literal;
+      ];
+    ];
+  .
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/D009-2tables1primarykey1foreingkey/r2rmld.ttl	Fri Feb 10 19:44:24 2012 +0100
@@ -0,0 +1,42 @@
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
+@base <http://mappingpedia.org/rdb2rdf/r2rml/tc/> .
+
+<TriplesMap1>
+   a rr:TriplesMap;
+        
+   rr:logicalTable [ rr:sqlQuery """
+        SELECT Name, COUNT(Sport) as SPORTCOUNT
+        FROM Student
+        GROUP BY Name
+        """ ];
+	
+    rr:subjectMap 
+    [ 
+        rr:template "http://example.com/resource/student_{Name}";
+        rr:termType rr:IRI;
+        rr:class <http://example.com/ontology/Student>;
+    ]; 
+	
+    rr:predicateObjectMap
+    [ 
+      rr:predicateMap [ rr:constant foaf:name ]; 
+      rr:objectMap    [ 
+             rr:column "Name";
+             rr:termType rr:Literal;
+      ];
+    ];
+
+   rr:predicateObjectMap
+    [ 
+      rr:predicateMap [ rr:constant ex:numSport ]; 
+      rr:objectMap    [ 
+             rr:column "SPORTCOUNT";
+             rr:datatype xsd:integer;
+      ];
+    ];
+  .
+
--- a/D011-M2MRelations/mappeda.nq	Tue Nov 01 02:47:49 2011 +0100
+++ b/D011-M2MRelations/mappeda.nq	Fri Feb 10 19:44:24 2012 +0100
@@ -1,19 +1,22 @@
 <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" .
 <http://example.com/11FernandoAlonso> <http://xmlns.com/foaf/0.1/firstName> "Fernando" .
-<http://example.com/11FernandoAlonso> <http://example.com/id> "11"^^<http://www.w3.org/2001/XMLSchema#integer> .
+<http://example.com/11FernandoAlonso> <http://example.com/id> "11"^^<http://www.w3.org/2001/XMLSchema#integer> .
\ No newline at end of file
--- a/D011-M2MRelations/r2rmlb.ttl	Tue Nov 01 02:47:49 2011 +0100
+++ b/D011-M2MRelations/r2rmlb.ttl	Fri Feb 10 19:44:24 2012 +0100
@@ -5,6 +5,7 @@
 @base <http://mappingpedia.org/rdb2rdf/r2rml/tc/> .
 
 <TriplesMap1>
+	a rr:TriplesMap; 
     rr:logicalTable [ rr:tableName "Student"; ] ;
     rr:subjectMap [
         rr:template "http://example.com/student/{ID}";
@@ -24,6 +25,7 @@
 	.	
     
 <TriplesMap2>
+	a rr:TriplesMap; 
     rr:logicalTable [ rr:tableName "Sport"; ] ;
     rr:subjectMap [
         rr:template "http://example.com/sport/{ID}";
@@ -43,6 +45,7 @@
 	.
 
 <LinkMap_1_2>
+	a rr:TriplesMap; 
    
    rr:logicalTable [ rr:tableName "Student_Sport" ];
    
--- a/D012-2tables2duplicates0nulls/mappeda.nq	Tue Nov 01 02:47:49 2011 +0100
+++ b/D012-2tables2duplicates0nulls/mappeda.nq	Fri Feb 10 19:44:24 2012 +0100
@@ -1,6 +1,6 @@
-_:AX2dX38ec05dcX3aX131488bea58X3aXX2dX7ff3 <http://example.com/amount> "30"^^<http://www.w3.org/2001/XMLSchema#float> .
-_:AX2dX38ec05dcX3aX131488bea58X3aXX2dX7ff3 <http://xmlns.com/foaf/0.1/name> "Bob Smith" .
-_:AX2dX38ec05dcX3aX131488bea58X3aXX2dX7ff3 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/IOU> .
-_:AX2dX38ec05dcX3aX131488bea58X3aXX2dX7ff2 <http://example.com/amount> "20"^^<http://www.w3.org/2001/XMLSchema#float> .
-_:AX2dX38ec05dcX3aX131488bea58X3aXX2dX7ff2 <http://xmlns.com/foaf/0.1/name> "Sue Jones" .
-_:AX2dX38ec05dcX3aX131488bea58X3aXX2dX7ff2 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/IOU> .
+_:Bob_Smith_30 <http://example.com/amount> "30"^^<http://www.w3.org/2001/XMLSchema#float> .
+_:Bob_Smith_30 <http://xmlns.com/foaf/0.1/name> "Bob Smith" .
+_:Bob_Smith_30 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/IOU> .
+_:Sue_Jones_20 <http://example.com/amount> "20"^^<http://www.w3.org/2001/XMLSchema#float> .
+_:Sue_Jones_20 <http://xmlns.com/foaf/0.1/name> "Sue Jones" .
+_:Sue_Jones_20 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/IOU> .
--- a/D012-2tables2duplicates0nulls/mappedb.nq	Tue Nov 01 02:47:49 2011 +0100
+++ b/D012-2tables2duplicates0nulls/mappedb.nq	Fri Feb 10 19:44:24 2012 +0100
@@ -1,6 +1,6 @@
-_:AX2dX38ec05dcX3aX131488bea58X3aXX2dX7fef <http://example.com/city> "London" .
-_:AX2dX38ec05dcX3aX131488bea58X3aXX2dX7fef <http://xmlns.com/foaf/0.1/name> "Bob Smith" .
-_:AX2dX38ec05dcX3aX131488bea58X3aXX2dX7fef <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/IOU> .
-_:AX2dX38ec05dcX3aX131488bea58X3aXX2dX7fee <http://example.com/amount> "Madrid" .
-_:AX2dX38ec05dcX3aX131488bea58X3aXX2dX7fee <http://xmlns.com/foaf/0.1/name> "Sue Jones" .
-_:AX2dX38ec05dcX3aX131488bea58X3aXX2dX7fee <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/IOU> .
+_:Bob_Smith_30 <http://example.com/city> "London" .
+_:Bob_Smith_30 <http://xmlns.com/foaf/0.1/name> "Bob Smith" .
+_:Bob_Smith_30 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/IOU> .
+_:Sue_Jones_20 <http://example.com/amount> "Madrid" .
+_:Sue_Jones_20 <http://xmlns.com/foaf/0.1/name> "Sue Jones" .
+_:Sue_Jones_20 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/IOU> .
--- a/D014-3tablesExample/mappedb.nq	Tue Nov 01 02:47:49 2011 +0100
+++ b/D014-3tablesExample/mappedb.nq	Fri Feb 10 19:44:24 2012 +0100
@@ -9,4 +9,9 @@
 <http://example.com/emp/7369> <http://example.com/emp#deptNum> "10"^^<http://www.w3.org/2001/XMLSchema#integer> <http://example.com/graph/CLERK/PART_TIME> .
 <http://example.com/emp/7369> <http://example.com/emp#etype> "PART TIME" <http://example.com/graph/CLERK/PART_TIME> .
 <http://example.com/emp/7369> <http://example.com/emp#c_ref_deptno> _:Department10 <http://example.com/graph/CLERK/PART_TIME> .
-<http://example.com/emp/7369> <http://example.com/emp#name> "SMITH" <http://example.com/emp#empNameGraph> .
\ No newline at end of file
+<http://example.com/emp/7369> <http://example.com/emp#name> "SMITH" <http://example.com/emp#empNameGraph> .
+_:Department10 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/ns#dept> <http://example.com/ns#DeptGraph> .
+_:Department10 <http://example.com/dept#deptno> "10"^^<http://www.w3.org/2001/XMLSchema#positiveInteger> <http://example.com/ns#dept> <http://example.com/ns#DeptGraph> .
+_:Department10 <http://example.com/dept#name> "APPSERVER" <http://example.com/ns#DeptGraph> .
+_:Department10 <http://example.com/dept#location> "NEW YORK" <http://example.com/ns#DeptGraph> .
+_:Department10 <http://example.com/dept#COMPANY> "EXAMPLE Corporation" <http://example.com/ns#DeptGraph> .
\ No newline at end of file
--- a/D014-3tablesExample/mappedc.nq	Tue Nov 01 02:47:49 2011 +0100
+++ b/D014-3tablesExample/mappedc.nq	Fri Feb 10 19:44:24 2012 +0100
@@ -3,10 +3,15 @@
 <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/graph/CLERK/PART_TIME> .
 <http://example.com/emp/7369> <http://example.com/emp#emptype> <http://example.com/emp/etype/PART_TIME>	<http://example.com/graph/CLERK/PART_TIME> .
 <http://example.com/emp/7369> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/emp/etype/PART_TIME> <http://example.com/graph/CLERK/PART_TIME> .
-<http://example.com/emp/7369> <http://example.com/emp#empno> "7369"^^<http://www.w3.org/2001/XMLSchema#integer>	<http://example.com/graph/CLERK/PART_TIME> .
+<http://example.com/emp/7369> <http://example.com/emp#empno> "7369"^^<http://www.w3.org/2001/XMLSchema#positiveInteger>	.
 <http://example.com/emp/7369> <http://example.com/emp#name> "SMITH"	<http://example.com/graph/CLERK/PART_TIME> .
 <http://example.com/emp/7369> <http://example.com/emp#job> "CLERK" <http://example.com/graph/CLERK/PART_TIME> .
 <http://example.com/emp/7369> <http://example.com/emp#deptNum> "10"^^<http://www.w3.org/2001/XMLSchema#integer> <http://example.com/graph/CLERK/PART_TIME> .
 <http://example.com/emp/7369> <http://example.com/emp#etype> "PART TIME" <http://example.com/graph/CLERK/PART_TIME> .
 <http://example.com/emp/7369> <http://example.com/emp#c_ref_deptno> _:Department10 <http://example.com/graph/CLERK/PART_TIME> .
 <http://example.com/emp/7369> <http://example.com/emp#name> "SMITH" <http://example.com/emp#empNameGraph> .
+_:Department10 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/ns#dept> <http://example.com/ns#DeptGraph> .
+_:Department10 <http://example.com/dept#deptno> "10"^^<http://www.w3.org/2001/XMLSchema#positiveInteger> <http://example.com/ns#dept> <http://example.com/ns#DeptGraph> .
+_:Department10 <http://example.com/dept#name> "APPSERVER" <http://example.com/ns#DeptGraph> .
+_:Department10 <http://example.com/dept#location> "NEW YORK" <http://example.com/ns#DeptGraph> .
+_:Department10 <http://example.com/dept#COMPANY> "EXAMPLE Corporation" <http://example.com/ns#DeptGraph> .
\ No newline at end of file
--- a/D014-3tablesExample/mappedd.nq	Tue Nov 01 02:47:49 2011 +0100
+++ b/D014-3tablesExample/mappedd.nq	Fri Feb 10 19:44:24 2012 +0100
@@ -11,7 +11,7 @@
 <http://example.com/emp/7369> <http://example.com/emp#c_ref_deptno> _:Department10 <http://example.com/graph/CLERK/PART_TIME> .
 <http://example.com/emp/7369> <http://example.com/emp#name> "SMITH" <http://example.com/emp#empNameGraph> .
 _:Department10 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/ns#dept> <http://example.com/ns#DeptGraph> .
-_:Department10 <http://example.com/dept#deptno> "10"^^xsd:positiveInteger <http://example.com/ns#dept> <http://example.com/ns#DeptGraph> .
-_:Department10 <http://example.com/dept#name> "APPSERVER" <http://example.com/ns#dept> <http://example.com/ns#DeptGraph> .
-_:Department10 <http://example.com/dept#location> "NEW YORK" <http://example.com/ns#dept> <http://example.com/ns#DeptGraph> .
-_:Department10 <http://example.com/dept#COMPANY> "EXAMPLE Corporation" <http://example.com/ns#dept> <http://example.com/ns#DeptGraph> .
+_:Department10 <http://example.com/dept#deptno> "10"^^<http://www.w3.org/2001/XMLSchema#positiveInteger> <http://example.com/ns#dept> <http://example.com/ns#DeptGraph> .
+_:Department10 <http://example.com/dept#name> "APPSERVER" <http://example.com/ns#DeptGraph> .
+_:Department10 <http://example.com/dept#location> "NEW YORK" <http://example.com/ns#DeptGraph> .
+_:Department10 <http://example.com/dept#COMPANY> "EXAMPLE Corporation" <http://example.com/ns#DeptGraph> .
--- a/D014-3tablesExample/r2rmlb.ttl	Tue Nov 01 02:47:49 2011 +0100
+++ b/D014-3tablesExample/r2rmlb.ttl	Fri Feb 10 19:44:24 2012 +0100
@@ -20,7 +20,7 @@
 
     rr:subjectMap [ rr:column "deptId"; rr:termType rr:BlankNode;
                     rr:class ex:dept; 
-                    rr:graphMap [ rr:graph ex:DeptGraph; ];
+                    rr:graphMap [ rr:constant ex:DeptGraph; ];
                     rr:inverseExpression "{deptno} = substr({deptId},length('Department')+1)"];
 
     rr:predicateObjectMap
@@ -44,7 +44,7 @@
     rr:predicateObjectMap 
     [ 
       rr:predicateMap [ rr:constant dept:COMPANY ]; 
-      rr:objectMap    [ rr:object "EXAMPLE Corporation" ]
+      rr:objectMap    [ rr:constant "EXAMPLE Corporation" ]
     ]
 .
 
@@ -101,7 +101,7 @@
     [ 
       rr:predicateMap [ rr:constant emp:name ]; 
       rr:objectMap    [ rr:column "ename" ]; 
-      rr:graphMap     [ rr:graph emp:empNameGraph ];
+      rr:graphMap     [ rr:constant emp:empNameGraph ];
     ];
 
     rr:predicateObjectMap 
--- a/D014-3tablesExample/r2rmlc.ttl	Tue Nov 01 02:47:49 2011 +0100
+++ b/D014-3tablesExample/r2rmlc.ttl	Fri Feb 10 19:44:24 2012 +0100
@@ -16,12 +16,12 @@
             , deptno
             , dname
             , loc
-         from SA.DEPT
+         from DEPT
        """ ];
 
     rr:subjectMap [ rr:column "deptId"; rr:termType rr:BlankNode;
                     rr:class ex:dept; 
-                    rr:graphMap [ rr:graph ex:DeptGraph; ];
+                    rr:graphMap [ rr:constant ex:DeptGraph; ];
                     rr:inverseExpression "{deptno} = substr({deptId},length('Department')+1)"];
 
     rr:predicateObjectMap
@@ -45,7 +45,7 @@
     rr:predicateObjectMap 
     [ 
       rr:predicateMap [ rr:constant dept:COMPANY ]; 
-      rr:objectMap    [ rr:object "EXAMPLE Corporation" ]
+      rr:objectMap    [ rr:constant "EXAMPLE Corporation" ]
     ]
 .
 
@@ -93,7 +93,7 @@
     [ 
       rr:predicateMap [ rr:constant emp:name ]; 
       rr:objectMap    [ rr:column "ename" ]; 
-      rr:graphMap     [ rr:graph emp:empNameGraph ];
+      rr:graphMap     [ rr:constant emp:empNameGraph ];
     ];
 
     rr:predicateObjectMap 
--- a/D014-3tablesExample/r2rmld.ttl	Tue Nov 01 02:47:49 2011 +0100
+++ b/D014-3tablesExample/r2rmld.ttl	Fri Feb 10 19:44:24 2012 +0100
@@ -14,12 +14,12 @@
             , deptno
             , dname
             , loc
-         from SA.DEPT
+         from DEPT
        """ ];
 
     rr:subjectMap [ rr:column "deptId"; rr:termType rr:BlankNode;
                     rr:class ex:dept; 
-                    rr:graphMap [ rr:graph ex:DeptGraph; ];
+                    rr:graphMap [ rr:constant ex:DeptGraph; ];
                     rr:inverseExpression "{deptno} = substr({deptId},length('Department')+1)"];
 
     rr:predicateObjectMap
@@ -43,7 +43,7 @@
     rr:predicateObjectMap 
     [ 
       rr:predicateMap [ rr:constant dept:COMPANY ]; 
-      rr:objectMap    [ rr:object "EXAMPLE Corporation" ]
+      rr:objectMap    [ rr:constant "EXAMPLE Corporation" ]
     ]
 .
 
@@ -102,7 +102,7 @@
     [ 
       rr:predicateMap [ rr:constant emp:name ]; 
       rr:objectMap    [ rr:column "ename" ]; 
-      rr:graphMap     [ rr:graph emp:empNameGraph ];
+      rr:graphMap     [ rr:constant emp:empNameGraph ];
     ];
 
     rr:predicateObjectMap 
--- a/D014-3tablesExample/r2rmle.ttl	Tue Nov 01 02:47:49 2011 +0100
+++ b/D014-3tablesExample/r2rmle.ttl	Fri Feb 10 19:44:24 2012 +0100
@@ -13,12 +13,12 @@
       Select ('http://example.com/emp/' || id) AS empId
            , ('http://example.com/emp/likes/' || likeType) AS empLikes
            , likedObj
-        from SA.LIKES
+        from LIKES
       """ ];
 
     rr:subjectMap [
       rr:column "empId";
-      rr:graphMap [ rr:graph ex:LikesGraph ];
+      rr:graphMap [ rr:constant ex:LikesGraph ];
     ];
 
     rr:predicateObjectMap 
Binary file ts1.zip has changed