TCs updated according to the new DM and R2RML specs - first round of changes
authorBoris Villazon-Terrazas <bvillazon@fi.upm.es>
Tue, 08 May 2012 17:30:39 +0200
changeset 89 d472da830100
parent 88 317bbf0f7112
child 90 aebbbe2bdf25
TCs updated according to the new DM and R2RML specs - first round of changes
D006-1table1primarykey1column1row/directGraph.ttl
D007-1table1primarykey2columns1row/directGraph.ttl
D008-1table1compositeprimarykey3columns1row/directGraph.ttl
D009-2tables1primarykey1foreignkey/directGraph.ttl
D009-2tables1primarykey1foreignkey/manifest.ttl
D010-1table1primarykey3colums3rows/directGraph.ttl
D011-M2MRelations/directGraph.ttl
D013-1table1primarykey3columns2rows1nullvalue/directGraph.ttl
D014-3tables1primarykey1foreignkey/directGraph.ttl
D015-1table3columns1composityeprimarykey3rows2languages/directGraph.ttl
D016-1table1primarykey10columns3rowsSQLdatatypes/directGraph.ttl
D016-1table1primarykey10columns3rowsSQLdatatypes/mappede.nq
D016-1table1primarykey10columns3rowsSQLdatatypes/r2rmle.ttl
D021-2tables2primarykeys1foreignkeyReferencesAllNulls/directGraph.ttl
D023-2tables2primarykeys2foreignkeysReferencesToNon-primarykeys/directGraph.ttl
D024-2tables2primarykeys1foreignkeyToARowWithSomeNulls/directGraph.ttl
D025-3tables3primarykeys3foreignkeys/directGraph.ttl
ts1.zip
--- a/D006-1table1primarykey1column1row/directGraph.ttl	Tue Apr 24 16:10:05 2012 +0200
+++ b/D006-1table1primarykey1column1row/directGraph.ttl	Tue May 08 17:30:39 2012 +0200
@@ -1,5 +1,5 @@
 @base <http://example.com/base/> .
 
-<Student/Name-Venus> <Student#Name> "Venus" .
-<Student/Name-Venus> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Student> .
+<Student/Name=Venus> <Student#Name> "Venus" .
+<Student/Name=Venus> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Student> .
 
--- a/D007-1table1primarykey2columns1row/directGraph.ttl	Tue Apr 24 16:10:05 2012 +0200
+++ b/D007-1table1primarykey2columns1row/directGraph.ttl	Tue May 08 17:30:39 2012 +0200
@@ -1,5 +1,5 @@
 @base <http://example.com/base/> .
 
-<Student/ID-10> <Student#ID> "10"^^<http://www.w3.org/2001/XMLSchema#integer> .
-<Student/ID-10> <Student#Name> "Venus" .
-<Student/ID-10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Student> .
+<Student/ID=10> <Student#ID> "10"^^<http://www.w3.org/2001/XMLSchema#integer> .
+<Student/ID=10> <Student#Name> "Venus" .
+<Student/ID=10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Student> .
--- a/D008-1table1compositeprimarykey3columns1row/directGraph.ttl	Tue Apr 24 16:10:05 2012 +0200
+++ b/D008-1table1compositeprimarykey3columns1row/directGraph.ttl	Tue May 08 17:30:39 2012 +0200
@@ -1,7 +1,7 @@
 @base <http://example.com/base/> .
 
-<Student/ID-10.Name-Venus%20Williams> <Student#ID> "10"^^<http://www.w3.org/2001/XMLSchema#integer> .
-<Student/ID-10.Name-Venus%20Williams> <Student#Name> "Venus Williams" .
-<Student/ID-10.Name-Venus%20Williams> <Student#Sport> "Tennis" .
-<Student/ID-10.Name-Venus%20Williams> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Student> .
+<Student/ID=10;Name=Venus%20Williams> <Student#ID> "10"^^<http://www.w3.org/2001/XMLSchema#integer> .
+<Student/ID=10;Name=Venus%20Williams> <Student#Name> "Venus Williams" .
+<Student/ID=10;Name=Venus%20Williams> <Student#Sport> "Tennis" .
+<Student/ID=10;Name=Venus%20Williams> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Student> .
 
--- a/D009-2tables1primarykey1foreignkey/directGraph.ttl	Tue Apr 24 16:10:05 2012 +0200
+++ b/D009-2tables1primarykey1foreignkey/directGraph.ttl	Tue May 08 17:30:39 2012 +0200
@@ -1,14 +1,14 @@
 @base <http://example.com/base/> .
 
-<Student/ID-10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Student> .
-<Student/ID-10> <Student#ID> "10"^^<http://www.w3.org/2001/XMLSchema#integer> .
-<Student/ID-10> <Student#Name> "Venus Williams" .
-<Student/ID-10> <Student#Sport> "100"^^<http://www.w3.org/2001/XMLSchema#integer> .
-<Student/ID-10> <Student#ref-Sport> <Sport/ID-100> .
-<Student/ID-20> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Student> .
-<Student/ID-20> <Student#ID> "20"^^<http://www.w3.org/2001/XMLSchema#integer> .
-<Student/ID-20> <Student#Name> "Demi Moore" .
-<Sport/ID-100> <Sport#ID> "100"^^<http://www.w3.org/2001/XMLSchema#integer> .
-<Sport/ID-100> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Sport> .
-<Sport/ID-100> <Sport#Name> "Tennis" .
+<Student/ID=10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Student> .
+<Student/ID=10> <Student#ID> "10"^^<http://www.w3.org/2001/XMLSchema#integer> .
+<Student/ID=10> <Student#Name> "Venus Williams" .
+<Student/ID=10> <Student#Sport> "100"^^<http://www.w3.org/2001/XMLSchema#integer> .
+<Student/ID=10> <Student#ref=Sport> <Sport/ID-100> .
+<Student/ID=20> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Student> .
+<Student/ID=20> <Student#ID> "20"^^<http://www.w3.org/2001/XMLSchema#integer> .
+<Student/ID=20> <Student#Name> "Demi Moore" .
+<Sport/ID=100> <Sport#ID> "100"^^<http://www.w3.org/2001/XMLSchema#integer> .
+<Sport/ID=100> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Sport> .
+<Sport/ID=100> <Sport#Name> "Tennis" .
 
--- a/D009-2tables1primarykey1foreignkey/manifest.ttl	Tue Apr 24 16:10:05 2012 +0200
+++ b/D009-2tables1primarykey1foreignkey/manifest.ttl	Tue May 08 17:30:39 2012 +0200
@@ -7,7 +7,7 @@
 	dcterms:title "Two tables, a primary key, a foreign key" ;
 	dcterms:identifier "D009-2tables1primarykey1foreignkey" ;
 	rdb2rdftest:sqlScriptFile "create.sql";
-	rdb2rdftest:relatedTestCase <dg0009>, <tc0009a>, <tc0009b>, <tc0009c>, <tc0009d> ;
+	rdb2rdftest:relatedTestCase <dg0009>, <tc0009a>, <tc0009b>,  <tc0009d> ; #<tc0009c>,
 .
 
 <dg0009> a rdb2rdftest:DirectMapping ;	
@@ -45,17 +45,17 @@
 	rdb2rdftest:mappingDocument "r2rmlb.ttl" ;
 .
 
-<tc0009c> a rdb2rdftest:R2RML ;	
-	dcterms:title "Unamed column in a logical table" ; 
-	dcterms:identifier "R2RMLTC0009c" ;
-	test:purpose "Test a logical table with unamed column." ;
-	test:specificationReference "#dfn-sql-query" ;
-	test:reviewStatus test:unreviewed ;
-	rdb2rdftest:database <d009> ;
-	rdb2rdftest:hasExpectedOutput false ;
-	rdb2rdftest:failMessage "non-conforming R2RML mapping";		
-	rdb2rdftest:mappingDocument "r2rmlc.ttl" ;
-.
+#<tc0009c> a rdb2rdftest:R2RML ;	
+#	dcterms:title "Unamed column in a logical table" ; 
+#	dcterms:identifier "R2RMLTC0009c" ;
+#	test:purpose "Test a logical table with unamed column." ;
+#	test:specificationReference "#dfn-sql-query" ;
+#	test:reviewStatus test:unreviewed ;
+#	rdb2rdftest:database <d009> ;
+#	rdb2rdftest:hasExpectedOutput false ;
+#	rdb2rdftest:failMessage "non-conforming R2RML mapping";		
+#	rdb2rdftest:mappingDocument "r2rmlc.ttl" ;
+#.
 
 <tc0009d> a rdb2rdftest:R2RML ;	
 	dcterms:title "Named column in logical table" ; 
--- a/D010-1table1primarykey3colums3rows/directGraph.ttl	Tue Apr 24 16:10:05 2012 +0200
+++ b/D010-1table1primarykey3colums3rows/directGraph.ttl	Tue May 08 17:30:39 2012 +0200
@@ -1,14 +1,14 @@
 @base <http://example.com/base/> .
 
-<Country%20Info/Country%20Code-1> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Country%20Info> .
-<Country%20Info/Country%20Code-1> <Country%20Info#Country%20Code> "1"^^<http://www.w3.org/2001/XMLSchema#integer>  .
-<Country%20Info/Country%20Code-1> <Country%20Info#Name> "Bolivia, Plurinational State of"  .
-<Country%20Info/Country%20Code-1> <Country%20Info#ISO%203166> "BO"  .
-<Country%20Info/Country%20Code-2> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Country%20Info> .
-<Country%20Info/Country%20Code-2> <Country%20Info#Country%20Code> "2"^^<http://www.w3.org/2001/XMLSchema#integer>  .
-<Country%20Info/Country%20Code-2> <Country%20Info#Name> "Ireland"  .
-<Country%20Info/Country%20Code-2> <Country%20Info#ISO%203166> "IE"  .
-<Country%20Info/Country%20Code-3> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Country%20Info> .
-<Country%20Info/Country%20Code-3> <Country%20Info#Country%20Code> "3"^^<http://www.w3.org/2001/XMLSchema#integer>  .
-<Country%20Info/Country%20Code-3> <Country%20Info#Name> "Saint Martin (French part)"  .
-<Country%20Info/Country%20Code-3> <Country%20Info#ISO%203166> "MF"  .
\ No newline at end of file
+<Country%20Info/Country%20Code=1> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Country%20Info> .
+<Country%20Info/Country%20Code=1> <Country%20Info#Country%20Code> "1"^^<http://www.w3.org/2001/XMLSchema#integer>  .
+<Country%20Info/Country%20Code=1> <Country%20Info#Name> "Bolivia, Plurinational State of"  .
+<Country%20Info/Country%20Code=1> <Country%20Info#ISO%203166> "BO"  .
+<Country%20Info/Country%20Code=2> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Country%20Info> .
+<Country%20Info/Country%20Code=2> <Country%20Info#Country%20Code> "2"^^<http://www.w3.org/2001/XMLSchema#integer>  .
+<Country%20Info/Country%20Code=2> <Country%20Info#Name> "Ireland"  .
+<Country%20Info/Country%20Code=2> <Country%20Info#ISO%203166> "IE"  .
+<Country%20Info/Country%20Code=3> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Country%20Info> .
+<Country%20Info/Country%20Code=3> <Country%20Info#Country%20Code> "3"^^<http://www.w3.org/2001/XMLSchema#integer>  .
+<Country%20Info/Country%20Code=3> <Country%20Info#Name> "Saint Martin (French part)"  .
+<Country%20Info/Country%20Code=3> <Country%20Info#ISO%203166> "MF"  .
\ No newline at end of file
--- a/D011-M2MRelations/directGraph.ttl	Tue Apr 24 16:10:05 2012 +0200
+++ b/D011-M2MRelations/directGraph.ttl	Tue May 08 17:30:39 2012 +0200
@@ -1,44 +1,44 @@
 @base <http://example.com/base/> .
 
-<Student/ID-10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Student> .
-<Student/ID-10> <Student#FirstName> "Venus".
-<Student/ID-10> <Student#ID> "10"^^<http://www.w3.org/2001/XMLSchema#integer> .
-<Student/ID-10> <Student#LastName> "Williams" .
-<Student/ID-11> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Student> .
-<Student/ID-11> <Student#FirstName> "Fernando".
-<Student/ID-11> <Student#ID> "11"^^<http://www.w3.org/2001/XMLSchema#integer> .
-<Student/ID-11> <Student#LastName> "Alonso" .
-<Student/ID-12> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Student> .
-<Student/ID-12> <Student#FirstName> "David".
-<Student/ID-12> <Student#ID> "12"^^<http://www.w3.org/2001/XMLSchema#integer> .
-<Student/ID-12> <Student#LastName> "Villa" .
-<Student_Sport/ID_Student-10.ID_Sport-110> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Student_Sport> .
-<Student_Sport/ID_Student-10.ID_Sport-110> <Student_Sport#ID_Student> "10"^^<http://www.w3.org/2001/XMLSchema#integer> .
-<Student_Sport/ID_Student-10.ID_Sport-110> <Student_Sport#ref-ID_Student> <Student/ID-10> .
-<Student_Sport/ID_Student-10.ID_Sport-110> <Student_Sport#ID_Sport> "110"^^<http://www.w3.org/2001/XMLSchema#integer> .
-<Student_Sport/ID_Student-10.ID_Sport-110> <Student_Sport#ref-ID_Sport> <Sport/ID-110> .
-<Student_Sport/ID_Student-11.ID_Sport-111> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Student_Sport> .
-<Student_Sport/ID_Student-11.ID_Sport-111> <Student_Sport#ID_Student> "11"^^<http://www.w3.org/2001/XMLSchema#integer> .
-<Student_Sport/ID_Student-11.ID_Sport-111> <Student_Sport#ref-ID_Student> <Student/ID-11> .
-<Student_Sport/ID_Student-11.ID_Sport-111> <Student_Sport#ID_Sport> "111"^^<http://www.w3.org/2001/XMLSchema#integer> .
-<Student_Sport/ID_Student-11.ID_Sport-111> <Student_Sport#ref-ID_Sport> <Sport/ID-111> .
-<Student_Sport/ID_Student-11.ID_Sport-112> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Student_Sport> .
-<Student_Sport/ID_Student-11.ID_Sport-112> <Student_Sport#ID_Student> "11"^^<http://www.w3.org/2001/XMLSchema#integer> .
-<Student_Sport/ID_Student-11.ID_Sport-112> <Student_Sport#ref-ID_Student> <Student/ID-11> .
-<Student_Sport/ID_Student-11.ID_Sport-112> <Student_Sport#ID_Sport> "112"^^<http://www.w3.org/2001/XMLSchema#integer> .
-<Student_Sport/ID_Student-11.ID_Sport-112> <Student_Sport#ref-ID_Sport> <Sport/ID-112> .
-<Student_Sport/ID_Student-12.ID_Sport-111> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Student_Sport> .
-<Student_Sport/ID_Student-12.ID_Sport-111> <Student_Sport#ID_Student> "12"^^<http://www.w3.org/2001/XMLSchema#integer> .
-<Student_Sport/ID_Student-12.ID_Sport-111> <Student_Sport#ref-ID_Student> <Student/ID-12> .
-<Student_Sport/ID_Student-12.ID_Sport-111> <Student_Sport#ID_Sport> "111"^^<http://www.w3.org/2001/XMLSchema#integer> .
-<Student_Sport/ID_Student-12.ID_Sport-111> <Student_Sport#ref-ID_Sport> <Sport/ID-111> .
-<Sport/ID-110> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type>  <Sport> .
-<Sport/ID-110> <Sport#ID> "110"^^<http://www.w3.org/2001/XMLSchema#integer> .
-<Sport/ID-110> <Sport#Description> "Tennis" .
-<Sport/ID-111>  <http://www.w3.org/1999/02/22-rdf-syntax-ns#type>  <Sport> .
-<Sport/ID-111> <Sport#ID> "111"^^<http://www.w3.org/2001/XMLSchema#integer> .
-<Sport/ID-111> <Sport#Description> "Football" .
-<Sport/ID-112>  <http://www.w3.org/1999/02/22-rdf-syntax-ns#type>  <Sport> .
-<Sport/ID-112>  <Sport#ID> "112"^^<http://www.w3.org/2001/XMLSchema#integer> .
-<Sport/ID-112>  <Sport#Description> "Formula1" .
+<Student/ID=10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Student> .
+<Student/ID=10> <Student#FirstName> "Venus".
+<Student/ID=10> <Student#ID> "10"^^<http://www.w3.org/2001/XMLSchema#integer> .
+<Student/ID=10> <Student#LastName> "Williams" .
+<Student/ID=11> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Student> .
+<Student/ID=11> <Student#FirstName> "Fernando".
+<Student/ID=11> <Student#ID> "11"^^<http://www.w3.org/2001/XMLSchema#integer> .
+<Student/ID=11> <Student#LastName> "Alonso" .
+<Student/ID=12> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Student> .
+<Student/ID=12> <Student#FirstName> "David".
+<Student/ID=12> <Student#ID> "12"^^<http://www.w3.org/2001/XMLSchema#integer> .
+<Student/ID=12> <Student#LastName> "Villa" .
+<Student_Sport/ID_Student=10;ID_Sport=110> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Student_Sport> .
+<Student_Sport/ID_Student=10;ID_Sport=110> <Student_Sport#ID_Student> "10"^^<http://www.w3.org/2001/XMLSchema#integer> .
+<Student_Sport/ID_Student=10;ID_Sport=110> <Student_Sport#ref=ID_Student> <Student/ID=10> .
+<Student_Sport/ID_Student=10;ID_Sport=110> <Student_Sport#ID_Sport> "110"^^<http://www.w3.org/2001/XMLSchema#integer> .
+<Student_Sport/ID_Student=10;ID_Sport=110> <Student_Sport#ref=ID_Sport> <Sport/ID=110> .
+<Student_Sport/ID_Student=11;ID_Sport=111> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Student_Sport> .
+<Student_Sport/ID_Student=11;ID_Sport=111> <Student_Sport#ID_Student> "11"^^<http://www.w3.org/2001/XMLSchema#integer> .
+<Student_Sport/ID_Student=11;ID_Sport=111> <Student_Sport#ref=ID_Student> <Student/ID=11> .
+<Student_Sport/ID_Student=11;ID_Sport=111> <Student_Sport#ID_Sport> "111"^^<http://www.w3.org/2001/XMLSchema#integer> .
+<Student_Sport/ID_Student=11;ID_Sport=111> <Student_Sport#ref=ID_Sport> <Sport/ID=111> .
+<Student_Sport/ID_Student=11;ID_Sport=112> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Student_Sport> .
+<Student_Sport/ID_Student=11;ID_Sport=112> <Student_Sport#ID_Student> "11"^^<http://www.w3.org/2001/XMLSchema#integer> .
+<Student_Sport/ID_Student=11;ID_Sport=112> <Student_Sport#ref=ID_Student> <Student/ID=11> .
+<Student_Sport/ID_Student=11;ID_Sport=112> <Student_Sport#ID_Sport> "112"^^<http://www.w3.org/2001/XMLSchema#integer> .
+<Student_Sport/ID_Student=11;ID_Sport=112> <Student_Sport#ref=ID_Sport> <Sport/ID=112> .
+<Student_Sport/ID_Student=12;ID_Sport=111> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Student_Sport> .
+<Student_Sport/ID_Student=12;ID_Sport=111> <Student_Sport#ID_Student> "12"^^<http://www.w3.org/2001/XMLSchema#integer> .
+<Student_Sport/ID_Student=12;ID_Sport=111> <Student_Sport#ref=ID_Student> <Student/ID=12> .
+<Student_Sport/ID_Student=12;ID_Sport=111> <Student_Sport#ID_Sport> "111"^^<http://www.w3.org/2001/XMLSchema#integer> .
+<Student_Sport/ID_Student=12;ID_Sport=111> <Student_Sport#ref=ID_Sport> <Sport/ID=111> .
+<Sport/ID=110> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type>  <Sport> .
+<Sport/ID=110> <Sport#ID> "110"^^<http://www.w3.org/2001/XMLSchema#integer> .
+<Sport/ID=110> <Sport#Description> "Tennis" .
+<Sport/ID=111>  <http://www.w3.org/1999/02/22-rdf-syntax-ns#type>  <Sport> .
+<Sport/ID=111> <Sport#ID> "111"^^<http://www.w3.org/2001/XMLSchema#integer> .
+<Sport/ID=111> <Sport#Description> "Football" .
+<Sport/ID=112>  <http://www.w3.org/1999/02/22-rdf-syntax-ns#type>  <Sport> .
+<Sport/ID=112>  <Sport#ID> "112"^^<http://www.w3.org/2001/XMLSchema#integer> .
+<Sport/ID=112>  <Sport#Description> "Formula1" .
 
--- a/D013-1table1primarykey3columns2rows1nullvalue/directGraph.ttl	Tue Apr 24 16:10:05 2012 +0200
+++ b/D013-1table1primarykey3columns2rows1nullvalue/directGraph.ttl	Tue May 08 17:30:39 2012 +0200
@@ -1,9 +1,9 @@
 @base <http://example.com/base/> .
 
-<Person/ID-1> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Person> .
-<Person/ID-1> <Person#ID> "1"^^<http://www.w3.org/2001/XMLSchema#integer> .
-<Person/ID-1> <Person#Name> "Alice" .
-<Person/ID-2> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Person> .
-<Person/ID-2> <Person#ID> "2"^^<http://www.w3.org/2001/XMLSchema#integer> .
-<Person/ID-2> <Person#Name> "Bob" .
-<Person/ID-2> <Person#DateOfBirth> "September, 2010" .
+<Person/ID=1> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Person> .
+<Person/ID=1> <Person#ID> "1"^^<http://www.w3.org/2001/XMLSchema#integer> .
+<Person/ID=1> <Person#Name> "Alice" .
+<Person/ID=2> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Person> .
+<Person/ID=2> <Person#ID> "2"^^<http://www.w3.org/2001/XMLSchema#integer> .
+<Person/ID=2> <Person#Name> "Bob" .
+<Person/ID=2> <Person#DateOfBirth> "September, 2010" .
--- a/D014-3tables1primarykey1foreignkey/directGraph.ttl	Tue Apr 24 16:10:05 2012 +0200
+++ b/D014-3tables1primarykey1foreignkey/directGraph.ttl	Tue May 08 17:30:39 2012 +0200
@@ -1,12 +1,12 @@
 @base <http://example.com/base/> .
 
-<EMP/empno-7369> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <EMP> .
-<EMP/empno-7369> <EMP#empno> "7369"^^<http://www.w3.org/2001/XMLSchema#integer>  .
-<EMP/empno-7369> <EMP#deptno> "10"^^<http://www.w3.org/2001/XMLSchema#integer>  .
-<EMP/empno-7369> <EMP#ref-deptno> _:c  .
-<EMP/empno-7369> <EMP#ename> "SMITH" .
-<EMP/empno-7369> <EMP#job> "CLERK" .
-<EMP/empno-7369> <EMP#etype> "PART_TIME" .
+<EMP/empno=7369> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <EMP> .
+<EMP/empno=7369> <EMP#empno> "7369"^^<http://www.w3.org/2001/XMLSchema#integer>  .
+<EMP/empno=7369> <EMP#deptno> "10"^^<http://www.w3.org/2001/XMLSchema#integer>  .
+<EMP/empno=7369> <EMP#ref=deptno> _:c  .
+<EMP/empno=7369> <EMP#ename> "SMITH" .
+<EMP/empno=7369> <EMP#job> "CLERK" .
+<EMP/empno=7369> <EMP#etype> "PART_TIME" .
 _:a <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <LIKES> .
 _:a <LIKES#id> "7369"^^<http://www.w3.org/2001/XMLSchema#integer>  .
 _:a <LIKES#likeType> "Playing" .
--- a/D015-1table3columns1composityeprimarykey3rows2languages/directGraph.ttl	Tue Apr 24 16:10:05 2012 +0200
+++ b/D015-1table3columns1composityeprimarykey3rows2languages/directGraph.ttl	Tue May 08 17:30:39 2012 +0200
@@ -1,18 +1,18 @@
 @base <http://example.com/base/> .
 
-<Country/Code-BO.Lan-EN> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Country> .
-<Country/Code-BO.Lan-EN> <Country#Code> "BO" .
-<Country/Code-BO.Lan-EN> <Country#Lan> "EN" .
-<Country/Code-BO.Lan-EN> <Country#Name> "Bolivia, Plurinational State of" .
-<Country/Code-BO.Lan-ES> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Country> .
-<Country/Code-BO.Lan-ES> <Country#Code> "BO" .
-<Country/Code-BO.Lan-ES> <Country#Lan> "ES" .
-<Country/Code-BO.Lan-ES> <Country#Name> "Estado Plurinacional de Bolivia" . 
-<Country/Code-IE.Lan-EN> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Country> .
-<Country/Code-IE.Lan-EN> <Country#Code> "IE" .
-<Country/Code-IE.Lan-EN> <Country#Lan> "EN" .
-<Country/Code-IE.Lan-EN> <Country#Name> "Ireland" .
-<Country/Code-IE.Lan-ES> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Country> .
-<Country/Code-IE.Lan-ES> <Country#Code> "IE" .
-<Country/Code-IE.Lan-ES> <Country#Lan> "ES" .
-<Country/Code-IE.Lan-ES> <Country#Name> "Irlanda" .
\ No newline at end of file
+<Country/Code=BO;Lan=EN> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Country> .
+<Country/Code=BO;Lan=EN> <Country#Code> "BO" .
+<Country/Code=BO;Lan=EN> <Country#Lan> "EN" .
+<Country/Code=BO;Lan=EN> <Country#Name> "Bolivia, Plurinational State of" .
+<Country/Code=BO;Lan=ES> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Country> .
+<Country/Code=BO;Lan=ES> <Country#Code> "BO" .
+<Country/Code=BO;Lan=ES> <Country#Lan> "ES" .
+<Country/Code=BO;Lan=ES> <Country#Name> "Estado Plurinacional de Bolivia" . 
+<Country/Code=IE;Lan=EN> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Country> .
+<Country/Code=IE;Lan=EN> <Country#Code> "IE" .
+<Country/Code=IE;Lan=EN> <Country#Lan> "EN" .
+<Country/Code=IE;Lan=EN> <Country#Name> "Ireland" .
+<Country/Code=IE;Lan=ES> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Country> .
+<Country/Code=IE;Lan=ES> <Country#Code> "IE" .
+<Country/Code=IE;Lan=ES> <Country#Lan> "ES" .
+<Country/Code=IE;Lan=ES> <Country#Name> "Irlanda" .
\ No newline at end of file
--- a/D016-1table1primarykey10columns3rowsSQLdatatypes/directGraph.ttl	Tue Apr 24 16:10:05 2012 +0200
+++ b/D016-1table1primarykey10columns3rowsSQLdatatypes/directGraph.ttl	Tue May 08 17:30:39 2012 +0200
@@ -1,35 +1,35 @@
 @base <http://example.com/base/> .
 
-<Patient/ID-10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Patient> .
-<Patient/ID-10> <Patient#ID> "10"^^<http://www.w3.org/2001/XMLSchema#integer> .
-<Patient/ID-10> <Patient#FirstName> "Monica" .
-<Patient/ID-10> <Patient#LastName> "Geller" .
-<Patient/ID-10> <Patient#Sex> "female" .
-<Patient/ID-10> <Patient#Weight> "8.025E1"^^<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-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> "aVZCT1J3MEtHZ29BQUFBTlNVaEVVZ0FBQUFVQUFBQUZDQVlBQUFDTmJ5YmxBQUFBSEVsRVFWUUkxMlA0Ly84L3czOEdJQVhESUJLRTBESHhnbGpOQkFBTzlUWEwwWTRPSHdBQUFBQkpSVTVFcmtKZ2dnPT0="^^<http://www.w3.org/2001/XMLSchema#base64Binary> .
-<Patient/ID-11> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Patient> .
-<Patient/ID-11> <Patient#ID> "11"^^<http://www.w3.org/2001/XMLSchema#integer> .
-<Patient/ID-11> <Patient#FirstName> "Rachel" .
-<Patient/ID-11> <Patient#LastName> "Green" .
-<Patient/ID-11> <Patient#Sex> "female" .
-<Patient/ID-11> <Patient#Weight> "7.022E1"^^<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-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> "aVZCT1J3MEtHZ29BQUFBTlNVaEVVZ0FBQUFVQUFBQUZDQVlBQUFDTmJ5YmxBQUFBSEVsRVFWUUkxMlA1Ly84L3czOEdJQVhESUJLRTBESHhnbGpOQkFBTzlUWEwwWTRPSHdBQUFBQkpSVTVFcmtKZ2dnPT0="^^<http://www.w3.org/2001/XMLSchema#base64Binary> .
-<Patient/ID-12> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Patient> .
-<Patient/ID-12> <Patient#ID> "12"^^<http://www.w3.org/2001/XMLSchema#integer> .
-<Patient/ID-12> <Patient#FirstName> "Chandler" .
-<Patient/ID-12> <Patient#LastName> "Bing" .
-<Patient/ID-12> <Patient#Sex> "male" .
-<Patient/ID-12> <Patient#Weight> "9.031E1"^^<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-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> "aVZCT1J3MEtHZ29BQUFBTlNVaEVVZ0FBQUFVQUFBQUZDQVlBQUFDTmJ5YmxBQUFBSEVsRVFWUUkxMlA1Ly82L3czOEdJQVhESUJLRTBESHhnbGpOQkFBTzlUWEwwWTRPSHdBQUFBQkpSVTVFcmtKZ2dnPT0="^^<http://www.w3.org/2001/XMLSchema#base64Binary> .
\ No newline at end of file
+<Patient/ID=10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Patient> .
+<Patient/ID=10> <Patient#ID> "10"^^<http://www.w3.org/2001/XMLSchema#integer> .
+<Patient/ID=10> <Patient#FirstName> "Monica" .
+<Patient/ID=10> <Patient#LastName> "Geller" .
+<Patient/ID=10> <Patient#Sex> "female" .
+<Patient/ID=10> <Patient#Weight> "8.025E1"^^<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-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> "89504E470D0A1A0A0000000D49484452000000050000000508060000008D6F26E50000001C4944415408D763F9FFFEBFC37F062005C3201284D031F18258CD04000EF535CBD18E0E1F0000000049454E44AE426082"^^<http://www.w3.org/2001/XMLSchema#hexBinary> .
+<Patient/ID=11> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Patient> .
+<Patient/ID=11> <Patient#ID> "11"^^<http://www.w3.org/2001/XMLSchema#integer> .
+<Patient/ID=11> <Patient#FirstName> "Rachel" .
+<Patient/ID=11> <Patient#LastName> "Green" .
+<Patient/ID=11> <Patient#Sex> "female" .
+<Patient/ID=11> <Patient#Weight> "7.022E1"^^<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-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> "89504E470D0A1A0A0000000D49484452000000050000000508060000008D6F26E50000001C4944415408D763F9FFFF3FC37F062005C3201284D031F18258CD04000EF535CBD18E0E1F0000000049454E44AE426082"^^<http://www.w3.org/2001/XMLSchema#hexBinary> .
+<Patient/ID=12> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Patient> .
+<Patient/ID=12> <Patient#ID> "12"^^<http://www.w3.org/2001/XMLSchema#integer> .
+<Patient/ID=12> <Patient#FirstName> "Chandler" .
+<Patient/ID=12> <Patient#LastName> "Bing" .
+<Patient/ID=12> <Patient#Sex> "male" .
+<Patient/ID=12> <Patient#Weight> "9.031E1"^^<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-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> "89504E470D0A1A0A0000000D49484452000000050000000508060000008D6F26E50000001C4944415408D763F9FFFEBFC37F062005C3201284D031F18258CD04000EF535CBD18E0E1F0000000049454E44AE426082"^^<http://www.w3.org/2001/XMLSchema#hexBinary> .
\ No newline at end of file
--- a/D016-1table1primarykey10columns3rowsSQLdatatypes/mappede.nq	Tue Apr 24 16:10:05 2012 +0200
+++ b/D016-1table1primarykey10columns3rowsSQLdatatypes/mappede.nq	Tue May 08 17:30:39 2012 +0200
@@ -1,6 +1,6 @@
 <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/photo> <data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==> .
+<http://example.com/Patient10> <http://example.com/photo> <data:image/png;hex,89504E470D0A1A0A0000000D49484452000000050000000508060000008D6F26E50000001C4944415408D763F9FFFEBFC37F062005C3201284D031F18258CD04000EF535CBD18E0E1F0000000049454E44AE426082> .
 <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/photo> <data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P5//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==> .
+<http://example.com/Patient11> <http://example.com/photo> <data:image/png;hex,89504E470D0A1A0A0000000D49484452000000050000000508060000008D6F26E50000001C4944415408D763F9FFFF3FC37F062005C3201284D031F18258CD04000EF535CBD18E0E1F0000000049454E44AE426082> .
 <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/photo> <data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P5//6/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==> .
\ No newline at end of file
+<http://example.com/Patient12> <http://example.com/photo> <data:image/png;hex,89504E470D0A1A0A0000000D49484452000000050000000508060000008D6F26E50000001C4944415408D763F9FFFEBFC37F062005C3201284D031F18258CD04000EF535CBD18E0E1F0000000049454E44AE426082> .
\ No newline at end of file
--- a/D016-1table1primarykey10columns3rowsSQLdatatypes/r2rmle.ttl	Tue Apr 24 16:10:05 2012 +0200
+++ b/D016-1table1primarykey10columns3rowsSQLdatatypes/r2rmle.ttl	Tue May 08 17:30:39 2012 +0200
@@ -22,7 +22,7 @@
     rr:predicateObjectMap
     [ 
       rr:predicate	ex:photo;
-      rr:objectMap	[ rr:template "data:image/png;base64,{\"Photo\"}"; ];
+      rr:objectMap	[ rr:template "data:image/png;hex,{\"Photo\"}"; ];
     ];
 
     .
--- a/D021-2tables2primarykeys1foreignkeyReferencesAllNulls/directGraph.ttl	Tue Apr 24 16:10:05 2012 +0200
+++ b/D021-2tables2primarykeys1foreignkeyReferencesAllNulls/directGraph.ttl	Tue May 08 17:30:39 2012 +0200
@@ -1,36 +1,36 @@
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 @base <http://example.com/base/> .
 
-<Target/PK-1010> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Target> .
-<Target/PK-1010> <Target#PK> 1010 .
-<Target/PK-1010> <Target#key1attr1> "K1A11" .
-<Target/PK-1010> <Target#key1attr2> "K1A21" .
-<Target/PK-1010> <Target#key2attr1> "K2A11" .
-<Target/PK-1010> <Target#key2attr2> "K2A21" .
-
-<Target/PK-1011> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Target> .
-<Target/PK-1011> <Target#PK> 1011 .
-<Target/PK-1011> <Target#key1attr1> "K1A12" .
-<Target/PK-1011> <Target#key1attr2> "K1A22" .
-<Target/PK-1011> <Target#key2attr2> "K2A22" .
+<Target/PK=1010> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Target> .
+<Target/PK=1010> <Target#PK> 1010 .
+<Target/PK=1010> <Target#key1attr1> "K1A11" .
+<Target/PK=1010> <Target#key1attr2> "K1A21" .
+<Target/PK=1010> <Target#key2attr1> "K2A11" .
+<Target/PK=1010> <Target#key2attr2> "K2A21" .
 
-<Target/PK-1012> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Target> .
-<Target/PK-1012> <Target#PK> 1012 .
-<Target/PK-1012> <Target#key1attr1> "K1A13" .
-<Target/PK-1012> <Target#key1attr2> "K1A23" .
+<Target/PK=1011> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Target> .
+<Target/PK=1011> <Target#PK> 1011 .
+<Target/PK=1011> <Target#key1attr1> "K1A12" .
+<Target/PK=1011> <Target#key1attr2> "K1A22" .
+<Target/PK=1011> <Target#key2attr2> "K2A22" .
 
-<Source/ID-1100> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Source> .
-<Source/ID-1100> <Source#ID> 1100 .
-<Source/ID-1100> <Source#attrA> "K2A21" .
-<Source/ID-1100> <Source#attrB> "K2A11" .
-<Source/ID-1100> <Source#ref-attrA.attrB> <Target/PK-1010> .
+<Target/PK=1012> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Target> .
+<Target/PK=1012> <Target#PK> 1012 .
+<Target/PK=1012> <Target#key1attr1> "K1A13" .
+<Target/PK=1012> <Target#key1attr2> "K1A23" .
 
-<Source/ID-1101> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Source> .
-<Source/ID-1101> <Source#ID> 1101 .
-<Source/ID-1101> <Source#attrA> "K2A22" .
-<Source/ID-1101> <Source#ref-attrA.attrB> <Target/PK-1011> .
+<Source/ID=1100> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Source> .
+<Source/ID=1100> <Source#ID> 1100 .
+<Source/ID=1100> <Source#attrA> "K2A21" .
+<Source/ID=1100> <Source#attrB> "K2A11" .
+<Source/ID=1100> <Source#ref=attrA;attrB> <Target/PK=1010> .
 
-<Source/ID-1102> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Source> .
-<Source/ID-1102> <Source#ID> 1102 .
-<Source/ID-1102> <Source#ref-attrA.attrB> <Target/PK-1012> .
+<Source/ID=1101> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Source> .
+<Source/ID=1101> <Source#ID> 1101 .
+<Source/ID=1101> <Source#attrA> "K2A22" .
+<Source/ID=1101> <Source#ref=attrA;attrB> <Target/PK=1011> .
 
+<Source/ID=1102> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Source> .
+<Source/ID=1102> <Source#ID> 1102 .
+<Source/ID=1102> <Source#ref=attrA;attrB> <Target/PK=1012> .
+
--- a/D023-2tables2primarykeys2foreignkeysReferencesToNon-primarykeys/directGraph.ttl	Tue Apr 24 16:10:05 2012 +0200
+++ b/D023-2tables2primarykeys2foreignkeysReferencesToNon-primarykeys/directGraph.ttl	Tue May 08 17:30:39 2012 +0200
@@ -1,15 +1,16 @@
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@base <http://example.com/base/> .
 
-<Target/PK-1010> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Target> .
-<Target/PK-1010> <Target#PK> 1010 .
-<Target/PK-1010> <Target#key1attr1> "K1A1" .
-<Target/PK-1010> <Target#key1attr2> "K1A2" .
-<Target/PK-1010> <Target#key2attr1> "K2A1" .
-<Target/PK-1010> <Target#key2attr2> "K2A2" .
+<Target/PK=1010> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Target> .
+<Target/PK=1010> <Target#PK> 1010 .
+<Target/PK=1010> <Target#key1attr1> "K1A1" .
+<Target/PK=1010> <Target#key1attr2> "K1A2" .
+<Target/PK=1010> <Target#key2attr1> "K2A1" .
+<Target/PK=1010> <Target#key2attr2> "K2A2" .
 
-<Source/ID-1100> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Source> .
-<Source/ID-1100> <Source#ID> 1100 .
-<Source/ID-1100> <Source#attrA> "K2A2" .
-<Source/ID-1100> <Source#attrB> "K2A1" .
-<Source/ID-1100> <Source#ref-attrA.attrB> <Target/PK-1010> .
+<Source/ID=1100> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Source> .
+<Source/ID=1100> <Source#ID> 1100 .
+<Source/ID=1100> <Source#attrA> "K2A2" .
+<Source/ID=1100> <Source#attrB> "K2A1" .
+<Source/ID=1100> <Source#ref=attrA;attrB> <Target/PK=1010> .
 
--- a/D024-2tables2primarykeys1foreignkeyToARowWithSomeNulls/directGraph.ttl	Tue Apr 24 16:10:05 2012 +0200
+++ b/D024-2tables2primarykeys1foreignkeyToARowWithSomeNulls/directGraph.ttl	Tue May 08 17:30:39 2012 +0200
@@ -1,27 +1,27 @@
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 @base <http://example.com/base/> .
 
-<Target/PK-1010> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Target> .
-<Target/PK-1010> <Target#PK> 1010 .
-<Target/PK-1010> <Target#key1attr1> "K1A11" .
-<Target/PK-1010> <Target#key1attr2> "K1A21" .
-<Target/PK-1010> <Target#key2attr1> "K2A11" .
-<Target/PK-1010> <Target#key2attr2> "K2A21" .
+<Target/PK=1010> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Target> .
+<Target/PK=1010> <Target#PK> 1010 .
+<Target/PK=1010> <Target#key1attr1> "K1A11" .
+<Target/PK=1010> <Target#key1attr2> "K1A21" .
+<Target/PK=1010> <Target#key2attr1> "K2A11" .
+<Target/P=1010> <Target#key2attr2> "K2A21" .
 
-<Target/PK-1011> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Target> .
-<Target/PK-1011> <Target#PK> 1011 .
-<Target/PK-1011> <Target#key1attr1> "K1A12" .
-<Target/PK-1011> <Target#key1attr2> "K1A22" .
-<Target/PK-1011> <Target#key2attr2> "K2A22" .
+<Target/PK=1011> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Target> .
+<Target/PK=1011> <Target#PK> 1011 .
+<Target/PK=1011> <Target#key1attr1> "K1A12" .
+<Target/PK=1011> <Target#key1attr2> "K1A22" .
+<Target/PK=1011> <Target#key2attr2> "K2A22" .
 
-<Source/ID-1100> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Source> .
-<Source/ID-1100> <Source#ID> 1100 .
-<Source/ID-1100> <Source#attrA> "K2A21" .
-<Source/ID-1100> <Source#attrB> "K2A11" .
-<Source/ID-1100> <Source#ref-attrA.attrB> <Target/PK-1010> .
+<Source/ID=1100> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Source> .
+<Source/ID=1100> <Source#ID> 1100 .
+<Source/ID=1100> <Source#attrA> "K2A21" .
+<Source/ID=1100> <Source#attrB> "K2A11" .
+<Source/ID=1100> <Source#ref=attrA;attrB> <Target/PK=1010> .
 
-<Source/ID-1101> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Source> .
-<Source/ID-1101> <Source#ID> 1101 .
-<Source/ID-1101> <Source#attrA> "K2A22" .
-<Source/ID-1101> <Source#ref-attrA.attrB> <Target/PK-1011> .
+<Source/ID=1101> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Source> .
+<Source/ID=1101> <Source#ID> 1101 .
+<Source/ID=1101> <Source#attrA> "K2A22" .
+<Source/ID=1101> <Source#ref=attrA;attrB> <Target/PK=1011> .
 
--- a/D025-3tables3primarykeys3foreignkeys/directGraph.ttl	Tue Apr 24 16:10:05 2012 +0200
+++ b/D025-3tables3primarykeys3foreignkeys/directGraph.ttl	Tue May 08 17:30:39 2012 +0200
@@ -1,51 +1,51 @@
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 @base <http://example.com/base/> .
 
-<People/ID-7> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <People> .
-<People/ID-7> <People#ID> 7 .
-<People/ID-7> <People#fname> "Bob" .
-<People/ID-7> <People#addr> 18 .
-<People/ID-7> <People#ref-addr> <Addresses/ID-18> .
-<People/ID-7> <People#deptName> "accounting" .
-<People/ID-7> <People#deptCity> "Cambridge" .
-<People/ID-7> <People#ref-deptName.deptCity> <Department/ID-23> .
-<People/ID-8> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <People> .
-<People/ID-8> <People#ID> 8 .
-<People/ID-8> <People#fname> "Sue" .
+<People/ID=7> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <People> .
+<People/ID=7> <People#ID> 7 .
+<People/ID=7> <People#fname> "Bob" .
+<People/ID=7> <People#addr> 18 .
+<People/ID=7> <People#ref=addr> <Addresses/ID=18> .
+<People/ID=7> <People#deptName> "accounting" .
+<People/ID=7> <People#deptCity> "Cambridge" .
+<People/ID=7> <People#ref=deptName;deptCity> <Department/ID=23> .
+<People/ID=8> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <People> .
+<People/ID=8> <People#ID> 8 .
+<People/ID=8> <People#fname> "Sue" .
 
-<Addresses/ID-18> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Addresses> .
-<Addresses/ID-18> <Addresses#ID> 18 .
-<Addresses/ID-18> <Addresses#city> "Cambridge" .
-<Addresses/ID-18> <Addresses#state> "MA" .
+<Addresses/ID=18> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Addresses> .
+<Addresses/ID=18> <Addresses#ID> 18 .
+<Addresses/ID=18> <Addresses#city> "Cambridge" .
+<Addresses/ID=18> <Addresses#state> "MA" .
 
-<Department/ID-23> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Department> .
-<Department/ID-23> <Department#ID> 23 .
-<Department/ID-23> <Department#name> "accounting" .
-<Department/ID-23> <Department#city> "Cambridge" .
-<Department/ID-23> <Department#manager> 8; .
-<Department/ID-23> <Department#ref-manager> <People/ID-8> .
+<Department/ID=23> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Department> .
+<Department/ID=23> <Department#ID> 23 .
+<Department/ID=23> <Department#name> "accounting" .
+<Department/ID=23> <Department#city> "Cambridge" .
+<Department/ID=23> <Department#manager> 8; .
+<Department/ID=23> <Department#ref=manager> <People/ID=8> .
 
 _:c <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Projects> .
 _:c <Projects#lead> 8 .
-_:c <Projects#ref-lead> <People/ID-8> .
+_:c <Projects#ref=lead> <People/ID=8> .
 _:c <Projects#name> "pencil survey" .
 _:c <Projects#deptName> "accounting" .
 _:c <Projects#deptCity> "Cambridge" .
-_:c <Projects#ref-deptName.deptCity> <Department/ID-23> .
+_:c <Projects#ref=deptName;deptCity> <Department/ID=23> .
 
 _:d <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Projects> .
 _:d <Projects#lead> 8 .
-_:d <Projects#ref-lead> <People/ID-8> .
+_:d <Projects#ref=lead> <People/ID=8> .
 _:d <Projects#name> "eraser survey" .
 _:d <Projects#deptName> "accounting" .
 _:d <Projects#deptCity> "Cambridge" .
-_:d <Projects#ref-deptName.deptCity> <Department/ID-23> .
+_:d <Projects#ref=deptName;deptCity> <Department/ID=23> .
 
-<TaskAssignments/worker-7.project-pencil%20survey> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <TaskAssignments> .
-<TaskAssignments/worker-7.project-pencil%20survey> <TaskAssignments#worker> 7 .
-<TaskAssignments/worker-7.project-pencil%20survey> <TaskAssignments#ref-worker> <People/ID-7> .
-<TaskAssignments/worker-7.project-pencil%20survey> <TaskAssignments#project> "pencil survey" .
-<TaskAssignments/worker-7.project-pencil%20survey> <TaskAssignments#deptName> "accounting" .
-<TaskAssignments/worker-7.project-pencil%20survey> <TaskAssignments#deptCity> "Cambridge" .
-<TaskAssignments/worker-7.project-pencil%20survey> <TaskAssignments#ref-deptName.deptCity> <Department/ID-23> .
-<TaskAssignments/worker-7.project-pencil%20survey> <TaskAssignments#ref-project.deptName.deptCity> _:c .
\ No newline at end of file
+<TaskAssignments/worker=7;project=pencil%20survey> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <TaskAssignments> .
+<TaskAssignments/worker=7;project=pencil%20survey> <TaskAssignments#worker> 7 .
+<TaskAssignments/worker=7;project=pencil%20survey> <TaskAssignments#ref=worker> <People/ID=7> .
+<TaskAssignments/worker=7;project=pencil%20survey> <TaskAssignments#project> "pencil survey" .
+<TaskAssignments/worker=7;project=pencil%20survey> <TaskAssignments#deptName> "accounting" .
+<TaskAssignments/worker=7;project=pencil%20survey> <TaskAssignments#deptCity> "Cambridge" .
+<TaskAssignments/worker=7;project=pencil%20survey> <TaskAssignments#ref=deptName;deptCity> <Department/ID=23> .
+<TaskAssignments/worker=7;project=pencil%20survey> <TaskAssignments#ref=project;deptName.deptCity> _:c .
\ No newline at end of file
Binary file ts1.zip has changed