fix #23

RMLio · Sep 26, 2019 · 2fd43b2 · 2fd43b2
1 parent f56acd8
commit 2fd43b2
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 2 deletions.
diff --git a/lib/abstract-generator.js b/lib/abstract-generator.js
@@ -587,13 +587,13 @@ class AbstractGenerator {
       return str;
     }
 
-    str = str.replace('\\:', '@@@@____@@@@');
+    str = str.replace(/\\:/g, '@@@@____@@@@');
 
 
     const splits = str.split(':');
 
     if (splits.length === 1) {
-      return str.replace('@@@@____@@@@', ':');
+      return str.replace(/@@@@____@@@@/g, ':');
     }
 
     if (splits[1].charAt(0) === ' ') {

diff --git a/lib/rml-generator.test.js b/lib/rml-generator.test.js
@@ -120,6 +120,10 @@ describe('YARRRML to RML', function () {
   it('condition on single object', function (done) {
     work('condition-on-single-object/mapping.yarrrml', 'condition-on-single-object/mapping.rml.ttl', done);
   });
+
+  it('escape character', function (done) {
+    work('escape-character/mapping.yarrrml', 'escape-character/mapping.rml.ttl', done);
+  });
 });
 
 function work(path1, path2, cb) {

diff --git a/test/escape-character/mapping.rml.ttl b/test/escape-character/mapping.rml.ttl
@@ -0,0 +1,28 @@
+@prefix rr: <http://www.w3.org/ns/r2rml#>.
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>.
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>.
+@prefix fnml: <http://semweb.mmlab.be/ns/fnml#>.
+@prefix fno: <http://w3id.org/function/ontology#>.
+@prefix rml: <http://semweb.mmlab.be/ns/rml#>.
+@prefix ql: <http://semweb.mmlab.be/ns/ql#>.
+@prefix : <http://mapping.example.com/>.
+
+:map_person_0 rml:logicalSource :source_0.
+:source_0 a rml:LogicalSource;
+    rml:source "person.csv";
+    rml:referenceFormulation ql:CSV.
+:map_person_0 a rr:TriplesMap;
+    rdfs:label "person".
+:s_0 a rr:SubjectMap.
+:map_person_0 rr:subjectMap :s_0.
+:s_0 rr:template "{id}::number".
+:pom_0 a rr:PredicateObjectMap.
+:map_person_0 rr:predicateObjectMap :pom_0.
+:pm_0 a rr:PredicateMap.
+:pom_0 rr:predicateMap :pm_0.
+:pm_0 rr:constant rdf:type.
+:pom_0 rr:objectMap :om_0.
+:om_0 a rr:ObjectMap;
+    rr:constant "http://schema.org/Person";
+    rr:termType rr:IRI.
+
diff --git a/test/escape-character/mapping.yarrrml b/test/escape-character/mapping.yarrrml
@@ -0,0 +1,7 @@
+mappings:
+  person:
+    sources:
+     - ["person.csv~csv"]
+    s: $(id)\:\:number
+    po:
+      - [a, schema:Person]