Update TCs according to Richard comments III
authorBoris Villazon-Terrazas <bvillazon@fi.upm.es>
Tue, 13 Mar 2012 02:30:47 +0100
changeset 70 7866839f6bb2
parent 69 f4aa7ea4a7b0
child 71 9cf64d1fbc6c
Update TCs according to Richard comments III
D001-1table1column1row/manifest.ttl
D001-1table1column1row/mappedb.nq
D001-1table1column1row/r2rmla.ttl
D001-1table1column1row/r2rmlb.ttl
D002-1table2columns1row/manifest.ttl
D002-1table2columns1row/mappedb.nq
D002-1table2columns1row/r2rmla.ttl
D002-1table2columns1row/r2rmlb.ttl
D002-1table2columns1row/r2rmlf.ttl
D002-1table2columns1row/r2rmli.ttl
D003-1table3columns1row/create.sql
D003-1table3columns1row/manifest.ttl
D003-1table3columns1row/mappedb.nq
D003-1table3columns1row/r2rmla.ttl
D003-1table3columns1row/r2rmlb.ttl
D004-1table2columns1row/manifest.ttl
D004-1table2columns1row/r2rmlb.ttl
D006-1table1primarykey1column1row/manifest.ttl
D006-1table1primarykey1column1row/mappeda.nq
D006-1table1primarykey1column1row/r2rmla.ttl
D007-1table1primarykey2columns1row/manifest.ttl
D007-1table1primarykey2columns1row/mappeda.nq
D007-1table1primarykey2columns1row/mappedb.nq
D007-1table1primarykey2columns1row/mappedc.nq
D007-1table1primarykey2columns1row/mappedd.nq
D007-1table1primarykey2columns1row/mappede.nq
D007-1table1primarykey2columns1row/mappedf.nq
D007-1table1primarykey2columns1row/mappedh.nq
D007-1table1primarykey2columns1row/r2rmla.ttl
D007-1table1primarykey2columns1row/r2rmlb.ttl
D007-1table1primarykey2columns1row/r2rmlc.ttl
D007-1table1primarykey2columns1row/r2rmld.ttl
D007-1table1primarykey2columns1row/r2rmle.ttl
D007-1table1primarykey2columns1row/r2rmlf.ttl
D007-1table1primarykey2columns1row/r2rmlg.ttl
D007-1table1primarykey2columns1row/r2rmlh.ttl
D007-1table1primarykey2columns1row/r2rmli.ttl
D008-1table1compositeprimarykey3columns1row/manifest.ttl
D008-1table1compositeprimarykey3columns1row/mappeda.nq
D008-1table1compositeprimarykey3columns1row/mappedb.nq
D008-1table1compositeprimarykey3columns1row/mappedc.nq
D008-1table1compositeprimarykey3columns1row/r2rmla.ttl
D008-1table1compositeprimarykey3columns1row/r2rmlb.ttl
D008-1table1compositeprimarykey3columns1row/r2rmlc.ttl
D009-2tables1primarykey1foreignkey/manifest.ttl
D009-2tables1primarykey1foreignkey/mappeda.nq
D009-2tables1primarykey1foreignkey/mappedd.nq
D009-2tables1primarykey1foreignkey/r2rmla.ttl
D009-2tables1primarykey1foreignkey/r2rmlb.ttl
D009-2tables1primarykey1foreignkey/r2rmlc.ttl
D009-2tables1primarykey1foreignkey/r2rmld.ttl
D010-1table1primarykey3colums3rows/manifest.ttl
D010-1table1primarykey3colums3rows/mappedb.nq
D010-1table1primarykey3colums3rows/mappedc.nq
D010-1table1primarykey3colums3rows/r2rmla.ttl
D010-1table1primarykey3colums3rows/r2rmlb.ttl
D010-1table1primarykey3colums3rows/r2rmlc.ttl
D011-M2MRelations/manifest.ttl
D011-M2MRelations/mappeda.nq
D011-M2MRelations/mappedb.nq
D011-M2MRelations/r2rmla.ttl
D011-M2MRelations/r2rmlb.ttl
D012-2tables2duplicates0nulls/manifest.ttl
D012-2tables2duplicates0nulls/mappeda.nq
D012-2tables2duplicates0nulls/mappedb.nq
D012-2tables2duplicates0nulls/r2rmla.ttl
D012-2tables2duplicates0nulls/r2rmlb.ttl
D012-2tables2duplicates0nulls/r2rmlc.ttl
D012-2tables2duplicates0nulls/r2rmld.ttl
D013-1table1primarykey3columns2rows1nullvalue/manifest.ttl
D013-1table1primarykey3columns2rows1nullvalue/mappeda.nq
D013-1table1primarykey3columns2rows1nullvalue/r2rmla.ttl
D014-3tables1primarykey1foreignkey/manifest.ttl
D014-3tables1primarykey1foreignkey/mappeda.nq
D014-3tables1primarykey1foreignkey/mappedb.nq
D014-3tables1primarykey1foreignkey/mappedc.nq
D014-3tables1primarykey1foreignkey/mappedd.nq
D014-3tables1primarykey1foreignkey/r2rmla.ttl
D014-3tables1primarykey1foreignkey/r2rmlb.ttl
D014-3tables1primarykey1foreignkey/r2rmlc.ttl
D014-3tables1primarykey1foreignkey/r2rmld.ttl
D015-1table3columns1composityeprimarykey3rows2languages/manifest.ttl
D015-1table3columns1composityeprimarykey3rows2languages/r2rmla.ttl
D016-1table1primarykey10columns3rowsSQLdatatypes/directGraph.nt
D016-1table1primarykey10columns3rowsSQLdatatypes/manifest.ttl
D016-1table1primarykey10columns3rowsSQLdatatypes/mappeda.nq
D016-1table1primarykey10columns3rowsSQLdatatypes/mappedb.nq
D016-1table1primarykey10columns3rowsSQLdatatypes/r2rmla.ttl
D016-1table1primarykey10columns3rowsSQLdatatypes/r2rmlb.ttl
D016-1table1primarykey10columns3rowsSQLdatatypes/r2rmlc.ttl
D016-1table1primarykey10columns3rowsSQLdatatypes/r2rmld.ttl
D018-1table1primarykey2columns3rows/r2rmla.ttl
D019-1table1primarykey3columns3rows/create.sql
D019-1table1primarykey3columns3rows/manifest.ttl
D019-1table1primarykey3columns3rows/mappeda.nq
D020-1table1column5rows/create.sql
D020-1table1column5rows/manifest.ttl
D020-1table1column5rows/mappeda.nq
D020-1table1column5rows/r2rmla.ttl
D020-1table1column5rows/r2rmlb.ttl
ts1.zip
--- a/D001-1table1column1row/manifest.ttl	Mon Mar 12 15:51:52 2012 +0100
+++ b/D001-1table1column1row/manifest.ttl	Tue Mar 13 02:30:47 2012 +0100
@@ -22,9 +22,9 @@
 .
 
 <tc0001a> a rdb2rdftest:R2RML ;	
-	dcterms:title "One column mapping" ; 
+	dcterms:title "One column mapping, subject URI generation by using rr:template" ; 
 	dcterms:identifier "R2RMLTC0001a" ;
-	test:purpose "Tests: (1) one column mapping; (2) subject URI generation by using one single column; (3) one column to one property" ;
+	test:purpose "Tests: (1) one column mapping; (2) subject URI generation by using rr:tmplate; (3) one column to one property" ;
 	test:specificationReference "#dfn-template-valued-term-map" ;
 	test:reviewStatus test:unreviewed ;
 	rdb2rdftest:database <d001> ;
@@ -34,9 +34,9 @@
 .
 
 <tc0001b> a rdb2rdftest:R2RML ;	
-	dcterms:title "One column mapping" ; 
+	dcterms:title "One column mapping, generation of a BlankNode subject by using rr:termType" ; 
 	dcterms:identifier "R2RMLTC0001b" ;
-	test:purpose "Tests: (1) one column mapping; (2) generation of a BlankNode subject; (3) one column to one property" ;
+	test:purpose "Tests: (1) one column mapping; (2) generation of a BlankNode subject by using rr:termType; (3) one column to one property" ;
 	test:specificationReference "#termtype" ;
 	test:reviewStatus test:unreviewed ;
 	rdb2rdftest:database <d001> ;
--- a/D001-1table1column1row/mappedb.nq	Mon Mar 12 15:51:52 2012 +0100
+++ b/D001-1table1column1row/mappedb.nq	Tue Mar 13 02:30:47 2012 +0100
@@ -1,1 +1,1 @@
-_:Venus <http://xmlns.com/foaf/0.1/name> "Venus" .
+_:students/Venus <http://xmlns.com/foaf/0.1/name> "Venus" .
--- a/D001-1table1column1row/r2rmla.ttl	Mon Mar 12 15:51:52 2012 +0100
+++ b/D001-1table1column1row/r2rmla.ttl	Tue Mar 13 02:30:47 2012 +0100
@@ -13,7 +13,7 @@
 	
     rr:predicateObjectMap
     [ 
-      rr:predicate	  foaf:name ; 
-      rr:objectMap    [ rr:column "\"Name\"" ]
+      rr:predicate		foaf:name ; 
+      rr:objectMap		[ rr:column "\"Name\"" ]
     ]
     .
--- a/D001-1table1column1row/r2rmlb.ttl	Mon Mar 12 15:51:52 2012 +0100
+++ b/D001-1table1column1row/r2rmlb.ttl	Tue Mar 13 02:30:47 2012 +0100
@@ -9,7 +9,7 @@
     
     rr:logicalTable [ rr:tableName "\"Student\"" ];
 
-    rr:subjectMap [ rr:column "\"Name\""; rr:termType rr:BlankNode ]; 
+    rr:subjectMap [ rr:template "students/{\"Name\"}"; rr:termType rr:BlankNode ]; 
 	
     rr:predicateObjectMap
     [ 
--- a/D002-1table2columns1row/manifest.ttl	Mon Mar 12 15:51:52 2012 +0100
+++ b/D002-1table2columns1row/manifest.ttl	Tue Mar 13 02:30:47 2012 +0100
@@ -22,9 +22,9 @@
 .
 
 <tc0002a> a rdb2rdftest:R2RML ;	
-	dcterms:title "Two columns mapping, generation of a subject URI" ; 
+	dcterms:title "Two columns mapping, generation of a subject URI by the concatenation of two column values" ; 
 	dcterms:identifier "R2RMLTC0002a" ;
-	test:purpose "Tests: (1) two column mapping, no primary key; (2) subject URI generated by concatenation of two column values; (3) one column to one property; (4) presence of unqualified name for a rr:tableName" ;
+	test:purpose "Tests: (1) two column mapping, no primary key; (2) subject URI generated by the concatenation of two column values; (3) one column to one property" ;
 	test:specificationReference "#from-template" ;
 	test:reviewStatus test:unreviewed ;
 	rdb2rdftest:database <d002> ;
@@ -34,9 +34,9 @@
 .
 
 <tc0002b> a rdb2rdftest:R2RML ;	
-	dcterms:title "Two columns mapping, generation of a \"BlankNode\" subject" ; 
+	dcterms:title "Two columns mapping, generation of a BlankNode subject by using rr:template and rr:termType" ; 
 	dcterms:identifier "R2RMLTC0002b" ;
-	test:purpose "Tests: (1) two column mapping, no primary key; (2) generation of a \"BlankNode\" subject by using rr:template; (3) one column to one property" ;
+	test:purpose "Tests: (1) two column mapping, no primary key; (2) generation of a BlankNode subject by using rr:template; (3) one column to one property" ;
 	test:specificationReference "#termtype" ;
 	test:reviewStatus test:unreviewed ;
 	rdb2rdftest:database <d002> ;
@@ -58,10 +58,10 @@
 .
 
 <tc0002d> a rdb2rdftest:R2RML ;	
-	dcterms:title "Two columns mapping, generation of a \"BlankNode\" subject" ; 
+	dcterms:title "Two columns mapping, generation of a BlankNode subject by using a SQL Query that concatenates two columns" ; 
 	dcterms:identifier "R2RMLTC0002d" ;
-	test:purpose "Tests (1) two column mapping, no primary key; (2) generation of a \"BlankNode\" subject by using a SQL Query that concatenates two columns; (3) one column to one property" ;
-	test:specificationReference "#termtype" ;
+	test:purpose "Tests (1) two column mapping, no primary key; (2) generation of a BlankNode subject by using a SQL Query that concatenates two columns; (3) one column to one property" ;
+	test:specificationReference "#dfn-sql-query" ;
 	test:reviewStatus test:unreviewed ;
 	rdb2rdftest:database <d002> ;
 	rdb2rdftest:hasExpectedOutput true ;
@@ -82,14 +82,14 @@
 .
 
 <tc0002f> a rdb2rdftest:R2RML ;	
-	dcterms:title "Two columns mapping, schema-qualified name for a rr:tableName" ; 
+	dcterms:title "Two columns mapping, delimited identifiers referenced as regular identifiers" ; 
 	dcterms:identifier "R2RMLTC0002f" ;
-	test:purpose "Tests the presence of schema-qualified name for a rr:tableName" ;
+	test:purpose "Tests the presence of delimited identifiers referenced as regular identifiers. Within rr:template ID is ok, but Name is not" ;
 	test:specificationReference "#from-template" ;
 	test:reviewStatus test:unreviewed ;
 	rdb2rdftest:database <d002> ;
-	rdb2rdftest:output "mappedf.nq" ;
-	rdb2rdftest:hasExpectedOutput true ;	
+	rdb2rdftest:hasExpectedOutput false ;	
+	rdb2rdftest:failMessage "non-conforming R2RML mapping";	
 	rdb2rdftest:mappingDocument "r2rmlf.ttl" ;
 .
 
@@ -113,6 +113,7 @@
 	test:reviewStatus test:unreviewed ;
 	rdb2rdftest:database <d002> ;
 	rdb2rdftest:hasExpectedOutput false ;
+	rdb2rdftest:failMessage "non-conforming R2RML mapping";		
 	rdb2rdftest:mappingDocument "r2rmlh.ttl" ;
 .
 
@@ -120,7 +121,7 @@
 	dcterms:title "Two columns mapping, SQL Version identifier" ; 
 	dcterms:identifier "R2RMLTC0002i" ;
 	test:purpose "Tests the presence of a SQL Version identifier " ;
-	test:specificationReference "#r2rml-views" ;
+	test:specificationReference "#dfn-sql-version-identifier" ;
 	test:reviewStatus test:unreviewed ;
 	rdb2rdftest:database <d002> ;
 	rdb2rdftest:output "mappedi.nq" ;
--- a/D002-1table2columns1row/mappedb.nq	Mon Mar 12 15:51:52 2012 +0100
+++ b/D002-1table2columns1row/mappedb.nq	Tue Mar 13 02:30:47 2012 +0100
@@ -1,1 +1,1 @@
-_:Student10 <http://xmlns.com/foaf/0.1/name> "Venus" .
+_:students/10 <http://xmlns.com/foaf/0.1/name> "Venus" .
--- a/D002-1table2columns1row/r2rmla.ttl	Mon Mar 12 15:51:52 2012 +0100
+++ b/D002-1table2columns1row/r2rmla.ttl	Tue Mar 13 02:30:47 2012 +0100
@@ -15,7 +15,7 @@
     rr:predicateObjectMap
     [ 
       rr:predicate		ex:id ; 
-      rr:objectMap		[ rr:column "\"ID\""; rr:datatype xsd:integer ]
+      rr:objectMap		[ rr:column "\"ID\""; ]
     ];
 
     rr:predicateObjectMap
--- a/D002-1table2columns1row/r2rmlb.ttl	Mon Mar 12 15:51:52 2012 +0100
+++ b/D002-1table2columns1row/r2rmlb.ttl	Tue Mar 13 02:30:47 2012 +0100
@@ -9,7 +9,7 @@
     
     rr:logicalTable [ rr:tableName "\"Student\""; ];
 
-    rr:subjectMap [ rr:template "Student{\"ID\"}" rr:termType rr:BlankNode;  ];
+    rr:subjectMap [ rr:template "students/{\"ID\"}" rr:termType rr:BlankNode;  ];
 
     rr:predicateObjectMap
     [ 
--- a/D002-1table2columns1row/r2rmlf.ttl	Mon Mar 12 15:51:52 2012 +0100
+++ b/D002-1table2columns1row/r2rmlf.ttl	Tue Mar 13 02:30:47 2012 +0100
@@ -9,13 +9,13 @@
     
     rr:logicalTable [ rr:tableName "\"Student\"" ];
 
-    rr:subjectMap [ rr:template "http://example.com/{\"ID\"}{\"Name\"}";
+    rr:subjectMap [ rr:template "http://example.com/{ID}/{Name}";
                     rr:class foaf:Person ];
 
     rr:predicateObjectMap
     [ 
       rr:predicate		ex:id ; 
-      rr:objectMap		[ rr:column "\"ID\""; rr:datatype xsd:integer ]
+      rr:objectMap		[ rr:column "\"ID\"";  ]
     ];
 
     rr:predicateObjectMap
--- a/D002-1table2columns1row/r2rmli.ttl	Mon Mar 12 15:51:52 2012 +0100
+++ b/D002-1table2columns1row/r2rmli.ttl	Tue Mar 13 02:30:47 2012 +0100
@@ -22,7 +22,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/create.sql	Mon Mar 12 15:51:52 2012 +0100
+++ b/D003-1table3columns1row/create.sql	Tue Mar 13 02:30:47 2012 +0100
@@ -1,6 +1,6 @@
 CREATE TABLE "Student" (
-"ID" integer,
-"FirstName" varchar(50),
-"LastName" varchar(50)
+"ID" INTEGER,
+"FirstName" VARCHAR(50),
+"LastName" VARCHAR(50)
 );
 INSERT INTO "Student" ("ID", "FirstName", "LastName") VALUES (10,'Venus', 'Williams');
--- a/D003-1table3columns1row/manifest.ttl	Mon Mar 12 15:51:52 2012 +0100
+++ b/D003-1table3columns1row/manifest.ttl	Tue Mar 13 02:30:47 2012 +0100
@@ -7,7 +7,7 @@
 	dcterms:title "One table, three columns, one row, no primary key" ;
 	dcterms:identifier "D003-1table3columns1row" ;
 	rdb2rdftest:sqlScriptFile "create.sql";
-	rdb2rdftest:relatedTestCase <dg0003>, <tc0003a>, <tc0003b>, <tc0003c>, <tc0003d> ;
+	rdb2rdftest:relatedTestCase <dg0003>, <tc0003a>, <tc0003b>, <tc0003c> ;
 .
 
 <dg0003> a rdb2rdftest:DirectMapping ;	
@@ -22,22 +22,22 @@
 .
 
 <tc0003a> a rdb2rdftest:R2RML ;	
-	dcterms:title "Three columns mapping, concatenation of two column values" ; 
+	dcterms:title "Three columns mapping, undefined SQL Version identifier" ; 
 	dcterms:identifier "R2RMLTC0003a" ;
-	test:purpose "Tests: (1) three column mapping; (2) subject URI generated by concatenation of two column values; (3) one column to one property" ;
-	test:specificationReference "#from-column" ;
+	test:purpose "Tests the presence of an undefined SQL Version identifier" ;
+	test:specificationReference "#dfn-sql-version-identifier" ;
 	test:reviewStatus test:unreviewed ;
 	rdb2rdftest:database <d003> ;
-	rdb2rdftest:output "mappeda.nq" ;
-	rdb2rdftest:hasExpectedOutput true ;	
+	rdb2rdftest:hasExpectedOutput false ;	
+	rdb2rdftest:failMessage "non-conforming R2RML mapping";
 	rdb2rdftest:mappingDocument "r2rmla.ttl" ;
 .
 
 <tc0003b> a rdb2rdftest:R2RML ;	
-	dcterms:title "Three columns mapping, concatenation of columns to produce literal" ; 
+	dcterms:title "Three columns mapping, concatenation of columns, by using a rr:sqlQuery to produce literal" ; 
 	dcterms:identifier "R2RMLTC0003b" ;
-	test:purpose "Tests: (1) three column mapping; and (2) concatenation of columns to produce literal" ;
-	test:specificationReference "#r2rml-views"  ;
+	test:purpose "Tests: (1) three column mapping; and (2) concatenation of columns to produce literal, by using a rr:sqlQuery" ;
+	test:specificationReference "#dfn-sql-query"  ;
 	test:reviewStatus test:unreviewed ;
 	rdb2rdftest:database <d003> ;
 	rdb2rdftest:output "mappedb.nq" ;
@@ -46,7 +46,7 @@
 .
 
 <tc0003c> a rdb2rdftest:R2RML ;	
-	dcterms:title "Three columns mapping, using rr:template to produce literal" ; 
+	dcterms:title "Three columns mapping, by using a rr:template to produce literal" ; 
 	dcterms:identifier "R2RMLTC0003c" ;
 	test:purpose "Tests: (1) three column mapping; and (2) the use of rr:template to produce literal" ;
 	test:specificationReference "#from-template"  ;
@@ -57,14 +57,3 @@
 	rdb2rdftest:mappingDocument "r2rmlc.ttl" ;
 .
 
-<tc0003d> a rdb2rdftest:R2RML ;	
-	dcterms:title "Three columns mapping, using rr:termType and rr:IRI" ; 
-	dcterms:identifier "R2RMLTC0003d" ;
-	test:purpose "Tests rr:termType rr:IRI" ;
-	test:specificationReference "#from-template"  ;
-	test:reviewStatus test:unreviewed ;
-	rdb2rdftest:database <d003> ;
-	rdb2rdftest:output "mappedd.nq" ;
-	rdb2rdftest:hasExpectedOutput true ;
-	rdb2rdftest:mappingDocument "r2rmld.ttl" ;
-.
--- a/D003-1table3columns1row/mappedb.nq	Mon Mar 12 15:51:52 2012 +0100
+++ b/D003-1table3columns1row/mappedb.nq	Tue Mar 13 02:30:47 2012 +0100
@@ -1,1 +1,1 @@
-<http://example.com/Student10> <http://xmlns.com/foaf/0.1/name> "Venus Williams" .
\ No newline at end of file
+<http://example.com/Student/10> <http://xmlns.com/foaf/0.1/name> "Venus Williams" .
\ No newline at end of file
--- a/D003-1table3columns1row/r2rmla.ttl	Mon Mar 12 15:51:52 2012 +0100
+++ b/D003-1table3columns1row/r2rmla.ttl	Tue Mar 13 02:30:47 2012 +0100
@@ -9,24 +9,22 @@
 
      rr:logicalTable [ rr:tableName "\"Student\"" ];
 
-    rr:subjectMap [ rr:template "http://example.com/Student{\"ID\"}{\"FirstName\"}{\"LastName\"}";
+	rr:logicalTable [ 
+						rr:sqlQuery """
+							SELECT 	"ID",
+									"FirstName",
+									"LastName"
+							FROM "Student"
+                       """;
+						rr:sqlVersion rr:SQL1979 				   
+                       ];
+
+    rr:subjectMap [ rr:template "http://example.com/Student/{\"ID\"}/{\"FirstName\"}-{\"LastName\"}";
                     rr:class foaf:Person  ];
 	
     rr:predicateObjectMap
     [ 
       rr:predicate		ex:id ; 
-      rr:objectMap		[ rr:column "\"ID\""; rr:datatype xsd:integer ]
+      rr:objectMap		[ rr:column "\"ID\""; ]
     ];
-
-    rr:predicateObjectMap
-    [ 
-      rr:predicate		foaf:firstName ; 
-      rr:objectMap		[ rr:column "\"FirstName\"" ]
-    ];
-
-    rr:predicateObjectMap
-    [ 
-      rr:predicate		foaf:lastName ; 
-      rr:objectMap		[ rr:column "\"LastName\"" ]
-    ]
-    .
+     .
--- a/D003-1table3columns1row/r2rmlb.ttl	Mon Mar 12 15:51:52 2012 +0100
+++ b/D003-1table3columns1row/r2rmlb.ttl	Tue Mar 13 02:30:47 2012 +0100
@@ -15,7 +15,7 @@
                      """
                      ];
 
-    rr:subjectMap [ rr:template "http://example.com/Student{\"ID\"}"; ];
+    rr:subjectMap [ rr:template "http://example.com/Student/{\"ID\"}"; ];
 
     rr:predicateObjectMap
     [ 
--- a/D004-1table2columns1row/manifest.ttl	Mon Mar 12 15:51:52 2012 +0100
+++ b/D004-1table2columns1row/manifest.ttl	Tue Mar 13 02:30:47 2012 +0100
@@ -24,7 +24,7 @@
 <tc0004a> a rdb2rdftest:R2RML ;	
 	dcterms:title "Two column mapping, from one row table to two different triples" ; 
 	dcterms:identifier "R2RMLTC0004a" ;
-	test:purpose "Tests: (1) two column mapping, (2) subject URI generated by a column value; (3) from one row table to two different triples" ;
+	test:purpose "Tests: (1) two column mapping, (2) subject URI generated by a column value; (3) from one row table to two different triples (4) typing by using rr:class" ;
 	test:specificationReference "#typing" ;
 	test:reviewStatus test:unreviewed ;
 	rdb2rdftest:database <d004> ;
@@ -34,13 +34,13 @@
 .
 
 <tc0004b> a rdb2rdftest:R2RML ;	
-	dcterms:title "Two column mapping, generation of a \"BlankNode\" subject;" ; 
+	dcterms:title "Two column mapping, presence of rr:termType rr:Literal on rr:subjectMap" ; 
 	dcterms:identifier "R2RMLTC0004b" ;
-	test:purpose "Tests: (1) two column mapping (2) generation of a \"BlankNode\" subject; (3) from one row table to two different triples" ;
-	test:specificationReference "#r2rml-views" ;
+	test:purpose "Tests: (1) two column mapping (2) the presence of rr:termType rr:Literal on rr:subjectMap, which is invalid" ;
+	test:specificationReference "#termtype" ;
 	test:reviewStatus test:unreviewed ;
 	rdb2rdftest:database <d004> ;
-	rdb2rdftest:output "mappedb.nq" ;
-	rdb2rdftest:hasExpectedOutput true ;
+	rdb2rdftest:failMessage "non-conforming R2RML mapping";
+	rdb2rdftest:hasExpectedOutput false ;
 	rdb2rdftest:mappingDocument "r2rmlb.ttl" ;
 .
\ No newline at end of file
--- a/D004-1table2columns1row/r2rmlb.ttl	Mon Mar 12 15:51:52 2012 +0100
+++ b/D004-1table2columns1row/r2rmlb.ttl	Tue Mar 13 02:30:47 2012 +0100
@@ -14,7 +14,7 @@
        """;
 	   ] ;
 
-    rr:subjectMap [ rr:column "StudentId"; rr:termType rr:BlankNode;
+    rr:subjectMap [ rr:column "StudentId"; rr:termType rr:Literal;
                     rr:class ex:Student ];
 	
     rr:predicateObjectMap
@@ -22,24 +22,4 @@
       rr:predicate		foaf:name ; 
       rr:objectMap		[ rr:column "\"Student\"" ]
     ]
-    .
-
-<TriplesMap2>
-    a rr:TriplesMap;
-
-      rr:logicalTable [ rr:sqlQuery """
-       SELECT ('Sport' || "Sport") AS SportId,
-			"Sport"
-         FROM "Student_Sport"
-       """;
-	  ];
-
-    rr:subjectMap [ rr:column "SportId"; rr:termType rr:BlankNode;
-                    rr:class ex:Sport  ];
-	
-    rr:predicateObjectMap
-    [ 
-      rr:predicate		foaf:name ; 
-      rr:objectMap		[ rr:column "\"Sport\"" ]
-    ]
-	.
\ No newline at end of file
+    .
\ No newline at end of file
--- a/D006-1table1primarykey1column1row/manifest.ttl	Mon Mar 12 15:51:52 2012 +0100
+++ b/D006-1table1primarykey1column1row/manifest.ttl	Tue Mar 13 02:30:47 2012 +0100
@@ -22,9 +22,9 @@
 .
 
 <tc0006a> a rdb2rdftest:R2RML ;	
-	dcterms:title "Long form of R2RML by using rr:constant" ; 
+	dcterms:title "Long form of R2RML by using rr:constant in rr:subjectMap, rr:predicateMap, rr:objectMap and rr:graphMap" ; 
 	dcterms:identifier "R2RMLTC0006a" ;
-	test:purpose "Tests one column mapping with one primary key and rr:template" ;
+	test:purpose "Tests the use of rr:constant in rr:subjectMap, rr:predicateMap, rr:objectMap and rr:graphMap" ;
 	test:specificationReference "#constant" ;
 	test:reviewStatus test:unreviewed ;
 	rdb2rdftest:database <d006> ;
--- a/D006-1table1primarykey1column1row/mappeda.nq	Mon Mar 12 15:51:52 2012 +0100
+++ b/D006-1table1primarykey1column1row/mappeda.nq	Tue Mar 13 02:30:47 2012 +0100
@@ -1,1 +1,1 @@
-<http://example.com/Venus> <http://xmlns.com/foaf/0.1/name> "Venus" .
+<http://example.com/BadStudent> <http://example.com/description> "Bad Student" <http://example.com/graph/student> .
--- a/D006-1table1primarykey1column1row/r2rmla.ttl	Mon Mar 12 15:51:52 2012 +0100
+++ b/D006-1table1primarykey1column1row/r2rmla.ttl	Tue Mar 13 02:30:47 2012 +0100
@@ -9,11 +9,12 @@
     
     rr:logicalTable [ rr:tableName "\"Student\"" ];
 
-    rr:subjectMap [ rr:template "http://example.com/{\"Name\"}" ]; 
+    rr:subjectMap [ rr:constant ex:BadStudent;  
+    				rr:graphMap [ rr:constant <http://example.com/graph/student> ]; ]; 
 	
     rr:predicateObjectMap
     [ 
-      rr:predicateMap [ rr:constant foaf:name ]; 
-      rr:objectMap    [ rr:column "\"Name\"" ]
+      rr:predicateMap [ rr:constant ex:description ]; 
+      rr:objectMap    [ rr:constant "Bad Student" ]
     ]
     .
--- a/D007-1table1primarykey2columns1row/manifest.ttl	Mon Mar 12 15:51:52 2012 +0100
+++ b/D007-1table1primarykey2columns1row/manifest.ttl	Tue Mar 13 02:30:47 2012 +0100
@@ -7,7 +7,7 @@
 	dcterms:title "One table, one primary key, two columns, one row" ;
 	dcterms:identifier "D007-1table1primarykey2columns1row" ;
 	rdb2rdftest:sqlScriptFile "create.sql";
-	rdb2rdftest:relatedTestCase <dg0007>, <tc0007a>, <tc0007b>, <tc0007c>, <tc0007d>, <tc0007e>, <tc0007f>, <tc0007g>  ;
+	rdb2rdftest:relatedTestCase <dg0007>, <tc0007a>, <tc0007b>, <tc0007c>, <tc0007d>, <tc0007e>, <tc0007f>, <tc0007g>, <tc0007h>, <tc0007i> ;
 .
 
 <dg0007> a rdb2rdftest:DirectMapping ;	
@@ -22,10 +22,10 @@
 .
 
 <tc0007a> a rdb2rdftest:R2RML ;	
-	dcterms:title "One column mapping, using rr:constant property" ; 
+	dcterms:title "Typing resources by relying on rdf:type predicate" ; 
 	dcterms:identifier "R2RMLTC0007a" ;
-	test:purpose "Tests constant-value term map by using rr:constant property" ;
-	test:specificationReference "#constant" ;
+	test:purpose "Tests the typing resources by relying on rdf:type predicate" ;
+	test:specificationReference "#typing" ;
 	test:reviewStatus test:unreviewed ;
 	rdb2rdftest:database <d007> ;
 	rdb2rdftest:output "mappeda.nq" ;
@@ -34,10 +34,10 @@
 .
 
 <tc0007b> a rdb2rdftest:R2RML ;	
-	dcterms:title "One column mapping, using constant shortcut properties" ; 
+	dcterms:title "Assigning triples to Named Graphs" ; 
 	dcterms:identifier "R2RMLTC0007b" ;
-	test:purpose "Tests constant-value term map by using constant shortcut properties rr:predicate, rr:object and rr:graph. Also directly using rr:tableName" ;
-	test:specificationReference "#constant" ;
+	test:purpose "Tests the generation of triples to a named graph" ;
+	test:specificationReference "#named-graphs" ;
 	test:reviewStatus test:unreviewed ;
 	rdb2rdftest:database <d007> ;
 	rdb2rdftest:output "mappedb.nq" ;
@@ -104,3 +104,27 @@
 	rdb2rdftest:hasExpectedOutput true ;
 	rdb2rdftest:mappingDocument "r2rmlg.ttl" ;
 .
+
+<tc0007h> a rdb2rdftest:R2RML ;	
+	dcterms:title "Assigning triples to the default graph" ; 
+	dcterms:identifier "R2RMLTC0007h" ;
+	test:purpose "Tests the generation of triples to the default graph" ;
+	test:specificationReference "#named-graphs" ;
+	test:reviewStatus test:unreviewed ;
+	rdb2rdftest:database <d007> ;
+	rdb2rdftest:output "mappedh.nq" ;
+	rdb2rdftest:hasExpectedOutput true ;
+	rdb2rdftest:mappingDocument "r2rmlh.ttl" ;
+.
+
+<tc0007i> a rdb2rdftest:R2RML ;	
+	dcterms:title "Assigning triples to a non-IRI named graph" ; 
+	dcterms:identifier "R2RMLTC0007i" ;
+	test:purpose "Tests the generation of triples to a non-IRI named graph, which is an error" ;
+	test:specificationReference "#named-graphs" ;
+	test:reviewStatus test:unreviewed ;
+	rdb2rdftest:database <d007> ;
+	rdb2rdftest:failMessage "non-conforming R2RML mapping";
+	rdb2rdftest:hasExpectedOutput false ;
+	rdb2rdftest:mappingDocument "r2rmli.ttl" ;
+.
--- a/D007-1table1primarykey2columns1row/mappeda.nq	Mon Mar 12 15:51:52 2012 +0100
+++ b/D007-1table1primarykey2columns1row/mappeda.nq	Tue Mar 13 02:30:47 2012 +0100
@@ -1,3 +1,1 @@
-<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://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person>  <http://example.com/PersonGraph> .
+ <http://example.com/Student/10/Venus> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
--- a/D007-1table1primarykey2columns1row/mappedb.nq	Mon Mar 12 15:51:52 2012 +0100
+++ b/D007-1table1primarykey2columns1row/mappedb.nq	Tue Mar 13 02:30:47 2012 +0100
@@ -1,3 +1,2 @@
-<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://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person>  <http://example.com/PersonGraph> .
+<http://example.com/Student/10/Venus> <http://xmlns.com/foaf/0.1/name> "Venus" <http://example.com/PersonGraph> . 
+<http://example.com/Student/10/Venus> <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/mappedc.nq	Mon Mar 12 15:51:52 2012 +0100
+++ b/D007-1table1primarykey2columns1row/mappedc.nq	Tue Mar 13 02:30:47 2012 +0100
@@ -1,4 +1,4 @@
-<http://example.com/Student10Venus> <http://xmlns.com/foaf/0.1/firstName> "Venus" .
-<http://example.com/Student10Venus> <http://example.com/id> "10"^^<http://www.w3.org/2001/XMLSchema#integer> . 
-<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/Student10Venus> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/Student> .
+<http://example.com/Student/10/Venus> <http://xmlns.com/foaf/0.1/name> "Venus" .
+<http://example.com/Student/10/Venus> <http://example.com/id> "10"^^<http://www.w3.org/2001/XMLSchema#integer> . 
+<http://example.com/Student/10/Venus> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
+<http://example.com/Student/10/Venus> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/Student> .
--- a/D007-1table1primarykey2columns1row/mappedd.nq	Mon Mar 12 15:51:52 2012 +0100
+++ b/D007-1table1primarykey2columns1row/mappedd.nq	Tue Mar 13 02:30:47 2012 +0100
@@ -1,4 +1,4 @@
-<http://example.com/Student10Venus> <http://xmlns.com/foaf/0.1/firstName> "Venus" .
-<http://example.com/Student10Venus> <http://example.com/id> "10"^^<http://www.w3.org/2001/XMLSchema#integer> . 
-<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/Student10Venus> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/Student> .
+<http://example.com/Student/10/Venus> <http://xmlns.com/foaf/0.1/name> "Venus" .
+<http://example.com/Student/10/Venus> <http://example.com/id> "10"^^<http://www.w3.org/2001/XMLSchema#integer> . 
+<http://example.com/Student/10/Venus> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
+<http://example.com/Student/10/Venus> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/Student> .
--- a/D007-1table1primarykey2columns1row/mappede.nq	Mon Mar 12 15:51:52 2012 +0100
+++ b/D007-1table1primarykey2columns1row/mappede.nq	Tue Mar 13 02:30:47 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://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> .
+<http://example.com/Student/10/Venus> <http://example.com/id> "10"^^<http://www.w3.org/2001/XMLSchema#integer> <http://example.com/PersonGraph> .
+<http://example.com/Student/10/Venus> <http://xmlns.com/foaf/0.1/name> "Venus" <http://example.com/PersonGraph> .
+<http://example.com/Student/10/Venus> <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	Mon Mar 12 15:51:52 2012 +0100
+++ b/D007-1table1primarykey2columns1row/mappedf.nq	Tue Mar 13 02:30:47 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/Student/10/Venus> <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/Student/10/Venus> <http://xmlns.com/foaf/0.1/name> "Venus" <http://example.com/PersonGraph> .
+<http://example.com/Student/10/Venus> <http://example.com/id> "10"^^<http://www.w3.org/2001/XMLSchema#integer> <http://example.com/PersonGraph> .
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/D007-1table1primarykey2columns1row/mappedh.nq	Tue Mar 13 02:30:47 2012 +0100
@@ -0,0 +1,2 @@
+<http://example.com/Student/10/Venus> <http://xmlns.com/foaf/0.1/name> "Venus" . 
+<http://example.com/Student/10/Venus> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person>  .
--- a/D007-1table1primarykey2columns1row/r2rmla.ttl	Mon Mar 12 15:51:52 2012 +0100
+++ b/D007-1table1primarykey2columns1row/r2rmla.ttl	Tue Mar 13 02:30:47 2012 +0100
@@ -5,32 +5,16 @@
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 @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\"}{\"Name\"}"; 
-					rr:graph	ex:PersonGraph; 
-	];
+    rr:subjectMap [ rr:template "http://example.com/Student/{\"ID\"}/{\"Name\"}"; ];
 	
     rr:predicateObjectMap
     [ 
 		rr:predicate	rdf:type ;
 		rr:object		foaf:Person; 
 	];
-	
-    rr:predicateObjectMap
-    [ 
-		rr:predicate	ex:id ;
-		rr:objectMap    [ rr:column "\"ID\""; rr:datatype xsd:integer ]
-    ];
-
-    rr:predicateObjectMap
-    [ 
-      rr:predicate		foaf:firstName ;
-      rr:objectMap		[ rr:column "\"Name\"" ]
-    ]
-
     .
--- a/D007-1table1primarykey2columns1row/r2rmlb.ttl	Mon Mar 12 15:51:52 2012 +0100
+++ b/D007-1table1primarykey2columns1row/r2rmlb.ttl	Tue Mar 13 02:30:47 2012 +0100
@@ -11,7 +11,7 @@
 
 	rr:logicalTable [ rr:tableName "\"Student\""; ];
 
-    rr:subjectMap [ rr:template "http://example.com/Student{\"ID\"}{\"Name\"}"; 
+    rr:subjectMap [ rr:template "http://example.com/Student/{\"ID\"}/{\"Name\"}"; 
 				    rr:graph ex:PersonGraph;
 	];
 	
@@ -20,16 +20,10 @@
 		rr:predicate	rdf:type;
 		rr:object		foaf:Person;
 	];
-	
-    rr:predicateObjectMap
-    [ 
-		rr:predicate	ex:id;
-		rr:objectMap    [ rr:column "\"ID\""; rr:datatype xsd:integer ]
-    ];
 
     rr:predicateObjectMap
     [ 
-      rr:predicate		foaf:firstName;
+      rr:predicate		foaf:name;
       rr:objectMap		[ rr:column "\"Name\"" ]
     ]
 
--- a/D007-1table1primarykey2columns1row/r2rmlc.ttl	Mon Mar 12 15:51:52 2012 +0100
+++ b/D007-1table1primarykey2columns1row/r2rmlc.ttl	Tue Mar 13 02:30:47 2012 +0100
@@ -12,19 +12,19 @@
 	rr:logicalTable [ rr:tableName "\"Student\"" ];
 
     rr:subjectMap [ 
-		rr:template "http://example.com/Student{\"ID\"}{\"Name\"}"; 
+		rr:template "http://example.com/Student/{\"ID\"}/{\"Name\"}"; 
 		rr:class foaf:Person,ex:Student; 
 	];
 	
     rr:predicateObjectMap
     [ 
 		rr:predicate	ex:id ;
-		rr:objectMap	[ rr:column "\"ID\""; rr:datatype xsd:integer ]
+		rr:objectMap	[ rr:column "\"ID\"";  ]
     ];
 
     rr:predicateObjectMap
     [ 
-      rr:predicate		foaf:firstName ;
+      rr:predicate		foaf:name ;
       rr:objectMap		[ rr:column "\"Name\"" ]
     ]
 
--- a/D007-1table1primarykey2columns1row/r2rmld.ttl	Mon Mar 12 15:51:52 2012 +0100
+++ b/D007-1table1primarykey2columns1row/r2rmld.ttl	Tue Mar 13 02:30:47 2012 +0100
@@ -12,30 +12,30 @@
 	rr:logicalTable [ rr:tableName "\"Student\"" ];
 
     rr:subjectMap [ 
-		rr:template "http://example.com/Student{\"ID\"}{\"Name\"}"; 
+		rr:template "http://example.com/Student/{\"ID\"}/{\"Name\"}"; 
 	];
 	
     rr:predicateObjectMap
     [ 
 		rr:predicate	rdf:type;
-		rr:object		foaf:Person;
+		rr:object	foaf:Person;
 	];
 
     rr:predicateObjectMap
     [ 
 		rr:predicate	rdf:type;
-		rr:object		ex:Student;
+		rr:object	ex:Student;
 	];
 	
     rr:predicateObjectMap
     [ 
 		rr:predicate	ex:id ;
-		rr:objectMap    [ rr:column "\"ID\""; rr:datatype xsd:integer ]
+		rr:objectMap    [ rr:column "\"ID\""; ]
     ];
 
     rr:predicateObjectMap
     [ 
-      rr:predicate		foaf:firstName ;
+      rr:predicate		foaf:name ;
       rr:objectMap		[ rr:column "\"Name\"" ]
     ]
 
--- a/D007-1table1primarykey2columns1row/r2rmle.ttl	Mon Mar 12 15:51:52 2012 +0100
+++ b/D007-1table1primarykey2columns1row/r2rmle.ttl	Tue Mar 13 02:30:47 2012 +0100
@@ -11,7 +11,7 @@
 
 	rr:logicalTable [ rr:tableName "\"Student\"" ];
 
-    rr:subjectMap [ rr:template "http://example.com/Student{\"ID\"}{\"Name\"}"; 
+    rr:subjectMap [ rr:template "http://example.com/Student/{\"ID\"}/{\"Name\"}"; 
 					rr:graph	ex:PersonGraph ;
 					rr:class foaf:Person
 	];
@@ -19,12 +19,12 @@
     rr:predicateObjectMap
     [ 
 		rr:predicate	ex:id ;
-		rr:objectMap	[ rr:column "\"ID\""; rr:datatype xsd:integer ]
+		rr:objectMap	[ rr:column "\"ID\""; ]
     ];
 
     rr:predicateObjectMap
     [ 
-      rr:predicate		foaf:firstName ;
+      rr:predicate		foaf:name ;
       rr:objectMap		[ rr:column "\"Name\"" ]
     ]
 
--- a/D007-1table1primarykey2columns1row/r2rmlf.ttl	Mon Mar 12 15:51:52 2012 +0100
+++ b/D007-1table1primarykey2columns1row/r2rmlf.ttl	Tue Mar 13 02:30:47 2012 +0100
@@ -11,25 +11,25 @@
 
 	rr:logicalTable [ rr:tableName "\"Student\"" ];
 
-	rr:subjectMap [ rr:template "http://example.com/Student{\"ID\"}{\"Name\"}";
+	rr:subjectMap [ rr:template "http://example.com/Student/{\"ID\"}/{\"Name\"}";
 					rr:graph	ex:PersonGraph ;
 	];
 	
     rr:predicateObjectMap
     [ 
 		rr:predicate	rdf:type ;
-		rr:object		foaf:Person ; 
+		rr:object	foaf:Person ; 
 	];
 	
     rr:predicateObjectMap
     [ 
 		rr:predicate	ex:id ;
-		rr:objectMap    [ rr:column "\"ID\""; rr:datatype xsd:integer ]
+		rr:objectMap    [ rr:column "\"ID\"";  ]
     ];
 
     rr:predicateObjectMap
     [ 
-      rr:predicate		foaf:firstName ;
-      rr:objectMap		[ rr:column "\"Name\"" ]
+		rr:predicate	foaf:name ;
+		rr:objectMap	[ rr:column "\"Name\"" ]
     ]
     .
\ No newline at end of file
--- a/D007-1table1primarykey2columns1row/r2rmlg.ttl	Mon Mar 12 15:51:52 2012 +0100
+++ b/D007-1table1primarykey2columns1row/r2rmlg.ttl	Tue Mar 13 02:30:47 2012 +0100
@@ -1,5 +1,3 @@
-@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/> .
 
 
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/D007-1table1primarykey2columns1row/r2rmlh.ttl	Tue Mar 13 02:30:47 2012 +0100
@@ -0,0 +1,30 @@
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@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\"}/{\"Name\"}"; 
+				    rr:graph rr:defaultGraph;
+	];
+	
+    rr:predicateObjectMap
+    [ 
+		rr:predicate	rdf:type;
+		rr:object		foaf:Person;
+	];
+
+    rr:predicateObjectMap
+    [ 
+      rr:predicate		foaf:name;
+      rr:objectMap		[ rr:column "\"Name\"" ]
+    ]
+
+    .
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/D007-1table1primarykey2columns1row/r2rmli.ttl	Tue Mar 13 02:30:47 2012 +0100
@@ -0,0 +1,30 @@
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@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\"}/{\"Name\"}"; 
+				    rr:graphMap [ rr:column "\"Name\""; rr:termType rr:Literal; ]
+	];
+	
+    rr:predicateObjectMap
+    [ 
+		rr:predicate	rdf:type;
+		rr:object		foaf:Person;
+	];
+
+    rr:predicateObjectMap
+    [ 
+      rr:predicate		foaf:name;
+      rr:objectMap		[ rr:column "\"Name\"" ]
+    ]
+
+    .
--- a/D008-1table1compositeprimarykey3columns1row/manifest.ttl	Mon Mar 12 15:51:52 2012 +0100
+++ b/D008-1table1compositeprimarykey3columns1row/manifest.ttl	Tue Mar 13 02:30:47 2012 +0100
@@ -22,9 +22,9 @@
 .
 
 <tc0008a> a rdb2rdftest:R2RML ;	
-	dcterms:title "Generation of triples to a target graph" ; 
+	dcterms:title "Generation of triples to a target graph by using rr:graphMap and rr:template" ; 
 	dcterms:identifier "R2RMLTC0008a" ;
-	test:purpose "Test that results of the mapping can be directed to a target graph." ;
+	test:purpose "Test that results of the mapping can be directed to a target graph by using rr:graphMap and rr:template" ;
 	test:specificationReference "#named-graphs" ;
 	test:reviewStatus test:unreviewed ;
 	rdb2rdftest:database <d008> ;
@@ -46,10 +46,10 @@
 .
 
 <tc0008c> a rdb2rdftest:R2RML ;	
-	dcterms:title "Generation of triples by using multiple predicateMaps referencing to the same logical table" ; 
+	dcterms:title "Generation of triples by using multiple predicateMaps within a rr:predicateObjectMap" ; 
 	dcterms:identifier "R2RMLTC0008c" ;
-	test:purpose "Generation of triples by using multiple predicateMaps referencing to the same logical table" ;
-	test:specificationReference "#dfn-predicate-object-map" ;
+	test:purpose "Tests the generation of triples by using multiple predicateMaps within a rr:predicateObjectMap" ;
+	test:specificationReference "#physical-tables" ;
 	test:reviewStatus test:unreviewed ;
 	rdb2rdftest:database <d008> ;
 	rdb2rdftest:hasExpectedOutput true ;
--- a/D008-1table1compositeprimarykey3columns1row/mappeda.nq	Mon Mar 12 15:51:52 2012 +0100
+++ b/D008-1table1compositeprimarykey3columns1row/mappeda.nq	Tue Mar 13 02:30:47 2012 +0100
@@ -1,5 +1,5 @@
-<http://example.com/Student10Venus%20Williams> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> <http://example.com/graph/Student10Venus%20Williams> .
-<http://example.com/Student10Venus%20Williams> <http://xmlns.com/foaf/0.1/name> "Venus Williams" <http://example.com/graph/Student10Venus%20Williams> .
-<http://example.com/Student10Venus%20Williams> <http://example.com/id> "10"^^<http://www.w3.org/2001/XMLSchema#integer> <http://example.com/graph/Student10Venus%20Williams> . 
-<http://example.com/Student10Venus%20Williams> <http://example.com/Sport> "Tennis" <http://example.com/graph/Student10Venus%20Williams> . 
+<http://example.com/Student/10/Venus%20Williams> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> <http://example.com/graph/Student/10/Venus%20Williams> .
+<http://example.com/Student/10/Venus%20Williams> <http://xmlns.com/foaf/0.1/name> "Venus Williams" <http://example.com/graph/Student/10/Venus%20Williams> .
+<http://example.com/Student/10/Venus%20Williams> <http://example.com/id> "10"^^<http://www.w3.org/2001/XMLSchema#integer> <http://example.com/graph/Student/10/Venus%20Williams> . 
+<http://example.com/Student/10/Venus%20Williams> <http://example.com/Sport> "Tennis" <http://example.com/graph/Student/10/Venus%20Williams> . 
 
--- a/D008-1table1compositeprimarykey3columns1row/mappedb.nq	Mon Mar 12 15:51:52 2012 +0100
+++ b/D008-1table1compositeprimarykey3columns1row/mappedb.nq	Tue Mar 13 02:30:47 2012 +0100
@@ -1,6 +1,6 @@
-<http://example.com/Student10Venus%20Williams> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person>  .
-<http://example.com/Student10Venus%20Williams> <http://xmlns.com/foaf/0.1/name> "Venus Williams" .
-<http://example.com/Student10Venus%20Williams> <http://example.com/id> "10"^^<http://www.w3.org/2001/XMLSchema#integer>  . 
-<http://example.com/Student10Venus%20Williams> <http://example.com/Sport> <http://example.com/Tennis> . 
+<http://example.com/Student/10/Venus%20Williams> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person>  .
+<http://example.com/Student/10/Venus%20Williams> <http://xmlns.com/foaf/0.1/name> "Venus Williams" .
+<http://example.com/Student/10/Venus%20Williams> <http://example.com/id> "10"^^<http://www.w3.org/2001/XMLSchema#integer>  . 
+<http://example.com/Student/10/Venus%20Williams> <http://example.com/Sport> <http://example.com/Tennis> . 
 <http://example.com/Tennis> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://activity.com/Sport> .
 
--- a/D008-1table1compositeprimarykey3columns1row/mappedc.nq	Mon Mar 12 15:51:52 2012 +0100
+++ b/D008-1table1compositeprimarykey3columns1row/mappedc.nq	Tue Mar 13 02:30:47 2012 +0100
@@ -1,6 +1,3 @@
-<http://example.com/Student10Venus%20Williams> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person>  .
-<http://example.com/Student10Venus%20Williams> <http://xmlns.com/foaf/0.1/name> "Venus Williams"  .
-<http://example.com/Student10Venus%20Williams> <http://example.com/name> "Venus Williams"  .
-<http://example.com/Student10Venus%20Williams> <http://example.com/id> "10"^^<http://www.w3.org/2001/XMLSchema#integer>  . 
-<http://example.com/Student10Venus%20Williams> <http://example.com/Sport> "Tennis"  . 
+<http://example.com/Student/10/Venus%20Williams> <http://xmlns.com/foaf/0.1/name> "Venus Williams"  .
+<http://example.com/Student/10/Venus%20Williams> <http://example.com/name> "Venus Williams"  .
 
--- a/D008-1table1compositeprimarykey3columns1row/r2rmla.ttl	Mon Mar 12 15:51:52 2012 +0100
+++ b/D008-1table1compositeprimarykey3columns1row/r2rmla.ttl	Tue Mar 13 02:30:47 2012 +0100
@@ -11,8 +11,8 @@
 
 	rr:logicalTable [ rr:tableName "\"Student\"" ];
 
-    rr:subjectMap [ rr:template "http://example.com/Student{\"ID\"}{\"Name\"}"; 
-					rr:graphMap [ rr:template "http://example.com/graph/Student{\"ID\"}{\"Name\"}"; ]
+	rr:subjectMap [ rr:template "http://example.com/Student/{\"ID\"}/{\"Name\"}"; 
+					rr:graphMap [ rr:template "http://example.com/graph/Student/{\"ID\"}/{\"Name\"}"; ]
 	];
 	
     rr:predicateObjectMap
@@ -24,7 +24,7 @@
     rr:predicateObjectMap
     [ 
 		rr:predicate	ex:id ;
-		rr:objectMap    [ rr:column "\"ID\""; rr:datatype xsd:integer ]
+		rr:objectMap    [ rr:column "\"ID\"";  ]
     ];
 
     rr:predicateObjectMap
--- a/D008-1table1compositeprimarykey3columns1row/r2rmlb.ttl	Mon Mar 12 15:51:52 2012 +0100
+++ b/D008-1table1compositeprimarykey3columns1row/r2rmlb.ttl	Tue Mar 13 02:30:47 2012 +0100
@@ -24,7 +24,7 @@
 
 	rr:logicalTable [ rr:tableName "\"Student\"" ];
 
-    rr:subjectMap [ rr:template "http://example.com/Student{\"ID\"}{\"Name\"}";
+    rr:subjectMap [ rr:template "http://example.com/Student/{\"ID\"}/{\"Name\"}";
 	];
 	
     rr:predicateObjectMap
@@ -36,7 +36,7 @@
     rr:predicateObjectMap
     [ 
 		rr:predicate	ex:id ;
-		rr:objectMap    [ rr:column "\"ID\""; rr:datatype xsd:integer ]
+		rr:objectMap    [ rr:column "\"ID\"";  ]
     ];
 
     rr:predicateObjectMap
--- a/D008-1table1compositeprimarykey3columns1row/r2rmlc.ttl	Mon Mar 12 15:51:52 2012 +0100
+++ b/D008-1table1compositeprimarykey3columns1row/r2rmlc.ttl	Tue Mar 13 02:30:47 2012 +0100
@@ -11,32 +11,12 @@
 
 	rr:logicalTable [ rr:tableName "\"Student\"" ];
 
-    rr:subjectMap [ rr:template "http://example.com/Student{\"ID\"}{\"Name\"}"; 
-	];
-	
-    rr:predicateObjectMap
-    [ 
-		rr:predicate	rdf:type ;
-		rr:object		foaf:Person ; 
-	];
+    rr:subjectMap [ rr:template "http://example.com/Student/{\"ID\"}/{\"Name\"}"; ];
 	
     rr:predicateObjectMap
     [ 
-		rr:predicate	ex:id ;
-		rr:objectMap    [ rr:column "\"ID\""; rr:datatype xsd:integer ]
+		rr:predicate	foaf:name ;
+		rr:predicate	ex:name ;
+		rr:objectMap	[ rr:column "\"Name\"" ]
     ];
-
-    rr:predicateObjectMap
-    [ 
-      rr:predicate		foaf:name ;
-      rr:predicate		ex:name ;
-      rr:objectMap    [ rr:column "\"Name\"" ]
-    ];
-
-    rr:predicateObjectMap
-    [ 
-      rr:predicate		ex:Sport ;
-      rr:objectMap    [ rr:column "\"Sport\"" ]
-    ]
-	
     .
--- a/D009-2tables1primarykey1foreignkey/manifest.ttl	Mon Mar 12 15:51:52 2012 +0100
+++ b/D009-2tables1primarykey1foreignkey/manifest.ttl	Tue Mar 13 02:30:47 2012 +0100
@@ -49,7 +49,7 @@
 	dcterms:title "Unamed column in a logical table" ; 
 	dcterms:identifier "R2RMLTC0009c" ;
 	test:purpose "Test a logical table with unamed column." ;
-	test:specificationReference "#dfn-logical-table" ;
+	test:specificationReference "#dfn-sql-query" ;
 	test:reviewStatus test:unreviewed ;
 	rdb2rdftest:database <d009> ;
 	rdb2rdftest:hasExpectedOutput false ;
@@ -61,7 +61,7 @@
 	dcterms:title "Named column in logical table" ; 
 	dcterms:identifier "R2RMLTC0009d" ;
 	test:purpose "Test a logical table named column." ;
-	test:specificationReference "#dfn-logical-table" ;
+	test:specificationReference "#dfn-sql-query" ;
 	test:reviewStatus test:unreviewed ;
 	rdb2rdftest:database <d009> ;
 	rdb2rdftest:output "mappedd.nq" ;
--- a/D009-2tables1primarykey1foreignkey/mappeda.nq	Mon Mar 12 15:51:52 2012 +0100
+++ b/D009-2tables1primarykey1foreignkey/mappeda.nq	Tue Mar 13 02:30:47 2012 +0100
@@ -1,7 +1,5 @@
-<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/resource/student_10> <http://xmlns.com/foaf/0.1/name> "Venus Williams"  .
 <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/resource/student_20> <http://xmlns.com/foaf/0.1/name> "Demi Moore"  .
-<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/resource/sport_100> <http://www.w3.org/2000/01/rdf-schema#label> "Tennis" .
 <http://example.com/resource/student_10> <http://example.com/ontology/practises> <http://example.com/resource/sport_100>  .
\ No newline at end of file
--- a/D009-2tables1primarykey1foreignkey/mappedd.nq	Mon Mar 12 15:51:52 2012 +0100
+++ b/D009-2tables1primarykey1foreignkey/mappedd.nq	Tue Mar 13 02:30:47 2012 +0100
@@ -1,7 +1,5 @@
-<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-2tables1primarykey1foreignkey/r2rmla.ttl	Mon Mar 12 15:51:52 2012 +0100
+++ b/D009-2tables1primarykey1foreignkey/r2rmla.ttl	Tue Mar 13 02:30:47 2012 +0100
@@ -10,31 +10,23 @@
         
 	rr:logicalTable [ rr:tableName  "\"Student\"" ];
 	
-    rr:subjectMap 
-    [ 
-        rr:template "http://example.com/resource/student_{\"ID\"}";
-        rr:termType rr:IRI;
-        rr:class <http://example.com/ontology/Student>;
-    ]; 
+    rr:subjectMap [ rr:template "http://example.com/resource/student_{\"ID\"}"; ]; 
 	
     rr:predicateObjectMap
     [ 
-      rr:predicate	foaf:name ; 
-      rr:objectMap    [ 
-             rr:column "\"Name\"";
-             rr:termType rr:Literal;
-      ];
+		rr:predicate	foaf:name ; 
+		rr:objectMap	[ rr:column "\"Name\""; ];
     ];
 
     rr:predicateObjectMap
     [ 
       rr:predicate	<http://example.com/ontology/practises> ; 
-      rr:objectMap    [ 
+      rr:objectMap	[ 
            rr:parentTriplesMap <TriplesMap2>;
            rr:joinCondition [
 				rr:child "\"Sport\"" ;
 				rr:parent "\"ID\"" ;
-		   ]
+			]
       ];
     ];
     .
@@ -44,19 +36,11 @@
 		
 	rr:logicalTable [ rr:tableName  "\"Sport\"" ];
 
-    rr:subjectMap 
-    [ 
-        rr:template "http://example.com/resource/sport_{\"ID\"}";
-        rr:termType rr:IRI;
-        rr:class <http://example.com/ontology/Sport>;
-    ]; 
+    rr:subjectMap [ rr:template "http://example.com/resource/sport_{\"ID\"}"; ]; 
 	
     rr:predicateObjectMap
     [ 
-      rr:predicate		rdfs:label ; 
-      rr:objectMap    [ 
-             rr:column "\"Name\""; 
-             rr:termType rr:Literal;
-      ];
+		rr:predicate	rdfs:label ; 
+		rr:objectMap	[ rr:column "\"Name\""; ];
     ];
 	.
\ No newline at end of file
--- a/D009-2tables1primarykey1foreignkey/r2rmlb.ttl	Mon Mar 12 15:51:52 2012 +0100
+++ b/D009-2tables1primarykey1foreignkey/r2rmlb.ttl	Tue Mar 13 02:30:47 2012 +0100
@@ -12,26 +12,22 @@
 	
     rr:subjectMap 
     [ 
-        rr:template "http://example.com/resource/student_{\"ID\"}";
-        rr:termType rr:IRI;
-        rr:class <http://example.com/ontology/Student>;
+        rr:template	"http://example.com/resource/student_{\"ID\"}";
+        rr:class	<http://example.com/ontology/Student>;
         rr:graph	<http://example.com/graph/students> ;
     ]; 
 	
     rr:predicateObjectMap
     [ 
-      rr:predicate		foaf:name ; 
-      rr:objectMap    [ 
-             rr:column "\"Name\"";
-             rr:termType rr:Literal;
-      ];
-      rr:graph	<http://example.com/graph/students> ;
+      rr:predicate	foaf:name ; 
+      rr:objectMap	[ rr:column "\"Name\""; ];
+      rr:graph		<http://example.com/graph/students> ;
     ];
 
     rr:predicateObjectMap
     [ 
-      rr:predicate		<http://example.com/ontology/practises> ; 
-      rr:objectMap    [ 
+      rr:predicate	<http://example.com/ontology/practises> ; 
+      rr:objectMap	[ 
            rr:parentTriplesMap <TriplesMap2>;
            rr:joinCondition [
 				rr:child "\"Sport\"" ;
@@ -44,25 +40,19 @@
 
 <TriplesMap2>
     a rr:TriplesMap;
-        
-		
+
 	rr:logicalTable [ rr:tableName  "\"Sport\"" ];
 
     rr:subjectMap 
     [ 
         rr:template "http://example.com/resource/sport_{\"ID\"}";
-        rr:termType rr:IRI;
         rr:class <http://example.com/ontology/Sport>;
         rr:graph <http://example.com/graph/sports> ;
     ]; 
 	
     rr:predicateObjectMap
     [ 
-      rr:predicate	rdfs:label ; 
-      rr:objectMap    [ 
-             rr:column "\"Name\""; 
-             rr:termType rr:Literal;
-      ];
-      
+		rr:predicate	rdfs:label ; 
+		rr:objectMap	[ rr:column "\"Name\""; ];
     ];
 	.
\ No newline at end of file
--- a/D009-2tables1primarykey1foreignkey/r2rmlc.ttl	Mon Mar 12 15:51:52 2012 +0100
+++ b/D009-2tables1primarykey1foreignkey/r2rmlc.ttl	Tue Mar 13 02:30:47 2012 +0100
@@ -14,20 +14,12 @@
         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:subjectMap [ rr:template "http://example.com/resource/student_{\"Name\"}"; ]; 
 	
     rr:predicateObjectMap
     [ 
-      rr:predicate		foaf:name ; 
-      rr:objectMap    [ 
-             rr:column "\"Name\"";
-             rr:termType rr:Literal;
-      ];
+      rr:predicate	foaf:name ; 
+      rr:objectMap	[ rr:column "\"Name\""; ];
     ];
   .
 
--- a/D009-2tables1primarykey1foreignkey/r2rmld.ttl	Mon Mar 12 15:51:52 2012 +0100
+++ b/D009-2tables1primarykey1foreignkey/r2rmld.ttl	Tue Mar 13 02:30:47 2012 +0100
@@ -14,29 +14,18 @@
         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:subjectMap [ rr:template "http://example.com/resource/student_{Name}"; ]; 
 	
     rr:predicateObjectMap
     [ 
-      rr:predicate		foaf:name ; 
-      rr:objectMap    [ 
-             rr:column "\"Name\"";
-             rr:termType rr:Literal;
-      ];
+      rr:predicate	foaf:name ; 
+      rr:objectMap	[ rr:column "\"Name\""; ];
     ];
 
    rr:predicateObjectMap
     [ 
-      rr:predicate		ex:numSport ; 
-      rr:objectMap    [ 
-             rr:column "SPORTCOUNT";
-             rr:datatype xsd:integer;
-      ];
+		rr:predicate	ex:numSport ; 
+		rr:objectMap	[ rr:column "SPORTCOUNT"; ];
     ];
   .
 
--- a/D010-1table1primarykey3colums3rows/manifest.ttl	Mon Mar 12 15:51:52 2012 +0100
+++ b/D010-1table1primarykey3colums3rows/manifest.ttl	Tue Mar 13 02:30:47 2012 +0100
@@ -22,7 +22,7 @@
 .
 
 <tc0010a> a rdb2rdftest:R2RML ;	
-	dcterms:title "Table with special chars" ; 
+	dcterms:title "Template with table column with special chars" ; 
 	dcterms:identifier "R2RMLTC0010a" ;
 	test:purpose "Tests a template with blank space in column value" ;
 	test:specificationReference "#dfn-template-valued-term-map" ;
@@ -34,7 +34,7 @@
 .
 
 <tc0010b> a rdb2rdftest:R2RML ;	
-	dcterms:title "Table with Special Chars" ; 
+	dcterms:title "Template with table columns with special chars" ; 
 	dcterms:identifier "R2RMLTC0010b" ;
 	test:purpose "Tests a template with special chars in column value" ;
 	test:specificationReference "#dfn-template-valued-term-map" ;
@@ -46,7 +46,7 @@
 .
 
 <tc0010c> a rdb2rdftest:R2RML ;	
-	dcterms:title "Table with Special Chars" ; 
+	dcterms:title "Template with table columns with special chars and backslashes" ; 
 	dcterms:identifier "R2RMLTC0010c" ;
 	test:purpose "Tests a template with special chars in column value and backslash escapes in string templates" ;
 	test:specificationReference "#dfn-template-valued-term-map" ;
--- a/D010-1table1primarykey3colums3rows/mappedb.nq	Mon Mar 12 15:51:52 2012 +0100
+++ b/D010-1table1primarykey3colums3rows/mappedb.nq	Tue Mar 13 02:30:47 2012 +0100
@@ -1,3 +1,3 @@
-<http://example.com/1Bolivia%2C%20Plurinational%20State%20of> <http://example.com/name> "Bolivia, Plurinational State of" .
-<http://example.com/2Ireland> <http://example.com/name> "Ireland" .
-<http://example.com/3Saint%20Martin%20(French%20part)> <http://example.com/name> "Saint Martin (French part)" .
+<http://example.com/1/Bolivia%2C%20Plurinational%20State%20of> <http://example.com/name> "Bolivia, Plurinational State of" .
+<http://example.com/2/Ireland> <http://example.com/name> "Ireland" .
+<http://example.com/3/Saint%20Martin%20(French%20part)> <http://example.com/name> "Saint Martin (French part)" .
--- a/D010-1table1primarykey3colums3rows/mappedc.nq	Mon Mar 12 15:51:52 2012 +0100
+++ b/D010-1table1primarykey3colums3rows/mappedc.nq	Tue Mar 13 02:30:47 2012 +0100
@@ -1,3 +1,3 @@
-<http://example.com/1Bolivia%2C%20Plurinational%20State%20of> <http://example.com/code> "{{{ BO }}}" .
-<http://example.com/2Ireland> <http://example.com/code> "{{{ IE }}}" .
-<http://example.com/3Saint%20Martin%20(French%20part)> <http://example.com/code> "{{{ MF }}}" .
+<http://example.com/1/Bolivia%2C%20Plurinational%20State%20of> <http://example.com/code> "{{{ BO }}}" .
+<http://example.com/2/Ireland> <http://example.com/code> "{{{ IE }}}" .
+<http://example.com/3/Saint%20Martin%20(French%20part)> <http://example.com/code> "{{{ MF }}}" .
--- a/D010-1table1primarykey3colums3rows/r2rmla.ttl	Mon Mar 12 15:51:52 2012 +0100
+++ b/D010-1table1primarykey3colums3rows/r2rmla.ttl	Tue Mar 13 02:30:47 2012 +0100
@@ -9,11 +9,11 @@
         
 	rr:logicalTable [ rr:tableName "\"Country Info\""; ] ;
 	
-    rr:subjectMap [ rr:template "http://example.com/{\"Country Code\"}" ]; 
+	rr:subjectMap [ rr:template "http://example.com/{\"Country Code\"}" ]; 
 	
-    rr:predicateObjectMap
-    [ 
-      rr:predicate		ex:name ; 
-      rr:objectMap		[ rr:column "\"Name\"" ]
-    ]
-    .
\ No newline at end of file
+	rr:predicateObjectMap
+	[ 
+		rr:predicate		ex:name ; 
+		rr:objectMap		[ rr:column "\"Name\"" ]
+ 	]
+ 	.
\ No newline at end of file
--- a/D010-1table1primarykey3colums3rows/r2rmlb.ttl	Mon Mar 12 15:51:52 2012 +0100
+++ b/D010-1table1primarykey3colums3rows/r2rmlb.ttl	Tue Mar 13 02:30:47 2012 +0100
@@ -9,11 +9,11 @@
         
 	rr:logicalTable [ rr:tableName "\"Country Info\""; ] ;
 	
-    rr:subjectMap [ rr:template "http://example.com/{\"Country Code\"}{\"Name\"}" ]; 
+	rr:subjectMap [ rr:template "http://example.com/{\"Country Code\"}/{\"Name\"}" ]; 
 	
-    rr:predicateObjectMap
-    [ 
-      rr:predicate		ex:name ; 
-      rr:objectMap    [ rr:column "\"Name\"" ]
+	rr:predicateObjectMap
+	[ 
+		rr:predicate	ex:name ; 
+		rr:objectMap    [ rr:column "\"Name\"" ]
     ]
     .
\ No newline at end of file
--- a/D010-1table1primarykey3colums3rows/r2rmlc.ttl	Mon Mar 12 15:51:52 2012 +0100
+++ b/D010-1table1primarykey3colums3rows/r2rmlc.ttl	Tue Mar 13 02:30:47 2012 +0100
@@ -9,11 +9,11 @@
         
 	rr:logicalTable [ rr:tableName "\"Country Info\""; ] ;
 	
-    rr:subjectMap [ rr:template "http://example.com/{\"Country Code\"}{\"Name\"}" ]; 
+	rr:subjectMap [ rr:template "http://example.com/{\"Country Code\"}/{\"Name\"}" ]; 
 	
-    rr:predicateObjectMap
-    [ 
-      rr:predicate		ex:code ; 
-      rr:objectMap    [ rr:template "\\{\\{\\{ {\"ISO 3166\"} \\}\\}\\}"; rr:termType rr:Literal; ]
-    ]
+	rr:predicateObjectMap
+	[ 
+		rr:predicate	ex:code ; 
+		rr:objectMap    [ rr:template "\\{\\{\\{ {\"ISO 3166\"} \\}\\}\\}"; rr:termType rr:Literal; ]
+	]
     .
\ No newline at end of file
--- a/D011-M2MRelations/manifest.ttl	Mon Mar 12 15:51:52 2012 +0100
+++ b/D011-M2MRelations/manifest.ttl	Tue Mar 13 02:30:47 2012 +0100
@@ -37,7 +37,7 @@
 	dcterms:title "M to M relation, by using an additional Triples Map" ; 
 	dcterms:identifier "R2RMLTC0011b" ;
 	test:purpose "Tests, M to M relations, by using an additional Triples Map" ;
-	test:specificationReference "#termtype" ;
+	test:specificationReference "#physical-tables" ;
 	test:reviewStatus test:unreviewed ;
 	rdb2rdftest:database <d011> ;
 	rdb2rdftest:output "mappedb.nq" ;
--- a/D011-M2MRelations/mappeda.nq	Mon Mar 12 15:51:52 2012 +0100
+++ b/D011-M2MRelations/mappeda.nq	Tue Mar 13 02:30:47 2012 +0100
@@ -1,22 +1,19 @@
-<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> .
\ No newline at end of file
+<http://example.com/110/Tennis> <http://example.com/description> "Tennis" .
+<http://example.com/110/Tennis> <http://example.com/id> "110"^^<http://www.w3.org/2001/XMLSchema#integer> .
+<http://example.com/10/Venus-Williams> <http://example.com/plays> <http://example.com/110/Tennis> .
+<http://example.com/10/Venus-Williams> <http://example.com/lastName> "Williams" .
+<http://example.com/10/Venus-Williams> <http://example.com/firstName> "Venus" .
+<http://example.com/10/Venus-Williams> <http://example.com/id> "10"^^<http://www.w3.org/2001/XMLSchema#integer> .
+<http://example.com/111/Football> <http://example.com/description> "Football" .
+<http://example.com/111/Football> <http://example.com/id> "111"^^<http://www.w3.org/2001/XMLSchema#integer> .
+<http://example.com/12/David-Villa> <http://example.com/plays> <http://example.com/111/Football> .
+<http://example.com/12/David-Villa> <http://example.com/lastName> "Villa" .
+<http://example.com/12/David-Villa> <http://example.com/firstName> "David" .
+<http://example.com/12/David-Villa> <http://example.com/id> "12"^^<http://www.w3.org/2001/XMLSchema#integer> .
+<http://example.com/112/Formula1> <http://example.com/description> "Formula1" .
+<http://example.com/112/Formula1> <http://example.com/id> "112"^^<http://www.w3.org/2001/XMLSchema#integer> .
+<http://example.com/11/Fernando-Alonso> <http://example.com/plays> <http://example.com/112/Formula1> .
+<http://example.com/11/Fernando-Alonso> <http://example.com/plays> <http://example.com/111/Football> .
+<http://example.com/11/Fernando-Alonso> <http://example.com/lastName> "Alonso" .
+<http://example.com/11/Fernando-Alonso> <http://example.com/firstName> "Fernando" .
+<http://example.com/11/Fernando-Alonso> <http://example.com/id> "11"^^<http://www.w3.org/2001/XMLSchema#integer> .
\ No newline at end of file
--- a/D011-M2MRelations/mappedb.nq	Mon Mar 12 15:51:52 2012 +0100
+++ b/D011-M2MRelations/mappedb.nq	Tue Mar 13 02:30:47 2012 +0100
@@ -1,21 +1,15 @@
-<http://example.com/student/10> <http://xmlns.com/foaf/0.1/lastName> "Williams" .
-<http://example.com/student/10> <http://xmlns.com/foaf/0.1/firstName> "Venus" .
-<http://example.com/student/10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/Student> .
-<http://example.com/student/12> <http://xmlns.com/foaf/0.1/lastName> "Villa" .
-<http://example.com/student/12> <http://xmlns.com/foaf/0.1/firstName> "David" .
-<http://example.com/student/12> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/Student> .
-<http://example.com/student/11> <http://xmlns.com/foaf/0.1/lastName> "Alonso" .
-<http://example.com/student/11> <http://xmlns.com/foaf/0.1/firstName> "Fernando" .
-<http://example.com/student/11> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/Student> .
+<http://example.com/student/10> <http://example.com/lastName> "Williams" .
+<http://example.com/student/10> <http://example.com/firstName> "Venus" .
+<http://example.com/student/12> <http://example.com/lastName> "Villa" .
+<http://example.com/student/12> <http://example.com/firstName> "David" .
+<http://example.com/student/11> <http://example.com/lastName> "Alonso" .
+<http://example.com/student/11> <http://example.com/firstName> "Fernando" .
 <http://example.com/sport/110> <http://example.com/description> "Tennis" .
 <http://example.com/sport/110> <http://example.com/id> "110"^^<http://www.w3.org/2001/XMLSchema#integer> .
-<http://example.com/sport/110> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/Sport> .
 <http://example.com/sport/111> <http://example.com/description> "Football" .
 <http://example.com/sport/111> <http://example.com/id> "111"^^<http://www.w3.org/2001/XMLSchema#integer> .
-<http://example.com/sport/111> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/Sport> .
 <http://example.com/sport/112> <http://example.com/description> "Formula1" .
 <http://example.com/sport/112> <http://example.com/id> "112"^^<http://www.w3.org/2001/XMLSchema#integer> .
-<http://example.com/sport/112> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/Sport> .
 <http://example.com/student/10> <http://example.com/plays> <http://example.com/sport/110> .
 <http://example.com/student/12> <http://example.com/plays> <http://example.com/sport/111> .
 <http://example.com/student/11> <http://example.com/plays> <http://example.com/sport/112> .
--- a/D011-M2MRelations/r2rmla.ttl	Mon Mar 12 15:51:52 2012 +0100
+++ b/D011-M2MRelations/r2rmla.ttl	Tue Mar 13 02:30:47 2012 +0100
@@ -18,30 +18,30 @@
        AND Sport.ID = Student_Sport.ID_Sport;
        """; ];
 
-    rr:subjectMap [ rr:template "http://example.com/{ID}{FirstName}{LastName}" ];
+    rr:subjectMap [ rr:template "http://example.com/{ID}/{FirstName}-{LastName}" ];
 	
     rr:predicateObjectMap
     [ 
-      rr:predicate		ex:id ; 
-      rr:objectMap    [ rr:column "ID"; rr:datatype xsd:integer ]
+      rr:predicate	ex:id ; 
+      rr:objectMap	[ rr:column "ID"; ]
     ];
 
     rr:predicateObjectMap
     [ 
-      rr:predicate		foaf:firstName ; 
-      rr:objectMap    [ rr:column "FirstName" ]
+      rr:predicate	ex:firstName ; 
+      rr:objectMap	[ rr:column "FirstName" ]
     ];
 
     rr:predicateObjectMap
     [ 
-      rr:predicate		foaf:lastName ; 
-      rr:objectMap    [ rr:column "LastName" ]
+      rr:predicate	ex:lastName ; 
+      rr:objectMap	[ rr:column "LastName" ]
     ];
 
     rr:predicateObjectMap
     [ 
-      rr:predicate		ex:plays ; 
-      rr:objectMap    [ rr:template "http://example.com/{Sport_ID}{Description}" ]
+      rr:predicate	ex:plays ; 
+      rr:objectMap	[ rr:template "http://example.com/{Sport_ID}/{Description}" ]
     ]
     .
 
@@ -50,20 +50,17 @@
 
 	rr:logicalTable [ rr:tableName  "Sport" ];
 	
-    rr:subjectMap [ 
-		rr:template "http://example.com/{ID}{Description}"; 
-		rr:class ex:Sport; 
-	];
+    rr:subjectMap [ rr:template "http://example.com/{ID}/{Description}"; ];
 
     rr:predicateObjectMap
     [ 
-      rr:predicate		ex:id ; 
-      rr:objectMap    [ rr:column "ID"; rr:datatype xsd:integer ]
+      rr:predicate	ex:id ; 
+      rr:objectMap	[ rr:column "ID"; ]
     ];
 
     rr:predicateObjectMap
     [ 
-      rr:predicate		ex:description ; 
-      rr:objectMap    [ rr:column "Description" ]
+      rr:predicate	ex:description ; 
+      rr:objectMap	[ rr:column "Description" ]
     ]
     .
--- a/D011-M2MRelations/r2rmlb.ttl	Mon Mar 12 15:51:52 2012 +0100
+++ b/D011-M2MRelations/r2rmlb.ttl	Tue Mar 13 02:30:47 2012 +0100
@@ -6,41 +6,41 @@
 
 <TriplesMap1>
 	a rr:TriplesMap; 
+
     rr:logicalTable [ rr:tableName "\"Student\""; ] ;
-    rr:subjectMap [
-        rr:template "http://example.com/student/{\"ID\"}";
-        rr:class ex:Student;
-    ];
+
+    rr:subjectMap [ rr:template "http://example.com/student/{\"ID\"}"; ];
+
     rr:predicateObjectMap
     [ 
-      rr:predicate		foaf:firstName ; 
-      rr:objectMap    [ rr:column "\"FirstName\"" ]
+		rr:predicate	ex:firstName ; 
+		rr:objectMap	[ rr:column "\"FirstName\"" ]
     ];
 
     rr:predicateObjectMap
     [ 
-      rr:predicate		foaf:lastName ; 
-      rr:objectMap    [ rr:column "\"LastName\"" ]
+		rr:predicate	ex:lastName ; 
+		rr:objectMap	[ rr:column "\"LastName\"" ]
     ]
 	.	
     
 <TriplesMap2>
 	a rr:TriplesMap; 
+
     rr:logicalTable [ rr:tableName "\"Sport\""; ] ;
-    rr:subjectMap [
-        rr:template "http://example.com/sport/{\"ID\"}";
-        rr:class ex:Sport;
-    ];
+
+    rr:subjectMap [ rr:template "http://example.com/sport/{\"ID\"}"; ];
+
     rr:predicateObjectMap
     [ 
-      rr:predicate		ex:id ; 
-      rr:objectMap    [ rr:column "\"ID\""; rr:datatype xsd:integer ]
+		rr:predicate	ex:id ; 
+		rr:objectMap	[ rr:column "\"ID\""; ]
     ];
 
     rr:predicateObjectMap
     [ 
-      rr:predicate		ex:description ; 
-      rr:objectMap    [ rr:column "\"Description\"" ]
+		rr:predicate	ex:description ; 
+		rr:objectMap	[ rr:column "\"Description\"" ]
     ]
 	.
 
@@ -52,8 +52,8 @@
    rr:subjectMap [ rr:template "http://example.com/student/{\"ID_Student\"}" ];
    
    rr:predicateObjectMap [
-       rr:predicate		ex:plays ;
-       rr:objectMap [ rr:template "http://example.com/sport/{\"ID_Sport\"}" ];
+		rr:predicate	ex:plays ;
+		rr:objectMap	[ rr:template "http://example.com/sport/{\"ID_Sport\"}" ];
    ].
    
    
--- a/D012-2tables2duplicates0nulls/manifest.ttl	Mon Mar 12 15:51:52 2012 +0100
+++ b/D012-2tables2duplicates0nulls/manifest.ttl	Tue Mar 13 02:30:47 2012 +0100
@@ -25,7 +25,7 @@
 	dcterms:title "Duplicate tuples generate same blank node" ; 
 	dcterms:identifier "R2RMLTC0012a" ;
 	test:purpose "Tests that blank nodes with same identifier and in the same graph but generated by different logical rows are considered equivalent." ;
-	test:specificationReference "#termtype" ;
+	test:specificationReference "#blank-nodes" ;
 	test:reviewStatus test:unreviewed ;
 	rdb2rdftest:database <d012> ;
 	rdb2rdftest:hasExpectedOutput true ;
@@ -37,7 +37,7 @@
 	dcterms:title "Duplicate tuples generate same blank node" ; 
 	dcterms:identifier "R2RMLTC0012b" ;
 	test:purpose "Tests that blank nodes with same identifier and in the same graph but generated by different logical rows are considered equivalent." ;
-	test:specificationReference "#termtype" ;
+	test:specificationReference "#blank-nodes" ;
 	test:reviewStatus test:unreviewed ;
 	rdb2rdftest:database <d012> ;
 	rdb2rdftest:hasExpectedOutput true ;	
@@ -49,7 +49,7 @@
 	dcterms:title "TriplesMap without subjectMap" ; 
 	dcterms:identifier "R2RMLTC0012c" ;
 	test:purpose "Tests a R2RML with missing information, TriplesMap without subjectMap." ;
-	test:specificationReference "#data-errors" ;
+	test:specificationReference "#dfn-template-valued-term-map" ;
 	test:reviewStatus test:unreviewed ;
 	rdb2rdftest:database <d012> ;
 	rdb2rdftest:hasExpectedOutput false ;
@@ -61,7 +61,7 @@
 	dcterms:title "TriplesMap with two subjectMap" ; 
 	dcterms:identifier "R2RMLTC0012d" ;
 	test:purpose "Tests a R2RML with wrong information, TriplesMap with two subjectMap." ;
-	test:specificationReference "#data-errors" ;
+	test:specificationReference "#dfn-template-valued-term-map" ;
 	test:reviewStatus test:unreviewed ;
 	rdb2rdftest:database <d012> ;
 	rdb2rdftest:hasExpectedOutput false ;
--- a/D012-2tables2duplicates0nulls/mappeda.nq	Mon Mar 12 15:51:52 2012 +0100
+++ b/D012-2tables2duplicates0nulls/mappeda.nq	Tue Mar 13 02:30:47 2012 +0100
@@ -1,6 +1,4 @@
-_:Bob_Smith_30 <http://example.com/amount> "30"^^<http://www.w3.org/2001/XMLSchema#float> .
+_:Bob_Smith_30 <http://example.com/amount> "30"^^<http://www.w3.org/2001/XMLSchema#double> .
 _: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://example.com/amount> "20"^^<http://www.w3.org/2001/XMLSchema#double> .
 _: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	Mon Mar 12 15:51:52 2012 +0100
+++ b/D012-2tables2duplicates0nulls/mappedb.nq	Tue Mar 13 02:30:47 2012 +0100
@@ -1,6 +1,4 @@
 _: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> .
+_:Sue_Jones_20 <http://xmlns.com/foaf/0.1/name> "Sue Jones" .
\ No newline at end of file
--- a/D012-2tables2duplicates0nulls/r2rmla.ttl	Mon Mar 12 15:51:52 2012 +0100
+++ b/D012-2tables2duplicates0nulls/r2rmla.ttl	Tue Mar 13 02:30:47 2012 +0100
@@ -9,16 +9,12 @@
 
 	rr:logicalTable [ rr:tableName  "\"IOUs\"" ];
 	
-    rr:subjectMap [
-            rr:template "{\"fname\"}_{\"lname\"}_{\"amount\"}"; 
-            rr:termType rr:BlankNode;
-            rr:class ex:IOU; 
-      ];
+    rr:subjectMap [ rr:template "{\"fname\"}_{\"lname\"}_{\"amount\"}"; rr:termType rr:BlankNode; ];
 	
     rr:predicateObjectMap
     [ 
-      rr:predicate		foaf:name ; 
-      rr:objectMap    [ 
+      rr:predicate	foaf:name ; 
+      rr:objectMap	[ 
             rr:template "{\"fname\"} {\"lname\"}";
             rr:termType rr:Literal ;
       ]
@@ -29,8 +25,6 @@
       rr:predicate		ex:amount ; 
       rr:objectMap    [ 
             rr:column "\"amount\"";
-            rr:termType rr:Literal ;
-            rr:datatype xsd:float ;
       ]
     ];
 	.
\ No newline at end of file
--- a/D012-2tables2duplicates0nulls/r2rmlb.ttl	Mon Mar 12 15:51:52 2012 +0100
+++ b/D012-2tables2duplicates0nulls/r2rmlb.ttl	Tue Mar 13 02:30:47 2012 +0100
@@ -12,7 +12,6 @@
     rr:subjectMap [
             rr:template "{\"fname\"}_{\"lname\"}"; 
             rr:termType rr:BlankNode ;
-            rr:class ex:IOU; 
       ];
 	
     rr:predicateObjectMap
@@ -32,15 +31,11 @@
     rr:subjectMap [
             rr:template "{\"fname\"}_{\"lname\"}"; 
             rr:termType rr:BlankNode;
-            rr:class ex:IOU; 
       ];
 	
     rr:predicateObjectMap
     [ 
-      rr:predicate		ex:city ; 
-      rr:objectMap    [ 
-            rr:column "\"city\"";
-            rr:termType rr:Literal ; 
-      ]
+      rr:predicate	ex:city ; 
+      rr:objectMap	[ rr:column "\"city\""; ]
     ];
 	.
\ No newline at end of file
--- a/D012-2tables2duplicates0nulls/r2rmlc.ttl	Mon Mar 12 15:51:52 2012 +0100
+++ b/D012-2tables2duplicates0nulls/r2rmlc.ttl	Tue Mar 13 02:30:47 2012 +0100
@@ -11,8 +11,8 @@
 	
     rr:predicateObjectMap
     [ 
-      rr:predicate		foaf:name ; 
-      rr:objectMap    [ 
+      rr:predicate	foaf:name ; 
+      rr:objectMap	[ 
             rr:template "{\"fname\"} {\"lname\"}";
             rr:termType rr:Literal ;
       ]
@@ -20,11 +20,7 @@
     
     rr:predicateObjectMap
     [ 
-      rr:predicate		ex:amount ; 
-      rr:objectMap    [ 
-            rr:column "\"amount\"";
-            rr:termType rr:Literal ;
-            rr:datatype xsd:float ;
-      ]
+      rr:predicate	ex:amount ; 
+      rr:objectMap	[ rr:column "\"amount\""; ]
     ];
 	.
\ No newline at end of file
--- a/D012-2tables2duplicates0nulls/r2rmld.ttl	Mon Mar 12 15:51:52 2012 +0100
+++ b/D012-2tables2duplicates0nulls/r2rmld.ttl	Tue Mar 13 02:30:47 2012 +0100
@@ -11,32 +11,15 @@
 	
     rr:subjectMap [
             rr:template "{\"fname\"}_{\"lname\"}_{\"amount\"}"; 
-            rr:termType rr:BlankNode;
-            rr:class ex:IOU; 
       ];
 
     rr:subjectMap [
             rr:template "{\"amount\"}_{\"fname\"}_{\"lname\"}"; 
-            rr:termType rr:BlankNode;
-            rr:class ex:IOU; 
       ];
-	  
-    rr:predicateObjectMap
-    [ 
-      rr:predicate		foaf:name ; 
-      rr:objectMap    [ 
-            rr:template "{\"fname\"} {\"lname\"}";
-            rr:termType rr:Literal ;
-      ]
-    ];
     
     rr:predicateObjectMap
     [ 
       rr:predicate		ex:amount ; 
-      rr:objectMap    [ 
-            rr:column "\"amount\"";
-            rr:termType rr:Literal ;
-            rr:datatype xsd:float ;
-      ]
+      rr:objectMap		[ rr:column "\"amount\""; ]
     ];
 	.
\ No newline at end of file
--- a/D013-1table1primarykey3columns2rows1nullvalue/manifest.ttl	Mon Mar 12 15:51:52 2012 +0100
+++ b/D013-1table1primarykey3columns2rows1nullvalue/manifest.ttl	Tue Mar 13 02:30:47 2012 +0100
@@ -22,9 +22,9 @@
 .
 
 <tc0013a> a rdb2rdftest:R2RML ;	
-	dcterms:title "Duplicate tuples generate same blank node" ; 
+	dcterms:title "Generation of empty triples from referenced columns that have null values" ; 
 	dcterms:identifier "R2RMLTC0013a" ;
-	test:purpose "Tests the presence of null values in a template valued term map" ;
+	test:purpose "Tests the generation of empty triples from referenced columns that have null values" ;
 	test:specificationReference "#dfn-template-valued-term-map" ;
 	test:reviewStatus test:unreviewed ;
 	rdb2rdftest:database <d013> ;
--- a/D013-1table1primarykey3columns2rows1nullvalue/mappeda.nq	Mon Mar 12 15:51:52 2012 +0100
+++ b/D013-1table1primarykey3columns2rows1nullvalue/mappeda.nq	Tue Mar 13 02:30:47 2012 +0100
@@ -1,8 +1,2 @@
-<http://example.com/Person1Alice> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
-<http://example.com/Person1Alice> <http://example.com/id> "1"^^<http://www.w3.org/2001/XMLSchema#integer> . 
-<http://example.com/Person1Alice> <http://xmlns.com/foaf/0.1/name> "Alice" .
-<http://example.com/Person2BobSeptember%2C%202010> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
-<http://example.com/Person2BobSeptember%2C%202010> <http://example.com/id> "2"^^<http://www.w3.org/2001/XMLSchema#integer> . 
-<http://example.com/Person2BobSeptember%2C%202010> <http://xmlns.com/foaf/0.1/name> "Bob" .
-<http://example.com/Person2BobSeptember%2C%202010> <http://example.com/BirthDay> "September, 2010" .
+<http://example.com/Person/2/Bob-September%2C%202010> <http://example.com/BirthDay> "September, 2010" .
 
--- a/D013-1table1primarykey3columns2rows1nullvalue/r2rmla.ttl	Mon Mar 12 15:51:52 2012 +0100
+++ b/D013-1table1primarykey3columns2rows1nullvalue/r2rmla.ttl	Tue Mar 13 02:30:47 2012 +0100
@@ -11,29 +11,11 @@
 
 	rr:logicalTable [ rr:tableName "\"Person\"" ];
 
-    rr:subjectMap [ rr:template "http://example.com/Person{\"ID\"}{\"Name\"}{\"DateOfBirth\"}";  ];
-	
-    rr:predicateObjectMap
-    [ 
-		rr:predicate	rdf:type ;
-		rr:object		foaf:Person ; 
-	];
+    rr:subjectMap [ rr:template "http://example.com/Person/{\"ID\"}/{\"Name\"}-{\"DateOfBirth\"}";  ];
 	
     rr:predicateObjectMap
     [ 
-		rr:predicate	ex:id ;
-		rr:objectMap    [ rr:column "\"ID\""; rr:datatype xsd:integer ]
-    ];
-
-    rr:predicateObjectMap
-    [ 
-      rr:predicate		foaf:name ;
-      rr:objectMap    [ rr:column "\"Name\"" ]
-    ];
-
-    rr:predicateObjectMap
-    [ 
       rr:predicate		ex:BirthDay ;
-      rr:objectMap    [ rr:column "\"DateOfBirth\"" ]
+      rr:objectMap		[ rr:column "\"DateOfBirth\"" ]
     ]
     .
--- a/D014-3tables1primarykey1foreignkey/manifest.ttl	Mon Mar 12 15:51:52 2012 +0100
+++ b/D014-3tables1primarykey1foreignkey/manifest.ttl	Tue Mar 13 02:30:47 2012 +0100
@@ -8,7 +8,7 @@
 	dcterms:title "3 tables, one primary key, one foreign key" ;
 	dcterms:identifier "D014-3tables1primarykey1foreignkey" ;
 	rdb2rdftest:sqlScriptFile "create.sql";
-	rdb2rdftest:relatedTestCase <dg0014>, <tc0014a>, <tc0014b>, <tc0014c>, <tc0014d>, <tc0014e> ;
+	rdb2rdftest:relatedTestCase <dg0014>, <tc0014a>, <tc0014b>, <tc0014c>, <tc0014d> ;
 .
 
 <dg0014> a rdb2rdftest:DirectMapping ;	
@@ -23,10 +23,10 @@
 .
 
 <tc0014a> a rdb2rdftest:R2RML ;	
-	dcterms:title "three tables, one primary key, one foreign key" ; 
+	dcterms:title "Subjectmap with rr:inverseExpression" ; 
 	dcterms:identifier "R2RMLTC0014a" ;
-	test:purpose "Tests a logicaltable with sqlQuery" ;
-	test:specificationReference "#dfn-graph-map" ;
+	test:purpose "Tests a rr:subjectMap with rr:inverseExpression" ;
+	test:specificationReference "#inverse" ;
 	test:reviewStatus test:unreviewed ;
 	rdb2rdftest:database <d014> ;
 	rdb2rdftest:hasExpectedOutput true ;
@@ -35,10 +35,10 @@
 .
 
 <tc0014b> a rdb2rdftest:R2RML ;	
-	dcterms:title "three tables, one primary key, one foreign key" ; 
+	dcterms:title "Triplesmaps with rr:inverseExpression and rr:joinCondition" ; 
 	dcterms:identifier "R2RMLTC0014b" ;
-	test:purpose "Mapping specification using SQL-based logical table definition" ;
-	test:specificationReference "#inverse" ;
+	test:purpose "Test two triplesmaps, one with a rr:inverseExpression and the other with a rr:joinCondition for foerign key relations" ;
+	test:specificationReference "#dfn-join-condition" ;
 	test:reviewStatus test:unreviewed ;
 	rdb2rdftest:database <d014> ;
 	rdb2rdftest:hasExpectedOutput true ;	
@@ -47,9 +47,9 @@
 .
 
 <tc0014c> a rdb2rdftest:R2RML ;	
-	dcterms:title "three tables, one primary key, one foreign key" ; 
+	dcterms:title "Triplesmaps with rr:inverseExpression, rr:joinCondition, and referencing object maps" ; 
 	dcterms:identifier "R2RMLTC0014c" ;
-	test:purpose "Mapping specification using table name based logical table definition" ;
+	test:purpose "Triplesmaps with rr:inverseExpression, rr:joinCondition, and referencing object maps" ;
 	test:specificationReference "#foreign-key" ;
 	test:reviewStatus test:unreviewed ;
 	rdb2rdftest:database <d014> ;
@@ -61,35 +61,11 @@
 <tc0014d> a rdb2rdftest:R2RML ;	
 	dcterms:title "three tables, one primary key, one foreign key" ; 
 	dcterms:identifier "R2RMLTC0014d" ;
-	test:purpose "Mapping specification referencing object map" ;
-	test:specificationReference "#dfn-referencing-object-map" ;
+	test:purpose "Test the translation of database type codes to IRIs" ;
+	test:specificationReference "#example-translationtable" ;
 	test:reviewStatus test:unreviewed ;
 	rdb2rdftest:database <d014> ;
 	rdb2rdftest:hasExpectedOutput true ;
 	rdb2rdftest:output "mappedd.nq" ;	
 	rdb2rdftest:mappingDocument "r2rmld.ttl" ;
-.
-
-<tc0014e> a rdb2rdftest:R2RML ;	
-	dcterms:title "three tables, one primary key, one foreign key" ; 
-	dcterms:identifier "R2RMLTC0014e" ;
-	test:purpose "Mapping Specification for the LIKES Table" ;
-	test:specificationReference "#dfn-output-dataset" ;
-	test:reviewStatus test:unreviewed ;
-	rdb2rdftest:database <d014> ;
-	rdb2rdftest:hasExpectedOutput true ;
-	rdb2rdftest:output "mappede.nq" ;	
-	rdb2rdftest:mappingDocument "r2rmle.ttl" ;
-.
-
-<tc0014f> a rdb2rdftest:R2RML ;	
-	dcterms:title "Database type codes to IRIs" ; 
-	dcterms:identifier "R2RMLTC0014f" ;
-	test:purpose "Test the translation of database type codes to IRIs" ;
-	test:specificationReference "#example-translationtable" ;
-	test:reviewStatus test:unreviewed ;
-	rdb2rdftest:database <d014> ;
-	rdb2rdftest:hasExpectedOutput true ;
-	rdb2rdftest:output "mappedf.nq" ;	
-	rdb2rdftest:mappingDocument "r2rmlf.ttl" ;
 .
\ No newline at end of file
--- a/D014-3tables1primarykey1foreignkey/mappeda.nq	Mon Mar 12 15:51:52 2012 +0100
+++ b/D014-3tables1primarykey1foreignkey/mappeda.nq	Tue Mar 13 02:30:47 2012 +0100
@@ -1,5 +1,1 @@
-_: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#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
+_:Department10 <http://example.com/dept#location> "NEW YORK" .
--- a/D014-3tables1primarykey1foreignkey/mappedb.nq	Mon Mar 12 15:51:52 2012 +0100
+++ b/D014-3tables1primarykey1foreignkey/mappedb.nq	Tue Mar 13 02:30:47 2012 +0100
@@ -1,17 +1,16 @@
-<http://example.com/emp/7369> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/ns#emp> <http://example.com/graph/CLERK/PART_TIME> .
-<http://example.com/emp/7369> <http://example.com/emp#jobtype> <http://example.com/emp/job/CLERK> <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/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#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
+<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> .
+<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/emp/7369> <http://example.com/emp#empno> "7369"^^<http://www.w3.org/2001/XMLSchema#integer>  .
+<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#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" .
+_:Department10 <http://example.com/dept#COMPANY> "EXAMPLE Corporation" .
\ No newline at end of file
--- a/D014-3tables1primarykey1foreignkey/mappedc.nq	Mon Mar 12 15:51:52 2012 +0100
+++ b/D014-3tables1primarykey1foreignkey/mappedc.nq	Tue Mar 13 02:30:47 2012 +0100
@@ -1,17 +1,15 @@
-<http://example.com/emp/7369> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/ns#emp> <http://example.com/graph/CLERK/PART_TIME> .
-<http://example.com/emp/7369> <http://example.com/emp#jobtype> <http://example.com/emp/job/CLERK> <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/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#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
+<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> .
+<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/emp/7369> <http://example.com/emp#empno> "7369"^^<http://www.w3.org/2001/XMLSchema#integer> .
+<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#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" .
+_:Department10 <http://example.com/dept#COMPANY> "EXAMPLE Corporation" .
--- a/D014-3tables1primarykey1foreignkey/mappedd.nq	Mon Mar 12 15:51:52 2012 +0100
+++ b/D014-3tables1primarykey1foreignkey/mappedd.nq	Tue Mar 13 02:30:47 2012 +0100
@@ -1,17 +1,1 @@
-<http://example.com/emp/7369> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/ns#emp> <http://example.com/graph/CLERK/PART_TIME> .
-<http://example.com/emp/7369> <http://example.com/emp#jobtype> <http://example.com/emp/job/CLERK> <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/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#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> .
+<http://data.example.com/employee/7369> <http://example.com/ns#role> <http://data.example.com/roles/general-office> .
\ No newline at end of file
--- a/D014-3tables1primarykey1foreignkey/r2rmla.ttl	Mon Mar 12 15:51:52 2012 +0100
+++ b/D014-3tables1primarykey1foreignkey/r2rmla.ttl	Tue Mar 13 02:30:47 2012 +0100
@@ -1,47 +1,25 @@
 @prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix ex: <http://example.com/ns#> .
-@prefix emp: <http://example.com/emp#> .
 @prefix dept: <http://example.com/dept#> .
-@prefix likes: <http://example.com/likes#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 @base <http://mappingpedia.org/rdb2rdf/r2rml/tc/> .
 
 <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:graph	ex:DeptGraph ;
                     rr:inverseExpression "{\"deptno\"} = substr({\"deptId\"},length('Department')+1)"];
 
-    rr:predicateObjectMap
-    [ 
-      rr:predicate		dept:deptno ; 
-      rr:objectMap    [ rr:column "\"deptno\""; rr:datatype xsd:positiveInteger ]
-    ];
-
     rr:predicateObjectMap 
     [ 
-      rr:predicate		dept:name ; 
-      rr:objectMap    [ rr:column "\"dname\"" ]
+      rr:predicate	dept:location ; 
+      rr:objectMap	[ rr:column "\"loc\"" ]
     ];
-
-    rr:predicateObjectMap 
-    [ 
-      rr:predicate		dept:location ; 
-      rr:objectMap    [ rr:column "\"loc\"" ]
-    ];
-
-    rr:predicateObjectMap 
-    [ 
-      rr:predicate		dept:COMPANY ; 
-      rr:objectMap    [ rr:object "EXAMPLE Corporation" ]
-    ]
+ 
 .
\ No newline at end of file
--- a/D014-3tables1primarykey1foreignkey/r2rmlb.ttl	Mon Mar 12 15:51:52 2012 +0100
+++ b/D014-3tables1primarykey1foreignkey/r2rmlb.ttl	Tue Mar 13 02:30:47 2012 +0100
@@ -11,22 +11,20 @@
 <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:graph	ex:DeptGraph ;
-                    rr:inverseExpression "{\"deptno\"} = substr({"deptId"},length('Department')+1)"];
+                    rr:inverseExpression "{\"deptno\"} = substr({"deptId"},length('Department')+1)" ];
 
     rr:predicateObjectMap
     [ 
       rr:predicate		dept:deptno ; 
-      rr:objectMap    [ rr:column "\"deptno\""; rr:datatype xsd:positiveInteger ]
+      rr:objectMap    [ rr:column "\"deptno\""; ]
     ];
 
     rr:predicateObjectMap 
@@ -63,10 +61,8 @@
        FROM "EMP"
        """ ];
 
-    rr:subjectMap [ rr:column "empURI";
-                    rr:class ex:emp; 
-                    rr:graphMap [ rr:column "graphURI" ]; ];
-
+    rr:subjectMap [ rr:column "empURI"; ];
+     
     rr:predicateObjectMap 
     [ 
       rr:predicate		emp:jobtype ; 
@@ -101,7 +97,6 @@
     [ 
       rr:predicate		emp:name ; 
       rr:objectMap    [ rr:column "\"ename\"" ]; 
-      rr:graph			emp:empNameGraph ;
     ];
 
     rr:predicateObjectMap 
--- a/D014-3tables1primarykey1foreignkey/r2rmlc.ttl	Mon Mar 12 15:51:52 2012 +0100
+++ b/D014-3tables1primarykey1foreignkey/r2rmlc.ttl	Tue Mar 13 02:30:47 2012 +0100
@@ -7,22 +7,18 @@
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 @base <http://mappingpedia.org/rdb2rdf/r2rml/tc/> .
 
-
-
 <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:graph	ex:DeptGraph ;
-                    rr:inverseExpression "{\"deptno\"} = substr({deptId},length('Department')+1)"];
+                    rr:inverseExpression "{"deptno"} = substr({deptId},length('Department')+1)"];
 
     rr:predicateObjectMap
     [ 
@@ -49,38 +45,46 @@
     ]
 .
 
+
+<jobtypeObjectMap>
+    a rr:ObjectMap;
+    rr:template "http://example.com/emp/job/{\"job\"}"
+    .
+
+<emptypeObjectMap>
+    a rr:ObjectMap;
+    rr:template "http://example.com/emp/etype/{\"etype\"}"
+    .
+
 <TriplesMap2>
     a rr:TriplesMap;
 
     rr:logicalTable [ rr:tableName "\"EMP\"" ];
 
-    rr:subjectMap [ rr:template "http://example.com/emp/{\"empno\"}";
-                    rr:class ex:emp; 
-                    rr:graphMap [ rr:template "http://example.com/graph/{\"job\"}/{\"etype\"}"; ];
-                  ];
+    rr:subjectMap [ rr:template "http://example.com/emp/{\"empno\"}"; ];
 
     rr:predicateObjectMap 
     [ 
       rr:predicate		emp:jobtype ; 
-      rr:objectMap    [ rr:template "http://example.com/emp/job/{\"job\"}" ]
+      rr:objectMap    <jobtypeObjectMap>
     ];
 
     rr:predicateObjectMap 
     [ 
       rr:predicate		rdf:type ; 
-      rr:objectMap    [ rr:template "http://example.com/emp/job/{\"job\"}" ]
+      rr:objectMap    <jobtypeObjectMap>
     ];
 
     rr:predicateObjectMap 
     [ 
       rr:predicate		emp:emptype ; 
-      rr:objectMap    [ rr:template "http://example.com/emp/etype/{\"etype\"}" ]
+      rr:objectMap    <emptypeObjectMap>
     ];
 
     rr:predicateObjectMap 
     [ 
       rr:predicate		rdf:type ; 
-      rr:objectMap    [ rr:template "http://example.com/emp/etype/{\"etype\"}" ]
+      rr:objectMap    <emptypeObjectMap>
     ];
 
     rr:predicateObjectMap 
@@ -92,8 +96,7 @@
     rr:predicateObjectMap 
     [ 
       rr:predicate		emp:name ; 
-      rr:objectMap		[ rr:column "\"ename\"" ]; 
-      rr:graph			emp:empNameGraph ;
+      rr:objectMap    [ rr:column "\"ename\"" ]; 
     ];
 
     rr:predicateObjectMap 
--- a/D014-3tables1primarykey1foreignkey/r2rmld.ttl	Mon Mar 12 15:51:52 2012 +0100
+++ b/D014-3tables1primarykey1foreignkey/r2rmld.ttl	Tue Mar 13 02:30:47 2012 +0100
@@ -3,134 +3,25 @@
 @prefix ex: <http://example.com/ns#> .
 @prefix emp: <http://example.com/emp#> .
 @prefix dept: <http://example.com/dept#> .
-@prefix likes: <http://example.com/likes#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 @base <http://mappingpedia.org/rdb2rdf/r2rml/tc/> .
 
-<TriplesMap1>
-    a rr:TriplesMap;
+<TriplesMap4>
+	a rr:TriplesMap;
     rr:logicalTable [ rr:sqlQuery """
-       Select ('Department' || "deptno") AS deptId
-            , "deptno"
-            , "dname"
-            , "loc"
-         from "DEPT"
-       """ ];
-
-    rr:subjectMap [ rr:column "deptId"; rr:termType rr:BlankNode;
-                    rr:class ex:dept; 
-                    rr:graph	ex:DeptGraph ;
-                    rr:inverseExpression "{"deptno"} = substr({deptId},length('Department')+1)"];
-
-    rr:predicateObjectMap
-    [ 
-      rr:predicate		dept:deptno ; 
-      rr:objectMap    [ rr:column "\"deptno\""; rr:datatype xsd:positiveInteger ]
-    ];
-
-    rr:predicateObjectMap 
-    [ 
-      rr:predicate		dept:name ; 
-      rr:objectMap    [ rr:column "\"dname\"" ]
-    ];
-
-    rr:predicateObjectMap 
-    [ 
-      rr:predicate		dept:location ; 
-      rr:objectMap    [ rr:column "\"loc\"" ]
-    ];
-
-    rr:predicateObjectMap 
-    [ 
-      rr:predicate		dept:COMPANY ; 
-      rr:object			"EXAMPLE Corporation" 
-    ]
-.
-
-
-<jobtypeObjectMap>
-    a rr:ObjectMap;
-    rr:template "http://example.com/emp/job/{\"job\"}"
-    .
-
-<emptypeObjectMap>
-    a rr:ObjectMap;
-    rr:template "http://example.com/emp/etype/{\"etype\"}"
-    .
-
-<TriplesMap2>
-    a rr:TriplesMap;
-
-    rr:logicalTable [ rr:tableName "\"EMP\"" ];
-
-    rr:subjectMap [ rr:template "http://example.com/emp/{\"empno\"}";
-                    rr:class ex:emp; 
-                    rr:graphMap [ rr:template "http://example.com/graph/{\"job\"}/{\"etype\"}"; ];
-                  ];
 
-    rr:predicateObjectMap 
-    [ 
-      rr:predicate		emp:jobtype ; 
-      rr:objectMap    <jobtypeObjectMap>
-    ];
-
-    rr:predicateObjectMap 
-    [ 
-      rr:predicate		rdf:type ; 
-      rr:objectMap    <jobtypeObjectMap>
-    ];
-
-    rr:predicateObjectMap 
-    [ 
-      rr:predicate		emp:emptype ; 
-      rr:objectMap    <emptypeObjectMap>
-    ];
-
-    rr:predicateObjectMap 
-    [ 
-      rr:predicate		rdf:type ; 
-      rr:objectMap    <emptypeObjectMap>
-    ];
-
-    rr:predicateObjectMap 
-    [ 
-      rr:predicate		emp:empno ; 
-      rr:objectMap    [ rr:column "\"empno\"" ]
-    ];
+        SELECT *, (CASE "job"
+            WHEN 'CLERK' THEN 'general-office'
+            WHEN 'NIGHTGUARD' THEN 'security'
+            WHEN 'ENGINEER' THEN 'engineering'
+        END) ROLE FROM "EMP"
 
-    rr:predicateObjectMap 
-    [ 
-      rr:predicate		emp:name ; 
-      rr:objectMap    [ rr:column "\"ename\"" ]; 
-      rr:graph			emp:empNameGraph ;
-    ];
-
-    rr:predicateObjectMap 
-    [ 
-      rr:predicate		emp:job ; 
-      rr:objectMap    [ rr:column "\"job\"" ]
-    ];
-
-    rr:predicateObjectMap 
-    [ 
-      rr:predicate		emp:deptNum ; 
-      rr:objectMap    [ rr:column "\"deptno\"" ]
+        """ ];
+    rr:subjectMap [
+        rr:template "http://data.example.com/employee/{\"empno\"}";
     ];
-
-    rr:predicateObjectMap 
-    [ 
-      rr:predicate		emp:etype ; 
-      rr:objectMap    [ rr:column "\"etype\"" ]
-    ];
-
     rr:predicateObjectMap [
-      rr:predicate		emp:c_ref_deptno ;
-      rr:objectMap    [
-        rr:parentTriplesMap <TriplesMap1>;
-        rr:joinCondition [
-          rr:child "\"deptno\"";
-          rr:parent "\"deptno\"";
-        ];
-      ];
-    ]
-    .
\ No newline at end of file
+        rr:predicate ex:role;
+        rr:objectMap [ rr:template "http://data.example.com/roles/{ROLE}" ];
+    ].
+    
\ No newline at end of file
--- a/D015-1table3columns1composityeprimarykey3rows2languages/manifest.ttl	Mon Mar 12 15:51:52 2012 +0100
+++ b/D015-1table3columns1composityeprimarykey3rows2languages/manifest.ttl	Tue Mar 13 02:30:47 2012 +0100
@@ -22,9 +22,9 @@
 .
 
 <tc0015a> a rdb2rdftest:R2RML ;	
-	dcterms:title "Table with language information" ; 
+	dcterms:title "Generation of language tags from a table with language information" ; 
 	dcterms:identifier "R2RMLTC0015a" ;
-	test:purpose "Tests the language tag" ;
+	test:purpose "Generation of language tags from a table with language information" ;
 	test:specificationReference "#language-tags" ;
 	test:reviewStatus test:unreviewed ;
 	rdb2rdftest:database <d015> ;
@@ -34,9 +34,9 @@
 .
 
 <tc0015b> a rdb2rdftest:R2RML ;	
-	dcterms:title "Table with language information" ; 
+	dcterms:title "Generation of language tags from a table with language information, and a term map with invalid rr:language value" ; 
 	dcterms:identifier "R2RMLTC0015b" ;
-	test:purpose "Tests a term map with rr:language where the value isn't a valid language, which is an error" ;
+	test:purpose "Tests a term map with an invalid rr:language value, which is an error" ;
 	test:specificationReference "#language-tags" ;
 	test:reviewStatus test:unreviewed ;
 	rdb2rdftest:database <d015> ;
--- a/D015-1table3columns1composityeprimarykey3rows2languages/r2rmla.ttl	Mon Mar 12 15:51:52 2012 +0100
+++ b/D015-1table3columns1composityeprimarykey3rows2languages/r2rmla.ttl	Tue Mar 13 02:30:47 2012 +0100
@@ -10,17 +10,17 @@
     a rr:TriplesMap;
       
 	rr:logicalTable [  rr:sqlQuery """
-                       SELECT "Code", "Name", "Lan"
-                       FROM "Country"
-					   WHERE "Lan" = 'EN';
+						SELECT "Code", "Name", "Lan"
+						FROM "Country"
+						WHERE "Lan" = 'EN';
                        """ ] ;
 	
     rr:subjectMap [ rr:template "http://example.com/{\"Code\"}" ]; 
 	
     rr:predicateObjectMap
     [ 
-      rr:predicate rdfs:label;
-      rr:objectMap    [ rr:column "\"Name\""; rr:language "en" ]
+      rr:predicate	rdfs:label;
+      rr:objectMap	[ rr:column "\"Name\""; rr:language "en" ]
     ]
     .
 	
--- a/D016-1table1primarykey10columns3rowsSQLdatatypes/directGraph.nt	Mon Mar 12 15:51:52 2012 +0100
+++ b/D016-1table1primarykey10columns3rowsSQLdatatypes/directGraph.nt	Tue Mar 13 02:30:47 2012 +0100
@@ -3,10 +3,10 @@
 <Patient/ID-10> <Patient#FirstName> "Monica" .
 <Patient/ID-10> <Patient#LastName> "Geller" .
 <Patient/ID-10> <Patient#Sex> "female" .
-<Patient/ID-10> <Patient#Weight> "80.25"^^<http://www.w3.org/2001/XMLSchema#double> .
-<Patient/ID-10> <Patient#Height> "1.65"^^<http://www.w3.org/2001/XMLSchema#double> .
+<Patient/ID-10> <Patient#Weight> "80.25E0"^^<http://www.w3.org/2001/XMLSchema#double> .
+<Patient/ID-10> <Patient#Height> "1.65E0"^^<http://www.w3.org/2001/XMLSchema#double> .
 <Patient/ID-10> <Patient#BirthDate> "1981-10-10"^^<http://www.w3.org/2001/XMLSchema#date> .
-<Patient/ID-10> <Patient#EntranceDate> "2009-10-10 12:12:22"^^<http://www.w3.org/2001/XMLSchema#dateTime> .
+<Patient/ID-10> <Patient#EntranceDate> "2009-10-10T12:12:22"^^<http://www.w3.org/2001/XMLSchema#dateTime> .
 <Patient/ID-10> <Patient#PaidInAdvance> "false"^^<http://www.w3.org/2001/XMLSchema#boolean> .
 <Patient/ID-10> <Patient#Photo> "iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg=="^^<http://www.w3.org/2001/XMLSchema#base64Binary> .
 <Patient/ID-11> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Patient> .
@@ -14,10 +14,10 @@
 <Patient/ID-11> <Patient#FirstName> "Rachel" .
 <Patient/ID-11> <Patient#LastName> "Green" .
 <Patient/ID-11> <Patient#Sex> "female" .
-<Patient/ID-11> <Patient#Weight> "70.22"^^<http://www.w3.org/2001/XMLSchema#double> .
-<Patient/ID-11> <Patient#Height> "1.7"^^<http://www.w3.org/2001/XMLSchema#double> .
+<Patient/ID-11> <Patient#Weight> "70.22E0"^^<http://www.w3.org/2001/XMLSchema#double> .
+<Patient/ID-11> <Patient#Height> "1.7E0"^^<http://www.w3.org/2001/XMLSchema#double> .
 <Patient/ID-11> <Patient#BirthDate> "1982-11-12"^^<http://www.w3.org/2001/XMLSchema#date> .
-<Patient/ID-11> <Patient#EntranceDate> "2008-11-12 09:45:44"^^<http://www.w3.org/2001/XMLSchema#dateTime> .
+<Patient/ID-11> <Patient#EntranceDate> "2008-11-12T09:45:44"^^<http://www.w3.org/2001/XMLSchema#dateTime> .
 <Patient/ID-11> <Patient#PaidInAdvance> "true"^^<http://www.w3.org/2001/XMLSchema#boolean> .
 <Patient/ID-11> <Patient#Photo> "iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P5//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg=="^^<http://www.w3.org/2001/XMLSchema#base64Binary> .
 <Patient/ID-12> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Patient> .
@@ -25,9 +25,9 @@
 <Patient/ID-12> <Patient#FirstName> "Chandler" .
 <Patient/ID-12> <Patient#LastName> "Bing" .
 <Patient/ID-12> <Patient#Sex> "male" .
-<Patient/ID-12> <Patient#Weight> "90.31"^^<http://www.w3.org/2001/XMLSchema#double> .
-<Patient/ID-12> <Patient#Height> "1.76"^^<http://www.w3.org/2001/XMLSchema#double> .
+<Patient/ID-12> <Patient#Weight> "90.31E0"^^<http://www.w3.org/2001/XMLSchema#double> .
+<Patient/ID-12> <Patient#Height> "1.76E0"^^<http://www.w3.org/2001/XMLSchema#double> .
 <Patient/ID-12> <Patient#BirthDate> "1978-04-06"^^<http://www.w3.org/2001/XMLSchema#date> .
-<Patient/ID-12> <Patient#EntranceDate> "2007-03-12 02:13:14"^^<http://www.w3.org/2001/XMLSchema#dateTime> .
+<Patient/ID-12> <Patient#EntranceDate> "2007-03-12T02:13:14"^^<http://www.w3.org/2001/XMLSchema#dateTime> .
 <Patient/ID-12> <Patient#PaidInAdvance> "true"^^<http://www.w3.org/2001/XMLSchema#boolean> .
 <Patient/ID-12> <Patient#Photo> "iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P5//6/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg=="^^<http://www.w3.org/2001/XMLSchema#base64Binary> .
\ No newline at end of file
--- a/D016-1table1primarykey10columns3rowsSQLdatatypes/manifest.ttl	Mon Mar 12 15:51:52 2012 +0100
+++ b/D016-1table1primarykey10columns3rowsSQLdatatypes/manifest.ttl	Tue Mar 13 02:30:47 2012 +0100
@@ -23,7 +23,7 @@
 
 
 <tc0016a> a rdb2rdftest:R2RML ;	
-	dcterms:title "Table with datatypes" ; 
+	dcterms:title "Table with datatypes: string and integer" ; 
 	dcterms:identifier "R2RMLTC0016a" ;
 	test:purpose "Tests the rr:termtype  and datatype conversions: string and integer" ;
 	test:specificationReference "#datatype-conversions" ;
@@ -35,7 +35,7 @@
 .
 
 <tc0016b> a rdb2rdftest:R2RML ;	
-	dcterms:title "Table with datatypes" ; 
+	dcterms:title "Table with datatypes: real and float" ; 
 	dcterms:identifier "R2RMLTC0016b" ;
 	test:purpose "Tests the rr:termtype and datatype conversions: real and float" ;
 	test:specificationReference "#datatype-conversions" ;
@@ -47,7 +47,7 @@
 .
 
 <tc0016c> a rdb2rdftest:R2RML ;	
-	dcterms:title "Table with datatypes" ; 
+	dcterms:title "Table with datatypes: date and timestamp" ; 
 	dcterms:identifier "R2RMLTC0016c" ;
 	test:purpose "Tests the rr:termtype and datatype conversions: date and timestamp" ;
 	test:specificationReference "#datatype-conversions" ;
@@ -59,7 +59,7 @@
 .
 
 <tc0016d> a rdb2rdftest:R2RML ;	
-	dcterms:title "Table with datatypes" ; 
+	dcterms:title "Table with datatypes, boolean conversions" ; 
 	dcterms:identifier "R2RMLTC0016d" ;
 	test:purpose "Tests the rr:termtype and datatype conversions: boolean" ;
 	test:specificationReference "#datatype-conversions" ;
@@ -71,7 +71,7 @@
 .
 
 <tc0016e> a rdb2rdftest:R2RML ;	
-	dcterms:title "Table with datatypes" ; 
+	dcterms:title "Table with datatypes, binary column" ; 
 	dcterms:identifier "R2RMLTC0016e" ;
 	test:purpose "Tests the rr:termtype and datatype conversions: binary" ;
 	test:specificationReference "#datatype-conversions" ;
--- a/D016-1table1primarykey10columns3rowsSQLdatatypes/mappeda.nq	Mon Mar 12 15:51:52 2012 +0100
+++ b/D016-1table1primarykey10columns3rowsSQLdatatypes/mappeda.nq	Tue Mar 13 02:30:47 2012 +0100
@@ -1,16 +1,16 @@
-<http://example.com/Patient10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
-<http://example.com/Patient10> <http://example.com/id> "10"^^<http://www.w3.org/2001/XMLSchema#integer> .
-<http://example.com/Patient10> <http://xmlns.com/foaf/0.1/firstName> "Monica"^^<http://www.w3.org/2001/XMLSchema#string> .
-<http://example.com/Patient10> <http://xmlns.com/foaf/0.1/lastName> "Geller"^^<http://www.w3.org/2001/XMLSchema#string> .
-<http://example.com/Patient10> <http://xmlns.com/foaf/0.1/gender> "female"^^<http://www.w3.org/2001/XMLSchema#string> .
-<http://example.com/Patient11> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
-<http://example.com/Patient11> <http://example.com/id> "11"^^<http://www.w3.org/2001/XMLSchema#integer> .
-<http://example.com/Patient11> <http://xmlns.com/foaf/0.1/firstName> "Rachel"^^<http://www.w3.org/2001/XMLSchema#string> .
-<http://example.com/Patient11> <http://xmlns.com/foaf/0.1/lastName> "Green"^^<http://www.w3.org/2001/XMLSchema#string> .
-<http://example.com/Patient11> <http://xmlns.com/foaf/0.1/gender> "female"^^<http://www.w3.org/2001/XMLSchema#string> .
-<http://example.com/Patient12> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
-<http://example.com/Patient12> <http://example.com/id> "12"^^<http://www.w3.org/2001/XMLSchema#integer> .
-<http://example.com/Patient12> <http://xmlns.com/foaf/0.1/firstName> "Chandler"^^<http://www.w3.org/2001/XMLSchema#string> .
-<http://example.com/Patient12> <http://xmlns.com/foaf/0.1/lastName> "Bing"^^<http://www.w3.org/2001/XMLSchema#string> .
-<http://example.com/Patient12> <http://xmlns.com/foaf/0.1/gender> "male"^^<http://www.w3.org/2001/XMLSchema#string> .
+<http://example.com/Patient/10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/Person> .
+<http://example.com/Patient/10> <http://example.com/id> "10"^^<http://www.w3.org/2001/XMLSchema#integer> .
+<http://example.com/Patient/10> <http://example.com/firstName> "Monica" .
+<http://example.com/Patient/10> <http://example.com/lastName> "Geller" .
+<http://example.com/Patient/10> <http://example.com/gender> "female" .
+<http://example.com/Patient/11> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/Person> .
+<http://example.com/Patient/11> <http://example.com/id> "11"^^<http://www.w3.org/2001/XMLSchema#integer> .
+<http://example.com/Patient/11> <http://example.com/firstName> "Rachel" .
+<http://example.com/Patient/11> <http://example.com/lastName> "Green" .
+<http://example.com/Patient/11> <http://example.com/gender> "female" .
+<http://example.com/Patient/12> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/Person> .
+<http://example.com/Patient/12> <http://example.com/id> "12"^^<http://www.w3.org/2001/XMLSchema#integer> .
+<http://example.com/Patient/12> <http://example.com/firstName> "Chandler" .
+<http://example.com/Patient/12> <http://example.com/lastName> "Bing" .
+<http://example.com/Patient/12> <http://example.com/gender> "male" .
 
--- a/D016-1table1primarykey10columns3rowsSQLdatatypes/mappedb.nq	Mon Mar 12 15:51:52 2012 +0100
+++ b/D016-1table1primarykey10columns3rowsSQLdatatypes/mappedb.nq	Tue Mar 13 02:30:47 2012 +0100
@@ -1,10 +1,10 @@
 <http://example.com/Patient10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
-<http://example.com/Patient10> <http://example.com/weight> "80.25"^^<http://www.w3.org/2001/XMLSchema#real> .
-<http://example.com/Patient10> <http://example.com/height> "1.65"^^<http://www.w3.org/2001/XMLSchema#float> .
+<http://example.com/Patient10> <http://example.com/weight> "80.25E0"^^<http://www.w3.org/2001/XMLSchema#double> .
+<http://example.com/Patient10> <http://example.com/height> "1.65E0"^^<http://www.w3.org/2001/XMLSchema#double> .
 <http://example.com/Patient11> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
-<http://example.com/Patient11> <http://example.com/weight> "70.22"^^<http://www.w3.org/2001/XMLSchema#real> .
-<http://example.com/Patient11> <http://example.com/height> "1.70"^^<http://www.w3.org/2001/XMLSchema#float> .
+<http://example.com/Patient11> <http://example.com/weight> "70.22E0"^^<http://www.w3.org/2001/XMLSchema#double> .
+<http://example.com/Patient11> <http://example.com/height> "1.7E0"^^<http://www.w3.org/2001/XMLSchema#double> .
 <http://example.com/Patient12> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
-<http://example.com/Patient12> <http://example.com/weight> "90.31"^^<http://www.w3.org/2001/XMLSchema#real> .
-<http://example.com/Patient12> <http://example.com/height> "1.76"^^<http://www.w3.org/2001/XMLSchema#float> .
+<http://example.com/Patient12> <http://example.com/weight> "90.31E0"^^<http://www.w3.org/2001/XMLSchema#double> .
+<http://example.com/Patient12> <http://example.com/height> "1.76E0"^^<http://www.w3.org/2001/XMLSchema#double> .
 
--- a/D016-1table1primarykey10columns3rowsSQLdatatypes/r2rmla.ttl	Mon Mar 12 15:51:52 2012 +0100
+++ b/D016-1table1primarykey10columns3rowsSQLdatatypes/r2rmla.ttl	Tue Mar 13 02:30:47 2012 +0100
@@ -11,7 +11,7 @@
 
 	rr:logicalTable [ rr:tableName "\"Patient\"" ];
 
-    rr:subjectMap [ rr:template "http://example.com/Patient{\"ID\"}"; ];
+    rr:subjectMap [ rr:template "http://example.com/Patient/{\"ID\"}"; ];
 	
     rr:predicateObjectMap
     [ 
@@ -22,25 +22,25 @@
     rr:predicateObjectMap
     [ 
 		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:objectMap    [ rr:column "\"ID\""; ]
     ];
 
     rr:predicateObjectMap
     [ 
-      rr:predicate		foaf:lastName;
-      rr:objectMap		[ rr:column "\"LastName\""; rr:datatype xsd:string ]
+      rr:predicate		ex:firstName;
+      rr:objectMap		[ rr:column "\"FirstName\""; ]
     ];
 
     rr:predicateObjectMap
     [ 
-      rr:predicate		foaf:gender;
-      rr:objectMap		[ rr:column "\"Sex\""; rr:datatype xsd:string ]
+      rr:predicate		ex:lastName;
+      rr:objectMap		[ rr:column "\"LastName\""; ]
+    ];
+
+    rr:predicateObjectMap
+    [ 
+      rr:predicate		ex:gender;
+      rr:objectMap		[ rr:column "\"Sex\""; ]
     ];
 
     .
--- a/D016-1table1primarykey10columns3rowsSQLdatatypes/r2rmlb.ttl	Mon Mar 12 15:51:52 2012 +0100
+++ b/D016-1table1primarykey10columns3rowsSQLdatatypes/r2rmlb.ttl	Tue Mar 13 02:30:47 2012 +0100
@@ -22,13 +22,13 @@
     rr:predicateObjectMap
     [ 
       rr:predicate ex:weight;
-      rr:objectMap    [ rr:column "\"Weight\""; rr:datatype xsd:real ]
+      rr:objectMap    [ rr:column "\"Weight\""; ]
     ];
 
     rr:predicateObjectMap
     [ 
       rr:predicate ex:height;
-      rr:objectMap    [ rr:column "\"Height\""; rr:datatype xsd:float ]
+      rr:objectMap    [ rr:column "\"Height\""; ]
     ];
 
     .
--- a/D016-1table1primarykey10columns3rowsSQLdatatypes/r2rmlc.ttl	Mon Mar 12 15:51:52 2012 +0100
+++ b/D016-1table1primarykey10columns3rowsSQLdatatypes/r2rmlc.ttl	Tue Mar 13 02:30:47 2012 +0100
@@ -22,13 +22,13 @@
     rr:predicateObjectMap
     [ 
       rr:predicate		ex:birthdate;
-      rr:objectMap		[ rr:column "\"BirthDate\""; rr:datatype xsd:date ]
+      rr:objectMap		[ rr:column "\"BirthDate\""; ]
     ];
 
     rr:predicateObjectMap
     [ 
       rr:predicate		ex:entrancedate;
-      rr:objectMap		[ rr:column "\"EntranceDate\""; rr:datatype xsd:dateTime ]
+      rr:objectMap		[ rr:column "\"EntranceDate\""; ]
     ];
 
     .
--- a/D016-1table1primarykey10columns3rowsSQLdatatypes/r2rmld.ttl	Mon Mar 12 15:51:52 2012 +0100
+++ b/D016-1table1primarykey10columns3rowsSQLdatatypes/r2rmld.ttl	Tue Mar 13 02:30:47 2012 +0100
@@ -22,7 +22,7 @@
     rr:predicateObjectMap
     [ 
       rr:predicate		ex:paid;
-      rr:objectMap		[ rr:column "\"PaidInAdvance\""; rr:datatype xsd:boolean ]
+      rr:objectMap		[ rr:column "\"PaidInAdvance\"";  ]
     ];
 
     .
--- a/D018-1table1primarykey2columns3rows/r2rmla.ttl	Mon Mar 12 15:51:52 2012 +0100
+++ b/D018-1table1primarykey2columns3rows/r2rmla.ttl	Tue Mar 13 02:30:47 2012 +0100
@@ -15,7 +15,7 @@
     rr:predicateObjectMap
     [ 
       rr:predicate		ex:id ; 
-      rr:objectMap		[ rr:column "\"ID\""; rr:datatype xsd:integer ]
+      rr:objectMap		[ rr:column "\"ID\""; ]
     ];
 
     rr:predicateObjectMap
--- a/D019-1table1primarykey3columns3rows/create.sql	Mon Mar 12 15:51:52 2012 +0100
+++ b/D019-1table1primarykey3columns3rows/create.sql	Tue Mar 13 02:30:47 2012 +0100
@@ -5,4 +5,4 @@
 );
 INSERT INTO "Employee" ("ID","FirstName","LastName") VALUES (10,'http://example.com/ns#Jhon','Smith');
 INSERT INTO "Employee" ("ID","FirstName","LastName") VALUES (20,'Carlos','Mendoza');
-INSERT INTO "Employee" ("ID","FirstName","LastName") VALUES (30,'Juan Daniel','Crespo');
+INSERT INTO "Employee" ("ID","FirstName","LastName") VALUES (30,'Juan Daniel','Crespo');
\ No newline at end of file
--- a/D019-1table1primarykey3columns3rows/manifest.ttl	Mon Mar 12 15:51:52 2012 +0100
+++ b/D019-1table1primarykey3columns3rows/manifest.ttl	Tue Mar 13 02:30:47 2012 +0100
@@ -14,7 +14,7 @@
 	dcterms:title "Generation of triples by using IRI value in columns" ; 
 	dcterms:identifier "R2RMLTC0019a" ;
 	test:purpose "Test the generation of triples by using IRI value in columns" ;
-	test:specificationReference "#generated-rdf-term" ;
+	test:specificationReference "#from-column" ;
 	test:reviewStatus test:unreviewed ;
 	rdb2rdftest:database <d019> ;
 	rdb2rdftest:output "mappeda.nq" ;
@@ -23,10 +23,10 @@
 .
 
 <tc0019b> a rdb2rdftest:R2RML ;	
-	dcterms:title "Generation of triples by using IRI value in columns" ; 
+	dcterms:title "Generation of triples by using IRI value in columns, with data error" ; 
 	dcterms:identifier "R2RMLTC0019b" ;
 	test:purpose "Test the generation of triples by using IRI value in columns, conforming R2RML mapping with data error (and no result)" ;
-	test:specificationReference "#generated-rdf-term" ;
+	test:specificationReference "#from-column" ;
 	test:reviewStatus test:unreviewed ;
 	rdb2rdftest:database <d019> ;
 	rdb2rdftest:hasExpectedOutput false ;
--- a/D019-1table1primarykey3columns3rows/mappeda.nq	Mon Mar 12 15:51:52 2012 +0100
+++ b/D019-1table1primarykey3columns3rows/mappeda.nq	Tue Mar 13 02:30:47 2012 +0100
@@ -1,2 +1,2 @@
 <http://example.com/ns#Jhon> <http://xmlns.com/foaf/0.1/name> "http://example.com/ns#Jhon" .
-<http://example.com/Carlos> <http://xmlns.com/foaf/0.1/name> "Carlos" .
\ No newline at end of file
+<http://example.com/base/Carlos> <http://xmlns.com/foaf/0.1/name> "Carlos" .
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/D020-1table1column5rows/create.sql	Tue Mar 13 02:30:47 2012 +0100
@@ -0,0 +1,9 @@
+CREATE TABLE "Student" (
+"Name" VARCHAR(50),
+);
+
+INSERT INTO "Student" ("Name") VALUES ('http://company.com/Alice');
+INSERT INTO "Student" ("Name") VALUES ('Bob');
+INSERT INTO "Student" ("Name") VALUES ('Bob/Charles');
+INSERT INTO "Student" ("Name") VALUES ('path/../Danny');
+INSERT INTO "Student" ("Name") VALUES ('Emily Smith');
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/D020-1table1column5rows/manifest.ttl	Tue Mar 13 02:30:47 2012 +0100
@@ -0,0 +1,35 @@
+@prefix test: <http://www.w3.org/2006/03/test-description#> .
+@prefix dcterms: <http://purl.org/dc/elements/1.1/> .
+@prefix rdb2rdftest: <http://purl.org/NET/rdb2rdf-test#> .
+@base <http://www.w3.org/2001/sw/rdb2rdf/test-cases/#> .
+
+<d020> a rdb2rdftest:DataBase;
+	dcterms:title "One table, one column, five rows" ;
+	dcterms:identifier "D020-1table1column5rows" ;
+	rdb2rdftest:sqlScriptFile "create.sql";
+	rdb2rdftest:relatedTestCase <tc0020a>, <tc0020b> ;
+.
+
+<tc0020a> a rdb2rdftest:R2RML ;	
+	dcterms:title "Generation of triples by using IRI value in columns" ; 
+	dcterms:identifier "R2RMLTC0020a" ;
+	test:purpose "Test the generation of triples by using IRI value in columns" ;
+	test:specificationReference "#from-template" ;
+	test:reviewStatus test:unreviewed ;
+	rdb2rdftest:database <d020> ;
+	rdb2rdftest:output "mappeda.nq" ;
+	rdb2rdftest:hasExpectedOutput true ;
+	rdb2rdftest:mappingDocument "r2rmla.ttl" ;
+.
+
+<tc0020b> a rdb2rdftest:R2RML ;	
+	dcterms:title "Generation of triples by using IRI value in columns, with data errors" ; 
+	dcterms:identifier "R2RMLTC0020b" ;
+	test:purpose "Test the generation of triples by using IRI value in columns, conforming R2RML mapping with data error (and no result)" ;
+	test:specificationReference "#from-column" ;
+	test:reviewStatus test:unreviewed ;
+	rdb2rdftest:database <d020> ;
+	rdb2rdftest:hasExpectedOutput false ;
+	rdb2rdftest:failMessage "Conforming R2RML mapping with data error";	
+	rdb2rdftest:mappingDocument "r2rmlb.ttl" ;	
+.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/D020-1table1column5rows/mappeda.nq	Tue Mar 13 02:30:47 2012 +0100
@@ -0,0 +1,5 @@
+<http://example.com/base/http%3A%2F%2Fcompany.com%2FAlice> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
+<http://example.com/base/Bob> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
+<http://example.com/base/Bob%2FCharles> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
+<http://example.com/base/path%2F..%2FDanny> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
+<http://example.com/base/Emily%20Smith> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/D020-1table1column5rows/r2rmla.ttl	Tue Mar 13 02:30:47 2012 +0100
@@ -0,0 +1,18 @@
+@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#> .
+@base <http://mappingpedia.org/rdb2rdf/r2rml/tc/> .
+
+<TriplesMap1>
+    a rr:TriplesMap;
+ 	rr:logicalTable [ rr:tableName "\"Student\""; ];
+    
+    rr:subjectMap [ rr:template "{\"Name\"}"; rr:termType rr:IRI; ];
+    
+    rr:predicateObjectMap 
+    [
+    	rr:predicate	rdf:type;
+    	rr:object		foaf:Person;
+    ];
+.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/D020-1table1column5rows/r2rmlb.ttl	Tue Mar 13 02:30:47 2012 +0100
@@ -0,0 +1,18 @@
+@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#> .
+@base <http://mappingpedia.org/rdb2rdf/r2rml/tc/> .
+
+<TriplesMap1>
+    a rr:TriplesMap;
+ 	rr:logicalTable [ rr:tableName "\"Student\""; ];
+    
+    rr:subjectMap [ rr:column "\"Name\""; rr:termType rr:IRI; ];
+    
+    rr:predicateObjectMap 
+    [
+    	rr:predicate	rdf:type;
+    	rr:object		foaf:Person;
+    ];
+.
Binary file ts1.zip has changed