@netwerk-digitaal-erfgoed/network-of-terms-catalog 5.4.0 → 5.5.1

package/catalog/queries/lookup/abr-cht.rq

@@ -16,6 +16,9 @@ WHERE {
     # Aardewerk: <https://data.cultureelerfgoed.nl/term/id/abr/71e411bf-8645-4420-98a4-b8746574b002>
     # Aardewerk: <https://data.cultureelerfgoed.nl/term/id/cht/dfbf8107-09f9-49c9-8118-8e79b7613723>
     VALUES ?uri { ?uris }
+
+    ?uri a skos:Concept .
+
     OPTIONAL {
         ?uri skos:prefLabel ?prefLabel .
         FILTER(LANG(?prefLabel) = "nl")

package/catalog/queries/lookup/brinkman-nta.rq

@@ -1,3 +1,4 @@
+PREFIX schema: <http://schema.org/>
 # Do not remove this prefix - KB data uses old version of SKOS
 PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
 
@@ -24,43 +25,50 @@ WHERE {
     # Person in NTA: <http://data.bibliotheken.nl/id/thes/p06854796X>
     VALUES ?uri { ?uris }
 
+    ?uri a ?type .
+    VALUES ?type { skos:Concept schema:Person } .
+
     # For Brinkman
     OPTIONAL {
-        ?uri skos:prefLabel ?prefLabel .
-        FILTER(LANG(?prefLabel) = "nl" )
-    }
-    OPTIONAL {
-        ?uri skos:altLabel ?altLabel .
-        FILTER(LANG(?altLabel) = "nl")
-    }
-    OPTIONAL {
-        ?uri skos:hiddenLabel ?hiddenLabel .
-        FILTER(LANG(?hiddenLabel) = "nl")
-    }
-    OPTIONAL {
-        ?uri skos:scopeNote ?scopeNote .
-        FILTER(LANG(?scopeNote) = "nl")
-    }
-    OPTIONAL {
-        ?uri skos:broader ?broader_uri .
-        ?broader_uri skos:prefLabel ?broader_prefLabel .
-        FILTER(LANG(?broader_prefLabel) = "nl")
-    }
-    OPTIONAL {
-        ?uri skos:narrower ?narrower_uri .
-        ?narrower_uri skos:prefLabel ?narrower_prefLabel .
-        FILTER(LANG(?narrower_prefLabel) = "nl")
-    }
-    OPTIONAL {
-        ?uri skos:related ?related_uri .
-        ?related_uri skos:prefLabel ?related_prefLabel .
-        FILTER(LANG(?related_prefLabel) = "nl")
+        OPTIONAL {
+            ?uri skos:prefLabel ?prefLabel .
+            FILTER(LANG(?prefLabel) = "nl" )
+        }
+        OPTIONAL {
+            ?uri skos:altLabel ?altLabel .
+            FILTER(LANG(?altLabel) = "nl")
+        }
+        OPTIONAL {
+            ?uri skos:hiddenLabel ?hiddenLabel .
+            FILTER(LANG(?hiddenLabel) = "nl")
+        }
+        OPTIONAL {
+            ?uri skos:scopeNote ?scopeNote .
+            FILTER(LANG(?scopeNote) = "nl")
+        }
+        OPTIONAL {
+            ?uri skos:broader ?broader_uri .
+            ?broader_uri skos:prefLabel ?broader_prefLabel .
+            FILTER(LANG(?broader_prefLabel) = "nl")
+        }
+        OPTIONAL {
+            ?uri skos:narrower ?narrower_uri .
+            ?narrower_uri skos:prefLabel ?narrower_prefLabel .
+            FILTER(LANG(?narrower_prefLabel) = "nl")
+        }
+        OPTIONAL {
+            ?uri skos:related ?related_uri .
+            ?related_uri skos:prefLabel ?related_prefLabel .
+            FILTER(LANG(?related_prefLabel) = "nl")
+        }
     }
 
     # For NTA
-    OPTIONAL { ?uri rdfs:label ?rdfs_label }
-    OPTIONAL { ?uri schema:name ?schema_name }
-    OPTIONAL { ?uri schema:alternateName ?schema_alternateName }
-    OPTIONAL { ?uri schema:description ?schema_description }
+    OPTIONAL {
+        OPTIONAL { ?uri rdfs:label ?rdfs_label }
+        OPTIONAL { ?uri schema:name ?schema_name }
+        OPTIONAL { ?uri schema:alternateName ?schema_alternateName }
+        OPTIONAL { ?uri schema:description ?schema_description }
+    }
 }
 LIMIT 1000

package/catalog/queries/lookup/eurovoc.rq

@@ -9,13 +9,16 @@ CONSTRUCT {
         skos:narrower ?narrower_uri ;
         skos:related ?related_uri .
     ?broader_uri skos:prefLabel ?broader_prefLabel .
-    ?narrower_uri skos:prefLabel ?narrower_prefLabel . 
+    ?narrower_uri skos:prefLabel ?narrower_prefLabel .
     ?related_uri skos:prefLabel ?related_prefLabel .
 }
 WHERE {
     #For example:
     # Water: http://eurovoc.europa.eu/597
     VALUES ?uri { ?uris }
+
+    ?uri a skos:Concept .
+
     OPTIONAL {
         ?uri skos:prefLabel ?prefLabel .
         FILTER(LANG(?prefLabel) = "nl")
@@ -40,4 +43,4 @@ WHERE {
         FILTER(LANG(?related_prefLabel) = "nl")
     }
 }
-LIMIT 1000
+LIMIT 1000

package/catalog/queries/lookup/gtaa.rq

@@ -20,6 +20,8 @@ WHERE {
     # Genre: <http://data.beeldengeluid.nl/gtaa/30115>
     VALUES ?uri { ?uris }
 
+    ?uri a skos:Concept .
+
     OPTIONAL {
         ?uri skos:prefLabel ?prefLabel .
         FILTER(LANG(?prefLabel) = "nl" )

package/catalog/queries/lookup/muziekschatten.rq

@@ -20,6 +20,9 @@ WHERE {
     # Person: <https://data.muziekschatten.nl/som/4275e51d7d94b224928da9b7707a170a>
     VALUES ?uri { ?uris }
 
+    ?uri a ?type .
+    VALUES ?type { skos:Concept schema:Person } .
+
     OPTIONAL {
         ?uri schema:name ?schema_name .
         FILTER(LANG(?schema_name) = "nl")

package/catalog/queries/lookup/muziekweb.rq

@@ -22,6 +22,9 @@ WHERE {
     # Music genre: <https://data.muziekweb.nl/Link/T00000000050>
     VALUES ?uri { ?uris }
 
+    ?uri a ?type .
+    VALUES ?type { muziekweb:Genre schema:MusicGroup } .
+
     OPTIONAL { ?uri rdfs:label ?rdfs_label }
     OPTIONAL { ?uri skos:prefLabel ?prefLabel }
     OPTIONAL { ?uri skos:altLabel ?altLabel }

package/catalog/queries/lookup/nmvw.rq

@@ -17,6 +17,8 @@ WHERE {
     # Luxemburg: <https://hdl.handle.net/20.500.11840/termmaster17499>
     VALUES ?uri { ?uris }
 
+    ?uri a skos:Concept .
+
     OPTIONAL {
         ?uri skos:prefLabel ?prefLabel .
     }

package/catalog/queries/lookup/rkdartists.rq

@@ -15,6 +15,9 @@ WHERE {
     # Vincent van Gogh: <https://data.rkd.nl/artists/32439>
     VALUES ?uri { ?uris }
 
+    ?uri a ?type .
+    VALUES ?type { schema:Person schema:Organization } .
+
     OPTIONAL { ?uri schema:name ?schema_name . }
     OPTIONAL { ?uri schema:alternateName ?schema_alternateName . }
     OPTIONAL { ?uri schema:description ?schema_description . }

package/catalog/queries/lookup/wo2thesaurus.rq

@@ -18,6 +18,8 @@ WHERE {
     # Organization: <https://data.niod.nl/WO2_Thesaurus/corporaties/5610>
     VALUES ?uri { ?uris }
 
+    ?uri a skos:Concept .
+
     OPTIONAL {
         ?uri skos:prefLabel ?prefLabel .
         FILTER(LANG(?prefLabel) = "nl")

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

@@ -14,8 +14,18 @@ WHERE {
     ?uri ?predicate ?label .
     VALUES ?predicate { skos:prefLabel skos:altLabel }
 
-    # 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")))
+    {
+        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")) )
+    }
 
     OPTIONAL { ?uri skos:prefLabel ?prefLabel }
     OPTIONAL { ?uri skos:altLabel ?altLabel }

package/catalog/queries/search/brinkman.rq

@@ -22,8 +22,18 @@ WHERE {
     VALUES ?predicate { skos:prefLabel skos:altLabel }
     FILTER(LANG(?label) = "nl")
 
-    # 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")))
+    {
+        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")))
+    }
 
     OPTIONAL {
         ?uri skos:prefLabel ?prefLabel .

package/catalog/queries/search/gtaa.rq

@@ -18,8 +18,19 @@ WHERE {
     VALUES ?predicate { skos:prefLabel skos:altLabel }
     FILTER(LANG(?label) = "nl")
 
-    # 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")))
+    {
+        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")) )
+    }
+
     OPTIONAL {
         ?uri skos:prefLabel ?prefLabel .
         FILTER(LANG(?prefLabel) = "nl" )

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

@@ -13,10 +13,19 @@ CONSTRUCT {
 }
 WHERE {
     ?uri a muziekweb:Genre .
-    ?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")))
+    {
+        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")) )
+    }
 
     OPTIONAL {
         ?uri skos:broader ?broader_uri .

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

@@ -14,8 +14,18 @@ WHERE {
     ?uri ?predicate ?label .
     VALUES ?predicate { skos:prefLabel skos:altLabel }
 
-    # 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")))
+    {
+        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")) )
+    }
 
     OPTIONAL { ?uri skos:prefLabel ?prefLabel }
     OPTIONAL { ?uri skos:altLabel ?altLabel }

package/catalog/queries/search/nmvw.rq

@@ -15,8 +15,18 @@ WHERE {
     ?uri ?predicate ?label .
     VALUES ?predicate { skos:prefLabel skos:altLabel }
 
-    # 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")))
+    {
+        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")) )
+    }
 
     OPTIONAL {
         ?uri skos:prefLabel ?prefLabel .

package/catalog/queries/search/nta.rq

@@ -12,8 +12,25 @@ WHERE {
     ?uri ?predicate ?label .
     VALUES ?predicate { rdfs:label schema:name schema:alternateName }
 
-    # 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")))
+    {
+        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"
+            )
+        ))
+    }
 
     OPTIONAL { ?uri rdfs:label ?rdfs_label }
     OPTIONAL { ?uri schema:name ?schema_name }

package/catalog/queries/search/rkdartists.rq

@@ -7,7 +7,8 @@ CONSTRUCT {
         skos:prefLabel ?schema_name ;
         skos:altLabel ?schema_alternateName ;
         skos:scopeNote ?schema_description ;
-        rdfs:seeAlso ?rdfs_seeAlso .
+    # commented the following lines as a temporary fix
+    #    rdfs:seeAlso ?rdfs_seeAlso .
 }
 WHERE {
     ?uri a ?type .
@@ -15,13 +16,32 @@ WHERE {
     ?uri ?name ?label .
     VALUES ?name { schema:name schema:alternateName }
 
-    # 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")))
+    {
+        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"
+            )
+        ))
+    }
 
     OPTIONAL { ?uri schema:name ?schema_name . }
     OPTIONAL { ?uri schema:alternateName ?schema_alternateName . }
     OPTIONAL { ?uri schema:description ?schema_description . }
-    BIND(STRAFTER(STR(?uri), "https://data.rkd.nl/artists/") AS ?identifier)
-    BIND(IRI(CONCAT("https://rkd.nl/explore/artists/", ?identifier)) AS ?rdfs_seeAlso)
+
+    # commented the following lines as a temporary fix
+    #BIND(STRAFTER(STR(?uri), "https://data.rkd.nl/artists/") AS ?identifier)
+    #BIND(IRI(CONCAT("https://rkd.nl/explore/artists/", ?identifier)) AS ?rdfs_seeAlso)
 }
 LIMIT 1000

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netwerk-digitaal-erfgoed/network-of-terms-catalog",
-  "version": "5.4.0",
+  "version": "5.5.1",
   "description": "Catalog of Network of Terms datasets",
   "repository": {
     "type": "git",
@@ -30,14 +30,14 @@
   "devDependencies": {
     "@types/jest": "^27.0.1",
     "@types/n3": "^1.4.3",
-    "@types/node": "^16.0.0",
+    "@types/node": "^17.0.0",
     "@types/rdf-ext": "^1.3.7",
     "gts": "^3.0.2",
     "jest": "^27.0.3",
     "jsonld-streaming-parser": "^2.1.0",
     "rdf-data-factory": "^1.0.1",
     "rdf-ext": "^1.3.0",
-    "rdf-validate-shacl": "^0.3.1",
+    "rdf-validate-shacl": "^0.4.0",
     "ts-jest": "^27.0.2",
     "typescript": "^4.0.5"
   },