@netwerk-digitaal-erfgoed/network-of-terms-catalog 10.0.1 → 10.1.0

package/catalog/datasets/muziekschatten-klassieke-werken.jsonld

@@ -52,7 +52,7 @@
         },
         {
           "@type": "FindAction",
-          "query": "file://catalog/queries/lookup/muziekschatten.rq"
+          "query": "file://catalog/queries/lookup/muziekschatten-klassiekewerken.rq"
         },
         {
           "@type": "Action",

package/catalog/datasets/muziekschatten-onderwerpen.jsonld

@@ -26,7 +26,7 @@
     }
   ],
   "url": [
-    "https://data.muziekschatten.nl/som/"
+    "https://data.muziekschatten.nl/som/d"
   ],
   "mainEntityOfPage": [
     "https://data.muziekschatten.nl/"
@@ -55,7 +55,7 @@
         },
         {
           "@type": "FindAction",
-          "query": "file://catalog/queries/lookup/muziekschatten.rq"
+          "query": "file://catalog/queries/lookup/muziekschatten-onderwerpen.rq"
         },
         {
           "@type": "Action",

package/catalog/datasets/muziekschatten-personen.jsonld

@@ -52,7 +52,7 @@
         },
         {
           "@type": "FindAction",
-          "query": "file://catalog/queries/lookup/muziekschatten.rq"
+          "query": "file://catalog/queries/lookup/muziekschatten-personen.rq"
         },
         {
           "@type": "Action",

package/catalog/datasets/uitvoeringsmedium.jsonld

@@ -55,7 +55,7 @@
         },
         {
           "@type": "FindAction",
-          "query": "file://catalog/queries/lookup/muziekschatten.rq"
+          "query": "file://catalog/queries/lookup/uitvoeringsmedium.rq"
         },
         {
           "@type": "Action",

package/catalog/publishers.jsonld

@@ -29,10 +29,7 @@
           "@value": "Rijksdienst voor het Cultureel Erfgoed"
         }
       ],
-      "alternateName": {
-        "@language": "nl",
-        "@value": "RCE"
-      }
+      "alternateName": "RCE"
     },
     {
       "@id": "https://www.niod.nl",

package/catalog/queries/lookup/eurovoc.rq

@@ -23,31 +23,31 @@ WHERE {
 
     OPTIONAL {
         ?uri skos:prefLabel ?prefLabel .
-        FILTER(LANG(?prefLabel) = "nl")
+        FILTER(LANG(?prefLabel) = "nl" || LANG(?prefLabel) = "en")
     }
     OPTIONAL {
         ?uri skos:altLabel ?altLabel .
-        FILTER(LANG(?altLabel) = "nl")
+        FILTER(LANG(?altLabel) = "nl" || LANG(?altLabel) = "en")
     }
     OPTIONAL {
         ?uri skos:broader ?broader_uri .
         ?broader_uri skos:prefLabel ?broader_prefLabel .
-        FILTER(LANG(?broader_prefLabel) = "nl")
+        FILTER(LANG(?broader_prefLabel) = "nl" || LANG(?broader_prefLabel) = "en")
     }
     OPTIONAL {
         ?uri skos:narrower ?narrower_uri .
         ?narrower_uri skos:prefLabel ?narrower_prefLabel .
-        FILTER(LANG(?narrower_prefLabel) = "nl")
+        FILTER(LANG(?narrower_prefLabel) = "nl" || LANG(?narrower_prefLabel) = "en")
     }
     OPTIONAL {
         ?uri skos:related ?related_uri .
         ?related_uri skos:prefLabel ?related_prefLabel .
-        FILTER(LANG(?related_prefLabel) = "nl")
+        FILTER(LANG(?related_prefLabel) = "nl" || LANG(?related_prefLabel) = "en")
     }
     OPTIONAL {
         ?uri skos:exactMatch ?exactMatch_uri .
         ?exactMatch_uri skos:exactMatch ?exactMatch_prefLabel .
-        FILTER(LANG(?exactMatch_prefLabel) = "nl")
+        FILTER(LANG(?exactMatch_prefLabel) = "nl" || LANG(?exactMatch_prefLabel) = "en")
     }
 }
 LIMIT 1000

package/catalog/queries/lookup/muziekschatten-klassiekewerken.rq

@@ -0,0 +1,49 @@
+PREFIX owl: <http://www.w3.org/2002/07/owl#>
+PREFIX rdaw: <http://rdaregistry.info/Elements/w/>
+PREFIX schema: <http://schema.org/>
+PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
+PREFIX som: <https://data.muziekschatten.nl/som/>
+
+CONSTRUCT {
+    ?uri a skos:Concept;
+        skos:prefLabel ?prefLabel ;
+        skos:altLabel ?altLabel ;
+        skos:scopeNote ?scopeNote ;
+        skos:broader ?broader_uri ;
+        skos:narrower ?narrower_uri .
+    ?broader_uri skos:prefLabel ?broader_prefLabel .
+    ?narrower_uri skos:prefLabel ?narrower_prefLabel .
+}
+WHERE {
+    VALUES ?uri { ?uris }
+
+    ?uri a <http://rdaregistry.info/Elements/c/C10001>;
+        rdfs:label ?prefLabel .
+
+    OPTIONAL { ?uri rdaw:P10086 ?altLabel . } # Varianttitel
+    OPTIONAL { ?uri rdaw:P10219 ?eerste_datum }
+    OPTIONAL { ?uri rdaw:P10333 ?opusnummer }
+    OPTIONAL { ?uri rdaw:P10335 ?thematisch_nummer }
+    OPTIONAL {
+        ?uri rdaw:P10019 ?broader_uri . # Is part of work
+        ?broader_uri rdfs:label ?broader_prefLabel .
+    }
+    OPTIONAL {
+        ?uri rdaw:P10147 ?narrower_uri . # Has part work
+        ?narrower_uri rdfs:label ?narrower_prefLabel .
+    }
+
+    BIND(
+        STRLANG(
+            CONCAT(
+                ?prefLabel, ",",
+                IF(STRLEN(?altLabel) > 0, CONCAT(" Varianttitel: ", ?altLabel, ","), ""),
+                IF(BOUND(?opusnummer), CONCAT(" Opusnr.: ", ?opusnummer, ","), ""),
+                IF(BOUND(?thematisch_nummer), CONCAT(" Thematisch nr.: ", ?thematisch_nummer, ","), ""),
+                IF(BOUND(?eerste_datum), CONCAT(" Datum: ", ?eerste_datum), "")
+            ),
+            "nl"
+        ) AS ?scopeNote
+    )
+}
+LIMIT 1000

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

@@ -0,0 +1,58 @@
+PREFIX owl: <http://www.w3.org/2002/07/owl#>
+PREFIX rdaw: <http://rdaregistry.info/Elements/w/>
+PREFIX schema: <http://schema.org/>
+PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
+PREFIX som: <https://data.muziekschatten.nl/som/>
+
+CONSTRUCT {
+    ?uri a skos:Concept;
+        skos:prefLabel ?prefLabel;
+        skos:scopeNote ?scopeNote_nl, ?scopeNote_en;
+        skos:broader ?broader_uri ;
+        skos:exactMatch ?exactMatch_uri .
+    ?broader_uri skos:prefLabel ?broader_schema_name .
+}
+WHERE {
+    VALUES ?uri { ?uris }
+
+    ?uri a skos:Concept
+    BIND(<https://data.muziekschatten.nl/#onderwerpen> AS ?datasetUri).
+
+    OPTIONAL {
+        ?uri schema:name ?prefLabel .
+    }
+    OPTIONAL {
+        ?uri skos:broader ?broader_uri .
+        ?broader_uri schema:name ?broader_schema_name .
+    }
+    OPTIONAL {
+        ?uri schema:keywords ?schema_keywords
+    }
+    OPTIONAL {
+        ?uri som:DC ?dc
+    }
+    BIND(
+        STRLANG(
+            COALESCE(
+                IF(BOUND(?schema_keywords) && BOUND(?dc), CONCAT("Trefwoorden: ", ?schema_keywords, " | ", "Dewey: ", ?dc), ?noScopeNote),
+                IF(BOUND(?schema_keywords), CONCAT("Trefwoorden: ", ?schema_keywords), ?noScopeNote),
+                IF(BOUND(?dc), CONCAT("Dewey: ", ?dc), ?noScopeNote)
+            ),
+            "nl"
+        ) AS ?scopeNote_nl
+    )
+
+    BIND(
+        STRLANG(
+            COALESCE(
+                IF(BOUND(?schema_keywords) && BOUND(?dc), CONCAT("Keywords: ", ?schema_keywords, " | ", "Dewey: ", ?dc), ?noScopeNote),
+                IF(BOUND(?schema_keywords), CONCAT("Keywords: ", ?schema_keywords), ?noScopeNote),
+                IF(BOUND(?dc), CONCAT("Dewey: ", ?dc), ?noScopeNote)
+            ),
+            "en"
+        ) AS ?scopeNote_en
+    )
+
+    OPTIONAL { ?uri skos:exactMatch ?exactMatch_uri } # Has no labels.
+}
+LIMIT 1000

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

@@ -0,0 +1,49 @@
+PREFIX owl: <http://www.w3.org/2002/07/owl#>
+PREFIX rdaw: <http://rdaregistry.info/Elements/w/>
+PREFIX schema: <http://schema.org/>
+PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
+PREFIX som: <https://data.muziekschatten.nl/som/>
+
+CONSTRUCT {
+    ?uri a skos:Concept;
+        skos:prefLabel ?prefLabel ;
+        skos:altLabel ?schema_alternateName ;
+        skos:scopeNote ?schema_hasOccupation ;
+        skos:exactMatch ?exactMatch_uri .
+}
+WHERE {
+    VALUES ?uri { ?uris }
+
+    ?uri a schema:Person .
+
+    OPTIONAL { ?uri schema:name ?schema_name }
+    OPTIONAL { ?uri schema:alternateName ?schema_alternateName }
+    OPTIONAL {
+        ?uri schema:hasOccupation ?hasOccupation .
+        BIND(REPLACE(?hasOccupation, ";;;;;;;;;;;;", "") AS ?schema_hasOccupation)
+    }
+
+    OPTIONAL { ?uri schema:familyName ?schema_familyName }
+    OPTIONAL { ?uri schema:givenName ?schema_givenName }
+    BIND(
+        COALESCE(
+            IF(STRLEN(?schema_familyName) > 0 && STRLEN(?schema_givenName) > 0, CONCAT(?schema_familyName, ", ", ?schema_givenName), ?noName),
+            ?schema_familyName,
+            ?schema_givenName,
+            ?schema_name # Fallback
+        ) AS ?name
+    )
+    OPTIONAL { ?uri som:GDAT ?som_birthYear }
+    OPTIONAL { ?uri som:SDAT ?som_deathYear }
+    BIND(
+        COALESCE(
+            IF(BOUND(?som_birthYear) && BOUND(?som_deathYear), CONCAT(?som_birthYear, "-", ?som_deathYear), ?noDate),
+            IF(BOUND(?som_birthYear), CONCAT(?som_birthYear, "-"), ?noDate),
+            IF(BOUND(?som_deathYear), CONCAT("-", ?som_deathYear), ?noDate),
+            ""
+        ) AS ?dates
+    )
+    BIND(CONCAT(?name, IF(?dates != "", CONCAT(" (", ?dates, ")"), "")) AS ?prefLabel)
+    OPTIONAL { ?uri owl:sameAs ?exactMatch_uri } # Has no labels.
+}
+LIMIT 1000

package/catalog/queries/lookup/rkdartists.rq

@@ -6,7 +6,8 @@ CONSTRUCT {
     ?uri a skos:Concept ;
         skos:prefLabel ?prefLabel ;
         skos:altLabel ?altLabel ;
-        skos:scopeNote ?scopeNote ;
+        skos:scopeNote ?scopeNote_nl, ?scopeNote_en ;
+        skos:exactMatch ?exactMatch_uri ;
         rdfs:seeAlso ?seeAlso .
 }
 WHERE {
@@ -17,49 +18,102 @@ WHERE {
     {
         SELECT ?uri
             (GROUP_CONCAT(DISTINCT ?schema_description; separator="; ") as ?descriptions)
-            (GROUP_CONCAT(DISTINCT ?birthPlace; separator="/") as ?birthPlaces)
-            (GROUP_CONCAT(DISTINCT ?deathPlace; separator="/") as ?deathPlaces)
-            (GROUP_CONCAT(DISTINCT ?additionalType; separator=", ") as ?additionalTypes)
+            (GROUP_CONCAT(DISTINCT ?additionalType_nl; separator=", ") as ?additionalTypes_nl)
+            (GROUP_CONCAT(DISTINCT ?additionalType_en; separator=", ") as ?additionalTypes_en)
+            ?birthPlace_nl
+            ?birthPlace_en
+            ?deathPlace_nl
+            ?deathPlace_en
         WHERE {
             ?uri a ?type .
             VALUES ?type { schema:Person schema:Organization }
 
             OPTIONAL { ?uri schema:description ?schema_description . }
-            OPTIONAL { ?uri schema:birthPlace ?birthPlace .
-                FILTER(langMatches(lang(?birthPlace), "nl")) }
-            OPTIONAL { ?uri schema:deathPlace ?deathPlace .
-                FILTER(langMatches(lang(?deathPlace), "nl"))}
-            OPTIONAL { ?uri schema:additionalType ?additionalType .
-                FILTER(langMatches(lang(?additionalType), "nl"))}
 
-        } GROUP BY ?uri
+            OPTIONAL {
+                ?uri schema:birthPlace ?birthPlace_nl .
+                FILTER(langMatches(lang(?birthPlace_nl), "nl"))
+            }
+            OPTIONAL {
+                ?uri schema:birthPlace ?birthPlace_en .
+                FILTER(langMatches(lang(?birthPlace_en), "en"))
+            }
+
+            OPTIONAL {
+                ?uri schema:deathPlace ?deathPlace_nl .
+                FILTER(langMatches(lang(?deathPlace_nl), "nl"))
+            }
+            OPTIONAL {
+                ?uri schema:deathPlace ?deathPlace_en .
+                FILTER(langMatches(lang(?deathPlace_en), "en"))
+            }
+
+            OPTIONAL {
+                ?uri schema:additionalType ?additionalType_nl .
+                FILTER(langMatches(lang(?additionalType_nl), "nl"))
+            }
+            OPTIONAL {
+                ?uri schema:additionalType ?additionalType_en .
+                FILTER(langMatches(lang(?additionalType_en), "en"))
+            }
+        }
+        #LIMIT#
     }
 
     OPTIONAL { ?uri schema:name ?prefLabel . }
     OPTIONAL { ?uri schema:alternateName ?altLabel . }
     OPTIONAL { ?uri schema:birthDate ?birthDate . }
     OPTIONAL { ?uri schema:deathDate ?deathDate . }
+    OPTIONAL { ?uri rdfs:seeAlso ?exactMatch_uri . }
 
     BIND(
-        CONCAT(
-          IF(BOUND(?birthDate) || STRLEN(?birthPlaces) > 0 ,
+        STRLANG(
             CONCAT(
-              IF(BOUND(?birthDate), CONCAT(?birthDate, " "), ""),
-              IF(STRLEN(?birthPlaces) > 0, CONCAT("(", ?birthPlaces, ") "), ""),
-              IF(BOUND(?deathDate) || STRLEN(?deathPlaces) > 0," - "," - ; ")),
-            ""),
-          IF(BOUND(?deathDate) || STRLEN(?deathPlaces) > 0,
+                IF(BOUND(?birthDate) || STRLEN(?birthPlace_nl) > 0,
+                    CONCAT(
+                        IF(BOUND(?birthDate), CONCAT(?birthDate, " "), ""),
+                        IF(STRLEN(?birthPlace_nl) > 0, CONCAT("(", ?birthPlace_nl, ") "), ""),
+                        IF(BOUND(?deathDate) || STRLEN(?deathPlace_nl) > 0," - "," – ; ")),
+                        ""
+                    ),
+                IF(BOUND(?deathDate) || STRLEN(?deathPlace_nl) > 0,
+                    CONCAT(
+                        IF(BOUND(?birthDate) || STRLEN(?birthPlace_nl) > 0, "", "– "),
+                        IF(BOUND(?deathDate), CONCAT(?deathDate, " "), ""),
+                        IF(STRLEN(?deathPlace_nl) > 0, CONCAT("(", ?deathPlace_nl, ")"), ""),
+                        "; "),
+                        ""
+                    ),
+                IF(STRLEN(?additionalTypes_nl) > 0, CONCAT(?additionalTypes_nl, ". "), ""),
+                IF(STRLEN(?descriptions) > 0, CONCAT(?descriptions, ". "), "")
+            ),
+            "nl"
+        ) as ?scopeNote_nl
+    )
+    BIND(
+        STRLANG(
             CONCAT(
-              IF(BOUND(?birthDate) || STRLEN(?birthPlaces) > 0 , "", "- "),
-              IF(BOUND(?deathDate), CONCAT(?deathDate, " "), ""),
-              IF(STRLEN(?deathPlaces) > 0, CONCAT("(", ?deathPlaces, ")"), ""),
-              "; "),
-            ""),
-            IF(STRLEN(?additionalTypes) > 0, CONCAT(?additionalTypes, ". "), ""),
-            IF(STRLEN(?descriptions) > 0, CONCAT(?descriptions, ". "), "")
-        ) as ?scopeNote
+                IF(BOUND(?birthDate) || STRLEN(?birthPlace_en) > 0,
+                    CONCAT(
+                        IF(BOUND(?birthDate), CONCAT(?birthDate, " "), ""),
+                        IF(STRLEN(?birthPlace_en) > 0, CONCAT("(", ?birthPlace_en, ") "), ""),
+                        IF(BOUND(?deathDate) || BOUND(?deathPlace_en)," - "," – ; ")),
+                        ""
+                    ),
+                IF(BOUND(?deathDate) || BOUND(?deathPlace_en),
+                    CONCAT(
+                        IF(BOUND(?birthDate) || BOUND(?birthPlace_en), "", "– "),
+                        IF(BOUND(?deathDate), CONCAT(?deathDate, " "), ""),
+                        IF(STRLEN(?deathPlace_nl) > 0, CONCAT("(", ?deathPlace_en, ")"), ""),
+                        "; "),
+                        ""
+                    ),
+                IF(STRLEN(?additionalTypes_nl) > 0, CONCAT(?additionalTypes_en, ". "), ""),
+                IF(STRLEN(?descriptions) > 0, CONCAT(?descriptions, ". "), "")
+            ),
+            "en"
+        ) as ?scopeNote_en
     )
     BIND(STRAFTER(STR(?uri), "https://data.rkd.nl/artists/") AS ?identifier)
     BIND(IRI(CONCAT("https://rkd.nl/explore/artists/", ?identifier)) AS ?seeAlso)
 }
-LIMIT 1000

package/catalog/queries/lookup/uitvoeringsmedium.rq

@@ -0,0 +1,33 @@
+PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
+PREFIX som: <https://data.muziekschatten.nl/som/>
+
+CONSTRUCT {
+    ?uri a skos:Concept;
+        skos:prefLabel ?prefLabel ;
+        skos:altLabel ?altLabel ;
+        skos:scopeNote ?scopeNote ;
+        skos:broader ?broader_uri ;
+        skos:exactMatch ?exactMatch_uri .
+    ?broader_uri skos:prefLabel ?broader_prefLabel .
+}
+WHERE {
+    VALUES ?uri { ?uris }
+
+    ?uri skos:prefLabel ?prefLabel .
+
+    OPTIONAL {
+        ?uri skos:scopeNote ?scopeNote
+    }
+
+    OPTIONAL {
+        ?uri skos:altLabel ?altLabel .
+    }
+
+    OPTIONAL {
+        ?uri skos:broader ?broader_uri .
+        ?broader_uri skos:prefLabel ?broader_prefLabel .
+    }
+
+    OPTIONAL { ?uri skos:exactMatch ?exactMatch_uri } # Has no labels.
+}
+LIMIT 1000

package/catalog/queries/lookup/wikidata.rq

@@ -7,7 +7,6 @@ CONSTRUCT {
     ?uri a skos:Concept ;
     	skos:prefLabel ?rdfs_label ;
         skos:altLabel ?altLabel ;
-    	skos:altLabel ?altLabelStreetName ;
     	skos:scopeNote ?schema_description .
 }
 WHERE {
@@ -19,33 +18,15 @@ WHERE {
     VALUES ?uri { ?uris }
 
     ?uri rdfs:label ?rdfs_label .
-    FILTER(LANG(?rdfs_label) = "nl")
+    FILTER(LANG(?rdfs_label) = "nl" || LANG(?rdfs_label) = "en")
 
     OPTIONAL {
         ?uri skos:altLabel ?altLabel .
-        FILTER(LANG(?altLabel) = "nl")
+        FILTER(LANG(?altLabel) = "nl" || LANG(?altLabel) = "en")
     }
     OPTIONAL {
         ?uri schema:description ?schema_description
-        FILTER(LANG(?schema_description) = "nl")
+        FILTER(LANG(?schema_description) = "nl" || LANG(?schema_description) = "en")
     }
-    # For streets
-    OPTIONAL {
-        ?uri wdt:P276/rdfs:label ?locationName .
-        FILTER(LANG(?locationName) = "nl")
-    }
-    # For streets
-    OPTIONAL {
-        ?uri wdt:P131/rdfs:label ?administrationName .
-        FILTER(LANG(?administrationName) = "nl")
-    }
-    # For streets
-    BIND(
-        COALESCE(
-            IF(BOUND(?locationName), CONCAT(?rdfs_label, " (", ?locationName, ")"), 1/0),
-            IF(BOUND(?administrationName), CONCAT(?rdfs_label, " (", ?administrationName, ")"), 1/0)
-        )
-        AS ?altLabelStreetName
-    )
 }
 LIMIT 1000

package/catalog/queries/search/aat-materials.rq

@@ -22,44 +22,58 @@ CONSTRUCT {
     ?exactMatch_uri skos:prefLabel ?exactMatch_prefLabel .
 }
 WHERE {
+    VALUES ?language {
+        aat:300388256 # Dutch
+        aat:300388277 # English
+    }
+
     {
-        SELECT * WHERE {
+        SELECT DISTINCT ?uri WHERE {
             ?uri luc:term ?query ;
                 a ?type ;
                 void:inDataset <http://vocab.getty.edu/dataset/aat> ;
                 gvp:broaderPreferred+ <http://vocab.getty.edu/aat/300010357> . # limit results to the "materials hierarchy name" (300010357)
             ?type rdfs:subClassOf gvp:Subject .
             FILTER (?type != gvp:Subject) .
-            ?uri skosxl:prefLabel ?prefLabel_uri .
-            ?prefLabel_uri dcterms:language aat:300388256 . # Dutch (language)
-            ?prefLabel_uri skosxl:literalForm ?prefLabel .
+            ?uri skosxl:prefLabel [
+                dcterms:language ?language ; # Faster than FILTER(langMatches(...): https://vocab.getty.edu/queries#Find_Terms_by_Language_Tag
+                skosxl:literalForm ?prefLabel
+            ]
         }
         #LIMIT#
     }
+    ?uri skosxl:prefLabel [
+        dcterms:language ?language ; # Faster than FILTER(langMatches(...): https://vocab.getty.edu/queries#Find_Terms_by_Language_Tag
+        skosxl:literalForm ?prefLabel
+    ]
     OPTIONAL {
-        ?uri skosxl:altLabel ?altLabel_uri .
-        ?altLabel_uri dcterms:language aat:300388256 . # Dutch (language)
-        ?altLabel_uri skosxl:literalForm ?altLabel .
+        ?uri skosxl:altLabel [
+            dcterms:language ?language ;
+            skosxl:literalForm ?altLabel
+        ]
     }
     OPTIONAL {
-        ?uri skos:scopeNote ?scopeNote_uri .
-        ?scopeNote_uri dcterms:language aat:300388256 . # Dutch (language)
-        ?scopeNote_uri rdf:value ?scopeNote .
+        ?uri skos:scopeNote [
+            dcterms:language ?language ;
+            rdf:value ?scopeNote
+        ]
     }
     OPTIONAL {
         ?uri rdfs:seeAlso ?rdfs_seeAlso
     }
     OPTIONAL {
         ?uri gvp:broaderPreferred ?broader_uri .
-        ?broader_uri skosxl:prefLabel ?broader_uri_skosxl .
-        ?broader_uri_skosxl dcterms:language aat:300388256 . # Dutch (language)
-        ?broader_uri_skosxl skosxl:literalForm ?broader_prefLabel .
+        ?broader_uri skosxl:prefLabel [
+            dcterms:language ?language ;
+            skosxl:literalForm ?broader_prefLabel
+        ]
     }
     OPTIONAL {
         ?uri skos:narrower ?narrower_uri .
-        ?narrower_uri skosxl:prefLabel ?narrower_uri_skosxl .
-        ?narrower_uri_skosxl dcterms:language aat:300388256 . # Dutch (language)
-        ?narrower_uri_skosxl skosxl:literalForm ?narrower_prefLabel .
+        ?narrower_uri skosxl:prefLabel [
+            dcterms:language ?language ;
+            skosxl:literalForm ?narrower_prefLabel
+        ]
     }
     OPTIONAL {
         ?uri skos:exactMatch ?exactMatch_uri . # Has no labels.

package/catalog/queries/search/aat-processes-and-techniques.rq

@@ -19,46 +19,61 @@ CONSTRUCT {
         skos:exactMatch ?exactMatch_uri .
     ?broader_uri skos:prefLabel ?broader_prefLabel .
     ?narrower_uri skos:prefLabel ?narrower_prefLabel .
+    ?exactMatch_uri skos:prefLabel ?exactMatch_prefLabel .
 }
 WHERE {
+    VALUES ?language {
+        aat:300388256 # Dutch
+        aat:300388277 # English
+    }
+
     {
-        SELECT * WHERE {
+        SELECT DISTINCT ?uri WHERE {
             ?uri luc:term ?query ;
                 a ?type ;
                 void:inDataset <http://vocab.getty.edu/dataset/aat> ;
                 gvp:broaderPreferred+ <http://vocab.getty.edu/aat/300053001> . # limit results to the "processes and techniques hierarchy name (300053001)"
             ?type rdfs:subClassOf gvp:Subject .
             FILTER (?type != gvp:Subject) .
-            ?uri skosxl:prefLabel ?prefLabel_uri .
-            ?prefLabel_uri dcterms:language aat:300388256 . # Dutch (language)
-            ?prefLabel_uri skosxl:literalForm ?prefLabel .
+            ?uri skosxl:prefLabel [
+                dcterms:language ?language ; # Faster than FILTER(langMatches(...): https://vocab.getty.edu/queries#Find_Terms_by_Language_Tag
+                skosxl:literalForm ?prefLabel
+            ]
         }
         #LIMIT#
     }
+    ?uri skosxl:prefLabel [
+        dcterms:language ?language ; # Faster than FILTER(langMatches(...): https://vocab.getty.edu/queries#Find_Terms_by_Language_Tag
+        skosxl:literalForm ?prefLabel
+    ]
     OPTIONAL {
-        ?uri skosxl:altLabel ?altLabel_uri .
-        ?altLabel_uri dcterms:language aat:300388256 . # Dutch (language)
-        ?altLabel_uri skosxl:literalForm ?altLabel .
+        ?uri skosxl:altLabel [
+            dcterms:language ?language ;
+            skosxl:literalForm ?altLabel
+        ]
     }
     OPTIONAL {
-        ?uri skos:scopeNote ?scopeNote_uri .
-        ?scopeNote_uri dcterms:language aat:300388256 . # Dutch (language)
-        ?scopeNote_uri rdf:value ?scopeNote .
+        ?uri skos:scopeNote [
+            dcterms:language ?language ;
+            rdf:value ?scopeNote
+        ]
     }
     OPTIONAL {
         ?uri rdfs:seeAlso ?rdfs_seeAlso
     }
     OPTIONAL {
         ?uri gvp:broaderPreferred ?broader_uri .
-        ?broader_uri skosxl:prefLabel ?broader_uri_skosxl .
-        ?broader_uri_skosxl dcterms:language aat:300388256 . # Dutch (language)
-        ?broader_uri_skosxl skosxl:literalForm ?broader_prefLabel .
+        ?broader_uri skosxl:prefLabel [
+            dcterms:language ?language ;
+            skosxl:literalForm ?broader_prefLabel
+        ]
     }
     OPTIONAL {
         ?uri skos:narrower ?narrower_uri .
-        ?narrower_uri skosxl:prefLabel ?narrower_uri_skosxl .
-        ?narrower_uri_skosxl dcterms:language aat:300388256 . # Dutch (language)
-        ?narrower_uri_skosxl skosxl:literalForm ?narrower_prefLabel .
+        ?narrower_uri skosxl:prefLabel [
+            dcterms:language ?language ;
+            skosxl:literalForm ?narrower_prefLabel
+        ]
     }
     OPTIONAL {
         ?uri skos:exactMatch ?exactMatch_uri . # Has no labels.