@netwerk-digitaal-erfgoed/network-of-terms-catalog 9.18.0 → 9.19.1

package/catalog/queries/search/stcn-drukkers.rq

@@ -12,13 +12,18 @@ CONSTRUCT {
         skos:exactMatch ?exactMatch_uri .
 }
 WHERE {
-    ?uri schema:mainEntityOfPage/schema:isPartOf <http://data.bibliotheken.nl/id/dataset/stcn/printers> ;
-        schema:additionalType <http://www.productontology.org/id/Printer_%28publishing%29> ;   # Select printers.
-        rdfs:label ?rdfs_label .
+    {
+        SELECT ?uri ?rdfs_label WHERE {
+            ?uri schema:mainEntityOfPage/schema:isPartOf <http://data.bibliotheken.nl/id/dataset/stcn/printers> ;
+                schema:additionalType <http://www.productontology.org/id/Printer_%28publishing%29> ;   # Select printers.
+                rdfs:label ?rdfs_label .
 
-    ?uri ?predicate ?label .
-    VALUES ?predicate { rdfs:label schema:name schema:alternateName }
-    ?label <bif:contains> ?virtuosoQuery .
+            ?uri ?predicate ?label .
+            VALUES ?predicate { rdfs:label schema:name schema:alternateName }
+            ?label <bif:contains> ?virtuosoQuery .
+        }
+        #LIMIT#
+    }
     # STCN defines multiple URIs for the same printer.
     # The distinction between these URIs is based on the place where the printer lived and worked.
     # See for example "Plantijn"
@@ -34,4 +39,3 @@ WHERE {
         ?uri schema:sameAs ?exactMatch_uri . # Has no labels.
     }
 }
-LIMIT 1000

package/catalog/queries/search/uitvoeringsmedium.rq

@@ -11,15 +11,21 @@ CONSTRUCT {
     ?broader_uri skos:prefLabel ?broader_prefLabel .
 }
 WHERE {
-    ?uri a skos:Concept ;
-        skos:inScheme som:Uitvoeringsmedium ;
-        skos:prefLabel ?prefLabel .
+    {
+        SELECT ?uri ?prefLabel WHERE {
+            ?uri a skos:Concept ;
+                skos:inScheme som:Uitvoeringsmedium ;
+                skos:prefLabel ?prefLabel .
 
-    FILTER(LANG(?prefLabel) = "nl")
+            FILTER(LANG(?prefLabel) = "nl")
 
-    ?uri ?predicate ?label .
-    VALUES ?predicate { skos:prefLabel skos:altLabel }
-    ?label <bif:contains> ?virtuosoQuery .
+            ?uri ?predicate ?label .
+            VALUES ?predicate { skos:prefLabel skos:altLabel }
+            ?label <bif:contains> ?virtuosoQuery .
+        }
+        GROUP BY ?uri
+        #LIMIT#
+    }
 
     OPTIONAL {
         ?uri skos:scopeNote ?scopeNote
@@ -38,4 +44,3 @@ WHERE {
 
     OPTIONAL { ?uri skos:exactMatch ?exactMatch_uri } # Has no labels.
 }
-LIMIT 1000

package/catalog/queries/search/wikidata-entities-all.rq

@@ -1,7 +1,9 @@
 PREFIX bd: <http://www.bigdata.com/rdf#>
 PREFIX mwapi: <https://www.mediawiki.org/ontology#API/>
+PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
 PREFIX schema: <http://schema.org/>
 PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
+PREFIX vrank: <http://purl.org/voc/vrank#>
 PREFIX wikibase: <http://wikiba.se/ontology#>
 
 CONSTRUCT {
@@ -11,6 +13,7 @@ CONSTRUCT {
     ?item skos:prefLabel ?rdfs_label .
     ?item skos:altLabel ?altLabel .
     ?item skos:scopeNote ?schema_description .
+    ?item vrank:simpleRank ?score .
 }
 WHERE {
     SERVICE wikibase:mwapi {
@@ -18,7 +21,9 @@ WHERE {
         bd:serviceParam wikibase:api "EntitySearch" .
         bd:serviceParam mwapi:language "nl" .
         bd:serviceParam mwapi:search ?query .
+        bd:serviceParam wikibase:limit ?limit .
         ?item wikibase:apiOutputItem mwapi:item .
+        ?ordinal wikibase:apiOrdinal true.
     }
     ?item rdfs:label ?rdfs_label .
     FILTER(LANG(?rdfs_label) = "nl")
@@ -30,5 +35,7 @@ WHERE {
         ?item schema:description ?schema_description
         FILTER(LANG(?schema_description) = "nl")
     }
+    BIND(-?ordinal AS ?score)
 }
-LIMIT 1000
+ORDER BY ASC(?ordinal)
+

package/catalog/queries/search/wikidata-entities-persons.rq

@@ -3,6 +3,7 @@ PREFIX mwapi: <https://www.mediawiki.org/ontology#API/>
 PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
 PREFIX schema: <http://schema.org/>
 PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
+PREFIX vrank: <http://purl.org/voc/vrank#>
 PREFIX wikibase: <http://wikiba.se/ontology#>
 PREFIX wdt: <http://www.wikidata.org/prop/direct/>
 PREFIX wd: <http://www.wikidata.org/entity/>
@@ -14,23 +15,35 @@ CONSTRUCT {
     ?item skos:prefLabel ?prefLabel .
     ?item skos:altLabel ?altLabel .
     ?item skos:scopeNote ?description .
+    ?item vrank:simpleRank ?score .
 }
 WHERE {
-    SERVICE wikibase:mwapi {
-        bd:serviceParam wikibase:endpoint "www.wikidata.org" .
-        # Instead of using the "EntitySearch" API we use a more generic text search option
-        # To avoid noise we will filter the resultset on the occurence of the search string
-        # in either prefLabel or altLabel
-        bd:serviceParam wikibase:api "Search" .
-        bd:serviceParam mwapi:language "nl" .
-        bd:serviceParam mwapi:srsearch ?query .
-        ?item wikibase:apiOutputItem mwapi:title .
+    {
+        SELECT DISTINCT ?item ?score WHERE {
+            SERVICE wikibase:mwapi {
+                bd:serviceParam wikibase:endpoint "www.wikidata.org" .
+                # Instead of using the "EntitySearch" API we use a more generic text search option
+                # To avoid noise we will filter the resultset on the occurence of the search string
+                # in either prefLabel or altLabel
+                bd:serviceParam wikibase:api "Search" .
+                bd:serviceParam mwapi:language "nl" .
+                bd:serviceParam mwapi:srsearch ?query .
+                ?item wikibase:apiOutputItem mwapi:title .
+                ?ordinal wikibase:apiOrdinal true.
+            }
+
+            BIND(-?ordinal AS ?score)
+            # Only select instances of type "human"
+            ?item wdt:P31 wd:Q5 .
+        }
+        ORDER BY ASC(?ordinal)
+        #LIMIT#
     }
-    # Only select instances of type "human"
-    ?item wdt:P31 wd:Q5 .
 
-    ?item rdfs:label ?prefLabel .
-    FILTER(LANG(?prefLabel) = "nl")
+    OPTIONAL {
+        ?item rdfs:label ?prefLabel .
+        FILTER(LANG(?prefLabel) = "nl")
+    }
     OPTIONAL {
         ?item skos:altLabel ?altLabel .
         FILTER(LANG(?altLabel) = "nl"||LANG(?altLabel) = "en")
@@ -39,7 +52,4 @@ WHERE {
         ?item schema:description ?description
         FILTER(LANG(?description) = "nl")
     }
-    # limit the result set to matches in the prefLabels or altLabels
-    FILTER(CONTAINS(LCASE(?prefLabel),LCASE(?query))||CONTAINS(LCASE(?altLabel),LCASE(?query)))
 }
-LIMIT 1000

package/catalog/queries/search/wikidata-entities-places.rq

@@ -3,6 +3,7 @@ PREFIX mwapi: <https://www.mediawiki.org/ontology#API/>
 PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
 PREFIX schema: <http://schema.org/>
 PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
+PREFIX vrank: <http://purl.org/voc/vrank#>
 PREFIX wikibase: <http://wikiba.se/ontology#>
 PREFIX wdt: <http://www.wikidata.org/prop/direct/>
 PREFIX wd: <http://www.wikidata.org/entity/>
@@ -14,52 +15,65 @@ CONSTRUCT {
     ?item skos:prefLabel ?prefLabel .
     ?item skos:altLabel ?altLabel .
     ?item skos:scopeNote ?schema_description .
+    ?item vrank:simpleRank ?score .
 }
 WHERE {
-    SERVICE wikibase:mwapi {
-        bd:serviceParam wikibase:endpoint "www.wikidata.org" .
-        # The search seems to be done with a "starts with" function,
-        # where by default the English pref and alt labels are searched.
-        # Setting the required language to something else than "en"
-        # results in an additional search in the pref and alt labels for this language.
-        bd:serviceParam wikibase:api "EntitySearch" .
-        bd:serviceParam mwapi:language "nl" .
-        bd:serviceParam mwapi:search ?query .
-        ?item wikibase:apiOutputItem mwapi:item .
-    }
-    # We are looking for places; because there are many types possible (cities, villages, etc) we filter
-    # on instances (P31) or subclasses (P279) of "human settlement" (Q486972)
-    ?item wdt:P31/wdt:P279* wd:Q486972 .
-
     {
-        # Select places in the Netherlands (Q55)
-        ?item wdt:P17 wd:Q55 .
+        SELECT DISTINCT ?item ?score WHERE {
+            SERVICE wikibase:mwapi {
+                bd:serviceParam wikibase:endpoint "www.wikidata.org" .
+                # The search seems to be done with a "starts with" function,
+                # where by default the English pref and alt labels are searched.
+                # Setting the required language to something else than "en"
+                # results in an additional search in the pref and alt labels for this language.
+                bd:serviceParam wikibase:api "EntitySearch" .
+                bd:serviceParam mwapi:language "nl" .
+                bd:serviceParam mwapi:search ?query .
+                ?item wikibase:apiOutputItem mwapi:item .
+                ?ordinal wikibase:apiOrdinal true.
+            }
 
-        # Filter out Dutch municipalities
-        # deactivated because some places are former municipalities
-        # and would be excluded by this filter
-        #FILTER NOT EXISTS { ?item wdt:P31 wd:Q2039348 }
-    }
-    UNION {
-        # Select places in Belgium
-        ?item wdt:P17 wd:Q31 .
+            BIND(-?ordinal AS ?score)
 
-        # Filter out Belgian municipalities
-        # deactivated because some places are former municipalities
-        # and would be excluded by this filter
-        #FILTER NOT EXISTS { ?item wdt:P31 wd:Q493522}
-    }
+            # We are looking for places; because there are many types possible (cities, villages, etc) we filter
+            # on instances (P31) or subclasses (P279) of "human settlement" (Q486972)
+            ?item wdt:P31/wdt:P279* wd:Q486972 .
+
+            {
+                {
+                    # Select places in the Netherlands (Q55)
+                    ?item wdt:P17 wd:Q55 .
 
-    # Filter out agglomerations
-    FILTER NOT EXISTS { ?item wdt:P31 wd:Q159313 }
+                    # Filter out Dutch municipalities
+                    # deactivated because some places are former municipalities
+                    # and would be excluded by this filter
+                    #FILTER NOT EXISTS { ?item wdt:P31 wd:Q2039348 }
+                }
+                UNION {
+                    # Select places in Belgium
+                    ?item wdt:P17 wd:Q31 .
 
-    # Filter out neighborhoods
-    FILTER NOT EXISTS { ?item wdt:P31 wd:Q123705 }
+                    # Filter out Belgian municipalities
+                    # deactivated because some places are former municipalities
+                    # and would be excluded by this filter
+                    #FILTER NOT EXISTS { ?item wdt:P31 wd:Q493522}
+                }
+            }
 
-    ?item rdfs:label ?prefLabel .
+            # Filter out agglomerations
+            FILTER NOT EXISTS { ?item wdt:P31 wd:Q159313 }
 
-    # select only the Dutch pref/altLabels and description
-    FILTER(LANG(?prefLabel) = "nl")
+            # Filter out neighborhoods
+            FILTER NOT EXISTS { ?item wdt:P31 wd:Q123705 }
+        }
+        ORDER BY ?ordinal
+        #LIMIT#
+    }
+
+    OPTIONAL {
+        ?item rdfs:label ?prefLabel .
+        FILTER(LANG(?prefLabel) = "nl")
+    }
     OPTIONAL {
         ?item skos:altLabel ?altLabel .
         FILTER(LANG(?altLabel) = "nl")
@@ -69,4 +83,3 @@ WHERE {
         FILTER(LANG(?schema_description) = "nl")
     }
 }
-LIMIT 1000

package/catalog/queries/search/wikidata-entities-streets.rq

@@ -2,6 +2,7 @@ PREFIX bd: <http://www.bigdata.com/rdf#>
 PREFIX mwapi: <https://www.mediawiki.org/ontology#API/>
 PREFIX schema: <http://schema.org/>
 PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
+PREFIX vrank: <http://purl.org/voc/vrank#>
 PREFIX wikibase: <http://wikiba.se/ontology#>
 PREFIX wdt: <http://www.wikidata.org/prop/direct/>
 PREFIX wd: <http://www.wikidata.org/entity/>
@@ -11,31 +12,45 @@ CONSTRUCT {
     ?item a skos:Concept ;
         skos:prefLabel ?streetName ;
         skos:altLabel ?altLabel ;
-        skos:scopeNote ?description .
+        skos:scopeNote ?description ;
+        vrank:simpleRank ?score .
 }
 WHERE {
-    SERVICE wikibase:mwapi {
-        bd:serviceParam wikibase:endpoint "www.wikidata.org" .
-        bd:serviceParam wikibase:api "Search" .
-        bd:serviceParam mwapi:language "nl" .
-        bd:serviceParam mwapi:srsearch ?query .
-        ?item wikibase:apiOutputItem mwapi:title .
-    }
-    # Use UNION instead of VALUES because the latter doesn't properly restrict results.
     {
-        # Streets.
-        ?item wdt:P31 wd:Q79007
-    }
-    UNION {
-        # Squares.
-        ?item wdt:P31 wd:Q174782
-    }
-    UNION {
-        # Main squares, e.g. http://www.wikidata.org/entity/Q1083850.
-        ?item wdt:P31 wd:Q26987258
+        SELECT DISTINCT ?item ?score WHERE {
+            SERVICE wikibase:mwapi {
+                bd:serviceParam wikibase:endpoint "www.wikidata.org" .
+                # Instead of using the "EntitySearch" API we use a more generic text search option
+                # To avoid noise we will filter the resultset on the occurence of the search string
+                # in either prefLabel or altLabel
+                bd:serviceParam wikibase:api "Search" .
+                bd:serviceParam mwapi:language "nl" .
+
+                bd:serviceParam mwapi:srsearch ?query .
+                ?item wikibase:apiOutputItem mwapi:title .
+                ?ordinal wikibase:apiOrdinal true.
+            }
+
+            BIND(-?ordinal AS ?score)
+
+            # Use UNION instead of VALUES because the latter doesn't properly restrict results.
+            {
+                # Streets.
+                ?item wdt:P31 wd:Q79007
+            }
+            UNION {
+                # Squares.
+                ?item wdt:P31 wd:Q174782
+            }
+            UNION {
+                # Main squares, e.g. http://www.wikidata.org/entity/Q1083850.
+                ?item wdt:P31 wd:Q26987258
+            }
+            ?item wdt:P17 wd:Q55 .
+        }
+        ORDER BY ASC(?ordinal)
+        #LIMIT#
     }
-    ?item wdt:P17 wd:Q55 .
-    ?item wdt:P131 ?administration .
     OPTIONAL {
         ?item wdt:P276 ?location .
         ?location rdfs:label ?locationName .
@@ -49,10 +64,14 @@ WHERE {
         ?item skos:altLabel ?altLabel
         FILTER(LANG(?altLabel) = "nl")
     }
-    ?item rdfs:label ?streetName .
-    ?administration rdfs:label ?administrationName .
-    FILTER LANGMATCHES(LANG(?streetName),"nl")
-    FILTER LANGMATCHES(LANG(?administrationName),"nl")
+    OPTIONAL {
+        ?item rdfs:label ?streetName .
+        FILTER LANGMATCHES(LANG(?streetName), "nl")
+    }
+    OPTIONAL {
+        ?item wdt:P131/rdfs:label ?administrationName .
+        FILTER LANGMATCHES(LANG(?administrationName), "nl")
+    }
 
     # Some streets come with altLabel ‘Street name (Place name)’. For those that don’t, construct the altLabel manually.
     BIND(
@@ -66,4 +85,3 @@ WHERE {
         ) as ?altLabel
     )
 }
-LIMIT 1000

package/catalog/queries/search/wo2thesaurus.rq

@@ -13,14 +13,19 @@ CONSTRUCT {
     ?narrower_uri skos:prefLabel ?narrower_prefLabel .
 }
 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)))
+    {
+        SELECT ?uri 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)))
+        }
+        #LIMIT#
+    }
     OPTIONAL {
         ?uri skos:prefLabel ?prefLabel .
         FILTER(LANG(?prefLabel) = "nl" )
@@ -51,4 +56,3 @@ WHERE {
         ?uri skos:exactMatch ?exactMatch_uri . # Has no labels.
     }
 }
-LIMIT 1000

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netwerk-digitaal-erfgoed/network-of-terms-catalog",
-  "version": "9.18.0",
+  "version": "9.19.1",
   "type": "module",
   "description": "Catalog of Network of Terms datasets",
   "repository": {
@@ -33,7 +33,7 @@
     "@types/rdf-ext": "^2.5.0",
     "gts": "^5.3.1",
     "jsonld-streaming-parser": "^4.0.1",
-    "rdf-data-factory": "^1.1.2",
+    "rdf-data-factory": "^2.0.2",
     "rdf-ext": "^2.5.2",
     "rdf-validate-shacl": "^0.5.6"
   },
@@ -45,7 +45,7 @@
     "@comunica/query-sparql": "^4.0.2",
     "@comunica/query-sparql-rdfjs": "^4.0.2",
     "@comunica/utils-bindings-factory": "^4.0.2",
-    "@netwerk-digitaal-erfgoed/network-of-terms-query": "5.4.0",
+    "@netwerk-digitaal-erfgoed/network-of-terms-query": "5.5.0",
     "globby": "^14.0.2",
     "memoize": "^10.0.0",
     "rdf-parse": "^3.0.0",