--- a/D003-1table3columns1row/r2rmla.ttl Thu Mar 22 22:14:33 2012 +0100
+++ b/D003-1table3columns1row/r2rmla.ttl Mon Mar 26 20:32:56 2012 +0200
@@ -7,8 +7,6 @@
<TriplesMap1>
a rr:TriplesMap;
- rr:logicalTable [ rr:tableName "\"Student\"" ];
-
rr:logicalTable [
rr:sqlQuery """
SELECT "ID",
--- a/D005-1table3columns3rows2duplicates/manifest.ttl Thu Mar 22 22:14:33 2012 +0100
+++ b/D005-1table3columns3rows2duplicates/manifest.ttl Mon Mar 26 20:32:56 2012 +0200
@@ -22,9 +22,9 @@
.
<tc0005a> a rdb2rdftest:R2RML ;
- dcterms:title "generation of duplicate triples, typing of resources" ;
+ dcterms:title "Typing of resources" ;
dcterms:identifier "R2RMLTC0005a" ;
- test:purpose "Tests the generation of duplicate triples and the typing of resources" ;
+ test:purpose "Tests the typing of resources" ;
test:specificationReference "#typing" ;
test:reviewStatus test:unreviewed ;
rdb2rdftest:database <d005> ;
--- a/D009-2tables1primarykey1foreignkey/mappeda.nq Thu Mar 22 22:14:33 2012 +0100
+++ b/D009-2tables1primarykey1foreignkey/mappeda.nq Mon Mar 26 20:32:56 2012 +0200
@@ -1,5 +1,4 @@
<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/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 Thu Mar 22 22:14:33 2012 +0100
+++ b/D009-2tables1primarykey1foreignkey/mappedd.nq Mon Mar 26 20:32:56 2012 +0200
@@ -1,6 +1,6 @@
<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_Venus%20Williams> <http://example.com/numSport> "1" .
<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> .
+<http://example.com/resource/student_Demi%20Moore> <http://example.com/numSport> "0" .
--- a/D011-M2MRelations/mappeda.nq Thu Mar 22 22:14:33 2012 +0100
+++ b/D011-M2MRelations/mappeda.nq Mon Mar 26 20:32:56 2012 +0200
@@ -12,8 +12,8 @@
<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
+<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 Mar 22 22:14:33 2012 +0100
+++ b/D011-M2MRelations/r2rmla.ttl Mon Mar 26 20:32:56 2012 +0200
@@ -8,14 +8,14 @@
a rr:TriplesMap;
rr:logicalTable [ rr:sqlQuery """
- SELECT Student.ID as ID,
- Student.FirstName as FirstName,
- Student.LastName as LastName,
- Sport.Description as Description,
- Sport.ID as Sport_ID
- FROM Student,Sport,Student_Sport
- WHERE Student.ID = Student_Sport.ID_Student
- AND Sport.ID = Student_Sport.ID_Sport;
+ SELECT "Student"."ID" as ID,
+ "Student"."FirstName" as FirstName,
+ "Student"."LastName" as LastName,
+ "Sport"."Description" as Description,
+ "Sport"."ID" as Sport_ID
+ FROM "Student","Sport","Student_Sport"
+ WHERE "Student"."ID" = "Student_Sport"."ID_Student"
+ AND "Sport"."ID" = "Student_Sport"."ID_Sport";
"""; ];
rr:subjectMap [ rr:template "http://example.com/{ID}/{FirstName}-{LastName}" ];
--- a/D016-1table1primarykey10columns3rowsSQLdatatypes/mappeda.nq Thu Mar 22 22:14:33 2012 +0100
+++ b/D016-1table1primarykey10columns3rowsSQLdatatypes/mappeda.nq Mon Mar 26 20:32:56 2012 +0200
@@ -1,14 +1,14 @@
-<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://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/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://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/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://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/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" .
--- a/D020-1table1column5rows/r2rmla.ttl Thu Mar 22 22:14:33 2012 +0100
+++ b/D020-1table1column5rows/r2rmla.ttl Mon Mar 26 20:32:56 2012 +0200
@@ -2,6 +2,7 @@
@prefix foaf: <http://xmlns.com/foaf/0.1/> .
@prefix ex: <http://example.com/> .
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
@base <http://mappingpedia.org/rdb2rdf/r2rml/tc/> .
<TriplesMap1>
--- a/D020-1table1column5rows/r2rmlb.ttl Thu Mar 22 22:14:33 2012 +0100
+++ b/D020-1table1column5rows/r2rmlb.ttl Mon Mar 26 20:32:56 2012 +0200
@@ -2,6 +2,7 @@
@prefix foaf: <http://xmlns.com/foaf/0.1/> .
@prefix ex: <http://example.com/> .
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
@base <http://mappingpedia.org/rdb2rdf/r2rml/tc/> .
<TriplesMap1>
--- a/D021-2tables2primarykeys1foreignkeyReferencesAllNulls/directGraph.ttl Thu Mar 22 22:14:33 2012 +0100
+++ b/D021-2tables2primarykeys1foreignkeyReferencesAllNulls/directGraph.ttl Mon Mar 26 20:32:56 2012 +0200
@@ -1,35 +1,35 @@
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-<Target/PK-1010> a <Target> .
+<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> a <Target> .
+<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-1012> a <Target> .
+<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-1100> a <Source> .
+<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> a <Source> .
+<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> a <Source> .
+<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/D022-2tables1primarykey1foreignkeyReferencesNoPrimaryKey/directGraph.ttl Thu Mar 22 22:14:33 2012 +0100
+++ b/D022-2tables1primarykey1foreignkeyReferencesNoPrimaryKey/directGraph.ttl Mon Mar 26 20:32:56 2012 +0200
@@ -1,13 +1,13 @@
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-_:a a <Target> .
+_:a <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Target> .
_:a <Target#litattr1> 1010 .
_:a <Target#key1attr1> "K1A1" .
_:a <Target#key1attr2> "K1A2" .
_:a <Target#key2attr1> "K2A1" .
_:a <Target#key2attr2> "K2A2" .
-<Source/ID-1100> a <Source> .
+<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" .
--- a/D023-2tables2primarykeys2foreignkeysReferencesToNon-primarykeys/directGraph.ttl Thu Mar 22 22:14:33 2012 +0100
+++ b/D023-2tables2primarykeys2foreignkeysReferencesToNon-primarykeys/directGraph.ttl Mon Mar 26 20:32:56 2012 +0200
@@ -1,13 +1,13 @@
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-<Target/PK-1010> a <Target> .
+<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> a <Source> .
+<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" .
--- a/D024-2tables2primarykeys1foreignkeyToARowWithSomeNulls/directGraph.ttl Thu Mar 22 22:14:33 2012 +0100
+++ b/D024-2tables2primarykeys1foreignkeyToARowWithSomeNulls/directGraph.ttl Mon Mar 26 20:32:56 2012 +0200
@@ -1,25 +1,25 @@
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-<Target/PK-1010> a <Target> .
+<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> a <Target> .
+<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> a <Source> .
+<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> a <Source> .
+<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 Thu Mar 22 22:14:33 2012 +0100
+++ b/D025-3tables3primarykeys3foreignkeys/directGraph.ttl Mon Mar 26 20:32:56 2012 +0200
@@ -1,6 +1,6 @@
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-<People/ID-7> a <People> .
+<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 .
@@ -8,23 +8,23 @@
<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> a <People> .
+<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> a <Addresses> .
+<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> a <Department> .
+<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 a <Projects> .
+_: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#name> "pencil survey" .
@@ -32,7 +32,7 @@
_:c <Projects#deptCity> "Cambridge" .
_:c <Projects#ref-deptName.deptCity> <Department/ID-23> .
-_:d a <Projects> .
+_: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#name> "eraser survey" .
@@ -40,7 +40,7 @@
_:d <Projects#deptCity> "Cambridge" .
_:d <Projects#ref-deptName.deptCity> <Department/ID-23> .
-<TaskAssignments/worker-7.project-pencil%20survey> a <TaskAssignments> .
+<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" .
Binary file ts1.zip has changed