@netwerk-digitaal-erfgoed/network-of-terms-catalog 5.5.0 → 5.5.4

package/catalog/queries/lookup/wo2thesaurus.rq

@@ -20,6 +20,10 @@ WHERE {
 
     ?uri a skos:Concept .
 
+    # Exclude terms from the 'Technische Lijsten', a concept scheme with terms that should only be used by NOB
+    FILTER NOT EXISTS {
+        ?uri skos:inScheme <https://data.niod.nl/WO2_Thesaurus/11183>
+    }
     OPTIONAL {
         ?uri skos:prefLabel ?prefLabel .
         FILTER(LANG(?prefLabel) = "nl")

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

@@ -15,12 +15,12 @@ WHERE {
     VALUES ?predicate { skos:prefLabel skos:altLabel }
 
     {
-        FILTER(?booleanQuery)
+        FILTER(?virtuosoQuery)
         ?uri ?predicate ?label .
-        ?label <bif:contains> ?booleanQuery .
+        ?label <bif:contains> ?virtuosoQuery .
     } UNION {
         # BC support.
-        BIND(?booleanQuery as ?b)
+        BIND(?virtuosoQuery as ?b)
         FILTER(!BOUND(?b))
         ?uri ?predicate ?label .
         # Replace query "A B" with "A AND B", leaving queries "A AND B" or "A OR B" unchanged.

package/catalog/queries/search/brinkman.rq

@@ -23,12 +23,12 @@ WHERE {
     FILTER(LANG(?label) = "nl")
 
     {
-        FILTER(?booleanQuery)
+        FILTER(?virtuosoQuery)
         ?uri ?predicate ?label .
-        ?label <bif:contains> ?booleanQuery .
+        ?label <bif:contains> ?virtuosoQuery .
     } UNION {
         # BC support.
-        BIND(?booleanQuery as ?b)
+        BIND(?virtuosoQuery as ?b)
         FILTER(!BOUND(?b))
         ?uri ?predicate ?label .
         # Replace query "A B" with "A AND B", leaving queries "A AND B" or "A OR B" unchanged.

package/catalog/queries/search/gtaa.rq

@@ -19,12 +19,12 @@ WHERE {
     FILTER(LANG(?label) = "nl")
 
     {
-        FILTER(?booleanQuery)
+        FILTER(?virtuosoQuery)
         ?uri ?predicate ?label .
-        ?label <bif:contains> ?booleanQuery .
+        ?label <bif:contains> ?virtuosoQuery .
     } UNION {
         # BC support.
-        BIND(?booleanQuery as ?b)
+        BIND(?virtuosoQuery as ?b)
         FILTER(!BOUND(?b))
         ?uri ?predicate ?label .
         # Replace query "A B" with "A AND B", leaving queries "A AND B" or "A OR B" unchanged.

package/catalog/queries/search/muziekschatten-onderwerpen.rq

@@ -11,11 +11,20 @@ CONSTRUCT {
 }
 WHERE {
     ?uri a skos:Concept .
-    ?uri ?predicate ?label .
-    VALUES ?predicate { schema:name schema:keywords }
 
-    # A 'FILTER (<bif:contains>, ...)' currently does not work due to https://github.com/comunica/comunica/issues/844
-    ?label <bif:contains> ?query .
+    {
+        FILTER(?virtuosoQuery)
+        ?uri ?predicate ?label .
+        VALUES ?predicate { schema:name schema:keywords }
+        ?label <bif:contains> ?virtuosoQuery .
+    } UNION {
+        # BC support.
+        BIND(?virtuosoQuery as ?b)
+        FILTER(!BOUND(?b))
+        ?uri ?predicate ?label .
+        VALUES ?predicate { schema:name schema:keywords }
+        ?label <bif:contains> ?query .
+    }
 
     OPTIONAL {
         ?uri schema:name ?schema_name .

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

@@ -31,11 +31,19 @@ WHERE {
     # Require the presence of this property for quality purposes
     ?uri som:NDEREC ?nderec .
 
-    ?uri ?predicate ?label .
-    VALUES ?predicate { schema:name schema:alternateName }
-
-    # A 'FILTER (<bif:contains>, ...)' currently does not work due to https://github.com/comunica/comunica/issues/844
-    ?label <bif:contains> ?query .
+    {
+        FILTER(?virtuosoQuery)
+        ?uri ?predicate ?label .
+        VALUES ?predicate { schema:name schema:alternateName }
+        ?label <bif:contains> ?virtuosoQuery .
+    } UNION {
+        # BC support.
+        BIND(?virtuosoQuery as ?b)
+        FILTER(!BOUND(?b))
+        ?uri ?predicate ?label .
+        VALUES ?predicate { schema:name schema:alternateName }
+        ?label <bif:contains> ?query .
+    }
 
     OPTIONAL { ?uri schema:name ?schema_name }
     OPTIONAL { ?uri schema:alternateName ?schema_alternateName }

package/catalog/queries/search/mw-genresstijlen.rq

@@ -15,12 +15,12 @@ WHERE {
     ?uri a muziekweb:Genre .
 
     {
-        FILTER(?booleanQuery)
+        FILTER(?virtuosoQuery)
         ?uri rdfs:label ?rdfs_label .
-        ?rdfs_label <bif:contains> ?booleanQuery .
+        ?rdfs_label <bif:contains> ?virtuosoQuery .
     } UNION {
         # BC support.
-        BIND(?booleanQuery as ?b)
+        BIND(?virtuosoQuery as ?b)
         FILTER(!BOUND(?b))
         ?uri rdfs:label ?rdfs_label .
         # Replace query "A B" with "A AND B", leaving queries "A AND B" or "A OR B" unchanged.

package/catalog/queries/search/mw-personengroepen.rq

@@ -15,12 +15,12 @@ WHERE {
     VALUES ?predicate { skos:prefLabel skos:altLabel }
 
     {
-        FILTER(?booleanQuery)
+        FILTER(?virtuosoQuery)
         ?uri ?predicate ?label .
-        ?label <bif:contains> ?booleanQuery .
+        ?label <bif:contains> ?virtuosoQuery .
     } UNION {
         # BC support.
-        BIND(?booleanQuery as ?b)
+        BIND(?virtuosoQuery as ?b)
         FILTER(!BOUND(?b))
         ?uri ?predicate ?label .
         # Replace query "A B" with "A AND B", leaving queries "A AND B" or "A OR B" unchanged.

package/catalog/queries/search/nmvw.rq

@@ -16,12 +16,12 @@ WHERE {
     VALUES ?predicate { skos:prefLabel skos:altLabel }
 
     {
-        FILTER(?booleanQuery)
+        FILTER(?virtuosoQuery)
         ?uri ?predicate ?label .
-        ?label <bif:contains> ?booleanQuery .
+        ?label <bif:contains> ?virtuosoQuery .
     } UNION {
         # BC support.
-        BIND(?booleanQuery as ?b)
+        BIND(?virtuosoQuery as ?b)
         FILTER(!BOUND(?b))
         ?uri ?predicate ?label .
         # Replace query "A B" with "A AND B", leaving queries "A AND B" or "A OR B" unchanged.

package/catalog/queries/search/nta.rq

@@ -13,12 +13,12 @@ WHERE {
     VALUES ?predicate { rdfs:label schema:name schema:alternateName }
 
     {
-        FILTER(?booleanQuery)
+        FILTER(?virtuosoQuery)
         ?uri ?predicate ?label .
-        ?label <bif:contains> ?booleanQuery .
+        ?label <bif:contains> ?virtuosoQuery .
     } UNION {
         # BC support.
-        BIND(?booleanQuery as ?b)
+        BIND(?virtuosoQuery as ?b)
         FILTER(!BOUND(?b))
         ?uri ?predicate ?label .
         # Replace query "A B" with "A AND B", leaving queries "A AND B" or "A OR B" unchanged.

package/catalog/queries/search/rkdartists.rq

@@ -17,13 +17,15 @@ WHERE {
     VALUES ?name { schema:name schema:alternateName }
 
     {
-        FILTER(?booleanQuery)
+        FILTER(?virtuosoQuery)
         ?uri ?predicate ?label .
-        ?label <bif:contains> ?booleanQuery .
+        ?label <bif:contains> ?virtuosoQuery .
     } UNION {
         # BC support.
-        BIND(?booleanQuery as ?b)
-        FILTER(!BOUND(?b))
+        # The RKD Virtuoso endpoint needs isLiteral() rather than !BOUND() because the latter still matches, throwing an
+        # error for queries with diacritics.
+        FILTER(!isLiteral(?virtuosoQuery))
+
         ?uri ?predicate ?label .
         # Replace query "A B" with "A AND B", leaving queries "A AND B" or "A OR B" unchanged.
         FILTER (<bif:contains> (?label,

package/catalog/queries/search/wo2thesaurus.rq

@@ -13,6 +13,10 @@ CONSTRUCT {
 }
 WHERE {
     ?uri ?predicate ?label .
+    # Exclude terms from the 'Technische Lijsten', a concept scheme with terms that should only be used by NOB
+    FILTER NOT EXISTS {
+        ?uri skos:inScheme <https://data.niod.nl/WO2_Thesaurus/11183>
+    }
     VALUES ?predicate { skos:prefLabel skos:altLabel }
     FILTER(LANG(?label) = "nl")
     FILTER(CONTAINS(LCASE(?label), LCASE(?query)))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netwerk-digitaal-erfgoed/network-of-terms-catalog",
-  "version": "5.5.0",
+  "version": "5.5.4",
   "description": "Catalog of Network of Terms datasets",
   "repository": {
     "type": "git",