@igea/oac_backend 1.0.49 → 1.0.51

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@igea/oac_backend",
-  "version": "1.0.49",
+  "version": "1.0.51",
   "description": "Backend service for the OAC project",
   "main": "src/index.js",
   "bin": {
@@ -24,22 +24,27 @@
   "homepage": "https://github.com/chpigea/oac_backend#readme",
   "dependencies": {
     "@igea/oac_jwt_helpers": "1.0.10",
+    "@rdfjs/data-model": "1.1.2",
+    "@rdfjs/types": "1.1.0",
     "axios": "1.10.0",
     "cookie-parser": "1.4.7",
     "crypto": "1.0.1",
     "express": "5.1.0",
     "express-rate-limit": "8.1.0",
-    "fast-xml-parser": "^5.3.3",
+    "fast-xml-parser": "5.3.3",
     "get-port": "7.1.0",
     "knex": "3.1.0",
     "libxmljs2": "0.37.0",
     "multer": "2.0.2",
-    "n3": "1.26.0",
+    "n3": "1.17.2",
     "nodemailer": "7.0.6",
     "pg": "8.16.3",
+    "rdf-data-factory": "2.0.2",
+    "rdf-ext": "1.3.0",
     "rdf-validate-shacl": "0.6.5",
     "strip-bom": "5.0.0",
-    "tmp": "0.2.5"
+    "tmp": "0.2.5",
+    "xmlbuilder2": "4.0.3"
   },
   "devDependencies": {
     "chai": "5.2.1",

package/src/controllers/fuseki.js

@@ -239,10 +239,13 @@ router.post('/search/by-prefix', (req, res) => {
         const bindings = response.data.results.bindings;
         let results = []
         bindings.forEach(result => {
-            results.push({
-                instance: result.instance.value,
-                label: result.label.value,
-            });
+            if(result.node){
+                var label = result.label ? result.label.value : "";
+                results.push({
+                    instance: result.node.value,
+                    label
+                });
+            }
         });
         res.json({ 
             success: true, 
@@ -250,6 +253,7 @@ router.post('/search/by-prefix', (req, res) => {
             message: null
         });
     }).catch(err => {
+        console.log(err)
         res.status(500).json({
             success: false,
             data: null,

package/src/controllers/ontology.js

@@ -228,7 +228,7 @@ router.post('/convert/:from/:to', (req, res) => {
     console.log(`Requesting conversion from ${from} to ${to}`); 
     let conversionFunction = null
     if(from === 'ttl' && to === 'xml'){
-        conversionFunction = Converter.turtle2RdfXml
+        conversionFunction = Converter.turtle2RdfXmlCustom
     }else if(from === 'xml' && to === 'ttl'){
         conversionFunction = Converter.rdfXml2Turtle
     }else if(from === to){

package/src/models/converter.js

@@ -1,7 +1,9 @@
 const fs = require('fs');
-const { Parser } = require('n3');
-const { DataFactory, Store } = require('n3');
+
+const { Parser, DataFactory, Store } = require('n3');
 const { exec } = require('child_process');
+const { create } = require('xmlbuilder2');
+const rdf = require('rdf-ext')
 
 class Converter {
 
@@ -94,6 +96,95 @@ class Converter {
         
     }
 
+    //------------------------------------------------------------------------------------
+    // Helper per estrarre QName/localName
+    
+    static qnameLocal(uriObj) {
+        let uri = (typeof uriObj === 'string') ? uriObj : uriObj.value
+        if (uri.includes('#')) 
+            return uri.split('#')[1];
+        return uri.split('/').pop();
+    }
+
+    // Generatore XML ricorsivo
+    static buildNode(dataset, subject, parent, visited) {
+        if (visited.has(subject.value)) {
+            parent.ele('Reference').att('rdf:resource', subject.value);
+            return;
+        }
+        visited.add(subject.value);
+
+        // Determina tag principale dall'rdf:type
+        const types = [...dataset.match(subject, rdf.namedNode('http://www.w3.org/1999/02/22-rdf-syntax-ns#type'))];
+        const tagUri = types.length ? types[0].object.value : subject.value;
+        const tagName = Converter.qnameLocal(tagUri);
+
+        const elem = parent.ele(tagName).att('rdf:about', subject.value);
+
+        // Itera predicati
+        const preds = new Set(dataset.match(subject).map(q => q.predicate.value));
+        for (let p of Array.from(preds).sort()) {
+            const predName = Converter.qnameLocal(p);
+            console.log("predName: " + predName)
+            const objects = dataset.match(subject, rdf.namedNode(p)).map(q => q.object);
+
+            for (let obj of objects) {
+                const child = elem.ele(predName);
+
+                if (obj.termType === 'Literal') {
+                    const lit = child.ele('rdfs:Literal').att('rdf:about', obj.value);
+                    lit.ele('rdfs:label').txt(obj.value);
+                } else if (obj.termType === 'NamedNode' || obj.termType === 'BlankNode') {
+                    Converter.buildNode(dataset, obj, child, visited);
+                } else {
+                    child.txt(obj.value);
+                }
+            }
+        }
+
+        return elem;
+    }
+
+    static turtle2RdfXmlCustom(turtle, outRdfXmlPath=null) {
+
+        return new Promise((resolve, reject) => {
+            const parser = new Parser();
+            const quads = parser.parse(turtle);
+            
+            const dataset = rdf.dataset();
+            for (const quad of quads) {
+                dataset.add(quad);
+            }
+
+            const root = create({ version: '1.0', encoding: 'UTF-8' })
+                .ele('rdf:RDF', {
+                    'xmlns:rdf': 'http://www.w3.org/1999/02/22-rdf-syntax-ns#',
+                    'xmlns:rdfs': 'http://www.w3.org/2000/01/rdf-schema#'
+                });
+
+            const visited = new Set();
+            const subjects = Array.from(new Set(dataset.map(q => q.subject.value)))
+                .map(uri => rdf.namedNode(uri))
+                .sort((a, b) => a.value.localeCompare(b.value));
+
+            console.log(subjects)
+            for (let s of subjects) {
+                Converter.buildNode(dataset, s, root, visited);
+            }
+
+            const xml = root.end({ prettyPrint: true });
+            
+            if(outRdfXmlPath){
+                fs.writeFileSync(outRdfXmlPath, xml, 'utf8');
+            }
+
+            resolve(xml) 
+        })
+        
+    }
+    
+    //------------------------------------------------------------------------------------
+
     static async turtle2RdfXml(inTurtlePath, outRdfXmlPath) {
         return new Promise((resolve, reject) => {
             const command = `rapper -i turtle -o rdfxml "${inTurtlePath}" > "${outRdfXmlPath}"`; 

package/src/models/fuseki.js

@@ -90,20 +90,22 @@ class Fuseki {
         if(limit < 1) limit = 50;
         return `
             PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
-            SELECT DISTINCT ?instance ?label
+            SELECT ?node ?label
             WHERE {
-                # tutte le istanze con qualsiasi proprietà
-                ?instance ?p ?o .
-                # filtro per IRI che inizia con il prefisso specifico
-                FILTER(STRSTARTS(STR(?instance), "${prefix}"))
-                # filtro per IRI che termina con UUID
-                #FILTER(REGEX(STR(?instance), "[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$"))
-                # label opzionale
-                OPTIONAL { ?instance rdfs:label ?label . }
+                {
+                    ?s ?p ?node .
+                    FILTER (isIRI(?node) && STRSTARTS(STR(?node), "${prefix}"))
+                }
+                UNION
+                {
+                    ?node ?p ?o.
+                    FILTER (isIRI(?node) && STRSTARTS(STR(?node), "${prefix}"))
+                }
+                OPTIONAL { ?node rdfs:label ?label . }
             }
             ORDER BY ?label
             LIMIT ${limit}
-            OFFSET ${offset}`   
+            OFFSET ${offset}`
     }
 
     static getQuerySearchInvestigation(id, prefix='http://indagine/') {

package/src/models/vocabolaries/parser

@@ -96,7 +96,7 @@ class Parser{
                 resolve(queries);
             }
             let checkCompleted = function(index, query, status, message){
-                console.log(`Completed ${index+1}/${files.length}`);
+                //console.log(`Completed ${index+1}/${files.length}`);
                 files[index].status = status;
                 files[index].message = message;
                 if(status) queries[index]=query;

package/src/ontology/schema_v2.shacl.ttl

@@ -12,6 +12,12 @@
 #@prefix skos: <http://www.w3.org/2004/02/skos/core> .
 #@prefix pref: <http://indagine/> .
 
+@prefix core: <http://data.sparna.fr/ontologies/sparnatural-config-core#> .
+@prefix dash: <http://datashapes.org/dash#> .
+@prefix skos: <http://www.w3.org/2004/02/skos/core#> .
+@prefix skosxl: <http://www.w3.org/2008/05/skos-xl#> .
+@prefix volipi: <http://data.sparna.fr/ontologies/volipi#> .
+
 
 ex:E7ActivityShape # INDAGINE
     a sh:NodeShape, rdfs:Class ;
@@ -136,11 +142,13 @@ ex:E41Appellation02Shape # DENOMINAZIONE BENE
 ex:E55Type02Shape # TIPO QUESITO DIAGNOSTICO
     a sh:NodeShape, rdfs:Class ;
     sh:targetClass crm:E55_Type ;
+    volipi:iconName "fa-solid fa-car" ;
     sh:property [
         sh:path ex:P2hastype02 ;
-		sh:class owl:Class ; # vocabolario QUESITO DIAGNOSTICO (8) id="quesito-diagnostico"
+        #dash:searchWidget core:TreeProperty ;
+        sh:class owl:Class ; # vocabolario QUESITO DIAGNOSTICO (8) id="quesito-diagnostico"
 		owl:imports <OAC_EXPOSED_PROTOCOL://OAC_EXPOSED_HOST:OAC_EXPOSED_PORT/backend/fuseki/get-vocabolary-terms/quesito-diagnostico> ;
-		sh:name "Tipo" ;
+        sh:name "Tipo" ;
         sh:maxCount 1 ;
         sh:minCount 1 ; 
     ] ;

package/test/models/converter.test.js

@@ -27,13 +27,23 @@ describe('Converter', () => {
     });
   });
 
-it('should convert a turtle string to sparql UPSERT', (done) => {
+  it('should convert a turtle string to sparql UPSERT', (done) => {
     let inputTurtle = fs.readFileSync(__dirname + '/example-investigation-01.ttl', 'utf8');
     let sparql = converter.turtle2Sparql(inputTurtle)
     expect(sparql).to.be.a('string');
     expect(sparql.length).to.be.greaterThan(0);
-    console.log(sparql);
+    //console.log(sparql);
     done();
   });
 
+  it('should convert a turtle string to Custom RDF/Xml', (done) => {
+    let inputTurtle = fs.readFileSync(__dirname + '/example-investigation-02.ttl', 'utf8');
+    converter.turtle2RdfXmlCustom(inputTurtle).then((sparql) => { 
+      expect(sparql).to.be.a('string');
+      expect(sparql.length).to.be.greaterThan(0);
+      console.log(sparql);
+      done();
+    })
+  });
+
 })

package/test/models/example-investigation-02.ttl

@@ -0,0 +1,32 @@
+@prefix sh: <http://www.w3.org/ns/shacl#>.
+@prefix ex: <http://example.org/shapes/>.
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>.
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>.
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#>.
+@prefix owl: <http://www.w3.org/2002/07/owl#>.
+@prefix crm: <http://www.cidoc-crm.org/cidoc-crm/>.
+@prefix basecpm: <http://ontome.net/ns/cpm/>.
+@prefix base: <http://www.ics.forth.gr/isl/CRMinf/>.
+@prefix cpm: <http://ontome.net/ns/cpm/>.
+@prefix crmsci: <http://www.cidoc-crm.org/extensions/crmsci/>.
+@prefix pref: <http://diagnostica/>.
+@prefix skos: <http://www.w3.org/2004/02/skos/core#>.
+
+pref:3cc24c8c-ce06-40ef-bdce-9da2c4c5394b ex:P48haspreferredidentifier01 <http://indagine/3>;
+    a crm:E42_Identifier.
+pref:1adba9d5-c83b-41a8-b97f-c6e5b168658a a crm:E7_Activity;
+    crm:P48_has_preferred_identifier pref:3cc24c8c-ce06-40ef-bdce-9da2c4c5394b;
+    crm:P17_was_motivated_by pref:f30ead0e-edcc-4f6f-868e-8bc6f9d13813;
+    crm:P14_carried_out_by pref:57701c6c-ece4-472b-bc24-b75c1c254568;
+    <http://purl.org/dc/terms/conformsTo> ex:E7ActivityShape.
+pref:40a75ae6-daa4-4ae1-bd41-2e07175f6f75 a crm:E55_Type;
+    ex:P2hastype02 <http://diagnostica/vocabularies/quesito-diagnostico/tecnologia-di-produzione>.
+pref:f30ead0e-edcc-4f6f-868e-8bc6f9d13813 a base:I12_Adopted_Belief;
+    crm:P2_has_type pref:40a75ae6-daa4-4ae1-bd41-2e07175f6f75.
+pref:95e957ad-55b5-45d3-bf62-6a292959c4f9 a crm:E41_Appellation;
+    ex:ente_richiedente "Università";
+    ex:schedatore "Christian".
+pref:956f0c5a-6fc5-4a79-b399-6c6288fb000f a crm:E55_Type;
+    crm:P1_is_defined_by pref:95e957ad-55b5-45d3-bf62-6a292959c4f9.
+pref:57701c6c-ece4-472b-bc24-b75c1c254568 a crm:E29_Actor;
+    crm:P2_has_type pref:956f0c5a-6fc5-4a79-b399-6c6288fb000f.