@netwerk-digitaal-erfgoed/network-of-terms-catalog 6.27.0 → 7.0.0

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

@@ -13,19 +13,7 @@ WHERE {
     ?uri a hg:Street .
     ?uri ?predicate ?label .
     VALUES ?predicate { skos:prefLabel skos:altLabel }
-
-    {
-        FILTER(?virtuosoQuery)
-        ?uri ?predicate ?label .
-        ?label <bif:contains> ?virtuosoQuery .
-    } UNION {
-        # BC support.
-        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.
-        FILTER (<bif:contains> (?label, REPLACE(?query, "(?<!AND)(?<!OR)[[:space:]]+(?!AND)(?!OR)", " AND ", "i")) )
-    }
+    ?label <bif:contains> ?virtuosoQuery .
 
     OPTIONAL { ?uri skos:prefLabel ?prefLabel }
     OPTIONAL { ?uri skos:altLabel ?altLabel }

package/catalog/queries/search/brinkman.rq

@@ -21,19 +21,7 @@ WHERE {
     ?uri ?predicate ?label .
     VALUES ?predicate { skos:prefLabel skos:altLabel }
     FILTER(LANG(?label) = "nl")
-
-    {
-        FILTER(?virtuosoQuery)
-        ?uri ?predicate ?label .
-        ?label <bif:contains> ?virtuosoQuery .
-    } UNION {
-        # BC support.
-        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.
-        FILTER (<bif:contains> (?label, REPLACE(?query, "(?<!AND)(?<!OR)[[:space:]]+(?!AND)(?!OR)", " AND ", "i")))
-    }
+    ?label <bif:contains> ?virtuosoQuery .
 
     OPTIONAL {
         ?uri skos:prefLabel ?prefLabel .

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

@@ -10,22 +10,11 @@ CONSTRUCT {
     ?broader_uri skos:prefLabel ?broader_schema_name .
 }
 WHERE {
-    ?uri a skos:Concept .
+    ?uri a skos:Concept ;
+        ?predicate ?label .
 
-    {
-        FILTER(?virtuosoQuery)
-        ?uri ?predicate ?label .
-        VALUES ?predicate { schema:name schema:keywords }
-        ?label <bif:contains> ?virtuosoQuery .
-    } UNION {
-        # BC support.
-        # This Virtuoso endpoint needs STRLEN() rather than !BOUND() because the latter still matches, throwing an error
-        # for queries with diacritics or multiple words.
-        FILTER(STRLEN(?virtuosoQuery) = 0)
-        ?uri ?predicate ?label .
-        VALUES ?predicate { schema:name schema:keywords }
-        ?label <bif:contains> ?query .
-    }
+    VALUES ?predicate { schema:name schema:keywords }
+    ?label <bif:contains> ?virtuosoQuery .
 
     OPTIONAL {
         ?uri schema:name ?schema_name .

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

@@ -29,22 +29,10 @@ CONSTRUCT {
 WHERE {
     ?uri a schema:Person .
     # Require the presence of this property for quality purposes
-    ?uri som:NDEREC ?nderec .
-
-    {
-        FILTER(?virtuosoQuery)
-        ?uri ?predicate ?label .
-        VALUES ?predicate { schema:name schema:alternateName }
-        ?label <bif:contains> ?virtuosoQuery .
-    } UNION {
-        # BC support.
-        # This Virtuoso endpoint needs STRLEN() rather than !BOUND() because the latter still matches, throwing an error
-        # for queries with diacritics or multiple words.
-        FILTER(STRLEN(?virtuosoQuery) = 0)
-        ?uri ?predicate ?label .
-        VALUES ?predicate { schema:name schema:alternateName }
-        ?label <bif:contains> ?query .
-    }
+    ?uri som:NDEREC ?nderec ;
+        ?predicate ?label .
+    VALUES ?predicate { schema:name schema:alternateName }
+    ?label <bif:contains> ?virtuosoQuery .
 
     OPTIONAL { ?uri schema:name ?schema_name }
     OPTIONAL { ?uri schema:alternateName ?schema_alternateName }

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

@@ -12,20 +12,9 @@ CONSTRUCT {
     ?narrower_uri skos:prefLabel ?narrower_prefLabel .
 }
 WHERE {
-    ?uri a muziekweb:Genre .
-
-    {
-        FILTER(?virtuosoQuery)
-        ?uri rdfs:label ?rdfs_label .
-        ?rdfs_label <bif:contains> ?virtuosoQuery .
-    } UNION {
-        # BC support.
-        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.
-        FILTER (<bif:contains> (?rdfs_label, REPLACE(?query, "(?<!AND)(?<!OR)[[:space:]]+(?!AND)(?!OR)", " AND ", "i")) )
-    }
+    ?uri a muziekweb:Genre ;
+        rdfs:label ?rdfs_label .
+    ?rdfs_label <bif:contains> ?virtuosoQuery .
 
     OPTIONAL {
         ?uri skos:broader ?broader_uri .

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

@@ -10,22 +10,10 @@ CONSTRUCT {
         skos:scopeNote ?schema_description .
 }
 WHERE {
-    ?uri a schema:MusicGroup .
-    ?uri ?predicate ?label .
+    ?uri a schema:MusicGroup ;
+        ?predicate ?label .
     VALUES ?predicate { skos:prefLabel skos:altLabel }
-
-    {
-        FILTER(?virtuosoQuery)
-        ?uri ?predicate ?label .
-        ?label <bif:contains> ?virtuosoQuery .
-    } UNION {
-        # BC support.
-        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.
-        FILTER (<bif:contains> (?label, REPLACE(?query, "(?<!AND)(?<!OR)[[:space:]]+(?!AND)(?!OR)", " AND ", "i")) )
-    }
+    ?label <bif:contains> ?virtuosoQuery .
 
     OPTIONAL { ?uri skos:prefLabel ?prefLabel }
     OPTIONAL { ?uri skos:altLabel ?altLabel }

package/catalog/queries/search/nmvw.rq

@@ -14,19 +14,7 @@ CONSTRUCT {
 WHERE {
     ?uri ?predicate ?label .
     VALUES ?predicate { skos:prefLabel skos:altLabel }
-
-    {
-        FILTER(?virtuosoQuery)
-        ?uri ?predicate ?label .
-        ?label <bif:contains> ?virtuosoQuery .
-    } UNION {
-        # BC support.
-        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.
-        FILTER (<bif:contains> (?label, REPLACE(?query, "(?<!AND)(?<!OR)[[:space:]]+(?!AND)(?!OR)", " AND ", "i")) )
-    }
+    ?label <bif:contains> ?virtuosoQuery .
 
     OPTIONAL {
         ?uri skos:prefLabel ?prefLabel .

package/catalog/queries/search/nta.rq

@@ -8,29 +8,10 @@ CONSTRUCT {
         skos:scopeNote ?schema_description .
 }
 WHERE {
-    ?uri schema:mainEntityOfPage/schema:isPartOf <http://data.bibliotheken.nl/id/dataset/persons> .
-    ?uri ?predicate ?label .
+    ?uri schema:mainEntityOfPage/schema:isPartOf <http://data.bibliotheken.nl/id/dataset/persons> ;
+        ?predicate ?label .
     VALUES ?predicate { rdfs:label schema:name schema:alternateName }
-
-    {
-        FILTER(?virtuosoQuery)
-        ?uri ?predicate ?label .
-        ?label <bif:contains> ?virtuosoQuery .
-    } UNION {
-        # BC support.
-        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.
-        FILTER (<bif:contains> (?label,
-            REPLACE(
-                REPLACE(?query, "[.,]", " "),
-                "(?<!AND)(?<!OR)[[:space:]]+(?!AND)(?!OR)(?!$)(?![[:space:]])",
-                " AND ",
-                "i"
-            )
-        ))
-    }
+    ?label <bif:contains> ?virtuosoQuery .
 
     OPTIONAL { ?uri rdfs:label ?rdfs_label }
     OPTIONAL { ?uri schema:name ?schema_name }

package/catalog/queries/search/rkdartists.rq

@@ -15,27 +15,8 @@ WHERE {
     ?uri ?name ?label .
     VALUES ?name { schema:name schema:alternateName }
 
-    {
-        FILTER(?virtuosoQuery)
-        ?uri ?predicate ?label .
-        ?label <bif:contains> ?virtuosoQuery .
-    } UNION {
-        # BC support.
-        # 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,
-            REPLACE(
-                REPLACE(?query, "[.,]", " "),
-                "(?<!AND)(?<!OR)[[:space:]]+(?!AND)(?!OR)(?!$)(?![[:space:]])",
-                " AND ",
-                "i"
-            )
-        ))
-    }
+    ?uri ?predicate ?label .
+    ?label <bif:contains> ?virtuosoQuery .
 
     OPTIONAL { ?uri schema:name ?schema_name . }
     OPTIONAL { ?uri schema:alternateName ?schema_alternateName . }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netwerk-digitaal-erfgoed/network-of-terms-catalog",
-  "version": "6.27.0",
+  "version": "7.0.0",
   "type": "module",
   "description": "Catalog of Network of Terms datasets",
   "repository": {
@@ -32,7 +32,7 @@
     "@comunica/types": "^2.7.0",
     "@types/n3": "^1.4.3",
     "@types/rdf-ext": "^2.2.2",
-    "gts": "^3.1.1",
+    "gts": "^5.0.0",
     "jsonld-streaming-parser": "^3.2.0",
     "rdf-data-factory": "^1.1.2",
     "rdf-ext": "^2.2.0",
@@ -45,7 +45,7 @@
   "dependencies": {
     "@comunica/bindings-factory": "^2.7.0",
     "@comunica/query-sparql-rdfjs": "^2.8.0",
-    "@netwerk-digitaal-erfgoed/network-of-terms-query": "2.9.2",
+    "@netwerk-digitaal-erfgoed/network-of-terms-query": "3.0.0",
     "globby": "^13.2.2",
     "rdf-parse": "^2.3.2",
     "rdf-store-stream": "^2.0.0"