section: {single-targets, source-vocabulary}: drop ql namespace

Fixes #32
kg-construct · Sep 13, 2023 · 20365d9 · 20365d9
1 parent b4e3b81
commit 20365d9
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 30 deletions.
diff --git a/spec/section/single-targets.md b/spec/section/single-targets.md
@@ -53,7 +53,7 @@ to an RDF dump with N-Quads as serialization format and GZip compression:
 &lt;#TriplesMap&gt; a rml:TriplesMap;
   rml:logicalSource [ a rml:LogicalSource;
     rml:source &lt;#DCATSourceAccess&gt;;
-    rml:referenceFormulation ql:JSONPath;
+    rml:referenceFormulation rml:JSONPath;
     rml:iterator "$.[*]";
   ];
   rml:subjectMap [ a rml:SubjectMap;
@@ -155,7 +155,7 @@ with Turtle as serialization format and Zip compression:
 &lt;#TriplesMap&gt; a rml:TriplesMap;
   rml:logicalSource [ a rml:LogicalSource;
     rml:source &lt;#DCATSourceAccess&gt;;
-    rml:referenceFormulation ql:JSONPath;
+    rml:referenceFormulation rml:JSONPath;
     rml:iterator "$.[*]";
   ];
   rml:subjectMap [ a rml:SubjectMap;
@@ -274,7 +274,7 @@ with N-Triples as serialization format:
 &lt;#TriplesMap&gt; a rml:TriplesMap;
   rml:logicalSource [ a rml:LogicalSource;
     rml:source &lt;#DCATSourceAccess&gt;;
-    rml:referenceFormulation ql:JSONPath;
+    rml:referenceFormulation rml:JSONPath;
     rml:iterator "$.[*]";
   ];
   rml:subjectMap [ a rml:SubjectMap;
@@ -389,7 +389,7 @@ to an RDF dump with N-Quads as serialization format:
 &lt;#TriplesMap&gt; a rml:TriplesMap;
   rml:logicalSource [ a rml:LogicalSource;
     rml:source &lt;#DCATSourceAccess&gt;;
-    rml:referenceFormulation ql:JSONPath;
+    rml:referenceFormulation rml:JSONPath;
     rml:iterator "$.[*]";
   ];
   rml:subjectMap [ a rml:SubjectMap;
@@ -492,7 +492,7 @@ to a RDF dump with N-Triples as serialization format:
 &lt;#TriplesMap&gt; a rml:TriplesMap;
   rml:logicalSource [ a rml:LogicalSource;
     rml:source &lt;#DCATSourceAccess&gt;;
-    rml:referenceFormulation ql:JSONPath;
+    rml:referenceFormulation rml:JSONPath;
     rml:iterator "$.[*]";
   ];
   rml:subjectMap [ a rml:SubjectMap;

diff --git a/spec/section/source-vocabulary.md b/spec/section/source-vocabulary.md
@@ -20,7 +20,7 @@ defines the reference formulation used to refer to the elements
 of a data source.
 The reference formulation must be specified in the case of databases,
 CSV, TSV, XML, and JSON data sources.
-By default `rml:SQL2008` for databases, `ql:CSV` for CSV and TSV data sources.
+By default `rml:SQL2008` for databases, `rml:CSV` for CSV and TSV data sources.
 XPath for XML and JSONPath for JSON and JSONL data sources.
 
 The following properties MAY be specified in a Logical Source:
@@ -48,7 +48,7 @@ If a property is specified, it MUST NOT be specified multiple times.
 | Property                    | Domain               | Range                     |
 | --------------------------- | -------------------- | ------------------------- |
 | `rml:source`                | `rml:LogicalSource`  | `IRI`                     |
-| `rml:referenceFormulation`  | `rml:LogicalSource`  | `ql:ReferenceFormulation` |
+| `rml:referenceFormulation`  | `rml:LogicalSource`  | `rml:ReferenceFormulation` |
 | `rml:iterator`              | `rml:LogicalSource`  | `Literal`                 |
 
 <figure>
@@ -64,29 +64,29 @@ Several reference formulations (`rml:ReferenceFormulation`)
 are defined in this specification:
 
 - `rml:SQL2008`: SQL 2008 standard for relational databases
-- `ql:CSV`: CSV or TSV data sources
-- `ql:JSONPath`: JSON documents
-- `ql:XPath`: XML documents, a shortcut for `ql:XPathReferenceFormulation`
+- `rml:CSV`: CSV or TSV data sources
+- `rml:JSONPath`: JSON documents
+- `rml:XPath`: XML documents, a shortcut for `rml:XPathReferenceFormulation`
 with default parameters
-- `ql:XPathReferenceFormulation`: XML documents with optionally
+- `rml:XPathReferenceFormulation`: XML documents with optionally
 the definition of XML namespaces used in references.
 By default, no namespaces are defined.
 
-`ql:XPathReferenceFormulation` may specify zero or more 
-`ql:namespace` properties with a `ql:Namespace`.
-A `ql:Namespace` contains the following required properties:
- - `ql:namespacePrefix`: A Literal with the prefix used for the XML namespace.
- - `ql:namespaceURL`: A Literal with the URL identifying the XML namespace.
+`rml:XPathReferenceFormulation` may specify zero or more 
+`rml:namespace` properties with a `rml:Namespace`.
+A `rml:Namespace` contains the following required properties:
+ - `rml:namespacePrefix`: A Literal with the prefix used for the XML namespace.
+ - `rml:namespaceURL`: A Literal with the URL identifying the XML namespace.
 
 <pre class="ex-source">
 &lt;#XMLNamespace&gt; a rml:LogicalSource;
      rml:source [ a rml:Source, dcat:Distribution;
          dcat:accessURL &lt;file:///path/to/data.xml&gt;;
      ];
-     rml:referenceFormulation [ a ql:XPathReferenceFormulation;
-       ql:namespace [ a ql:Namespace;
-         ql:namespacePrefix "ex";
-         ql:namespaceURL "http://example.org";
+     rml:referenceFormulation [ a rml:XPathReferenceFormulation;
+       rml:namespace [ a rml:Namespace;
+         rml:namespacePrefix "ex";
+         rml:namespaceURL "http://example.org";
        ];
      ];
      rml:iterator "/xpath/ex:namespace/expression";
@@ -137,7 +137,7 @@ through a `SELECT * FROM {table}` query (`rml:tableName` compatibility).
        rml:compression rml:gzip; # GZip compression
        rml:encoding rml:UTF-16; # UTF-16 encoding
      ];
-     rml:referenceFormulation ql:JSONPath;
+     rml:referenceFormulation rml:JSONPath;
      rml:iterator "$.jsonpath.expression";
 .
 </pre>
@@ -207,7 +207,7 @@ The following example show a Source of an CSV file.
         rml:null "NULL";
         rml:null "";
      ];
-     rml:referenceFormulation ql:CSV;
+     rml:referenceFormulation rml:CSV;
 .
 </pre>
 
@@ -222,7 +222,7 @@ the `student` table. The database username and password are provided as well.
 <pre class="ex-source">
 &lt;#RDB&gt; a rml:LogicalSource;
     rml:source [ a rml:Source, d2rq:Database;
-        d2rq:jdbcDSN "jdbc:mysql://localhost/example";
+        d2rq:jdbcDSN "jdbc:mysrml://localhost/example";
         d2rq:jdbcDriver "com.mysql.jdbc.Driver";
         d2rq:username "user";
         d2rq:password "password";
@@ -242,7 +242,7 @@ XML file with no compression.
     rml:source [ a rml:Source, dcat:Distribution;
         dcat:accessURL &lt;file:///path/to/data.xml&gt;;
     ];
-    rml:referenceFormulation ql:XPath;
+    rml:referenceFormulation rml:XPath;
     rml:iterator "/xpath/iterator/expression";
 .
 </pre>
@@ -255,7 +255,7 @@ The following example is GZip compressed JSON file as Source:
         dcat:accessURL &lt;file:///path/to/data.json.gz&gt;;
         rml:compression rml:gzip;
      ];
-     rml:referenceFormulation ql:JSONPath;
+     rml:referenceFormulation rml:JSONPath;
      rml:iterator "$.jsonpath.expression";
 .
 </pre>
@@ -301,7 +301,7 @@ set to 'Processor':
             ];
         ];
     ];
-    rml:referenceFormulation ql:JSONPath;
+    rml:referenceFormulation rml:JSONPath;
     rml:iterator "$.jsonpath";
 .
 </pre>
@@ -320,7 +320,7 @@ HTTP Server Sent Events stream in XML format without compression:
             ];
         ];
     ];
-    rml:referenceFormulation ql:XPath;
+    rml:referenceFormulation rml:XPath;
     rml:iterator "/my/xpath";
 .
 </pre>
@@ -342,7 +342,7 @@ MQTT stream in JSON format without compression:
             ];
         ];
     ];
-    rml:referenceFormulation ql:JSONPath;
+    rml:referenceFormulation rml:JSONPath;
     rml:iterator "$.jsonpath";
 .
 </pre>
@@ -361,7 +361,7 @@ TCP stream in JSON format without compression:
             ];
         ];
     ];
-    rml:referenceFormulation ql:JSONPath;
+    rml:referenceFormulation rml:JSONPath;
     rml:iterator "$.jsonpath";
 .
 </pre>
@@ -382,7 +382,7 @@ Kafka stream in XML format without compression:
             ];
         ];
     ];
-    rml:referenceFormulation ql:XPath;
+    rml:referenceFormulation rml:XPath;
     rml:iterator "/my/xpath";
 .
 </pre>