--- a/D005-1table3columns3rows2duplicates/mappeda.nq	Thu Jun 28 13:40:15 2012 +0200
+++ b/D005-1table3columns3rows2duplicates/mappeda.nq	Sun Jul 01 17:53:09 2012 +0200
@@ -1,4 +1,4 @@
-<http://example.com/Bob-Smith> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
-<http://example.com/Bob-Smith> <http://example.com/owes> "3.0E1"^^<http://www.w3.org/2001/XMLSchema#double> .
-<http://example.com/Sue-Jones> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
-<http://example.com/Sue-Jones> <http://example.com/owes> "2.0E1"^^<http://www.w3.org/2001/XMLSchema#double> .
+<http://example.com/Bob;Smith> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
+<http://example.com/Bob;Smith> <http://example.com/owes> "3.0E1"^^<http://www.w3.org/2001/XMLSchema#double> .
+<http://example.com/Sue;Jones> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
+<http://example.com/Sue;Jones> <http://example.com/owes> "2.0E1"^^<http://www.w3.org/2001/XMLSchema#double> .

--- a/D005-1table3columns3rows2duplicates/r2rmla.ttl	Thu Jun 28 13:40:15 2012 +0200
+++ b/D005-1table3columns3rows2duplicates/r2rmla.ttl	Sun Jul 01 17:53:09 2012 +0200
@@ -9,7 +9,7 @@
     
     rr:logicalTable [ rr:tableName "\"IOUs\"" ];
 
-    rr:subjectMap [ rr:template "http://example.com/{\"fname\"}-{\"lname\"}";
+    rr:subjectMap [ rr:template "http://example.com/{\"fname\"};{\"lname\"}";
                     rr:class foaf:Person ];
 
     rr:predicateObjectMap

--- a/D005-1table3columns3rows2duplicates/r2rmlb.ttl	Thu Jun 28 13:40:15 2012 +0200
+++ b/D005-1table3columns3rows2duplicates/r2rmlb.ttl	Sun Jul 01 17:53:09 2012 +0200
@@ -9,7 +9,7 @@
     
     rr:logicalTable [ rr:tableName "\"IOUs\"" ];
 
-    rr:subjectMap [ rr:template "{\"fname\"}{\"lname\"}";
+    rr:subjectMap [ rr:template "{\"fname\"}_{\"lname\"}";
                     rr:class <IOUs>;
                     rr:termType rr:BlankNode; ];
 

--- a/D006-1table1primarykey1column1row/r2rmla.ttl	Thu Jun 28 13:40:15 2012 +0200
+++ b/D006-1table1primarykey1column1row/r2rmla.ttl	Sun Jul 01 17:53:09 2012 +0200
@@ -15,6 +15,6 @@
     rr:predicateObjectMap
     [ 
       rr:predicateMap [ rr:constant ex:description ]; 
-      rr:objectMap    [ rr:constant "Bad Student"; rr:termType rr:Literal; ]
+      rr:objectMap    [ rr:constant "Bad Student"; ]
     ]
     .

--- a/D011-M2MRelations/mappeda.nq	Thu Jun 28 13:40:15 2012 +0200
+++ b/D011-M2MRelations/mappeda.nq	Sun Jul 01 17:53:09 2012 +0200
@@ -1,19 +1,19 @@
 <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/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/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/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> .
-<http://example.com/11/Fernando-Alonso> <http://example.com/plays> <http://example.com/111/Football> .
-<http://example.com/11/Fernando-Alonso> <http://example.com/plays> <http://example.com/112/Formula1> .
+<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> .
+<http://example.com/11/Fernando;Alonso> <http://example.com/plays> <http://example.com/111/Football> .
+<http://example.com/11/Fernando;Alonso> <http://example.com/plays> <http://example.com/112/Formula1> .

--- a/D011-M2MRelations/r2rmla.ttl	Thu Jun 28 13:40:15 2012 +0200
+++ b/D011-M2MRelations/r2rmla.ttl	Sun Jul 01 17:53:09 2012 +0200
@@ -18,7 +18,7 @@
        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
     [ 

--- a/D012-2tables2duplicates0nulls/r2rmla.ttl	Thu Jun 28 13:40:15 2012 +0200
+++ b/D012-2tables2duplicates0nulls/r2rmla.ttl	Sun Jul 01 17:53:09 2012 +0200
@@ -9,7 +9,7 @@
 
 	rr:logicalTable [ rr:tableName  "\"IOUs\"" ];
 	
-    rr:subjectMap [ rr:template "{\"fname\"}{\"lname\"}{\"amount\"}"; rr:termType rr:BlankNode; ];
+    rr:subjectMap [ rr:template "{\"fname\"}_{\"lname\"}_{\"amount\"}"; rr:termType rr:BlankNode; ];
 	
     rr:predicateObjectMap
     [ 

--- a/D012-2tables2duplicates0nulls/r2rmlb.ttl	Thu Jun 28 13:40:15 2012 +0200
+++ b/D012-2tables2duplicates0nulls/r2rmlb.ttl	Sun Jul 01 17:53:09 2012 +0200
@@ -10,7 +10,7 @@
 	rr:logicalTable [ rr:tableName  "\"IOUs\"" ]; 
 	
     rr:subjectMap [
-            rr:template "{\"fname\"}{\"lname\"}"; 
+            rr:template "{\"fname\"}_{\"lname\"}"; 
             rr:termType rr:BlankNode ;
       ];
 	
@@ -29,7 +29,7 @@
 	rr:logicalTable [ rr:tableName  "\"Lives\"" ]; 
 
     rr:subjectMap [
-            rr:template "{\"fname\"}{\"lname\"}"; 
+            rr:template "{\"fname\"}_{\"lname\"}"; 
             rr:termType rr:BlankNode;
       ];
 	

--- a/D012-2tables2duplicates0nulls/r2rmle.ttl	Thu Jun 28 13:40:15 2012 +0200
+++ b/D012-2tables2duplicates0nulls/r2rmle.ttl	Sun Jul 01 17:53:09 2012 +0200
@@ -10,7 +10,7 @@
 
 	rr:logicalTable [ rr:tableName  "\"IOUs\"" ];
 	
-    rr:subjectMap [ rr:template "{\"fname\"}{\"lname\"}{\"amount\"}"; rr:termType rr:BlankNode; ];
+    rr:subjectMap [ rr:template "{\"fname\"}_{\"lname\"}_{\"amount\"}"; rr:termType rr:BlankNode; ];
     
     rr:predicateObjectMap [
     	rr:predicate rdf:type;
@@ -41,7 +41,7 @@
 
 	rr:logicalTable [ rr:tableName  "\"Lives\"" ];
 	
-    rr:subjectMap [ rr:template "{\"fname\"}{\"lname\"}{\"city\"}"; rr:termType rr:BlankNode; ];
+    rr:subjectMap [ rr:template "{\"fname\"}_{\"lname\"}_{\"city\"}"; rr:termType rr:BlankNode; ];
     
     rr:predicateObjectMap [
     	rr:predicate rdf:type;

--- a/D013-1table1primarykey3columns2rows1nullvalue/mappeda.nq	Thu Jun 28 13:40:15 2012 +0200
+++ b/D013-1table1primarykey3columns2rows1nullvalue/mappeda.nq	Sun Jul 01 17:53:09 2012 +0200
@@ -1,2 +1,2 @@
-<http://example.com/Person/2/Bob-September%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	Thu Jun 28 13:40:15 2012 +0200
+++ b/D013-1table1primarykey3columns2rows1nullvalue/r2rmla.ttl	Sun Jul 01 17:53:09 2012 +0200
@@ -11,7 +11,7 @@
 
 	rr:logicalTable [ rr:tableName "\"Person\"" ];
 
-    rr:subjectMap [ rr:template "http://example.com/Person/{\"ID\"}/{\"Name\"}-{\"DateOfBirth\"}";  ];
+    rr:subjectMap [ rr:template "http://example.com/Person/{\"ID\"}/{\"Name\"}/{\"DateOfBirth\"}";  ];
 	
     rr:predicateObjectMap
     [ 

--- a/D014-3tables1primarykey1foreignkey/r2rmlb.ttl	Thu Jun 28 13:40:15 2012 +0200
+++ b/D014-3tables1primarykey1foreignkey/r2rmlb.ttl	Sun Jul 01 17:53:09 2012 +0200
@@ -54,7 +54,7 @@
             , "ename"
             , ('http://example.com/emp/job/'|| "job") AS jobTypeURI
             , "job"
-            , deptno
+            , "deptno"
             , ('http://example.com/emp/etype/'|| "etype") AS empTypeURI
             , "etype"
             , ('http://example.com/graph/'|| "job" || '/' || "etype") AS graphURI

--- a/D014-3tables1primarykey1foreignkey/r2rmlc.ttl	Thu Jun 28 13:40:15 2012 +0200
+++ b/D014-3tables1primarykey1foreignkey/r2rmlc.ttl	Sun Jul 01 17:53:09 2012 +0200
@@ -41,7 +41,7 @@
     rr:predicateObjectMap 
     [ 
       rr:predicate		dept:COMPANY ; 
-      rr:objectMap		[ rr:constant "EXAMPLE Corporation"; rr:termType rr:Literal; ]
+      rr:objectMap		[ rr:constant "EXAMPLE Corporation"; ]
     ]
 .
 

--- a/D014-3tables1primarykey1foreignkey/r2rmld.ttl	Thu Jun 28 13:40:15 2012 +0200
+++ b/D014-3tables1primarykey1foreignkey/r2rmld.ttl	Sun Jul 01 17:53:09 2012 +0200
@@ -10,7 +10,7 @@
 	a rr:TriplesMap;
     rr:logicalTable [ rr:sqlQuery """
 
-        SELECT *, (CASE "job"
+        SELECT "EMP".*, (CASE "job"
             WHEN 'CLERK' THEN 'general-office'
             WHEN 'NIGHTGUARD' THEN 'security'
             WHEN 'ENGINEER' THEN 'engineering'

Binary file rdb2rdf-ts.zip has changed