Merge pull request #359 from InseeFr/fix/make-family-optional

fix: make family optional when fetching series

Author: rkouere

pom.xml

@@ -12,7 +12,7 @@
     <packaging>jar</packaging>
     <groupId>fr.insee.rmes</groupId>
     <artifactId>magma</artifactId>
-    <version>1.4.8</version>
+    <version>1.4.9</version>
     <name>magma</name>
     <description>Metadata management API</description>
     <organization>

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}') }

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 . 

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 .