useBlankNode as option

Author: HeersGBV

app.py

@@ -21,11 +21,12 @@ def dlftLidoFile():
     return Path('./defaultLido.xml')
 
 
-def convert_lido_str(lido_str, x3ml_str, format='turtle'):
+def convert_lido_str(lido_str, x3ml_str,**kw):
     '''Converts LIDO XML string to RDF using the provided X3ML mapping string.
     Returns the RDF string in the specified format.'''
     if lido_str:
-        converter = LRC.LidoRDFConverter.from_str(x3ml_str)
+        format = kw.get('format','turtle')
+        converter = LRC.LidoRDFConverter.from_str(x3ml_str, **kw)
         graph = converter.parse_string(lido_str)
         return graph.serialize(format=format)
     return ''
@@ -95,8 +96,9 @@ def run_mappings():
     if js := parm.get('x3ml'):
         model = X3ml.fromJSON(js)
         format = parm.get('format','turtle')
+        useBlankNode = parm.get('useBlankNode',True)
         response_object = {'status': 'success', 'message': 'Mappings applied to Lido!', 'format':format}
-        response_object['text'] = convert_lido_str(lido_data, model.to_str(),format=format)
+        response_object['text'] = convert_lido_str(lido_data, model.to_str(),format=format, useBlankNode = useBlankNode)
         return jsonify(response_object)
     return jsonify({'status': 'failed', 'message': 'No Lido data provided!'})
 
@@ -120,7 +122,7 @@ def convert():
         lido_data = request.get_data()
         format = 'turtle'
     try:
-        rdf_str = convert_lido_str(lido_data, mapping_data, format=format)
+        rdf_str = convert_lido_str(lido_data, mapping_data, format=format, useBlankNode = False)
         response = make_response(rdf_str, 200)
         response.mime_type = f"text/{format}"
     except Exception as e:

libs/LidoRDFConverter.py

@@ -119,8 +119,12 @@ def make_id_node(id_str: str, **kw) -> RF.URIRef:
     '''Creates an RDF node (BNode or URIRef) from id string and a mode'''
     '''Gets the ID mode and graph from kw arguments'''
     mode = kw.get('mode', x3ml.IDMode.LIDO_ID)
+    useBlankNode = kw.get('useBlankNode',False)
     if mode == x3ml.IDMode.PATH:
-        return RF.BNode(hash(id_str))
+        if useBlankNode:
+            return RF.BNode(hash(id_str))
+        else:
+            return NAMESPACE_MAP['n4o'][f"{hash(id_str)}"]
     uri = f'n4o:{hash(id_str)}'
     try:
         nsm = kw.get('graph').namespace_manager
@@ -194,14 +198,15 @@ def get_ns(elem):
 class LidoRDFConverter():
     '''Converts LIDO XML files to RDF graphs using X3ML mappings'''
 
-    def __init__(self, file_path):
+    def __init__(self, file_path, useBlankNode = False):
         self.mappings = x3ml.Mappings.from_file(file_path)
+        self.useBlankNode = useBlankNode
 
     Graph = RF.Graph
 
     @classmethod
-    def from_str(cls, mapping_str):
-        obj = cls('')
+    def from_str(cls, mapping_str,**kw):
+        obj = cls('',kw.get('useBlankNode',False))
         obj.mappings = x3ml.Mappings.from_str(mapping_str)
         return obj
 
@@ -278,4 +283,4 @@ def _process_lido_element(self, elem, graph) -> None:
         for data in [m.evaluate(elem) for m in self.mappings]:
             for i, mapping_data in enumerate(data):
                 if mapping_data.valid:
-                    add_triples(graph, mapping_data, recID, index=i)
+                    add_triples(graph, mapping_data, recID, index=i, useBlankNode = self.useBlankNode)

templates/index.html

@@ -125,11 +125,11 @@ <h5 class="modal-title" id="uploadLidoModalLabel">Upload LIDO/XML file</h5>
     <div class="row">
       <div class="col-5">
         <div> Mappings (x3ml):<br>
-          <button type="button" class="btn btn-primary btn-sm " @click="addMapping" title="Add a new mapping rule to the list.">Add mapping</button>
-          <button type="button" class="btn btn-primary btn-sm" @click="clearMappings" title="Remove all mapping rules.">Clear all</button>
-          <button type="button" class="btn btn-primary btn-sm" @click="resetMappings" title="Load the default mappings.">Load default</button>
-          <button type="button" class="btn btn-primary btn-sm" data-bs-toggle="modal" data-bs-target="#uploadX3mlModal" title="Upload a customer mapping.">Upload</button>
-          <button type="button" class="btn btn-primary btn-sm" @click="downloadMappings" title="Download the current mapping.">Download</button>
+          <button type="button" class="btn btn-primary btn-sm " @click="addMapping" title="Add new mapping.">Add mapping</button>
+          <button type="button" class="btn btn-primary btn-sm" @click="clearMappings" title="Remove all mappings.">Clear all</button>
+          <button type="button" class="btn btn-primary btn-sm" @click="resetMappings" title="Load default mappings.">Load default</button>
+          <button type="button" class="btn btn-primary btn-sm" data-bs-toggle="modal" data-bs-target="#uploadX3mlModal" title="Upload mappings.">Upload</button>
+          <button type="button" class="btn btn-primary btn-sm" @click="downloadMappings" title="Download mappings.">Download</button>
         </div>
         <div id="acc" class="accordion accordion-flush" style="overflow-y: scroll; height:1000px; width: 100%;">
           <div class="accordion-item" v-for="(mapping, i) in x3ml.mappings" :key="i">
@@ -201,6 +201,11 @@ <h2 class="accordion-header" :id="'L' + j">
                 </option>
               </select>
             </div>
+            <div class="form-check">
+              <input class="form-check-input" type="checkbox" v-model="useBlankNode" id="flexCheckDefault">
+              <label class="form-check-label" for="flexCheckDefault">Use BNodes</label>
+            </div>
+
           </div>
           <p>
           <div id="rdfEditor"></div>
@@ -274,7 +279,8 @@ <h2 class="accordion-header" :id="'L' + j">
           mode: '',
           modeFormatKeys: new Map(),
           tmp: ["abc", "abcd", "xxxx"],
-          formatKey: 'n3'
+          formatKey: 'n3',
+          useBlankNode: false
         }
       },
       delimiters: ["${", "}$"], // for global
@@ -284,7 +290,7 @@ <h2 class="accordion-header" :id="'L' + j">
           let attrs = event.target.attributes;
           let i = parseInt(attrs.id.value);
           let j = parseInt(attrs.pid.value);
-          let link =  this.x3ml.mappings[j].links[i];
+          let link = this.x3ml.mappings[j].links[i];
           link.range.sourceNode.text = event.target.value
         },
         saveX3mlUrl(event) {
@@ -500,7 +506,7 @@ <h2 class="accordion-header" :id="'L' + j">
       // Triggers the transformation lido + x3ml => ttl
       // and loads the result into the RDF editor.
       format = app.formatKey
-      data = { type: '/run_mappings', data: lidoEditor.getValue(), x3ml: app.x3ml, format: format }
+      data = { type: '/run_mappings', data: lidoEditor.getValue(), x3ml: app.x3ml, format: format, useBlankNode: app.useBlankNode }
       post('run_mappings', data)
         .then(res => res.json())
         .then(s => {