From dcde90a6b168e80d58ba1b18bd4c3aea5df42b20 Mon Sep 17 00:00:00 2001 From: Emmanuel Date: Mon, 25 Aug 2025 10:23:54 +0100 Subject: [PATCH 1/3] fix: make family optional when fetching series --- .../queries/pogues/getAllSeries.ftlh | 20 ++++++++++--------- .../queries/pogues/getAllSeriesSurvey.ftlh | 18 +++++++++-------- .../queries/pogues/getSerieById.ftlh | 20 ++++++++++--------- 3 files changed, 32 insertions(+), 26 deletions(-) diff --git a/src/main/resources/queries/pogues/getAllSeries.ftlh b/src/main/resources/queries/pogues/getAllSeries.ftlh index f0b8fdfe4..33a6ec9f4 100644 --- a/src/main/resources/queries/pogues/getAllSeries.ftlh +++ b/src/main/resources/queries/pogues/getAllSeries.ftlh @@ -14,15 +14,17 @@ OPTIONAL {?series dc:creator ?proprietaire .} - ?series dcterms:isPartOf ?family . - ?family a insee:StatisticalOperationFamily . - ?family skos:prefLabel ?familyLabelLg1 . - FILTER (lang(?familyLabelLg1 ) = '${LG1}') - ?family skos:prefLabel ?familyLabelLg2 . - FILTER (lang(?familyLabelLg2 ) = '${LG2}') - BIND(STRAFTER(STR(?family),'/operations/famille/') AS ?familyId ) . - - OPTIONAL { ?series skos:altLabel ?seriesAltLabelLg1 . + OPTIONAL { + ?series dcterms:isPartOf ?family . + ?family a insee:StatisticalOperationFamily . + ?family skos:prefLabel ?familyLabelLg1 . + FILTER (lang(?familyLabelLg1 ) = '${LG1}') + ?family skos:prefLabel ?familyLabelLg2 . + FILTER (lang(?familyLabelLg2 ) = '${LG2}') + BIND(STRAFTER(STR(?family),'/operations/famille/') AS ?familyId ) . + } + + OPTIONAL { ?series skos:altLabel ?seriesAltLabelLg1 . FILTER (lang(?seriesAltLabelLg1) = '${LG1}') } OPTIONAL { ?series skos:altLabel ?seriesAltLabelLg2 . FILTER (lang(?seriesAltLabelLg2) = '${LG2}') } diff --git a/src/main/resources/queries/pogues/getAllSeriesSurvey.ftlh b/src/main/resources/queries/pogues/getAllSeriesSurvey.ftlh index 593bf45b6..6d8c40fcb 100644 --- a/src/main/resources/queries/pogues/getAllSeriesSurvey.ftlh +++ b/src/main/resources/queries/pogues/getAllSeriesSurvey.ftlh @@ -14,14 +14,16 @@ OPTIONAL {?series dc:creator ?proprietaire .} - ?series dcterms:isPartOf ?family . - ?family a insee:StatisticalOperationFamily . - ?family skos:prefLabel ?familyLabelLg1 . - FILTER (lang(?familyLabelLg1 ) = '${LG1}') - ?family skos:prefLabel ?familyLabelLg2 . - FILTER (lang(?familyLabelLg2 ) = '${LG2}') - BIND(STRAFTER(STR(?family),'/operations/famille/') AS ?familyId ) . - + OPTIONAL { + ?series dcterms:isPartOf ?family . + ?family a insee:StatisticalOperationFamily . + ?family skos:prefLabel ?familyLabelLg1 . + FILTER (lang(?familyLabelLg1 ) = '${LG1}') + ?family skos:prefLabel ?familyLabelLg2 . + FILTER (lang(?familyLabelLg2 ) = '${LG2}') + BIND(STRAFTER(STR(?family),'/operations/famille/') AS ?familyId ) . + } + OPTIONAL { ?series skos:altLabel ?seriesAltLabelLg1 . FILTER (lang(?seriesAltLabelLg1) = '${LG1}') } OPTIONAL { ?series skos:altLabel ?seriesAltLabelLg2 . diff --git a/src/main/resources/queries/pogues/getSerieById.ftlh b/src/main/resources/queries/pogues/getSerieById.ftlh index 7bedfdfd9..11055f88e 100644 --- a/src/main/resources/queries/pogues/getSerieById.ftlh +++ b/src/main/resources/queries/pogues/getSerieById.ftlh @@ -13,15 +13,17 @@ FILTER (lang(?seriesLabelLg1) = '${LG1}') ?series skos:prefLabel ?seriesLabelLg2 . FILTER (lang(?seriesLabelLg2) = '${LG2}') - - ?series dcterms:isPartOf ?family . - ?family a insee:StatisticalOperationFamily . - ?family skos:prefLabel ?familyLabelLg1 . - FILTER (lang(?familyLabelLg1 ) = '${LG1}') - ?family skos:prefLabel ?familyLabelLg2 . - FILTER (lang(?familyLabelLg2 ) = '${LG2}') - BIND(STRAFTER(STR(?family),'/operations/famille/') AS ?familyId ) . - + + OPTIONAL { + ?series dcterms:isPartOf ?family . + ?family a insee:StatisticalOperationFamily . + ?family skos:prefLabel ?familyLabelLg1 . + FILTER (lang(?familyLabelLg1 ) = '${LG1}') + ?family skos:prefLabel ?familyLabelLg2 . + FILTER (lang(?familyLabelLg2 ) = '${LG2}') + BIND(STRAFTER(STR(?family),'/operations/famille/') AS ?familyId ) . + } + OPTIONAL { ?series skos:altLabel ?seriesAltLabelLg1 . FILTER (lang(?seriesAltLabelLg1) = '${LG1}') } OPTIONAL { ?series skos:altLabel ?seriesAltLabelLg2 . From b68584ecad5f6126fa0975f769f329c392802350 Mon Sep 17 00:00:00 2001 From: Nicolas Echallier Date: Mon, 25 Aug 2025 11:35:42 +0200 Subject: [PATCH 2/3] build: update pom.xml to 1.4.9-rc0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3e758b559..f29f69ca3 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ jar fr.insee.rmes magma - 1.4.8 + 1.4.9-rc0 magma Metadata management API From c77dc2a39e5e020e2ab115274e3b5d3cff1d18b6 Mon Sep 17 00:00:00 2001 From: Nicolas Echallier Date: Mon, 1 Sep 2025 14:51:39 +0200 Subject: [PATCH 3/3] build: update pom.xml to 1.4.9 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f29f69ca3..9f8317887 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ jar fr.insee.rmes magma - 1.4.9-rc0 + 1.4.9 magma Metadata management API