@igea/oac_backend 1.0.49 → 1.0.50

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@igea/oac_backend",
-  "version": "1.0.49",
+  "version": "1.0.50",
   "description": "Backend service for the OAC project",
   "main": "src/index.js",
   "bin": {

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/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/') {