Merge pull request #619

* feat: organisation return Lg2
InseeFr · May 7, 2024 · 5abee45 · 5abee45
1 parent e52cb25
commit 5abee45
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/...main/java/fr/insee/rmes/persistance/sparql_queries/organizations/OrganizationQueries.java b/...main/java/fr/insee/rmes/persistance/sparql_queries/organizations/OrganizationQueries.java
@@ -45,6 +45,7 @@ public static String organizationsQuery() throws RmesException {
 		params.put("ORGANIZATIONS_GRAPH", config.getOrganizationsGraph());
 		params.put("ORGANIZATIONS_INSEE_GRAPH", config.getOrgInseeGraph());
 		params.put("LG1", config.getLg1());
+		params.put("LG2", config.getLg2());
 		return FreeMarkerUtils.buildRequest("organizations/", "getOrganizations.ftlh", params);
 	}
 

diff --git a/src/main/resources/request/organizations/getOrganizations.ftlh b/src/main/resources/request/organizations/getOrganizations.ftlh
@@ -1,4 +1,4 @@
-SELECT DISTINCT ?iri ?id ?label ?altLabel
+SELECT DISTINCT ?iri ?id ?label ?altLabel ?labelLg2
 FROM <${ORGANIZATIONS_GRAPH}>
 FROM <${ORGANIZATIONS_INSEE_GRAPH}>
 WHERE {
@@ -7,6 +7,13 @@ WHERE {
     OPTIONAL { ?iri skos:prefLabel ?label .
     FILTER (lang(?label) = '${LG1}')}
     OPTIONAL {?iri skos:altLabel ?altLabel .}
+
+    OPTIONAL {
+        ?iri skos:prefLabel ?label2 .
+        FILTER (lang(?label2) = '${LG2}')
+    } .
+
+    BIND(if(bound(?label2), ?label2, ?label) AS ?labelLg2)
 }
-GROUP BY ?iri ?id ?label ?altLabel
+GROUP BY ?iri ?id ?label ?altLabel ?labelLg2
 ORDER BY ?label