netwerk-digitaal-erfgoed · ddeboer · Dec 13, 2024 · Dec 13, 2024
diff --git a/jest.config.js b/jest.config.js
@@ -10,8 +10,8 @@ export default {
   ],
   coverageThreshold: {
     global: {
-      lines: 91.39,
-      statements: 91.39,
+      lines: 91.41,
+      statements: 91.41,
       branches: 92.62,
       functions: 90.9,
     },

diff --git a/packages/network-of-terms-catalog/catalog/datasets/aat-materials.jsonld b/packages/network-of-terms-catalog/catalog/datasets/aat-materials.jsonld
@@ -36,7 +36,7 @@
       "@value": "Selectie van AAT termen voor het beschrijven van materialen in architectuur-, kunst- en cultuurhistorische collecties"
     }
   ],
-  "inLanguage": "nl",
+  "inLanguage": ["en", "nl"],
   "distribution": [
     {
       "@id": "http://vocab.getty.edu/aat/sparql/materials",

diff --git a/packages/network-of-terms-catalog/catalog/datasets/aat-processes-and-techniques.jsonld b/packages/network-of-terms-catalog/catalog/datasets/aat-processes-and-techniques.jsonld
@@ -36,7 +36,7 @@
       "@value": "Selectie van AAT termen voor het beschrijven van processen en technieken in architectuur-, kunst- en cultuurhistorische collecties"
     }
   ],
-  "inLanguage": "nl",
+  "inLanguage": ["en", "nl"],
   "distribution": [
     {
       "@id": "http://vocab.getty.edu/aat/sparql/processes-and-techniques",

diff --git a/packages/network-of-terms-catalog/catalog/datasets/aat-styles-and-periods.jsonld b/packages/network-of-terms-catalog/catalog/datasets/aat-styles-and-periods.jsonld
@@ -39,7 +39,7 @@
       "@value": "Selectie van AAT termen voor het beschrijven van stijlen en periodes in architectuur-, kunst- en cultuurhistorische collecties"
     }
   ],
-  "inLanguage": "nl",
+  "inLanguage": ["en", "nl"],
   "distribution": [
     {
       "@id": "http://vocab.getty.edu/aat/sparql/styles-and-periods",

diff --git a/packages/network-of-terms-catalog/catalog/datasets/aat.jsonld b/packages/network-of-terms-catalog/catalog/datasets/aat.jsonld
@@ -57,7 +57,7 @@
       "@value": "Onderwerpen voor het beschrijven van architectuur-, kunst- en cultuurhistorische collecties"
     }
   ],
-  "inLanguage": "nl",
+  "inLanguage": ["en", "nl"],
   "distribution": [
     {
       "@id": "http://vocab.getty.edu/aat/sparql",

diff --git a/packages/network-of-terms-catalog/catalog/datasets/eurovoc.jsonld b/packages/network-of-terms-catalog/catalog/datasets/eurovoc.jsonld
@@ -36,7 +36,7 @@
       "@value": "Onderwerpen over alle gebieden waarop de Europese Unie actief is. De nadruk ligt op de parlementaire activiteiten van de EU"
     }
   ],
-  "inLanguage": "nl",
+  "inLanguage": ["en", "nl"],
   "distribution": [
     {
       "@id": "http://publications.europa.eu/webapi/rdf/sparql#eurovoc",

diff --git a/packages/network-of-terms-catalog/catalog/datasets/rkdartists.jsonld b/packages/network-of-terms-catalog/catalog/datasets/rkdartists.jsonld
@@ -30,7 +30,7 @@
       "@value": "Biografische gegevens van Nederlandse en buitenlandse kunstenaars van de middeleeuwen tot heden"
     }
   ],
-  "inLanguage": "nl",
+  "inLanguage": ["en", "nl"],
   "distribution": [
     {
       "@id": "https://api.rkd.triply.cc/datasets/rkd/RKD-SDO-Knowledge-Graph/sparql",

diff --git a/packages/network-of-terms-catalog/catalog/datasets/uitvoeringsmedium.jsonld b/packages/network-of-terms-catalog/catalog/datasets/uitvoeringsmedium.jsonld
@@ -33,7 +33,7 @@
       "@value": "Termen voor het beschrijven van muziekinstrumenten, zangstemmen en ensembles (in enkelvoudige en meervoudige bezetting)"
     }
   ],
-  "inLanguage": "nl",
+  "inLanguage": ["en", "nl"],
   "distribution": [
     {
       "@id": "https://data.muziekschatten.nl/sparql/#uitvoeringsmedium",

diff --git a/packages/network-of-terms-catalog/catalog/datasets/wikidata-entities-all.jsonld b/packages/network-of-terms-catalog/catalog/datasets/wikidata-entities-all.jsonld
@@ -36,7 +36,7 @@
       "@value": "Alle entiteiten in Wikidata, zoals beroepen, films of kunstwerken"
     }
   ],
-  "inLanguage": "nl",
+  "inLanguage": ["en", "nl"],
   "distribution": [
     {
       "@id": "https://query.wikidata.org/sparql#entities-all",

diff --git a/packages/network-of-terms-catalog/catalog/datasets/wikidata-entities-persons.jsonld b/packages/network-of-terms-catalog/catalog/datasets/wikidata-entities-persons.jsonld
@@ -30,7 +30,7 @@
       "@value": "Personen"
     }
   ],
-  "inLanguage": "nl",
+  "inLanguage": ["en", "nl"],
   "distribution": [
     {
       "@id": "https://query.wikidata.org/sparql#entities-persons",

diff --git a/packages/network-of-terms-catalog/catalog/datasets/wikidata-entities-places.jsonld b/packages/network-of-terms-catalog/catalog/datasets/wikidata-entities-places.jsonld
@@ -30,7 +30,7 @@
       "@value": "Plaatsen in Nederland en België"
     }
   ],
-  "inLanguage": "nl",
+  "inLanguage": ["en", "nl"],
   "distribution": [
     {
       "@id": "https://query.wikidata.org/sparql#entities-places",

diff --git a/packages/network-of-terms-catalog/catalog/datasets/wikidata-entities-streets.jsonld b/packages/network-of-terms-catalog/catalog/datasets/wikidata-entities-streets.jsonld
@@ -30,7 +30,7 @@
       "@value": "Straten in Nederland"
     }
   ],
-  "inLanguage": "nl",
+  "inLanguage": ["en", "nl"],
   "distribution": [
     {
       "@id": "https://query.wikidata.org/sparql#entities-streets",

diff --git a/packages/network-of-terms-catalog/src/getCatalog.ts b/packages/network-of-terms-catalog/src/getCatalog.ts
@@ -30,10 +30,14 @@ export async function getCatalog(path?: string): Promise<Catalog> {
 export async function fromStore(store: RDF.Store): Promise<Catalog> {
   // Collect all properties for SELECT and GROUP BY so we can flatten the schema:url values into a single value.
   const properties =
-    '?dataset ?name ?description ?creator ?creatorName ?creatorAlternateName ?distribution ?endpointUrl ?searchQuery ?lookupQuery ?reconciliationUrlTemplate ?alternateName ?mainEntityOfPage ?inLanguage';
+    '?dataset ?name ?description ?creator ?creatorName ?creatorAlternateName ?distribution ?endpointUrl ?searchQuery ?lookupQuery ?reconciliationUrlTemplate ?alternateName ?mainEntityOfPage';
   const query = `
       PREFIX schema: <http://schema.org/>
-        SELECT ${properties} (GROUP_CONCAT(?genre) as ?genre) (GROUP_CONCAT(DISTINCT ?url) as ?url) WHERE {
+        SELECT ${properties} 
+            (GROUP_CONCAT(?genre) as ?genre)
+            (GROUP_CONCAT(DISTINCT ?url) as ?url)
+            (GROUP_CONCAT(DISTINCT ?inLanguage) as ?inLanguage) 
+        WHERE {
           ?dataset a schema:Dataset ;
             schema:name ?name ;
             schema:description ?description ;
@@ -83,7 +87,7 @@ export async function fromStore(store: RDF.Store): Promise<Catalog> {
             .value.split(' ') // The single value is space-delineated.
             .map((url: string) => new IRI(url)),
           bindings.get('mainEntityOfPage')!.value,
-          bindings.get('inLanguage')!.value,
+          bindings.get('inLanguage')!.value.split(' '), // The single value is space-delineated.
           [
             new Organization(
               new IRI(bindings.get('creator')!.value),

diff --git a/packages/network-of-terms-catalog/test/catalog.test.ts b/packages/network-of-terms-catalog/test/catalog.test.ts
@@ -46,7 +46,7 @@ describe('Catalog', () => {
       new IRI('https://data.cultureelerfgoed.nl/term/id/cht/'),
     ]);
     expect(cht.alternateName).toEqual('CHT');
-    expect(cht.inLanguage).toEqual('nl');
+    expect(cht.inLanguage).toEqual(['nl']);
     expect(cht.creators[0].name).toEqual(
       'Rijksdienst voor het Cultureel Erfgoed'
     );

diff --git a/packages/network-of-terms-graphql/src/resolvers.ts b/packages/network-of-terms-graphql/src/resolvers.ts
@@ -144,7 +144,7 @@ async function source(distribution: Distribution, dataset: Dataset) {
     alternateName: dataset.alternateName,
     description: dataset.description,
     mainEntityOfPage: [dataset.mainEntityOfPage],
-    inLanguage: [dataset.inLanguage],
+    inLanguage: dataset.inLanguage,
     creators: dataset.creators.map(creator => ({
       uri: creator.iri,
       name: creator.name,

diff --git a/packages/network-of-terms-graphql/test/server.test.ts b/packages/network-of-terms-graphql/test/server.test.ts
@@ -98,7 +98,7 @@ describe('Server', () => {
     expect(body.data.terms[0].source.uri).toEqual(
       'https://data.rkd.nl/rkdartists'
     );
-    expect(body.data.terms[0].source.inLanguage).toEqual(['nl']);
+    expect(body.data.terms[0].source.inLanguage).toEqual(['en', 'nl']);
     expect(body.data.terms[0].result.__typename).toEqual('Terms');
     expect(body.data.terms[0].result.terms).toHaveLength(5); // Terms found.
     expect(body.data.terms[0].responseTimeMs).toBeGreaterThan(0);

diff --git a/packages/network-of-terms-query/src/catalog.ts b/packages/network-of-terms-query/src/catalog.ts
@@ -50,7 +50,7 @@ export class Dataset {
     readonly genres: IRI[],
     readonly termsPrefixes: IRI[],
     readonly mainEntityOfPage: string,
-    readonly inLanguage: string,
+    readonly inLanguage: string[],
     readonly creators: [Organization],
     readonly distributions: [Distribution],
     readonly alternateName?: string

diff --git a/packages/network-of-terms-query/src/server-test.ts b/packages/network-of-terms-query/src/server-test.ts
@@ -30,7 +30,7 @@ export const testCatalog = (port: number) =>
       ],
       [new IRI('https://example.com/resources/')],
       'https://example.com/rkdartists',
-      'nl',
+      ['en', 'nl'],
       [
         new Organization(
           new IRI('https://rkd.nl'),
@@ -109,7 +109,7 @@ export const testCatalog = (port: number) =>
       ],
       [new IRI('https://data.cultureelerfgoed.nl/term/id/cht/')],
       'https://example.com/cht',
-      'nl',
+      ['nl'],
       [
         new Organization(
           new IRI('https://www.cultureelerfgoed.nl'),
@@ -143,7 +143,7 @@ export const testCatalog = (port: number) =>
       ],
       [new IRI('http://vocab.getty.edu/aat/')],
       'https://example.com/aat',
-      'nl',
+      ['nl'],
       [
         new Organization(
           new IRI('http://www.getty.edu/research/'),
@@ -171,7 +171,7 @@ export const testCatalog = (port: number) =>
       ],
       [new IRI('http://data.beeldengeluid.nl/gtaa/')],
       'https://example.com/gtaa',
-      'nl',
+      ['nl'],
       [
         new Organization(
           new IRI('https://www.beeldengeluid.nl/'),