@netwerk-digitaal-erfgoed/network-of-terms-catalog 10.2.0 → 10.2.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/catalog/queries/lookup/aat.rq +25 -15
  2. package/catalog/queries/lookup/rkdartists.rq +5 -5
  3. package/catalog/queries/search/aat.rq +1 -0
  4. package/catalog/queries/search/rkdartists.rq +5 -5
  5. package/package.json +1 -1
package/catalog/queries/lookup/aat.rq CHANGED
@@ -24,33 +24,43 @@ WHERE {
24
24
  # Wars: <http://vocab.getty.edu/aat/300055314>
25
25
  VALUES ?uri { ?uris }
26
26
 
27
- ?uri skosxl:prefLabel ?prefLabel_uri .
28
- ?prefLabel_uri dcterms:language aat:300388256 . # Dutch (language)
29
- ?prefLabel_uri skosxl:literalForm ?prefLabel .
27
+ VALUES ?language {
28
+ aat:300388256 # Dutch
29
+ aat:300388277 # English
30
+ }
31
+
32
+ ?uri skosxl:prefLabel [
33
+ dcterms:language ?language ; # Faster than FILTER(langMatches(...): https://vocab.getty.edu/queries#Find_Terms_by_Language_Tag
34
+ skosxl:literalForm ?prefLabel
35
+ ]
30
36
  OPTIONAL {
31
- ?uri skosxl:altLabel ?altLabel_uri .
32
- ?altLabel_uri dcterms:language aat:300388256 . # Dutch (language)
33
- ?altLabel_uri skosxl:literalForm ?altLabel .
37
+ ?uri skosxl:altLabel [
38
+ dcterms:language ?language ;
39
+ skosxl:literalForm ?altLabel
40
+ ]
34
41
  }
35
42
  OPTIONAL {
36
- ?uri skos:scopeNote ?scopeNote_uri .
37
- ?scopeNote_uri dcterms:language aat:300388256 . # Dutch (language)
38
- ?scopeNote_uri rdf:value ?scopeNote .
43
+ ?uri skos:scopeNote [
44
+ dcterms:language ?language ;
45
+ rdf:value ?scopeNote
46
+ ]
39
47
  }
40
48
  OPTIONAL {
41
49
  ?uri rdfs:seeAlso ?rdfs_seeAlso
42
50
  }
43
51
  OPTIONAL {
44
52
  ?uri gvp:broaderPreferred ?broader_uri .
45
- ?broader_uri skosxl:prefLabel ?broader_uri_skosxl .
46
- ?broader_uri_skosxl dcterms:language aat:300388256 . # Dutch (language)
47
- ?broader_uri_skosxl skosxl:literalForm ?broader_prefLabel .
53
+ ?broader_uri skosxl:prefLabel [
54
+ dcterms:language ?language ;
55
+ skosxl:literalForm ?broader_prefLabel
56
+ ]
48
57
  }
49
58
  OPTIONAL {
50
59
  ?uri skos:narrower ?narrower_uri .
51
- ?narrower_uri skosxl:prefLabel ?narrower_uri_skosxl .
52
- ?narrower_uri_skosxl dcterms:language aat:300388256 . # Dutch (language)
53
- ?narrower_uri_skosxl skosxl:literalForm ?narrower_prefLabel .
60
+ ?narrower_uri skosxl:prefLabel [
61
+ dcterms:language ?language ;
62
+ skosxl:literalForm ?narrower_prefLabel
63
+ ]
54
64
  }
55
65
  OPTIONAL {
56
66
  ?uri skos:exactMatch ?exactMatch_uri . # Has no labels.
package/catalog/queries/lookup/rkdartists.rq CHANGED
@@ -97,18 +97,18 @@ WHERE {
97
97
  CONCAT(
98
98
  IF(BOUND(?birthDate), CONCAT(?birthDate, " "), ""),
99
99
  IF(STRLEN(?birthPlace_en) > 0, CONCAT("(", ?birthPlace_en, ") "), ""),
100
- IF(BOUND(?deathDate) || BOUND(?deathPlace_en)," - "," – ; ")),
100
+ IF(BOUND(?deathDate) || STRLEN(?deathPlace_en) >0, " - ", " – ; ")),
101
101
  ""
102
102
  ),
103
- IF(BOUND(?deathDate) || BOUND(?deathPlace_en),
103
+ IF(BOUND(?deathDate) || STRLEN(?deathPlace_en) > 0,
104
104
  CONCAT(
105
- IF(BOUND(?birthDate) || BOUND(?birthPlace_en), "", "– "),
105
+ IF(BOUND(?birthDate) || STRLEN(?birthPlace_en) > 0, "", "– "),
106
106
  IF(BOUND(?deathDate), CONCAT(?deathDate, " "), ""),
107
- IF(STRLEN(?deathPlace_nl) > 0, CONCAT("(", ?deathPlace_en, ")"), ""),
107
+ IF(STRLEN(?deathPlace_en) > 0, CONCAT("(", ?deathPlace_en, ")"), ""),
108
108
  "; "),
109
109
  ""
110
110
  ),
111
- IF(STRLEN(?additionalTypes_nl) > 0, CONCAT(?additionalTypes_en, ". "), ""),
111
+ IF(STRLEN(?additionalTypes_en) > 0, CONCAT(?additionalTypes_en, ". "), ""),
112
112
  IF(STRLEN(?descriptions) > 0, CONCAT(?descriptions, ". "), "")
113
113
  ),
114
114
  "en"
package/catalog/queries/search/aat.rq CHANGED
@@ -76,6 +76,7 @@ WHERE {
76
76
  }
77
77
  OPTIONAL {
78
78
  ?uri skos:exactMatch ?exactMatch_uri .
79
+ FILTER(?exactMatch_uri != ?uri) # Exclude self-reference.
79
80
  ?exactMatch_uri skosxl:prefLabel [
80
81
  dcterms:language ?language ;
81
82
  skosxl:literalForm ?exactMatch_prefLabel
package/catalog/queries/search/rkdartists.rq CHANGED
@@ -97,18 +97,18 @@ WHERE {
97
97
  CONCAT(
98
98
  IF(BOUND(?birthDate), CONCAT(?birthDate, " "), ""),
99
99
  IF(STRLEN(?birthPlace_en) > 0, CONCAT("(", ?birthPlace_en, ") "), ""),
100
- IF(BOUND(?deathDate) || BOUND(?deathPlace_en)," - "," – ; ")),
100
+ IF(BOUND(?deathDate) || STRLEN(?deathPlace_en) >0, " - ", " – ; ")),
101
101
  ""
102
102
  ),
103
- IF(BOUND(?deathDate) || BOUND(?deathPlace_en),
103
+ IF(BOUND(?deathDate) || STRLEN(?deathPlace_en) > 0,
104
104
  CONCAT(
105
- IF(BOUND(?birthDate) || BOUND(?birthPlace_en), "", "– "),
105
+ IF(BOUND(?birthDate) || STRLEN(?birthPlace_en) > 0, "", "– "),
106
106
  IF(BOUND(?deathDate), CONCAT(?deathDate, " "), ""),
107
- IF(STRLEN(?deathPlace_nl) > 0, CONCAT("(", ?deathPlace_en, ")"), ""),
107
+ IF(STRLEN(?deathPlace_en) > 0, CONCAT("(", ?deathPlace_en, ")"), ""),
108
108
  "; "),
109
109
  ""
110
110
  ),
111
- IF(STRLEN(?additionalTypes_nl) > 0, CONCAT(?additionalTypes_en, ". "), ""),
111
+ IF(STRLEN(?additionalTypes_en) > 0, CONCAT(?additionalTypes_en, ". "), ""),
112
112
  IF(STRLEN(?descriptions) > 0, CONCAT(?descriptions, ". "), "")
113
113
  ),
114
114
  "en"
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@netwerk-digitaal-erfgoed/network-of-terms-catalog",
3
- "version": "10.2.0",
3
+ "version": "10.2.2",
4
4
  "type": "module",
5
5
  "description": "Catalog of Network of Terms datasets",
6
6
  "repository": {