@netwerk-digitaal-erfgoed/network-of-terms-catalog 10.16.1 → 10.17.1

package/catalog/queries/search/abr.rq

@@ -24,7 +24,7 @@ WHERE {
 
             VALUES ?predicate { skos:prefLabel skos:altLabel skos:hiddenLabel }
 
-            FILTER(CONTAINS(LCASE(?label), LCASE(?query)))
+            FILTER(CONTAINS(LCASE(?label), LCASE(?query)) || CONTAINS(LCASE(STR(?uri)), LCASE(?query)))
 
         }
         #LIMIT#

package/catalog/queries/search/canon-van-limburg.rq

@@ -0,0 +1,56 @@
+PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+PREFIX schema: <https://schema.org/>
+PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
+
+CONSTRUCT {
+    ?uri a skos:Concept ;
+        skos:prefLabel ?prefLabel ;
+        skos:altLabel ?altLabel ;
+        skos:scopeNote ?scopeNote ;
+        skos:exactMatch ?exactMatch_uri ;
+        skos:broader ?broader_uri ;
+        skos:narrower ?narrower_uri ;
+        skos:related ?related_uri ;
+        skos:seeAlso ?seeAlso_uri .
+    ?exactMatch_uri skos:prefLabel ?exactMatch_prefLabel .
+    ?broader_uri skos:prefLabel ?broader_prefLabel .
+    ?narrower_uri skos:prefLabel ?narrower_prefLabel .
+    ?related_uri skos:prefLabel ?related_prefLabel .
+    ?seeAlso_uri skos:prefLabel ?seeAlso_prefLabel .
+}
+WHERE {
+    GRAPH <https://canonvanlimburg.limburgcollectie.nl> {
+        {
+            SELECT ?uri ?prefLabel ?altLabel WHERE {
+                ?uri a skos:Concept ;
+                    skos:prefLabel ?prefLabel ;
+                    skos:altLabel ?altLabel .
+
+                FILTER(CONTAINS(LCASE(?prefLabel), LCASE(?query)) || CONTAINS(LCASE(?altLabel), LCASE(?query)))
+            }
+            #LIMIT#
+        }
+        
+        OPTIONAL { ?uri skos:scopeNote ?scopeNote }
+        OPTIONAL { 
+            ?uri skos:exactMatch ?exactMatch_uri .
+            OPTIONAL { ?exactMatch_uri skos:prefLabel ?exactMatch_prefLabel }
+        }
+        OPTIONAL { 
+            ?uri skos:broader ?broader_uri .
+            OPTIONAL { ?broader_uri skos:prefLabel ?broader_prefLabel }
+        }
+        OPTIONAL { 
+            ?uri skos:narrower ?narrower_uri .
+            OPTIONAL { ?narrower_uri skos:prefLabel ?narrower_prefLabel }
+        }
+        OPTIONAL { 
+            ?uri skos:related ?related_uri .
+            OPTIONAL { ?related_uri skos:prefLabel ?related_prefLabel }
+        }
+        OPTIONAL { 
+            ?uri skos:seeAlso ?seeAlso_uri .
+            OPTIONAL { ?seeAlso_uri skos:prefLabel ?seeAlso_prefLabel }
+        }
+    }
+}

package/catalog/queries/search/goudatijdmachine-straten.rq

@@ -2,57 +2,48 @@ PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
 PREFIX gtm: <https://www.goudatijdmachine.nl/def#>
 PREFIX sdo: <https://schema.org/>
 PREFIX hg: <http://rdf.histograph.io/>
-PREFIX luc: <http://www.ontotext.com/connectors/lucene#>
-PREFIX luc-index: <http://www.ontotext.com/connectors/lucene/instance#>
+PREFIX ql: <http://qlever.cs.uni-freiburg.de/builtin-functions/>
 PREFIX omeka: <http://omeka.org/s/vocabs/o#>
 PREFIX owl: <http://www.w3.org/2002/07/owl#>
 PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
-PREFIX vrank: <http://purl.org/voc/vrank#>
-
 CONSTRUCT {
-    ?piduri a skos:Concept ;
-        skos:prefLabel ?prefLabel ;
-        skos:altLabel ?altLabel;
-        skos:scopeNote ?scopeNote ;
-        skos:related ?related_uri ;
-        skos:exactMatch ?exactMatch_uri ;
-        vrank:simpleRank ?score .
-    ?related_uri skos:prefLabel ?related_prefLabel .
-    ?exactMatch_uri skos:prefLabel ?exactMatch_label .
+  ?piduri a skos:Concept ;
+    skos:prefLabel ?prefLabel ;
+    skos:altLabel ?altLabel;
+    skos:scopeNote ?scopeNote ;
+    skos:related ?related_uri ;
+    skos:exactMatch ?exactMatch_uri .
+  ?related_uri skos:prefLabel ?related_prefLabel .
+  ?exactMatch_uri skos:prefLabel ?exactMatch_label .
 } WHERE {
-    ?search a luc-index:straten_index ;
-        luc:query ?query ;
-        luc:limit ?limit ;
-        luc:entities ?uri .
-
-    ?uri owl:sameAs ?piduri
-    FILTER(STRSTARTS(STR(?piduri), "https://n2t.net"))
-
-    ?uri sdo:name ?prefLabel .
-    ?uri luc:score ?score .
-
-    OPTIONAL {
-        ?uri gtm:genoemdNaar ?genoemdNaar .
-    }
-
-    BIND (
-        CONCAT(
-            IF ( EXISTS { ?uri omeka:item_set <https://n2t.net/ark:/60537/bd75pg> }, "Verdwenen straat", "Straat" ),
-            IF ( BOUND(?genoemdNaar), CONCAT(" in Gouda, genoemd naar ", ?genoemdNaar )," in Gouda" )
-        )
+  ?uri sdo:name|sdo:alternateName ?item .
+  ?uri a gtm:Straat .
+  ?text ql:contains-entity ?item .
+  ?text ql:contains-word ?query .
+  ?uri owl:sameAs ?piduri .
+  ?uri sdo:name ?prefLabel .
+  OPTIONAL {
+    ?uri gtm:genoemdNaar ?genoemdNaar .
+  }
+  BIND (
+    CONCAT(
+      IF ( EXISTS {
+          ?uri omeka:item_set <https://n2t.net/ark:/60537/bd75pg> 
+        }, "Verdwenen straat", "Straat" ),
+      IF ( BOUND(?genoemdNaar), CONCAT(" in Gouda, genoemd naar ", ?genoemdNaar )," in Gouda" )
+    )
     AS ?scopeNote )
-
-    OPTIONAL { ?uri sdo:alternateName ?altLabel . }
-
-    OPTIONAL {
-        ?uri hg:absorbedBy|hg:absorbed ?related_uri .
-        ?related_uri a gtm:Straat ;
-            sdo:name ?related_prefLabel .
-        FILTER (STRSTARTS(STR(?related_uri), "https://n2t.net/ark:/60537/") && ?uri != ?related_uri )
-    }
-
-    OPTIONAL {
-        ?uri rdfs:seeAlso ?exactMatch_uri .
-        ?exactMatch_uri omeka:label ?exactMatch_label .
-    }
-}
+  OPTIONAL {
+    ?uri sdo:alternateName ?altLabel .
+  }
+  OPTIONAL {
+    ?uri hg:absorbedBy|hg:absorbed ?related_uri .
+    ?related_uri a gtm:Straat ;
+                 sdo:name ?related_prefLabel .
+    FILTER (?uri != ?related_uri )
+  }
+  OPTIONAL {
+    ?uri rdfs:seeAlso ?exactMatch_uri .
+    ?exactMatch_uri omeka:label ?exactMatch_label .
+  }
+}

package/catalog/queries/search/rtf-personen.rq

@@ -19,7 +19,7 @@ WHERE {
             OPTIONAL { ?uri skos:scopeNote ?scopeNote }
             OPTIONAL { ?uri skos:exactMatch ?exactMatch_uri }
 
-            FILTER(CONTAINS(LCASE(?prefLabel), LCASE(?query)) || CONTAINS(LCASE(?altlabel), LCASE(?query)))
+            FILTER(CONTAINS(LCASE(?prefLabel), LCASE(?query)) || CONTAINS(LCASE(?altLabel), LCASE(?query)))
         }
     }
 }

package/catalog/queries/search/wo2thesaurus.rq

@@ -16,14 +16,19 @@ WHERE {
     {
         SELECT ?uri WHERE {
             ?uri ?predicate ?label .
-            # Exclude terms from the 'Technische Lijsten', a concept scheme with terms that should only be used by NOB
+            # Exclude terms that are *only* in 'Technische Lijsten', but keep terms that are also in other schemes
             FILTER NOT EXISTS {
-                ?uri skos:inScheme <https://data.niod.nl/WO2_Thesaurus/11183>
+              ?uri skos:inScheme <https://data.niod.nl/WO2_Thesaurus/11183> .
+              FILTER NOT EXISTS {
+                ?uri skos:inScheme ?otherScheme .
+                FILTER(?otherScheme != <https://data.niod.nl/WO2_Thesaurus/11183>)
+              }
             }
             VALUES ?predicate { skos:prefLabel skos:altLabel }
             FILTER(LANG(?label) = "nl")
             FILTER(CONTAINS(LCASE(?label), LCASE(?query)))
         }
+
         #LIMIT#
     }
     OPTIONAL {

package/dist/getCatalog.d.ts

@@ -2,10 +2,4 @@ import { Catalog } from '@netwerk-digitaal-erfgoed/network-of-terms-query';
 import type RDF from '@rdfjs/types';
 export declare function getCatalog(path?: string): Promise<Catalog>;
 export declare function fromStore(store: RDF.Store): Promise<Catalog>;
-/**
- * Return a separate RDF.Store for each catalog file because merging them into a single store
- * causes blank nodes to be re-used instead of incremented when adding the next file.
- */
-export declare function fromFiles(directory: string): Promise<RDF.Store>;
-export declare function fromFile(file: string): Promise<RDF.Store>;
 //# sourceMappingURL=getCatalog.d.ts.map

package/dist/getCatalog.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getCatalog.d.ts","sourceRoot":"","sources":["../src/getCatalog.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,OAAO,EAMR,MAAM,kDAAkD,CAAC;AAI1D,OAAO,KAAK,GAAG,MAAM,cAAc,CAAC;AAGpC,wBAAsB,UAAU,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAMhE;AA0FD,wBAAsB,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CA6DlE;AAED;;;GAGG;AACH,wBAAsB,SAAS,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CASrE;AAED,wBAAsB,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAQ/D"}
+{"version":3,"file":"getCatalog.d.ts","sourceRoot":"","sources":["../src/getCatalog.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,OAAO,EAMR,MAAM,kDAAkD,CAAC;AAI1D,OAAO,KAAK,GAAG,MAAM,cAAc,CAAC;AAKpC,wBAAsB,UAAU,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAMhE;AA0FD,wBAAsB,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CA8DlE"}

package/dist/getCatalog.js

@@ -3,12 +3,12 @@ import { rdfParser } from 'rdf-parse';
 import { QueryEngine } from '@comunica/query-sparql-rdfjs';
 import { Transform } from 'stream';
 import { globby } from 'globby';
-import { storeStream } from 'rdf-store-stream';
 import { Catalog, Dataset, Feature, FeatureType, Organization, SparqlDistribution, } from '@netwerk-digitaal-erfgoed/network-of-terms-query';
 import { fileURLToPath } from 'url';
 import { ldkit, rdf, schema } from 'ldkit/namespaces';
 import { createLens } from 'ldkit';
 import { dirname, join } from 'node:path';
+import { RdfStore } from 'rdf-stores';
 export async function getCatalog(path) {
     const directory = (path ?? fileURLToPath(new URL('../catalog', import.meta.url))).replace(/\\/g, '/'); // Windows compatibility.
     const store = await fromFiles(directory);
@@ -103,7 +103,8 @@ const engine = new QueryEngine();
 export async function fromStore(store) {
     const lens = createLens(catalogSchema, {
         sources: [store],
-        engine,
+        // Cast needed: rdf-parse uses Comunica v4 types, incompatible with v5.
+        engine: engine,
         distinctConstruct: true,
     });
     const datasets = await lens.find();
@@ -120,22 +121,27 @@ export async function fromStore(store) {
  * Return a separate RDF.Store for each catalog file because merging them into a single store
  * causes blank nodes to be re-used instead of incremented when adding the next file.
  */
-export async function fromFiles(directory) {
+async function fromFiles(directory) {
     // Read all files except those in the queries/ directory.
     const files = await globby([directory, '!' + directory + '/queries']);
-    return (await Promise.all(files.map(fromFile))).reduce((previous, current) => {
-        previous.import(current.match());
-        return previous;
-    });
+    const store = RdfStore.createDefault();
+    for (const file of files) {
+        const stream = fromFile(file);
+        await new Promise((resolve, reject) => {
+            store.import(stream);
+            stream.on('end', resolve);
+            stream.on('error', reject);
+        });
+    }
+    return store;
 }
-export async function fromFile(file) {
-    const quadStream = rdfParser
+function fromFile(file) {
+    return rdfParser
         .parse(fs.createReadStream(file), {
         path: file,
     })
         .pipe(new InlineFiles(file))
         .pipe(new SubstituteCredentialsFromEnvironmentVariables());
-    return storeStream(quadStream);
 }
 /**
  * An RDF.Quad transform that inlines file://... references in the quad's object value.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netwerk-digitaal-erfgoed/network-of-terms-catalog",
-  "version": "10.16.1",
+  "version": "10.17.1",
   "description": "Catalog of Network of Terms datasets",
   "keywords": [
     "nde"
@@ -34,20 +34,20 @@
     "!**/*.tsbuildinfo"
   ],
   "dependencies": {
-    "@comunica/query-sparql": "^4.3.0",
-    "@comunica/query-sparql-rdfjs": "^4.3.0",
+    "@comunica/query-sparql": "^5.1.2",
+    "@comunica/query-sparql-rdfjs": "^5.1.2",
     "@netwerk-digitaal-erfgoed/network-of-terms-query": "*",
     "@rdfjs/types": "^2.0.1",
     "globby": "^14.0.2",
     "ldkit": "^2.5.1",
-    "memoize": "^10.0.0",
-    "rdf-parse": "^3.0.0",
-    "rdf-store-stream": "^3.0.0",
+    "memoize": "^10.2.0",
+    "rdf-parse": "^5.0.0",
+    "rdf-stores": "^2.1.1",
     "tslib": "^2.3.0"
   },
   "devDependencies": {
-    "@comunica/types": "^4.2.0",
-    "@types/n3": "^1.24.2",
+    "@comunica/types": "^5.1.0",
+    "@types/n3": "^1.26.1",
     "@types/rdf-ext": "^2.5.2",
     "jsonld-streaming-parser": "^5.0.0",
     "rdf-ext": "^2.6.0",