From 2bbbe8d7ae99ebc153244ec62fad820e0033feb1 Mon Sep 17 00:00:00 2001 From: BulotF Date: Wed, 12 Jun 2019 12:44:56 +0200 Subject: [PATCH 001/439] Create ddi32toddi33.xsl Program to transform a DDI 3.2 questionnaire into a DDI 3.3 questionnaire --- .../resources/xslt/util/ddi/ddi32toddi33.xsl | 126 ++++++++++++++++++ 1 file changed, 126 insertions(+) create mode 100644 src/main/resources/xslt/util/ddi/ddi32toddi33.xsl diff --git a/src/main/resources/xslt/util/ddi/ddi32toddi33.xsl b/src/main/resources/xslt/util/ddi/ddi32toddi33.xsl new file mode 100644 index 000000000..5cb33e518 --- /dev/null +++ b/src/main/resources/xslt/util/ddi/ddi32toddi33.xsl @@ -0,0 +1,126 @@ + + + + + root template : DDIInstance with DDI 3.3 namespaces + + + + + + + + + default template : keep the same + + + + + + + + + DDI 3.2 namespaces to DDI 3.3 ones + + + + + + + + + + + + + + + + + + + + + + + + + + + + + xhtml namespace keeps the same + + + + + + + + + real evolutions + + + + + + + + + https://ddi-alliance.atlassian.net/projects/DDILIFE/issues/DDILIFE-3526 + + + + + + + + + https://ddi-alliance.atlassian.net/projects/DDILIFE/issues/DDILIFE-3523 + + + + + + + + + + + + + https://ddi-alliance.atlassian.net/projects/DDILIFE/issues/DDILIFE-3523 + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 673f7bf973bdc86618c8567bf8a5a7ec790c7a12 Mon Sep 17 00:00:00 2001 From: BulotF Date: Wed, 12 Jun 2019 12:45:20 +0200 Subject: [PATCH 002/439] Update simpsons.xml Simpsons DDI 3.2 to Simpsons DDI 3.3 --- questionnaires/simpsons/ddi/simpsons.xml | 522 +++++++++++------------ 1 file changed, 256 insertions(+), 266 deletions(-) diff --git a/questionnaires/simpsons/ddi/simpsons.xml b/questionnaires/simpsons/ddi/simpsons.xml index 383252d9c..26479c864 100644 --- a/questionnaires/simpsons/ddi/simpsons.xml +++ b/questionnaires/simpsons/ddi/simpsons.xml @@ -1,16 +1,8 @@ - - fr.insee - INSEE-i6vwid - 0.1.0 - +fr.inseeINSEE-i6vwid0.1.0 Questionnaire SIMPSONS - - + fr.insee RessourcePackage-i6vwid 0.1.0 @@ -30,7 +22,7 @@ - We're going to test your knowledge about the simpsons series.Welcome in the simspons world! + We're going to test your knowledge about the simpsons series.Welcome in the simspons world! @@ -96,7 +88,7 @@ - Several possible answers + Several possible answers @@ -135,7 +127,7 @@ - fr.inseeFTN-INSTRUCTION-10.1.0tooltipIncluded principalities + fr.inseeFTN-INSTRUCTION-10.1.0tooltipIncluded principalities fr.insee ControlConstructScheme-i6vwid @@ -147,7 +139,7 @@ Questionnaire SIMPSONS - template + template fr.insee j6p0ti5h @@ -183,7 +175,7 @@ 0.1.0 Instruction - module + module fr.insee j6p3dkx6-QC @@ -213,7 +205,7 @@ General knowledge of the series - submodule + submodule fr.insee j3343qhx-QC @@ -255,7 +247,7 @@ 0.1.0 Instruction - module + module fr.insee j3343clt-QC @@ -285,7 +277,7 @@ Characters - module + module fr.insee j334akov-QC @@ -327,7 +319,7 @@ General questions - module + module fr.insee j6qe237q @@ -357,7 +349,7 @@ Kwik-E-Mart - submodule + submodule fr.insee j4nwc63q-QC @@ -381,7 +373,7 @@ Clowning - submodule + submodule fr.insee j4nw0rr6-QC @@ -399,7 +391,7 @@ Transport - submodule + submodule fr.insee j6p2lwuj-QC @@ -417,7 +409,7 @@ Favourite characters - module + module fr.insee j6qg8rc6-QC @@ -435,7 +427,7 @@ Comment - module + module fr.insee j6z0z3us-QC @@ -447,7 +439,7 @@ fr.insee d1e42 0.1.0 - + hideable xpath @@ -489,7 +481,7 @@ - hideable + hideable fr.insee j6p0s7o5 @@ -501,7 +493,7 @@ fr.insee d1e101 0.1.0 - + hideable xpath @@ -543,7 +535,7 @@ - hideable + hideable fr.insee j3341528 @@ -821,7 +813,7 @@ QuestionItem - + informational fr.insee j4nwc63q-CI-0 0.1.0 @@ -1281,7 +1273,7 @@ 0 99 - Decimal + Decimal fr.insee j6q9h8tj-RDOP-jbgdjy8h @@ -1387,7 +1379,7 @@ 0 99 - Decimal + Decimal fr.insee j6z06z1e-RDOP-jbgddnrd @@ -1429,8 +1421,8 @@ In which city do the Simpsons reside? - - radio-button + + radio-button fr.insee j334iumu @@ -1493,8 +1485,8 @@ Who is the Simpsons city mayor? - - checkbox + + checkbox fr.insee j6qdqoen @@ -1557,8 +1549,8 @@ In which state do The Simpsons reside? - - drop-down-list + + drop-down-list fr.insee j4nwo00f @@ -1725,7 +1717,7 @@ - + fr.insee j335cu3c @@ -1735,7 +1727,7 @@ - + fr.insee @@ -1762,8 +1754,8 @@ - - + + fr.insee @@ -1790,8 +1782,8 @@ - - + + fr.insee @@ -1818,8 +1810,8 @@ - - + + fr.insee @@ -1846,7 +1838,7 @@ - + fr.insee @@ -1956,7 +1948,7 @@ - + fr.insee j6p2mvca @@ -1966,9 +1958,9 @@ - - - radio-button + + + radio-button fr.insee jbdxh138 @@ -1995,10 +1987,10 @@ - - - - radio-button + + + + radio-button fr.insee jbdxh138 @@ -2025,10 +2017,10 @@ - - - - radio-button + + + + radio-button fr.insee jbdxh138 @@ -2055,10 +2047,10 @@ - - - - radio-button + + + + radio-button fr.insee jbdxh138 @@ -2085,7 +2077,7 @@ - + @@ -2189,7 +2181,7 @@ - + fr.insee j6qeytgc @@ -2199,9 +2191,9 @@ - - - drop-down-list + + + drop-down-list fr.insee jbdxh138 @@ -2228,10 +2220,10 @@ - - - - drop-down-list + + + + drop-down-list fr.insee jbdxh138 @@ -2258,10 +2250,10 @@ - - - - drop-down-list + + + + drop-down-list fr.insee jbdxh138 @@ -2288,10 +2280,10 @@ - - - - drop-down-list + + + + drop-down-list fr.insee jbdxh138 @@ -2318,7 +2310,7 @@ - + @@ -2444,7 +2436,7 @@ - + fr.insee j6z087mq @@ -2454,9 +2446,9 @@ - - - checkbox + + + checkbox fr.insee jbdxricm @@ -2483,10 +2475,10 @@ - - - - checkbox + + + + checkbox fr.insee jbdxricm @@ -2513,10 +2505,10 @@ - - - - checkbox + + + + checkbox fr.insee jbdxricm @@ -2543,10 +2535,10 @@ - - - - checkbox + + + + checkbox fr.insee jbdxricm @@ -2573,10 +2565,10 @@ - - - - checkbox + + + + checkbox fr.insee jbdxricm @@ -2603,7 +2595,7 @@ - + @@ -2840,7 +2832,7 @@ - + fr.insee j4nwh16i @@ -2850,7 +2842,7 @@ - + fr.insee j4nwc63q-secondDimension-fakeCL-1 @@ -2860,13 +2852,13 @@ - + 0 100 - Decimal + Decimal fr.insee j4nwc63q-RDOP-jbgde5yl @@ -2879,14 +2871,14 @@ - - + + 0 100 - Decimal + Decimal fr.insee j4nwc63q-RDOP-jbgd2x2t @@ -2899,14 +2891,14 @@ - - + + 0 100 - Decimal + Decimal fr.insee j4nwc63q-RDOP-jbgdjypz @@ -2919,14 +2911,14 @@ - - + + 0 100 - Decimal + Decimal fr.insee j4nwc63q-RDOP-jbgdcftu @@ -2939,14 +2931,14 @@ - - + + 0 100 - Decimal + Decimal fr.insee j4nwc63q-RDOP-jbgdiyfe @@ -2959,14 +2951,14 @@ - - + + 0 100 - Decimal + Decimal fr.insee j4nwc63q-RDOP-jbgdj1wd @@ -2979,14 +2971,14 @@ - - + + 0 100 - Decimal + Decimal fr.insee j4nwc63q-RDOP-jbgddylk @@ -2999,14 +2991,14 @@ - - + + 0 100 - Decimal + Decimal fr.insee j4nwc63q-RDOP-jbgd3jj6 @@ -3019,14 +3011,14 @@ - - + + 0 100 - Decimal + Decimal fr.insee j4nwc63q-RDOP-jbgd4w3k @@ -3039,14 +3031,14 @@ - - + + 0 100 - Decimal + Decimal fr.insee j4nwc63q-RDOP-jbgd4w4k @@ -3059,7 +3051,7 @@ - + @@ -3251,7 +3243,7 @@ - + fr.insee j77dav9b @@ -3261,7 +3253,7 @@ - + fr.insee j4nw0rr6-secondDimension-fakeCL-1 @@ -3271,9 +3263,9 @@ - - - drop-down-list + + + drop-down-list fr.insee jbdyh6b5 @@ -3301,10 +3293,10 @@ - - - - drop-down-list + + + + drop-down-list fr.insee jbdyh6b5 @@ -3332,10 +3324,10 @@ - - - - drop-down-list + + + + drop-down-list fr.insee jbdyh6b5 @@ -3363,10 +3355,10 @@ - - - - drop-down-list + + + + drop-down-list fr.insee jbdyh6b5 @@ -3394,8 +3386,8 @@ - - + + fr.insee @@ -3410,8 +3402,8 @@ - - + + fr.insee @@ -3426,8 +3418,8 @@ - - + + fr.insee @@ -3442,8 +3434,8 @@ - - + + fr.insee @@ -3458,7 +3450,7 @@ - + @@ -4003,7 +3995,7 @@ - + fr.insee j6p2kivg @@ -4013,7 +4005,7 @@ - + fr.insee jbdye1wa @@ -4023,7 +4015,7 @@ - + fr.insee @@ -4051,8 +4043,8 @@ - - + + fr.insee @@ -4080,8 +4072,8 @@ - - + + fr.insee @@ -4109,8 +4101,8 @@ - - + + fr.insee @@ -4138,8 +4130,8 @@ - - + + fr.insee @@ -4167,8 +4159,8 @@ - - + + fr.insee @@ -4196,8 +4188,8 @@ - - + + fr.insee @@ -4225,8 +4217,8 @@ - - + + fr.insee @@ -4254,8 +4246,8 @@ - - + + fr.insee @@ -4283,8 +4275,8 @@ - - + + fr.insee @@ -4312,8 +4304,8 @@ - - + + fr.insee @@ -4341,8 +4333,8 @@ - - + + fr.insee @@ -4370,8 +4362,8 @@ - - + + fr.insee @@ -4399,8 +4391,8 @@ - - + + fr.insee @@ -4428,8 +4420,8 @@ - - + + fr.insee @@ -4457,8 +4449,8 @@ - - + + fr.insee @@ -4486,8 +4478,8 @@ - - + + fr.insee @@ -4515,8 +4507,8 @@ - - + + fr.insee @@ -4544,8 +4536,8 @@ - - + + fr.insee @@ -4573,8 +4565,8 @@ - - + + fr.insee @@ -4602,8 +4594,8 @@ - - + + fr.insee @@ -4631,8 +4623,8 @@ - - + + fr.insee @@ -4660,8 +4652,8 @@ - - + + fr.insee @@ -4689,8 +4681,8 @@ - - + + fr.insee @@ -4718,7 +4710,7 @@ - + fr.insee @@ -5183,7 +5175,7 @@ - + fr.insee j6qg8rc6-secondDimension-fakeCL-1 @@ -5193,7 +5185,7 @@ - + fr.insee @@ -5208,8 +5200,8 @@ - - + + fr.insee @@ -5224,8 +5216,8 @@ - - + + fr.insee @@ -5240,8 +5232,8 @@ - - + + fr.insee @@ -5256,8 +5248,8 @@ - - + + fr.insee @@ -5272,8 +5264,8 @@ - - + + fr.insee @@ -5288,8 +5280,8 @@ - - + + fr.insee @@ -5304,8 +5296,8 @@ - - + + fr.insee @@ -5320,8 +5312,8 @@ - - + + fr.insee @@ -5336,8 +5328,8 @@ - - + + fr.insee @@ -5352,14 +5344,14 @@ - - + + 0 120 - Decimal + Decimal fr.insee j6qg8rc6-RDOP-jbgdfndq @@ -5372,14 +5364,14 @@ - - + + 0 120 - Decimal + Decimal fr.insee j6qg8rc6-RDOP-jbgd7osi @@ -5392,14 +5384,14 @@ - - + + 0 120 - Decimal + Decimal fr.insee j6qg8rc6-RDOP-jbgd7bnw @@ -5412,14 +5404,14 @@ - - + + 0 120 - Decimal + Decimal fr.insee j6qg8rc6-RDOP-jbgd9k71 @@ -5432,14 +5424,14 @@ - - + + 0 120 - Decimal + Decimal fr.insee j6qg8rc6-RDOP-jbgdimks @@ -5452,14 +5444,14 @@ - - + + 0 120 - Decimal + Decimal fr.insee j6qg8rc6-RDOP-jbgdjquz @@ -5472,14 +5464,14 @@ - - + + 0 120 - Decimal + Decimal fr.insee j6qg8rc6-RDOP-jbgdd2w3 @@ -5492,14 +5484,14 @@ - - + + 0 120 - Decimal + Decimal fr.insee j6qg8rc6-RDOP-jbgdkosc @@ -5512,14 +5504,14 @@ - - + + 0 120 - Decimal + Decimal fr.insee j6qg8rc6-RDOP-jbgdk0x4 @@ -5532,14 +5524,14 @@ - - + + 0 120 - Decimal + Decimal fr.insee j6qg8rc6-RDOP-jbgd2wgf @@ -5552,7 +5544,7 @@ - + @@ -10029,11 +10021,10 @@ INSEE-COMMUN-MNR-DateTimedate 0.1.0 jj/mm/aaaa - date + date - - + fr.insee StudyUnit-i6vwid 0.1.0 @@ -10064,7 +10055,7 @@ fr.insee InstrumentScheme-i6vwid 0.1.0 - + fr.insee Instrument-i6vwid 0.1.0 @@ -10081,5 +10072,4 @@ - - \ No newline at end of file + \ No newline at end of file From 48e3ef1cc75d4eca81ddf410acfc19ca88ad4e27 Mon Sep 17 00:00:00 2001 From: BulotF Date: Wed, 12 Jun 2019 12:46:45 +0200 Subject: [PATCH 003/439] update namespaces DDI 3.2 into DDI 3.3 in : - preCode DDI - inputs/ddi - transformations/ddi2out --- .../xslt/inputs/ddi/source-fixed.xsl | 4 ++-- .../transformations/ddi2fr/ddi2fr-fixed.xsl | 4 ++-- .../transformations/ddi2js/ddi2js-fixed.xsl | 4 ++-- .../transformations/ddi2odt/ddi2odt-fixed.xsl | 4 ++-- .../transformations/ddi2pdf/ddi2pdf-fixed.xsl | 4 ++-- src/main/resources/xslt/util/ddi/cleaning.xsl | 4 ++-- .../resources/xslt/util/ddi/dereferencing.xsl | 20 +++++++++---------- src/main/resources/xslt/util/ddi/titling.xsl | 4 ++-- 8 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/main/resources/xslt/inputs/ddi/source-fixed.xsl b/src/main/resources/xslt/inputs/ddi/source-fixed.xsl index d43ddb32a..5e01b77a8 100644 --- a/src/main/resources/xslt/inputs/ddi/source-fixed.xsl +++ b/src/main/resources/xslt/inputs/ddi/source-fixed.xsl @@ -1,8 +1,8 @@ diff --git a/src/main/resources/xslt/transformations/ddi2fr/ddi2fr-fixed.xsl b/src/main/resources/xslt/transformations/ddi2fr/ddi2fr-fixed.xsl index d7f8dde97..8e976fb1e 100644 --- a/src/main/resources/xslt/transformations/ddi2fr/ddi2fr-fixed.xsl +++ b/src/main/resources/xslt/transformations/ddi2fr/ddi2fr-fixed.xsl @@ -5,8 +5,8 @@ xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl" xmlns:eno="http://xml.insee.fr/apps/eno" xmlns:enoddi="http://xml.insee.fr/apps/eno/ddi" xmlns:enofr="http://xml.insee.fr/apps/eno/form-runner" - xmlns:enoddi2fr="http://xml.insee.fr/apps/eno/ddi2form-runner" xmlns:d="ddi:datacollection:3_2" - xmlns:r="ddi:reusable:3_2" xmlns:l="ddi:logicalproduct:3_2" version="2.0"> + xmlns:enoddi2fr="http://xml.insee.fr/apps/eno/ddi2form-runner" xmlns:d="ddi:datacollection:3_3" + xmlns:r="ddi:reusable:3_3" xmlns:l="ddi:logicalproduct:3_3" version="2.0"> diff --git a/src/main/resources/xslt/transformations/ddi2js/ddi2js-fixed.xsl b/src/main/resources/xslt/transformations/ddi2js/ddi2js-fixed.xsl index 9ad5e6a16..fe32ee0a7 100644 --- a/src/main/resources/xslt/transformations/ddi2js/ddi2js-fixed.xsl +++ b/src/main/resources/xslt/transformations/ddi2js/ddi2js-fixed.xsl @@ -5,8 +5,8 @@ xmlns:enoodt="http://xml.insee.fr/apps/eno/out/odt" xmlns:enojs="http://xml.insee.fr/apps/eno/out/js" xmlns:enoddi2fr="http://xml.insee.fr/apps/eno/ddi2form-runner" - xmlns:d="ddi:datacollection:3_2" - xmlns:r="ddi:reusable:3_2" xmlns:l="ddi:logicalproduct:3_2" version="2.0"> + xmlns:d="ddi:datacollection:3_3" + xmlns:r="ddi:reusable:3_3" xmlns:l="ddi:logicalproduct:3_3" version="2.0"> diff --git a/src/main/resources/xslt/transformations/ddi2odt/ddi2odt-fixed.xsl b/src/main/resources/xslt/transformations/ddi2odt/ddi2odt-fixed.xsl index fdff4f97b..a53cbc092 100644 --- a/src/main/resources/xslt/transformations/ddi2odt/ddi2odt-fixed.xsl +++ b/src/main/resources/xslt/transformations/ddi2odt/ddi2odt-fixed.xsl @@ -4,8 +4,8 @@ xmlns:enoddi="http://xml.insee.fr/apps/eno/ddi" xmlns:enoodt="http://xml.insee.fr/apps/eno/out/odt" xmlns:enoddi2fr="http://xml.insee.fr/apps/eno/ddi2form-runner" - xmlns:d="ddi:datacollection:3_2" - xmlns:r="ddi:reusable:3_2" xmlns:l="ddi:logicalproduct:3_2" version="2.0"> + xmlns:d="ddi:datacollection:3_3" + xmlns:r="ddi:reusable:3_3" xmlns:l="ddi:logicalproduct:3_3" version="2.0"> diff --git a/src/main/resources/xslt/transformations/ddi2pdf/ddi2pdf-fixed.xsl b/src/main/resources/xslt/transformations/ddi2pdf/ddi2pdf-fixed.xsl index 34b02630b..d188d8722 100644 --- a/src/main/resources/xslt/transformations/ddi2pdf/ddi2pdf-fixed.xsl +++ b/src/main/resources/xslt/transformations/ddi2pdf/ddi2pdf-fixed.xsl @@ -4,8 +4,8 @@ xmlns:enoddi="http://xml.insee.fr/apps/eno/ddi" xmlns:enopdf="http://xml.insee.fr/apps/eno/out/form-runner" xmlns:enoddi2pdf="http://xml.insee.fr/apps/eno/ddi2pdf" - xmlns:d="ddi:datacollection:3_2" - xmlns:r="ddi:reusable:3_2" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:l="ddi:logicalproduct:3_2" version="2.0"> + xmlns:d="ddi:datacollection:3_3" + xmlns:r="ddi:reusable:3_3" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:l="ddi:logicalproduct:3_3" version="2.0"> diff --git a/src/main/resources/xslt/util/ddi/cleaning.xsl b/src/main/resources/xslt/util/ddi/cleaning.xsl index d2305854e..d83ea0b49 100644 --- a/src/main/resources/xslt/util/ddi/cleaning.xsl +++ b/src/main/resources/xslt/util/ddi/cleaning.xsl @@ -1,8 +1,8 @@ diff --git a/src/main/resources/xslt/util/ddi/dereferencing.xsl b/src/main/resources/xslt/util/ddi/dereferencing.xsl index 4707f165c..aa598bd9c 100644 --- a/src/main/resources/xslt/util/ddi/dereferencing.xsl +++ b/src/main/resources/xslt/util/ddi/dereferencing.xsl @@ -1,9 +1,9 @@ + xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl" xmlns:d="ddi:datacollection:3_3" + xmlns:r="ddi:reusable:3_3" xmlns:l="ddi:logicalproduct:3_3" xmlns:g="ddi:group:3_3" + xmlns:s="ddi:studyunit:3_3" xmlns:xs="http://www.w3.org/2001/XMLSchema" version="2.0"> @@ -141,15 +141,15 @@ - + xmlns:pr="ddi:ddiprofile:3_3" + xmlns:c="ddi:conceptualcomponent:3_3" + xmlns:cm="ddi:comparative:3_3"> @@ -297,7 +297,7 @@ @@ -258,9 +258,9 @@ - @@ -268,7 +268,7 @@ - @@ -698,8 +698,8 @@ + and not(d:StructuredMixedGridResponseDomain/d:GridResponseDomainInMixed[not(d:NominalDomain) and not(d:AttachmentLocation)])] + and parent::d:GridResponseDomainInMixed and following-sibling::d:GridAttachment//d:SelectDimension]"> + and not(d:StructuredMixedGridResponseDomain/d:GridResponseDomainInMixed[not(d:NominalDomain) and not(d:AttachmentLocation)])] + and parent::d:GridResponseDomainInMixed and following-sibling::d:GridAttachment//d:SelectDimension]]" mode="enoddi:get-label" priority="2"> @@ -884,8 +884,8 @@ diff --git a/src/main/resources/xslt/transformations/ddi2fr/drivers.fods b/src/main/resources/xslt/transformations/ddi2fr/drivers.fods index 1baf9f7a8..b90265b90 100644 --- a/src/main/resources/xslt/transformations/ddi2fr/drivers.fods +++ b/src/main/resources/xslt/transformations/ddi2fr/drivers.fods @@ -1,7 +1,7 @@ - 2009-04-16T11:32:48.39P1DT2H58M14S163LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-04-10T14:34:48.795000000François Bulot + 2009-04-16T11:32:48.39P1DT3H3M9S164LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-12T12:48:19.613000000François Bulot 0 @@ -14,7 +14,7 @@ 0 - 60 + 57 0 0 0 @@ -77,8 +77,8 @@ true true true - \\S20slinng\M20-207-RICOH MP2554SP - 1hP+/1xcUzIwc2xpbm5nXE0yMC0yMDctUklDT0ggTVAyNTU0U1AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUklDT0ggUENMNiBVbml2ZXJzYWxEcml2ZXIgVjQuMQAWAAEA8hIAAAAAAAAEAAhSAAAEdAAAM1ROVwAAAAAKAFwAXABTADIAMABzAGwAaQBuAG4AZwBcAE0AMgAwAC0AMgAwADcALQBSAEkAQwBPAEgAIABNAFAAMgA1AAAAAAABBAAg3AAMEg//gAMBAAkAmgs0CGQAAQAHAFgCAQACAFgCAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAIAAAAAAgAAAQAAAAAAAAAAAAAAAAAAAAAAAAAxMERSDFhkDpG++hkAAAAAKQQAAHicdVPRcuMwCPwXP/ch6dy01/yMB0vYVouERkJJ05v790OyE6eX9M1mVwss8KfLAsFCshEmzL0LsYgkOHeHDopw/cxIaKR7+o/q0TqQc0SlRgIXFExozobQKplQBNOMYD3bxkkuaMTiCIWqnC2R8HNFeRw1VLIS2KtYAI/9ql4LqYo8uVAZt1h7gaMLLek7D2s8cPJALeeq6+zjNxmOyEdMBGcLAv3oCCPIrERFIUZyBsRx+GL2R6BSJfa7Xe2ATfEYJLuvVucvjZmShX2EiKmG+xKcKOb9A+zkrMzquanJfj+/PqAQhkk5+vzQPb+97n5UWRhLXT+IrIn2+5c3JSW0xSAGgjTV6kcnws2w1s5Td9/vhh7UNo+QOTkdCtD6RH/VjuZWnTgn3R9XB5BYo2r3ZdA6KP3IKNeI2s+l/u7retXKZ8RtTRQgDhPaSbdxFFXmqODA/EE3KjbBaUxa2sA64nSNV81LJHDA7Wl/C3HU8vk2gWHiNJwUGwjMh+74aXaCzb/MVNZWX5o/U4I4O5PXnT7q2XC6+AZEgp8CuQldK8MAg94XE6lB25m0BLqVGb83ojeodmx9lWWmy5/h6DBXD5fK7yTV4e2+7w4yz9q1KdKbkpIaoZwL+PcfWFN6vgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASAENPTVBBVF9EVVBMRVhfTU9ERRQARHVwbGV4TW9kZTo6TG9uZ0VkZ2U= + Envoyer à OneNote 16 + xQT+/0Vudm95ZXIgw6AgT25lTm90ZcKgMTYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAU2VuZCB0byBNaWNyb3NvZnQgT25lTm90ZSAxNiBEcgAWAAEA4gMAAAAAAAAEAAhSAAAEdAAAM1ROVwAAAAAKAEUAbgB2AG8AeQBlAHIAIADgACAATwBuAGUATgBvAHQAZQCgADEANgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBAAG3AD8AgMvAAABAAkAmgs0CGQAAQAPAFgCAgABAFgCAwABAEEANAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAQAAAAIAAAABAAAA/////wAAAAAAAAAAAAAAAAAAAABESU5VIgDAAPwCAACsE9jAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAMAAAABTTVRKAAAAABAAsABTAGUAbgBkACAAdABvACAATQBpAGMAcgBvAHMAbwBmAHQAIABPAG4AZQBOAG8AdABlACAAMQA2ACAARAByAGkAdgBlAHIAAABSRVNETEwAVW5pcmVzRExMAFBhcGVyU2l6ZQBMRVRURVIAT3JpZW50YXRpb24AUE9SVFJBSVQAUmVzb2x1dGlvbgBEUEk2MDAAQ29sb3JNb2RlADI0YnBwAAAAAAAAAAAAAAAAAAAAABIAQ09NUEFUX0RVUExFWF9NT0RFEwBEdXBsZXhNb2RlOjpVbmtub3du zxx @@ -591,7 +591,7 @@ ???(???) - 00/00/0000, 00:00:00 + 00/00/0000, 00:00:00 @@ -896,7 +896,7 @@ - l:Code[ancestor::r:CodeListReference[parent::d:CodeDomain[parent::d:QuestionItem or parent::d:GridResponseDomain or parent::d:ResponseDomainInMixed]]] + l:Code[ancestor::r:CodeListReference[parent::d:CodeDomain[parent::d:QuestionItem or parent::d:GridResponseDomainInMixed or parent::d:ResponseDomainInMixed]]] xf-item @@ -965,7 +965,7 @@ - d:GridResponseDomain[ancestor::d:QuestionGrid] + d:GridResponseDomainInMixed[ancestor::d:QuestionGrid] Cell @@ -1056,7 +1056,7 @@ - d:QuestionGrid[(d:GridDimension/@rank='2' or d:StructuredMixedGridResponseDomain/d:GridResponseDomain[not(d:NominalDomain) and not(d:AttachmentLocation)]) and not(d:GridDimension/d:Roster)] + d:QuestionGrid[(d:GridDimension/@rank='2' or d:StructuredMixedGridResponseDomain/d:GridResponseDomainInMixed[not(d:NominalDomain) and not(d:AttachmentLocation)]) and not(d:GridDimension/d:Roster)] Table @@ -1071,7 +1071,7 @@ - d:QuestionGrid[not(d:GridDimension/@rank='2') and not(d:StructuredMixedGridResponseDomain/d:GridResponseDomain[not(d:NominalDomain) and not(d:AttachmentLocation)])] + d:QuestionGrid[not(d:GridDimension/@rank='2') and not(d:StructuredMixedGridResponseDomain/d:GridResponseDomainInMixed[not(d:NominalDomain) and not(d:AttachmentLocation)])] MultipleChoiceQuestion diff --git a/src/main/resources/xslt/transformations/ddi2fr/tree-navigation.fods b/src/main/resources/xslt/transformations/ddi2fr/tree-navigation.fods index 31b3beb97..6a61bc741 100644 --- a/src/main/resources/xslt/transformations/ddi2fr/tree-navigation.fods +++ b/src/main/resources/xslt/transformations/ddi2fr/tree-navigation.fods @@ -1,26 +1,26 @@ - 2009-04-16T11:32:48.39PT6H10M49S31LibreOffice/5.4.5.1$Windows_X86_64 LibreOffice_project/79c9829dd5d8054ec39a82dc51cd9eff340dbee82018-05-22T17:00:25.815000000François Bulot + 2009-04-16T11:32:48.39PT6H11M28S32LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-12T12:49:50.058000000François Bulot 0 0 50242 - 3898 + 3889 view1 - 1 - 4 + 2 + 5 0 0 0 0 2 - 0 + 1 0 0 0 @@ -32,7 +32,7 @@ Sheet1 - 1616 + 1655 0 100 60 @@ -77,8 +77,8 @@ true true true - \\S20slinng\m20-207-ricoh mp2554sp - 1hP+/1xcUzIwc2xpbm5nXG0yMC0yMDctcmljb2ggbXAyNTU0c3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUklDT0ggUENMNiBVbml2ZXJzYWxEcml2ZXIgVjQuMQAWAAEA8hIAAAAAAAAEAAhSAAAEdAAAM1ROVwAAAAAKAFwAXABTADIAMABzAGwAaQBuAG4AZwBcAG0AMgAwAC0AMgAwADcALQByAGkAYwBvAGgAIABtAHAAMgA1AAAAAAABBAAg3AAMEg//gAMBAAkAmgs0CGQAAQAHAFgCAQACAFgCAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAIAAAAAAgAAAQAAAAAAAAAAAAAAAAAAAAAAAAAxMERSDFhkDpG++hkAAAAAKQQAAHicdVPRcuMwCPwXP/ch6dy01/yMB0vYVouERkJJ05v790OyE6eX9M1mVwss8KfLAsFCshEmzL0LsYgkOHeHDopw/cxIaKR7+o/q0TqQc0SlRgIXFExozobQKplQBNOMYD3bxkkuaMTiCIWqnC2R8HNFeRw1VLIS2KtYAI/9ql4LqYo8uVAZt1h7gaMLLek7D2s8cPJALeeq6+zjNxmOyEdMBGcLAv3oCCPIrERFIUZyBsRx+GL2R6BSJfa7Xe2ATfEYJLuvVucvjZmShX2EiKmG+xKcKOb9A+zkrMzquanJfj+/PqAQhkk5+vzQPb+97n5UWRhLXT+IrIn2+5c3JSW0xSAGgjTV6kcnws2w1s5Td9/vhh7UNo+QOTkdCtD6RH/VjuZWnTgn3R9XB5BYo2r3ZdA6KP3IKNeI2s+l/u7retXKZ8RtTRQgDhPaSbdxFFXmqODA/EE3KjbBaUxa2sA64nSNV81LJHDA7Wl/C3HU8vk2gWHiNJwUGwjMh+74aXaCzb/MVNZWX5o/U4I4O5PXnT7q2XC6+AZEgp8CuQldK8MAg94XE6lB25m0BLqVGb83ojeodmx9lWWmy5/h6DBXD5fK7yTV4e2+7w4yz9q1KdKbkpIaoZwL+PcfWFN6vgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASAENPTVBBVF9EVVBMRVhfTU9ERRQARHVwbGV4TW9kZTo6TG9uZ0VkZ2U= + Envoyer à OneNote 16 + xQT+/0Vudm95ZXIgw6AgT25lTm90ZcKgMTYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAU2VuZCB0byBNaWNyb3NvZnQgT25lTm90ZSAxNiBEcgAWAAEA4gMAAAAAAAAEAAhSAAAEdAAAM1ROVwAAAAAKAEUAbgB2AG8AeQBlAHIAIADgACAATwBuAGUATgBvAHQAZQCgADEANgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBAAG3AD8AgMvAAABAAkAmgs0CGQAAQAPAFgCAgABAFgCAwABAEEANAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAQAAAAIAAAABAAAA/////wAAAAAAAAAAAAAAAAAAAABESU5VIgDAAPwCAACsE9jAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAMAAAABTTVRKAAAAABAAsABTAGUAbgBkACAAdABvACAATQBpAGMAcgBvAHMAbwBmAHQAIABPAG4AZQBOAG8AdABlACAAMQA2ACAARAByAGkAdgBlAHIAAABSRVNETEwAVW5pcmVzRExMAFBhcGVyU2l6ZQBMRVRURVIAT3JpZW50YXRpb24AUE9SVFJBSVQAUmVzb2x1dGlvbgBEUEk2MDAAQ29sb3JNb2RlADI0YnBwAAAAAAAAAAAAAAAAAAAAABIAQ09NUEFUX0RVUExFWF9NT0RFEwBEdXBsZXhNb2RlOjpVbmtub3du zxx @@ -517,7 +517,7 @@ - + @@ -570,7 +570,7 @@ ???(???) - 00/00/0000, 00:00:00 + 00/00/0000, 00:00:00 @@ -632,13 +632,13 @@ - d:QuestionGrid[not(d:GridDimension/@rank='2') and not(d:StructuredMixedGridResponseDomain/d:GridResponseDomain[not(d:NominalDomain) and not(d:AttachmentLocation)])] + d:QuestionGrid[not(d:GridDimension/@rank='2') and not(d:StructuredMixedGridResponseDomain/d:GridResponseDomainInMixed[not(d:NominalDomain) and not(d:AttachmentLocation)])] - .//d:GridResponseDomain/* + .//d:GridResponseDomainInMixed/* - In MultipleChoiceQuestion, only the child of GridResponseDomain are considered as child (GridDimension and GridResponseDomain are escaped to prevent Table&Cell drivers). + In MultipleChoiceQuestion, only the child of GridResponseDomainInMixed are considered as child (GridDimension and GridResponseDomain are escaped to prevent Table&Cell drivers). From 31e3423d1d9067a129f71e4eb31cac43e1cba266 Mon Sep 17 00:00:00 2001 From: BulotF Date: Wed, 12 Jun 2019 14:12:40 +0200 Subject: [PATCH 005/439] d:GridResponseDomain -> InMixed ddi2out other than ddi2fr --- .../xslt/transformations/ddi2js/drivers.fods | 22 +- .../ddi2js/tree-navigation.fods | 214 ++++++++++------- .../xslt/transformations/ddi2odt/drivers.fods | 24 +- .../ddi2odt/tree-navigation.fods | 218 +++++++++++------- .../xslt/transformations/ddi2pdf/drivers.fods | 28 +-- .../ddi2pdf/tree-navigation.fods | 24 +- 6 files changed, 305 insertions(+), 225 deletions(-) diff --git a/src/main/resources/xslt/transformations/ddi2js/drivers.fods b/src/main/resources/xslt/transformations/ddi2js/drivers.fods index d0850b16b..de434e77f 100644 --- a/src/main/resources/xslt/transformations/ddi2js/drivers.fods +++ b/src/main/resources/xslt/transformations/ddi2js/drivers.fods @@ -1,7 +1,7 @@ - 2009-04-16T11:32:48.39P5DT1H46M26S216LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-04-09T16:31:55.962000000 + 2009-04-16T11:32:48.39P5DT1H47M20S217LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-12T13:47:33.456000000François Bulot 0 @@ -14,7 +14,7 @@ 0 - 59 + 35 0 0 0 @@ -23,7 +23,7 @@ 0 0 0 - 27 + 0 0 100 60 @@ -32,7 +32,7 @@ Sheet1 - 1209 + 1655 0 100 60 @@ -77,8 +77,8 @@ true true true - \\S20slinng\M20-207-RICOH MP2554SP - 1hP+/1xcUzIwc2xpbm5nXE0yMC0yMDctUklDT0ggTVAyNTU0U1AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUklDT0ggUENMNiBVbml2ZXJzYWxEcml2ZXIgVjQuMQAWAAEA8hIAAAAAAAAEAAhSAAAEdAAAM1ROVwAAAAAKAFwAXABTADIAMABzAGwAaQBuAG4AZwBcAE0AMgAwAC0AMgAwADcALQBSAEkAQwBPAEgAIABNAFAAMgA1AAAAAAABBAAg3AAMEg//gAMBAAkAmgs0CGQAAQAHAFgCAQACAFgCAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAIAAAAAAgAAAQAAAAAAAAAAAAAAAAAAAAAAAAAxMERSDFhkDpG++hkAAAAAKQQAAHicdVPRcuMwCPwXP/ch6dy01/yMB0vYVouERkJJ05v790OyE6eX9M1mVwss8KfLAsFCshEmzL0LsYgkOHeHDopw/cxIaKR7+o/q0TqQc0SlRgIXFExozobQKplQBNOMYD3bxkkuaMTiCIWqnC2R8HNFeRw1VLIS2KtYAI/9ql4LqYo8uVAZt1h7gaMLLek7D2s8cPJALeeq6+zjNxmOyEdMBGcLAv3oCCPIrERFIUZyBsRx+GL2R6BSJfa7Xe2ATfEYJLuvVucvjZmShX2EiKmG+xKcKOb9A+zkrMzquanJfj+/PqAQhkk5+vzQPb+97n5UWRhLXT+IrIn2+5c3JSW0xSAGgjTV6kcnws2w1s5Td9/vhh7UNo+QOTkdCtD6RH/VjuZWnTgn3R9XB5BYo2r3ZdA6KP3IKNeI2s+l/u7retXKZ8RtTRQgDhPaSbdxFFXmqODA/EE3KjbBaUxa2sA64nSNV81LJHDA7Wl/C3HU8vk2gWHiNJwUGwjMh+74aXaCzb/MVNZWX5o/U4I4O5PXnT7q2XC6+AZEgp8CuQldK8MAg94XE6lB25m0BLqVGb83ojeodmx9lWWmy5/h6DBXD5fK7yTV4e2+7w4yz9q1KdKbkpIaoZwL+PcfWFN6vgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASAENPTVBBVF9EVVBMRVhfTU9ERRQARHVwbGV4TW9kZTo6TG9uZ0VkZ2U= + Envoyer à OneNote 16 + xQT+/0Vudm95ZXIgw6AgT25lTm90ZcKgMTYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAU2VuZCB0byBNaWNyb3NvZnQgT25lTm90ZSAxNiBEcgAWAAEA4gMAAAAAAAAEAAhSAAAEdAAAM1ROVwAAAAAKAEUAbgB2AG8AeQBlAHIAIADgACAATwBuAGUATgBvAHQAZQCgADEANgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBAAG3AD8AgMvAAABAAkAmgs0CGQAAQAPAFgCAgABAFgCAwABAEEANAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAQAAAAIAAAABAAAA/////wAAAAAAAAAAAAAAAAAAAABESU5VIgDAAPwCAACsE9jAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAMAAAABTTVRKAAAAABAAsABTAGUAbgBkACAAdABvACAATQBpAGMAcgBvAHMAbwBmAHQAIABPAG4AZQBOAG8AdABlACAAMQA2ACAARAByAGkAdgBlAHIAAABSRVNETEwAVW5pcmVzRExMAFBhcGVyU2l6ZQBMRVRURVIAT3JpZW50YXRpb24AUE9SVFJBSVQAUmVzb2x1dGlvbgBEUEk2MDAAQ29sb3JNb2RlADI0YnBwAAAAAAAAAAAAAAAAAAAAABIAQ09NUEFUX0RVUExFWF9NT0RFEwBEdXBsZXhNb2RlOjpVbmtub3du zxx @@ -588,7 +588,7 @@ ???(???) - 00/00/0000, 00:00:00 + 00/00/0000, 00:00:00 @@ -890,7 +890,7 @@ - l:Code[ancestor::r:CodeListReference[parent::d:CodeDomain[parent::d:QuestionItem or parent::d:GridResponseDomain or parent::d:ResponseDomainInMixed]]] + l:Code[ancestor::r:CodeListReference[parent::d:CodeDomain[parent::d:QuestionItem or parent::d:GridResponseDomainInMixed or parent::d:ResponseDomainInMixed]]] xf-item @@ -959,7 +959,7 @@ - d:GridResponseDomain[ancestor::d:QuestionGrid] + d:GridResponseDomainInMixed[ancestor::d:QuestionGrid] Cell @@ -1050,7 +1050,7 @@ - d:QuestionGrid[(d:GridDimension/@rank='2' or d:StructuredMixedGridResponseDomain/d:GridResponseDomain[not(d:NominalDomain) and not(d:AttachmentLocation)]) and not(d:GridDimension/d:Roster)] + d:QuestionGrid[(d:GridDimension/@rank='2' or d:StructuredMixedGridResponseDomain/d:GridResponseDomainInMixed[not(d:NominalDomain) and not(d:AttachmentLocation)]) and not(d:GridDimension/d:Roster)] Table @@ -1065,7 +1065,7 @@ - d:QuestionGrid[not(d:GridDimension/@rank='2') and not(d:StructuredMixedGridResponseDomain/d:GridResponseDomain[not(d:NominalDomain) and not(d:AttachmentLocation)])] + d:QuestionGrid[not(d:GridDimension/@rank='2') and not(d:StructuredMixedGridResponseDomain/d:GridResponseDomainInMixed[not(d:NominalDomain) and not(d:AttachmentLocation)])] MultipleChoiceQuestion diff --git a/src/main/resources/xslt/transformations/ddi2js/tree-navigation.fods b/src/main/resources/xslt/transformations/ddi2js/tree-navigation.fods index c4872c57f..9d2a1534b 100644 --- a/src/main/resources/xslt/transformations/ddi2js/tree-navigation.fods +++ b/src/main/resources/xslt/transformations/ddi2js/tree-navigation.fods @@ -1,7 +1,7 @@ - 2009-04-16T11:32:48.39PT3H22M40S32LibreOffice/5.2.6.2$Windows_X86_64 LibreOffice_project/a3100ed2409ebf1c212f5048fbe377c281438fdc2018-06-04T16:10:59.992000000 + 2009-04-16T11:32:48.39PT3H23M18S33LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-12T13:48:18.592000000François Bulot 0 @@ -13,14 +13,14 @@ view1 - 0 + 2 5 0 0 0 0 2 - 0 + 1 0 0 0 @@ -28,10 +28,11 @@ 100 60 true + false Sheet1 - 1376 + 1655 0 100 60 @@ -52,6 +53,7 @@ 1 1 true + false @@ -75,8 +77,8 @@ true true true - \\S20slinng\m20-207-ricoh mp2554sp - 0RP+/1xcUzIwc2xpbm5nXG0yMC0yMDctcmljb2ggbXAyNTU0c3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUklDT0ggUENMNiBVbml2ZXJzYWxEcml2ZXIgVjQuMQAWAAEA8hIAAAAAAAAEAAhSAAAEdAAAM1ROVwAAAAAKAFwAXABTADIAMABzAGwAaQBuAG4AZwBcAG0AMgAwAC0AMgAwADcALQByAGkAYwBvAGgAIABtAHAAMgA1AAAAAAABBAAg3AAMEg//gAMBAAkAmgs0CGQAAQAHAFgCAQACAFgCAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAIAAAAAAgAAAQAAAAAAAAAAAAAAAAAAAAAAAAAxMERSDFhkDpG++hkAAAAAKQQAAHicdVPRcuMwCPwXP/ch6dy01/yMB0vYVouERkJJ05v790OyE6eX9M1mVwss8KfLAsFCshEmzL0LsYgkOHeHDopw/cxIaKR7+o/q0TqQc0SlRgIXFExozobQKplQBNOMYD3bxkkuaMTiCIWqnC2R8HNFeRw1VLIS2KtYAI/9ql4LqYo8uVAZt1h7gaMLLek7D2s8cPJALeeq6+zjNxmOyEdMBGcLAv3oCCPIrERFIUZyBsRx+GL2R6BSJfa7Xe2ATfEYJLuvVucvjZmShX2EiKmG+xKcKOb9A+zkrMzquanJfj+/PqAQhkk5+vzQPb+97n5UWRhLXT+IrIn2+5c3JSW0xSAGgjTV6kcnws2w1s5Td9/vhh7UNo+QOTkdCtD6RH/VjuZWnTgn3R9XB5BYo2r3ZdA6KP3IKNeI2s+l/u7retXKZ8RtTRQgDhPaSbdxFFXmqODA/EE3KjbBaUxa2sA64nSNV81LJHDA7Wl/C3HU8vk2gWHiNJwUGwjMh+74aXaCzb/MVNZWX5o/U4I4O5PXnT7q2XC6+AZEgp8CuQldK8MAg94XE6lB25m0BLqVGb83ojeodmx9lWWmy5/h6DBXD5fK7yTV4e2+7w4yz9q1KdKbkpIaoZwL+PcfWFN6vgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASAENPTVBBVF9EVVBMRVhfTU9ERQ8ARFVQTEVYX0xPTkdFREdF + Envoyer à OneNote 16 + xQT+/0Vudm95ZXIgw6AgT25lTm90ZcKgMTYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAU2VuZCB0byBNaWNyb3NvZnQgT25lTm90ZSAxNiBEcgAWAAEA4gMAAAAAAAAEAAhSAAAEdAAAM1ROVwAAAAAKAEUAbgB2AG8AeQBlAHIAIADgACAATwBuAGUATgBvAHQAZQCgADEANgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBAAG3AD8AgMvAAABAAkAmgs0CGQAAQAPAFgCAgABAFgCAwABAEEANAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAQAAAAIAAAABAAAA/////wAAAAAAAAAAAAAAAAAAAABESU5VIgDAAPwCAACsE9jAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAMAAAABTTVRKAAAAABAAsABTAGUAbgBkACAAdABvACAATQBpAGMAcgBvAHMAbwBmAHQAIABPAG4AZQBOAG8AdABlACAAMQA2ACAARAByAGkAdgBlAHIAAABSRVNETEwAVW5pcmVzRExMAFBhcGVyU2l6ZQBMRVRURVIAT3JpZW50YXRpb24AUE9SVFJBSVQAUmVzb2x1dGlvbgBEUEk2MDAAQ29sb3JNb2RlADI0YnBwAAAAAAAAAAAAAAAAAAAAABIAQ09NUEFUX0RVUExFWF9NT0RFEwBEdXBsZXhNb2RlOjpVbmtub3du zxx @@ -153,19 +155,6 @@ € - - - - € - - - - - - - - € - - € @@ -187,133 +176,133 @@ € - + € - + - € - + - + € - + - € - + - + - + - + - - + - - - + + + - + € - + € - + - € - + - - - + + + - + - + - + - - + - - - + + + - + € - + € - + - € - + - - - + + + - + : - + : : - + : - + @@ -360,93 +349,144 @@ : - + - + - - + - + - + - - + - + - + - - + - + - + - - + - + € - + - € - + - + € - + - € - + - + € - + - € - + - + € - + - € - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -527,15 +567,15 @@ - ??? (???) + ???(???) - 00/00/0000, 00:00:00 + 00/00/0000, 00:00:00 - Page 1 / 99 + Page 1/ 99 @@ -592,13 +632,13 @@ - d:QuestionGrid[not(d:GridDimension/@rank='2') and not(d:StructuredMixedGridResponseDomain/d:GridResponseDomain[not(d:NominalDomain) and not(d:AttachmentLocation)])] + d:QuestionGrid[not(d:GridDimension/@rank='2') and not(d:StructuredMixedGridResponseDomain/d:GridResponseDomainInMixed[not(d:NominalDomain) and not(d:AttachmentLocation)])] - .//d:GridResponseDomain/* + .//d:GridResponseDomainInMixed/* - In MultipleChoiceQuestion, only the child of GridResponseDomain are considered as child (GridDimension and GridResponseDomain are escaped to prevent Table&Cell drivers). + In MultipleChoiceQuestion, only the child of GridResponseDomainInMixed are considered as child (GridDimension and GridResponseDomain are escaped to prevent Table&Cell drivers). diff --git a/src/main/resources/xslt/transformations/ddi2odt/drivers.fods b/src/main/resources/xslt/transformations/ddi2odt/drivers.fods index 3eda38b73..238540f22 100644 --- a/src/main/resources/xslt/transformations/ddi2odt/drivers.fods +++ b/src/main/resources/xslt/transformations/ddi2odt/drivers.fods @@ -1,7 +1,7 @@ - 2009-04-16T11:32:48.39P3DT6H13M23S207LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-01-24T16:31:41.178000000 + 2009-04-16T11:32:48.39P3DT6H14M29S208LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-12T13:52:34.288000000François Bulot 0 @@ -13,8 +13,8 @@ view1 - 1 - 20 + 0 + 54 0 0 0 @@ -23,7 +23,7 @@ 0 0 0 - 0 + 35 0 100 60 @@ -32,7 +32,7 @@ Sheet1 - 1376 + 1655 0 100 60 @@ -77,8 +77,8 @@ true true true - \\S20slinng\M20-207-RICOH MP2554SP - 1hP+/1xcUzIwc2xpbm5nXE0yMC0yMDctUklDT0ggTVAyNTU0U1AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUklDT0ggUENMNiBVbml2ZXJzYWxEcml2ZXIgVjQuMQAWAAEA8hIAAAAAAAAEAAhSAAAEdAAAM1ROVwAAAAAKAFwAXABTADIAMABzAGwAaQBuAG4AZwBcAE0AMgAwAC0AMgAwADcALQBSAEkAQwBPAEgAIABNAFAAMgA1AAAAAAABBAAg3AAMEg//gAMBAAkAmgs0CGQAAQAHAFgCAQACAFgCAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAIAAAAAAgAAAQAAAAAAAAAAAAAAAAAAAAAAAAAxMERSDFhkDpG++hkAAAAAKQQAAHicdVPRcuMwCPwXP/ch6dy01/yMB0vYVouERkJJ05v790OyE6eX9M1mVwss8KfLAsFCshEmzL0LsYgkOHeHDopw/cxIaKR7+o/q0TqQc0SlRgIXFExozobQKplQBNOMYD3bxkkuaMTiCIWqnC2R8HNFeRw1VLIS2KtYAI/9ql4LqYo8uVAZt1h7gaMLLek7D2s8cPJALeeq6+zjNxmOyEdMBGcLAv3oCCPIrERFIUZyBsRx+GL2R6BSJfa7Xe2ATfEYJLuvVucvjZmShX2EiKmG+xKcKOb9A+zkrMzquanJfj+/PqAQhkk5+vzQPb+97n5UWRhLXT+IrIn2+5c3JSW0xSAGgjTV6kcnws2w1s5Td9/vhh7UNo+QOTkdCtD6RH/VjuZWnTgn3R9XB5BYo2r3ZdA6KP3IKNeI2s+l/u7retXKZ8RtTRQgDhPaSbdxFFXmqODA/EE3KjbBaUxa2sA64nSNV81LJHDA7Wl/C3HU8vk2gWHiNJwUGwjMh+74aXaCzb/MVNZWX5o/U4I4O5PXnT7q2XC6+AZEgp8CuQldK8MAg94XE6lB25m0BLqVGb83ojeodmx9lWWmy5/h6DBXD5fK7yTV4e2+7w4yz9q1KdKbkpIaoZwL+PcfWFN6vgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASAENPTVBBVF9EVVBMRVhfTU9ERRQARHVwbGV4TW9kZTo6TG9uZ0VkZ2U= + Envoyer à OneNote 16 + xQT+/0Vudm95ZXIgw6AgT25lTm90ZcKgMTYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAU2VuZCB0byBNaWNyb3NvZnQgT25lTm90ZSAxNiBEcgAWAAEA4gMAAAAAAAAEAAhSAAAEdAAAM1ROVwAAAAAKAEUAbgB2AG8AeQBlAHIAIADgACAATwBuAGUATgBvAHQAZQCgADEANgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBAAG3AD8AgMvAAABAAkAmgs0CGQAAQAPAFgCAgABAFgCAwABAEEANAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAQAAAAIAAAABAAAA/////wAAAAAAAAAAAAAAAAAAAABESU5VIgDAAPwCAACsE9jAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAMAAAABTTVRKAAAAABAAsABTAGUAbgBkACAAdABvACAATQBpAGMAcgBvAHMAbwBmAHQAIABPAG4AZQBOAG8AdABlACAAMQA2ACAARAByAGkAdgBlAHIAAABSRVNETEwAVW5pcmVzRExMAFBhcGVyU2l6ZQBMRVRURVIAT3JpZW50YXRpb24AUE9SVFJBSVQAUmVzb2x1dGlvbgBEUEk2MDAAQ29sb3JNb2RlADI0YnBwAAAAAAAAAAAAAAAAAAAAABIAQ09NUEFUX0RVUExFWF9NT0RFEwBEdXBsZXhNb2RlOjpVbmtub3du zxx @@ -588,7 +588,7 @@ ???(???) - 00/00/0000, 00:00:00 + 00/00/0000, 00:00:00 @@ -890,7 +890,7 @@ - l:Code[ancestor::r:CodeListReference[parent::d:CodeDomain[parent::d:QuestionItem or parent::d:GridResponseDomain or parent::d:ResponseDomainInMixed]]] + l:Code[ancestor::r:CodeListReference[parent::d:CodeDomain[parent::d:QuestionItem or parent::d:GridResponseDomainInMixed or parent::d:ResponseDomainInMixed]]] xf-item @@ -959,7 +959,7 @@ - d:GridResponseDomain[ancestor::d:QuestionGrid] + d:GridResponseDomainInMixed[ancestor::d:QuestionGrid] Cell @@ -1050,7 +1050,7 @@ - d:QuestionGrid[(d:GridDimension/@rank='2' or d:StructuredMixedGridResponseDomain/d:GridResponseDomain[not(d:NominalDomain) and not(d:AttachmentLocation)]) and not(d:GridDimension/d:Roster)] + d:QuestionGrid[(d:GridDimension/@rank='2' or d:StructuredMixedGridResponseDomain/d:GridResponseDomainInMixed[not(d:NominalDomain) and not(d:AttachmentLocation)]) and not(d:GridDimension/d:Roster)] Table @@ -1065,7 +1065,7 @@ - d:QuestionGrid[not(d:GridDimension/@rank='2') and not(d:StructuredMixedGridResponseDomain/d:GridResponseDomain[not(d:NominalDomain) and not(d:AttachmentLocation)])] + d:QuestionGrid[not(d:GridDimension/@rank='2') and not(d:StructuredMixedGridResponseDomain/d:GridResponseDomainInMixed[not(d:NominalDomain) and not(d:AttachmentLocation)])] MultipleChoiceQuestion diff --git a/src/main/resources/xslt/transformations/ddi2odt/tree-navigation.fods b/src/main/resources/xslt/transformations/ddi2odt/tree-navigation.fods index c4872c57f..7021acc42 100644 --- a/src/main/resources/xslt/transformations/ddi2odt/tree-navigation.fods +++ b/src/main/resources/xslt/transformations/ddi2odt/tree-navigation.fods @@ -1,26 +1,26 @@ - 2009-04-16T11:32:48.39PT3H22M40S32LibreOffice/5.2.6.2$Windows_X86_64 LibreOffice_project/a3100ed2409ebf1c212f5048fbe377c281438fdc2018-06-04T16:10:59.992000000 + 2009-04-16T11:32:48.39PT3H23M10S33LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-12T13:53:09.079000000François Bulot 0 0 54881 - 3578 + 3494 view1 - 0 + 1 5 0 0 0 0 2 - 0 + 1 0 0 0 @@ -28,10 +28,11 @@ 100 60 true + false Sheet1 - 1376 + 1655 0 100 60 @@ -52,6 +53,7 @@ 1 1 true + false @@ -75,8 +77,8 @@ true true true - \\S20slinng\m20-207-ricoh mp2554sp - 0RP+/1xcUzIwc2xpbm5nXG0yMC0yMDctcmljb2ggbXAyNTU0c3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUklDT0ggUENMNiBVbml2ZXJzYWxEcml2ZXIgVjQuMQAWAAEA8hIAAAAAAAAEAAhSAAAEdAAAM1ROVwAAAAAKAFwAXABTADIAMABzAGwAaQBuAG4AZwBcAG0AMgAwAC0AMgAwADcALQByAGkAYwBvAGgAIABtAHAAMgA1AAAAAAABBAAg3AAMEg//gAMBAAkAmgs0CGQAAQAHAFgCAQACAFgCAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAIAAAAAAgAAAQAAAAAAAAAAAAAAAAAAAAAAAAAxMERSDFhkDpG++hkAAAAAKQQAAHicdVPRcuMwCPwXP/ch6dy01/yMB0vYVouERkJJ05v790OyE6eX9M1mVwss8KfLAsFCshEmzL0LsYgkOHeHDopw/cxIaKR7+o/q0TqQc0SlRgIXFExozobQKplQBNOMYD3bxkkuaMTiCIWqnC2R8HNFeRw1VLIS2KtYAI/9ql4LqYo8uVAZt1h7gaMLLek7D2s8cPJALeeq6+zjNxmOyEdMBGcLAv3oCCPIrERFIUZyBsRx+GL2R6BSJfa7Xe2ATfEYJLuvVucvjZmShX2EiKmG+xKcKOb9A+zkrMzquanJfj+/PqAQhkk5+vzQPb+97n5UWRhLXT+IrIn2+5c3JSW0xSAGgjTV6kcnws2w1s5Td9/vhh7UNo+QOTkdCtD6RH/VjuZWnTgn3R9XB5BYo2r3ZdA6KP3IKNeI2s+l/u7retXKZ8RtTRQgDhPaSbdxFFXmqODA/EE3KjbBaUxa2sA64nSNV81LJHDA7Wl/C3HU8vk2gWHiNJwUGwjMh+74aXaCzb/MVNZWX5o/U4I4O5PXnT7q2XC6+AZEgp8CuQldK8MAg94XE6lB25m0BLqVGb83ojeodmx9lWWmy5/h6DBXD5fK7yTV4e2+7w4yz9q1KdKbkpIaoZwL+PcfWFN6vgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASAENPTVBBVF9EVVBMRVhfTU9ERQ8ARFVQTEVYX0xPTkdFREdF + Envoyer à OneNote 16 + xQT+/0Vudm95ZXIgw6AgT25lTm90ZcKgMTYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAU2VuZCB0byBNaWNyb3NvZnQgT25lTm90ZSAxNiBEcgAWAAEA4gMAAAAAAAAEAAhSAAAEdAAAM1ROVwAAAAAKAEUAbgB2AG8AeQBlAHIAIADgACAATwBuAGUATgBvAHQAZQCgADEANgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBAAG3AD8AgMvAAABAAkAmgs0CGQAAQAPAFgCAgABAFgCAwABAEEANAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAQAAAAIAAAABAAAA/////wAAAAAAAAAAAAAAAAAAAABESU5VIgDAAPwCAACsE9jAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAMAAAABTTVRKAAAAABAAsABTAGUAbgBkACAAdABvACAATQBpAGMAcgBvAHMAbwBmAHQAIABPAG4AZQBOAG8AdABlACAAMQA2ACAARAByAGkAdgBlAHIAAABSRVNETEwAVW5pcmVzRExMAFBhcGVyU2l6ZQBMRVRURVIAT3JpZW50YXRpb24AUE9SVFJBSVQAUmVzb2x1dGlvbgBEUEk2MDAAQ29sb3JNb2RlADI0YnBwAAAAAAAAAAAAAAAAAAAAABIAQ09NUEFUX0RVUExFWF9NT0RFEwBEdXBsZXhNb2RlOjpVbmtub3du zxx @@ -153,19 +155,6 @@ € - - - - € - - - - - - - - € - - € @@ -187,133 +176,133 @@ € - + € - + - € - + - + € - + - € - + - + - + - + - - + - - - + + + - + € - + € - + - € - + - - - + + + - + - + - + - - + - - - + + + - + € - + € - + - € - + - - - + + + - + : - + : : - + : - + @@ -360,93 +349,144 @@ : - + - + - - + - + - + - - + - + - + - - + - + - + - - + - + € - + - € - + - + € - + - € - + - + € - + - € - + - + € - + - € - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -477,7 +517,7 @@ - + @@ -527,15 +567,15 @@ - ??? (???) + ???(???) - 00/00/0000, 00:00:00 + 00/00/0000, 00:00:00 - Page 1 / 99 + Page 1/ 99 @@ -592,13 +632,13 @@ - d:QuestionGrid[not(d:GridDimension/@rank='2') and not(d:StructuredMixedGridResponseDomain/d:GridResponseDomain[not(d:NominalDomain) and not(d:AttachmentLocation)])] + d:QuestionGrid[not(d:GridDimension/@rank='2') and not(d:StructuredMixedGridResponseDomain/d:GridResponseDomainInMixed[not(d:NominalDomain) and not(d:AttachmentLocation)])] - .//d:GridResponseDomain/* + .//d:GridResponseDomainInMixed/* - In MultipleChoiceQuestion, only the child of GridResponseDomain are considered as child (GridDimension and GridResponseDomain are escaped to prevent Table&Cell drivers). + In MultipleChoiceQuestion, only the child of GridResponseDomainInMixed are considered as child (GridDimension and GridResponseDomain are escaped to prevent Table&Cell drivers). diff --git a/src/main/resources/xslt/transformations/ddi2pdf/drivers.fods b/src/main/resources/xslt/transformations/ddi2pdf/drivers.fods index bc459386c..8a57d6481 100644 --- a/src/main/resources/xslt/transformations/ddi2pdf/drivers.fods +++ b/src/main/resources/xslt/transformations/ddi2pdf/drivers.fods @@ -1,29 +1,29 @@ - 2009-04-16T11:32:48.39P2DT1H38M16S165LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-02-28T10:58:35.420000000François Bulot + 2009-04-16T11:32:48.39P2DT1H39M24S166LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-12T13:54:37.386000000François Bulot 0 0 67742 - 29859 + 29806 view1 - 2 - 25 + 0 + 58 0 0 0 0 2 - 1 + 0 0 0 - 0 + 39 0 100 60 @@ -77,8 +77,8 @@ true true true - \\S20slinng\M20-207-RICOH MP2554SP - 1hP+/1xcUzIwc2xpbm5nXE0yMC0yMDctUklDT0ggTVAyNTU0U1AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUklDT0ggUENMNiBVbml2ZXJzYWxEcml2ZXIgVjQuMQAWAAEA8hIAAAAAAAAEAAhSAAAEdAAAM1ROVwAAAAAKAFwAXABTADIAMABzAGwAaQBuAG4AZwBcAE0AMgAwAC0AMgAwADcALQBSAEkAQwBPAEgAIABNAFAAMgA1AAAAAAABBAAg3AAMEg//gAMBAAkAmgs0CGQAAQAHAFgCAQACAFgCAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAIAAAAAAgAAAQAAAAAAAAAAAAAAAAAAAAAAAAAxMERSDFhkDpG++hkAAAAAKQQAAHicdVPRcuMwCPwXP/ch6dy01/yMB0vYVouERkJJ05v790OyE6eX9M1mVwss8KfLAsFCshEmzL0LsYgkOHeHDopw/cxIaKR7+o/q0TqQc0SlRgIXFExozobQKplQBNOMYD3bxkkuaMTiCIWqnC2R8HNFeRw1VLIS2KtYAI/9ql4LqYo8uVAZt1h7gaMLLek7D2s8cPJALeeq6+zjNxmOyEdMBGcLAv3oCCPIrERFIUZyBsRx+GL2R6BSJfa7Xe2ATfEYJLuvVucvjZmShX2EiKmG+xKcKOb9A+zkrMzquanJfj+/PqAQhkk5+vzQPb+97n5UWRhLXT+IrIn2+5c3JSW0xSAGgjTV6kcnws2w1s5Td9/vhh7UNo+QOTkdCtD6RH/VjuZWnTgn3R9XB5BYo2r3ZdA6KP3IKNeI2s+l/u7retXKZ8RtTRQgDhPaSbdxFFXmqODA/EE3KjbBaUxa2sA64nSNV81LJHDA7Wl/C3HU8vk2gWHiNJwUGwjMh+74aXaCzb/MVNZWX5o/U4I4O5PXnT7q2XC6+AZEgp8CuQldK8MAg94XE6lB25m0BLqVGb83ojeodmx9lWWmy5/h6DBXD5fK7yTV4e2+7w4yz9q1KdKbkpIaoZwL+PcfWFN6vgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASAENPTVBBVF9EVVBMRVhfTU9ERRQARHVwbGV4TW9kZTo6TG9uZ0VkZ2U= + Envoyer à OneNote 16 + xQT+/0Vudm95ZXIgw6AgT25lTm90ZcKgMTYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAU2VuZCB0byBNaWNyb3NvZnQgT25lTm90ZSAxNiBEcgAWAAEA4gMAAAAAAAAEAAhSAAAEdAAAM1ROVwAAAAAKAEUAbgB2AG8AeQBlAHIAIADgACAATwBuAGUATgBvAHQAZQCgADEANgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBAAG3AD8AgMvAAABAAkAmgs0CGQAAQAPAFgCAgABAFgCAwABAEEANAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAQAAAAIAAAABAAAA/////wAAAAAAAAAAAAAAAAAAAABESU5VIgDAAPwCAACsE9jAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAMAAAABTTVRKAAAAABAAsABTAGUAbgBkACAAdABvACAATQBpAGMAcgBvAHMAbwBmAHQAIABPAG4AZQBOAG8AdABlACAAMQA2ACAARAByAGkAdgBlAHIAAABSRVNETEwAVW5pcmVzRExMAFBhcGVyU2l6ZQBMRVRURVIAT3JpZW50YXRpb24AUE9SVFJBSVQAUmVzb2x1dGlvbgBEUEk2MDAAQ29sb3JNb2RlADI0YnBwAAAAAAAAAAAAAAAAAAAAABIAQ09NUEFUX0RVUExFWF9NT0RFEwBEdXBsZXhNb2RlOjpVbmtub3du zxx @@ -530,7 +530,7 @@ - + @@ -599,7 +599,7 @@ ???(???) - 00/00/0000, 00:00:00 + 00/00/0000, 00:00:00 @@ -927,7 +927,7 @@ - l:Code[ancestor::r:CodeListReference[parent::d:CodeDomain[parent::d:QuestionItem or parent::d:GridResponseDomain or parent::d:ResponseDomainInMixed]]] + l:Code[ancestor::r:CodeListReference[parent::d:CodeDomain[parent::d:QuestionItem or parent::d:GridResponseDomainInMixed or parent::d:ResponseDomainInMixed]]] xf-item @@ -996,7 +996,7 @@ - d:GridResponseDomain[ancestor::d:QuestionGrid] + d:GridResponseDomainInMixed[ancestor::d:QuestionGrid] Cell @@ -1086,7 +1086,7 @@ - d:QuestionGrid[(d:GridDimension/@rank='2' or d:StructuredMixedGridResponseDomain/d:GridResponseDomain[not(d:NominalDomain) and not(d:AttachmentLocation)]) and not(d:GridDimension/d:Roster)] + d:QuestionGrid[(d:GridDimension/@rank='2' or d:StructuredMixedGridResponseDomain/d:GridResponseDomainInMixed[not(d:NominalDomain) and not(d:AttachmentLocation)]) and not(d:GridDimension/d:Roster)] Table @@ -1101,7 +1101,7 @@ - d:QuestionGrid[not(d:GridDimension/@rank='2') and not(d:StructuredMixedGridResponseDomain/d:GridResponseDomain[not(d:NominalDomain) and not(d:AttachmentLocation)])] + d:QuestionGrid[not(d:GridDimension/@rank='2') and not(d:StructuredMixedGridResponseDomain/d:GridResponseDomainInMixed[not(d:NominalDomain) and not(d:AttachmentLocation)])] MultipleChoiceQuestion diff --git a/src/main/resources/xslt/transformations/ddi2pdf/tree-navigation.fods b/src/main/resources/xslt/transformations/ddi2pdf/tree-navigation.fods index 2ab9a9ae3..7d8040c91 100644 --- a/src/main/resources/xslt/transformations/ddi2pdf/tree-navigation.fods +++ b/src/main/resources/xslt/transformations/ddi2pdf/tree-navigation.fods @@ -1,26 +1,26 @@ - 2009-04-16T11:32:48.39P1DT6H26M28S70LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82018-10-10T12:43:31.550000000François Bulot + 2009-04-16T11:32:48.39P1DT6H30M35S73LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-12T14:04:02.826000000François Bulot 0 0 71737 - 3494 + 3501 view1 1 - 9 + 5 0 0 0 0 2 - 1 + 0 0 0 0 @@ -32,7 +32,7 @@ Sheet1 - 1255 + 1655 0 100 60 @@ -77,8 +77,8 @@ true true true - \\S20slinng\M20-207-RICOH MP2554SP - 1hP+/1xcUzIwc2xpbm5nXE0yMC0yMDctUklDT0ggTVAyNTU0U1AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUklDT0ggUENMNiBVbml2ZXJzYWxEcml2ZXIgVjQuMQAWAAEA8hIAAAAAAAAEAAhSAAAEdAAAM1ROVwAAAAAKAFwAXABTADIAMABzAGwAaQBuAG4AZwBcAE0AMgAwAC0AMgAwADcALQBSAEkAQwBPAEgAIABNAFAAMgA1AAAAAAABBAAg3AAMEg//gAMBAAkAmgs0CGQAAQAHAFgCAQACAFgCAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAIAAAAAAgAAAQAAAAAAAAAAAAAAAAAAAAAAAAAxMERSDFhkDpG++hkAAAAAKQQAAHicdVPRcuMwCPwXP/ch6dy01/yMB0vYVouERkJJ05v790OyE6eX9M1mVwss8KfLAsFCshEmzL0LsYgkOHeHDopw/cxIaKR7+o/q0TqQc0SlRgIXFExozobQKplQBNOMYD3bxkkuaMTiCIWqnC2R8HNFeRw1VLIS2KtYAI/9ql4LqYo8uVAZt1h7gaMLLek7D2s8cPJALeeq6+zjNxmOyEdMBGcLAv3oCCPIrERFIUZyBsRx+GL2R6BSJfa7Xe2ATfEYJLuvVucvjZmShX2EiKmG+xKcKOb9A+zkrMzquanJfj+/PqAQhkk5+vzQPb+97n5UWRhLXT+IrIn2+5c3JSW0xSAGgjTV6kcnws2w1s5Td9/vhh7UNo+QOTkdCtD6RH/VjuZWnTgn3R9XB5BYo2r3ZdA6KP3IKNeI2s+l/u7retXKZ8RtTRQgDhPaSbdxFFXmqODA/EE3KjbBaUxa2sA64nSNV81LJHDA7Wl/C3HU8vk2gWHiNJwUGwjMh+74aXaCzb/MVNZWX5o/U4I4O5PXnT7q2XC6+AZEgp8CuQldK8MAg94XE6lB25m0BLqVGb83ojeodmx9lWWmy5/h6DBXD5fK7yTV4e2+7w4yz9q1KdKbkpIaoZwL+PcfWFN6vgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASAENPTVBBVF9EVVBMRVhfTU9ERRQARHVwbGV4TW9kZTo6TG9uZ0VkZ2U= + Envoyer à OneNote 16 + xQT+/0Vudm95ZXIgw6AgT25lTm90ZcKgMTYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAU2VuZCB0byBNaWNyb3NvZnQgT25lTm90ZSAxNiBEcgAWAAEA4gMAAAAAAAAEAAhSAAAEdAAAM1ROVwAAAAAKAEUAbgB2AG8AeQBlAHIAIADgACAATwBuAGUATgBvAHQAZQCgADEANgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBAAG3AD8AgMvAAABAAkAmgs0CGQAAQAPAFgCAgABAFgCAwABAEEANAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAQAAAAIAAAABAAAA/////wAAAAAAAAAAAAAAAAAAAABESU5VIgDAAPwCAACsE9jAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAMAAAABTTVRKAAAAABAAsABTAGUAbgBkACAAdABvACAATQBpAGMAcgBvAHMAbwBmAHQAIABPAG4AZQBOAG8AdABlACAAMQA2ACAARAByAGkAdgBlAHIAAABSRVNETEwAVW5pcmVzRExMAFBhcGVyU2l6ZQBMRVRURVIAT3JpZW50YXRpb24AUE9SVFJBSVQAUmVzb2x1dGlvbgBEUEk2MDAAQ29sb3JNb2RlADI0YnBwAAAAAAAAAAAAAAAAAAAAABIAQ09NUEFUX0RVUExFWF9NT0RFEwBEdXBsZXhNb2RlOjpVbmtub3du zxx @@ -517,7 +517,7 @@ - + @@ -566,7 +566,7 @@ ???(???) - 00/00/0000, 00:00:00 + 00/00/0000, 00:00:00 @@ -628,13 +628,13 @@ - d:QuestionGrid[not(d:GridDimension/@rank='2') and not(d:StructuredMixedGridResponseDomain/d:GridResponseDomain[not(d:NominalDomain) and not(d:AttachmentLocation)])] + d:QuestionGrid[not(d:GridDimension/@rank='2') and not(d:StructuredMixedGridResponseDomain/d:GridResponseDomainInMixed[not(d:NominalDomain) and not(d:AttachmentLocation)])] - *[not(self::d:GridDimension or self::d:InterviewerInstructionReference or self::d:StructuredMixedGridResponseDomain or (self::d:ExternalAid and r:Description/r:Content/xhtml:div/@class='FlowControl'))] |descendant::d:GridResponseDomain/*[not(d:AttachmentLocation)] + .//d:GridResponseDomainInMixed/* - In MultipleChoiceQuestion, only the child of GridResponseDomain are considered as child (GridDimension and GridResponseDomain are escaped to prevent Table&Cell drivers). + In MultipleChoiceQuestion, only the child of GridResponseDomainInMixed are considered as child (GridDimension and GridResponseDomain are escaped to prevent Table&Cell drivers). From 51564dae17d2c6d677a6747c6cb3e12ab621d6e1 Mon Sep 17 00:00:00 2001 From: BulotF Date: Wed, 12 Jun 2019 14:16:05 +0200 Subject: [PATCH 006/439] update in.xml for ddi-to-out --- src/test/resources/ddi-to-fo/in.xml | 522 ++++++++++++------------- src/test/resources/ddi-to-js/in.xml | 522 ++++++++++++------------- src/test/resources/ddi-to-odt/in.xml | 522 ++++++++++++------------- src/test/resources/ddi-to-pdf/in.xml | 522 ++++++++++++------------- src/test/resources/ddi-to-xform/in.xml | 522 ++++++++++++------------- 5 files changed, 1280 insertions(+), 1330 deletions(-) diff --git a/src/test/resources/ddi-to-fo/in.xml b/src/test/resources/ddi-to-fo/in.xml index 383252d9c..26479c864 100644 --- a/src/test/resources/ddi-to-fo/in.xml +++ b/src/test/resources/ddi-to-fo/in.xml @@ -1,16 +1,8 @@ - - fr.insee - INSEE-i6vwid - 0.1.0 - +fr.inseeINSEE-i6vwid0.1.0 Questionnaire SIMPSONS - - + fr.insee RessourcePackage-i6vwid 0.1.0 @@ -30,7 +22,7 @@ - We're going to test your knowledge about the simpsons series.Welcome in the simspons world! + We're going to test your knowledge about the simpsons series.Welcome in the simspons world! @@ -96,7 +88,7 @@ - Several possible answers + Several possible answers @@ -135,7 +127,7 @@ - fr.inseeFTN-INSTRUCTION-10.1.0tooltipIncluded principalities + fr.inseeFTN-INSTRUCTION-10.1.0tooltipIncluded principalities fr.insee ControlConstructScheme-i6vwid @@ -147,7 +139,7 @@ Questionnaire SIMPSONS - template + template fr.insee j6p0ti5h @@ -183,7 +175,7 @@ 0.1.0 Instruction - module + module fr.insee j6p3dkx6-QC @@ -213,7 +205,7 @@ General knowledge of the series - submodule + submodule fr.insee j3343qhx-QC @@ -255,7 +247,7 @@ 0.1.0 Instruction - module + module fr.insee j3343clt-QC @@ -285,7 +277,7 @@ Characters - module + module fr.insee j334akov-QC @@ -327,7 +319,7 @@ General questions - module + module fr.insee j6qe237q @@ -357,7 +349,7 @@ Kwik-E-Mart - submodule + submodule fr.insee j4nwc63q-QC @@ -381,7 +373,7 @@ Clowning - submodule + submodule fr.insee j4nw0rr6-QC @@ -399,7 +391,7 @@ Transport - submodule + submodule fr.insee j6p2lwuj-QC @@ -417,7 +409,7 @@ Favourite characters - module + module fr.insee j6qg8rc6-QC @@ -435,7 +427,7 @@ Comment - module + module fr.insee j6z0z3us-QC @@ -447,7 +439,7 @@ fr.insee d1e42 0.1.0 - + hideable xpath @@ -489,7 +481,7 @@ - hideable + hideable fr.insee j6p0s7o5 @@ -501,7 +493,7 @@ fr.insee d1e101 0.1.0 - + hideable xpath @@ -543,7 +535,7 @@ - hideable + hideable fr.insee j3341528 @@ -821,7 +813,7 @@ QuestionItem - + informational fr.insee j4nwc63q-CI-0 0.1.0 @@ -1281,7 +1273,7 @@ 0 99 - Decimal + Decimal fr.insee j6q9h8tj-RDOP-jbgdjy8h @@ -1387,7 +1379,7 @@ 0 99 - Decimal + Decimal fr.insee j6z06z1e-RDOP-jbgddnrd @@ -1429,8 +1421,8 @@ In which city do the Simpsons reside? - - radio-button + + radio-button fr.insee j334iumu @@ -1493,8 +1485,8 @@ Who is the Simpsons city mayor? - - checkbox + + checkbox fr.insee j6qdqoen @@ -1557,8 +1549,8 @@ In which state do The Simpsons reside? - - drop-down-list + + drop-down-list fr.insee j4nwo00f @@ -1725,7 +1717,7 @@ - + fr.insee j335cu3c @@ -1735,7 +1727,7 @@ - + fr.insee @@ -1762,8 +1754,8 @@ - - + + fr.insee @@ -1790,8 +1782,8 @@ - - + + fr.insee @@ -1818,8 +1810,8 @@ - - + + fr.insee @@ -1846,7 +1838,7 @@ - + fr.insee @@ -1956,7 +1948,7 @@ - + fr.insee j6p2mvca @@ -1966,9 +1958,9 @@ - - - radio-button + + + radio-button fr.insee jbdxh138 @@ -1995,10 +1987,10 @@ - - - - radio-button + + + + radio-button fr.insee jbdxh138 @@ -2025,10 +2017,10 @@ - - - - radio-button + + + + radio-button fr.insee jbdxh138 @@ -2055,10 +2047,10 @@ - - - - radio-button + + + + radio-button fr.insee jbdxh138 @@ -2085,7 +2077,7 @@ - + @@ -2189,7 +2181,7 @@ - + fr.insee j6qeytgc @@ -2199,9 +2191,9 @@ - - - drop-down-list + + + drop-down-list fr.insee jbdxh138 @@ -2228,10 +2220,10 @@ - - - - drop-down-list + + + + drop-down-list fr.insee jbdxh138 @@ -2258,10 +2250,10 @@ - - - - drop-down-list + + + + drop-down-list fr.insee jbdxh138 @@ -2288,10 +2280,10 @@ - - - - drop-down-list + + + + drop-down-list fr.insee jbdxh138 @@ -2318,7 +2310,7 @@ - + @@ -2444,7 +2436,7 @@ - + fr.insee j6z087mq @@ -2454,9 +2446,9 @@ - - - checkbox + + + checkbox fr.insee jbdxricm @@ -2483,10 +2475,10 @@ - - - - checkbox + + + + checkbox fr.insee jbdxricm @@ -2513,10 +2505,10 @@ - - - - checkbox + + + + checkbox fr.insee jbdxricm @@ -2543,10 +2535,10 @@ - - - - checkbox + + + + checkbox fr.insee jbdxricm @@ -2573,10 +2565,10 @@ - - - - checkbox + + + + checkbox fr.insee jbdxricm @@ -2603,7 +2595,7 @@ - + @@ -2840,7 +2832,7 @@ - + fr.insee j4nwh16i @@ -2850,7 +2842,7 @@ - + fr.insee j4nwc63q-secondDimension-fakeCL-1 @@ -2860,13 +2852,13 @@ - + 0 100 - Decimal + Decimal fr.insee j4nwc63q-RDOP-jbgde5yl @@ -2879,14 +2871,14 @@ - - + + 0 100 - Decimal + Decimal fr.insee j4nwc63q-RDOP-jbgd2x2t @@ -2899,14 +2891,14 @@ - - + + 0 100 - Decimal + Decimal fr.insee j4nwc63q-RDOP-jbgdjypz @@ -2919,14 +2911,14 @@ - - + + 0 100 - Decimal + Decimal fr.insee j4nwc63q-RDOP-jbgdcftu @@ -2939,14 +2931,14 @@ - - + + 0 100 - Decimal + Decimal fr.insee j4nwc63q-RDOP-jbgdiyfe @@ -2959,14 +2951,14 @@ - - + + 0 100 - Decimal + Decimal fr.insee j4nwc63q-RDOP-jbgdj1wd @@ -2979,14 +2971,14 @@ - - + + 0 100 - Decimal + Decimal fr.insee j4nwc63q-RDOP-jbgddylk @@ -2999,14 +2991,14 @@ - - + + 0 100 - Decimal + Decimal fr.insee j4nwc63q-RDOP-jbgd3jj6 @@ -3019,14 +3011,14 @@ - - + + 0 100 - Decimal + Decimal fr.insee j4nwc63q-RDOP-jbgd4w3k @@ -3039,14 +3031,14 @@ - - + + 0 100 - Decimal + Decimal fr.insee j4nwc63q-RDOP-jbgd4w4k @@ -3059,7 +3051,7 @@ - + @@ -3251,7 +3243,7 @@ - + fr.insee j77dav9b @@ -3261,7 +3253,7 @@ - + fr.insee j4nw0rr6-secondDimension-fakeCL-1 @@ -3271,9 +3263,9 @@ - - - drop-down-list + + + drop-down-list fr.insee jbdyh6b5 @@ -3301,10 +3293,10 @@ - - - - drop-down-list + + + + drop-down-list fr.insee jbdyh6b5 @@ -3332,10 +3324,10 @@ - - - - drop-down-list + + + + drop-down-list fr.insee jbdyh6b5 @@ -3363,10 +3355,10 @@ - - - - drop-down-list + + + + drop-down-list fr.insee jbdyh6b5 @@ -3394,8 +3386,8 @@ - - + + fr.insee @@ -3410,8 +3402,8 @@ - - + + fr.insee @@ -3426,8 +3418,8 @@ - - + + fr.insee @@ -3442,8 +3434,8 @@ - - + + fr.insee @@ -3458,7 +3450,7 @@ - + @@ -4003,7 +3995,7 @@ - + fr.insee j6p2kivg @@ -4013,7 +4005,7 @@ - + fr.insee jbdye1wa @@ -4023,7 +4015,7 @@ - + fr.insee @@ -4051,8 +4043,8 @@ - - + + fr.insee @@ -4080,8 +4072,8 @@ - - + + fr.insee @@ -4109,8 +4101,8 @@ - - + + fr.insee @@ -4138,8 +4130,8 @@ - - + + fr.insee @@ -4167,8 +4159,8 @@ - - + + fr.insee @@ -4196,8 +4188,8 @@ - - + + fr.insee @@ -4225,8 +4217,8 @@ - - + + fr.insee @@ -4254,8 +4246,8 @@ - - + + fr.insee @@ -4283,8 +4275,8 @@ - - + + fr.insee @@ -4312,8 +4304,8 @@ - - + + fr.insee @@ -4341,8 +4333,8 @@ - - + + fr.insee @@ -4370,8 +4362,8 @@ - - + + fr.insee @@ -4399,8 +4391,8 @@ - - + + fr.insee @@ -4428,8 +4420,8 @@ - - + + fr.insee @@ -4457,8 +4449,8 @@ - - + + fr.insee @@ -4486,8 +4478,8 @@ - - + + fr.insee @@ -4515,8 +4507,8 @@ - - + + fr.insee @@ -4544,8 +4536,8 @@ - - + + fr.insee @@ -4573,8 +4565,8 @@ - - + + fr.insee @@ -4602,8 +4594,8 @@ - - + + fr.insee @@ -4631,8 +4623,8 @@ - - + + fr.insee @@ -4660,8 +4652,8 @@ - - + + fr.insee @@ -4689,8 +4681,8 @@ - - + + fr.insee @@ -4718,7 +4710,7 @@ - + fr.insee @@ -5183,7 +5175,7 @@ - + fr.insee j6qg8rc6-secondDimension-fakeCL-1 @@ -5193,7 +5185,7 @@ - + fr.insee @@ -5208,8 +5200,8 @@ - - + + fr.insee @@ -5224,8 +5216,8 @@ - - + + fr.insee @@ -5240,8 +5232,8 @@ - - + + fr.insee @@ -5256,8 +5248,8 @@ - - + + fr.insee @@ -5272,8 +5264,8 @@ - - + + fr.insee @@ -5288,8 +5280,8 @@ - - + + fr.insee @@ -5304,8 +5296,8 @@ - - + + fr.insee @@ -5320,8 +5312,8 @@ - - + + fr.insee @@ -5336,8 +5328,8 @@ - - + + fr.insee @@ -5352,14 +5344,14 @@ - - + + 0 120 - Decimal + Decimal fr.insee j6qg8rc6-RDOP-jbgdfndq @@ -5372,14 +5364,14 @@ - - + + 0 120 - Decimal + Decimal fr.insee j6qg8rc6-RDOP-jbgd7osi @@ -5392,14 +5384,14 @@ - - + + 0 120 - Decimal + Decimal fr.insee j6qg8rc6-RDOP-jbgd7bnw @@ -5412,14 +5404,14 @@ - - + + 0 120 - Decimal + Decimal fr.insee j6qg8rc6-RDOP-jbgd9k71 @@ -5432,14 +5424,14 @@ - - + + 0 120 - Decimal + Decimal fr.insee j6qg8rc6-RDOP-jbgdimks @@ -5452,14 +5444,14 @@ - - + + 0 120 - Decimal + Decimal fr.insee j6qg8rc6-RDOP-jbgdjquz @@ -5472,14 +5464,14 @@ - - + + 0 120 - Decimal + Decimal fr.insee j6qg8rc6-RDOP-jbgdd2w3 @@ -5492,14 +5484,14 @@ - - + + 0 120 - Decimal + Decimal fr.insee j6qg8rc6-RDOP-jbgdkosc @@ -5512,14 +5504,14 @@ - - + + 0 120 - Decimal + Decimal fr.insee j6qg8rc6-RDOP-jbgdk0x4 @@ -5532,14 +5524,14 @@ - - + + 0 120 - Decimal + Decimal fr.insee j6qg8rc6-RDOP-jbgd2wgf @@ -5552,7 +5544,7 @@ - + @@ -10029,11 +10021,10 @@ INSEE-COMMUN-MNR-DateTimedate 0.1.0 jj/mm/aaaa - date + date - - + fr.insee StudyUnit-i6vwid 0.1.0 @@ -10064,7 +10055,7 @@ fr.insee InstrumentScheme-i6vwid 0.1.0 - + fr.insee Instrument-i6vwid 0.1.0 @@ -10081,5 +10072,4 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/src/test/resources/ddi-to-js/in.xml b/src/test/resources/ddi-to-js/in.xml index 383252d9c..26479c864 100644 --- a/src/test/resources/ddi-to-js/in.xml +++ b/src/test/resources/ddi-to-js/in.xml @@ -1,16 +1,8 @@ - - fr.insee - INSEE-i6vwid - 0.1.0 - +fr.inseeINSEE-i6vwid0.1.0 Questionnaire SIMPSONS - - + fr.insee RessourcePackage-i6vwid 0.1.0 @@ -30,7 +22,7 @@ - We're going to test your knowledge about the simpsons series.Welcome in the simspons world! + We're going to test your knowledge about the simpsons series.Welcome in the simspons world! @@ -96,7 +88,7 @@ - Several possible answers + Several possible answers @@ -135,7 +127,7 @@ - fr.inseeFTN-INSTRUCTION-10.1.0tooltipIncluded principalities + fr.inseeFTN-INSTRUCTION-10.1.0tooltipIncluded principalities fr.insee ControlConstructScheme-i6vwid @@ -147,7 +139,7 @@ Questionnaire SIMPSONS - template + template fr.insee j6p0ti5h @@ -183,7 +175,7 @@ 0.1.0 Instruction - module + module fr.insee j6p3dkx6-QC @@ -213,7 +205,7 @@ General knowledge of the series - submodule + submodule fr.insee j3343qhx-QC @@ -255,7 +247,7 @@ 0.1.0 Instruction - module + module fr.insee j3343clt-QC @@ -285,7 +277,7 @@ Characters - module + module fr.insee j334akov-QC @@ -327,7 +319,7 @@ General questions - module + module fr.insee j6qe237q @@ -357,7 +349,7 @@ Kwik-E-Mart - submodule + submodule fr.insee j4nwc63q-QC @@ -381,7 +373,7 @@ Clowning - submodule + submodule fr.insee j4nw0rr6-QC @@ -399,7 +391,7 @@ Transport - submodule + submodule fr.insee j6p2lwuj-QC @@ -417,7 +409,7 @@ Favourite characters - module + module fr.insee j6qg8rc6-QC @@ -435,7 +427,7 @@ Comment - module + module fr.insee j6z0z3us-QC @@ -447,7 +439,7 @@ fr.insee d1e42 0.1.0 - + hideable xpath @@ -489,7 +481,7 @@ - hideable + hideable fr.insee j6p0s7o5 @@ -501,7 +493,7 @@ fr.insee d1e101 0.1.0 - + hideable xpath @@ -543,7 +535,7 @@ - hideable + hideable fr.insee j3341528 @@ -821,7 +813,7 @@ QuestionItem - + informational fr.insee j4nwc63q-CI-0 0.1.0 @@ -1281,7 +1273,7 @@ 0 99 - Decimal + Decimal fr.insee j6q9h8tj-RDOP-jbgdjy8h @@ -1387,7 +1379,7 @@ 0 99 - Decimal + Decimal fr.insee j6z06z1e-RDOP-jbgddnrd @@ -1429,8 +1421,8 @@ In which city do the Simpsons reside? - - radio-button + + radio-button fr.insee j334iumu @@ -1493,8 +1485,8 @@ Who is the Simpsons city mayor? - - checkbox + + checkbox fr.insee j6qdqoen @@ -1557,8 +1549,8 @@ In which state do The Simpsons reside? - - drop-down-list + + drop-down-list fr.insee j4nwo00f @@ -1725,7 +1717,7 @@ - + fr.insee j335cu3c @@ -1735,7 +1727,7 @@ - + fr.insee @@ -1762,8 +1754,8 @@ - - + + fr.insee @@ -1790,8 +1782,8 @@ - - + + fr.insee @@ -1818,8 +1810,8 @@ - - + + fr.insee @@ -1846,7 +1838,7 @@ - + fr.insee @@ -1956,7 +1948,7 @@ - + fr.insee j6p2mvca @@ -1966,9 +1958,9 @@ - - - radio-button + + + radio-button fr.insee jbdxh138 @@ -1995,10 +1987,10 @@ - - - - radio-button + + + + radio-button fr.insee jbdxh138 @@ -2025,10 +2017,10 @@ - - - - radio-button + + + + radio-button fr.insee jbdxh138 @@ -2055,10 +2047,10 @@ - - - - radio-button + + + + radio-button fr.insee jbdxh138 @@ -2085,7 +2077,7 @@ - + @@ -2189,7 +2181,7 @@ - + fr.insee j6qeytgc @@ -2199,9 +2191,9 @@ - - - drop-down-list + + + drop-down-list fr.insee jbdxh138 @@ -2228,10 +2220,10 @@ - - - - drop-down-list + + + + drop-down-list fr.insee jbdxh138 @@ -2258,10 +2250,10 @@ - - - - drop-down-list + + + + drop-down-list fr.insee jbdxh138 @@ -2288,10 +2280,10 @@ - - - - drop-down-list + + + + drop-down-list fr.insee jbdxh138 @@ -2318,7 +2310,7 @@ - + @@ -2444,7 +2436,7 @@ - + fr.insee j6z087mq @@ -2454,9 +2446,9 @@ - - - checkbox + + + checkbox fr.insee jbdxricm @@ -2483,10 +2475,10 @@ - - - - checkbox + + + + checkbox fr.insee jbdxricm @@ -2513,10 +2505,10 @@ - - - - checkbox + + + + checkbox fr.insee jbdxricm @@ -2543,10 +2535,10 @@ - - - - checkbox + + + + checkbox fr.insee jbdxricm @@ -2573,10 +2565,10 @@ - - - - checkbox + + + + checkbox fr.insee jbdxricm @@ -2603,7 +2595,7 @@ - + @@ -2840,7 +2832,7 @@ - + fr.insee j4nwh16i @@ -2850,7 +2842,7 @@ - + fr.insee j4nwc63q-secondDimension-fakeCL-1 @@ -2860,13 +2852,13 @@ - + 0 100 - Decimal + Decimal fr.insee j4nwc63q-RDOP-jbgde5yl @@ -2879,14 +2871,14 @@ - - + + 0 100 - Decimal + Decimal fr.insee j4nwc63q-RDOP-jbgd2x2t @@ -2899,14 +2891,14 @@ - - + + 0 100 - Decimal + Decimal fr.insee j4nwc63q-RDOP-jbgdjypz @@ -2919,14 +2911,14 @@ - - + + 0 100 - Decimal + Decimal fr.insee j4nwc63q-RDOP-jbgdcftu @@ -2939,14 +2931,14 @@ - - + + 0 100 - Decimal + Decimal fr.insee j4nwc63q-RDOP-jbgdiyfe @@ -2959,14 +2951,14 @@ - - + + 0 100 - Decimal + Decimal fr.insee j4nwc63q-RDOP-jbgdj1wd @@ -2979,14 +2971,14 @@ - - + + 0 100 - Decimal + Decimal fr.insee j4nwc63q-RDOP-jbgddylk @@ -2999,14 +2991,14 @@ - - + + 0 100 - Decimal + Decimal fr.insee j4nwc63q-RDOP-jbgd3jj6 @@ -3019,14 +3011,14 @@ - - + + 0 100 - Decimal + Decimal fr.insee j4nwc63q-RDOP-jbgd4w3k @@ -3039,14 +3031,14 @@ - - + + 0 100 - Decimal + Decimal fr.insee j4nwc63q-RDOP-jbgd4w4k @@ -3059,7 +3051,7 @@ - + @@ -3251,7 +3243,7 @@ - + fr.insee j77dav9b @@ -3261,7 +3253,7 @@ - + fr.insee j4nw0rr6-secondDimension-fakeCL-1 @@ -3271,9 +3263,9 @@ - - - drop-down-list + + + drop-down-list fr.insee jbdyh6b5 @@ -3301,10 +3293,10 @@ - - - - drop-down-list + + + + drop-down-list fr.insee jbdyh6b5 @@ -3332,10 +3324,10 @@ - - - - drop-down-list + + + + drop-down-list fr.insee jbdyh6b5 @@ -3363,10 +3355,10 @@ - - - - drop-down-list + + + + drop-down-list fr.insee jbdyh6b5 @@ -3394,8 +3386,8 @@ - - + + fr.insee @@ -3410,8 +3402,8 @@ - - + + fr.insee @@ -3426,8 +3418,8 @@ - - + + fr.insee @@ -3442,8 +3434,8 @@ - - + + fr.insee @@ -3458,7 +3450,7 @@ - + @@ -4003,7 +3995,7 @@ - + fr.insee j6p2kivg @@ -4013,7 +4005,7 @@ - + fr.insee jbdye1wa @@ -4023,7 +4015,7 @@ - + fr.insee @@ -4051,8 +4043,8 @@ - - + + fr.insee @@ -4080,8 +4072,8 @@ - - + + fr.insee @@ -4109,8 +4101,8 @@ - - + + fr.insee @@ -4138,8 +4130,8 @@ - - + + fr.insee @@ -4167,8 +4159,8 @@ - - + + fr.insee @@ -4196,8 +4188,8 @@ - - + + fr.insee @@ -4225,8 +4217,8 @@ - - + + fr.insee @@ -4254,8 +4246,8 @@ - - + + fr.insee @@ -4283,8 +4275,8 @@ - - + + fr.insee @@ -4312,8 +4304,8 @@ - - + + fr.insee @@ -4341,8 +4333,8 @@ - - + + fr.insee @@ -4370,8 +4362,8 @@ - - + + fr.insee @@ -4399,8 +4391,8 @@ - - + + fr.insee @@ -4428,8 +4420,8 @@ - - + + fr.insee @@ -4457,8 +4449,8 @@ - - + + fr.insee @@ -4486,8 +4478,8 @@ - - + + fr.insee @@ -4515,8 +4507,8 @@ - - + + fr.insee @@ -4544,8 +4536,8 @@ - - + + fr.insee @@ -4573,8 +4565,8 @@ - - + + fr.insee @@ -4602,8 +4594,8 @@ - - + + fr.insee @@ -4631,8 +4623,8 @@ - - + + fr.insee @@ -4660,8 +4652,8 @@ - - + + fr.insee @@ -4689,8 +4681,8 @@ - - + + fr.insee @@ -4718,7 +4710,7 @@ - + fr.insee @@ -5183,7 +5175,7 @@ - + fr.insee j6qg8rc6-secondDimension-fakeCL-1 @@ -5193,7 +5185,7 @@ - + fr.insee @@ -5208,8 +5200,8 @@ - - + + fr.insee @@ -5224,8 +5216,8 @@ - - + + fr.insee @@ -5240,8 +5232,8 @@ - - + + fr.insee @@ -5256,8 +5248,8 @@ - - + + fr.insee @@ -5272,8 +5264,8 @@ - - + + fr.insee @@ -5288,8 +5280,8 @@ - - + + fr.insee @@ -5304,8 +5296,8 @@ - - + + fr.insee @@ -5320,8 +5312,8 @@ - - + + fr.insee @@ -5336,8 +5328,8 @@ - - + + fr.insee @@ -5352,14 +5344,14 @@ - - + + 0 120 - Decimal + Decimal fr.insee j6qg8rc6-RDOP-jbgdfndq @@ -5372,14 +5364,14 @@ - - + + 0 120 - Decimal + Decimal fr.insee j6qg8rc6-RDOP-jbgd7osi @@ -5392,14 +5384,14 @@ - - + + 0 120 - Decimal + Decimal fr.insee j6qg8rc6-RDOP-jbgd7bnw @@ -5412,14 +5404,14 @@ - - + + 0 120 - Decimal + Decimal fr.insee j6qg8rc6-RDOP-jbgd9k71 @@ -5432,14 +5424,14 @@ - - + + 0 120 - Decimal + Decimal fr.insee j6qg8rc6-RDOP-jbgdimks @@ -5452,14 +5444,14 @@ - - + + 0 120 - Decimal + Decimal fr.insee j6qg8rc6-RDOP-jbgdjquz @@ -5472,14 +5464,14 @@ - - + + 0 120 - Decimal + Decimal fr.insee j6qg8rc6-RDOP-jbgdd2w3 @@ -5492,14 +5484,14 @@ - - + + 0 120 - Decimal + Decimal fr.insee j6qg8rc6-RDOP-jbgdkosc @@ -5512,14 +5504,14 @@ - - + + 0 120 - Decimal + Decimal fr.insee j6qg8rc6-RDOP-jbgdk0x4 @@ -5532,14 +5524,14 @@ - - + + 0 120 - Decimal + Decimal fr.insee j6qg8rc6-RDOP-jbgd2wgf @@ -5552,7 +5544,7 @@ - + @@ -10029,11 +10021,10 @@ INSEE-COMMUN-MNR-DateTimedate 0.1.0 jj/mm/aaaa - date + date - - + fr.insee StudyUnit-i6vwid 0.1.0 @@ -10064,7 +10055,7 @@ fr.insee InstrumentScheme-i6vwid 0.1.0 - + fr.insee Instrument-i6vwid 0.1.0 @@ -10081,5 +10072,4 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/src/test/resources/ddi-to-odt/in.xml b/src/test/resources/ddi-to-odt/in.xml index 383252d9c..26479c864 100644 --- a/src/test/resources/ddi-to-odt/in.xml +++ b/src/test/resources/ddi-to-odt/in.xml @@ -1,16 +1,8 @@ - - fr.insee - INSEE-i6vwid - 0.1.0 - +fr.inseeINSEE-i6vwid0.1.0 Questionnaire SIMPSONS - - + fr.insee RessourcePackage-i6vwid 0.1.0 @@ -30,7 +22,7 @@ - We're going to test your knowledge about the simpsons series.Welcome in the simspons world! + We're going to test your knowledge about the simpsons series.Welcome in the simspons world! @@ -96,7 +88,7 @@ - Several possible answers + Several possible answers @@ -135,7 +127,7 @@ - fr.inseeFTN-INSTRUCTION-10.1.0tooltipIncluded principalities + fr.inseeFTN-INSTRUCTION-10.1.0tooltipIncluded principalities fr.insee ControlConstructScheme-i6vwid @@ -147,7 +139,7 @@ Questionnaire SIMPSONS - template + template fr.insee j6p0ti5h @@ -183,7 +175,7 @@ 0.1.0 Instruction - module + module fr.insee j6p3dkx6-QC @@ -213,7 +205,7 @@ General knowledge of the series - submodule + submodule fr.insee j3343qhx-QC @@ -255,7 +247,7 @@ 0.1.0 Instruction - module + module fr.insee j3343clt-QC @@ -285,7 +277,7 @@ Characters - module + module fr.insee j334akov-QC @@ -327,7 +319,7 @@ General questions - module + module fr.insee j6qe237q @@ -357,7 +349,7 @@ Kwik-E-Mart - submodule + submodule fr.insee j4nwc63q-QC @@ -381,7 +373,7 @@ Clowning - submodule + submodule fr.insee j4nw0rr6-QC @@ -399,7 +391,7 @@ Transport - submodule + submodule fr.insee j6p2lwuj-QC @@ -417,7 +409,7 @@ Favourite characters - module + module fr.insee j6qg8rc6-QC @@ -435,7 +427,7 @@ Comment - module + module fr.insee j6z0z3us-QC @@ -447,7 +439,7 @@ fr.insee d1e42 0.1.0 - + hideable xpath @@ -489,7 +481,7 @@ - hideable + hideable fr.insee j6p0s7o5 @@ -501,7 +493,7 @@ fr.insee d1e101 0.1.0 - + hideable xpath @@ -543,7 +535,7 @@ - hideable + hideable fr.insee j3341528 @@ -821,7 +813,7 @@ QuestionItem - + informational fr.insee j4nwc63q-CI-0 0.1.0 @@ -1281,7 +1273,7 @@ 0 99 - Decimal + Decimal fr.insee j6q9h8tj-RDOP-jbgdjy8h @@ -1387,7 +1379,7 @@ 0 99 - Decimal + Decimal fr.insee j6z06z1e-RDOP-jbgddnrd @@ -1429,8 +1421,8 @@ In which city do the Simpsons reside? - - radio-button + + radio-button fr.insee j334iumu @@ -1493,8 +1485,8 @@ Who is the Simpsons city mayor? - - checkbox + + checkbox fr.insee j6qdqoen @@ -1557,8 +1549,8 @@ In which state do The Simpsons reside? - - drop-down-list + + drop-down-list fr.insee j4nwo00f @@ -1725,7 +1717,7 @@ - + fr.insee j335cu3c @@ -1735,7 +1727,7 @@ - + fr.insee @@ -1762,8 +1754,8 @@ - - + + fr.insee @@ -1790,8 +1782,8 @@ - - + + fr.insee @@ -1818,8 +1810,8 @@ - - + + fr.insee @@ -1846,7 +1838,7 @@ - + fr.insee @@ -1956,7 +1948,7 @@ - + fr.insee j6p2mvca @@ -1966,9 +1958,9 @@ - - - radio-button + + + radio-button fr.insee jbdxh138 @@ -1995,10 +1987,10 @@ - - - - radio-button + + + + radio-button fr.insee jbdxh138 @@ -2025,10 +2017,10 @@ - - - - radio-button + + + + radio-button fr.insee jbdxh138 @@ -2055,10 +2047,10 @@ - - - - radio-button + + + + radio-button fr.insee jbdxh138 @@ -2085,7 +2077,7 @@ - + @@ -2189,7 +2181,7 @@ - + fr.insee j6qeytgc @@ -2199,9 +2191,9 @@ - - - drop-down-list + + + drop-down-list fr.insee jbdxh138 @@ -2228,10 +2220,10 @@ - - - - drop-down-list + + + + drop-down-list fr.insee jbdxh138 @@ -2258,10 +2250,10 @@ - - - - drop-down-list + + + + drop-down-list fr.insee jbdxh138 @@ -2288,10 +2280,10 @@ - - - - drop-down-list + + + + drop-down-list fr.insee jbdxh138 @@ -2318,7 +2310,7 @@ - + @@ -2444,7 +2436,7 @@ - + fr.insee j6z087mq @@ -2454,9 +2446,9 @@ - - - checkbox + + + checkbox fr.insee jbdxricm @@ -2483,10 +2475,10 @@ - - - - checkbox + + + + checkbox fr.insee jbdxricm @@ -2513,10 +2505,10 @@ - - - - checkbox + + + + checkbox fr.insee jbdxricm @@ -2543,10 +2535,10 @@ - - - - checkbox + + + + checkbox fr.insee jbdxricm @@ -2573,10 +2565,10 @@ - - - - checkbox + + + + checkbox fr.insee jbdxricm @@ -2603,7 +2595,7 @@ - + @@ -2840,7 +2832,7 @@ - + fr.insee j4nwh16i @@ -2850,7 +2842,7 @@ - + fr.insee j4nwc63q-secondDimension-fakeCL-1 @@ -2860,13 +2852,13 @@ - + 0 100 - Decimal + Decimal fr.insee j4nwc63q-RDOP-jbgde5yl @@ -2879,14 +2871,14 @@ - - + + 0 100 - Decimal + Decimal fr.insee j4nwc63q-RDOP-jbgd2x2t @@ -2899,14 +2891,14 @@ - - + + 0 100 - Decimal + Decimal fr.insee j4nwc63q-RDOP-jbgdjypz @@ -2919,14 +2911,14 @@ - - + + 0 100 - Decimal + Decimal fr.insee j4nwc63q-RDOP-jbgdcftu @@ -2939,14 +2931,14 @@ - - + + 0 100 - Decimal + Decimal fr.insee j4nwc63q-RDOP-jbgdiyfe @@ -2959,14 +2951,14 @@ - - + + 0 100 - Decimal + Decimal fr.insee j4nwc63q-RDOP-jbgdj1wd @@ -2979,14 +2971,14 @@ - - + + 0 100 - Decimal + Decimal fr.insee j4nwc63q-RDOP-jbgddylk @@ -2999,14 +2991,14 @@ - - + + 0 100 - Decimal + Decimal fr.insee j4nwc63q-RDOP-jbgd3jj6 @@ -3019,14 +3011,14 @@ - - + + 0 100 - Decimal + Decimal fr.insee j4nwc63q-RDOP-jbgd4w3k @@ -3039,14 +3031,14 @@ - - + + 0 100 - Decimal + Decimal fr.insee j4nwc63q-RDOP-jbgd4w4k @@ -3059,7 +3051,7 @@ - + @@ -3251,7 +3243,7 @@ - + fr.insee j77dav9b @@ -3261,7 +3253,7 @@ - + fr.insee j4nw0rr6-secondDimension-fakeCL-1 @@ -3271,9 +3263,9 @@ - - - drop-down-list + + + drop-down-list fr.insee jbdyh6b5 @@ -3301,10 +3293,10 @@ - - - - drop-down-list + + + + drop-down-list fr.insee jbdyh6b5 @@ -3332,10 +3324,10 @@ - - - - drop-down-list + + + + drop-down-list fr.insee jbdyh6b5 @@ -3363,10 +3355,10 @@ - - - - drop-down-list + + + + drop-down-list fr.insee jbdyh6b5 @@ -3394,8 +3386,8 @@ - - + + fr.insee @@ -3410,8 +3402,8 @@ - - + + fr.insee @@ -3426,8 +3418,8 @@ - - + + fr.insee @@ -3442,8 +3434,8 @@ - - + + fr.insee @@ -3458,7 +3450,7 @@ - + @@ -4003,7 +3995,7 @@ - + fr.insee j6p2kivg @@ -4013,7 +4005,7 @@ - + fr.insee jbdye1wa @@ -4023,7 +4015,7 @@ - + fr.insee @@ -4051,8 +4043,8 @@ - - + + fr.insee @@ -4080,8 +4072,8 @@ - - + + fr.insee @@ -4109,8 +4101,8 @@ - - + + fr.insee @@ -4138,8 +4130,8 @@ - - + + fr.insee @@ -4167,8 +4159,8 @@ - - + + fr.insee @@ -4196,8 +4188,8 @@ - - + + fr.insee @@ -4225,8 +4217,8 @@ - - + + fr.insee @@ -4254,8 +4246,8 @@ - - + + fr.insee @@ -4283,8 +4275,8 @@ - - + + fr.insee @@ -4312,8 +4304,8 @@ - - + + fr.insee @@ -4341,8 +4333,8 @@ - - + + fr.insee @@ -4370,8 +4362,8 @@ - - + + fr.insee @@ -4399,8 +4391,8 @@ - - + + fr.insee @@ -4428,8 +4420,8 @@ - - + + fr.insee @@ -4457,8 +4449,8 @@ - - + + fr.insee @@ -4486,8 +4478,8 @@ - - + + fr.insee @@ -4515,8 +4507,8 @@ - - + + fr.insee @@ -4544,8 +4536,8 @@ - - + + fr.insee @@ -4573,8 +4565,8 @@ - - + + fr.insee @@ -4602,8 +4594,8 @@ - - + + fr.insee @@ -4631,8 +4623,8 @@ - - + + fr.insee @@ -4660,8 +4652,8 @@ - - + + fr.insee @@ -4689,8 +4681,8 @@ - - + + fr.insee @@ -4718,7 +4710,7 @@ - + fr.insee @@ -5183,7 +5175,7 @@ - + fr.insee j6qg8rc6-secondDimension-fakeCL-1 @@ -5193,7 +5185,7 @@ - + fr.insee @@ -5208,8 +5200,8 @@ - - + + fr.insee @@ -5224,8 +5216,8 @@ - - + + fr.insee @@ -5240,8 +5232,8 @@ - - + + fr.insee @@ -5256,8 +5248,8 @@ - - + + fr.insee @@ -5272,8 +5264,8 @@ - - + + fr.insee @@ -5288,8 +5280,8 @@ - - + + fr.insee @@ -5304,8 +5296,8 @@ - - + + fr.insee @@ -5320,8 +5312,8 @@ - - + + fr.insee @@ -5336,8 +5328,8 @@ - - + + fr.insee @@ -5352,14 +5344,14 @@ - - + + 0 120 - Decimal + Decimal fr.insee j6qg8rc6-RDOP-jbgdfndq @@ -5372,14 +5364,14 @@ - - + + 0 120 - Decimal + Decimal fr.insee j6qg8rc6-RDOP-jbgd7osi @@ -5392,14 +5384,14 @@ - - + + 0 120 - Decimal + Decimal fr.insee j6qg8rc6-RDOP-jbgd7bnw @@ -5412,14 +5404,14 @@ - - + + 0 120 - Decimal + Decimal fr.insee j6qg8rc6-RDOP-jbgd9k71 @@ -5432,14 +5424,14 @@ - - + + 0 120 - Decimal + Decimal fr.insee j6qg8rc6-RDOP-jbgdimks @@ -5452,14 +5444,14 @@ - - + + 0 120 - Decimal + Decimal fr.insee j6qg8rc6-RDOP-jbgdjquz @@ -5472,14 +5464,14 @@ - - + + 0 120 - Decimal + Decimal fr.insee j6qg8rc6-RDOP-jbgdd2w3 @@ -5492,14 +5484,14 @@ - - + + 0 120 - Decimal + Decimal fr.insee j6qg8rc6-RDOP-jbgdkosc @@ -5512,14 +5504,14 @@ - - + + 0 120 - Decimal + Decimal fr.insee j6qg8rc6-RDOP-jbgdk0x4 @@ -5532,14 +5524,14 @@ - - + + 0 120 - Decimal + Decimal fr.insee j6qg8rc6-RDOP-jbgd2wgf @@ -5552,7 +5544,7 @@ - + @@ -10029,11 +10021,10 @@ INSEE-COMMUN-MNR-DateTimedate 0.1.0 jj/mm/aaaa - date + date - - + fr.insee StudyUnit-i6vwid 0.1.0 @@ -10064,7 +10055,7 @@ fr.insee InstrumentScheme-i6vwid 0.1.0 - + fr.insee Instrument-i6vwid 0.1.0 @@ -10081,5 +10072,4 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/src/test/resources/ddi-to-pdf/in.xml b/src/test/resources/ddi-to-pdf/in.xml index 383252d9c..26479c864 100644 --- a/src/test/resources/ddi-to-pdf/in.xml +++ b/src/test/resources/ddi-to-pdf/in.xml @@ -1,16 +1,8 @@ - - fr.insee - INSEE-i6vwid - 0.1.0 - +fr.inseeINSEE-i6vwid0.1.0 Questionnaire SIMPSONS - - + fr.insee RessourcePackage-i6vwid 0.1.0 @@ -30,7 +22,7 @@ - We're going to test your knowledge about the simpsons series.Welcome in the simspons world! + We're going to test your knowledge about the simpsons series.Welcome in the simspons world! @@ -96,7 +88,7 @@ - Several possible answers + Several possible answers @@ -135,7 +127,7 @@ - fr.inseeFTN-INSTRUCTION-10.1.0tooltipIncluded principalities + fr.inseeFTN-INSTRUCTION-10.1.0tooltipIncluded principalities fr.insee ControlConstructScheme-i6vwid @@ -147,7 +139,7 @@ Questionnaire SIMPSONS - template + template fr.insee j6p0ti5h @@ -183,7 +175,7 @@ 0.1.0 Instruction - module + module fr.insee j6p3dkx6-QC @@ -213,7 +205,7 @@ General knowledge of the series - submodule + submodule fr.insee j3343qhx-QC @@ -255,7 +247,7 @@ 0.1.0 Instruction - module + module fr.insee j3343clt-QC @@ -285,7 +277,7 @@ Characters - module + module fr.insee j334akov-QC @@ -327,7 +319,7 @@ General questions - module + module fr.insee j6qe237q @@ -357,7 +349,7 @@ Kwik-E-Mart - submodule + submodule fr.insee j4nwc63q-QC @@ -381,7 +373,7 @@ Clowning - submodule + submodule fr.insee j4nw0rr6-QC @@ -399,7 +391,7 @@ Transport - submodule + submodule fr.insee j6p2lwuj-QC @@ -417,7 +409,7 @@ Favourite characters - module + module fr.insee j6qg8rc6-QC @@ -435,7 +427,7 @@ Comment - module + module fr.insee j6z0z3us-QC @@ -447,7 +439,7 @@ fr.insee d1e42 0.1.0 - + hideable xpath @@ -489,7 +481,7 @@ - hideable + hideable fr.insee j6p0s7o5 @@ -501,7 +493,7 @@ fr.insee d1e101 0.1.0 - + hideable xpath @@ -543,7 +535,7 @@ - hideable + hideable fr.insee j3341528 @@ -821,7 +813,7 @@ QuestionItem - + informational fr.insee j4nwc63q-CI-0 0.1.0 @@ -1281,7 +1273,7 @@ 0 99 - Decimal + Decimal fr.insee j6q9h8tj-RDOP-jbgdjy8h @@ -1387,7 +1379,7 @@ 0 99 - Decimal + Decimal fr.insee j6z06z1e-RDOP-jbgddnrd @@ -1429,8 +1421,8 @@ In which city do the Simpsons reside? - - radio-button + + radio-button fr.insee j334iumu @@ -1493,8 +1485,8 @@ Who is the Simpsons city mayor? - - checkbox + + checkbox fr.insee j6qdqoen @@ -1557,8 +1549,8 @@ In which state do The Simpsons reside? - - drop-down-list + + drop-down-list fr.insee j4nwo00f @@ -1725,7 +1717,7 @@ - + fr.insee j335cu3c @@ -1735,7 +1727,7 @@ - + fr.insee @@ -1762,8 +1754,8 @@ - - + + fr.insee @@ -1790,8 +1782,8 @@ - - + + fr.insee @@ -1818,8 +1810,8 @@ - - + + fr.insee @@ -1846,7 +1838,7 @@ - + fr.insee @@ -1956,7 +1948,7 @@ - + fr.insee j6p2mvca @@ -1966,9 +1958,9 @@ - - - radio-button + + + radio-button fr.insee jbdxh138 @@ -1995,10 +1987,10 @@ - - - - radio-button + + + + radio-button fr.insee jbdxh138 @@ -2025,10 +2017,10 @@ - - - - radio-button + + + + radio-button fr.insee jbdxh138 @@ -2055,10 +2047,10 @@ - - - - radio-button + + + + radio-button fr.insee jbdxh138 @@ -2085,7 +2077,7 @@ - + @@ -2189,7 +2181,7 @@ - + fr.insee j6qeytgc @@ -2199,9 +2191,9 @@ - - - drop-down-list + + + drop-down-list fr.insee jbdxh138 @@ -2228,10 +2220,10 @@ - - - - drop-down-list + + + + drop-down-list fr.insee jbdxh138 @@ -2258,10 +2250,10 @@ - - - - drop-down-list + + + + drop-down-list fr.insee jbdxh138 @@ -2288,10 +2280,10 @@ - - - - drop-down-list + + + + drop-down-list fr.insee jbdxh138 @@ -2318,7 +2310,7 @@ - + @@ -2444,7 +2436,7 @@ - + fr.insee j6z087mq @@ -2454,9 +2446,9 @@ - - - checkbox + + + checkbox fr.insee jbdxricm @@ -2483,10 +2475,10 @@ - - - - checkbox + + + + checkbox fr.insee jbdxricm @@ -2513,10 +2505,10 @@ - - - - checkbox + + + + checkbox fr.insee jbdxricm @@ -2543,10 +2535,10 @@ - - - - checkbox + + + + checkbox fr.insee jbdxricm @@ -2573,10 +2565,10 @@ - - - - checkbox + + + + checkbox fr.insee jbdxricm @@ -2603,7 +2595,7 @@ - + @@ -2840,7 +2832,7 @@ - + fr.insee j4nwh16i @@ -2850,7 +2842,7 @@ - + fr.insee j4nwc63q-secondDimension-fakeCL-1 @@ -2860,13 +2852,13 @@ - + 0 100 - Decimal + Decimal fr.insee j4nwc63q-RDOP-jbgde5yl @@ -2879,14 +2871,14 @@ - - + + 0 100 - Decimal + Decimal fr.insee j4nwc63q-RDOP-jbgd2x2t @@ -2899,14 +2891,14 @@ - - + + 0 100 - Decimal + Decimal fr.insee j4nwc63q-RDOP-jbgdjypz @@ -2919,14 +2911,14 @@ - - + + 0 100 - Decimal + Decimal fr.insee j4nwc63q-RDOP-jbgdcftu @@ -2939,14 +2931,14 @@ - - + + 0 100 - Decimal + Decimal fr.insee j4nwc63q-RDOP-jbgdiyfe @@ -2959,14 +2951,14 @@ - - + + 0 100 - Decimal + Decimal fr.insee j4nwc63q-RDOP-jbgdj1wd @@ -2979,14 +2971,14 @@ - - + + 0 100 - Decimal + Decimal fr.insee j4nwc63q-RDOP-jbgddylk @@ -2999,14 +2991,14 @@ - - + + 0 100 - Decimal + Decimal fr.insee j4nwc63q-RDOP-jbgd3jj6 @@ -3019,14 +3011,14 @@ - - + + 0 100 - Decimal + Decimal fr.insee j4nwc63q-RDOP-jbgd4w3k @@ -3039,14 +3031,14 @@ - - + + 0 100 - Decimal + Decimal fr.insee j4nwc63q-RDOP-jbgd4w4k @@ -3059,7 +3051,7 @@ - + @@ -3251,7 +3243,7 @@ - + fr.insee j77dav9b @@ -3261,7 +3253,7 @@ - + fr.insee j4nw0rr6-secondDimension-fakeCL-1 @@ -3271,9 +3263,9 @@ - - - drop-down-list + + + drop-down-list fr.insee jbdyh6b5 @@ -3301,10 +3293,10 @@ - - - - drop-down-list + + + + drop-down-list fr.insee jbdyh6b5 @@ -3332,10 +3324,10 @@ - - - - drop-down-list + + + + drop-down-list fr.insee jbdyh6b5 @@ -3363,10 +3355,10 @@ - - - - drop-down-list + + + + drop-down-list fr.insee jbdyh6b5 @@ -3394,8 +3386,8 @@ - - + + fr.insee @@ -3410,8 +3402,8 @@ - - + + fr.insee @@ -3426,8 +3418,8 @@ - - + + fr.insee @@ -3442,8 +3434,8 @@ - - + + fr.insee @@ -3458,7 +3450,7 @@ - + @@ -4003,7 +3995,7 @@ - + fr.insee j6p2kivg @@ -4013,7 +4005,7 @@ - + fr.insee jbdye1wa @@ -4023,7 +4015,7 @@ - + fr.insee @@ -4051,8 +4043,8 @@ - - + + fr.insee @@ -4080,8 +4072,8 @@ - - + + fr.insee @@ -4109,8 +4101,8 @@ - - + + fr.insee @@ -4138,8 +4130,8 @@ - - + + fr.insee @@ -4167,8 +4159,8 @@ - - + + fr.insee @@ -4196,8 +4188,8 @@ - - + + fr.insee @@ -4225,8 +4217,8 @@ - - + + fr.insee @@ -4254,8 +4246,8 @@ - - + + fr.insee @@ -4283,8 +4275,8 @@ - - + + fr.insee @@ -4312,8 +4304,8 @@ - - + + fr.insee @@ -4341,8 +4333,8 @@ - - + + fr.insee @@ -4370,8 +4362,8 @@ - - + + fr.insee @@ -4399,8 +4391,8 @@ - - + + fr.insee @@ -4428,8 +4420,8 @@ - - + + fr.insee @@ -4457,8 +4449,8 @@ - - + + fr.insee @@ -4486,8 +4478,8 @@ - - + + fr.insee @@ -4515,8 +4507,8 @@ - - + + fr.insee @@ -4544,8 +4536,8 @@ - - + + fr.insee @@ -4573,8 +4565,8 @@ - - + + fr.insee @@ -4602,8 +4594,8 @@ - - + + fr.insee @@ -4631,8 +4623,8 @@ - - + + fr.insee @@ -4660,8 +4652,8 @@ - - + + fr.insee @@ -4689,8 +4681,8 @@ - - + + fr.insee @@ -4718,7 +4710,7 @@ - + fr.insee @@ -5183,7 +5175,7 @@ - + fr.insee j6qg8rc6-secondDimension-fakeCL-1 @@ -5193,7 +5185,7 @@ - + fr.insee @@ -5208,8 +5200,8 @@ - - + + fr.insee @@ -5224,8 +5216,8 @@ - - + + fr.insee @@ -5240,8 +5232,8 @@ - - + + fr.insee @@ -5256,8 +5248,8 @@ - - + + fr.insee @@ -5272,8 +5264,8 @@ - - + + fr.insee @@ -5288,8 +5280,8 @@ - - + + fr.insee @@ -5304,8 +5296,8 @@ - - + + fr.insee @@ -5320,8 +5312,8 @@ - - + + fr.insee @@ -5336,8 +5328,8 @@ - - + + fr.insee @@ -5352,14 +5344,14 @@ - - + + 0 120 - Decimal + Decimal fr.insee j6qg8rc6-RDOP-jbgdfndq @@ -5372,14 +5364,14 @@ - - + + 0 120 - Decimal + Decimal fr.insee j6qg8rc6-RDOP-jbgd7osi @@ -5392,14 +5384,14 @@ - - + + 0 120 - Decimal + Decimal fr.insee j6qg8rc6-RDOP-jbgd7bnw @@ -5412,14 +5404,14 @@ - - + + 0 120 - Decimal + Decimal fr.insee j6qg8rc6-RDOP-jbgd9k71 @@ -5432,14 +5424,14 @@ - - + + 0 120 - Decimal + Decimal fr.insee j6qg8rc6-RDOP-jbgdimks @@ -5452,14 +5444,14 @@ - - + + 0 120 - Decimal + Decimal fr.insee j6qg8rc6-RDOP-jbgdjquz @@ -5472,14 +5464,14 @@ - - + + 0 120 - Decimal + Decimal fr.insee j6qg8rc6-RDOP-jbgdd2w3 @@ -5492,14 +5484,14 @@ - - + + 0 120 - Decimal + Decimal fr.insee j6qg8rc6-RDOP-jbgdkosc @@ -5512,14 +5504,14 @@ - - + + 0 120 - Decimal + Decimal fr.insee j6qg8rc6-RDOP-jbgdk0x4 @@ -5532,14 +5524,14 @@ - - + + 0 120 - Decimal + Decimal fr.insee j6qg8rc6-RDOP-jbgd2wgf @@ -5552,7 +5544,7 @@ - + @@ -10029,11 +10021,10 @@ INSEE-COMMUN-MNR-DateTimedate 0.1.0 jj/mm/aaaa - date + date - - + fr.insee StudyUnit-i6vwid 0.1.0 @@ -10064,7 +10055,7 @@ fr.insee InstrumentScheme-i6vwid 0.1.0 - + fr.insee Instrument-i6vwid 0.1.0 @@ -10081,5 +10072,4 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/src/test/resources/ddi-to-xform/in.xml b/src/test/resources/ddi-to-xform/in.xml index 383252d9c..26479c864 100644 --- a/src/test/resources/ddi-to-xform/in.xml +++ b/src/test/resources/ddi-to-xform/in.xml @@ -1,16 +1,8 @@ - - fr.insee - INSEE-i6vwid - 0.1.0 - +fr.inseeINSEE-i6vwid0.1.0 Questionnaire SIMPSONS - - + fr.insee RessourcePackage-i6vwid 0.1.0 @@ -30,7 +22,7 @@ - We're going to test your knowledge about the simpsons series.Welcome in the simspons world! + We're going to test your knowledge about the simpsons series.Welcome in the simspons world! @@ -96,7 +88,7 @@ - Several possible answers + Several possible answers @@ -135,7 +127,7 @@ - fr.inseeFTN-INSTRUCTION-10.1.0tooltipIncluded principalities + fr.inseeFTN-INSTRUCTION-10.1.0tooltipIncluded principalities fr.insee ControlConstructScheme-i6vwid @@ -147,7 +139,7 @@ Questionnaire SIMPSONS - template + template fr.insee j6p0ti5h @@ -183,7 +175,7 @@ 0.1.0 Instruction - module + module fr.insee j6p3dkx6-QC @@ -213,7 +205,7 @@ General knowledge of the series - submodule + submodule fr.insee j3343qhx-QC @@ -255,7 +247,7 @@ 0.1.0 Instruction - module + module fr.insee j3343clt-QC @@ -285,7 +277,7 @@ Characters - module + module fr.insee j334akov-QC @@ -327,7 +319,7 @@ General questions - module + module fr.insee j6qe237q @@ -357,7 +349,7 @@ Kwik-E-Mart - submodule + submodule fr.insee j4nwc63q-QC @@ -381,7 +373,7 @@ Clowning - submodule + submodule fr.insee j4nw0rr6-QC @@ -399,7 +391,7 @@ Transport - submodule + submodule fr.insee j6p2lwuj-QC @@ -417,7 +409,7 @@ Favourite characters - module + module fr.insee j6qg8rc6-QC @@ -435,7 +427,7 @@ Comment - module + module fr.insee j6z0z3us-QC @@ -447,7 +439,7 @@ fr.insee d1e42 0.1.0 - + hideable xpath @@ -489,7 +481,7 @@ - hideable + hideable fr.insee j6p0s7o5 @@ -501,7 +493,7 @@ fr.insee d1e101 0.1.0 - + hideable xpath @@ -543,7 +535,7 @@ - hideable + hideable fr.insee j3341528 @@ -821,7 +813,7 @@ QuestionItem - + informational fr.insee j4nwc63q-CI-0 0.1.0 @@ -1281,7 +1273,7 @@ 0 99 - Decimal + Decimal fr.insee j6q9h8tj-RDOP-jbgdjy8h @@ -1387,7 +1379,7 @@ 0 99 - Decimal + Decimal fr.insee j6z06z1e-RDOP-jbgddnrd @@ -1429,8 +1421,8 @@ In which city do the Simpsons reside? - - radio-button + + radio-button fr.insee j334iumu @@ -1493,8 +1485,8 @@ Who is the Simpsons city mayor? - - checkbox + + checkbox fr.insee j6qdqoen @@ -1557,8 +1549,8 @@ In which state do The Simpsons reside? - - drop-down-list + + drop-down-list fr.insee j4nwo00f @@ -1725,7 +1717,7 @@ - + fr.insee j335cu3c @@ -1735,7 +1727,7 @@ - + fr.insee @@ -1762,8 +1754,8 @@ - - + + fr.insee @@ -1790,8 +1782,8 @@ - - + + fr.insee @@ -1818,8 +1810,8 @@ - - + + fr.insee @@ -1846,7 +1838,7 @@ - + fr.insee @@ -1956,7 +1948,7 @@ - + fr.insee j6p2mvca @@ -1966,9 +1958,9 @@ - - - radio-button + + + radio-button fr.insee jbdxh138 @@ -1995,10 +1987,10 @@ - - - - radio-button + + + + radio-button fr.insee jbdxh138 @@ -2025,10 +2017,10 @@ - - - - radio-button + + + + radio-button fr.insee jbdxh138 @@ -2055,10 +2047,10 @@ - - - - radio-button + + + + radio-button fr.insee jbdxh138 @@ -2085,7 +2077,7 @@ - + @@ -2189,7 +2181,7 @@ - + fr.insee j6qeytgc @@ -2199,9 +2191,9 @@ - - - drop-down-list + + + drop-down-list fr.insee jbdxh138 @@ -2228,10 +2220,10 @@ - - - - drop-down-list + + + + drop-down-list fr.insee jbdxh138 @@ -2258,10 +2250,10 @@ - - - - drop-down-list + + + + drop-down-list fr.insee jbdxh138 @@ -2288,10 +2280,10 @@ - - - - drop-down-list + + + + drop-down-list fr.insee jbdxh138 @@ -2318,7 +2310,7 @@ - + @@ -2444,7 +2436,7 @@ - + fr.insee j6z087mq @@ -2454,9 +2446,9 @@ - - - checkbox + + + checkbox fr.insee jbdxricm @@ -2483,10 +2475,10 @@ - - - - checkbox + + + + checkbox fr.insee jbdxricm @@ -2513,10 +2505,10 @@ - - - - checkbox + + + + checkbox fr.insee jbdxricm @@ -2543,10 +2535,10 @@ - - - - checkbox + + + + checkbox fr.insee jbdxricm @@ -2573,10 +2565,10 @@ - - - - checkbox + + + + checkbox fr.insee jbdxricm @@ -2603,7 +2595,7 @@ - + @@ -2840,7 +2832,7 @@ - + fr.insee j4nwh16i @@ -2850,7 +2842,7 @@ - + fr.insee j4nwc63q-secondDimension-fakeCL-1 @@ -2860,13 +2852,13 @@ - + 0 100 - Decimal + Decimal fr.insee j4nwc63q-RDOP-jbgde5yl @@ -2879,14 +2871,14 @@ - - + + 0 100 - Decimal + Decimal fr.insee j4nwc63q-RDOP-jbgd2x2t @@ -2899,14 +2891,14 @@ - - + + 0 100 - Decimal + Decimal fr.insee j4nwc63q-RDOP-jbgdjypz @@ -2919,14 +2911,14 @@ - - + + 0 100 - Decimal + Decimal fr.insee j4nwc63q-RDOP-jbgdcftu @@ -2939,14 +2931,14 @@ - - + + 0 100 - Decimal + Decimal fr.insee j4nwc63q-RDOP-jbgdiyfe @@ -2959,14 +2951,14 @@ - - + + 0 100 - Decimal + Decimal fr.insee j4nwc63q-RDOP-jbgdj1wd @@ -2979,14 +2971,14 @@ - - + + 0 100 - Decimal + Decimal fr.insee j4nwc63q-RDOP-jbgddylk @@ -2999,14 +2991,14 @@ - - + + 0 100 - Decimal + Decimal fr.insee j4nwc63q-RDOP-jbgd3jj6 @@ -3019,14 +3011,14 @@ - - + + 0 100 - Decimal + Decimal fr.insee j4nwc63q-RDOP-jbgd4w3k @@ -3039,14 +3031,14 @@ - - + + 0 100 - Decimal + Decimal fr.insee j4nwc63q-RDOP-jbgd4w4k @@ -3059,7 +3051,7 @@ - + @@ -3251,7 +3243,7 @@ - + fr.insee j77dav9b @@ -3261,7 +3253,7 @@ - + fr.insee j4nw0rr6-secondDimension-fakeCL-1 @@ -3271,9 +3263,9 @@ - - - drop-down-list + + + drop-down-list fr.insee jbdyh6b5 @@ -3301,10 +3293,10 @@ - - - - drop-down-list + + + + drop-down-list fr.insee jbdyh6b5 @@ -3332,10 +3324,10 @@ - - - - drop-down-list + + + + drop-down-list fr.insee jbdyh6b5 @@ -3363,10 +3355,10 @@ - - - - drop-down-list + + + + drop-down-list fr.insee jbdyh6b5 @@ -3394,8 +3386,8 @@ - - + + fr.insee @@ -3410,8 +3402,8 @@ - - + + fr.insee @@ -3426,8 +3418,8 @@ - - + + fr.insee @@ -3442,8 +3434,8 @@ - - + + fr.insee @@ -3458,7 +3450,7 @@ - + @@ -4003,7 +3995,7 @@ - + fr.insee j6p2kivg @@ -4013,7 +4005,7 @@ - + fr.insee jbdye1wa @@ -4023,7 +4015,7 @@ - + fr.insee @@ -4051,8 +4043,8 @@ - - + + fr.insee @@ -4080,8 +4072,8 @@ - - + + fr.insee @@ -4109,8 +4101,8 @@ - - + + fr.insee @@ -4138,8 +4130,8 @@ - - + + fr.insee @@ -4167,8 +4159,8 @@ - - + + fr.insee @@ -4196,8 +4188,8 @@ - - + + fr.insee @@ -4225,8 +4217,8 @@ - - + + fr.insee @@ -4254,8 +4246,8 @@ - - + + fr.insee @@ -4283,8 +4275,8 @@ - - + + fr.insee @@ -4312,8 +4304,8 @@ - - + + fr.insee @@ -4341,8 +4333,8 @@ - - + + fr.insee @@ -4370,8 +4362,8 @@ - - + + fr.insee @@ -4399,8 +4391,8 @@ - - + + fr.insee @@ -4428,8 +4420,8 @@ - - + + fr.insee @@ -4457,8 +4449,8 @@ - - + + fr.insee @@ -4486,8 +4478,8 @@ - - + + fr.insee @@ -4515,8 +4507,8 @@ - - + + fr.insee @@ -4544,8 +4536,8 @@ - - + + fr.insee @@ -4573,8 +4565,8 @@ - - + + fr.insee @@ -4602,8 +4594,8 @@ - - + + fr.insee @@ -4631,8 +4623,8 @@ - - + + fr.insee @@ -4660,8 +4652,8 @@ - - + + fr.insee @@ -4689,8 +4681,8 @@ - - + + fr.insee @@ -4718,7 +4710,7 @@ - + fr.insee @@ -5183,7 +5175,7 @@ - + fr.insee j6qg8rc6-secondDimension-fakeCL-1 @@ -5193,7 +5185,7 @@ - + fr.insee @@ -5208,8 +5200,8 @@ - - + + fr.insee @@ -5224,8 +5216,8 @@ - - + + fr.insee @@ -5240,8 +5232,8 @@ - - + + fr.insee @@ -5256,8 +5248,8 @@ - - + + fr.insee @@ -5272,8 +5264,8 @@ - - + + fr.insee @@ -5288,8 +5280,8 @@ - - + + fr.insee @@ -5304,8 +5296,8 @@ - - + + fr.insee @@ -5320,8 +5312,8 @@ - - + + fr.insee @@ -5336,8 +5328,8 @@ - - + + fr.insee @@ -5352,14 +5344,14 @@ - - + + 0 120 - Decimal + Decimal fr.insee j6qg8rc6-RDOP-jbgdfndq @@ -5372,14 +5364,14 @@ - - + + 0 120 - Decimal + Decimal fr.insee j6qg8rc6-RDOP-jbgd7osi @@ -5392,14 +5384,14 @@ - - + + 0 120 - Decimal + Decimal fr.insee j6qg8rc6-RDOP-jbgd7bnw @@ -5412,14 +5404,14 @@ - - + + 0 120 - Decimal + Decimal fr.insee j6qg8rc6-RDOP-jbgd9k71 @@ -5432,14 +5424,14 @@ - - + + 0 120 - Decimal + Decimal fr.insee j6qg8rc6-RDOP-jbgdimks @@ -5452,14 +5444,14 @@ - - + + 0 120 - Decimal + Decimal fr.insee j6qg8rc6-RDOP-jbgdjquz @@ -5472,14 +5464,14 @@ - - + + 0 120 - Decimal + Decimal fr.insee j6qg8rc6-RDOP-jbgdd2w3 @@ -5492,14 +5484,14 @@ - - + + 0 120 - Decimal + Decimal fr.insee j6qg8rc6-RDOP-jbgdkosc @@ -5512,14 +5504,14 @@ - - + + 0 120 - Decimal + Decimal fr.insee j6qg8rc6-RDOP-jbgdk0x4 @@ -5532,14 +5524,14 @@ - - + + 0 120 - Decimal + Decimal fr.insee j6qg8rc6-RDOP-jbgd2wgf @@ -5552,7 +5544,7 @@ - + @@ -10029,11 +10021,10 @@ INSEE-COMMUN-MNR-DateTimedate 0.1.0 jj/mm/aaaa - date + date - - + fr.insee StudyUnit-i6vwid 0.1.0 @@ -10064,7 +10055,7 @@ fr.insee InstrumentScheme-i6vwid 0.1.0 - + fr.insee Instrument-i6vwid 0.1.0 @@ -10081,5 +10072,4 @@ - - \ No newline at end of file + \ No newline at end of file From 5f8d85e345b636da2bcddf2d66cff2910aa5e186 Mon Sep 17 00:00:00 2001 From: BulotF Date: Wed, 12 Jun 2019 14:35:09 +0200 Subject: [PATCH 007/439] TypeOfComputationItem --- .../resources/xslt/inputs/ddi/templates.fods | 31 ++++++++++++++----- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/src/main/resources/xslt/inputs/ddi/templates.fods b/src/main/resources/xslt/inputs/ddi/templates.fods index fbe049570..8f2c75fab 100644 --- a/src/main/resources/xslt/inputs/ddi/templates.fods +++ b/src/main/resources/xslt/inputs/ddi/templates.fods @@ -1,20 +1,20 @@ - 2009-04-16T11:32:48.39P3DT1H58M50S392LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-04-25T15:01:55.079000000François Bulot + 2009-04-16T11:32:48.39P3DT2H2M5S393LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-12T14:33:39.955000000François Bulot 0 0 63256 - 74323 + 74901 view1 0 - 107 + 96 0 0 0 @@ -23,7 +23,7 @@ 0 0 0 - 102 + 81 0 100 60 @@ -77,8 +77,8 @@ true true true - \\S20slinng\M20-207-RICOH MP2554SP - 1hP+/1xcUzIwc2xpbm5nXE0yMC0yMDctUklDT0ggTVAyNTU0U1AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUklDT0ggUENMNiBVbml2ZXJzYWxEcml2ZXIgVjQuMQAWAAEA8hIAAAAAAAAEAAhSAAAEdAAAM1ROVwAAAAAKAFwAXABTADIAMABzAGwAaQBuAG4AZwBcAE0AMgAwAC0AMgAwADcALQBSAEkAQwBPAEgAIABNAFAAMgA1AAAAAAABBAAg3AAMEg//gAMBAAkAmgs0CGQAAQAHAFgCAQACAFgCAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAIAAAAAAgAAAQAAAAAAAAAAAAAAAAAAAAAAAAAxMERSDFhkDpG++hkAAAAAKQQAAHicdVPRcuMwCPwXP/ch6dy01/yMB0vYVouERkJJ05v790OyE6eX9M1mVwss8KfLAsFCshEmzL0LsYgkOHeHDopw/cxIaKR7+o/q0TqQc0SlRgIXFExozobQKplQBNOMYD3bxkkuaMTiCIWqnC2R8HNFeRw1VLIS2KtYAI/9ql4LqYo8uVAZt1h7gaMLLek7D2s8cPJALeeq6+zjNxmOyEdMBGcLAv3oCCPIrERFIUZyBsRx+GL2R6BSJfa7Xe2ATfEYJLuvVucvjZmShX2EiKmG+xKcKOb9A+zkrMzquanJfj+/PqAQhkk5+vzQPb+97n5UWRhLXT+IrIn2+5c3JSW0xSAGgjTV6kcnws2w1s5Td9/vhh7UNo+QOTkdCtD6RH/VjuZWnTgn3R9XB5BYo2r3ZdA6KP3IKNeI2s+l/u7retXKZ8RtTRQgDhPaSbdxFFXmqODA/EE3KjbBaUxa2sA64nSNV81LJHDA7Wl/C3HU8vk2gWHiNJwUGwjMh+74aXaCzb/MVNZWX5o/U4I4O5PXnT7q2XC6+AZEgp8CuQldK8MAg94XE6lB25m0BLqVGb83ojeodmx9lWWmy5/h6DBXD5fK7yTV4e2+7w4yz9q1KdKbkpIaoZwL+PcfWFN6vgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASAENPTVBBVF9EVVBMRVhfTU9ERRQARHVwbGV4TW9kZTo6TG9uZ0VkZ2U= + Envoyer à OneNote 16 + xQT+/0Vudm95ZXIgw6AgT25lTm90ZcKgMTYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAU2VuZCB0byBNaWNyb3NvZnQgT25lTm90ZSAxNiBEcgAWAAEA4gMAAAAAAAAEAAhSAAAEdAAAM1ROVwAAAAAKAEUAbgB2AG8AeQBlAHIAIADgACAATwBuAGUATgBvAHQAZQCgADEANgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBAAG3AD8AgMvAAABAAkAmgs0CGQAAQAPAFgCAgABAFgCAwABAEEANAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAQAAAAIAAAABAAAA/////wAAAAAAAAAAAAAAAAAAAABESU5VIgDAAPwCAACsE9jAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAMAAAABTTVRKAAAAABAAsABTAGUAbgBkACAAdABvACAATQBpAGMAcgBvAHMAbwBmAHQAIABPAG4AZQBOAG8AdABlACAAMQA2ACAARAByAGkAdgBlAHIAAABSRVNETEwAVW5pcmVzRExMAFBhcGVyU2l6ZQBMRVRURVIAT3JpZW50YXRpb24AUE9SVFJBSVQAUmVzb2x1dGlvbgBEUEk2MDAAQ29sb3JNb2RlADI0YnBwAAAAAAAAAAAAAAAAAAAAABIAQ09NUEFUX0RVUExFWF9NT0RFEwBEdXBsZXhNb2RlOjpVbmtub3du zxx @@ -626,7 +626,7 @@ ???(???) - 00/00/0000, 00:00:00 + 00/00/0000, 00:00:00 @@ -2129,7 +2129,7 @@ - d:ComputationItem + d:ComputationItem[not(d:TypeOfComputationItem='stumblingblock')] enoddi:get-message-type @@ -2142,6 +2142,21 @@ Getting the message type of a d:Instruction being a descendant of a d:ComputationItem. + + + d:ComputationItem[d:TypeOfComputationItem='stumblingblock'] + + + enoddi:get-message-type + + + 'error' + + + + Getting the message type of a d:Instruction being a descendant of a d:ComputationItem. + + From c44bd105e5e95ab1dd153309ad58addb8fb280ab Mon Sep 17 00:00:00 2001 From: BulotF Date: Wed, 12 Jun 2019 15:15:05 +0200 Subject: [PATCH 008/439] FixedCellValue --- .../resources/xslt/inputs/ddi/templates.fods | 40 +++++++++++++++++-- .../xslt/transformations/ddi2fr/drivers.fods | 19 +++++++-- .../xslt/transformations/ddi2js/drivers.fods | 21 +++++++--- .../xslt/transformations/ddi2odt/drivers.fods | 19 +++++++-- .../xslt/transformations/ddi2pdf/drivers.fods | 19 +++++++-- 5 files changed, 97 insertions(+), 21 deletions(-) diff --git a/src/main/resources/xslt/inputs/ddi/templates.fods b/src/main/resources/xslt/inputs/ddi/templates.fods index 8f2c75fab..bab912759 100644 --- a/src/main/resources/xslt/inputs/ddi/templates.fods +++ b/src/main/resources/xslt/inputs/ddi/templates.fods @@ -1,20 +1,20 @@ - 2009-04-16T11:32:48.39P3DT2H2M5S393LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-12T14:33:39.955000000François Bulot + 2009-04-16T11:32:48.39P3DT2H23M22S394LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-12T15:12:44.963000000François Bulot 0 0 63256 - 74901 + 76058 view1 0 - 96 + 65 0 0 0 @@ -23,7 +23,7 @@ 0 0 0 - 81 + 38 0 100 60 @@ -1075,6 +1075,21 @@ Identifier for FixedCell : concat the name of the Grid, "Cell" and the position of the top-left corner + + + d:FixedCellValue + + + enoddi:get-id + + + concat(ancestor::d:QuestionGrid/r:ID,'-Cell-',d:CellCoordinatesAsDefined/d:SelectDimension[@rank='1']/@rangeMinimum,d:CellCoordinatesAsDefined/d:SelectDimension[@rank='1']/@specificValue,'_',d:CellCoordinatesAsDefined/d:SelectDimension[@rank='2']/@rangeMinimum,d:CellCoordinatesAsDefined/d:SelectDimension[@rank='2']/@specificValue) + + + + Identifier for FixedCell : concat the name of the Grid, "Cell" and the position of the top-left corner + + @@ -1246,6 +1261,23 @@ The label of grid cells without Response + + + d:FixedCellValue + + + enoddi:get-label + + + r:Value + + + lang-choice + + + The label of grid cells without Response + + r:Description[parent::d:IfThenElse] diff --git a/src/main/resources/xslt/transformations/ddi2fr/drivers.fods b/src/main/resources/xslt/transformations/ddi2fr/drivers.fods index b90265b90..11dc1b982 100644 --- a/src/main/resources/xslt/transformations/ddi2fr/drivers.fods +++ b/src/main/resources/xslt/transformations/ddi2fr/drivers.fods @@ -1,20 +1,20 @@ - 2009-04-16T11:32:48.39P1DT3H3M9S164LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-12T12:48:19.613000000François Bulot + 2009-04-16T11:32:48.39P1DT3H5M51S165LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-12T14:45:11.776000000François Bulot 0 0 50597 - 28513 + 28964 view1 0 - 57 + 47 0 0 0 @@ -591,7 +591,7 @@ ???(???) - 00/00/0000, 00:00:00 + 00/00/0000, 00:00:00 @@ -996,6 +996,17 @@ Those NoDataByDefinition elements which are linked to a text activate the FixedCell driver. + + + d:FixedCellValue + + + FixedCell + + + DDI 3.3 way to define FixedCell + + diff --git a/src/main/resources/xslt/transformations/ddi2js/drivers.fods b/src/main/resources/xslt/transformations/ddi2js/drivers.fods index de434e77f..ebb2ca575 100644 --- a/src/main/resources/xslt/transformations/ddi2js/drivers.fods +++ b/src/main/resources/xslt/transformations/ddi2js/drivers.fods @@ -1,20 +1,20 @@ - 2009-04-16T11:32:48.39P5DT1H47M20S217LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-12T13:47:33.456000000François Bulot + 2009-04-16T11:32:48.39P5DT1H47M32S218LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-12T15:13:42.858000000François Bulot 0 0 51722 - 28059 + 28511 view1 0 - 35 + 45 0 0 0 @@ -23,7 +23,7 @@ 0 0 0 - 0 + 15 0 100 60 @@ -588,7 +588,7 @@ ???(???) - 00/00/0000, 00:00:00 + 00/00/0000, 00:00:00 @@ -990,6 +990,17 @@ Those NoDataByDefinition elements which are linked to a text activate the FixedCell driver. + + + d:FixedCellValue + + + FixedCell + + + DDI 3.3 way to define FixedCell + + diff --git a/src/main/resources/xslt/transformations/ddi2odt/drivers.fods b/src/main/resources/xslt/transformations/ddi2odt/drivers.fods index 238540f22..c79d3f25d 100644 --- a/src/main/resources/xslt/transformations/ddi2odt/drivers.fods +++ b/src/main/resources/xslt/transformations/ddi2odt/drivers.fods @@ -1,20 +1,20 @@ - 2009-04-16T11:32:48.39P3DT6H14M29S208LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-12T13:52:34.288000000François Bulot + 2009-04-16T11:32:48.39P3DT6H15M5S209LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-12T15:14:30.153000000François Bulot 0 0 60138 - 28059 + 28511 view1 0 - 54 + 45 0 0 0 @@ -588,7 +588,7 @@ ???(???) - 00/00/0000, 00:00:00 + 00/00/0000, 00:00:00 @@ -990,6 +990,17 @@ Those NoDataByDefinition elements which are linked to a text activate the FixedCell driver. + + + d:FixedCellValue + + + FixedCell + + + DDI 3.3 way to define FixedCell + + diff --git a/src/main/resources/xslt/transformations/ddi2pdf/drivers.fods b/src/main/resources/xslt/transformations/ddi2pdf/drivers.fods index 8a57d6481..d6db259ac 100644 --- a/src/main/resources/xslt/transformations/ddi2pdf/drivers.fods +++ b/src/main/resources/xslt/transformations/ddi2pdf/drivers.fods @@ -1,20 +1,20 @@ - 2009-04-16T11:32:48.39P2DT1H39M24S166LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-12T13:54:37.386000000François Bulot + 2009-04-16T11:32:48.39P2DT1H39M32S167LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-12T15:14:46.498000000François Bulot 0 0 67742 - 29806 + 30257 view1 0 - 58 + 50 0 0 0 @@ -599,7 +599,7 @@ ???(???) - 00/00/0000, 00:00:00 + 00/00/0000, 00:00:00 @@ -1027,6 +1027,17 @@ Those NoDataByDefinition elements which are linked to a text activate the FixedCell driver. + + + d:FixedCellValue + + + FixedCell + + + DDI 3.3 way to define FixedCell + + From 3a66cbb366e7e1e5e92f7eaa52df30b2f852f184 Mon Sep 17 00:00:00 2001 From: BulotF Date: Wed, 12 Jun 2019 15:37:03 +0200 Subject: [PATCH 009/439] d:GridResponseDomainInMixed/d:ResponseAttachmentLocation --- .../resources/xslt/inputs/ddi/templates.fods | 48 +++++++++++++++---- .../xslt/transformations/ddi2fr/drivers.fods | 27 +++++++---- .../ddi2fr/tree-navigation.fods | 10 ++-- .../xslt/transformations/ddi2js/drivers.fods | 27 +++++++---- .../ddi2js/tree-navigation.fods | 14 +++--- .../xslt/transformations/ddi2odt/drivers.fods | 27 +++++++---- .../ddi2odt/tree-navigation.fods | 10 ++-- .../xslt/transformations/ddi2pdf/drivers.fods | 27 +++++++---- .../ddi2pdf/tree-navigation.fods | 12 ++--- 9 files changed, 138 insertions(+), 64 deletions(-) diff --git a/src/main/resources/xslt/inputs/ddi/templates.fods b/src/main/resources/xslt/inputs/ddi/templates.fods index bab912759..9e873e55d 100644 --- a/src/main/resources/xslt/inputs/ddi/templates.fods +++ b/src/main/resources/xslt/inputs/ddi/templates.fods @@ -1,20 +1,20 @@ - 2009-04-16T11:32:48.39P3DT2H23M22S394LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-12T15:12:44.963000000François Bulot + 2009-04-16T11:32:48.39P3DT2H26M50S396LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-12T15:35:40.762000000François Bulot 0 0 63256 - 76058 + 77216 view1 0 - 65 + 13 0 0 0 @@ -23,7 +23,7 @@ 0 0 0 - 38 + 0 0 100 60 @@ -557,6 +557,9 @@ + + + @@ -570,9 +573,6 @@ - - - @@ -1057,7 +1057,22 @@ - Identifier for the hideable group in "other – give details" + Identifier for the hideable group in "other – give details" in QuestionItem + + + + + d:GridResponseDomainInMixed[d:ResponseAttachmentLocation] + + + enoddi:get-id + + + concat(ancestor::d:QuestionGrid/r:ID,'-Details-',count(preceding-sibling::d:GridResponseDomainInMixed[d:ResponseAttachmentLocation])+1) + + + + Identifier for the hideable group in "other – give details" in QuestionGrid @@ -1905,7 +1920,22 @@ - Function that returns the id of the 'other' for a 'give-details' response. + Function that returns the id of the 'other' for a 'give-details' response in a QuestionItem. + + + + + d:GridResponseDomainInMixed[d:ResponseAttachmentLocation] + + + enoddi:get-hideable-command-variables + + + ../../r:Binding[r:SourceParameterReference/r:ID = current()/../d:GridResponseDomainInMixed[@attachmentBase= current()/d:ResponseAttachmentLocation/d:DomainSpecificValue/@attachmentDomain]/*[contains(name(),'Domain')]/r:OutParameter/r:ID]/r:TargetParameterReference/r:ID + + + + Function that returns the id of the 'other' for a 'give-details' response in a QuestionGrid. diff --git a/src/main/resources/xslt/transformations/ddi2fr/drivers.fods b/src/main/resources/xslt/transformations/ddi2fr/drivers.fods index 11dc1b982..c15d67a7c 100644 --- a/src/main/resources/xslt/transformations/ddi2fr/drivers.fods +++ b/src/main/resources/xslt/transformations/ddi2fr/drivers.fods @@ -1,20 +1,20 @@ - 2009-04-16T11:32:48.39P1DT3H5M51S165LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-12T14:45:11.776000000François Bulot + 2009-04-16T11:32:48.39P1DT3H7M53S167LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-12T15:22:43.848000000François Bulot 0 0 50597 - 28964 + 29416 view1 0 - 47 + 57 0 0 0 @@ -23,7 +23,7 @@ 0 0 0 - 27 + 33 0 100 60 @@ -591,7 +591,7 @@ ???(???) - 00/00/0000, 00:00:00 + 00/00/0000, 00:00:00 @@ -693,7 +693,18 @@ xf-group - "Other – give details" activate the xf-group driver for "give details" + "Other – give details" activate the xf-group driver for "give details" in QuestionItem + + + + + d:GridResponseDomainInMixed[d:ResponseAttachmentLocation] + + + xf-group + + + "Other – give details" activate the xf-group driver for "give details" in QuestionGrid @@ -1067,7 +1078,7 @@ - d:QuestionGrid[(d:GridDimension/@rank='2' or d:StructuredMixedGridResponseDomain/d:GridResponseDomainInMixed[not(d:NominalDomain) and not(d:AttachmentLocation)]) and not(d:GridDimension/d:Roster)] + d:QuestionGrid[(d:GridDimension/@rank='2' or d:StructuredMixedGridResponseDomain/d:GridResponseDomainInMixed[not(d:NominalDomain) and not(d:ResponseAttachmentLocation)]) and not(d:GridDimension/d:Roster)] Table @@ -1082,7 +1093,7 @@ - d:QuestionGrid[not(d:GridDimension/@rank='2') and not(d:StructuredMixedGridResponseDomain/d:GridResponseDomainInMixed[not(d:NominalDomain) and not(d:AttachmentLocation)])] + d:QuestionGrid[not(d:GridDimension/@rank='2') and not(d:StructuredMixedGridResponseDomain/d:GridResponseDomainInMixed[not(d:NominalDomain) and not(d:ResponseAttachmentLocation)])] MultipleChoiceQuestion diff --git a/src/main/resources/xslt/transformations/ddi2fr/tree-navigation.fods b/src/main/resources/xslt/transformations/ddi2fr/tree-navigation.fods index 6a61bc741..1c6fe11a3 100644 --- a/src/main/resources/xslt/transformations/ddi2fr/tree-navigation.fods +++ b/src/main/resources/xslt/transformations/ddi2fr/tree-navigation.fods @@ -1,7 +1,7 @@ - 2009-04-16T11:32:48.39PT6H11M28S32LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-12T12:49:50.058000000François Bulot + 2009-04-16T11:32:48.39PT6H11M37S33LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-12T15:26:54.352000000François Bulot 0 @@ -13,14 +13,14 @@ view1 - 2 + 0 5 0 0 0 0 2 - 1 + 0 0 0 0 @@ -570,7 +570,7 @@ ???(???) - 00/00/0000, 00:00:00 + 00/00/0000, 00:00:00 @@ -632,7 +632,7 @@ - d:QuestionGrid[not(d:GridDimension/@rank='2') and not(d:StructuredMixedGridResponseDomain/d:GridResponseDomainInMixed[not(d:NominalDomain) and not(d:AttachmentLocation)])] + d:QuestionGrid[not(d:GridDimension/@rank='2') and not(d:StructuredMixedGridResponseDomain/d:GridResponseDomainInMixed[not(d:NominalDomain) and not(d:ResponseAttachmentLocation)])] .//d:GridResponseDomainInMixed/* diff --git a/src/main/resources/xslt/transformations/ddi2js/drivers.fods b/src/main/resources/xslt/transformations/ddi2js/drivers.fods index ebb2ca575..672856d59 100644 --- a/src/main/resources/xslt/transformations/ddi2js/drivers.fods +++ b/src/main/resources/xslt/transformations/ddi2js/drivers.fods @@ -1,20 +1,20 @@ - 2009-04-16T11:32:48.39P5DT1H47M32S218LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-12T15:13:42.858000000François Bulot + 2009-04-16T11:32:48.39P5DT1H48M22S219LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-12T15:23:51.265000000François Bulot 0 0 51722 - 28511 + 28963 view1 0 - 45 + 58 0 0 0 @@ -23,7 +23,7 @@ 0 0 0 - 15 + 27 0 100 60 @@ -588,7 +588,7 @@ ???(???) - 00/00/0000, 00:00:00 + 00/00/0000, 00:00:00 @@ -690,7 +690,18 @@ xf-group - "Other – give details" activate the xf-group driver for "give details" + "Other – give details" activate the xf-group driver for "give details" in QuestionItem + + + + + d:GridResponseDomainInMixed[d:ResponseAttachmentLocation] + + + xf-group + + + "Other – give details" activate the xf-group driver for "give details" in QuestionGrid @@ -1061,7 +1072,7 @@ - d:QuestionGrid[(d:GridDimension/@rank='2' or d:StructuredMixedGridResponseDomain/d:GridResponseDomainInMixed[not(d:NominalDomain) and not(d:AttachmentLocation)]) and not(d:GridDimension/d:Roster)] + d:QuestionGrid[(d:GridDimension/@rank='2' or d:StructuredMixedGridResponseDomain/d:GridResponseDomainInMixed[not(d:NominalDomain) and not(d:ResponseAttachmentLocation)]) and not(d:GridDimension/d:Roster)] Table @@ -1076,7 +1087,7 @@ - d:QuestionGrid[not(d:GridDimension/@rank='2') and not(d:StructuredMixedGridResponseDomain/d:GridResponseDomainInMixed[not(d:NominalDomain) and not(d:AttachmentLocation)])] + d:QuestionGrid[not(d:GridDimension/@rank='2') and not(d:StructuredMixedGridResponseDomain/d:GridResponseDomainInMixed[not(d:NominalDomain) and not(d:ResponseAttachmentLocation)])] MultipleChoiceQuestion diff --git a/src/main/resources/xslt/transformations/ddi2js/tree-navigation.fods b/src/main/resources/xslt/transformations/ddi2js/tree-navigation.fods index 9d2a1534b..c0612743e 100644 --- a/src/main/resources/xslt/transformations/ddi2js/tree-navigation.fods +++ b/src/main/resources/xslt/transformations/ddi2js/tree-navigation.fods @@ -1,26 +1,26 @@ - 2009-04-16T11:32:48.39PT3H23M18S33LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-12T13:48:18.592000000François Bulot + 2009-04-16T11:32:48.39PT3H23M28S34LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-12T15:26:31.816000000François Bulot 0 0 54881 - 3578 + 3494 view1 - 2 + 0 5 0 0 0 0 2 - 1 + 0 0 0 0 @@ -517,7 +517,7 @@ - + @@ -570,7 +570,7 @@ ???(???) - 00/00/0000, 00:00:00 + 00/00/0000, 00:00:00 @@ -632,7 +632,7 @@ - d:QuestionGrid[not(d:GridDimension/@rank='2') and not(d:StructuredMixedGridResponseDomain/d:GridResponseDomainInMixed[not(d:NominalDomain) and not(d:AttachmentLocation)])] + d:QuestionGrid[not(d:GridDimension/@rank='2') and not(d:StructuredMixedGridResponseDomain/d:GridResponseDomainInMixed[not(d:NominalDomain) and not(d:ResponseAttachmentLocation)])] .//d:GridResponseDomainInMixed/* diff --git a/src/main/resources/xslt/transformations/ddi2odt/drivers.fods b/src/main/resources/xslt/transformations/ddi2odt/drivers.fods index c79d3f25d..22520b7b7 100644 --- a/src/main/resources/xslt/transformations/ddi2odt/drivers.fods +++ b/src/main/resources/xslt/transformations/ddi2odt/drivers.fods @@ -1,20 +1,20 @@ - 2009-04-16T11:32:48.39P3DT6H15M5S209LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-12T15:14:30.153000000François Bulot + 2009-04-16T11:32:48.39P3DT6H15M41S210LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-12T15:24:41.906000000François Bulot 0 0 60138 - 28511 + 28963 view1 0 - 45 + 13 0 0 0 @@ -23,7 +23,7 @@ 0 0 0 - 35 + 0 0 100 60 @@ -588,7 +588,7 @@ ???(???) - 00/00/0000, 00:00:00 + 00/00/0000, 00:00:00 @@ -690,7 +690,18 @@ xf-group - "Other – give details" activate the xf-group driver for "give details" + "Other – give details" activate the xf-group driver for "give details" in QuestionItem + + + + + d:GridResponseDomainInMixed[d:ResponseAttachmentLocation] + + + xf-group + + + "Other – give details" activate the xf-group driver for "give details" in QuestionGrid @@ -1061,7 +1072,7 @@ - d:QuestionGrid[(d:GridDimension/@rank='2' or d:StructuredMixedGridResponseDomain/d:GridResponseDomainInMixed[not(d:NominalDomain) and not(d:AttachmentLocation)]) and not(d:GridDimension/d:Roster)] + d:QuestionGrid[(d:GridDimension/@rank='2' or d:StructuredMixedGridResponseDomain/d:GridResponseDomainInMixed[not(d:NominalDomain) and not(d:ResponseAttachmentLocation)]) and not(d:GridDimension/d:Roster)] Table @@ -1076,7 +1087,7 @@ - d:QuestionGrid[not(d:GridDimension/@rank='2') and not(d:StructuredMixedGridResponseDomain/d:GridResponseDomainInMixed[not(d:NominalDomain) and not(d:AttachmentLocation)])] + d:QuestionGrid[not(d:GridDimension/@rank='2') and not(d:StructuredMixedGridResponseDomain/d:GridResponseDomainInMixed[not(d:NominalDomain) and not(d:ResponseAttachmentLocation)])] MultipleChoiceQuestion diff --git a/src/main/resources/xslt/transformations/ddi2odt/tree-navigation.fods b/src/main/resources/xslt/transformations/ddi2odt/tree-navigation.fods index 7021acc42..29cf9932a 100644 --- a/src/main/resources/xslt/transformations/ddi2odt/tree-navigation.fods +++ b/src/main/resources/xslt/transformations/ddi2odt/tree-navigation.fods @@ -1,7 +1,7 @@ - 2009-04-16T11:32:48.39PT3H23M10S33LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-12T13:53:09.079000000François Bulot + 2009-04-16T11:32:48.39PT3H23M21S34LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-12T15:26:13.873000000François Bulot 0 @@ -13,14 +13,14 @@ view1 - 1 + 0 5 0 0 0 0 2 - 1 + 0 0 0 0 @@ -570,7 +570,7 @@ ???(???) - 00/00/0000, 00:00:00 + 00/00/0000, 00:00:00 @@ -632,7 +632,7 @@ - d:QuestionGrid[not(d:GridDimension/@rank='2') and not(d:StructuredMixedGridResponseDomain/d:GridResponseDomainInMixed[not(d:NominalDomain) and not(d:AttachmentLocation)])] + d:QuestionGrid[not(d:GridDimension/@rank='2') and not(d:StructuredMixedGridResponseDomain/d:GridResponseDomainInMixed[not(d:NominalDomain) and not(d:ResponseAttachmentLocation)])] .//d:GridResponseDomainInMixed/* diff --git a/src/main/resources/xslt/transformations/ddi2pdf/drivers.fods b/src/main/resources/xslt/transformations/ddi2pdf/drivers.fods index d6db259ac..ad5716d1b 100644 --- a/src/main/resources/xslt/transformations/ddi2pdf/drivers.fods +++ b/src/main/resources/xslt/transformations/ddi2pdf/drivers.fods @@ -1,20 +1,20 @@ - 2009-04-16T11:32:48.39P2DT1H39M32S167LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-12T15:14:46.498000000François Bulot + 2009-04-16T11:32:48.39P2DT1H40M5S168LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-12T15:25:25.568000000François Bulot 0 0 67742 - 30257 + 30709 view1 0 - 50 + 10 0 0 0 @@ -23,7 +23,7 @@ 0 0 0 - 39 + 0 0 100 60 @@ -599,7 +599,7 @@ ???(???) - 00/00/0000, 00:00:00 + 00/00/0000, 00:00:00 @@ -701,7 +701,18 @@ xf-group - "Other – give details" activate the xf-group driver for "give details" + "Other – give details" activate the xf-group driver for "give details" in QuestionItem + + + + + d:GridResponseDomainInMixed[d:ResponseAttachmentLocation] + + + xf-group + + + "Other – give details" activate the xf-group driver for "give details" in QuestionGrid @@ -1097,7 +1108,7 @@ - d:QuestionGrid[(d:GridDimension/@rank='2' or d:StructuredMixedGridResponseDomain/d:GridResponseDomainInMixed[not(d:NominalDomain) and not(d:AttachmentLocation)]) and not(d:GridDimension/d:Roster)] + d:QuestionGrid[(d:GridDimension/@rank='2' or d:StructuredMixedGridResponseDomain/d:GridResponseDomainInMixed[not(d:NominalDomain) and not(d:ResponseAttachmentLocation)]) and not(d:GridDimension/d:Roster)] Table @@ -1112,7 +1123,7 @@ - d:QuestionGrid[not(d:GridDimension/@rank='2') and not(d:StructuredMixedGridResponseDomain/d:GridResponseDomainInMixed[not(d:NominalDomain) and not(d:AttachmentLocation)])] + d:QuestionGrid[not(d:GridDimension/@rank='2') and not(d:StructuredMixedGridResponseDomain/d:GridResponseDomainInMixed[not(d:NominalDomain) and not(d:ResponseAttachmentLocation)])] MultipleChoiceQuestion diff --git a/src/main/resources/xslt/transformations/ddi2pdf/tree-navigation.fods b/src/main/resources/xslt/transformations/ddi2pdf/tree-navigation.fods index 7d8040c91..507e64615 100644 --- a/src/main/resources/xslt/transformations/ddi2pdf/tree-navigation.fods +++ b/src/main/resources/xslt/transformations/ddi2pdf/tree-navigation.fods @@ -1,19 +1,19 @@ - 2009-04-16T11:32:48.39P1DT6H30M35S73LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-12T14:04:02.826000000François Bulot + 2009-04-16T11:32:48.39P1DT6H30M54S74LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-12T15:25:52.864000000François Bulot 0 0 71737 - 3501 + 3494 view1 - 1 + 0 5 0 0 @@ -517,7 +517,7 @@ - + @@ -566,7 +566,7 @@ ???(???) - 00/00/0000, 00:00:00 + 00/00/0000, 00:00:00 @@ -628,7 +628,7 @@ - d:QuestionGrid[not(d:GridDimension/@rank='2') and not(d:StructuredMixedGridResponseDomain/d:GridResponseDomainInMixed[not(d:NominalDomain) and not(d:AttachmentLocation)])] + d:QuestionGrid[not(d:GridDimension/@rank='2') and not(d:StructuredMixedGridResponseDomain/d:GridResponseDomainInMixed[not(d:NominalDomain) and not(d:ResponseAttachmentLocation)])] .//d:GridResponseDomainInMixed/* From 76b649ac7262528b81c52c6a5b321ff8e875b364 Mon Sep 17 00:00:00 2001 From: BulotF Date: Wed, 12 Jun 2019 15:43:17 +0200 Subject: [PATCH 010/439] d:DateTime/r:Range --- .../resources/xslt/inputs/ddi/templates.fods | 38 +++++++++++++++++-- 1 file changed, 34 insertions(+), 4 deletions(-) diff --git a/src/main/resources/xslt/inputs/ddi/templates.fods b/src/main/resources/xslt/inputs/ddi/templates.fods index 9e873e55d..721a6f497 100644 --- a/src/main/resources/xslt/inputs/ddi/templates.fods +++ b/src/main/resources/xslt/inputs/ddi/templates.fods @@ -1,20 +1,20 @@ - 2009-04-16T11:32:48.39P3DT2H26M50S396LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-12T15:35:40.762000000François Bulot + 2009-04-16T11:32:48.39P3DT2H34M2S397LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-12T15:42:53.153000000François Bulot 0 0 63256 - 77216 + 78373 view1 0 - 13 + 93 0 0 0 @@ -23,7 +23,7 @@ 0 0 0 - 0 + 72 0 100 60 @@ -2102,6 +2102,21 @@ Getting the minimum of a numeric response domain. + + + d:DateTimeDomain|d:DateTimeDomainReference + + + enoddi:get-minimum + + + descendant::r:Low[not(ancestor::r:OutParameter)] + + + + Getting the minimum of a dateTime or duration response domain. + + @@ -2120,6 +2135,21 @@ Getting the maximum of a numeric response domain. + + + d:DateTimeDomain|d:DateTimeDomainReference + + + enoddi:get-maximum + + + descendant::r:High[not(ancestor::r:OutParameter)] + + + + Getting the maximum of a dateTime or duration response domain. + + From 5dbcfd6ab9645f3cc13f02e316b520bdfbd66d48 Mon Sep 17 00:00:00 2001 From: BulotF Date: Wed, 12 Jun 2019 15:51:41 +0200 Subject: [PATCH 011/439] d:CodeDomain/@displayCode --- .../resources/xslt/inputs/ddi/templates.fods | 48 ++++++++++++++++--- 1 file changed, 41 insertions(+), 7 deletions(-) diff --git a/src/main/resources/xslt/inputs/ddi/templates.fods b/src/main/resources/xslt/inputs/ddi/templates.fods index 721a6f497..ee96f9057 100644 --- a/src/main/resources/xslt/inputs/ddi/templates.fods +++ b/src/main/resources/xslt/inputs/ddi/templates.fods @@ -1,29 +1,29 @@ - 2009-04-16T11:32:48.39P3DT2H34M2S397LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-12T15:42:53.153000000François Bulot + 2009-04-16T11:32:48.39P3DT2H42M2S401LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-12T15:50:55.537000000François Bulot 0 0 63256 - 78373 + 79530 view1 - 0 - 93 + 4 + 23 0 0 0 0 2 - 0 + 2 0 0 - 72 + 12 0 100 60 @@ -1194,8 +1194,42 @@ + + l:Code[not(ancestor::d:CodeDomain/@displayCode)] + + + enoddi:get-label + - l:Code + r:CategoryReference/l:Category/r:Label + + + lang-choice + + + The label of a Code is its descendant r:Label. + + + + + l:Code[ancestor::d:CodeDomain/@displayCode='true'] + + + enoddi:get-label + + + concat(r:Value,' - ',r:CategoryReference/l:Category/r:Label) + + + lang-choice + + + The label of a Code with DiaplayCode = 'true' is the concatenation of its r:Value and its descendant r:Label. + + + + + l:Code[ancestor::d:CodeDomain/@displayCode='false'] enoddi:get-label From 164584f682090ba32e132d12b4e2ce7733cd8e8c Mon Sep 17 00:00:00 2001 From: BulotF Date: Thu, 13 Jun 2019 10:39:16 +0200 Subject: [PATCH 012/439] d:CodeDomain/@displayCode : debug --- .../xslt/inputs/ddi/source-fixed.xsl | 73 +++++++++++++++++++ .../resources/xslt/inputs/ddi/templates.fods | 31 ++------ 2 files changed, 80 insertions(+), 24 deletions(-) diff --git a/src/main/resources/xslt/inputs/ddi/source-fixed.xsl b/src/main/resources/xslt/inputs/ddi/source-fixed.xsl index 6bfce5e75..fd739b62a 100644 --- a/src/main/resources/xslt/inputs/ddi/source-fixed.xsl +++ b/src/main/resources/xslt/inputs/ddi/source-fixed.xsl @@ -1080,4 +1080,77 @@ + + + The label of a Code with DiaplayCode = 'true' is the concatenation of its r:Value and its descendant r:Label. + + + + + + + + + + + + + + Only the first child of a xhtml:p must be titled + + + + + + + + + + + + + When we match a node starting by xhtml, we only process the first child node with modif-title mode. + + + + + + + + + + + + + + Adding the prefix. + + + + + + + + + + + + + + Adding the prefix. + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/xslt/inputs/ddi/templates.fods b/src/main/resources/xslt/inputs/ddi/templates.fods index ee96f9057..d5d8446ab 100644 --- a/src/main/resources/xslt/inputs/ddi/templates.fods +++ b/src/main/resources/xslt/inputs/ddi/templates.fods @@ -1,26 +1,26 @@ - 2009-04-16T11:32:48.39P3DT2H42M2S401LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-12T15:50:55.537000000François Bulot + 2009-04-16T11:32:48.39P3DT2H42M15S402LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-13T10:37:06.107000000François Bulot 0 0 63256 - 79530 + 78951 view1 - 4 - 23 + 0 + 22 0 0 0 0 2 - 2 + 0 0 0 12 @@ -32,7 +32,7 @@ Sheet1 - 1655 + 1255 0 100 60 @@ -626,7 +626,7 @@ ???(???) - 00/00/0000, 00:00:00 + 00/00/0000, 00:00:00 @@ -1210,23 +1210,6 @@ The label of a Code is its descendant r:Label. - - - l:Code[ancestor::d:CodeDomain/@displayCode='true'] - - - enoddi:get-label - - - concat(r:Value,' - ',r:CategoryReference/l:Category/r:Label) - - - lang-choice - - - The label of a Code with DiaplayCode = 'true' is the concatenation of its r:Value and its descendant r:Label. - - l:Code[ancestor::d:CodeDomain/@displayCode='false'] From 2444600f288b49d7dab9107c17024b898d0b32d0 Mon Sep 17 00:00:00 2001 From: BulotF Date: Thu, 13 Jun 2019 11:51:29 +0200 Subject: [PATCH 013/439] d:IfThenElse/d:TypeOfIfThenElse --- .../xslt/inputs/ddi/source-fixed.xsl | 16 +-- .../resources/xslt/inputs/ddi/templates.fods | 108 ++++++++++++++---- .../xslt/transformations/ddi2fr/drivers.fods | 27 +++-- .../xslt/transformations/ddi2js/drivers.fods | 27 +++-- .../xslt/transformations/ddi2odt/drivers.fods | 25 ++-- .../xslt/transformations/ddi2pdf/drivers.fods | 29 +++-- 6 files changed, 169 insertions(+), 63 deletions(-) diff --git a/src/main/resources/xslt/inputs/ddi/source-fixed.xsl b/src/main/resources/xslt/inputs/ddi/source-fixed.xsl index fd739b62a..0405239ef 100644 --- a/src/main/resources/xslt/inputs/ddi/source-fixed.xsl +++ b/src/main/resources/xslt/inputs/ddi/source-fixed.xsl @@ -542,8 +542,7 @@ - + @@ -551,13 +550,16 @@ - + + + + @@ -577,9 +579,9 @@ - - + + @@ -591,7 +593,7 @@ - + and diff --git a/src/main/resources/xslt/inputs/ddi/templates.fods b/src/main/resources/xslt/inputs/ddi/templates.fods index d5d8446ab..e05e725f7 100644 --- a/src/main/resources/xslt/inputs/ddi/templates.fods +++ b/src/main/resources/xslt/inputs/ddi/templates.fods @@ -1,29 +1,29 @@ - 2009-04-16T11:32:48.39P3DT2H42M15S402LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-13T10:37:06.107000000François Bulot + 2009-04-16T11:32:48.39P3DT3H23M40S406LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-13T11:44:15.090000000François Bulot 0 0 63256 - 78951 + 81265 view1 - 0 - 22 + 4 + 17 0 0 0 0 2 - 0 + 4 0 0 - 12 + 0 0 100 60 @@ -626,7 +626,7 @@ ???(???) - 00/00/0000, 00:00:00 + 00/00/0000, 00:00:00 @@ -1105,6 +1105,36 @@ Identifier for FixedCell : concat the name of the Grid, "Cell" and the position of the top-left corner + + + d:ThenConstructReference + + + enoddi:get-id + + + concat(parent::d:IfThenElse/r:ID,'-THEN') + + + + Identifier for ThenConstructReference is its IfThenElse's id concatened with '-THEN' + + + + + d:ElseConstructReference + + + enoddi:get-id + + + concat(parent::d:IfThenElse/r:ID,'-ELSE') + + + + Identifier for ElseConstructReference is its IfThenElse's id concatened with '-ELSE' + + @@ -1876,32 +1906,32 @@ - d:Sequence[parent::d:ThenConstructReference and d:TypeOfSequence/text()='hideable'] + d:ThenConstructReference[parent::d:IfThenElse/d:TypeOfIfThenElse='hideable'] enoddi:get-hideable-command - ../../d:IfCondition/r:Command/r:CommandContent + ../d:IfCondition/r:Command/r:CommandContent - The command associated to a hideable Sequence inside a ThenConstructReference. + The command associated to a hideable ThenConstructReference. - d:Sequence[parent::d:ElseConstructReference and d:TypeOfSequence/text()='hideable'] + d:ElseConstructReference[parent::d:IfThenElse/d:TypeOfIfThenElse='hideable'] enoddi:get-hideable-command - concat('not (',../../d:IfCondition/r:Command/r:CommandContent,')') + concat('not (',../d:IfCondition/r:Command/r:CommandContent,')') - The command associated to a hideable Sequence inside an ElseConstructReference. + The command associated to a hideable ElseConstructReference. @@ -1912,13 +1942,28 @@ - d:Sequence[parent::d:ThenConstructReference and d:TypeOfSequence/text()='hideable'] + d:ThenConstructReference[parent::d:IfThenElse/d:TypeOfIfThenElse='hideable'] + + + enoddi:get-hideable-command-variables + + + ../d:IfCondition/r:Command/r:Binding/r:SourceParameterReference/r:ID + + + + Function that returns the list of the variables in a filter. + + + + + d:ElseConstructReference[parent::d:IfThenElse/d:TypeOfIfThenElse='hideable'] enoddi:get-hideable-command-variables - ../../d:IfCondition/r:Command/r:Binding/r:SourceParameterReference/r:ID + ../d:IfCondition/r:Command/r:Binding/r:SourceParameterReference/r:ID @@ -1963,7 +2008,7 @@ enoddi:get-hideable-command-variables - ancestor::d:Sequence[d:TypeOfSequence='hideable']/../../d:IfCondition/r:Command/r:Binding/r:SourceParameterReference/r:ID + ancestor::d:IfThenElse[d:TypeOfIfThenElse='hideable']/d:IfCondition/r:Command/r:Binding/r:SourceParameterReference/r:ID @@ -1978,32 +2023,32 @@ - d:Sequence[parent::d:ThenConstructReference and d:TypeOfSequence/text()='deactivatable'] + d:ThenConstructReference[parent::d:IfThenElse/d:TypeOfIfThenElse='greyedout'] enoddi:get-deactivatable-command - ../../d:IfCondition/r:Command/r:CommandContent + ../d:IfCondition/r:Command/r:CommandContent - The command associated to a deactivatable Sequence inside a ThenConstructReference. + The command associated to a deactivatable ThenConstructReference. - d:Sequence[parent::d:ElseConstructReference and d:TypeOfSequence/text()='deactivatable'] + d:ElseConstructReference[parent::d:IfThenElse/d:TypeOfIfThenElse='greyedout'] enoddi:get-deactivatable-command - concat('not (',../../d:IfCondition/r:Command/r:CommandContent,')') + concat('not (',../d:IfCondition/r:Command/r:CommandContent,')') - The command associated to a deactivatable Sequence inside an ElseConstructReference. + The command associated to a deactivatable ElseConstructReference. @@ -2014,13 +2059,28 @@ - d:Sequence[parent::d:ThenConstructReference and d:TypeOfSequence/text()='deactivatable'] + d:ThenConstructReference[parent::d:IfThenElse/d:TypeOfIfThenElse='greyedout'] + + + enoddi:get-deactivatable-command-variables + + + ../d:IfCondition/r:Command/r:Binding/r:SourceParameterReference/r:ID + + + + Function that returns the list of the variables in a filter. + + + + + d:ElseConstructReference[parent::d:IfThenElse/d:TypeOfIfThenElse='greyedout'] enoddi:get-deactivatable-command-variables - ../../d:IfCondition/r:Command/r:Binding/r:SourceParameterReference/r:ID + ../d:IfCondition/r:Command/r:Binding/r:SourceParameterReference/r:ID diff --git a/src/main/resources/xslt/transformations/ddi2fr/drivers.fods b/src/main/resources/xslt/transformations/ddi2fr/drivers.fods index c15d67a7c..b37a30177 100644 --- a/src/main/resources/xslt/transformations/ddi2fr/drivers.fods +++ b/src/main/resources/xslt/transformations/ddi2fr/drivers.fods @@ -1,20 +1,20 @@ - 2009-04-16T11:32:48.39P1DT3H7M53S167LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-12T15:22:43.848000000François Bulot + 2009-04-16T11:32:48.39P1DT3H17M34S169LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-13T11:41:44.354000000François Bulot 0 0 50597 - 29416 + 29867 view1 0 - 57 + 9 0 0 0 @@ -23,7 +23,7 @@ 0 0 0 - 33 + 0 0 100 60 @@ -32,7 +32,7 @@ Sheet1 - 1655 + 1255 0 100 60 @@ -591,7 +591,7 @@ ???(???) - 00/00/0000, 00:00:00 + 00/00/0000, 00:00:00 @@ -676,13 +676,24 @@ - d:Sequence[(parent::d:ThenConstructReference or parent::d:ElseConstructReference) and not(descendant::d:TypeOfSequence[text()='module'])] + d:ThenConstructReference[not(descendant::d:TypeOfSequence='module')] xf-group - Those Sequence elements activate the xf-group driver. + The d:ThenConstructReference elements activate the xf-group driver. + + + + + d:ElseConstructReference[not(descendant::d:TypeOfSequence='module')] + + + xf-group + + + The d:ElseConstructReference elements activate the xf-group driver. diff --git a/src/main/resources/xslt/transformations/ddi2js/drivers.fods b/src/main/resources/xslt/transformations/ddi2js/drivers.fods index 672856d59..bcb2e9642 100644 --- a/src/main/resources/xslt/transformations/ddi2js/drivers.fods +++ b/src/main/resources/xslt/transformations/ddi2js/drivers.fods @@ -1,20 +1,20 @@ - 2009-04-16T11:32:48.39P5DT1H48M22S219LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-12T15:23:51.265000000François Bulot + 2009-04-16T11:32:48.39P5DT1H49M24S220LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-13T11:48:27.601000000François Bulot 0 0 51722 - 28963 + 29414 view1 0 - 58 + 9 0 0 0 @@ -23,7 +23,7 @@ 0 0 0 - 27 + 42 0 100 60 @@ -32,7 +32,7 @@ Sheet1 - 1655 + 1255 0 100 60 @@ -588,7 +588,7 @@ ???(???) - 00/00/0000, 00:00:00 + 00/00/0000, 00:00:00 @@ -673,13 +673,24 @@ - d:Sequence[(parent::d:ThenConstructReference or parent::d:ElseConstructReference) and not(descendant::d:TypeOfSequence[text()='module'])] + d:ThenConstructReference[not(descendant::d:TypeOfSequence='module')] xf-group - Those Sequence elements activate the xf-group driver. + The d:ThenConstructReference elements activate the xf-group driver. + + + + + d:ElseConstructReference[not(descendant::d:TypeOfSequence='module')] + + + xf-group + + + The d:ElseConstructReference elements activate the xf-group driver. diff --git a/src/main/resources/xslt/transformations/ddi2odt/drivers.fods b/src/main/resources/xslt/transformations/ddi2odt/drivers.fods index 22520b7b7..aa4cea978 100644 --- a/src/main/resources/xslt/transformations/ddi2odt/drivers.fods +++ b/src/main/resources/xslt/transformations/ddi2odt/drivers.fods @@ -1,20 +1,20 @@ - 2009-04-16T11:32:48.39P3DT6H15M41S210LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-12T15:24:41.906000000François Bulot + 2009-04-16T11:32:48.39P3DT6H16M11S211LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-13T11:49:09.450000000François Bulot 0 0 60138 - 28963 + 29414 view1 0 - 13 + 9 0 0 0 @@ -32,7 +32,7 @@ Sheet1 - 1655 + 1255 0 100 60 @@ -588,7 +588,7 @@ ???(???) - 00/00/0000, 00:00:00 + 00/00/0000, 00:00:00 @@ -673,13 +673,24 @@ - d:Sequence[(parent::d:ThenConstructReference or parent::d:ElseConstructReference) and not(descendant::d:TypeOfSequence[text()='module'])] + d:ThenConstructReference[not(descendant::d:TypeOfSequence='module')] xf-group - Those Sequence elements activate the xf-group driver. + The d:ThenConstructReference elements activate the xf-group driver. + + + + + d:ElseConstructReference[not(descendant::d:TypeOfSequence='module')] + + + xf-group + + + The d:ElseConstructReference elements activate the xf-group driver. diff --git a/src/main/resources/xslt/transformations/ddi2pdf/drivers.fods b/src/main/resources/xslt/transformations/ddi2pdf/drivers.fods index ad5716d1b..56e103391 100644 --- a/src/main/resources/xslt/transformations/ddi2pdf/drivers.fods +++ b/src/main/resources/xslt/transformations/ddi2pdf/drivers.fods @@ -1,20 +1,20 @@ - 2009-04-16T11:32:48.39P2DT1H40M5S168LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-12T15:25:25.568000000François Bulot + 2009-04-16T11:32:48.39P2DT1H40M26S170LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-13T11:49:46.547000000François Bulot 0 0 - 67742 - 30709 + 54828 + 31160 view1 0 - 10 + 12 0 0 0 @@ -32,7 +32,7 @@ Sheet1 - 1655 + 1255 0 100 60 @@ -509,7 +509,7 @@ - + @@ -599,7 +599,7 @@ ???(???) - 00/00/0000, 00:00:00 + 00/00/0000, 00:00:00 @@ -684,13 +684,24 @@ - d:Sequence[(parent::d:ThenConstructReference or parent::d:ElseConstructReference) and not(descendant::d:TypeOfSequence[text()='module'])] + d:ThenConstructReference[not(descendant::d:TypeOfSequence='module')] xf-group - Those Sequence elements activate the xf-group driver. + The d:ThenConstructReference elements activate the xf-group driver. + + + + + d:ElseConstructReference[not(descendant::d:TypeOfSequence='module')] + + + xf-group + + + The d:ElseConstructReference elements activate the xf-group driver. From cf814d825023e0fd959fe07658198b66904d81f9 Mon Sep 17 00:00:00 2001 From: BulotF Date: Thu, 13 Jun 2019 13:36:43 +0200 Subject: [PATCH 014/439] d:GridResponseDomainInMixed/d:ResponseAttachmentLocation in tree-navigation --- .../ddi2fr/tree-navigation.fods | 23 ++++++++++++----- .../ddi2js/tree-navigation.fods | 23 ++++++++++++----- .../ddi2odt/tree-navigation.fods | 23 ++++++++++++----- .../ddi2pdf/tree-navigation.fods | 25 +++++++++++++------ 4 files changed, 69 insertions(+), 25 deletions(-) diff --git a/src/main/resources/xslt/transformations/ddi2fr/tree-navigation.fods b/src/main/resources/xslt/transformations/ddi2fr/tree-navigation.fods index 1c6fe11a3..e0ea2b1fa 100644 --- a/src/main/resources/xslt/transformations/ddi2fr/tree-navigation.fods +++ b/src/main/resources/xslt/transformations/ddi2fr/tree-navigation.fods @@ -1,19 +1,19 @@ - 2009-04-16T11:32:48.39PT6H11M37S33LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-12T15:26:54.352000000François Bulot + 2009-04-16T11:32:48.39PT6H16M26S35LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-13T12:47:35.144000000François Bulot 0 0 50242 - 3889 + 4340 view1 - 0 + 1 5 0 0 @@ -32,7 +32,7 @@ Sheet1 - 1655 + 1255 0 100 60 @@ -570,7 +570,7 @@ ???(???) - 00/00/0000, 00:00:00 + 00/00/0000, 00:00:00 @@ -619,6 +619,17 @@ For l:Code with attached ResponseDomain, the attached is a direct child of the l:Code. FIXME : Works only for l:Code, if other case are used, need an extension of the implementation. + + + d:GridResponseDomainInMixed[@attachmentBase]//l:Code + + + ancestor::d:StructuredMixedGridResponseDomain/d:ResponseDomainInMixed[d:ResponseAttachmentLocation/d:DomainSpecificValue[r:Value = current()/r:Value and @attachmentDomain = current()/ancestor::d:GridResponseDomainInMixed/@attachmentBase]] + + + For l:Code with attached ResponseDomain, the attached is a direct child of the l:Code. FIXME : Works only for l:Code, if other case are used, need an extension of the implementation. + + d:CodeDomain @@ -635,7 +646,7 @@ d:QuestionGrid[not(d:GridDimension/@rank='2') and not(d:StructuredMixedGridResponseDomain/d:GridResponseDomainInMixed[not(d:NominalDomain) and not(d:ResponseAttachmentLocation)])] - .//d:GridResponseDomainInMixed/* + .//d:GridResponseDomainInMixed/*[not(d:ResponseAttachmentLocation)] In MultipleChoiceQuestion, only the child of GridResponseDomainInMixed are considered as child (GridDimension and GridResponseDomain are escaped to prevent Table&Cell drivers). diff --git a/src/main/resources/xslt/transformations/ddi2js/tree-navigation.fods b/src/main/resources/xslt/transformations/ddi2js/tree-navigation.fods index c0612743e..1b86acdb9 100644 --- a/src/main/resources/xslt/transformations/ddi2js/tree-navigation.fods +++ b/src/main/resources/xslt/transformations/ddi2js/tree-navigation.fods @@ -1,20 +1,20 @@ - 2009-04-16T11:32:48.39PT3H23M28S34LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-12T15:26:31.816000000François Bulot + 2009-04-16T11:32:48.39PT3H24M44S35LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-13T13:34:24.929000000François Bulot 0 0 54881 - 3494 + 3952 view1 0 - 5 + 6 0 0 0 @@ -517,7 +517,7 @@ - + @@ -570,7 +570,7 @@ ???(???) - 00/00/0000, 00:00:00 + 00/00/0000, 00:00:00 @@ -619,6 +619,17 @@ For l:Code with attached ResponseDomain, the attached is a direct child of the l:Code. FIXME : Works only for l:Code, if other case are used, need an extension of the implementation. + + + d:GridResponseDomainInMixed[@attachmentBase]//l:Code + + + ancestor::d:StructuredMixedGridResponseDomain/d:ResponseDomainInMixed[d:ResponseAttachmentLocation/d:DomainSpecificValue[r:Value = current()/r:Value and @attachmentDomain = current()/ancestor::d:GridResponseDomainInMixed/@attachmentBase]] + + + For l:Code with attached ResponseDomain, the attached is a direct child of the l:Code. FIXME : Works only for l:Code, if other case are used, need an extension of the implementation. + + d:CodeDomain @@ -635,7 +646,7 @@ d:QuestionGrid[not(d:GridDimension/@rank='2') and not(d:StructuredMixedGridResponseDomain/d:GridResponseDomainInMixed[not(d:NominalDomain) and not(d:ResponseAttachmentLocation)])] - .//d:GridResponseDomainInMixed/* + .//d:GridResponseDomainInMixed/*[not(d:ResponseAttachmentLocation)] In MultipleChoiceQuestion, only the child of GridResponseDomainInMixed are considered as child (GridDimension and GridResponseDomain are escaped to prevent Table&Cell drivers). diff --git a/src/main/resources/xslt/transformations/ddi2odt/tree-navigation.fods b/src/main/resources/xslt/transformations/ddi2odt/tree-navigation.fods index 29cf9932a..565cbff55 100644 --- a/src/main/resources/xslt/transformations/ddi2odt/tree-navigation.fods +++ b/src/main/resources/xslt/transformations/ddi2odt/tree-navigation.fods @@ -1,20 +1,20 @@ - 2009-04-16T11:32:48.39PT3H23M21S34LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-12T15:26:13.873000000François Bulot + 2009-04-16T11:32:48.39PT3H23M51S35LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-13T13:35:05.567000000François Bulot 0 0 54881 - 3494 + 3952 view1 0 - 5 + 3 0 0 0 @@ -517,7 +517,7 @@ - + @@ -570,7 +570,7 @@ ???(???) - 00/00/0000, 00:00:00 + 00/00/0000, 00:00:00 @@ -619,6 +619,17 @@ For l:Code with attached ResponseDomain, the attached is a direct child of the l:Code. FIXME : Works only for l:Code, if other case are used, need an extension of the implementation. + + + d:GridResponseDomainInMixed[@attachmentBase]//l:Code + + + ancestor::d:StructuredMixedGridResponseDomain/d:ResponseDomainInMixed[d:ResponseAttachmentLocation/d:DomainSpecificValue[r:Value = current()/r:Value and @attachmentDomain = current()/ancestor::d:GridResponseDomainInMixed/@attachmentBase]] + + + For l:Code with attached ResponseDomain, the attached is a direct child of the l:Code. FIXME : Works only for l:Code, if other case are used, need an extension of the implementation. + + d:CodeDomain @@ -635,7 +646,7 @@ d:QuestionGrid[not(d:GridDimension/@rank='2') and not(d:StructuredMixedGridResponseDomain/d:GridResponseDomainInMixed[not(d:NominalDomain) and not(d:ResponseAttachmentLocation)])] - .//d:GridResponseDomainInMixed/* + .//d:GridResponseDomainInMixed/*[not(d:ResponseAttachmentLocation)] In MultipleChoiceQuestion, only the child of GridResponseDomainInMixed are considered as child (GridDimension and GridResponseDomain are escaped to prevent Table&Cell drivers). diff --git a/src/main/resources/xslt/transformations/ddi2pdf/tree-navigation.fods b/src/main/resources/xslt/transformations/ddi2pdf/tree-navigation.fods index 507e64615..d6a91914f 100644 --- a/src/main/resources/xslt/transformations/ddi2pdf/tree-navigation.fods +++ b/src/main/resources/xslt/transformations/ddi2pdf/tree-navigation.fods @@ -1,20 +1,20 @@ - 2009-04-16T11:32:48.39P1DT6H30M54S74LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-12T15:25:52.864000000François Bulot + 2009-04-16T11:32:48.39P1DT6H31M30S75LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-13T13:35:53.280000000François Bulot 0 0 71737 - 3494 + 3952 view1 - 0 - 5 + 1 + 14 0 0 0 @@ -517,7 +517,7 @@ - + @@ -566,7 +566,7 @@ ???(???) - 00/00/0000, 00:00:00 + 00/00/0000, 00:00:00 @@ -615,6 +615,17 @@ For l:Code with attached ResponseDomain, the attached is a direct child of the l:Code. FIXME : Works only for l:Code, if other case are used, need an extension of the implementation. + + + d:GridResponseDomainInMixed[@attachmentBase]//l:Code + + + ancestor::d:StructuredMixedGridResponseDomain/d:ResponseDomainInMixed[d:ResponseAttachmentLocation/d:DomainSpecificValue[r:Value = current()/r:Value and @attachmentDomain = current()/ancestor::d:GridResponseDomainInMixed/@attachmentBase]] + + + For l:Code with attached ResponseDomain, the attached is a direct child of the l:Code. FIXME : Works only for l:Code, if other case are used, need an extension of the implementation. + + d:CodeDomain @@ -631,7 +642,7 @@ d:QuestionGrid[not(d:GridDimension/@rank='2') and not(d:StructuredMixedGridResponseDomain/d:GridResponseDomainInMixed[not(d:NominalDomain) and not(d:ResponseAttachmentLocation)])] - .//d:GridResponseDomainInMixed/* + .//d:GridResponseDomainInMixed/*[not(d:ResponseAttachmentLocation)] In MultipleChoiceQuestion, only the child of GridResponseDomainInMixed are considered as child (GridDimension and GridResponseDomain are escaped to prevent Table&Cell drivers). From 19198501c570826edb54d4915148fcc46a46361d Mon Sep 17 00:00:00 2001 From: BulotF Date: Fri, 14 Jun 2019 11:53:11 +0200 Subject: [PATCH 015/439] d:GridResponseDomainInMixed/d:ResponseAttachmentLocation : debug --- .../xslt/inputs/ddi/source-fixed.xsl | 38 +++++++++++++++---- .../xslt/transformations/ddi2fr/drivers.fods | 10 ++--- .../ddi2fr/tree-navigation.fods | 16 ++++---- .../xslt/transformations/ddi2js/drivers.fods | 10 ++--- .../ddi2js/tree-navigation.fods | 16 ++++---- .../xslt/transformations/ddi2odt/drivers.fods | 10 ++--- .../ddi2odt/tree-navigation.fods | 14 +++---- .../xslt/transformations/ddi2pdf/drivers.fods | 10 ++--- .../ddi2pdf/tree-navigation.fods | 16 ++++---- 9 files changed, 82 insertions(+), 58 deletions(-) diff --git a/src/main/resources/xslt/inputs/ddi/source-fixed.xsl b/src/main/resources/xslt/inputs/ddi/source-fixed.xsl index 0405239ef..e13391656 100644 --- a/src/main/resources/xslt/inputs/ddi/source-fixed.xsl +++ b/src/main/resources/xslt/inputs/ddi/source-fixed.xsl @@ -613,7 +613,7 @@ - Get the formula to know when a response is hidden or not. + Get the formula to know when a response is hidden or not in a QuestionItem. @@ -631,6 +631,29 @@ + + + Get the formula to know when a response is hidden or not in a QuestionGrid. + + + + + + + + + + + + + or + + + + + + + Returns the conditions of all its deactivatable ancestors. @@ -700,7 +723,7 @@ - - - + + @@ -886,7 +910,7 @@ diff --git a/src/main/resources/xslt/transformations/ddi2fr/drivers.fods b/src/main/resources/xslt/transformations/ddi2fr/drivers.fods index b37a30177..508572fe1 100644 --- a/src/main/resources/xslt/transformations/ddi2fr/drivers.fods +++ b/src/main/resources/xslt/transformations/ddi2fr/drivers.fods @@ -1,7 +1,7 @@ - 2009-04-16T11:32:48.39P1DT3H17M34S169LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-13T11:41:44.354000000François Bulot + 2009-04-16T11:32:48.39P1DT3H22M36S170LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-14T10:07:54.698000000François Bulot 0 @@ -14,7 +14,7 @@ 0 - 9 + 46 0 0 0 @@ -23,7 +23,7 @@ 0 0 0 - 0 + 18 0 100 60 @@ -591,7 +591,7 @@ ???(???) - 00/00/0000, 00:00:00 + 00/00/0000, 00:00:00 @@ -987,7 +987,7 @@ - d:GridResponseDomainInMixed[ancestor::d:QuestionGrid] + d:GridResponseDomainInMixed[not(d:ResponseAttachmentLocation)] Cell diff --git a/src/main/resources/xslt/transformations/ddi2fr/tree-navigation.fods b/src/main/resources/xslt/transformations/ddi2fr/tree-navigation.fods index e0ea2b1fa..9bbb77f93 100644 --- a/src/main/resources/xslt/transformations/ddi2fr/tree-navigation.fods +++ b/src/main/resources/xslt/transformations/ddi2fr/tree-navigation.fods @@ -1,7 +1,7 @@ - 2009-04-16T11:32:48.39PT6H16M26S35LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-13T12:47:35.144000000François Bulot + 2009-04-16T11:32:48.39PT6H26M34S38LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-14T10:12:57.515000000François Bulot 0 @@ -13,14 +13,14 @@ view1 - 1 - 5 + 2 + 6 0 0 0 0 2 - 0 + 2 0 0 0 @@ -570,7 +570,7 @@ ???(???) - 00/00/0000, 00:00:00 + 00/00/0000, 00:00:00 @@ -624,7 +624,7 @@ d:GridResponseDomainInMixed[@attachmentBase]//l:Code - ancestor::d:StructuredMixedGridResponseDomain/d:ResponseDomainInMixed[d:ResponseAttachmentLocation/d:DomainSpecificValue[r:Value = current()/r:Value and @attachmentDomain = current()/ancestor::d:GridResponseDomainInMixed/@attachmentBase]] + ancestor::d:StructuredMixedGridResponseDomain/d:GridResponseDomainInMixed[d:ResponseAttachmentLocation/d:DomainSpecificValue[r:Value = current()/r:Value and @attachmentDomain = current()/ancestor::d:GridResponseDomainInMixed/@attachmentBase]] For l:Code with attached ResponseDomain, the attached is a direct child of the l:Code. FIXME : Works only for l:Code, if other case are used, need an extension of the implementation. @@ -646,10 +646,10 @@ d:QuestionGrid[not(d:GridDimension/@rank='2') and not(d:StructuredMixedGridResponseDomain/d:GridResponseDomainInMixed[not(d:NominalDomain) and not(d:ResponseAttachmentLocation)])] - .//d:GridResponseDomainInMixed/*[not(d:ResponseAttachmentLocation)] + .//d:GridResponseDomainInMixed[not(d:ResponseAttachmentLocation)]/* - In MultipleChoiceQuestion, only the child of GridResponseDomainInMixed are considered as child (GridDimension and GridResponseDomain are escaped to prevent Table&Cell drivers). + In MultipleChoiceQuestion, only the child of GridResponseDomainInMixed are considered as child (GridDimension and GridResponseDomainInMixed are escaped to prevent Table&Cell drivers). diff --git a/src/main/resources/xslt/transformations/ddi2js/drivers.fods b/src/main/resources/xslt/transformations/ddi2js/drivers.fods index bcb2e9642..13aecb38d 100644 --- a/src/main/resources/xslt/transformations/ddi2js/drivers.fods +++ b/src/main/resources/xslt/transformations/ddi2js/drivers.fods @@ -1,7 +1,7 @@ - 2009-04-16T11:32:48.39P5DT1H49M24S220LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-13T11:48:27.601000000François Bulot + 2009-04-16T11:32:48.39P5DT1H50M221LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-14T11:49:38.073000000François Bulot 0 @@ -14,7 +14,7 @@ 0 - 9 + 44 0 0 0 @@ -23,7 +23,7 @@ 0 0 0 - 42 + 30 0 100 60 @@ -588,7 +588,7 @@ ???(???) - 00/00/0000, 00:00:00 + 00/00/0000, 00:00:00 @@ -981,7 +981,7 @@ - d:GridResponseDomainInMixed[ancestor::d:QuestionGrid] + d:GridResponseDomainInMixed[not(d:ResponseAttachmentLocation)] Cell diff --git a/src/main/resources/xslt/transformations/ddi2js/tree-navigation.fods b/src/main/resources/xslt/transformations/ddi2js/tree-navigation.fods index 1b86acdb9..880d2e334 100644 --- a/src/main/resources/xslt/transformations/ddi2js/tree-navigation.fods +++ b/src/main/resources/xslt/transformations/ddi2js/tree-navigation.fods @@ -1,7 +1,7 @@ - 2009-04-16T11:32:48.39PT3H24M44S35LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-13T13:34:24.929000000François Bulot + 2009-04-16T11:32:48.39PT3H25M1S36LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-14T11:52:42.297000000François Bulot 0 @@ -13,8 +13,8 @@ view1 - 0 - 6 + 1 + 5 0 0 0 @@ -32,7 +32,7 @@ Sheet1 - 1655 + 1255 0 100 60 @@ -570,7 +570,7 @@ ???(???) - 00/00/0000, 00:00:00 + 00/00/0000, 00:00:00 @@ -624,7 +624,7 @@ d:GridResponseDomainInMixed[@attachmentBase]//l:Code - ancestor::d:StructuredMixedGridResponseDomain/d:ResponseDomainInMixed[d:ResponseAttachmentLocation/d:DomainSpecificValue[r:Value = current()/r:Value and @attachmentDomain = current()/ancestor::d:GridResponseDomainInMixed/@attachmentBase]] + ancestor::d:StructuredMixedGridResponseDomain/d:GridResponseDomainInMixed[d:ResponseAttachmentLocation/d:DomainSpecificValue[r:Value = current()/r:Value and @attachmentDomain = current()/ancestor::d:GridResponseDomainInMixed/@attachmentBase]] For l:Code with attached ResponseDomain, the attached is a direct child of the l:Code. FIXME : Works only for l:Code, if other case are used, need an extension of the implementation. @@ -646,10 +646,10 @@ d:QuestionGrid[not(d:GridDimension/@rank='2') and not(d:StructuredMixedGridResponseDomain/d:GridResponseDomainInMixed[not(d:NominalDomain) and not(d:ResponseAttachmentLocation)])] - .//d:GridResponseDomainInMixed/*[not(d:ResponseAttachmentLocation)] + .//d:GridResponseDomainInMixed[not(d:ResponseAttachmentLocation)]/* - In MultipleChoiceQuestion, only the child of GridResponseDomainInMixed are considered as child (GridDimension and GridResponseDomain are escaped to prevent Table&Cell drivers). + In MultipleChoiceQuestion, only the child of GridResponseDomainInMixed are considered as child (GridDimension and GridResponseDomainInMixed are escaped to prevent Table&Cell drivers). diff --git a/src/main/resources/xslt/transformations/ddi2odt/drivers.fods b/src/main/resources/xslt/transformations/ddi2odt/drivers.fods index aa4cea978..3c98a4b28 100644 --- a/src/main/resources/xslt/transformations/ddi2odt/drivers.fods +++ b/src/main/resources/xslt/transformations/ddi2odt/drivers.fods @@ -1,7 +1,7 @@ - 2009-04-16T11:32:48.39P3DT6H16M11S211LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-13T11:49:09.450000000François Bulot + 2009-04-16T11:32:48.39P3DT6H16M19S212LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-14T11:49:55.801000000François Bulot 0 @@ -14,7 +14,7 @@ 0 - 9 + 44 0 0 0 @@ -23,7 +23,7 @@ 0 0 0 - 0 + 9 0 100 60 @@ -588,7 +588,7 @@ ???(???) - 00/00/0000, 00:00:00 + 00/00/0000, 00:00:00 @@ -981,7 +981,7 @@ - d:GridResponseDomainInMixed[ancestor::d:QuestionGrid] + d:GridResponseDomainInMixed[not(d:ResponseAttachmentLocation)] Cell diff --git a/src/main/resources/xslt/transformations/ddi2odt/tree-navigation.fods b/src/main/resources/xslt/transformations/ddi2odt/tree-navigation.fods index 565cbff55..b55e3cf46 100644 --- a/src/main/resources/xslt/transformations/ddi2odt/tree-navigation.fods +++ b/src/main/resources/xslt/transformations/ddi2odt/tree-navigation.fods @@ -1,7 +1,7 @@ - 2009-04-16T11:32:48.39PT3H23M51S35LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-13T13:35:05.567000000François Bulot + 2009-04-16T11:32:48.39PT3H24M12S36LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-14T11:52:16.129000000François Bulot 0 @@ -13,7 +13,7 @@ view1 - 0 + 1 3 0 0 @@ -32,7 +32,7 @@ Sheet1 - 1655 + 1255 0 100 60 @@ -570,7 +570,7 @@ ???(???) - 00/00/0000, 00:00:00 + 00/00/0000, 00:00:00 @@ -624,7 +624,7 @@ d:GridResponseDomainInMixed[@attachmentBase]//l:Code - ancestor::d:StructuredMixedGridResponseDomain/d:ResponseDomainInMixed[d:ResponseAttachmentLocation/d:DomainSpecificValue[r:Value = current()/r:Value and @attachmentDomain = current()/ancestor::d:GridResponseDomainInMixed/@attachmentBase]] + ancestor::d:StructuredMixedGridResponseDomain/d:GridResponseDomainInMixed[d:ResponseAttachmentLocation/d:DomainSpecificValue[r:Value = current()/r:Value and @attachmentDomain = current()/ancestor::d:GridResponseDomainInMixed/@attachmentBase]] For l:Code with attached ResponseDomain, the attached is a direct child of the l:Code. FIXME : Works only for l:Code, if other case are used, need an extension of the implementation. @@ -646,10 +646,10 @@ d:QuestionGrid[not(d:GridDimension/@rank='2') and not(d:StructuredMixedGridResponseDomain/d:GridResponseDomainInMixed[not(d:NominalDomain) and not(d:ResponseAttachmentLocation)])] - .//d:GridResponseDomainInMixed/*[not(d:ResponseAttachmentLocation)] + .//d:GridResponseDomainInMixed[not(d:ResponseAttachmentLocation)]/* - In MultipleChoiceQuestion, only the child of GridResponseDomainInMixed are considered as child (GridDimension and GridResponseDomain are escaped to prevent Table&Cell drivers). + In MultipleChoiceQuestion, only the child of GridResponseDomainInMixed are considered as child (GridDimension and GridResponseDomainInMixed are escaped to prevent Table&Cell drivers). diff --git a/src/main/resources/xslt/transformations/ddi2pdf/drivers.fods b/src/main/resources/xslt/transformations/ddi2pdf/drivers.fods index 56e103391..6dfe55b3f 100644 --- a/src/main/resources/xslt/transformations/ddi2pdf/drivers.fods +++ b/src/main/resources/xslt/transformations/ddi2pdf/drivers.fods @@ -1,7 +1,7 @@ - 2009-04-16T11:32:48.39P2DT1H40M26S170LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-13T11:49:46.547000000François Bulot + 2009-04-16T11:32:48.39P2DT1H40M32S171LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-14T11:50:08.562000000François Bulot 0 @@ -14,7 +14,7 @@ 0 - 12 + 47 0 0 0 @@ -23,7 +23,7 @@ 0 0 0 - 0 + 18 0 100 60 @@ -599,7 +599,7 @@ ???(???) - 00/00/0000, 00:00:00 + 00/00/0000, 00:00:00 @@ -1018,7 +1018,7 @@ - d:GridResponseDomainInMixed[ancestor::d:QuestionGrid] + d:GridResponseDomainInMixed[not(d:ResponseAttachmentLocation)] Cell diff --git a/src/main/resources/xslt/transformations/ddi2pdf/tree-navigation.fods b/src/main/resources/xslt/transformations/ddi2pdf/tree-navigation.fods index d6a91914f..33cc3ea2f 100644 --- a/src/main/resources/xslt/transformations/ddi2pdf/tree-navigation.fods +++ b/src/main/resources/xslt/transformations/ddi2pdf/tree-navigation.fods @@ -1,7 +1,7 @@ - 2009-04-16T11:32:48.39P1DT6H31M30S75LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-13T13:35:53.280000000François Bulot + 2009-04-16T11:32:48.39P1DT6H33M76LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-14T11:51:45.786000000François Bulot 0 @@ -14,13 +14,13 @@ 1 - 14 + 5 0 0 0 0 2 - 0 + 1 0 0 0 @@ -32,7 +32,7 @@ Sheet1 - 1655 + 1255 0 100 60 @@ -566,7 +566,7 @@ ???(???) - 00/00/0000, 00:00:00 + 00/00/0000, 00:00:00 @@ -620,7 +620,7 @@ d:GridResponseDomainInMixed[@attachmentBase]//l:Code - ancestor::d:StructuredMixedGridResponseDomain/d:ResponseDomainInMixed[d:ResponseAttachmentLocation/d:DomainSpecificValue[r:Value = current()/r:Value and @attachmentDomain = current()/ancestor::d:GridResponseDomainInMixed/@attachmentBase]] + ancestor::d:StructuredMixedGridResponseDomain/d:GridResponseDomainInMixed[d:ResponseAttachmentLocation/d:DomainSpecificValue[r:Value = current()/r:Value and @attachmentDomain = current()/ancestor::d:GridResponseDomainInMixed/@attachmentBase]] For l:Code with attached ResponseDomain, the attached is a direct child of the l:Code. FIXME : Works only for l:Code, if other case are used, need an extension of the implementation. @@ -642,10 +642,10 @@ d:QuestionGrid[not(d:GridDimension/@rank='2') and not(d:StructuredMixedGridResponseDomain/d:GridResponseDomainInMixed[not(d:NominalDomain) and not(d:ResponseAttachmentLocation)])] - .//d:GridResponseDomainInMixed/*[not(d:ResponseAttachmentLocation)] + .//d:GridResponseDomainInMixed[not(d:ResponseAttachmentLocation)]/* - In MultipleChoiceQuestion, only the child of GridResponseDomainInMixed are considered as child (GridDimension and GridResponseDomain are escaped to prevent Table&Cell drivers). + In MultipleChoiceQuestion, only the child of GridResponseDomainInMixed are considered as child (GridDimension and GridResponseDomainInMixed are escaped to prevent Table&Cell drivers). From 2872053511f9073f83974a6d119e338cd7885a8f Mon Sep 17 00:00:00 2001 From: BulotF Date: Wed, 19 Jun 2019 10:33:56 +0200 Subject: [PATCH 016/439] Other - give details in table --- src/main/resources/xslt/outputs/fr/models.xsl | 5 ++++ .../ddi2fr/tree-navigation.fods | 25 +++++++++++++------ 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/src/main/resources/xslt/outputs/fr/models.xsl b/src/main/resources/xslt/outputs/fr/models.xsl index 1dee2e1ee..01415814e 100644 --- a/src/main/resources/xslt/outputs/fr/models.xsl +++ b/src/main/resources/xslt/outputs/fr/models.xsl @@ -2024,6 +2024,11 @@ + + No other - give details out of cells + + + The Cell driver produces something only in the Body part but its children can produce something. diff --git a/src/main/resources/xslt/transformations/ddi2fr/tree-navigation.fods b/src/main/resources/xslt/transformations/ddi2fr/tree-navigation.fods index 9bbb77f93..b743c6e3f 100644 --- a/src/main/resources/xslt/transformations/ddi2fr/tree-navigation.fods +++ b/src/main/resources/xslt/transformations/ddi2fr/tree-navigation.fods @@ -1,26 +1,26 @@ - 2009-04-16T11:32:48.39PT6H26M34S38LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-14T10:12:57.515000000François Bulot + 2009-04-16T11:32:48.39PT6H31M21S40LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-19T09:37:22.187000000François Bulot 0 0 50242 - 4340 + 4792 view1 - 2 - 6 + 1 + 2 0 0 0 0 2 - 2 + 0 0 0 0 @@ -32,7 +32,7 @@ Sheet1 - 1255 + 1655 0 100 60 @@ -570,7 +570,7 @@ ???(???) - 00/00/0000, 00:00:00 + 00/00/0000, 00:00:00 @@ -608,6 +608,17 @@ ResponseDomainInMixed with AttachmentLocation correspond to attached Responsedomain that should'nt be seen as a direct child of the ResponseDomainInMixed but as a direct child of the response field which it's attached to ('other:' usecase) + + + d:StructuredMixedGridResponseDomain + + + *[not(d:ResponseAttachmentLocation)] + + + GridResponseDomainInMixed with AttachmentLocation correspond to attached Responsedomain that should'nt be seen as a direct child of the GridResponseDomainInMixed but as a direct child of the response field which it's attached to ('other:' usecase) + + d:ResponseDomainInMixed[@attachmentBase]//l:Code From 5f8ea9b995485c633c90a8af8b0668f392c08f9d Mon Sep 17 00:00:00 2001 From: BulotF Date: Wed, 19 Jun 2019 10:52:21 +0200 Subject: [PATCH 017/439] debug loop of pages --- src/main/resources/xslt/outputs/fr/models.xsl | 5 ++--- src/main/resources/xslt/util/fr/browsing.xsl | 5 +++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/resources/xslt/outputs/fr/models.xsl b/src/main/resources/xslt/outputs/fr/models.xsl index 01415814e..fd2bfec1f 100644 --- a/src/main/resources/xslt/outputs/fr/models.xsl +++ b/src/main/resources/xslt/outputs/fr/models.xsl @@ -999,7 +999,6 @@ - @@ -1957,7 +1956,7 @@ - + @@ -2115,7 +2114,7 @@ - + diff --git a/src/main/resources/xslt/util/fr/browsing.xsl b/src/main/resources/xslt/util/fr/browsing.xsl index 45f6cc437..834d2e624 100644 --- a/src/main/resources/xslt/util/fr/browsing.xsl +++ b/src/main/resources/xslt/util/fr/browsing.xsl @@ -680,6 +680,7 @@ + @@ -892,10 +893,10 @@ --> - + - + From f5e797fbd45e00c5ce32c0954d523a19ee3a61fc Mon Sep 17 00:00:00 2001 From: BulotF Date: Wed, 19 Jun 2019 11:50:49 +0200 Subject: [PATCH 018/439] Update out.xhtml --- src/test/resources/ddi-to-xform/out.xhtml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/test/resources/ddi-to-xform/out.xhtml b/src/test/resources/ddi-to-xform/out.xhtml index 384e33b84..ffeb91c71 100644 --- a/src/test/resources/ddi-to-xform/out.xhtml +++ b/src/test/resources/ddi-to-xform/out.xhtml @@ -549,9 +549,6 @@ - @@ -4296,7 +4293,7 @@ - + Date: Thu, 20 Jun 2019 16:11:35 +0200 Subject: [PATCH 019/439] d:CodeDomain/@displayCode : make code common with d:GridDimension/@displayCode --- .../xslt/inputs/ddi/source-fixed.xsl | 6 ++++-- src/main/resources/xslt/util/ddi/titling.xsl | 20 ------------------- 2 files changed, 4 insertions(+), 22 deletions(-) diff --git a/src/main/resources/xslt/inputs/ddi/source-fixed.xsl b/src/main/resources/xslt/inputs/ddi/source-fixed.xsl index e13391656..ba69ec26d 100644 --- a/src/main/resources/xslt/inputs/ddi/source-fixed.xsl +++ b/src/main/resources/xslt/inputs/ddi/source-fixed.xsl @@ -1108,10 +1108,12 @@ - The label of a Code with DiaplayCode = 'true' is the concatenation of its r:Value and its descendant r:Label. + The label of a Code in a CodeDomain with @displayCode = 'true' is the concatenation of its r:Value and its descendant r:Label. + The same for a Code in a GridDimension with @displayCode = 'true', but only if it has no descendant. + When both are true, only one Code is concatened - diff --git a/src/main/resources/xslt/util/ddi/titling.xsl b/src/main/resources/xslt/util/ddi/titling.xsl index 14e72fa0f..1f66923f6 100644 --- a/src/main/resources/xslt/util/ddi/titling.xsl +++ b/src/main/resources/xslt/util/ddi/titling.xsl @@ -366,26 +366,6 @@ )"/> - - - Template used to add code before labels from dropdown lists and tables - headers. - When l:Code is within a d:GridDimension where attributes @displyCode and displayLabel are true : adding labels. - - - - - - - - - - - - - Only the first child of a xhtml:p must be titled From 59b09b1c352b6d82ac471a9f26814a7878ca2ac8 Mon Sep 17 00:00:00 2001 From: BulotF Date: Thu, 20 Jun 2019 17:07:04 +0200 Subject: [PATCH 020/439] Update comment in EmptyCell driver --- .../xslt/transformations/ddi2js/drivers.fods | 16 ++++++++-------- .../xslt/transformations/ddi2odt/drivers.fods | 14 +++++++------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/main/resources/xslt/transformations/ddi2js/drivers.fods b/src/main/resources/xslt/transformations/ddi2js/drivers.fods index 13aecb38d..3e0a25b40 100644 --- a/src/main/resources/xslt/transformations/ddi2js/drivers.fods +++ b/src/main/resources/xslt/transformations/ddi2js/drivers.fods @@ -1,7 +1,7 @@ - 2009-04-16T11:32:48.39P5DT1H50M221LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-14T11:49:38.073000000François Bulot + 2009-04-16T11:32:48.39P5DT1H54M38S222LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-20T17:02:29.363000000François Bulot 0 @@ -13,17 +13,17 @@ view1 - 0 - 44 + 2 + 37 0 0 0 0 2 - 0 + 1 0 0 - 30 + 11 0 100 60 @@ -32,7 +32,7 @@ Sheet1 - 1255 + 1655 0 100 60 @@ -588,7 +588,7 @@ ???(???) - 00/00/0000, 00:00:00 + 00/00/0000, 00:00:00 @@ -998,7 +998,7 @@ EmptyCell - Those NoDataByDefinition elements activate the EmptyCell driver. + Those NoDataByDefinition elements which are not linked to a text activate the EmptyCell driver. diff --git a/src/main/resources/xslt/transformations/ddi2odt/drivers.fods b/src/main/resources/xslt/transformations/ddi2odt/drivers.fods index 3c98a4b28..9f230b5df 100644 --- a/src/main/resources/xslt/transformations/ddi2odt/drivers.fods +++ b/src/main/resources/xslt/transformations/ddi2odt/drivers.fods @@ -1,7 +1,7 @@ - 2009-04-16T11:32:48.39P3DT6H16M19S212LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-14T11:49:55.801000000François Bulot + 2009-04-16T11:32:48.39P3DT6H16M27S213LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-20T17:02:49.315000000François Bulot 0 @@ -13,14 +13,14 @@ view1 - 0 - 44 + 2 + 45 0 0 0 0 2 - 0 + 1 0 0 9 @@ -32,7 +32,7 @@ Sheet1 - 1255 + 1655 0 100 60 @@ -588,7 +588,7 @@ ???(???) - 00/00/0000, 00:00:00 + 00/00/0000, 00:00:00 @@ -998,7 +998,7 @@ EmptyCell - Those NoDataByDefinition elements activate the EmptyCell driver. + Those NoDataByDefinition elements which are not linked to a text activate the EmptyCell driver. From 2a07bb8ffda6eeba1cbf7ee996d4a4a616d36f13 Mon Sep 17 00:00:00 2001 From: BulotF Date: Thu, 20 Jun 2019 17:14:49 +0200 Subject: [PATCH 021/439] d:GridResponseDomainInMixed/d:ResponseAttachmentLocation : navigation --- .../ddi2js/tree-navigation.fods | 23 ++++++++++++----- .../ddi2odt/tree-navigation.fods | 23 ++++++++++++----- .../ddi2pdf/tree-navigation.fods | 25 +++++++++++++------ 3 files changed, 52 insertions(+), 19 deletions(-) diff --git a/src/main/resources/xslt/transformations/ddi2js/tree-navigation.fods b/src/main/resources/xslt/transformations/ddi2js/tree-navigation.fods index 880d2e334..ae181c5fb 100644 --- a/src/main/resources/xslt/transformations/ddi2js/tree-navigation.fods +++ b/src/main/resources/xslt/transformations/ddi2js/tree-navigation.fods @@ -1,20 +1,20 @@ - 2009-04-16T11:32:48.39PT3H25M1S36LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-14T11:52:42.297000000François Bulot + 2009-04-16T11:32:48.39PT3H29M12S37LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-20T17:11:42.186000000François Bulot 0 0 54881 - 3952 + 4404 view1 - 1 - 5 + 0 + 2 0 0 0 @@ -32,7 +32,7 @@ Sheet1 - 1255 + 1655 0 100 60 @@ -570,7 +570,7 @@ ???(???) - 00/00/0000, 00:00:00 + 00/00/0000, 00:00:00 @@ -608,6 +608,17 @@ ResponseDomainInMixed with AttachmentLocation correspond to attached Responsedomain that should'nt be seen as a direct child of the ResponseDomainInMixed but as a direct child of the response field which it's attached to ('other:' usecase) + + + d:StructuredMixedGridResponseDomain + + + *[not(d:ResponseAttachmentLocation)] + + + GridResponseDomainInMixed with AttachmentLocation correspond to attached Responsedomain that should'nt be seen as a direct child of the GridResponseDomainInMixed but as a direct child of the response field which it's attached to ('other:' usecase) + + d:ResponseDomainInMixed[@attachmentBase]//l:Code diff --git a/src/main/resources/xslt/transformations/ddi2odt/tree-navigation.fods b/src/main/resources/xslt/transformations/ddi2odt/tree-navigation.fods index b55e3cf46..ca3bfd821 100644 --- a/src/main/resources/xslt/transformations/ddi2odt/tree-navigation.fods +++ b/src/main/resources/xslt/transformations/ddi2odt/tree-navigation.fods @@ -1,20 +1,20 @@ - 2009-04-16T11:32:48.39PT3H24M12S36LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-14T11:52:16.129000000François Bulot + 2009-04-16T11:32:48.39PT3H24M20S37LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-20T17:11:59.690000000François Bulot 0 0 54881 - 3952 + 4404 view1 - 1 - 3 + 0 + 2 0 0 0 @@ -32,7 +32,7 @@ Sheet1 - 1255 + 1655 0 100 60 @@ -570,7 +570,7 @@ ???(???) - 00/00/0000, 00:00:00 + 00/00/0000, 00:00:00 @@ -608,6 +608,17 @@ ResponseDomainInMixed with AttachmentLocation correspond to attached Responsedomain that should'nt be seen as a direct child of the ResponseDomainInMixed but as a direct child of the response field which it's attached to ('other:' usecase) + + + d:StructuredMixedGridResponseDomain + + + *[not(d:ResponseAttachmentLocation)] + + + GridResponseDomainInMixed with AttachmentLocation correspond to attached Responsedomain that should'nt be seen as a direct child of the GridResponseDomainInMixed but as a direct child of the response field which it's attached to ('other:' usecase) + + d:ResponseDomainInMixed[@attachmentBase]//l:Code diff --git a/src/main/resources/xslt/transformations/ddi2pdf/tree-navigation.fods b/src/main/resources/xslt/transformations/ddi2pdf/tree-navigation.fods index 33cc3ea2f..900ed915d 100644 --- a/src/main/resources/xslt/transformations/ddi2pdf/tree-navigation.fods +++ b/src/main/resources/xslt/transformations/ddi2pdf/tree-navigation.fods @@ -1,26 +1,26 @@ - 2009-04-16T11:32:48.39P1DT6H33M76LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-14T11:51:45.786000000François Bulot + 2009-04-16T11:32:48.39P1DT6H33M10S77LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-20T17:12:17.990000000François Bulot 0 0 71737 - 3952 + 4404 view1 - 1 - 5 + 0 + 2 0 0 0 0 2 - 1 + 0 0 0 0 @@ -32,7 +32,7 @@ Sheet1 - 1255 + 1655 0 100 60 @@ -566,7 +566,7 @@ ???(???) - 00/00/0000, 00:00:00 + 00/00/0000, 00:00:00 @@ -604,6 +604,17 @@ ResponseDomainInMixed with AttachmentLocation correspond to attached Responsedomain that should'nt be seen as a direct child of the ResponseDomainInMixed but as a direct child of the response field which it's attached to ('other:' usecase) + + + d:StructuredMixedGridResponseDomain + + + *[not(d:ResponseAttachmentLocation)] + + + GridResponseDomainInMixed with AttachmentLocation correspond to attached Responsedomain that should'nt be seen as a direct child of the GridResponseDomainInMixed but as a direct child of the response field which it's attached to ('other:' usecase) + + d:ResponseDomainInMixed[@attachmentBase]//l:Code From 28c626b78313f196ba559b4ab7a0219b4a27f1bb Mon Sep 17 00:00:00 2001 From: BulotF Date: Fri, 5 Jul 2019 16:36:38 +0200 Subject: [PATCH 022/439] fixed-cell-value : use r:Value as xf:output content --- .../resources/xslt/inputs/ddi/functions.fods | 36 +++++++++++---- .../xslt/inputs/ddi/source-fixed.xsl | 18 +++++++- .../resources/xslt/inputs/ddi/templates.fods | 44 +++++++++++++++---- src/main/resources/xslt/outputs/fr/models.xsl | 17 +++++-- .../transformations/ddi2fr/functions.fods | 40 +++++++++++++---- 5 files changed, 125 insertions(+), 30 deletions(-) diff --git a/src/main/resources/xslt/inputs/ddi/functions.fods b/src/main/resources/xslt/inputs/ddi/functions.fods index 565d39635..dec08d0b8 100644 --- a/src/main/resources/xslt/inputs/ddi/functions.fods +++ b/src/main/resources/xslt/inputs/ddi/functions.fods @@ -1,20 +1,20 @@ - 2009-04-16T11:32:48.39PT18H39M57S142LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-24T10:02:27.668000000 + 2009-04-16T11:32:48.39PT18H43M17S144LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-07-05T11:05:44.636000000François Bulot 0 0 44116 - 29421 + 30324 view1 - 3 - 64 + 0 + 66 0 0 0 @@ -32,7 +32,7 @@ Sheet1 - 1600 + 1655 0 100 60 @@ -77,8 +77,8 @@ true true true - \\S20slinng\M20-207-RICOH MP2554SP - 1hP+/1xcUzIwc2xpbm5nXE0yMC0yMDctUklDT0ggTVAyNTU0U1AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUklDT0ggUENMNiBVbml2ZXJzYWxEcml2ZXIgVjQuMQAWAAEA8hIAAAAAAAAEAAhSAAAEdAAAM1ROVwAAAAAKAFwAXABTADIAMABzAGwAaQBuAG4AZwBcAE0AMgAwAC0AMgAwADcALQBSAEkAQwBPAEgAIABNAFAAMgA1AAAAAAABBAAg3AAMEg//gAMBAAkAmgs0CGQAAQAHAFgCAQACAFgCAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAIAAAAAAgAAAQAAAAAAAAAAAAAAAAAAAAAAAAAxMERSDFhkDpG++hkAAAAAKQQAAHicdVPRcuMwCPwXP/ch6dy01/yMB0vYVouERkJJ05v790OyE6eX9M1mVwss8KfLAsFCshEmzL0LsYgkOHeHDopw/cxIaKR7+o/q0TqQc0SlRgIXFExozobQKplQBNOMYD3bxkkuaMTiCIWqnC2R8HNFeRw1VLIS2KtYAI/9ql4LqYo8uVAZt1h7gaMLLek7D2s8cPJALeeq6+zjNxmOyEdMBGcLAv3oCCPIrERFIUZyBsRx+GL2R6BSJfa7Xe2ATfEYJLuvVucvjZmShX2EiKmG+xKcKOb9A+zkrMzquanJfj+/PqAQhkk5+vzQPb+97n5UWRhLXT+IrIn2+5c3JSW0xSAGgjTV6kcnws2w1s5Td9/vhh7UNo+QOTkdCtD6RH/VjuZWnTgn3R9XB5BYo2r3ZdA6KP3IKNeI2s+l/u7retXKZ8RtTRQgDhPaSbdxFFXmqODA/EE3KjbBaUxa2sA64nSNV81LJHDA7Wl/C3HU8vk2gWHiNJwUGwjMh+74aXaCzb/MVNZWX5o/U4I4O5PXnT7q2XC6+AZEgp8CuQldK8MAg94XE6lB25m0BLqVGb83ojeodmx9lWWmy5/h6DBXD5fK7yTV4e2+7w4yz9q1KdKbkpIaoZwL+PcfWFN6vgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASAENPTVBBVF9EVVBMRVhfTU9ERRQARHVwbGV4TW9kZTo6TG9uZ0VkZ2U= + Envoyer à OneNote 16 + xQT+/0Vudm95ZXIgw6AgT25lTm90ZcKgMTYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAU2VuZCB0byBNaWNyb3NvZnQgT25lTm90ZSAxNiBEcgAWAAEA4gMAAAAAAAAEAAhSAAAEdAAAM1ROVwAAAAAKAEUAbgB2AG8AeQBlAHIAIADgACAATwBuAGUATgBvAHQAZQCgADEANgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBAAG3AD8AgMvAAABAAkAmgs0CGQAAQAPAFgCAgABAFgCAwABAEEANAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAQAAAAIAAAABAAAA/////wAAAAAAAAAAAAAAAAAAAABESU5VIgDAAPwCAACsE9jAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAMAAAABTTVRKAAAAABAAsABTAGUAbgBkACAAdABvACAATQBpAGMAcgBvAHMAbwBmAHQAIABPAG4AZQBOAG8AdABlACAAMQA2ACAARAByAGkAdgBlAHIAAABSRVNETEwAVW5pcmVzRExMAFBhcGVyU2l6ZQBMRVRURVIAT3JpZW50YXRpb24AUE9SVFJBSVQAUmVzb2x1dGlvbgBEUEk2MDAAQ29sb3JNb2RlADI0YnBwAAAAAAAAAAAAAAAAAAAAABIAQ09NUEFUX0RVUExFWF9NT0RFEwBEdXBsZXhNb2RlOjpVbmtub3du zxx @@ -600,7 +600,7 @@ ???(???) - 00/00/0000, 00:00:00 + 00/00/0000, 00:00:00 @@ -1423,7 +1423,25 @@ Function for retrieving instructions based on the location they need to be outputted - + + + enoddi:get-cell-value + + + + Function that return the value of a fixed cell + + + + + enoddi:get-cell-value-variables + + + + Function that return the variables from the value of a fixed cell + + + diff --git a/src/main/resources/xslt/inputs/ddi/source-fixed.xsl b/src/main/resources/xslt/inputs/ddi/source-fixed.xsl index ba69ec26d..31442eca9 100644 --- a/src/main/resources/xslt/inputs/ddi/source-fixed.xsl +++ b/src/main/resources/xslt/inputs/ddi/source-fixed.xsl @@ -798,10 +798,26 @@ - + + + + Defining getter get-cell-value-variables. + Function that returns the list of the variables of the value of a fixed cell. + + + + + + + + + + + + diff --git a/src/main/resources/xslt/inputs/ddi/templates.fods b/src/main/resources/xslt/inputs/ddi/templates.fods index 7a595b904..ae76dac3f 100644 --- a/src/main/resources/xslt/inputs/ddi/templates.fods +++ b/src/main/resources/xslt/inputs/ddi/templates.fods @@ -1,29 +1,29 @@ - 2009-04-16T11:32:48.39P3DT3H23M40S406LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-13T11:44:15.090000000François Bulot + 2009-04-16T11:32:48.39P3DT4H4M12S409LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-07-05T11:05:26.891000000François Bulot 0 0 63256 - 81265 + 83326 view1 - 4 - 17 + 1 + 36 0 0 0 0 2 - 4 + 0 0 0 - 0 + 18 0 100 60 @@ -32,7 +32,7 @@ Sheet1 - 1255 + 1655 0 100 60 @@ -313,6 +313,12 @@ + + + : + + , + - @@ -626,7 +632,7 @@ ???(???) - 00/00/0000, 00:00:00 + 00/00/0000, 00:00:00 @@ -1331,7 +1337,7 @@ enoddi:get-label - r:Value + ../../d:CellLabel[eno:serialize(d:GridAttachment/d:CellCoordinatesAsDefined)=eno:serialize(current()/child::d:CellCoordinatesAsDefined)]/r:Content lang-choice @@ -1413,6 +1419,26 @@ + + + d:FixedCellValue + + + enoddi:get-cell-value + + + r:Value + + + + The value of a fixed cell + + + + + + + d:QuestionItem diff --git a/src/main/resources/xslt/outputs/fr/models.xsl b/src/main/resources/xslt/outputs/fr/models.xsl index fd2bfec1f..db886b6e3 100644 --- a/src/main/resources/xslt/outputs/fr/models.xsl +++ b/src/main/resources/xslt/outputs/fr/models.xsl @@ -347,7 +347,8 @@ - + + @@ -380,10 +381,10 @@ - + - + @@ -397,6 +398,16 @@ + + + + + + + + + + diff --git a/src/main/resources/xslt/transformations/ddi2fr/functions.fods b/src/main/resources/xslt/transformations/ddi2fr/functions.fods index 314a8a5d9..948198a16 100644 --- a/src/main/resources/xslt/transformations/ddi2fr/functions.fods +++ b/src/main/resources/xslt/transformations/ddi2fr/functions.fods @@ -1,20 +1,20 @@ - 2009-04-16T11:32:48.39PT10H4M52S84LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-04-10T14:51:50.068000000François Bulot + 2009-04-16T11:32:48.39PT10H47M25S85LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-07-05T11:13:04.457000000François Bulot 0 0 33709 - 29026 + 29929 view1 - 0 - 55 + 3 + 56 0 0 0 @@ -77,8 +77,8 @@ true true true - \\S20slinng\M20-207-RICOH MP2554SP - 1hP+/1xcUzIwc2xpbm5nXE0yMC0yMDctUklDT0ggTVAyNTU0U1AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUklDT0ggUENMNiBVbml2ZXJzYWxEcml2ZXIgVjQuMQAWAAEA8hIAAAAAAAAEAAhSAAAEdAAAM1ROVwAAAAAKAFwAXABTADIAMABzAGwAaQBuAG4AZwBcAE0AMgAwAC0AMgAwADcALQBSAEkAQwBPAEgAIABNAFAAMgA1AAAAAAABBAAg3AAMEg//gAMBAAkAmgs0CGQAAQAHAFgCAQACAFgCAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAIAAAAAAgAAAQAAAAAAAAAAAAAAAAAAAAAAAAAxMERSDFhkDpG++hkAAAAAKQQAAHicdVPRcuMwCPwXP/ch6dy01/yMB0vYVouERkJJ05v790OyE6eX9M1mVwss8KfLAsFCshEmzL0LsYgkOHeHDopw/cxIaKR7+o/q0TqQc0SlRgIXFExozobQKplQBNOMYD3bxkkuaMTiCIWqnC2R8HNFeRw1VLIS2KtYAI/9ql4LqYo8uVAZt1h7gaMLLek7D2s8cPJALeeq6+zjNxmOyEdMBGcLAv3oCCPIrERFIUZyBsRx+GL2R6BSJfa7Xe2ATfEYJLuvVucvjZmShX2EiKmG+xKcKOb9A+zkrMzquanJfj+/PqAQhkk5+vzQPb+97n5UWRhLXT+IrIn2+5c3JSW0xSAGgjTV6kcnws2w1s5Td9/vhh7UNo+QOTkdCtD6RH/VjuZWnTgn3R9XB5BYo2r3ZdA6KP3IKNeI2s+l/u7retXKZ8RtTRQgDhPaSbdxFFXmqODA/EE3KjbBaUxa2sA64nSNV81LJHDA7Wl/C3HU8vk2gWHiNJwUGwjMh+74aXaCzb/MVNZWX5o/U4I4O5PXnT7q2XC6+AZEgp8CuQldK8MAg94XE6lB25m0BLqVGb83ojeodmx9lWWmy5/h6DBXD5fK7yTV4e2+7w4yz9q1KdKbkpIaoZwL+PcfWFN6vgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASAENPTVBBVF9EVVBMRVhfTU9ERRQARHVwbGV4TW9kZTo6TG9uZ0VkZ2U= + Envoyer à OneNote 16 + xQT+/0Vudm95ZXIgw6AgT25lTm90ZcKgMTYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAU2VuZCB0byBNaWNyb3NvZnQgT25lTm90ZSAxNiBEcgAWAAEA4gMAAAAAAAAEAAhSAAAEdAAAM1ROVwAAAAAKAEUAbgB2AG8AeQBlAHIAIADgACAATwBuAGUATgBvAHQAZQCgADEANgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBAAG3AD8AgMvAAABAAkAmgs0CGQAAQAPAFgCAgABAFgCAwABAEEANAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAQAAAAIAAAABAAAA/////wAAAAAAAAAAAAAAAAAAAABESU5VIgDAAPwCAACsE9jAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAMAAAABTTVRKAAAAABAAsABTAGUAbgBkACAAdABvACAATQBpAGMAcgBvAHMAbwBmAHQAIABPAG4AZQBOAG8AdABlACAAMQA2ACAARAByAGkAdgBlAHIAAABSRVNETEwAVW5pcmVzRExMAFBhcGVyU2l6ZQBMRVRURVIAT3JpZW50YXRpb24AUE9SVFJBSVQAUmVzb2x1dGlvbgBEUEk2MDAAQ29sb3JNb2RlADI0YnBwAAAAAAAAAAAAAAAAAAAAABIAQ09NUEFUX0RVUExFWF9NT0RFEwBEdXBsZXhNb2RlOjpVbmtub3du zxx @@ -598,7 +598,7 @@ ???(???) - 00/00/0000, 00:00:00 + 00/00/0000, 00:00:00 @@ -1368,7 +1368,31 @@ Linking output function enofr:get-codelist-id to input function enoddi:get-codelist-id - + + + enofr:get-cell-value + + + + enoddi:get-cell-value + + + Linking output function enofr:get-cell-value to input function enoddi:get-cell-value + + + + + enofr:get-cell-value-variables + + + + enoddi:get-cell-value-variables + + + Linking output function enofr:get-cell-value-variables to input function enoddi:get-cell-value-variables + + + From e98b84dcc2ef0bb105087660e28a66c5863f34be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bulot=20Fran=C3=A7ois?= Date: Wed, 10 Jul 2019 14:25:19 +0200 Subject: [PATCH 023/439] MeasutementUnit in VariableRepresentation/*Domain --- .../xslt/inputs/ddi/source-fixed.xsl | 2 +- .../resources/xslt/util/ddi/ddi32toddi33.xsl | 34 +++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/src/main/resources/xslt/inputs/ddi/source-fixed.xsl b/src/main/resources/xslt/inputs/ddi/source-fixed.xsl index 31442eca9..52497fe6c 100644 --- a/src/main/resources/xslt/inputs/ddi/source-fixed.xsl +++ b/src/main/resources/xslt/inputs/ddi/source-fixed.xsl @@ -132,7 +132,7 @@ - + diff --git a/src/main/resources/xslt/util/ddi/ddi32toddi33.xsl b/src/main/resources/xslt/util/ddi/ddi32toddi33.xsl index 5cb33e518..b714b3a6b 100644 --- a/src/main/resources/xslt/util/ddi/ddi32toddi33.xsl +++ b/src/main/resources/xslt/util/ddi/ddi32toddi33.xsl @@ -123,4 +123,38 @@ + + https://ddi-alliance.atlassian.net/browse/DDILIFE-3532 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From af98ed2550db076f13320a2c4e0e1deb12bd6d33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bulot=20Fran=C3=A7ois?= Date: Thu, 11 Jul 2019 14:42:15 +0200 Subject: [PATCH 024/439] pdf : other - give details in table --- src/main/resources/xslt/outputs/pdf/models.xsl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/resources/xslt/outputs/pdf/models.xsl b/src/main/resources/xslt/outputs/pdf/models.xsl index dea54d96e..83dcfba13 100644 --- a/src/main/resources/xslt/outputs/pdf/models.xsl +++ b/src/main/resources/xslt/outputs/pdf/models.xsl @@ -511,6 +511,11 @@ + + No other - give details out of cells + + + From 6dacbc7ef29645139a6d6e922bbf496fd43be6e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bulot=20Fran=C3=A7ois?= Date: Thu, 11 Jul 2019 16:01:45 +0200 Subject: [PATCH 025/439] update FlowControl - pdf - ddi32 to ddi33 --- .../xslt/inputs/ddi/source-fixed.xsl | 2 +- .../resources/xslt/inputs/ddi/templates.fods | 33 ++++++++++++++----- .../resources/xslt/outputs/pdf/models.xsl | 30 +++++++++++++++++ .../xslt/transformations/ddi2pdf/drivers.fods | 19 ++++++----- .../ddi2pdf/tree-navigation.fods | 10 +++--- .../resources/xslt/util/ddi/ddi32toddi33.xsl | 11 ++++++- 6 files changed, 81 insertions(+), 24 deletions(-) diff --git a/src/main/resources/xslt/inputs/ddi/source-fixed.xsl b/src/main/resources/xslt/inputs/ddi/source-fixed.xsl index 52497fe6c..665782e5d 100644 --- a/src/main/resources/xslt/inputs/ddi/source-fixed.xsl +++ b/src/main/resources/xslt/inputs/ddi/source-fixed.xsl @@ -1110,7 +1110,7 @@ - + diff --git a/src/main/resources/xslt/inputs/ddi/templates.fods b/src/main/resources/xslt/inputs/ddi/templates.fods index ae76dac3f..0efea63d3 100644 --- a/src/main/resources/xslt/inputs/ddi/templates.fods +++ b/src/main/resources/xslt/inputs/ddi/templates.fods @@ -1,20 +1,20 @@ - 2009-04-16T11:32:48.39P3DT4H4M12S409LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-07-05T11:05:26.891000000François Bulot + 2009-04-16T11:32:48.39P3DT4H7M7S410LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-07-11T15:32:42.220000000François Bulot 0 0 63256 - 83326 + 83904 view1 - 1 - 36 + 0 + 128 0 0 0 @@ -23,7 +23,7 @@ 0 0 0 - 18 + 112 0 100 60 @@ -632,7 +632,7 @@ ???(???) - 00/00/0000, 00:00:00 + 00/00/0000, 00:00:00 @@ -1141,6 +1141,21 @@ Identifier for ElseConstructReference is its IfThenElse's id concatened with '-ELSE' + + + d:ExternalAid[r:OtherMaterial/r:Description/r:Content/xhtml:div/@class='FlowControl'] + + + enoddi:get-id + + + r:OtherMaterial/r:ID + + + + Identifier for FlowControl is its OtherMaterial's ID + + @@ -1365,13 +1380,13 @@ - r:Description[parent::d:ExternalAid and r:Content/xhtml:div/@class='FlowControl'] + d:ExternalAid[r:OtherMaterial/r:Description/r:Content/xhtml:div/@class='FlowControl'] enoddi:get-label - r:Content/xhtml:div[@class='FlowControl']/xhtml:div[@class='Description'] + r:OtherMaterial/r:Description/r:Content/xhtml:div[@class='FlowControl']/xhtml:div[@class='Description'] lang-choice @@ -2575,7 +2590,7 @@ - r:Description[parent::d:ExternalAid and r:Content/xhtml:div/@class='FlowControl'] + d:ExternalAid[r:OtherMaterial/r:Description/r:Content/xhtml:div/@class='FlowControl'] enoddi:get-format diff --git a/src/main/resources/xslt/outputs/pdf/models.xsl b/src/main/resources/xslt/outputs/pdf/models.xsl index 83dcfba13..52738bace 100644 --- a/src/main/resources/xslt/outputs/pdf/models.xsl +++ b/src/main/resources/xslt/outputs/pdf/models.xsl @@ -280,6 +280,36 @@ + + template for the FlowControl + + + + + + + + + + + + + + + + + + + + + + + + + + + + Questions with responses which are not in a table diff --git a/src/main/resources/xslt/transformations/ddi2pdf/drivers.fods b/src/main/resources/xslt/transformations/ddi2pdf/drivers.fods index 6dfe55b3f..3bd4a7120 100644 --- a/src/main/resources/xslt/transformations/ddi2pdf/drivers.fods +++ b/src/main/resources/xslt/transformations/ddi2pdf/drivers.fods @@ -1,20 +1,20 @@ - 2009-04-16T11:32:48.39P2DT1H40M32S171LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-14T11:50:08.562000000François Bulot + 2009-04-16T11:32:48.39P2DT1H46M10S173LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-07-11T15:24:55.947000000François Bulot 0 0 54828 - 31160 + 31612 view1 0 - 47 + 19 0 0 0 @@ -23,7 +23,7 @@ 0 0 0 - 18 + 0 0 100 60 @@ -32,7 +32,7 @@ Sheet1 - 1255 + 1655 0 100 60 @@ -599,7 +599,7 @@ ???(???) - 00/00/0000, 00:00:00 + 00/00/0000, 00:00:00 @@ -762,12 +762,15 @@ The Description of a IfThenElse is an alternative text for non dynamic output format, so it activates the xf-output drivers as other Instruction-like. + + + - r:Description[parent::d:ExternalAid and r:Content/xhtml:div/@class='FlowControl'] + d:ExternalAid[r:OtherMaterial/r:Description/r:Content/xhtml:div/@class='FlowControl'] - xf-output + FlowControl The "FlowControl" ExternalAid of a Question is the Instruction for a FlowControl leaving from the Question, so it activates the xf-output. diff --git a/src/main/resources/xslt/transformations/ddi2pdf/tree-navigation.fods b/src/main/resources/xslt/transformations/ddi2pdf/tree-navigation.fods index 900ed915d..9f677e025 100644 --- a/src/main/resources/xslt/transformations/ddi2pdf/tree-navigation.fods +++ b/src/main/resources/xslt/transformations/ddi2pdf/tree-navigation.fods @@ -1,7 +1,7 @@ - 2009-04-16T11:32:48.39P1DT6H33M10S77LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-20T17:12:17.990000000François Bulot + 2009-04-16T11:32:48.39P1DT6H34M30S78LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-07-11T15:29:22.395000000François Bulot 0 @@ -13,8 +13,8 @@ view1 - 0 - 2 + 1 + 8 0 0 0 @@ -566,7 +566,7 @@ ???(???) - 00/00/0000, 00:00:00 + 00/00/0000, 00:00:00 @@ -664,7 +664,7 @@ d:QuestionItem | d:QuestionGrid - *[not(self::d:InterviewerInstructionReference) and not(self::d:ExternalAid[r:Description/r:Content/xhtml:div/@class='FlowControl'])] + *[not(self::d:InterviewerInstructionReference) and not(self::d:ExternalAid[r:OtherMaterial/r:Description/r:Content/xhtml:div/@class='FlowControl'])] It deactivate explicit driver flow for Instructions attached to a question. Explicit out-getters should be used instead to retrieve instructions. diff --git a/src/main/resources/xslt/util/ddi/ddi32toddi33.xsl b/src/main/resources/xslt/util/ddi/ddi32toddi33.xsl index b714b3a6b..1f7500771 100644 --- a/src/main/resources/xslt/util/ddi/ddi32toddi33.xsl +++ b/src/main/resources/xslt/util/ddi/ddi32toddi33.xsl @@ -155,6 +155,15 @@ - + + https://ddi-alliance.atlassian.net/projects/DDILIFE/issues/DDILIFE-3590 + + + + + + + + \ No newline at end of file From 6d33ff04d3c4ab98487c9acce78289134a99a8f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bulot=20Fran=C3=A7ois?= Date: Thu, 11 Jul 2019 17:00:03 +0200 Subject: [PATCH 026/439] set tree-navigation and drivers the same content --- .../xslt/transformations/ddi2fr/drivers.fods | 37 +++++++++++--- .../ddi2fr/tree-navigation.fods | 8 +-- .../xslt/transformations/ddi2js/drivers.fods | 39 ++++++++++++--- .../ddi2js/tree-navigation.fods | 10 ++-- .../xslt/transformations/ddi2odt/drivers.fods | 49 ++++++++++++++----- .../ddi2odt/tree-navigation.fods | 10 ++-- .../xslt/transformations/ddi2pdf/drivers.fods | 10 ++-- 7 files changed, 119 insertions(+), 44 deletions(-) diff --git a/src/main/resources/xslt/transformations/ddi2fr/drivers.fods b/src/main/resources/xslt/transformations/ddi2fr/drivers.fods index 508572fe1..dca75478c 100644 --- a/src/main/resources/xslt/transformations/ddi2fr/drivers.fods +++ b/src/main/resources/xslt/transformations/ddi2fr/drivers.fods @@ -1,20 +1,20 @@ - 2009-04-16T11:32:48.39P1DT3H22M36S170LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-14T10:07:54.698000000François Bulot + 2009-04-16T11:32:48.39P1DT3H25M43S172LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-07-11T16:49:58.232000000François Bulot 0 0 50597 - 29867 + 31222 view1 0 - 46 + 18 0 0 0 @@ -23,7 +23,7 @@ 0 0 0 - 18 + 0 0 100 60 @@ -32,7 +32,7 @@ Sheet1 - 1255 + 1655 0 100 60 @@ -591,7 +591,7 @@ ???(???) - 00/00/0000, 00:00:00 + 00/00/0000, 00:00:00 @@ -743,6 +743,31 @@ Most Instruction elements activates the xf-output driver. + + + r:Description[parent::d:IfThenElse] + + + xf-output + + + The Description of a IfThenElse is an alternative text for non dynamic output format, so it activates the xf-output drivers as other Instruction-like. + + + + + + + + d:ExternalAid[r:OtherMaterial/r:Description/r:Content/xhtml:div/@class='FlowControl'] + + + FlowControl + + + The "FlowControl" ExternalAid of a Question is the Instruction for a FlowControl leaving from the Question, so it activates the xf-output. + + diff --git a/src/main/resources/xslt/transformations/ddi2fr/tree-navigation.fods b/src/main/resources/xslt/transformations/ddi2fr/tree-navigation.fods index b743c6e3f..3516c0b88 100644 --- a/src/main/resources/xslt/transformations/ddi2fr/tree-navigation.fods +++ b/src/main/resources/xslt/transformations/ddi2fr/tree-navigation.fods @@ -1,7 +1,7 @@ - 2009-04-16T11:32:48.39PT6H31M21S40LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-19T09:37:22.187000000François Bulot + 2009-04-16T11:32:48.39PT6H31M36S41LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-07-11T16:12:30.623000000François Bulot 0 @@ -14,7 +14,7 @@ 1 - 2 + 20 0 0 0 @@ -570,7 +570,7 @@ ???(???) - 00/00/0000, 00:00:00 + 00/00/0000, 00:00:00 @@ -668,7 +668,7 @@ d:QuestionItem | d:QuestionGrid - *[not(self::d:InterviewerInstructionReference)] + *[not(self::d:InterviewerInstructionReference) and not(self::d:ExternalAid[r:OtherMaterial/r:Description/r:Content/xhtml:div/@class='FlowControl'])] It deactivate explicit driver flow for Instructions attached to a question. Explicit out-getters should be used instead to retrieve instructions. diff --git a/src/main/resources/xslt/transformations/ddi2js/drivers.fods b/src/main/resources/xslt/transformations/ddi2js/drivers.fods index 3e0a25b40..215220f48 100644 --- a/src/main/resources/xslt/transformations/ddi2js/drivers.fods +++ b/src/main/resources/xslt/transformations/ddi2js/drivers.fods @@ -1,29 +1,29 @@ - 2009-04-16T11:32:48.39P5DT1H54M38S222LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-20T17:02:29.363000000François Bulot + 2009-04-16T11:32:48.39P5DT1H55M49S223LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-07-11T16:54:18.721000000François Bulot 0 0 51722 - 29414 + 30769 view1 - 2 - 37 + 0 + 16 0 0 0 0 2 - 1 + 0 0 0 - 11 + 0 0 100 60 @@ -588,7 +588,7 @@ ???(???) - 00/00/0000, 00:00:00 + 00/00/0000, 00:00:00 @@ -740,6 +740,31 @@ Most Instruction elements activates the xf-output driver. + + + r:Description[parent::d:IfThenElse] + + + xf-output + + + The Description of a IfThenElse is an alternative text for non dynamic output format, so it activates the xf-output drivers as other Instruction-like. + + + + + + + + d:ExternalAid[r:OtherMaterial/r:Description/r:Content/xhtml:div/@class='FlowControl'] + + + FlowControl + + + The "FlowControl" ExternalAid of a Question is the Instruction for a FlowControl leaving from the Question, so it activates the xf-output. + + diff --git a/src/main/resources/xslt/transformations/ddi2js/tree-navigation.fods b/src/main/resources/xslt/transformations/ddi2js/tree-navigation.fods index ae181c5fb..82516b1ad 100644 --- a/src/main/resources/xslt/transformations/ddi2js/tree-navigation.fods +++ b/src/main/resources/xslt/transformations/ddi2js/tree-navigation.fods @@ -1,7 +1,7 @@ - 2009-04-16T11:32:48.39PT3H29M12S37LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-20T17:11:42.186000000François Bulot + 2009-04-16T11:32:48.39PT3H29M16S38LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-07-11T16:12:55.566000000François Bulot 0 @@ -13,8 +13,8 @@ view1 - 0 - 2 + 1 + 7 0 0 0 @@ -570,7 +570,7 @@ ???(???) - 00/00/0000, 00:00:00 + 00/00/0000, 00:00:00 @@ -668,7 +668,7 @@ d:QuestionItem | d:QuestionGrid - *[not(self::d:InterviewerInstructionReference)] + *[not(self::d:InterviewerInstructionReference) and not(self::d:ExternalAid[r:OtherMaterial/r:Description/r:Content/xhtml:div/@class='FlowControl'])] It deactivate explicit driver flow for Instructions attached to a question. Explicit out-getters should be used instead to retrieve instructions. diff --git a/src/main/resources/xslt/transformations/ddi2odt/drivers.fods b/src/main/resources/xslt/transformations/ddi2odt/drivers.fods index 9f230b5df..9e3dfb669 100644 --- a/src/main/resources/xslt/transformations/ddi2odt/drivers.fods +++ b/src/main/resources/xslt/transformations/ddi2odt/drivers.fods @@ -1,29 +1,29 @@ - 2009-04-16T11:32:48.39P3DT6H16M27S213LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-20T17:02:49.315000000François Bulot + 2009-04-16T11:32:48.39P3DT6H19M15S216LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-07-11T16:58:53.896000000François Bulot 0 0 60138 - 29414 + 30769 view1 - 2 - 45 + 0 + 67 0 0 0 0 2 - 1 + 0 0 0 - 9 + 41 0 100 60 @@ -588,7 +588,7 @@ ???(???) - 00/00/0000, 00:00:00 + 00/00/0000, 00:00:00 @@ -740,6 +740,31 @@ Most Instruction elements activates the xf-output driver. + + + r:Description[parent::d:IfThenElse] + + + xf-output + + + The Description of a IfThenElse is an alternative text for non dynamic output format, so it activates the xf-output drivers as other Instruction-like. + + + + + + + + d:ExternalAid[r:OtherMaterial/r:Description/r:Content/xhtml:div/@class='FlowControl'] + + + FlowControl + + + The "FlowControl" ExternalAid of a Question is the Instruction for a FlowControl leaving from the Question, so it activates the xf-output. + + @@ -784,24 +809,24 @@ - d:DateTimeDomain[not(r:DateFieldFormat/text()='duration')] + d:DateTimeDomain[not(descendant::r:DateTypeCode/text()='duration')] DateTimeDomain - Those DateTimeDomain elements (not of the HH:CH type) activate the xf-input driver. + Those DateTimeDomain elements (not duration) activate the DateTimeDomain driver. - d:DateTimeDomainReference[not(r:DateFieldFormat/text()='duration')] + d:DateTimeDomainReference[not(descendant::r:DateTypeCode/text()='duration')] DateTimeDomain - Those DateTimeDomainReference elements (not of the HH:CH type) activate the xf-input driver. + Those DateTimeDomainReference elements (not duration) activate the DateTimeDomain driver. @@ -1127,7 +1152,7 @@ - l:Variable[not(r:QuestionReference or r:SourceParameterReference)] + l:Variable[not(r:QuestionReference or r:SourceParameterReference or d:GenerationInstruction)] ResponseElement diff --git a/src/main/resources/xslt/transformations/ddi2odt/tree-navigation.fods b/src/main/resources/xslt/transformations/ddi2odt/tree-navigation.fods index ca3bfd821..600816ae7 100644 --- a/src/main/resources/xslt/transformations/ddi2odt/tree-navigation.fods +++ b/src/main/resources/xslt/transformations/ddi2odt/tree-navigation.fods @@ -1,7 +1,7 @@ - 2009-04-16T11:32:48.39PT3H24M20S37LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-06-20T17:11:59.690000000François Bulot + 2009-04-16T11:32:48.39PT3H24M24S38LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-07-11T16:12:43.735000000François Bulot 0 @@ -13,8 +13,8 @@ view1 - 0 - 2 + 1 + 7 0 0 0 @@ -570,7 +570,7 @@ ???(???) - 00/00/0000, 00:00:00 + 00/00/0000, 00:00:00 @@ -668,7 +668,7 @@ d:QuestionItem | d:QuestionGrid - *[not(self::d:InterviewerInstructionReference)] + *[not(self::d:InterviewerInstructionReference) and not(self::d:ExternalAid[r:OtherMaterial/r:Description/r:Content/xhtml:div/@class='FlowControl'])] It deactivate explicit driver flow for Instructions attached to a question. Explicit out-getters should be used instead to retrieve instructions. diff --git a/src/main/resources/xslt/transformations/ddi2pdf/drivers.fods b/src/main/resources/xslt/transformations/ddi2pdf/drivers.fods index 3bd4a7120..376fdfb56 100644 --- a/src/main/resources/xslt/transformations/ddi2pdf/drivers.fods +++ b/src/main/resources/xslt/transformations/ddi2pdf/drivers.fods @@ -1,7 +1,7 @@ - 2009-04-16T11:32:48.39P2DT1H46M10S173LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-07-11T15:24:55.947000000François Bulot + 2009-04-16T11:32:48.39P2DT2H22M21S174LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-07-11T16:49:21.465000000François Bulot 0 @@ -14,7 +14,7 @@ 0 - 19 + 59 0 0 0 @@ -23,7 +23,7 @@ 0 0 0 - 0 + 34 0 100 60 @@ -599,7 +599,7 @@ ???(???) - 00/00/0000, 00:00:00 + 00/00/0000, 00:00:00 @@ -1166,7 +1166,7 @@ - l:Variable[not(r:QuestionReference or r:SourceParameterReference)] + l:Variable[not(r:QuestionReference or r:SourceParameterReference or d:GenerationInstruction)] ResponseElement From 5ff689cf225504a636539e2da31033c376f0e557 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bulot=20Fran=C3=A7ois?= Date: Thu, 11 Jul 2019 17:14:02 +0200 Subject: [PATCH 027/439] update ddi2out in files --- src/test/resources/ddi-to-fo/in.xml | 114 ++++++++++++++++++------- src/test/resources/ddi-to-js/in.xml | 114 ++++++++++++++++++------- src/test/resources/ddi-to-odt/in.xml | 114 ++++++++++++++++++------- src/test/resources/ddi-to-pdf/in.xml | 114 ++++++++++++++++++------- src/test/resources/ddi-to-xform/in.xml | 114 ++++++++++++++++++------- 5 files changed, 410 insertions(+), 160 deletions(-) diff --git a/src/test/resources/ddi-to-fo/in.xml b/src/test/resources/ddi-to-fo/in.xml index 26479c864..43c0c1a62 100644 --- a/src/test/resources/ddi-to-fo/in.xml +++ b/src/test/resources/ddi-to-fo/in.xml @@ -1175,7 +1175,7 @@ - + fr.insee j6p6my1d 0.1.0 @@ -1189,7 +1189,7 @@ - + fr.insee @@ -8129,9 +8129,14 @@ 0.1.0 QuestionGrid - - % - + % + 0 + 100 + Decimal + fr.insee + j4nwc63q-RDOP-jbgde5yl + 0.1.0 + fr.insee @@ -8155,9 +8160,14 @@ 0.1.0 QuestionGrid - - % - + % + 0 + 100 + Decimal + fr.insee + j4nwc63q-RDOP-jbgd2x2t + 0.1.0 + fr.insee @@ -8181,9 +8191,14 @@ 0.1.0 QuestionGrid - - % - + % + 0 + 100 + Decimal + fr.insee + j4nwc63q-RDOP-jbgdjypz + 0.1.0 + fr.insee @@ -8207,9 +8222,14 @@ 0.1.0 QuestionGrid - - % - + % + 0 + 100 + Decimal + fr.insee + j4nwc63q-RDOP-jbgdcftu + 0.1.0 + fr.insee @@ -8233,9 +8253,14 @@ 0.1.0 QuestionGrid - - % - + % + 0 + 100 + Decimal + fr.insee + j4nwc63q-RDOP-jbgdiyfe + 0.1.0 + fr.insee @@ -8259,9 +8284,14 @@ 0.1.0 QuestionGrid - - % - + % + 0 + 100 + Decimal + fr.insee + j4nwc63q-RDOP-jbgdj1wd + 0.1.0 + fr.insee @@ -8285,9 +8315,14 @@ 0.1.0 QuestionGrid - - % - + % + 0 + 100 + Decimal + fr.insee + j4nwc63q-RDOP-jbgddylk + 0.1.0 + fr.insee @@ -8311,9 +8346,14 @@ 0.1.0 QuestionGrid - - % - + % + 0 + 100 + Decimal + fr.insee + j4nwc63q-RDOP-jbgd3jj6 + 0.1.0 + fr.insee @@ -8337,9 +8377,14 @@ 0.1.0 QuestionGrid - - % - + % + 0 + 100 + Decimal + fr.insee + j4nwc63q-RDOP-jbgd4w3k + 0.1.0 + fr.insee @@ -8363,9 +8408,14 @@ 0.1.0 QuestionGrid - - % - + % + 0 + 100 + Decimal + fr.insee + j4nwc63q-RDOP-jbgd4w4k + 0.1.0 + fr.insee diff --git a/src/test/resources/ddi-to-js/in.xml b/src/test/resources/ddi-to-js/in.xml index 26479c864..43c0c1a62 100644 --- a/src/test/resources/ddi-to-js/in.xml +++ b/src/test/resources/ddi-to-js/in.xml @@ -1175,7 +1175,7 @@ - + fr.insee j6p6my1d 0.1.0 @@ -1189,7 +1189,7 @@ - + fr.insee @@ -8129,9 +8129,14 @@ 0.1.0 QuestionGrid - - % - + % + 0 + 100 + Decimal + fr.insee + j4nwc63q-RDOP-jbgde5yl + 0.1.0 + fr.insee @@ -8155,9 +8160,14 @@ 0.1.0 QuestionGrid - - % - + % + 0 + 100 + Decimal + fr.insee + j4nwc63q-RDOP-jbgd2x2t + 0.1.0 + fr.insee @@ -8181,9 +8191,14 @@ 0.1.0 QuestionGrid - - % - + % + 0 + 100 + Decimal + fr.insee + j4nwc63q-RDOP-jbgdjypz + 0.1.0 + fr.insee @@ -8207,9 +8222,14 @@ 0.1.0 QuestionGrid - - % - + % + 0 + 100 + Decimal + fr.insee + j4nwc63q-RDOP-jbgdcftu + 0.1.0 + fr.insee @@ -8233,9 +8253,14 @@ 0.1.0 QuestionGrid - - % - + % + 0 + 100 + Decimal + fr.insee + j4nwc63q-RDOP-jbgdiyfe + 0.1.0 + fr.insee @@ -8259,9 +8284,14 @@ 0.1.0 QuestionGrid - - % - + % + 0 + 100 + Decimal + fr.insee + j4nwc63q-RDOP-jbgdj1wd + 0.1.0 + fr.insee @@ -8285,9 +8315,14 @@ 0.1.0 QuestionGrid - - % - + % + 0 + 100 + Decimal + fr.insee + j4nwc63q-RDOP-jbgddylk + 0.1.0 + fr.insee @@ -8311,9 +8346,14 @@ 0.1.0 QuestionGrid - - % - + % + 0 + 100 + Decimal + fr.insee + j4nwc63q-RDOP-jbgd3jj6 + 0.1.0 + fr.insee @@ -8337,9 +8377,14 @@ 0.1.0 QuestionGrid - - % - + % + 0 + 100 + Decimal + fr.insee + j4nwc63q-RDOP-jbgd4w3k + 0.1.0 + fr.insee @@ -8363,9 +8408,14 @@ 0.1.0 QuestionGrid - - % - + % + 0 + 100 + Decimal + fr.insee + j4nwc63q-RDOP-jbgd4w4k + 0.1.0 + fr.insee diff --git a/src/test/resources/ddi-to-odt/in.xml b/src/test/resources/ddi-to-odt/in.xml index 26479c864..43c0c1a62 100644 --- a/src/test/resources/ddi-to-odt/in.xml +++ b/src/test/resources/ddi-to-odt/in.xml @@ -1175,7 +1175,7 @@ - + fr.insee j6p6my1d 0.1.0 @@ -1189,7 +1189,7 @@ - + fr.insee @@ -8129,9 +8129,14 @@ 0.1.0 QuestionGrid - - % - + % + 0 + 100 + Decimal + fr.insee + j4nwc63q-RDOP-jbgde5yl + 0.1.0 + fr.insee @@ -8155,9 +8160,14 @@ 0.1.0 QuestionGrid - - % - + % + 0 + 100 + Decimal + fr.insee + j4nwc63q-RDOP-jbgd2x2t + 0.1.0 + fr.insee @@ -8181,9 +8191,14 @@ 0.1.0 QuestionGrid - - % - + % + 0 + 100 + Decimal + fr.insee + j4nwc63q-RDOP-jbgdjypz + 0.1.0 + fr.insee @@ -8207,9 +8222,14 @@ 0.1.0 QuestionGrid - - % - + % + 0 + 100 + Decimal + fr.insee + j4nwc63q-RDOP-jbgdcftu + 0.1.0 + fr.insee @@ -8233,9 +8253,14 @@ 0.1.0 QuestionGrid - - % - + % + 0 + 100 + Decimal + fr.insee + j4nwc63q-RDOP-jbgdiyfe + 0.1.0 + fr.insee @@ -8259,9 +8284,14 @@ 0.1.0 QuestionGrid - - % - + % + 0 + 100 + Decimal + fr.insee + j4nwc63q-RDOP-jbgdj1wd + 0.1.0 + fr.insee @@ -8285,9 +8315,14 @@ 0.1.0 QuestionGrid - - % - + % + 0 + 100 + Decimal + fr.insee + j4nwc63q-RDOP-jbgddylk + 0.1.0 + fr.insee @@ -8311,9 +8346,14 @@ 0.1.0 QuestionGrid - - % - + % + 0 + 100 + Decimal + fr.insee + j4nwc63q-RDOP-jbgd3jj6 + 0.1.0 + fr.insee @@ -8337,9 +8377,14 @@ 0.1.0 QuestionGrid - - % - + % + 0 + 100 + Decimal + fr.insee + j4nwc63q-RDOP-jbgd4w3k + 0.1.0 + fr.insee @@ -8363,9 +8408,14 @@ 0.1.0 QuestionGrid - - % - + % + 0 + 100 + Decimal + fr.insee + j4nwc63q-RDOP-jbgd4w4k + 0.1.0 + fr.insee diff --git a/src/test/resources/ddi-to-pdf/in.xml b/src/test/resources/ddi-to-pdf/in.xml index 26479c864..43c0c1a62 100644 --- a/src/test/resources/ddi-to-pdf/in.xml +++ b/src/test/resources/ddi-to-pdf/in.xml @@ -1175,7 +1175,7 @@ - + fr.insee j6p6my1d 0.1.0 @@ -1189,7 +1189,7 @@ - + fr.insee @@ -8129,9 +8129,14 @@ 0.1.0 QuestionGrid - - % - + % + 0 + 100 + Decimal + fr.insee + j4nwc63q-RDOP-jbgde5yl + 0.1.0 + fr.insee @@ -8155,9 +8160,14 @@ 0.1.0 QuestionGrid - - % - + % + 0 + 100 + Decimal + fr.insee + j4nwc63q-RDOP-jbgd2x2t + 0.1.0 + fr.insee @@ -8181,9 +8191,14 @@ 0.1.0 QuestionGrid - - % - + % + 0 + 100 + Decimal + fr.insee + j4nwc63q-RDOP-jbgdjypz + 0.1.0 + fr.insee @@ -8207,9 +8222,14 @@ 0.1.0 QuestionGrid - - % - + % + 0 + 100 + Decimal + fr.insee + j4nwc63q-RDOP-jbgdcftu + 0.1.0 + fr.insee @@ -8233,9 +8253,14 @@ 0.1.0 QuestionGrid - - % - + % + 0 + 100 + Decimal + fr.insee + j4nwc63q-RDOP-jbgdiyfe + 0.1.0 + fr.insee @@ -8259,9 +8284,14 @@ 0.1.0 QuestionGrid - - % - + % + 0 + 100 + Decimal + fr.insee + j4nwc63q-RDOP-jbgdj1wd + 0.1.0 + fr.insee @@ -8285,9 +8315,14 @@ 0.1.0 QuestionGrid - - % - + % + 0 + 100 + Decimal + fr.insee + j4nwc63q-RDOP-jbgddylk + 0.1.0 + fr.insee @@ -8311,9 +8346,14 @@ 0.1.0 QuestionGrid - - % - + % + 0 + 100 + Decimal + fr.insee + j4nwc63q-RDOP-jbgd3jj6 + 0.1.0 + fr.insee @@ -8337,9 +8377,14 @@ 0.1.0 QuestionGrid - - % - + % + 0 + 100 + Decimal + fr.insee + j4nwc63q-RDOP-jbgd4w3k + 0.1.0 + fr.insee @@ -8363,9 +8408,14 @@ 0.1.0 QuestionGrid - - % - + % + 0 + 100 + Decimal + fr.insee + j4nwc63q-RDOP-jbgd4w4k + 0.1.0 + fr.insee diff --git a/src/test/resources/ddi-to-xform/in.xml b/src/test/resources/ddi-to-xform/in.xml index 26479c864..43c0c1a62 100644 --- a/src/test/resources/ddi-to-xform/in.xml +++ b/src/test/resources/ddi-to-xform/in.xml @@ -1175,7 +1175,7 @@ - + fr.insee j6p6my1d 0.1.0 @@ -1189,7 +1189,7 @@ - + fr.insee @@ -8129,9 +8129,14 @@ 0.1.0 QuestionGrid - - % - + % + 0 + 100 + Decimal + fr.insee + j4nwc63q-RDOP-jbgde5yl + 0.1.0 + fr.insee @@ -8155,9 +8160,14 @@ 0.1.0 QuestionGrid - - % - + % + 0 + 100 + Decimal + fr.insee + j4nwc63q-RDOP-jbgd2x2t + 0.1.0 + fr.insee @@ -8181,9 +8191,14 @@ 0.1.0 QuestionGrid - - % - + % + 0 + 100 + Decimal + fr.insee + j4nwc63q-RDOP-jbgdjypz + 0.1.0 + fr.insee @@ -8207,9 +8222,14 @@ 0.1.0 QuestionGrid - - % - + % + 0 + 100 + Decimal + fr.insee + j4nwc63q-RDOP-jbgdcftu + 0.1.0 + fr.insee @@ -8233,9 +8253,14 @@ 0.1.0 QuestionGrid - - % - + % + 0 + 100 + Decimal + fr.insee + j4nwc63q-RDOP-jbgdiyfe + 0.1.0 + fr.insee @@ -8259,9 +8284,14 @@ 0.1.0 QuestionGrid - - % - + % + 0 + 100 + Decimal + fr.insee + j4nwc63q-RDOP-jbgdj1wd + 0.1.0 + fr.insee @@ -8285,9 +8315,14 @@ 0.1.0 QuestionGrid - - % - + % + 0 + 100 + Decimal + fr.insee + j4nwc63q-RDOP-jbgddylk + 0.1.0 + fr.insee @@ -8311,9 +8346,14 @@ 0.1.0 QuestionGrid - - % - + % + 0 + 100 + Decimal + fr.insee + j4nwc63q-RDOP-jbgd3jj6 + 0.1.0 + fr.insee @@ -8337,9 +8377,14 @@ 0.1.0 QuestionGrid - - % - + % + 0 + 100 + Decimal + fr.insee + j4nwc63q-RDOP-jbgd4w3k + 0.1.0 + fr.insee @@ -8363,9 +8408,14 @@ 0.1.0 QuestionGrid - - % - + % + 0 + 100 + Decimal + fr.insee + j4nwc63q-RDOP-jbgd4w4k + 0.1.0 + fr.insee From 10c14d1fcb3d20bc762cadc4b2be77464f8d6543 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bulot=20Fran=C3=A7ois?= Date: Thu, 11 Jul 2019 17:14:31 +0200 Subject: [PATCH 028/439] update simpsons questionnaire --- questionnaires/simpsons/ddi/simpsons.xml | 114 ++++++++++++++++------- questionnaires/simpsons/parameters.xml | 12 ++- 2 files changed, 93 insertions(+), 33 deletions(-) diff --git a/questionnaires/simpsons/ddi/simpsons.xml b/questionnaires/simpsons/ddi/simpsons.xml index 26479c864..43c0c1a62 100644 --- a/questionnaires/simpsons/ddi/simpsons.xml +++ b/questionnaires/simpsons/ddi/simpsons.xml @@ -1175,7 +1175,7 @@ - + fr.insee j6p6my1d 0.1.0 @@ -1189,7 +1189,7 @@ - + fr.insee @@ -8129,9 +8129,14 @@ 0.1.0 QuestionGrid - - % - + % + 0 + 100 + Decimal + fr.insee + j4nwc63q-RDOP-jbgde5yl + 0.1.0 + fr.insee @@ -8155,9 +8160,14 @@ 0.1.0 QuestionGrid - - % - + % + 0 + 100 + Decimal + fr.insee + j4nwc63q-RDOP-jbgd2x2t + 0.1.0 + fr.insee @@ -8181,9 +8191,14 @@ 0.1.0 QuestionGrid - - % - + % + 0 + 100 + Decimal + fr.insee + j4nwc63q-RDOP-jbgdjypz + 0.1.0 + fr.insee @@ -8207,9 +8222,14 @@ 0.1.0 QuestionGrid - - % - + % + 0 + 100 + Decimal + fr.insee + j4nwc63q-RDOP-jbgdcftu + 0.1.0 + fr.insee @@ -8233,9 +8253,14 @@ 0.1.0 QuestionGrid - - % - + % + 0 + 100 + Decimal + fr.insee + j4nwc63q-RDOP-jbgdiyfe + 0.1.0 + fr.insee @@ -8259,9 +8284,14 @@ 0.1.0 QuestionGrid - - % - + % + 0 + 100 + Decimal + fr.insee + j4nwc63q-RDOP-jbgdj1wd + 0.1.0 + fr.insee @@ -8285,9 +8315,14 @@ 0.1.0 QuestionGrid - - % - + % + 0 + 100 + Decimal + fr.insee + j4nwc63q-RDOP-jbgddylk + 0.1.0 + fr.insee @@ -8311,9 +8346,14 @@ 0.1.0 QuestionGrid - - % - + % + 0 + 100 + Decimal + fr.insee + j4nwc63q-RDOP-jbgd3jj6 + 0.1.0 + fr.insee @@ -8337,9 +8377,14 @@ 0.1.0 QuestionGrid - - % - + % + 0 + 100 + Decimal + fr.insee + j4nwc63q-RDOP-jbgd4w3k + 0.1.0 + fr.insee @@ -8363,9 +8408,14 @@ 0.1.0 QuestionGrid - - % - + % + 0 + 100 + Decimal + fr.insee + j4nwc63q-RDOP-jbgd4w4k + 0.1.0 + fr.insee diff --git a/questionnaires/simpsons/parameters.xml b/questionnaires/simpsons/parameters.xml index f5ce07621..981d90d22 100644 --- a/questionnaires/simpsons/parameters.xml +++ b/questionnaires/simpsons/parameters.xml @@ -10,13 +10,23 @@ 0 + + default + + + true + true + + + + optical + - household <Browsing>module</Browsing> <Sequence> From 33d404e5e14c5a700803b84052202e3e59080824 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bulot=20Fran=C3=A7ois?= <U7ZR1J@ad.insee.intra> Date: Thu, 11 Jul 2019 17:44:22 +0200 Subject: [PATCH 029/439] include xhtml in js and odt useful namespaces --- .../resources/xslt/transformations/ddi2js/ddi2js-fixed.xsl | 4 +++- .../resources/xslt/transformations/ddi2odt/ddi2odt-fixed.xsl | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/resources/xslt/transformations/ddi2js/ddi2js-fixed.xsl b/src/main/resources/xslt/transformations/ddi2js/ddi2js-fixed.xsl index cb664da57..d4e2e06db 100644 --- a/src/main/resources/xslt/transformations/ddi2js/ddi2js-fixed.xsl +++ b/src/main/resources/xslt/transformations/ddi2js/ddi2js-fixed.xsl @@ -6,7 +6,9 @@ xmlns:enojs="http://xml.insee.fr/apps/eno/out/js" xmlns:enoddi2fr="http://xml.insee.fr/apps/eno/ddi2form-runner" xmlns:d="ddi:datacollection:3_3" - xmlns:r="ddi:reusable:3_3" xmlns:l="ddi:logicalproduct:3_3" version="2.0"> + xmlns:r="ddi:reusable:3_3" xmlns:l="ddi:logicalproduct:3_3" + xmlns:xhtml="http://www.w3.org/1999/xhtml" + version="2.0"> <!-- Importing the different resources --> <xsl:import href="../../inputs/ddi/source.xsl"/> diff --git a/src/main/resources/xslt/transformations/ddi2odt/ddi2odt-fixed.xsl b/src/main/resources/xslt/transformations/ddi2odt/ddi2odt-fixed.xsl index a53cbc092..1c44fa232 100644 --- a/src/main/resources/xslt/transformations/ddi2odt/ddi2odt-fixed.xsl +++ b/src/main/resources/xslt/transformations/ddi2odt/ddi2odt-fixed.xsl @@ -5,7 +5,9 @@ xmlns:enoodt="http://xml.insee.fr/apps/eno/out/odt" xmlns:enoddi2fr="http://xml.insee.fr/apps/eno/ddi2form-runner" xmlns:d="ddi:datacollection:3_3" - xmlns:r="ddi:reusable:3_3" xmlns:l="ddi:logicalproduct:3_3" version="2.0"> + xmlns:r="ddi:reusable:3_3" xmlns:l="ddi:logicalproduct:3_3" + xmlns:xhtml="http://www.w3.org/1999/xhtml" + version="2.0"> <!-- Importing the different resources --> <xsl:import href="../../inputs/ddi/source.xsl"/> From c14c598cd490569e34abff1a84a476f948eb889e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bulot=20Fran=C3=A7ois?= <U7ZR1J@ad.insee.intra> Date: Tue, 16 Jul 2019 16:06:34 +0200 Subject: [PATCH 030/439] manage filter's description and GoTo --- .../resources/xslt/inputs/ddi/functions.fods | 22 ++++++-- .../resources/xslt/inputs/ddi/templates.fods | 52 +++++++++++-------- src/main/resources/xslt/outputs/fr/models.xsl | 7 +++ .../resources/xslt/outputs/pdf/models.xsl | 39 +++++++------- .../xslt/transformations/ddi2fr/drivers.fods | 25 +++------ .../xslt/transformations/ddi2js/drivers.fods | 14 ++--- .../xslt/transformations/ddi2odt/drivers.fods | 16 +++--- .../xslt/transformations/ddi2pdf/drivers.fods | 16 +++--- .../transformations/ddi2pdf/functions.fods | 34 ++++++++---- 9 files changed, 126 insertions(+), 99 deletions(-) diff --git a/src/main/resources/xslt/inputs/ddi/functions.fods b/src/main/resources/xslt/inputs/ddi/functions.fods index dec08d0b8..e2ed15855 100644 --- a/src/main/resources/xslt/inputs/ddi/functions.fods +++ b/src/main/resources/xslt/inputs/ddi/functions.fods @@ -1,20 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> <office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.spreadsheet"> - <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>PT18H43M17S</meta:editing-duration><meta:editing-cycles>144</meta:editing-cycles><meta:generator>LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab8</meta:generator><dc:date>2019-07-05T11:05:44.636000000</dc:date><dc:creator>François Bulot</dc:creator><meta:document-statistic meta:table-count="1" meta:cell-count="186" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> + <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>PT18H44M21S</meta:editing-duration><meta:editing-cycles>145</meta:editing-cycles><meta:generator>LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab8</meta:generator><dc:date>2019-07-16T15:56:47.123000000</dc:date><dc:creator>François Bulot</dc:creator><meta:document-statistic meta:table-count="1" meta:cell-count="189" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> <office:settings> <config:config-item-set config:name="ooo:view-settings"> <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item> <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item> <config:config-item config:name="VisibleAreaWidth" config:type="int">44116</config:config-item> - <config:config-item config:name="VisibleAreaHeight" config:type="int">30324</config:config-item> + <config:config-item config:name="VisibleAreaHeight" config:type="int">30776</config:config-item> <config:config-item-map-indexed config:name="Views"> <config:config-item-map-entry> <config:config-item config:name="ViewId" config:type="string">view1</config:config-item> <config:config-item-map-named config:name="Tables"> <config:config-item-map-entry config:name="Sheet1"> <config:config-item config:name="CursorPositionX" config:type="int">0</config:config-item> - <config:config-item config:name="CursorPositionY" config:type="int">66</config:config-item> + <config:config-item config:name="CursorPositionY" config:type="int">67</config:config-item> <config:config-item config:name="HorizontalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="VerticalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="HorizontalSplitPosition" config:type="int">0</config:config-item> @@ -600,7 +600,7 @@ <text:p><text:sheet-name>???</text:sheet-name><text:s/>(<text:title>???</text:title>)</text:p> </style:region-left> <style:region-right> - <text:p><text:date style:data-style-name="N2" text:date-value="2019-07-05">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="11:02:24.364000000">00:00:00</text:time></text:p> + <text:p><text:date style:data-style-name="N2" text:date-value="2019-07-16">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="15:55:42.963000000">00:00:00</text:time></text:p> </style:region-right> </style:header> <style:header-left style:display="false"/> @@ -1441,7 +1441,19 @@ <text:p>Function that return the variables from the value of a fixed cell</text:p> </table:table-cell> </table:table-row> - <table:table-row table:style-name="ro1" table:number-rows-repeated="1048509"> + <table:table-row table:style-name="ro1"> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p>enoddi:get-flowcontrol-label</text:p> + </table:table-cell> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p>language</text:p> + </table:table-cell> + <table:table-cell/> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p>Function that returns the label of the flowcontrol of a filter</text:p> + </table:table-cell> + </table:table-row> + <table:table-row table:style-name="ro1" table:number-rows-repeated="1048508"> <table:table-cell table:number-columns-repeated="4"/> </table:table-row> <table:table-row table:style-name="ro1"> diff --git a/src/main/resources/xslt/inputs/ddi/templates.fods b/src/main/resources/xslt/inputs/ddi/templates.fods index 0efea63d3..030c771e8 100644 --- a/src/main/resources/xslt/inputs/ddi/templates.fods +++ b/src/main/resources/xslt/inputs/ddi/templates.fods @@ -1,20 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> <office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.spreadsheet"> - <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>P3DT4H7M7S</meta:editing-duration><meta:editing-cycles>410</meta:editing-cycles><meta:generator>LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab8</meta:generator><dc:date>2019-07-11T15:32:42.220000000</dc:date><dc:creator>François Bulot</dc:creator><meta:document-statistic meta:table-count="1" meta:cell-count="484" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> + <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>P3DT4H19M45S</meta:editing-duration><meta:editing-cycles>413</meta:editing-cycles><meta:generator>LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab8</meta:generator><dc:date>2019-07-16T15:56:58.475000000</dc:date><dc:creator>François Bulot</dc:creator><meta:document-statistic meta:table-count="1" meta:cell-count="484" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> <office:settings> <config:config-item-set config:name="ooo:view-settings"> <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item> <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item> <config:config-item config:name="VisibleAreaWidth" config:type="int">63256</config:config-item> - <config:config-item config:name="VisibleAreaHeight" config:type="int">83904</config:config-item> + <config:config-item config:name="VisibleAreaHeight" config:type="int">84483</config:config-item> <config:config-item-map-indexed config:name="Views"> <config:config-item-map-entry> <config:config-item config:name="ViewId" config:type="string">view1</config:config-item> <config:config-item-map-named config:name="Tables"> <config:config-item-map-entry config:name="Sheet1"> - <config:config-item config:name="CursorPositionX" config:type="int">0</config:config-item> - <config:config-item config:name="CursorPositionY" config:type="int">128</config:config-item> + <config:config-item config:name="CursorPositionX" config:type="int">1</config:config-item> + <config:config-item config:name="CursorPositionY" config:type="int">38</config:config-item> <config:config-item config:name="HorizontalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="VerticalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="HorizontalSplitPosition" config:type="int">0</config:config-item> @@ -23,7 +23,7 @@ <config:config-item config:name="PositionLeft" config:type="int">0</config:config-item> <config:config-item config:name="PositionRight" config:type="int">0</config:config-item> <config:config-item config:name="PositionTop" config:type="int">0</config:config-item> - <config:config-item config:name="PositionBottom" config:type="int">112</config:config-item> + <config:config-item config:name="PositionBottom" config:type="int">14</config:config-item> <config:config-item config:name="ZoomType" config:type="short">0</config:config-item> <config:config-item config:name="ZoomValue" config:type="int">100</config:config-item> <config:config-item config:name="PageViewZoomValue" config:type="int">60</config:config-item> @@ -632,7 +632,7 @@ <text:p><text:sheet-name>???</text:sheet-name><text:s/>(<text:title>???</text:title>)</text:p> </style:region-left> <style:region-right> - <text:p><text:date style:data-style-name="N2" text:date-value="2019-07-11">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="15:29:46.945000000">00:00:00</text:time></text:p> + <text:p><text:date style:data-style-name="N2" text:date-value="2019-07-16">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="15:50:34.202000000">00:00:00</text:time></text:p> </style:region-right> </style:header> <style:header-left style:display="false"/> @@ -1361,23 +1361,6 @@ <text:p>The label of grid cells without Response</text:p> </table:table-cell> </table:table-row> - <table:table-row table:style-name="ro2"> - <table:table-cell table:style-name="ce7" office:value-type="string" calcext:value-type="string"> - <text:p>r:Description[parent::d:IfThenElse]</text:p> - </table:table-cell> - <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>enoddi:get-label</text:p> - </table:table-cell> - <table:table-cell table:style-name="ce7" office:value-type="string" calcext:value-type="string"> - <text:p>r:Content</text:p> - </table:table-cell> - <table:table-cell table:style-name="ce7" office:value-type="string" calcext:value-type="string"> - <text:p>lang-choice</text:p> - </table:table-cell> - <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>The label of ITE's Description, corresponding to an alternative text for non dynamic output format.</text:p> - </table:table-cell> - </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell table:style-name="Default" office:value-type="string" calcext:value-type="string"> <text:p>d:ExternalAid[r:OtherMaterial/r:Description/r:Content/xhtml:div/@class='FlowControl']</text:p> @@ -1449,6 +1432,29 @@ <text:p>The value of a fixed cell</text:p> </table:table-cell> </table:table-row> + <table:table-row table:style-name="ro2"> + <table:table-cell table:style-name="Default"/> + <table:table-cell/> + <table:table-cell table:style-name="ce7" table:number-columns-repeated="2"/> + <table:table-cell/> + </table:table-row> + <table:table-row table:style-name="ro2"> + <table:table-cell table:style-name="Default" office:value-type="string" calcext:value-type="string"> + <text:p>d:ThenConstructReference</text:p> + </table:table-cell> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p>enoddi:get-flowcontrol-label</text:p> + </table:table-cell> + <table:table-cell table:style-name="ce7" office:value-type="string" calcext:value-type="string"> + <text:p>parent::d:IfThenElse/r:Description/r:Content</text:p> + </table:table-cell> + <table:table-cell table:style-name="ce7" office:value-type="string" calcext:value-type="string"> + <text:p>lang-choice</text:p> + </table:table-cell> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p>The label of the Goto of a filter</text:p> + </table:table-cell> + </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell table:number-columns-repeated="2"/> <table:table-cell table:style-name="ce7" table:number-columns-repeated="2"/> diff --git a/src/main/resources/xslt/outputs/fr/models.xsl b/src/main/resources/xslt/outputs/fr/models.xsl index db886b6e3..a025f2abc 100644 --- a/src/main/resources/xslt/outputs/fr/models.xsl +++ b/src/main/resources/xslt/outputs/fr/models.xsl @@ -156,6 +156,13 @@ </xhtml:html> </xsl:template> + <xd:doc> + <xd:desc> + <xd:p>GoTo are to be removed.</xd:p> + </xd:desc> + </xd:doc> + <xsl:template match="GoTo" mode="model"/> + <xd:doc> <xd:desc> <xd:p>Default template for Instance for the drivers.</xd:p> diff --git a/src/main/resources/xslt/outputs/pdf/models.xsl b/src/main/resources/xslt/outputs/pdf/models.xsl index 52738bace..6d8915d9d 100644 --- a/src/main/resources/xslt/outputs/pdf/models.xsl +++ b/src/main/resources/xslt/outputs/pdf/models.xsl @@ -204,6 +204,23 @@ <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="languages" tunnel="yes"/> + <xsl:variable name="label" select="enopdf:get-flowcontrol-label($source-context,$languages[1])"/> + <xsl:if test="$label != ''"> + <fo:block page-break-inside="avoid" keep-with-previous="always" xsl:use-attribute-sets="filter-block"> + <fo:inline-container start-indent="0%" end-indent="0%" width="9%" vertical-align="middle"> + <fo:block margin="2pt"> + <xsl:call-template name="insert-image"> + <xsl:with-param name="image-name" select="'filter_arrow.png'"/> + </xsl:call-template> + </fo:block> + </fo:inline-container> + <fo:inline-container xsl:use-attribute-sets="filter-inline-container"> + <fo:block xsl:use-attribute-sets="filter-alternative"> + <xsl:copy-of select="$label"/> + </fo:block> + </fo:inline-container> + </fo:block> + </xsl:if> <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> <xsl:with-param name="driver" select="." tunnel="yes"/> </xsl:apply-templates> @@ -247,24 +264,6 @@ <xsl:copy-of select="$label"/> </fo:block> </xsl:when> - <xsl:when test="$format = ('filter-alternative-text','flowcontrol-text')"> - <xsl:if test="$label != ''"> - <fo:block page-break-inside="avoid" keep-with-previous="always" xsl:use-attribute-sets="filter-block"> - <fo:inline-container start-indent="0%" end-indent="0%" width="9%" vertical-align="middle"> - <fo:block margin="2pt"> - <xsl:call-template name="insert-image"> - <xsl:with-param name="image-name" select="'filter_arrow.png'"/> - </xsl:call-template> - </fo:block> - </fo:inline-container> - <fo:inline-container xsl:use-attribute-sets="filter-inline-container"> - <fo:block xsl:use-attribute-sets="filter-alternative"> - <xsl:copy-of select="$label"/> - </fo:block> - </fo:inline-container> - </fo:block> - </xsl:if> - </xsl:when> <xsl:otherwise> <xsl:message select="concat('unknown xf-output : ',enopdf:get-name($source-context),$label)"/> <fo:block xsl:use-attribute-sets="general-style" page-break-inside="avoid" keep-with-next="always"> @@ -281,9 +280,9 @@ </xsl:template> <xd:doc> - <xd:desc>template for the FlowControl</xd:desc> + <xd:desc>template for the GoTo</xd:desc> </xd:doc> - <xsl:template match="main//FlowControl" mode="model"> + <xsl:template match="main//GoTo" mode="model"> <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="languages" tunnel="yes"/> diff --git a/src/main/resources/xslt/transformations/ddi2fr/drivers.fods b/src/main/resources/xslt/transformations/ddi2fr/drivers.fods index dca75478c..843ef858c 100644 --- a/src/main/resources/xslt/transformations/ddi2fr/drivers.fods +++ b/src/main/resources/xslt/transformations/ddi2fr/drivers.fods @@ -1,26 +1,26 @@ <?xml version="1.0" encoding="UTF-8"?> <office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.spreadsheet"> - <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>P1DT3H25M43S</meta:editing-duration><meta:editing-cycles>172</meta:editing-cycles><meta:generator>LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab8</meta:generator><dc:date>2019-07-11T16:49:58.232000000</dc:date><dc:creator>François Bulot</dc:creator><meta:document-statistic meta:table-count="1" meta:cell-count="135" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> + <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>P1DT3H36M22S</meta:editing-duration><meta:editing-cycles>175</meta:editing-cycles><meta:generator>LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab8</meta:generator><dc:date>2019-07-16T16:00:32.283000000</dc:date><dc:creator>François Bulot</dc:creator><meta:document-statistic meta:table-count="1" meta:cell-count="132" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> <office:settings> <config:config-item-set config:name="ooo:view-settings"> <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item> <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item> <config:config-item config:name="VisibleAreaWidth" config:type="int">50597</config:config-item> - <config:config-item config:name="VisibleAreaHeight" config:type="int">31222</config:config-item> + <config:config-item config:name="VisibleAreaHeight" config:type="int">30771</config:config-item> <config:config-item-map-indexed config:name="Views"> <config:config-item-map-entry> <config:config-item config:name="ViewId" config:type="string">view1</config:config-item> <config:config-item-map-named config:name="Tables"> <config:config-item-map-entry config:name="Sheet1"> - <config:config-item config:name="CursorPositionX" config:type="int">0</config:config-item> + <config:config-item config:name="CursorPositionX" config:type="int">2</config:config-item> <config:config-item config:name="CursorPositionY" config:type="int">18</config:config-item> <config:config-item config:name="HorizontalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="VerticalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="HorizontalSplitPosition" config:type="int">0</config:config-item> <config:config-item config:name="VerticalSplitPosition" config:type="int">0</config:config-item> <config:config-item config:name="ActiveSplitRange" config:type="short">2</config:config-item> - <config:config-item config:name="PositionLeft" config:type="int">0</config:config-item> + <config:config-item config:name="PositionLeft" config:type="int">1</config:config-item> <config:config-item config:name="PositionRight" config:type="int">0</config:config-item> <config:config-item config:name="PositionTop" config:type="int">0</config:config-item> <config:config-item config:name="PositionBottom" config:type="int">0</config:config-item> @@ -591,7 +591,7 @@ <text:p><text:sheet-name>???</text:sheet-name><text:s/>(<text:title>???</text:title>)</text:p> </style:region-left> <style:region-right> - <text:p><text:date style:data-style-name="N2" text:date-value="2019-07-11">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="16:46:49.663000000">00:00:00</text:time></text:p> + <text:p><text:date style:data-style-name="N2" text:date-value="2019-07-16">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="15:49:51.749000000">00:00:00</text:time></text:p> </style:region-right> </style:header> <style:header-left style:display="false"/> @@ -743,17 +743,6 @@ <text:p>Most Instruction elements activates the xf-output driver.</text:p> </table:table-cell> </table:table-row> - <table:table-row table:style-name="ro1"> - <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>r:Description[parent::d:IfThenElse]</text:p> - </table:table-cell> - <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>xf-output</text:p> - </table:table-cell> - <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>The Description of a IfThenElse is an alternative text for non dynamic output format, so it activates the xf-output drivers as other Instruction-like.</text:p> - </table:table-cell> - </table:table-row> <table:table-row table:style-name="ro1"> <table:table-cell table:number-columns-repeated="3"/> </table:table-row> @@ -762,10 +751,10 @@ <text:p>d:ExternalAid[r:OtherMaterial/r:Description/r:Content/xhtml:div/@class='FlowControl']</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>FlowControl</text:p> + <text:p>GoTo</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>The "FlowControl" ExternalAid of a Question is the Instruction for a FlowControl leaving from the Question, so it activates the xf-output.</text:p> + <text:p>The "FlowControl" ExternalAid of a Question is the Instruction for a GoTo leaving from the Question, so it activates the GoTo.</text:p> </table:table-cell> </table:table-row> <table:table-row table:style-name="ro1"> diff --git a/src/main/resources/xslt/transformations/ddi2js/drivers.fods b/src/main/resources/xslt/transformations/ddi2js/drivers.fods index 215220f48..d0cab4b8b 100644 --- a/src/main/resources/xslt/transformations/ddi2js/drivers.fods +++ b/src/main/resources/xslt/transformations/ddi2js/drivers.fods @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.spreadsheet"> - <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>P5DT1H55M49S</meta:editing-duration><meta:editing-cycles>223</meta:editing-cycles><meta:generator>LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab8</meta:generator><dc:date>2019-07-11T16:54:18.721000000</dc:date><dc:creator>François Bulot</dc:creator><meta:document-statistic meta:table-count="1" meta:cell-count="135" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> + <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>P5DT1H56M6S</meta:editing-duration><meta:editing-cycles>224</meta:editing-cycles><meta:generator>LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab8</meta:generator><dc:date>2019-07-16T16:01:00.691000000</dc:date><dc:creator>François Bulot</dc:creator><meta:document-statistic meta:table-count="1" meta:cell-count="135" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> <office:settings> <config:config-item-set config:name="ooo:view-settings"> <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item> @@ -13,14 +13,14 @@ <config:config-item config:name="ViewId" config:type="string">view1</config:config-item> <config:config-item-map-named config:name="Tables"> <config:config-item-map-entry config:name="Sheet1"> - <config:config-item config:name="CursorPositionX" config:type="int">0</config:config-item> - <config:config-item config:name="CursorPositionY" config:type="int">16</config:config-item> + <config:config-item config:name="CursorPositionX" config:type="int">1</config:config-item> + <config:config-item config:name="CursorPositionY" config:type="int">19</config:config-item> <config:config-item config:name="HorizontalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="VerticalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="HorizontalSplitPosition" config:type="int">0</config:config-item> <config:config-item config:name="VerticalSplitPosition" config:type="int">0</config:config-item> <config:config-item config:name="ActiveSplitRange" config:type="short">2</config:config-item> - <config:config-item config:name="PositionLeft" config:type="int">0</config:config-item> + <config:config-item config:name="PositionLeft" config:type="int">1</config:config-item> <config:config-item config:name="PositionRight" config:type="int">0</config:config-item> <config:config-item config:name="PositionTop" config:type="int">0</config:config-item> <config:config-item config:name="PositionBottom" config:type="int">0</config:config-item> @@ -588,7 +588,7 @@ <text:p><text:sheet-name>???</text:sheet-name><text:s/>(<text:title>???</text:title>)</text:p> </style:region-left> <style:region-right> - <text:p><text:date style:data-style-name="N2" text:date-value="2019-07-11">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="16:53:07.362000000">00:00:00</text:time></text:p> + <text:p><text:date style:data-style-name="N2" text:date-value="2019-07-16">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="16:00:43.617000000">00:00:00</text:time></text:p> </style:region-right> </style:header> <style:header-left style:display="false"/> @@ -759,10 +759,10 @@ <text:p>d:ExternalAid[r:OtherMaterial/r:Description/r:Content/xhtml:div/@class='FlowControl']</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>FlowControl</text:p> + <text:p>GoTo</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>The "FlowControl" ExternalAid of a Question is the Instruction for a FlowControl leaving from the Question, so it activates the xf-output.</text:p> + <text:p>The "FlowControl" ExternalAid of a Question is the Instruction for a GoTo leaving from the Question, so it activates the GoTo.</text:p> </table:table-cell> </table:table-row> <table:table-row table:style-name="ro1"> diff --git a/src/main/resources/xslt/transformations/ddi2odt/drivers.fods b/src/main/resources/xslt/transformations/ddi2odt/drivers.fods index 9e3dfb669..21c506cba 100644 --- a/src/main/resources/xslt/transformations/ddi2odt/drivers.fods +++ b/src/main/resources/xslt/transformations/ddi2odt/drivers.fods @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.spreadsheet"> - <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>P3DT6H19M15S</meta:editing-duration><meta:editing-cycles>216</meta:editing-cycles><meta:generator>LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab8</meta:generator><dc:date>2019-07-11T16:58:53.896000000</dc:date><dc:creator>François Bulot</dc:creator><meta:document-statistic meta:table-count="1" meta:cell-count="135" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> + <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>P3DT6H19M31S</meta:editing-duration><meta:editing-cycles>217</meta:editing-cycles><meta:generator>LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab8</meta:generator><dc:date>2019-07-16T16:01:24.131000000</dc:date><dc:creator>François Bulot</dc:creator><meta:document-statistic meta:table-count="1" meta:cell-count="135" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> <office:settings> <config:config-item-set config:name="ooo:view-settings"> <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item> @@ -13,17 +13,17 @@ <config:config-item config:name="ViewId" config:type="string">view1</config:config-item> <config:config-item-map-named config:name="Tables"> <config:config-item-map-entry config:name="Sheet1"> - <config:config-item config:name="CursorPositionX" config:type="int">0</config:config-item> - <config:config-item config:name="CursorPositionY" config:type="int">67</config:config-item> + <config:config-item config:name="CursorPositionX" config:type="int">1</config:config-item> + <config:config-item config:name="CursorPositionY" config:type="int">19</config:config-item> <config:config-item config:name="HorizontalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="VerticalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="HorizontalSplitPosition" config:type="int">0</config:config-item> <config:config-item config:name="VerticalSplitPosition" config:type="int">0</config:config-item> <config:config-item config:name="ActiveSplitRange" config:type="short">2</config:config-item> - <config:config-item config:name="PositionLeft" config:type="int">0</config:config-item> + <config:config-item config:name="PositionLeft" config:type="int">1</config:config-item> <config:config-item config:name="PositionRight" config:type="int">0</config:config-item> <config:config-item config:name="PositionTop" config:type="int">0</config:config-item> - <config:config-item config:name="PositionBottom" config:type="int">41</config:config-item> + <config:config-item config:name="PositionBottom" config:type="int">8</config:config-item> <config:config-item config:name="ZoomType" config:type="short">0</config:config-item> <config:config-item config:name="ZoomValue" config:type="int">100</config:config-item> <config:config-item config:name="PageViewZoomValue" config:type="int">60</config:config-item> @@ -588,7 +588,7 @@ <text:p><text:sheet-name>???</text:sheet-name><text:s/>(<text:title>???</text:title>)</text:p> </style:region-left> <style:region-right> - <text:p><text:date style:data-style-name="N2" text:date-value="2019-07-11">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="16:56:05.329000000">00:00:00</text:time></text:p> + <text:p><text:date style:data-style-name="N2" text:date-value="2019-07-16">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="16:01:08.047000000">00:00:00</text:time></text:p> </style:region-right> </style:header> <style:header-left style:display="false"/> @@ -759,10 +759,10 @@ <text:p>d:ExternalAid[r:OtherMaterial/r:Description/r:Content/xhtml:div/@class='FlowControl']</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>FlowControl</text:p> + <text:p>GoTo</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>The "FlowControl" ExternalAid of a Question is the Instruction for a FlowControl leaving from the Question, so it activates the xf-output.</text:p> + <text:p>The "FlowControl" ExternalAid of a Question is the Instruction for a GoTo leaving from the Question, so it activates the GoTo.</text:p> </table:table-cell> </table:table-row> <table:table-row table:style-name="ro1"> diff --git a/src/main/resources/xslt/transformations/ddi2pdf/drivers.fods b/src/main/resources/xslt/transformations/ddi2pdf/drivers.fods index 376fdfb56..e53051da0 100644 --- a/src/main/resources/xslt/transformations/ddi2pdf/drivers.fods +++ b/src/main/resources/xslt/transformations/ddi2pdf/drivers.fods @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.spreadsheet"> - <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>P2DT2H22M21S</meta:editing-duration><meta:editing-cycles>174</meta:editing-cycles><meta:generator>LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab8</meta:generator><dc:date>2019-07-11T16:49:21.465000000</dc:date><dc:creator>François Bulot</dc:creator><meta:document-statistic meta:table-count="1" meta:cell-count="135" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> + <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>P2DT2H23M3S</meta:editing-duration><meta:editing-cycles>176</meta:editing-cycles><meta:generator>LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab8</meta:generator><dc:date>2019-07-16T16:00:19.418000000</dc:date><dc:creator>François Bulot</dc:creator><meta:document-statistic meta:table-count="1" meta:cell-count="135" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> <office:settings> <config:config-item-set config:name="ooo:view-settings"> <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item> @@ -13,17 +13,17 @@ <config:config-item config:name="ViewId" config:type="string">view1</config:config-item> <config:config-item-map-named config:name="Tables"> <config:config-item-map-entry config:name="Sheet1"> - <config:config-item config:name="CursorPositionX" config:type="int">0</config:config-item> - <config:config-item config:name="CursorPositionY" config:type="int">59</config:config-item> + <config:config-item config:name="CursorPositionX" config:type="int">2</config:config-item> + <config:config-item config:name="CursorPositionY" config:type="int">19</config:config-item> <config:config-item config:name="HorizontalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="VerticalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="HorizontalSplitPosition" config:type="int">0</config:config-item> <config:config-item config:name="VerticalSplitPosition" config:type="int">0</config:config-item> <config:config-item config:name="ActiveSplitRange" config:type="short">2</config:config-item> - <config:config-item config:name="PositionLeft" config:type="int">0</config:config-item> + <config:config-item config:name="PositionLeft" config:type="int">1</config:config-item> <config:config-item config:name="PositionRight" config:type="int">0</config:config-item> <config:config-item config:name="PositionTop" config:type="int">0</config:config-item> - <config:config-item config:name="PositionBottom" config:type="int">34</config:config-item> + <config:config-item config:name="PositionBottom" config:type="int">0</config:config-item> <config:config-item config:name="ZoomType" config:type="short">0</config:config-item> <config:config-item config:name="ZoomValue" config:type="int">100</config:config-item> <config:config-item config:name="PageViewZoomValue" config:type="int">60</config:config-item> @@ -599,7 +599,7 @@ <text:p><text:sheet-name>???</text:sheet-name><text:s/>(<text:title>???</text:title>)</text:p> </style:region-left> <style:region-right> - <text:p><text:date style:data-style-name="N2" text:date-value="2019-07-11">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="16:13:10.385000000">00:00:00</text:time></text:p> + <text:p><text:date style:data-style-name="N2" text:date-value="2019-07-16">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="15:59:36.201000000">00:00:00</text:time></text:p> </style:region-right> </style:header> <style:header-left style:display="false"/> @@ -770,10 +770,10 @@ <text:p>d:ExternalAid[r:OtherMaterial/r:Description/r:Content/xhtml:div/@class='FlowControl']</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>FlowControl</text:p> + <text:p>GoTo</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>The "FlowControl" ExternalAid of a Question is the Instruction for a FlowControl leaving from the Question, so it activates the xf-output.</text:p> + <text:p>The "FlowControl" ExternalAid of a Question is the Instruction for a GoTo leaving from the Question, so it activates the GoTo.</text:p> </table:table-cell> </table:table-row> <table:table-row table:style-name="ro1"> diff --git a/src/main/resources/xslt/transformations/ddi2pdf/functions.fods b/src/main/resources/xslt/transformations/ddi2pdf/functions.fods index 2faaea35f..784808aa3 100644 --- a/src/main/resources/xslt/transformations/ddi2pdf/functions.fods +++ b/src/main/resources/xslt/transformations/ddi2pdf/functions.fods @@ -1,26 +1,26 @@ <?xml version="1.0" encoding="UTF-8"?> <office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.spreadsheet"> - <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>PT19H7M27S</meta:editing-duration><meta:editing-cycles>106</meta:editing-cycles><meta:generator>LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab8</meta:generator><dc:date>2018-08-20T15:14:44.931000000</dc:date><dc:creator>François Bulot</dc:creator><meta:document-statistic meta:table-count="1" meta:cell-count="121" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> + <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>PT19H8M11S</meta:editing-duration><meta:editing-cycles>107</meta:editing-cycles><meta:generator>LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab8</meta:generator><dc:date>2019-07-16T15:58:07.541000000</dc:date><dc:creator>François Bulot</dc:creator><meta:document-statistic meta:table-count="1" meta:cell-count="125" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> <office:settings> <config:config-item-set config:name="ooo:view-settings"> <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item> <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item> <config:config-item config:name="VisibleAreaWidth" config:type="int">36807</config:config-item> - <config:config-item config:name="VisibleAreaHeight" config:type="int">21223</config:config-item> + <config:config-item config:name="VisibleAreaHeight" config:type="int">21674</config:config-item> <config:config-item-map-indexed config:name="Views"> <config:config-item-map-entry> <config:config-item config:name="ViewId" config:type="string">view1</config:config-item> <config:config-item-map-named config:name="Tables"> <config:config-item-map-entry config:name="Sheet1"> - <config:config-item config:name="CursorPositionX" config:type="int">3</config:config-item> - <config:config-item config:name="CursorPositionY" config:type="int">38</config:config-item> + <config:config-item config:name="CursorPositionX" config:type="int">0</config:config-item> + <config:config-item config:name="CursorPositionY" config:type="int">39</config:config-item> <config:config-item config:name="HorizontalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="VerticalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="HorizontalSplitPosition" config:type="int">0</config:config-item> <config:config-item config:name="VerticalSplitPosition" config:type="int">0</config:config-item> <config:config-item config:name="ActiveSplitRange" config:type="short">2</config:config-item> - <config:config-item config:name="PositionLeft" config:type="int">1</config:config-item> + <config:config-item config:name="PositionLeft" config:type="int">0</config:config-item> <config:config-item config:name="PositionRight" config:type="int">0</config:config-item> <config:config-item config:name="PositionTop" config:type="int">0</config:config-item> <config:config-item config:name="PositionBottom" config:type="int">18</config:config-item> @@ -32,7 +32,7 @@ </config:config-item-map-entry> </config:config-item-map-named> <config:config-item config:name="ActiveTable" config:type="string">Sheet1</config:config-item> - <config:config-item config:name="HorizontalScrollbarWidth" config:type="int">1216</config:config-item> + <config:config-item config:name="HorizontalScrollbarWidth" config:type="int">1655</config:config-item> <config:config-item config:name="ZoomType" config:type="short">0</config:config-item> <config:config-item config:name="ZoomValue" config:type="int">100</config:config-item> <config:config-item config:name="PageViewZoomValue" config:type="int">60</config:config-item> @@ -77,8 +77,8 @@ <config:config-item config:name="IsRasterAxisSynchronized" config:type="boolean">true</config:config-item> <config:config-item config:name="AutoCalculate" config:type="boolean">true</config:config-item> <config:config-item config:name="ApplyUserData" config:type="boolean">true</config:config-item> - <config:config-item config:name="PrinterName" config:type="string">\\S20slinng\m20-207-ricoh mp2554sp</config:config-item> - <config:config-item config:name="PrinterSetup" config:type="base64Binary">1hP+/1xcUzIwc2xpbm5nXG0yMC0yMDctcmljb2ggbXAyNTU0c3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUklDT0ggUENMNiBVbml2ZXJzYWxEcml2ZXIgVjQuMQAWAAEA8hIAAAAAAAAEAAhSAAAEdAAAM1ROVwAAAAAKAFwAXABTADIAMABzAGwAaQBuAG4AZwBcAG0AMgAwAC0AMgAwADcALQByAGkAYwBvAGgAIABtAHAAMgA1AAAAAAABBAAg3AAMEg//gAMBAAkAmgs0CGQAAQAHAFgCAQACAFgCAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAIAAAAAAgAAAQAAAAAAAAAAAAAAAAAAAAAAAAAxMERSDFhkDpG++hkAAAAAKQQAAHicdVPRcuMwCPwXP/ch6dy01/yMB0vYVouERkJJ05v790OyE6eX9M1mVwss8KfLAsFCshEmzL0LsYgkOHeHDopw/cxIaKR7+o/q0TqQc0SlRgIXFExozobQKplQBNOMYD3bxkkuaMTiCIWqnC2R8HNFeRw1VLIS2KtYAI/9ql4LqYo8uVAZt1h7gaMLLek7D2s8cPJALeeq6+zjNxmOyEdMBGcLAv3oCCPIrERFIUZyBsRx+GL2R6BSJfa7Xe2ATfEYJLuvVucvjZmShX2EiKmG+xKcKOb9A+zkrMzquanJfj+/PqAQhkk5+vzQPb+97n5UWRhLXT+IrIn2+5c3JSW0xSAGgjTV6kcnws2w1s5Td9/vhh7UNo+QOTkdCtD6RH/VjuZWnTgn3R9XB5BYo2r3ZdA6KP3IKNeI2s+l/u7retXKZ8RtTRQgDhPaSbdxFFXmqODA/EE3KjbBaUxa2sA64nSNV81LJHDA7Wl/C3HU8vk2gWHiNJwUGwjMh+74aXaCzb/MVNZWX5o/U4I4O5PXnT7q2XC6+AZEgp8CuQldK8MAg94XE6lB25m0BLqVGb83ojeodmx9lWWmy5/h6DBXD5fK7yTV4e2+7w4yz9q1KdKbkpIaoZwL+PcfWFN6vgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASAENPTVBBVF9EVVBMRVhfTU9ERRQARHVwbGV4TW9kZTo6TG9uZ0VkZ2U=</config:config-item> + <config:config-item config:name="PrinterName" config:type="string">Envoyer à OneNote 16</config:config-item> + <config:config-item config:name="PrinterSetup" config:type="base64Binary">xQT+/0Vudm95ZXIgw6AgT25lTm90ZcKgMTYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAU2VuZCB0byBNaWNyb3NvZnQgT25lTm90ZSAxNiBEcgAWAAEA4gMAAAAAAAAEAAhSAAAEdAAAM1ROVwAAAAAKAEUAbgB2AG8AeQBlAHIAIADgACAATwBuAGUATgBvAHQAZQCgADEANgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBAAG3AD8AgMvAAABAAkAmgs0CGQAAQAPAFgCAgABAFgCAwABAEEANAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAQAAAAIAAAABAAAA/////wAAAAAAAAAAAAAAAAAAAABESU5VIgDAAPwCAACsE9jAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAMAAAABTTVRKAAAAABAAsABTAGUAbgBkACAAdABvACAATQBpAGMAcgBvAHMAbwBmAHQAIABPAG4AZQBOAG8AdABlACAAMQA2ACAARAByAGkAdgBlAHIAAABSRVNETEwAVW5pcmVzRExMAFBhcGVyU2l6ZQBMRVRURVIAT3JpZW50YXRpb24AUE9SVFJBSVQAUmVzb2x1dGlvbgBEUEk2MDAAQ29sb3JNb2RlADI0YnBwAAAAAAAAAAAAAAAAAAAAABIAQ09NUEFUX0RVUExFWF9NT0RFEwBEdXBsZXhNb2RlOjpVbmtub3du</config:config-item> <config:config-item-map-indexed config:name="ForbiddenCharacters"> <config:config-item-map-entry> <config:config-item config:name="Language" config:type="string">zxx</config:config-item> @@ -598,7 +598,7 @@ <text:p><text:sheet-name>???</text:sheet-name><text:s/>(<text:title>???</text:title>)</text:p> </style:region-left> <style:region-right> - <text:p><text:date style:data-style-name="N2" text:date-value="2018-08-20">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="15:13:44.483000000">00:00:00</text:time></text:p> + <text:p><text:date style:data-style-name="N2" text:date-value="2019-07-16">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="15:57:23.009000000">00:00:00</text:time></text:p> </style:region-right> </style:header> <style:header-left style:display="false"/> @@ -1169,7 +1169,21 @@ <text:p>Linking output function enopdf:get-business-name to input function enoddi:get-business-name.</text:p> </table:table-cell> </table:table-row> - <table:table-row table:style-name="ro1" table:number-rows-repeated="1048537"> + <table:table-row table:style-name="ro1"> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p>enopdf:get-flowcontrol-label</text:p> + </table:table-cell> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p>language</text:p> + </table:table-cell> + <table:table-cell table:style-name="ce2" office:value-type="string" calcext:value-type="string"> + <text:p>enoddi:get-flowcontrol-label</text:p> + </table:table-cell> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p>Linking output function enopdf:get-flowcontrol-label to input function enoddi:get-flowcontrol-label.</text:p> + </table:table-cell> + </table:table-row> + <table:table-row table:style-name="ro1" table:number-rows-repeated="1048536"> <table:table-cell table:number-columns-repeated="4"/> </table:table-row> <table:table-row table:style-name="ro1"> From bbae38715601ea3f7c87331931422df51b85b789 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bulot=20Fran=C3=A7ois?= <U7ZR1J@ad.insee.intra> Date: Tue, 16 Jul 2019 16:08:43 +0200 Subject: [PATCH 031/439] description of a filter : no longer a driver --- .../xslt/transformations/ddi2js/drivers.fods | 23 +++++-------------- .../xslt/transformations/ddi2odt/drivers.fods | 23 +++++-------------- .../xslt/transformations/ddi2pdf/drivers.fods | 21 ++++------------- 3 files changed, 17 insertions(+), 50 deletions(-) diff --git a/src/main/resources/xslt/transformations/ddi2js/drivers.fods b/src/main/resources/xslt/transformations/ddi2js/drivers.fods index d0cab4b8b..ee9bd45c7 100644 --- a/src/main/resources/xslt/transformations/ddi2js/drivers.fods +++ b/src/main/resources/xslt/transformations/ddi2js/drivers.fods @@ -1,26 +1,26 @@ <?xml version="1.0" encoding="UTF-8"?> <office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.spreadsheet"> - <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>P5DT1H56M6S</meta:editing-duration><meta:editing-cycles>224</meta:editing-cycles><meta:generator>LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab8</meta:generator><dc:date>2019-07-16T16:01:00.691000000</dc:date><dc:creator>François Bulot</dc:creator><meta:document-statistic meta:table-count="1" meta:cell-count="135" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> + <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>P5DT1H56M16S</meta:editing-duration><meta:editing-cycles>225</meta:editing-cycles><meta:generator>LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab8</meta:generator><dc:date>2019-07-16T16:07:57.628000000</dc:date><dc:creator>François Bulot</dc:creator><meta:document-statistic meta:table-count="1" meta:cell-count="132" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> <office:settings> <config:config-item-set config:name="ooo:view-settings"> <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item> <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item> <config:config-item config:name="VisibleAreaWidth" config:type="int">51722</config:config-item> - <config:config-item config:name="VisibleAreaHeight" config:type="int">30769</config:config-item> + <config:config-item config:name="VisibleAreaHeight" config:type="int">30317</config:config-item> <config:config-item-map-indexed config:name="Views"> <config:config-item-map-entry> <config:config-item config:name="ViewId" config:type="string">view1</config:config-item> <config:config-item-map-named config:name="Tables"> <config:config-item-map-entry config:name="Sheet1"> - <config:config-item config:name="CursorPositionX" config:type="int">1</config:config-item> - <config:config-item config:name="CursorPositionY" config:type="int">19</config:config-item> + <config:config-item config:name="CursorPositionX" config:type="int">0</config:config-item> + <config:config-item config:name="CursorPositionY" config:type="int">16</config:config-item> <config:config-item config:name="HorizontalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="VerticalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="HorizontalSplitPosition" config:type="int">0</config:config-item> <config:config-item config:name="VerticalSplitPosition" config:type="int">0</config:config-item> <config:config-item config:name="ActiveSplitRange" config:type="short">2</config:config-item> - <config:config-item config:name="PositionLeft" config:type="int">1</config:config-item> + <config:config-item config:name="PositionLeft" config:type="int">0</config:config-item> <config:config-item config:name="PositionRight" config:type="int">0</config:config-item> <config:config-item config:name="PositionTop" config:type="int">0</config:config-item> <config:config-item config:name="PositionBottom" config:type="int">0</config:config-item> @@ -588,7 +588,7 @@ <text:p><text:sheet-name>???</text:sheet-name><text:s/>(<text:title>???</text:title>)</text:p> </style:region-left> <style:region-right> - <text:p><text:date style:data-style-name="N2" text:date-value="2019-07-16">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="16:00:43.617000000">00:00:00</text:time></text:p> + <text:p><text:date style:data-style-name="N2" text:date-value="2019-07-16">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="16:07:47.079000000">00:00:00</text:time></text:p> </style:region-right> </style:header> <style:header-left style:display="false"/> @@ -740,17 +740,6 @@ <text:p>Most Instruction elements activates the xf-output driver.</text:p> </table:table-cell> </table:table-row> - <table:table-row table:style-name="ro1"> - <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>r:Description[parent::d:IfThenElse]</text:p> - </table:table-cell> - <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>xf-output</text:p> - </table:table-cell> - <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>The Description of a IfThenElse is an alternative text for non dynamic output format, so it activates the xf-output drivers as other Instruction-like.</text:p> - </table:table-cell> - </table:table-row> <table:table-row table:style-name="ro1"> <table:table-cell table:number-columns-repeated="3"/> </table:table-row> diff --git a/src/main/resources/xslt/transformations/ddi2odt/drivers.fods b/src/main/resources/xslt/transformations/ddi2odt/drivers.fods index 21c506cba..b6701b08c 100644 --- a/src/main/resources/xslt/transformations/ddi2odt/drivers.fods +++ b/src/main/resources/xslt/transformations/ddi2odt/drivers.fods @@ -1,26 +1,26 @@ <?xml version="1.0" encoding="UTF-8"?> <office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.spreadsheet"> - <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>P3DT6H19M31S</meta:editing-duration><meta:editing-cycles>217</meta:editing-cycles><meta:generator>LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab8</meta:generator><dc:date>2019-07-16T16:01:24.131000000</dc:date><dc:creator>François Bulot</dc:creator><meta:document-statistic meta:table-count="1" meta:cell-count="135" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> + <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>P3DT6H19M41S</meta:editing-duration><meta:editing-cycles>218</meta:editing-cycles><meta:generator>LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab8</meta:generator><dc:date>2019-07-16T16:08:14.756000000</dc:date><dc:creator>François Bulot</dc:creator><meta:document-statistic meta:table-count="1" meta:cell-count="132" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> <office:settings> <config:config-item-set config:name="ooo:view-settings"> <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item> <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item> <config:config-item config:name="VisibleAreaWidth" config:type="int">60138</config:config-item> - <config:config-item config:name="VisibleAreaHeight" config:type="int">30769</config:config-item> + <config:config-item config:name="VisibleAreaHeight" config:type="int">30317</config:config-item> <config:config-item-map-indexed config:name="Views"> <config:config-item-map-entry> <config:config-item config:name="ViewId" config:type="string">view1</config:config-item> <config:config-item-map-named config:name="Tables"> <config:config-item-map-entry config:name="Sheet1"> - <config:config-item config:name="CursorPositionX" config:type="int">1</config:config-item> - <config:config-item config:name="CursorPositionY" config:type="int">19</config:config-item> + <config:config-item config:name="CursorPositionX" config:type="int">0</config:config-item> + <config:config-item config:name="CursorPositionY" config:type="int">16</config:config-item> <config:config-item config:name="HorizontalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="VerticalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="HorizontalSplitPosition" config:type="int">0</config:config-item> <config:config-item config:name="VerticalSplitPosition" config:type="int">0</config:config-item> <config:config-item config:name="ActiveSplitRange" config:type="short">2</config:config-item> - <config:config-item config:name="PositionLeft" config:type="int">1</config:config-item> + <config:config-item config:name="PositionLeft" config:type="int">0</config:config-item> <config:config-item config:name="PositionRight" config:type="int">0</config:config-item> <config:config-item config:name="PositionTop" config:type="int">0</config:config-item> <config:config-item config:name="PositionBottom" config:type="int">8</config:config-item> @@ -588,7 +588,7 @@ <text:p><text:sheet-name>???</text:sheet-name><text:s/>(<text:title>???</text:title>)</text:p> </style:region-left> <style:region-right> - <text:p><text:date style:data-style-name="N2" text:date-value="2019-07-16">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="16:01:08.047000000">00:00:00</text:time></text:p> + <text:p><text:date style:data-style-name="N2" text:date-value="2019-07-16">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="16:08:04.483000000">00:00:00</text:time></text:p> </style:region-right> </style:header> <style:header-left style:display="false"/> @@ -740,17 +740,6 @@ <text:p>Most Instruction elements activates the xf-output driver.</text:p> </table:table-cell> </table:table-row> - <table:table-row table:style-name="ro1"> - <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>r:Description[parent::d:IfThenElse]</text:p> - </table:table-cell> - <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>xf-output</text:p> - </table:table-cell> - <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>The Description of a IfThenElse is an alternative text for non dynamic output format, so it activates the xf-output drivers as other Instruction-like.</text:p> - </table:table-cell> - </table:table-row> <table:table-row table:style-name="ro1"> <table:table-cell table:number-columns-repeated="3"/> </table:table-row> diff --git a/src/main/resources/xslt/transformations/ddi2pdf/drivers.fods b/src/main/resources/xslt/transformations/ddi2pdf/drivers.fods index e53051da0..db2e22831 100644 --- a/src/main/resources/xslt/transformations/ddi2pdf/drivers.fods +++ b/src/main/resources/xslt/transformations/ddi2pdf/drivers.fods @@ -1,26 +1,26 @@ <?xml version="1.0" encoding="UTF-8"?> <office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.spreadsheet"> - <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>P2DT2H23M3S</meta:editing-duration><meta:editing-cycles>176</meta:editing-cycles><meta:generator>LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab8</meta:generator><dc:date>2019-07-16T16:00:19.418000000</dc:date><dc:creator>François Bulot</dc:creator><meta:document-statistic meta:table-count="1" meta:cell-count="135" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> + <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>P2DT2H30M11S</meta:editing-duration><meta:editing-cycles>177</meta:editing-cycles><meta:generator>LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab8</meta:generator><dc:date>2019-07-16T16:07:27.802000000</dc:date><dc:creator>François Bulot</dc:creator><meta:document-statistic meta:table-count="1" meta:cell-count="132" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> <office:settings> <config:config-item-set config:name="ooo:view-settings"> <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item> <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item> <config:config-item config:name="VisibleAreaWidth" config:type="int">54828</config:config-item> - <config:config-item config:name="VisibleAreaHeight" config:type="int">31612</config:config-item> + <config:config-item config:name="VisibleAreaHeight" config:type="int">31160</config:config-item> <config:config-item-map-indexed config:name="Views"> <config:config-item-map-entry> <config:config-item config:name="ViewId" config:type="string">view1</config:config-item> <config:config-item-map-named config:name="Tables"> <config:config-item-map-entry config:name="Sheet1"> - <config:config-item config:name="CursorPositionX" config:type="int">2</config:config-item> - <config:config-item config:name="CursorPositionY" config:type="int">19</config:config-item> + <config:config-item config:name="CursorPositionX" config:type="int">0</config:config-item> + <config:config-item config:name="CursorPositionY" config:type="int">16</config:config-item> <config:config-item config:name="HorizontalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="VerticalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="HorizontalSplitPosition" config:type="int">0</config:config-item> <config:config-item config:name="VerticalSplitPosition" config:type="int">0</config:config-item> <config:config-item config:name="ActiveSplitRange" config:type="short">2</config:config-item> - <config:config-item config:name="PositionLeft" config:type="int">1</config:config-item> + <config:config-item config:name="PositionLeft" config:type="int">0</config:config-item> <config:config-item config:name="PositionRight" config:type="int">0</config:config-item> <config:config-item config:name="PositionTop" config:type="int">0</config:config-item> <config:config-item config:name="PositionBottom" config:type="int">0</config:config-item> @@ -751,17 +751,6 @@ <text:p>Most Instruction elements activates the xf-output driver.</text:p> </table:table-cell> </table:table-row> - <table:table-row table:style-name="ro1"> - <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>r:Description[parent::d:IfThenElse]</text:p> - </table:table-cell> - <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>xf-output</text:p> - </table:table-cell> - <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>The Description of a IfThenElse is an alternative text for non dynamic output format, so it activates the xf-output drivers as other Instruction-like.</text:p> - </table:table-cell> - </table:table-row> <table:table-row table:style-name="ro1"> <table:table-cell table:number-columns-repeated="3"/> </table:table-row> From 9167cff0b7bd5b6d832e7190d8eada43fbcb27e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bulot=20Fran=C3=A7ois?= <U7ZR1J@ad.insee.intra> Date: Tue, 16 Jul 2019 16:26:22 +0200 Subject: [PATCH 032/439] creation of driver "Clarification" from "xf-group" --- src/main/resources/xslt/outputs/fr/models.xsl | 10 ++++----- .../resources/xslt/outputs/pdf/models.xsl | 12 +++++++++++ .../xslt/transformations/ddi2fr/drivers.fods | 21 +++++++++++-------- .../xslt/transformations/ddi2js/drivers.fods | 19 ++++++++++------- .../xslt/transformations/ddi2odt/drivers.fods | 21 +++++++++++-------- .../xslt/transformations/ddi2pdf/drivers.fods | 17 ++++++++------- 6 files changed, 62 insertions(+), 38 deletions(-) diff --git a/src/main/resources/xslt/outputs/fr/models.xsl b/src/main/resources/xslt/outputs/fr/models.xsl index a025f2abc..646f61f41 100644 --- a/src/main/resources/xslt/outputs/fr/models.xsl +++ b/src/main/resources/xslt/outputs/fr/models.xsl @@ -183,7 +183,7 @@ <xd:p>The element is created and we continue to parse the input tree next within the created element.</xd:p> </xd:desc> </xd:doc> - <xsl:template match="Instance//*[name() = ('xf-group', 'Module')]" mode="model"> + <xsl:template match="Instance//*[name() = ('xf-group', 'Module','Clarification')]" mode="model"> <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:element name="{enofr:get-name($source-context)}"> <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> @@ -941,7 +941,7 @@ <xd:p>It builds the bind by using different enofr functions then the process goes on within the created bind.</xd:p> </xd:desc> </xd:doc> - <xsl:template match="Bind//*[name() = ('xf-group', 'Module')]" mode="model"> + <xsl:template match="Bind//*[name() = ('xf-group', 'Module','Clarification')]" mode="model"> <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="instance-ancestor" tunnel="yes"/> <xsl:variable name="name" select="enofr:get-name($source-context)"/> @@ -1557,10 +1557,10 @@ <xd:doc> <xd:desc> - <xd:p>Template for Body for the xf-group driver.</xd:p> + <xd:p>Template for Body for the xf-group or the Clarification drivers.</xd:p> </xd:desc> </xd:doc> - <xsl:template match="Body//xf-group" mode="model"> + <xsl:template match="Body//xf-group | Body//Clarification" mode="model"> <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="languages" tunnel="yes"/> <xsl:variable name="name" select="enofr:get-name($source-context)"/> @@ -2044,7 +2044,7 @@ <xd:doc> <xd:desc>No other - give details out of cells</xd:desc> </xd:doc> - <xsl:template match="Body//xf-group[(ancestor::Table or ancestor::TableLoop) and not(ancestor::Cell)]" mode="model" priority="2"/> + <xsl:template match="Body//Clarification[(ancestor::Table or ancestor::TableLoop) and not(ancestor::Cell)]" mode="model" priority="2"/> <xd:doc> <xd:desc> diff --git a/src/main/resources/xslt/outputs/pdf/models.xsl b/src/main/resources/xslt/outputs/pdf/models.xsl index 6d8915d9d..e66b2f709 100644 --- a/src/main/resources/xslt/outputs/pdf/models.xsl +++ b/src/main/resources/xslt/outputs/pdf/models.xsl @@ -225,6 +225,18 @@ <xsl:with-param name="driver" select="." tunnel="yes"/> </xsl:apply-templates> </xsl:template> + + <xd:doc> + <xd:desc>template for the Clarification of a response</xd:desc> + </xd:doc> + <xsl:template match="main//Clarification" mode="model"> + <xsl:param name="source-context" as="item()" tunnel="yes"/> + <xsl:param name="languages" tunnel="yes"/> + + <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> + <xsl:with-param name="driver" select="." tunnel="yes"/> + </xsl:apply-templates> + </xsl:template> <xd:doc> <xd:desc>template for the instructions</xd:desc> diff --git a/src/main/resources/xslt/transformations/ddi2fr/drivers.fods b/src/main/resources/xslt/transformations/ddi2fr/drivers.fods index 843ef858c..9188a49a2 100644 --- a/src/main/resources/xslt/transformations/ddi2fr/drivers.fods +++ b/src/main/resources/xslt/transformations/ddi2fr/drivers.fods @@ -1,26 +1,26 @@ <?xml version="1.0" encoding="UTF-8"?> <office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.spreadsheet"> - <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>P1DT3H36M22S</meta:editing-duration><meta:editing-cycles>175</meta:editing-cycles><meta:generator>LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab8</meta:generator><dc:date>2019-07-16T16:00:32.283000000</dc:date><dc:creator>François Bulot</dc:creator><meta:document-statistic meta:table-count="1" meta:cell-count="132" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> + <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>P1DT3H49M34S</meta:editing-duration><meta:editing-cycles>176</meta:editing-cycles><meta:generator>LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab8</meta:generator><dc:date>2019-07-16T16:13:44.924000000</dc:date><dc:creator>François Bulot</dc:creator><meta:document-statistic meta:table-count="1" meta:cell-count="132" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> <office:settings> <config:config-item-set config:name="ooo:view-settings"> <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item> <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item> <config:config-item config:name="VisibleAreaWidth" config:type="int">50597</config:config-item> - <config:config-item config:name="VisibleAreaHeight" config:type="int">30771</config:config-item> + <config:config-item config:name="VisibleAreaHeight" config:type="int">31222</config:config-item> <config:config-item-map-indexed config:name="Views"> <config:config-item-map-entry> <config:config-item config:name="ViewId" config:type="string">view1</config:config-item> <config:config-item-map-named config:name="Tables"> <config:config-item-map-entry config:name="Sheet1"> - <config:config-item config:name="CursorPositionX" config:type="int">2</config:config-item> - <config:config-item config:name="CursorPositionY" config:type="int">18</config:config-item> + <config:config-item config:name="CursorPositionX" config:type="int">0</config:config-item> + <config:config-item config:name="CursorPositionY" config:type="int">13</config:config-item> <config:config-item config:name="HorizontalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="VerticalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="HorizontalSplitPosition" config:type="int">0</config:config-item> <config:config-item config:name="VerticalSplitPosition" config:type="int">0</config:config-item> <config:config-item config:name="ActiveSplitRange" config:type="short">2</config:config-item> - <config:config-item config:name="PositionLeft" config:type="int">1</config:config-item> + <config:config-item config:name="PositionLeft" config:type="int">0</config:config-item> <config:config-item config:name="PositionRight" config:type="int">0</config:config-item> <config:config-item config:name="PositionTop" config:type="int">0</config:config-item> <config:config-item config:name="PositionBottom" config:type="int">0</config:config-item> @@ -696,15 +696,18 @@ <text:p>The d:ElseConstructReference elements activate the xf-group driver.</text:p> </table:table-cell> </table:table-row> + <table:table-row table:style-name="ro1"> + <table:table-cell table:number-columns-repeated="3"/> + </table:table-row> <table:table-row table:style-name="ro1"> <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>d:ResponseDomainInMixed[d:AttachmentLocation]</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>xf-group</text:p> + <text:p>Clarification</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>"Other – give details" activate the xf-group driver for "give details" in QuestionItem</text:p> + <text:p>"Other – give details" activate the Clarification driver for "give details" in QuestionItem</text:p> </table:table-cell> </table:table-row> <table:table-row table:style-name="ro1"> @@ -712,10 +715,10 @@ <text:p>d:GridResponseDomainInMixed[d:ResponseAttachmentLocation]</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>xf-group</text:p> + <text:p>Clarification</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>"Other – give details" activate the xf-group driver for "give details" in QuestionGrid</text:p> + <text:p>"Other – give details" activate the Clarification driver for "give details" in QuestionGrid</text:p> </table:table-cell> </table:table-row> <table:table-row table:style-name="ro1"> diff --git a/src/main/resources/xslt/transformations/ddi2js/drivers.fods b/src/main/resources/xslt/transformations/ddi2js/drivers.fods index ee9bd45c7..a7794a390 100644 --- a/src/main/resources/xslt/transformations/ddi2js/drivers.fods +++ b/src/main/resources/xslt/transformations/ddi2js/drivers.fods @@ -1,20 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> <office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.spreadsheet"> - <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>P5DT1H56M16S</meta:editing-duration><meta:editing-cycles>225</meta:editing-cycles><meta:generator>LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab8</meta:generator><dc:date>2019-07-16T16:07:57.628000000</dc:date><dc:creator>François Bulot</dc:creator><meta:document-statistic meta:table-count="1" meta:cell-count="132" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> + <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>P5DT2H2M31S</meta:editing-duration><meta:editing-cycles>226</meta:editing-cycles><meta:generator>LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab8</meta:generator><dc:date>2019-07-16T16:14:13.602000000</dc:date><dc:creator>François Bulot</dc:creator><meta:document-statistic meta:table-count="1" meta:cell-count="132" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> <office:settings> <config:config-item-set config:name="ooo:view-settings"> <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item> <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item> <config:config-item config:name="VisibleAreaWidth" config:type="int">51722</config:config-item> - <config:config-item config:name="VisibleAreaHeight" config:type="int">30317</config:config-item> + <config:config-item config:name="VisibleAreaHeight" config:type="int">30769</config:config-item> <config:config-item-map-indexed config:name="Views"> <config:config-item-map-entry> <config:config-item config:name="ViewId" config:type="string">view1</config:config-item> <config:config-item-map-named config:name="Tables"> <config:config-item-map-entry config:name="Sheet1"> - <config:config-item config:name="CursorPositionX" config:type="int">0</config:config-item> - <config:config-item config:name="CursorPositionY" config:type="int">16</config:config-item> + <config:config-item config:name="CursorPositionX" config:type="int">1</config:config-item> + <config:config-item config:name="CursorPositionY" config:type="int">13</config:config-item> <config:config-item config:name="HorizontalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="VerticalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="HorizontalSplitPosition" config:type="int">0</config:config-item> @@ -693,15 +693,18 @@ <text:p>The d:ElseConstructReference elements activate the xf-group driver.</text:p> </table:table-cell> </table:table-row> + <table:table-row table:style-name="ro1"> + <table:table-cell table:number-columns-repeated="3"/> + </table:table-row> <table:table-row table:style-name="ro1"> <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>d:ResponseDomainInMixed[d:AttachmentLocation]</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>xf-group</text:p> + <text:p>Clarification</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>"Other – give details" activate the xf-group driver for "give details" in QuestionItem</text:p> + <text:p>"Other – give details" activate the Clarification driver for "give details" in QuestionItem</text:p> </table:table-cell> </table:table-row> <table:table-row table:style-name="ro1"> @@ -709,10 +712,10 @@ <text:p>d:GridResponseDomainInMixed[d:ResponseAttachmentLocation]</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>xf-group</text:p> + <text:p>Clarification</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>"Other – give details" activate the xf-group driver for "give details" in QuestionGrid</text:p> + <text:p>"Other – give details" activate the Clarification driver for "give details" in QuestionGrid</text:p> </table:table-cell> </table:table-row> <table:table-row table:style-name="ro1"> diff --git a/src/main/resources/xslt/transformations/ddi2odt/drivers.fods b/src/main/resources/xslt/transformations/ddi2odt/drivers.fods index b6701b08c..b15e5cfaf 100644 --- a/src/main/resources/xslt/transformations/ddi2odt/drivers.fods +++ b/src/main/resources/xslt/transformations/ddi2odt/drivers.fods @@ -1,20 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> <office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.spreadsheet"> - <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>P3DT6H19M41S</meta:editing-duration><meta:editing-cycles>218</meta:editing-cycles><meta:generator>LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab8</meta:generator><dc:date>2019-07-16T16:08:14.756000000</dc:date><dc:creator>François Bulot</dc:creator><meta:document-statistic meta:table-count="1" meta:cell-count="132" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> + <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>P3DT6H25M55S</meta:editing-duration><meta:editing-cycles>219</meta:editing-cycles><meta:generator>LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab8</meta:generator><dc:date>2019-07-16T16:14:29.699000000</dc:date><dc:creator>François Bulot</dc:creator><meta:document-statistic meta:table-count="1" meta:cell-count="132" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> <office:settings> <config:config-item-set config:name="ooo:view-settings"> <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item> <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item> <config:config-item config:name="VisibleAreaWidth" config:type="int">60138</config:config-item> - <config:config-item config:name="VisibleAreaHeight" config:type="int">30317</config:config-item> + <config:config-item config:name="VisibleAreaHeight" config:type="int">30769</config:config-item> <config:config-item-map-indexed config:name="Views"> <config:config-item-map-entry> <config:config-item config:name="ViewId" config:type="string">view1</config:config-item> <config:config-item-map-named config:name="Tables"> <config:config-item-map-entry config:name="Sheet1"> - <config:config-item config:name="CursorPositionX" config:type="int">0</config:config-item> - <config:config-item config:name="CursorPositionY" config:type="int">16</config:config-item> + <config:config-item config:name="CursorPositionX" config:type="int">1</config:config-item> + <config:config-item config:name="CursorPositionY" config:type="int">14</config:config-item> <config:config-item config:name="HorizontalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="VerticalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="HorizontalSplitPosition" config:type="int">0</config:config-item> @@ -23,7 +23,7 @@ <config:config-item config:name="PositionLeft" config:type="int">0</config:config-item> <config:config-item config:name="PositionRight" config:type="int">0</config:config-item> <config:config-item config:name="PositionTop" config:type="int">0</config:config-item> - <config:config-item config:name="PositionBottom" config:type="int">8</config:config-item> + <config:config-item config:name="PositionBottom" config:type="int">2</config:config-item> <config:config-item config:name="ZoomType" config:type="short">0</config:config-item> <config:config-item config:name="ZoomValue" config:type="int">100</config:config-item> <config:config-item config:name="PageViewZoomValue" config:type="int">60</config:config-item> @@ -693,15 +693,18 @@ <text:p>The d:ElseConstructReference elements activate the xf-group driver.</text:p> </table:table-cell> </table:table-row> + <table:table-row table:style-name="ro1"> + <table:table-cell table:number-columns-repeated="3"/> + </table:table-row> <table:table-row table:style-name="ro1"> <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>d:ResponseDomainInMixed[d:AttachmentLocation]</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>xf-group</text:p> + <text:p>Clarification</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>"Other – give details" activate the xf-group driver for "give details" in QuestionItem</text:p> + <text:p>"Other – give details" activate the Clarification driver for "give details" in QuestionItem</text:p> </table:table-cell> </table:table-row> <table:table-row table:style-name="ro1"> @@ -709,10 +712,10 @@ <text:p>d:GridResponseDomainInMixed[d:ResponseAttachmentLocation]</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>xf-group</text:p> + <text:p>Clarification</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>"Other – give details" activate the xf-group driver for "give details" in QuestionGrid</text:p> + <text:p>"Other – give details" activate the Clarification driver for "give details" in QuestionGrid</text:p> </table:table-cell> </table:table-row> <table:table-row table:style-name="ro1"> diff --git a/src/main/resources/xslt/transformations/ddi2pdf/drivers.fods b/src/main/resources/xslt/transformations/ddi2pdf/drivers.fods index db2e22831..d4985e322 100644 --- a/src/main/resources/xslt/transformations/ddi2pdf/drivers.fods +++ b/src/main/resources/xslt/transformations/ddi2pdf/drivers.fods @@ -1,19 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> <office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.spreadsheet"> - <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>P2DT2H30M11S</meta:editing-duration><meta:editing-cycles>177</meta:editing-cycles><meta:generator>LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab8</meta:generator><dc:date>2019-07-16T16:07:27.802000000</dc:date><dc:creator>François Bulot</dc:creator><meta:document-statistic meta:table-count="1" meta:cell-count="132" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> + <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>P2DT2H36M43S</meta:editing-duration><meta:editing-cycles>178</meta:editing-cycles><meta:generator>LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab8</meta:generator><dc:date>2019-07-16T16:14:00.083000000</dc:date><dc:creator>François Bulot</dc:creator><meta:document-statistic meta:table-count="1" meta:cell-count="132" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> <office:settings> <config:config-item-set config:name="ooo:view-settings"> <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item> <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item> <config:config-item config:name="VisibleAreaWidth" config:type="int">54828</config:config-item> - <config:config-item config:name="VisibleAreaHeight" config:type="int">31160</config:config-item> + <config:config-item config:name="VisibleAreaHeight" config:type="int">31612</config:config-item> <config:config-item-map-indexed config:name="Views"> <config:config-item-map-entry> <config:config-item config:name="ViewId" config:type="string">view1</config:config-item> <config:config-item-map-named config:name="Tables"> <config:config-item-map-entry config:name="Sheet1"> - <config:config-item config:name="CursorPositionX" config:type="int">0</config:config-item> + <config:config-item config:name="CursorPositionX" config:type="int">1</config:config-item> <config:config-item config:name="CursorPositionY" config:type="int">16</config:config-item> <config:config-item config:name="HorizontalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="VerticalSplitMode" config:type="short">0</config:config-item> @@ -704,15 +704,18 @@ <text:p>The d:ElseConstructReference elements activate the xf-group driver.</text:p> </table:table-cell> </table:table-row> + <table:table-row table:style-name="ro1"> + <table:table-cell table:number-columns-repeated="3"/> + </table:table-row> <table:table-row table:style-name="ro1"> <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>d:ResponseDomainInMixed[d:AttachmentLocation]</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>xf-group</text:p> + <text:p>Clarification</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>"Other – give details" activate the xf-group driver for "give details" in QuestionItem</text:p> + <text:p>"Other – give details" activate the Clarification driver for "give details" in QuestionItem</text:p> </table:table-cell> </table:table-row> <table:table-row table:style-name="ro1"> @@ -720,10 +723,10 @@ <text:p>d:GridResponseDomainInMixed[d:ResponseAttachmentLocation]</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>xf-group</text:p> + <text:p>Clarification</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>"Other – give details" activate the xf-group driver for "give details" in QuestionGrid</text:p> + <text:p>"Other – give details" activate the Clarification driver for "give details" in QuestionGrid</text:p> </table:table-cell> </table:table-row> <table:table-row table:style-name="ro1"> From 9874df44814f0e96391301039a6cd5d6fa07ec43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bulot=20Fran=C3=A7ois?= <U7ZR1J@ad.insee.intra> Date: Tue, 16 Jul 2019 16:42:34 +0200 Subject: [PATCH 033/439] add fixed-cell-value for pdf --- .../resources/xslt/outputs/pdf/models.xsl | 3 +- .../transformations/ddi2pdf/ddi2pdf-fixed.xsl | 11 +++++++ .../transformations/ddi2pdf/functions.fods | 30 ++++++++++++++----- 3 files changed, 35 insertions(+), 9 deletions(-) diff --git a/src/main/resources/xslt/outputs/pdf/models.xsl b/src/main/resources/xslt/outputs/pdf/models.xsl index e66b2f709..f8ea9dadc 100644 --- a/src/main/resources/xslt/outputs/pdf/models.xsl +++ b/src/main/resources/xslt/outputs/pdf/models.xsl @@ -577,7 +577,8 @@ number-columns-spanned="{enopdf:get-colspan($source-context)}" number-rows-spanned="{enopdf:get-rowspan($source-context)}"> <fo:block> - <xsl:copy-of select="enopdf:get-label($source-context, $languages[1])"/> + <xsl:sequence select="enopdf:get-label($source-context, $languages[1])"/> + <xsl:sequence select="enopdf:get-fixed-value($source-context, $languages[1])"/> </fo:block> </fo:table-cell> </xsl:template> diff --git a/src/main/resources/xslt/transformations/ddi2pdf/ddi2pdf-fixed.xsl b/src/main/resources/xslt/transformations/ddi2pdf/ddi2pdf-fixed.xsl index d188d8722..e5cc87249 100644 --- a/src/main/resources/xslt/transformations/ddi2pdf/ddi2pdf-fixed.xsl +++ b/src/main/resources/xslt/transformations/ddi2pdf/ddi2pdf-fixed.xsl @@ -115,6 +115,17 @@ </xsl:variable> <xsl:sequence select="$tempLabel"/> </xsl:function> + + <xsl:function name="enopdf:get-formatted-fixed-value"> + <xsl:param name="context" as="item()"/> + <xsl:param name="language"/> + <xsl:variable name="tempLabel"> + <xsl:apply-templates select="enoddi:get-cell-value($context)" mode="enopdf:format-label"> + <xsl:with-param name="label-variables" select="enoddi:get-cell-value-variables($context)" tunnel="yes"/> + </xsl:apply-templates> + </xsl:variable> + <xsl:sequence select="$tempLabel"/> + </xsl:function> <xsl:template match="*" mode="enopdf:format-label" priority="-1"> <xsl:copy> diff --git a/src/main/resources/xslt/transformations/ddi2pdf/functions.fods b/src/main/resources/xslt/transformations/ddi2pdf/functions.fods index 784808aa3..36e5cd7d1 100644 --- a/src/main/resources/xslt/transformations/ddi2pdf/functions.fods +++ b/src/main/resources/xslt/transformations/ddi2pdf/functions.fods @@ -1,20 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> <office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.spreadsheet"> - <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>PT19H8M11S</meta:editing-duration><meta:editing-cycles>107</meta:editing-cycles><meta:generator>LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab8</meta:generator><dc:date>2019-07-16T15:58:07.541000000</dc:date><dc:creator>François Bulot</dc:creator><meta:document-statistic meta:table-count="1" meta:cell-count="125" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> + <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>PT19H9M36S</meta:editing-duration><meta:editing-cycles>108</meta:editing-cycles><meta:generator>LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab8</meta:generator><dc:date>2019-07-16T16:38:12.923000000</dc:date><dc:creator>François Bulot</dc:creator><meta:document-statistic meta:table-count="1" meta:cell-count="129" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> <office:settings> <config:config-item-set config:name="ooo:view-settings"> <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item> <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item> <config:config-item config:name="VisibleAreaWidth" config:type="int">36807</config:config-item> - <config:config-item config:name="VisibleAreaHeight" config:type="int">21674</config:config-item> + <config:config-item config:name="VisibleAreaHeight" config:type="int">22253</config:config-item> <config:config-item-map-indexed config:name="Views"> <config:config-item-map-entry> <config:config-item config:name="ViewId" config:type="string">view1</config:config-item> <config:config-item-map-named config:name="Tables"> <config:config-item-map-entry config:name="Sheet1"> - <config:config-item config:name="CursorPositionX" config:type="int">0</config:config-item> - <config:config-item config:name="CursorPositionY" config:type="int">39</config:config-item> + <config:config-item config:name="CursorPositionX" config:type="int">3</config:config-item> + <config:config-item config:name="CursorPositionY" config:type="int">16</config:config-item> <config:config-item config:name="HorizontalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="VerticalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="HorizontalSplitPosition" config:type="int">0</config:config-item> @@ -23,7 +23,7 @@ <config:config-item config:name="PositionLeft" config:type="int">0</config:config-item> <config:config-item config:name="PositionRight" config:type="int">0</config:config-item> <config:config-item config:name="PositionTop" config:type="int">0</config:config-item> - <config:config-item config:name="PositionBottom" config:type="int">18</config:config-item> + <config:config-item config:name="PositionBottom" config:type="int">0</config:config-item> <config:config-item config:name="ZoomType" config:type="short">0</config:config-item> <config:config-item config:name="ZoomValue" config:type="int">100</config:config-item> <config:config-item config:name="PageViewZoomValue" config:type="int">60</config:config-item> @@ -598,7 +598,7 @@ <text:p><text:sheet-name>???</text:sheet-name><text:s/>(<text:title>???</text:title>)</text:p> </style:region-left> <style:region-right> - <text:p><text:date style:data-style-name="N2" text:date-value="2019-07-16">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="15:57:23.009000000">00:00:00</text:time></text:p> + <text:p><text:date style:data-style-name="N2" text:date-value="2019-07-16">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="16:36:47.580000000">00:00:00</text:time></text:p> </style:region-right> </style:header> <style:header-left style:display="false"/> @@ -882,7 +882,21 @@ <text:p>enopdf:get-formatted-label</text:p> </table:table-cell> <table:table-cell table:style-name="Default" office:value-type="string" calcext:value-type="string"> - <text:p>Linking output function enopdf:get-label to input function enoddi:get-label.</text:p> + <text:p>Linking output function enopdf:get-label to input function enopdf:get-formatted-label.</text:p> + </table:table-cell> + </table:table-row> + <table:table-row table:style-name="ro2"> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p>enopdf:get-fixed-value</text:p> + </table:table-cell> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p>language</text:p> + </table:table-cell> + <table:table-cell table:style-name="ce2" office:value-type="string" calcext:value-type="string"> + <text:p>enopdf:get-formatted-fixed-value</text:p> + </table:table-cell> + <table:table-cell table:style-name="Default" office:value-type="string" calcext:value-type="string"> + <text:p>Linking output function enopdf:get-fixed-value to input function enopdf:get-formatted-fixed-value.</text:p> </table:table-cell> </table:table-row> <table:table-row table:style-name="ro2"> @@ -1183,7 +1197,7 @@ <text:p>Linking output function enopdf:get-flowcontrol-label to input function enoddi:get-flowcontrol-label.</text:p> </table:table-cell> </table:table-row> - <table:table-row table:style-name="ro1" table:number-rows-repeated="1048536"> + <table:table-row table:style-name="ro1" table:number-rows-repeated="1048535"> <table:table-cell table:number-columns-repeated="4"/> </table:table-row> <table:table-row table:style-name="ro1"> From 19651ff6406e265989ec0122c29829c6b5136641 Mon Sep 17 00:00:00 2001 From: CHTAINET Badr <Badr.CHTAINET@akka.eu> Date: Mon, 1 Jul 2019 17:35:17 +0200 Subject: [PATCH 034/439] 289 migration for parts 1,2 & 3 --- .../resources/xslt/outputs/ddi/models.xsl | 34 +++++++++---------- 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/src/main/resources/xslt/outputs/ddi/models.xsl b/src/main/resources/xslt/outputs/ddi/models.xsl index 522cfcfe2..01f696bef 100644 --- a/src/main/resources/xslt/outputs/ddi/models.xsl +++ b/src/main/resources/xslt/outputs/ddi/models.xsl @@ -28,14 +28,12 @@ <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:variable name="citation" select="enoddi32:get-citation($source-context)" as="xs:string"/> <xsl:variable name="agency" select="enoddi32:get-agency($source-context)" as="xs:string"/> - <DDIInstance xmlns="ddi:instance:3_2" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="ddi:instance:3_2 ../../../src/main/resources/schema/instance.xsd" - xmlns:a="ddi:archive:3_2" xmlns:r="ddi:reusable:3_2" xmlns:s="ddi:studyunit:3_2" - xmlns:d="ddi:datacollection:3_2" xmlns:g="ddi:group:3_2" xmlns:eno="http://xml.insee.fr/apps/eno" - xmlns:l="ddi:logicalproduct:3_2" xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl" - xmlns:enoddi32="http://xml.insee.fr/apps/eno/out/ddi32" xmlns:xhtml="http://www.w3.org/1999/xhtml" - isMaintainable="true"> + <DDIInstance xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="ddi:instance:3_3 https://www.ddialliance.org/Specification/DDI-Lifecycle/3.3/XMLSchema/instance.xsd" + xmlns="ddi:instance:3_3" xmlns:g="ddi:group:3_3" xmlns:d="ddi:datacollection:3_3" + xmlns:s="ddi:studyunit:3_3" xmlns:r="ddi:reusable:3_3" xmlns:xhtml="http://www.w3.org/1999/xhtml" + xmlns:a="ddi:archive:3_3" xmlns:xs="http://www.w3.org/2001/XMLSchema" + xmlns:l="ddi:logicalproduct:3_3" isMaintainable="true"> <r:Agency><xsl:value-of select="$agency"/></r:Agency> <r:ID><xsl:value-of select="concat('INSEE-', enoddi32:get-id($source-context))"/></r:ID> <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> @@ -73,7 +71,7 @@ <xsl:value-of select="enoddi32:get-label($source-context)"/> </r:Content> </r:Label> - <d:TypeOfSequence codeListID="INSEE-TOS-CL-1">template</d:TypeOfSequence> + <d:TypeOfSequence controlledVocabularyID="INSEE-TOS-CL-1">template</d:TypeOfSequence> <!--creation of references of direct children--> <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> <xsl:with-param name="driver" select="eno:append-empty-element('Sequence', .)" tunnel="yes"/> @@ -215,7 +213,7 @@ <r:ID>INSEE-COMMUN-MNR-<xsl:value-of select="$id-date-duration"/>-<xsl:value-of select="$formatDate"/></r:ID> <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> <r:DateFieldFormat><xsl:value-of select="$formatDate"/></r:DateFieldFormat> - <r:DateTypeCode codeListID="INSEE-DTC-CV"><xsl:value-of select="$DateTypeCode"/></r:DateTypeCode> + <r:DateTypeCode controlledVocabularyID="INSEE-DTC-CV"><xsl:value-of select="$DateTypeCode"/></r:DateTypeCode> </r:ManagedDateTimeRepresentation> </xsl:if> </xsl:for-each> @@ -686,7 +684,7 @@ <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> <xsl:with-param name="driver" select="eno:append-empty-element('driver-InterviewerInstructionReference', .)" tunnel="yes"/> </xsl:apply-templates> - <d:TypeOfSequence codeListID="INSEE-TOS-CL-1"> + <d:TypeOfSequence controlledVocabularyID="INSEE-TOS-CL-1"> <xsl:value-of select="enoddi32:get-sequence-type($source-context)"/> </d:TypeOfSequence> <xsl:apply-templates select="enoddi32:get-related-controls($source-context)" mode="source"> @@ -992,7 +990,7 @@ <xsl:value-of select="enoddi32:get-label($source-context)"/> </r:Content> </r:Label> - <d:TypeOfSequence codeListID="INSEE-TOS-CL-1">hideable</d:TypeOfSequence> + <d:TypeOfSequence controlledVocabularyID="INSEE-TOS-CL-1">hideable</d:TypeOfSequence> <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> <xsl:with-param name="driver" select="eno:append-empty-element('driver-ThenSequence',.)" tunnel="yes"/> </xsl:apply-templates> @@ -1062,7 +1060,7 @@ <xsl:param name="agency" as="xs:string" tunnel="yes"/> <xsl:variable name="mandatory" select="enoddi32:get-ci-type($source-context)"/> <d:CodeDomain> - <r:GenericOutputFormat codeListID="INSEE-GOF-CV"><xsl:value-of select="enoddi32:get-generic-output-format($source-context)"/></r:GenericOutputFormat> + <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV"><xsl:value-of select="enoddi32:get-generic-output-format($source-context)"/></r:GenericOutputFormat> <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> <xsl:with-param name="driver" select="." tunnel="yes"/> </xsl:apply-templates> @@ -1092,7 +1090,7 @@ <!-- Because of the xsl:for-each, driver context needs to be kept. --> <xsl:variable name="driver" select="."/> <xsl:for-each select="enoddi32:get-grid-dimensions($source-context)"> - <d:GridResponseDomain> + <d:GridResponseDomainInMixed> <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> <xsl:with-param name="driver" select="$driver" tunnel="yes"/> <xsl:with-param name="mandatory" select="enoddi32:get-ci-type($source-context)" tunnel="yes"/> @@ -1104,7 +1102,7 @@ </xsl:for-each> </d:CellCoordinatesAsDefined> </d:GridAttachment> - </d:GridResponseDomain> + </d:GridResponseDomainInMixed> </xsl:for-each> </xsl:template> @@ -1348,7 +1346,7 @@ <xsl:value-of select="enoddi32:get-high($source-context)"/> </r:High> </r:NumberRange> - <r:NumericTypeCode codeListID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> <r:OutParameter isArray="false"> <r:Agency><xsl:value-of select="$agency"/></r:Agency> <r:ID><xsl:value-of select="enoddi32:get-rdop-id($source-context)"/></r:ID> @@ -1377,7 +1375,7 @@ <xsl:value-of select="enoddi32:get-high($source-context)"/> </r:High> </r:NumberRange> - <r:NumericTypeCode codeListID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> </r:NumericRepresentation> <!-- MeasurementUnit --> <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> @@ -1536,7 +1534,7 @@ <xsl:param name="agency" as="xs:string" tunnel="yes"/> <xsl:param name="mandatory" as="xs:string" tunnel="yes" select="''"/> <d:CodeDomain> - <r:GenericOutputFormat codeListID="INSEE-GOF-CV"><xsl:value-of select="enoddi32:get-generic-output-format($source-context)"/></r:GenericOutputFormat> + <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV"><xsl:value-of select="enoddi32:get-generic-output-format($source-context)"/></r:GenericOutputFormat> <r:CodeListReference> <r:Agency><xsl:value-of select="$agency"/></r:Agency> <r:ID><xsl:value-of select="enoddi32:get-code-list-id($source-context)"/></r:ID> From b8171daad268d7e89f008e00b0f656a089dce9d3 Mon Sep 17 00:00:00 2001 From: CHTAINET Badr <Badr.CHTAINET@akka.eu> Date: Mon, 1 Jul 2019 18:25:18 +0200 Subject: [PATCH 035/439] 289 migration V3.3 part 4 --- src/main/resources/xslt/outputs/ddi/models.xsl | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/main/resources/xslt/outputs/ddi/models.xsl b/src/main/resources/xslt/outputs/ddi/models.xsl index 01f696bef..6964e5e81 100644 --- a/src/main/resources/xslt/outputs/ddi/models.xsl +++ b/src/main/resources/xslt/outputs/ddi/models.xsl @@ -739,6 +739,16 @@ <r:TypeOfObject>Instruction</r:TypeOfObject> </d:InterviewerInstructionReference> </xsl:if> + <xsl:variable name="type" select="enoddi32:get-ci-type($source-context)"/> + <xsl:variable name="controlCrticity"> + <xsl:choose> + <xsl:when test="normalize-space($type)='error'">stumblingblock</xsl:when> + <xsl:otherwise>informational</xsl:otherwise> + </xsl:choose> + </xsl:variable> + <d:TypeOfComputationItem controlledVocabularyID="INSEE-TOCI-CL-1"> + <xsl:value-of select="$controlCrticity"/> + </d:TypeOfComputationItem> <!-- Have a simpler way to deal with regular controls & mandatory response. --> <!-- An apply-templates on Expression will Output CommandeCode for Regular Control. --> <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> @@ -751,14 +761,6 @@ <xsl:with-param name="source-context" select="$source-context" tunnel="yes"/> </xsl:call-template> </xsl:if> - <xsl:variable name="type" select="enoddi32:get-ci-type($source-context)"/> - <xsl:if test="not(normalize-space($type)=('',' '))"> - <xsl:comment> - <xsl:text disable-output-escaping="yes"><r:TypeOfComputationItem></xsl:text> - <xsl:value-of select="$type"/> - <xsl:text disable-output-escaping="yes"></r:TypeOfComputationItem></xsl:text> - </xsl:comment> - </xsl:if> </d:ComputationItem> </xsl:template> From 66f1402afe4dc1104239cf0f339c3f37012eef9f Mon Sep 17 00:00:00 2001 From: CHTAINET Badr <Badr.CHTAINET@akka.eu> Date: Tue, 2 Jul 2019 11:21:13 +0200 Subject: [PATCH 036/439] 289 Migration DDI v3.3 part 5 --- src/main/resources/xslt/outputs/ddi/models.xsl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/xslt/outputs/ddi/models.xsl b/src/main/resources/xslt/outputs/ddi/models.xsl index 6964e5e81..b9b5dc511 100644 --- a/src/main/resources/xslt/outputs/ddi/models.xsl +++ b/src/main/resources/xslt/outputs/ddi/models.xsl @@ -963,6 +963,7 @@ <r:Agency><xsl:value-of select="$agency"/></r:Agency> <r:ID><xsl:value-of select="enoddi32:get-id($source-context)"/></r:ID> <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> + <d:TypeOfSequence controlledVocabularyID="INSEE-TOS-CL-1">hideable</d:TypeOfSequence> <r:Label> <r:Content xml:lang="{enoddi32:get-lang($source-context)}">A définir</r:Content> </r:Label> @@ -992,7 +993,6 @@ <xsl:value-of select="enoddi32:get-label($source-context)"/> </r:Content> </r:Label> - <d:TypeOfSequence controlledVocabularyID="INSEE-TOS-CL-1">hideable</d:TypeOfSequence> <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> <xsl:with-param name="driver" select="eno:append-empty-element('driver-ThenSequence',.)" tunnel="yes"/> </xsl:apply-templates> From 615f6cb0ba8f8aa76560260732e7870c71c67f5b Mon Sep 17 00:00:00 2001 From: CHTAINET Badr <Badr.CHTAINET@akka.eu> Date: Tue, 2 Jul 2019 17:49:29 +0200 Subject: [PATCH 037/439] 289 Migration V3.3 part 1 exlclude namespaces --- src/main/resources/xslt/outputs/ddi/models.xsl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/xslt/outputs/ddi/models.xsl b/src/main/resources/xslt/outputs/ddi/models.xsl index b9b5dc511..fe08b57db 100644 --- a/src/main/resources/xslt/outputs/ddi/models.xsl +++ b/src/main/resources/xslt/outputs/ddi/models.xsl @@ -5,7 +5,7 @@ xmlns:d="ddi:datacollection:3_2" xmlns:s="ddi:studyunit:3_2" xmlns:r="ddi:reusable:3_2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:a="ddi:archive:3_2" xmlns:l="ddi:logicalproduct:3_2" xmlns:enoddi32="http://xml.insee.fr/apps/eno/out/ddi32" - exclude-result-prefixes="xs" version="2.0"> + exclude-result-prefixes="xs xd eno enoddi32" version="2.0"> <xd:doc> From 86baeb644e448303229ca4a3302dc351ff66991f Mon Sep 17 00:00:00 2001 From: CHTAINET Badr <badr.chtainet@akka.eu> Date: Thu, 4 Jul 2019 10:29:19 +0200 Subject: [PATCH 038/439] 289 Add warning for part 4 --- src/main/resources/xslt/outputs/ddi/models.xsl | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/resources/xslt/outputs/ddi/models.xsl b/src/main/resources/xslt/outputs/ddi/models.xsl index fe08b57db..19e486bdf 100644 --- a/src/main/resources/xslt/outputs/ddi/models.xsl +++ b/src/main/resources/xslt/outputs/ddi/models.xsl @@ -742,6 +742,7 @@ <xsl:variable name="type" select="enoddi32:get-ci-type($source-context)"/> <xsl:variable name="controlCrticity"> <xsl:choose> + <xsl:when test="normalize-space($type)='warn'">warning</xsl:when> <xsl:when test="normalize-space($type)='error'">stumblingblock</xsl:when> <xsl:otherwise>informational</xsl:otherwise> </xsl:choose> From 29a58400aa6efec20ad57f4edb5b01dbe016c577 Mon Sep 17 00:00:00 2001 From: CHTAINET Badr <Badr.CHTAINET@akka.eu> Date: Thu, 4 Jul 2019 11:57:29 +0200 Subject: [PATCH 039/439] 289 add min and max to managed ManagedDateTimeRepresentation --- .../resources/xslt/outputs/ddi/models.xsl | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/main/resources/xslt/outputs/ddi/models.xsl b/src/main/resources/xslt/outputs/ddi/models.xsl index 19e486bdf..ccf4c5669 100644 --- a/src/main/resources/xslt/outputs/ddi/models.xsl +++ b/src/main/resources/xslt/outputs/ddi/models.xsl @@ -207,6 +207,22 @@ <xsl:when test="$formatDate = ('PnYnM', 'PTnHnM')">duration</xsl:when> <xsl:otherwise>date</xsl:otherwise> </xsl:choose> + </xsl:variable> + <xsl:variable name="minValue"> + <xsl:choose> + <xsl:when test="$formatDate = 'YYYY'">1900</xsl:when> + <xsl:when test="$formatDate = 'YYYY-MM'">1900-01</xsl:when> + <xsl:when test="$formatDate = 'YYYY-MM-DD'">1900-01-01</xsl:when> + <xsl:when test="$formatDate = 'PnYnM'">P0Y0M</xsl:when> + <xsl:when test="$formatDate = 'PTnHnM'">PT0H0M</xsl:when> + </xsl:choose> + </xsl:variable> + <xsl:variable name="maxValue"> + <xsl:choose> + <xsl:when test="$formatDate = 'PnYnM'">P99Y11M</xsl:when> + <xsl:when test="$formatDate = 'PTnHnM'">PT99H59M</xsl:when> + <xsl:otherwise>format-dateTime(<xsl:value-of select="concat(current-date(), ',' ,$formatDate)"/>)</xsl:otherwise> + </xsl:choose> </xsl:variable> <r:ManagedDateTimeRepresentation> <r:Agency><xsl:value-of select="$agency"/></r:Agency> @@ -214,6 +230,10 @@ <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> <r:DateFieldFormat><xsl:value-of select="$formatDate"/></r:DateFieldFormat> <r:DateTypeCode controlledVocabularyID="INSEE-DTC-CV"><xsl:value-of select="$DateTypeCode"/></r:DateTypeCode> + <r:Range> + <r:MinimumValue included="true"><xsl:value-of select="$minValue"/></r:MinimumValue> + <r:MaximumValue included="true"><xsl:value-of select="$maxValue"/></r:MaximumValue> + </r:Range> </r:ManagedDateTimeRepresentation> </xsl:if> </xsl:for-each> From 2573149f05388bfd11a30d8d18b3026cbfd51476 Mon Sep 17 00:00:00 2001 From: CHTAINET Badr <Badr.CHTAINET@akka.eu> Date: Fri, 5 Jul 2019 12:07:57 +0200 Subject: [PATCH 040/439] 289 Add part 7 --- .../xslt/inputs/pogues-xml/templates.fods | 46 +++++++++++++--- .../resources/xslt/outputs/ddi/models.xsl | 54 ++++++++++++++----- 2 files changed, 79 insertions(+), 21 deletions(-) diff --git a/src/main/resources/xslt/inputs/pogues-xml/templates.fods b/src/main/resources/xslt/inputs/pogues-xml/templates.fods index 507826b55..fd803c21a 100644 --- a/src/main/resources/xslt/inputs/pogues-xml/templates.fods +++ b/src/main/resources/xslt/inputs/pogues-xml/templates.fods @@ -1,20 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> <office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.spreadsheet"> - <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>P11DT13H58M42S</meta:editing-duration><meta:editing-cycles>471</meta:editing-cycles><meta:generator>LibreOffice/6.1.5.2$Windows_X86_64 LibreOffice_project/90f8dcf33c87b3705e78202e3df5142b201bd805</meta:generator><dc:date>2019-07-12T11:43:00.396000000</dc:date><meta:document-statistic meta:table-count="1" meta:cell-count="350" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> + <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>P11DT14H3M37S</meta:editing-duration><meta:editing-cycles>473</meta:editing-cycles><meta:generator>LibreOffice/6.1.5.2$Windows_X86_64 LibreOffice_project/90f8dcf33c87b3705e78202e3df5142b201bd805</meta:generator><dc:date>2019-07-18T12:46:55.911000000</dc:date><meta:document-statistic meta:table-count="1" meta:cell-count="358" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> <office:settings> <config:config-item-set config:name="ooo:view-settings"> <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item> <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item> <config:config-item config:name="VisibleAreaWidth" config:type="int">53973</config:config-item> - <config:config-item config:name="VisibleAreaHeight" config:type="int">54257</config:config-item> + <config:config-item config:name="VisibleAreaHeight" config:type="int">55414</config:config-item> <config:config-item-map-indexed config:name="Views"> <config:config-item-map-entry> <config:config-item config:name="ViewId" config:type="string">view1</config:config-item> <config:config-item-map-named config:name="Tables"> <config:config-item-map-entry config:name="Sheet1"> - <config:config-item config:name="CursorPositionX" config:type="int">2</config:config-item> - <config:config-item config:name="CursorPositionY" config:type="int">80</config:config-item> + <config:config-item config:name="CursorPositionX" config:type="int">0</config:config-item> + <config:config-item config:name="CursorPositionY" config:type="int">41</config:config-item> <config:config-item config:name="HorizontalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="VerticalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="HorizontalSplitPosition" config:type="int">0</config:config-item> @@ -23,7 +23,7 @@ <config:config-item config:name="PositionLeft" config:type="int">0</config:config-item> <config:config-item config:name="PositionRight" config:type="int">0</config:config-item> <config:config-item config:name="PositionTop" config:type="int">0</config:config-item> - <config:config-item config:name="PositionBottom" config:type="int">66</config:config-item> + <config:config-item config:name="PositionBottom" config:type="int">24</config:config-item> <config:config-item config:name="ZoomType" config:type="short">0</config:config-item> <config:config-item config:name="ZoomValue" config:type="int">100</config:config-item> <config:config-item config:name="PageViewZoomValue" config:type="int">60</config:config-item> @@ -598,7 +598,7 @@ <text:p><text:sheet-name>???</text:sheet-name><text:s/>(<text:title>???</text:title>)</text:p> </style:region-left> <style:region-right> - <text:p><text:date style:data-style-name="N2" text:date-value="2019-07-12">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="11:41:45.968000000">00:00:00</text:time></text:p> + <text:p><text:date style:data-style-name="N2" text:date-value="2019-07-18">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="12:42:00.639000000">00:00:00</text:time></text:p> </style:region-right> </style:header> <style:header-left style:display="false"/> @@ -1441,6 +1441,22 @@ </table:table-cell> <table:table-cell table:number-columns-repeated="1019"/> </table:table-row> + <table:table-row table:style-name="ro2"> + <table:table-cell table:style-name="Default" office:value-type="string" calcext:value-type="string"> + <text:p>*</text:p> + </table:table-cell> + <table:table-cell table:style-name="Default" office:value-type="string" calcext:value-type="string"> + <text:p>enopogues:get-maximum</text:p> + </table:table-cell> + <table:table-cell table:style-name="Default" office:value-type="string" calcext:value-type="string"> + <text:p>pogues:Maximum</text:p> + </table:table-cell> + <table:table-cell table:style-name="Default"/> + <table:table-cell table:style-name="Default" office:value-type="string" calcext:value-type="string"> + <text:p>Return the maximal value of the data type</text:p> + </table:table-cell> + <table:table-cell table:style-name="Default" table:number-columns-repeated="1019"/> + </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>pogues:Datatype[not(@visualizationHint) and @xsi:type='NumericDatatypeType']</text:p> @@ -1457,6 +1473,22 @@ </table:table-cell> <table:table-cell table:number-columns-repeated="1019"/> </table:table-row> + <table:table-row table:style-name="ro2"> + <table:table-cell table:style-name="Default" office:value-type="string" calcext:value-type="string"> + <text:p>*</text:p> + </table:table-cell> + <table:table-cell table:style-name="Default" office:value-type="string" calcext:value-type="string"> + <text:p>enopogues:get-minimum</text:p> + </table:table-cell> + <table:table-cell table:style-name="Default" office:value-type="string" calcext:value-type="string"> + <text:p>pogues:Minimum</text:p> + </table:table-cell> + <table:table-cell table:style-name="Default"/> + <table:table-cell table:style-name="Default" office:value-type="string" calcext:value-type="string"> + <text:p>Return the minimal value of the data type</text:p> + </table:table-cell> + <table:table-cell table:style-name="Default" table:number-columns-repeated="1019"/> + </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>pogues:Datatype[not(@visualizationHint) and @xsi:type='NumericDatatypeType']</text:p> @@ -2233,7 +2265,7 @@ <table:table-row table:style-name="ro2" table:number-rows-repeated="61"> <table:table-cell table:number-columns-repeated="1024"/> </table:table-row> - <table:table-row table:style-name="ro1" table:number-rows-repeated="1048418"> + <table:table-row table:style-name="ro1" table:number-rows-repeated="1048416"> <table:table-cell table:number-columns-repeated="1024"/> </table:table-row> <table:table-row table:style-name="ro1"> diff --git a/src/main/resources/xslt/outputs/ddi/models.xsl b/src/main/resources/xslt/outputs/ddi/models.xsl index ccf4c5669..704ce292b 100644 --- a/src/main/resources/xslt/outputs/ddi/models.xsl +++ b/src/main/resources/xslt/outputs/ddi/models.xsl @@ -1449,25 +1449,51 @@ <xsl:template match="driver-VariableScheme//DateTimeDomain | driver-VariableScheme//DurationDomain" mode="model"> <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="agency" as="xs:string" tunnel="yes"/> - <xsl:variable name="format" select="enoddi32:get-format($source-context)"/> + <xsl:variable name="maxVal" select="enoddi32:get-high($source-context)"/> + <xsl:variable name="minVal" select="enoddi32:get-low($source-context)"/> + <!-- Keep compatibility with old date if they don't have format --> + <xsl:variable name="format"> + <xsl:choose> + <xsl:when test="normalize-space(enoddi32:get-format($source-context)) != ('',' ')"><xsl:value-of select="enoddi32:get-format($source-context)"/></xsl:when> + <xsl:otherwise>YYYY-MM-DD</xsl:otherwise> + </xsl:choose> + </xsl:variable> <!-- Id definition depend on date or duration type --> <xsl:variable name="id-date-duration"> <xsl:choose> - <xsl:when test="name() = 'DurationDomain'">Duration</xsl:when> - <xsl:otherwise>DateTimedate</xsl:otherwise> - </xsl:choose> - <!-- Keep compatibility with old date if they don't have format --> - <xsl:choose> - <xsl:when test="$format != ''"><xsl:value-of select="concat('-',$format)"/></xsl:when> - <xsl:otherwise><xsl:value-of select="concat('-', 'YYYY-MM-DD')"/></xsl:otherwise> + <xsl:when test="name() = 'DurationDomain'"><xsl:value-of select="concat('Duration-', $format)"/></xsl:when> + <xsl:otherwise><xsl:value-of select="concat('DateTimedate-', $format)"/></xsl:otherwise> </xsl:choose> </xsl:variable> - <r:DateTimeRepresentationReference> - <r:Agency><xsl:value-of select="$agency"/></r:Agency> - <r:ID>INSEE-COMMUN-MNR-<xsl:value-of select="$id-date-duration"/></r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> - <r:TypeOfObject>ManagedDateTimeRepresentation</r:TypeOfObject> - </r:DateTimeRepresentationReference> + <xsl:variable name="DateTypeCode"> + <xsl:choose> + <xsl:when test="$format = 'YYYY'">gYear</xsl:when> + <xsl:when test="$format = 'YYYY-MM'">gYearMonth</xsl:when> + <xsl:when test="$format = ('PnYnM', 'PTnHnM')">duration</xsl:when> + <xsl:otherwise>date</xsl:otherwise> + </xsl:choose> + </xsl:variable> + <!-- Generate DateTimeRepresentation or DateTimeRepresentationReference depending on min and max existence --> + <xsl:choose> + <xsl:when test="$maxVal != '' or $minVal != ''"> + <r:DateTimeRepresentation> + <r:DateFieldFormat><xsl:value-of select="$format"/></r:DateFieldFormat> + <r:DateTypeCode controlledVocabularyID="INSEE-DTC-CV"><xsl:value-of select="$DateTypeCode"/></r:DateTypeCode> + <r:Range> + <r:MinimumValue included="true"><xsl:value-of select="$minVal"/></r:MinimumValue> + <r:MaximumValue included="true"><xsl:value-of select="$maxVal"/></r:MaximumValue> + </r:Range> + </r:DateTimeRepresentation> + </xsl:when> + <xsl:otherwise> + <r:DateTimeRepresentationReference> + <r:Agency><xsl:value-of select="$agency"/></r:Agency> + <r:ID>INSEE-COMMUN-MNR-<xsl:value-of select="$id-date-duration"/></r:ID> + <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> + <r:TypeOfObject>ManagedDateTimeRepresentation</r:TypeOfObject> + </r:DateTimeRepresentationReference> + </xsl:otherwise> + </xsl:choose> </xsl:template> <xsl:template match="driver-ManagedRepresentationScheme//*" mode="model"> From e198c0ed053cd6af5172834c320faf31fa1890a0 Mon Sep 17 00:00:00 2001 From: CHTAINET Badr <Badr.CHTAINET@akka.eu> Date: Wed, 10 Jul 2019 16:32:17 +0200 Subject: [PATCH 041/439] 289 optimization --- .../resources/xslt/outputs/ddi/models.xsl | 159 +++++++++++------- 1 file changed, 100 insertions(+), 59 deletions(-) diff --git a/src/main/resources/xslt/outputs/ddi/models.xsl b/src/main/resources/xslt/outputs/ddi/models.xsl index 704ce292b..dcf255340 100644 --- a/src/main/resources/xslt/outputs/ddi/models.xsl +++ b/src/main/resources/xslt/outputs/ddi/models.xsl @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl" - xmlns:eno="http://xml.insee.fr/apps/eno" xmlns:g="ddi:group:3_2" - xmlns:d="ddi:datacollection:3_2" xmlns:s="ddi:studyunit:3_2" xmlns:r="ddi:reusable:3_2" - xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:a="ddi:archive:3_2" - xmlns:l="ddi:logicalproduct:3_2" xmlns:enoddi32="http://xml.insee.fr/apps/eno/out/ddi32" + xmlns:eno="http://xml.insee.fr/apps/eno" xmlns:g="ddi:group:3_3" + xmlns:d="ddi:datacollection:3_3" xmlns:s="ddi:studyunit:3_3" xmlns:r="ddi:reusable:3_3" + xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:a="ddi:archive:3_3" + xmlns:l="ddi:logicalproduct:3_3" xmlns:enoddi32="http://xml.insee.fr/apps/eno/out/ddi32" exclude-result-prefixes="xs xd eno enoddi32" version="2.0"> @@ -221,7 +221,7 @@ <xsl:choose> <xsl:when test="$formatDate = 'PnYnM'">P99Y11M</xsl:when> <xsl:when test="$formatDate = 'PTnHnM'">PT99H59M</xsl:when> - <xsl:otherwise>format-dateTime(<xsl:value-of select="concat(current-date(), ',' ,$formatDate)"/>)</xsl:otherwise> + <xsl:otherwise>format-dateTime(current-date(),<xsl:value-of select="$formatDate"/>)</xsl:otherwise> </xsl:choose> </xsl:variable> <r:ManagedDateTimeRepresentation> @@ -239,7 +239,7 @@ </xsl:for-each> </r:ManagedRepresentationScheme> </g:ResourcePackage> - <s:StudyUnit xmlns="ddi:studyunit:3_2"> + <s:StudyUnit> <r:Agency><xsl:value-of select="$agency"/></r:Agency> <r:ID><xsl:value-of select="concat('StudyUnit-',enoddi32:get-id($source-context))"/></r:ID> <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> @@ -271,8 +271,8 @@ <r:ID><xsl:value-of select="concat('InstrumentScheme-',enoddi32:get-id($source-context))"/></r:ID> <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> <d:Instrument xmlns:pogues="http://xml.insee.fr/schema/applis/pogues" - xmlns:pr="ddi:ddiprofile:3_2" xmlns:c="ddi:conceptualcomponent:3_2" - xmlns:cm="ddi:comparative:3_2"> + xmlns:pr="ddi:ddiprofile:3_3" xmlns:c="ddi:conceptualcomponent:3_3" + xmlns:cm="ddi:comparative:3_3"> <r:Agency><xsl:value-of select="$agency"/></r:Agency> <r:ID><xsl:value-of select="concat('Instrument-',enoddi32:get-id($source-context))"/></r:ID> <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> @@ -511,19 +511,21 @@ <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="agency" as="xs:string" tunnel="yes"/> <d:ExternalAid> - <xsl:variable name="ID" select="enoddi32:get-id($source-context)"/> - <r:Agency><xsl:value-of select="$agency"/></r:Agency> - <r:ID><xsl:value-of select="$ID"/></r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> - <r:Description> - <r:Content> - <xhtml:div class="FlowControl" id="{$ID}"> - <xhtml:div class="Description"><xsl:value-of select="enoddi32:get-description($source-context)"/></xhtml:div> - <xhtml:div class="Expression"><xsl:value-of select="enoddi32:get-expression($source-context)"/></xhtml:div> - <xhtml:div class="IfTrue"><xsl:value-of select="enoddi32:get-if-true($source-context)"/></xhtml:div> - </xhtml:div> - </r:Content> - </r:Description> + <r:OtherMaterial> + <xsl:variable name="ID" select="enoddi32:get-id($source-context)"/> + <r:Agency><xsl:value-of select="$agency"/></r:Agency> + <r:ID><xsl:value-of select="$ID"/></r:ID> + <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> + <r:Description> + <r:Content> + <xhtml:div class="FlowControl" id="{$ID}"> + <xhtml:div class="Description"><xsl:value-of select="enoddi32:get-description($source-context)"/></xhtml:div> + <xhtml:div class="Expression"><xsl:value-of select="enoddi32:get-expression($source-context)"/></xhtml:div> + <xhtml:div class="IfTrue"><xsl:value-of select="enoddi32:get-if-true($source-context)"/></xhtml:div> + </xhtml:div> + </r:Content> + </r:Description> + </r:OtherMaterial> </d:ExternalAid> </xsl:template> @@ -531,7 +533,7 @@ <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="agency" tunnel="yes"/> <!-- All CodeLists (regular, fakes and boolean) are stored in a same CodeListScheme. --> - <l:CodeListScheme xmlns="ddi:instance:3_2"> + <l:CodeListScheme> <r:Agency><xsl:value-of select="$agency"/></r:Agency> <r:ID><xsl:value-of select="concat(enoddi32:get-survey-name($source-context),'-CLS')"/></r:ID> <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> @@ -760,6 +762,13 @@ </d:InterviewerInstructionReference> </xsl:if> <xsl:variable name="type" select="enoddi32:get-ci-type($source-context)"/> + <xsl:variable name="idCrticity"> + <xsl:choose> + <xsl:when test="normalize-space($type)='warn'">2</xsl:when> + <xsl:when test="normalize-space($type)='error'">3</xsl:when> + <xsl:otherwise>1</xsl:otherwise> + </xsl:choose> + </xsl:variable> <xsl:variable name="controlCrticity"> <xsl:choose> <xsl:when test="normalize-space($type)='warn'">warning</xsl:when> @@ -767,7 +776,8 @@ <xsl:otherwise>informational</xsl:otherwise> </xsl:choose> </xsl:variable> - <d:TypeOfComputationItem controlledVocabularyID="INSEE-TOCI-CL-1"> + <d:TypeOfComputationItem> + <xsl:attribute name="controlledVocabularyID">INSEE-TOCI-CL-<xsl:value-of select="$idCrticity"/></xsl:attribute> <xsl:value-of select="$controlCrticity"/> </d:TypeOfComputationItem> <!-- Have a simpler way to deal with regular controls & mandatory response. --> @@ -984,7 +994,6 @@ <r:Agency><xsl:value-of select="$agency"/></r:Agency> <r:ID><xsl:value-of select="enoddi32:get-id($source-context)"/></r:ID> <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> - <d:TypeOfSequence controlledVocabularyID="INSEE-TOS-CL-1">hideable</d:TypeOfSequence> <r:Label> <r:Content xml:lang="{enoddi32:get-lang($source-context)}">A définir</r:Content> </r:Label> @@ -993,6 +1002,7 @@ <xsl:value-of select="enoddi32:get-description($source-context)"/> </r:Content> </r:Description> + <d:TypeOfIfThenElse controlledVocabularyID="INSEE-TOITE-CL-1">hideable</d:TypeOfIfThenElse> <d:IfCondition> <xsl:call-template name="Command"> <xsl:with-param name="source-context" select="enoddi32:get-command($source-context)" tunnel="yes"/> @@ -1390,6 +1400,11 @@ <xsl:if test="number($decimalPositions) = number($decimalPositions) and number($decimalPositions) > 0"> <xsl:attribute name="decimalPositions" select="$decimalPositions"/> </xsl:if> + <!-- MeasurementUnit --> + <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> + <xsl:with-param name="driver" select="eno:append-empty-element('driver-VariableScheme', .)" tunnel="yes"/> + <xsl:with-param name="agency" select="$agency" as="xs:string" tunnel="yes"/> + </xsl:apply-templates> <r:NumberRange> <r:Low isInclusive="true"> <xsl:value-of select="enoddi32:get-low($source-context)"/> @@ -1400,50 +1415,75 @@ </r:NumberRange> <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> </r:NumericRepresentation> - <!-- MeasurementUnit --> - <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> - <xsl:with-param name="driver" select="eno:append-empty-element('driver-VariableScheme', .)" tunnel="yes"/> - <xsl:with-param name="agency" select="$agency" as="xs:string" tunnel="yes"/> - </xsl:apply-templates> </xsl:template> <xsl:template match="DateTimeDomain | DurationDomain" mode="model"> <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="agency" as="xs:string" tunnel="yes"/> <xsl:param name="mandatory" as="xs:string" tunnel="yes" select="''"/> - <xsl:variable name="format" select="enoddi32:get-format($source-context)"/> + <xsl:variable name="maxVal" select="enoddi32:get-high($source-context)"/> + <xsl:variable name="minVal" select="enoddi32:get-low($source-context)"/> + <!-- Keep compatibility with old date if they don't have format --> + <xsl:variable name="format"> + <xsl:choose> + <xsl:when test="enoddi32:get-format($source-context) != ''"><xsl:value-of select="enoddi32:get-format($source-context)"/></xsl:when> + <xsl:otherwise>YYYY-MM-DD</xsl:otherwise> + </xsl:choose> + </xsl:variable> <!-- Id definition depend on date or duration type --> <xsl:variable name="id-date-duration"> <xsl:choose> - <xsl:when test="name() = 'DurationDomain'">Duration</xsl:when> - <xsl:otherwise>DateTimedate</xsl:otherwise> - </xsl:choose> - <!-- Keep compatibility with old date if they don't have format --> - <xsl:choose> - <xsl:when test="$format != ''"><xsl:value-of select="concat('-',$format)"/></xsl:when> - <xsl:otherwise><xsl:value-of select="concat('-', 'YYYY-MM-DD')"/></xsl:otherwise> + <xsl:when test="name() = 'DurationDomain'"><xsl:value-of select="concat('Duration-', $format)"/></xsl:when> + <xsl:otherwise><xsl:value-of select="concat('DateTimedate-', $format)"/></xsl:otherwise> </xsl:choose> </xsl:variable> - <d:DateTimeDomainReference> - <r:Agency><xsl:value-of select="$agency"/></r:Agency> - <r:ID>INSEE-COMMUN-MNR-<xsl:value-of select="$id-date-duration"/></r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> - <r:TypeOfObject>ManagedDateTimeRepresentation</r:TypeOfObject> - <r:OutParameter isArray="false"> - <r:Agency><xsl:value-of select="$agency"/></r:Agency> - <r:ID><xsl:value-of select="enoddi32:get-rdop-id($source-context)"/></r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> - <r:DateTimeRepresentationReference> - <r:Agency><xsl:value-of select="$agency"/></r:Agency> - <r:ID>INSEE-COMMUN-MNR-<xsl:value-of select="$id-date-duration"/></r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> - <r:TypeOfObject>ManagedDateTimeRepresentation</r:TypeOfObject> - </r:DateTimeRepresentationReference> - </r:OutParameter> - <xsl:if test="$mandatory = 'mandatory'"> - <r:ResponseCardinality minimumResponses="1" maximumResponses="1"/> - </xsl:if> - </d:DateTimeDomainReference> + <!-- TypeCode depend on format --> + <xsl:variable name="DateTypeCode"> + <xsl:choose> + <xsl:when test="$format = 'YYYY'">gYear</xsl:when> + <xsl:when test="$format = 'YYYY-MM'">gYearMonth</xsl:when> + <xsl:when test="$format = ('PnYnM', 'PTnHnM')">duration</xsl:when> + <xsl:otherwise>date</xsl:otherwise> + </xsl:choose> + </xsl:variable> + <!-- Generate DateTimeRepresentation or DateTimeRepresentationReference depending on min and max existence --> + <xsl:choose> + <xsl:when test="$maxVal != '' or $minVal != ''"> + <d:DateTimeDomain> + <r:DateFieldFormat><xsl:value-of select="$format"/></r:DateFieldFormat> + <r:DateTypeCode controlledVocabularyID="INSEE-DTC-CV"><xsl:value-of select="$DateTypeCode"/></r:DateTypeCode> + <r:Range> + <r:MinimumValue included="true"><xsl:value-of select="$minVal"/></r:MinimumValue> + <r:MaximumValue included="true"><xsl:value-of select="$maxVal"/></r:MaximumValue> + </r:Range> + <xsl:if test="$mandatory = 'mandatory'"> + <r:ResponseCardinality minimumResponses="1" maximumResponses="1"/> + </xsl:if> + </d:DateTimeDomain> + </xsl:when> + <xsl:otherwise> + <d:DateTimeDomainReference> + <r:Agency><xsl:value-of select="$agency"/></r:Agency> + <r:ID>INSEE-COMMUN-MNR-<xsl:value-of select="$id-date-duration"/></r:ID> + <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> + <r:TypeOfObject>ManagedDateTimeRepresentation</r:TypeOfObject> + <r:OutParameter isArray="false"> + <r:Agency><xsl:value-of select="$agency"/></r:Agency> + <r:ID><xsl:value-of select="enoddi32:get-rdop-id($source-context)"/></r:ID> + <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> + <r:DateTimeRepresentationReference> + <r:Agency><xsl:value-of select="$agency"/></r:Agency> + <r:ID>INSEE-COMMUN-MNR-<xsl:value-of select="$id-date-duration"/></r:ID> + <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> + <r:TypeOfObject>ManagedDateTimeRepresentation</r:TypeOfObject> + </r:DateTimeRepresentationReference> + </r:OutParameter> + <xsl:if test="$mandatory = 'mandatory'"> + <r:ResponseCardinality minimumResponses="1" maximumResponses="1"/> + </xsl:if> + </d:DateTimeDomainReference> + </xsl:otherwise> + </xsl:choose> </xsl:template> <xsl:template match="driver-VariableScheme//DateTimeDomain | driver-VariableScheme//DurationDomain" mode="model"> @@ -1454,7 +1494,7 @@ <!-- Keep compatibility with old date if they don't have format --> <xsl:variable name="format"> <xsl:choose> - <xsl:when test="normalize-space(enoddi32:get-format($source-context)) != ('',' ')"><xsl:value-of select="enoddi32:get-format($source-context)"/></xsl:when> + <xsl:when test="enoddi32:get-format($source-context) != ''"><xsl:value-of select="enoddi32:get-format($source-context)"/></xsl:when> <xsl:otherwise>YYYY-MM-DD</xsl:otherwise> </xsl:choose> </xsl:variable> @@ -1465,6 +1505,7 @@ <xsl:otherwise><xsl:value-of select="concat('DateTimedate-', $format)"/></xsl:otherwise> </xsl:choose> </xsl:variable> + <!-- TypeCode depend on format --> <xsl:variable name="DateTypeCode"> <xsl:choose> <xsl:when test="$format = 'YYYY'">gYear</xsl:when> @@ -1477,7 +1518,7 @@ <xsl:choose> <xsl:when test="$maxVal != '' or $minVal != ''"> <r:DateTimeRepresentation> - <r:DateFieldFormat><xsl:value-of select="$format"/></r:DateFieldFormat> + <r:DateFieldFormat><xsl:value-of select="$format"/></r:DateFieldFormat> <r:DateTypeCode controlledVocabularyID="INSEE-DTC-CV"><xsl:value-of select="$DateTypeCode"/></r:DateTypeCode> <r:Range> <r:MinimumValue included="true"><xsl:value-of select="$minVal"/></r:MinimumValue> From 25336fa52ee1505fa1b94e0b25abbc9e9b3366c3 Mon Sep 17 00:00:00 2001 From: CHTAINET Badr <Badr.CHTAINET@akka.eu> Date: Thu, 11 Jul 2019 15:46:45 +0200 Subject: [PATCH 042/439] 289 Migrate util files to 3.3 --- src/main/resources/xslt/util/ddi/tweak-xhtml-for-ddi.xsl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/xslt/util/ddi/tweak-xhtml-for-ddi.xsl b/src/main/resources/xslt/util/ddi/tweak-xhtml-for-ddi.xsl index d1cdf0385..0286dad96 100644 --- a/src/main/resources/xslt/util/ddi/tweak-xhtml-for-ddi.xsl +++ b/src/main/resources/xslt/util/ddi/tweak-xhtml-for-ddi.xsl @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xhtml="http://www.w3.org/1999/xhtml" - xmlns:d="ddi:datacollection:3_2" xmlns:r="ddi:reusable:3_2" exclude-result-prefixes="xs" + xmlns:d="ddi:datacollection:3_3" xmlns:r="ddi:reusable:3_3" exclude-result-prefixes="xs" version="2.0"> <!-- From ce08f9debd0b47cad550c7b8948969dc3a05d72c Mon Sep 17 00:00:00 2001 From: CHTAINET Badr <Badr.CHTAINET@akka.eu> Date: Fri, 12 Jul 2019 11:39:57 +0200 Subject: [PATCH 043/439] 289 Migrate file pogues-xml2ddi-fixed to V3.3 --- .../transformations/pogues-xml2ddi/pogues-xml2ddi-fixed.xsl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/xslt/transformations/pogues-xml2ddi/pogues-xml2ddi-fixed.xsl b/src/main/resources/xslt/transformations/pogues-xml2ddi/pogues-xml2ddi-fixed.xsl index fa7ec9a2d..60d17ee57 100644 --- a/src/main/resources/xslt/transformations/pogues-xml2ddi/pogues-xml2ddi-fixed.xsl +++ b/src/main/resources/xslt/transformations/pogues-xml2ddi/pogues-xml2ddi-fixed.xsl @@ -6,8 +6,8 @@ xmlns:enoddi="http://xml.insee.fr/apps/eno/ddi" xmlns:enofr="http://xml.insee.fr/apps/eno/form-runner" xmlns:enoddi2fr="http://xml.insee.fr/apps/eno/ddi2form-runner" - xmlns:d="ddi:datacollection:3_2" - xmlns:r="ddi:reusable:3_2" xmlns:l="ddi:logicalproduct:3_2" + xmlns:d="ddi:datacollection:3_3" + xmlns:r="ddi:reusable:3_3" xmlns:l="ddi:logicalproduct:3_3" xmlns:enoddi32="http://xml.insee.fr/apps/eno/out/ddi32" xmlns:enopogues="http://xml.insee.fr/apps/eno/in/pogues-xml" version="2.0"> From c8aeac8973287a002a86ad110028ab6a9ba476bb Mon Sep 17 00:00:00 2001 From: CHTAINET Badr <Badr.CHTAINET@akka.eu> Date: Fri, 12 Jul 2019 14:32:42 +0200 Subject: [PATCH 044/439] 289 Fix format-date --- src/main/resources/xslt/outputs/ddi/models.xsl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/xslt/outputs/ddi/models.xsl b/src/main/resources/xslt/outputs/ddi/models.xsl index dcf255340..540c052ee 100644 --- a/src/main/resources/xslt/outputs/ddi/models.xsl +++ b/src/main/resources/xslt/outputs/ddi/models.xsl @@ -221,7 +221,7 @@ <xsl:choose> <xsl:when test="$formatDate = 'PnYnM'">P99Y11M</xsl:when> <xsl:when test="$formatDate = 'PTnHnM'">PT99H59M</xsl:when> - <xsl:otherwise>format-dateTime(current-date(),<xsl:value-of select="$formatDate"/>)</xsl:otherwise> + <xsl:otherwise>format-dateTime(current-date(),'<xsl:value-of select="$formatDate"/>')</xsl:otherwise> </xsl:choose> </xsl:variable> <r:ManagedDateTimeRepresentation> From 88d7c5c071c5921880c2dd738d5bf8937969b12d Mon Sep 17 00:00:00 2001 From: CHTAINET Badr <Badr.CHTAINET@akka.eu> Date: Mon, 15 Jul 2019 15:47:26 +0200 Subject: [PATCH 045/439] 289 new changes --- src/main/resources/xslt/outputs/ddi/models.xsl | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/resources/xslt/outputs/ddi/models.xsl b/src/main/resources/xslt/outputs/ddi/models.xsl index 540c052ee..2e36cf7f7 100644 --- a/src/main/resources/xslt/outputs/ddi/models.xsl +++ b/src/main/resources/xslt/outputs/ddi/models.xsl @@ -5,7 +5,7 @@ xmlns:d="ddi:datacollection:3_3" xmlns:s="ddi:studyunit:3_3" xmlns:r="ddi:reusable:3_3" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:a="ddi:archive:3_3" xmlns:l="ddi:logicalproduct:3_3" xmlns:enoddi32="http://xml.insee.fr/apps/eno/out/ddi32" - exclude-result-prefixes="xs xd eno enoddi32" version="2.0"> + exclude-result-prefixes="xd eno enoddi32" version="2.0"> <xd:doc> @@ -1456,6 +1456,11 @@ <r:MinimumValue included="true"><xsl:value-of select="$minVal"/></r:MinimumValue> <r:MaximumValue included="true"><xsl:value-of select="$maxVal"/></r:MaximumValue> </r:Range> + <r:OutParameter isArray="false"> + <r:Agency><xsl:value-of select="$agency"/></r:Agency> + <r:ID><xsl:value-of select="enoddi32:get-rdop-id($source-context)"/></r:ID> + <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> + </r:OutParameter> <xsl:if test="$mandatory = 'mandatory'"> <r:ResponseCardinality minimumResponses="1" maximumResponses="1"/> </xsl:if> From 152c353c41f9dfefd8c5b24f0bb18d526af4bc0a Mon Sep 17 00:00:00 2001 From: CHTAINET Badr <Badr.CHTAINET@akka.eu> Date: Tue, 16 Jul 2019 11:51:00 +0200 Subject: [PATCH 046/439] 289 change out file --- src/test/resources/pogues-xml-to-ddi/out.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/src/test/resources/pogues-xml-to-ddi/out.xml b/src/test/resources/pogues-xml-to-ddi/out.xml index 7bb2e9a02..480b3a4b0 100644 --- a/src/test/resources/pogues-xml-to-ddi/out.xml +++ b/src/test/resources/pogues-xml-to-ddi/out.xml @@ -10996,4 +10996,3 @@ </d:InstrumentScheme> </d:DataCollection> </s:StudyUnit> -</DDIInstance> \ No newline at end of file From a1a9639fcbf47136428e3f9ca8fbaf9dba8c5a8a Mon Sep 17 00:00:00 2001 From: CHTAINET Badr <Badr.CHTAINET@akka.eu> Date: Thu, 18 Jul 2019 12:20:38 +0200 Subject: [PATCH 047/439] 289 Max and min values --- src/main/resources/xslt/outputs/ddi/models.xsl | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/main/resources/xslt/outputs/ddi/models.xsl b/src/main/resources/xslt/outputs/ddi/models.xsl index 2e36cf7f7..8b84717df 100644 --- a/src/main/resources/xslt/outputs/ddi/models.xsl +++ b/src/main/resources/xslt/outputs/ddi/models.xsl @@ -1453,8 +1453,12 @@ <r:DateFieldFormat><xsl:value-of select="$format"/></r:DateFieldFormat> <r:DateTypeCode controlledVocabularyID="INSEE-DTC-CV"><xsl:value-of select="$DateTypeCode"/></r:DateTypeCode> <r:Range> - <r:MinimumValue included="true"><xsl:value-of select="$minVal"/></r:MinimumValue> - <r:MaximumValue included="true"><xsl:value-of select="$maxVal"/></r:MaximumValue> + <xsl:if test="$minVal != '' "> + <r:MinimumValue included="true"><xsl:value-of select="$minVal"/></r:MinimumValue> + </xsl:if> + <xsl:if test="$maxVal != '' "> + <r:MaximumValue included="true"><xsl:value-of select="$maxVal"/></r:MaximumValue> + </xsl:if> </r:Range> <r:OutParameter isArray="false"> <r:Agency><xsl:value-of select="$agency"/></r:Agency> @@ -1526,8 +1530,12 @@ <r:DateFieldFormat><xsl:value-of select="$format"/></r:DateFieldFormat> <r:DateTypeCode controlledVocabularyID="INSEE-DTC-CV"><xsl:value-of select="$DateTypeCode"/></r:DateTypeCode> <r:Range> - <r:MinimumValue included="true"><xsl:value-of select="$minVal"/></r:MinimumValue> - <r:MaximumValue included="true"><xsl:value-of select="$maxVal"/></r:MaximumValue> + <xsl:if test="$minVal != '' "> + <r:MinimumValue included="true"><xsl:value-of select="$minVal"/></r:MinimumValue> + </xsl:if> + <xsl:if test="$maxVal != '' "> + <r:MaximumValue included="true"><xsl:value-of select="$maxVal"/></r:MaximumValue> + </xsl:if> </r:Range> </r:DateTimeRepresentation> </xsl:when> From bda56f4371a279e701d714b02e83b1ff6bffd061 Mon Sep 17 00:00:00 2001 From: CHTAINET Badr <Badr.CHTAINET@akka.eu> Date: Thu, 18 Jul 2019 14:37:11 +0200 Subject: [PATCH 048/439] 289 Add final out ddi file --- src/test/resources/pogues-xml-to-ddi/out.xml | 531 ++++++++++--------- 1 file changed, 269 insertions(+), 262 deletions(-) diff --git a/src/test/resources/pogues-xml-to-ddi/out.xml b/src/test/resources/pogues-xml-to-ddi/out.xml index 480b3a4b0..52605f2ac 100644 --- a/src/test/resources/pogues-xml-to-ddi/out.xml +++ b/src/test/resources/pogues-xml-to-ddi/out.xml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?><DDIInstance xmlns="ddi:instance:3_2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:a="ddi:archive:3_2" xmlns:r="ddi:reusable:3_2" xmlns:s="ddi:studyunit:3_2" xmlns:d="ddi:datacollection:3_2" xmlns:g="ddi:group:3_2" xmlns:eno="http://xml.insee.fr/apps/eno" xmlns:l="ddi:logicalproduct:3_2" xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl" xmlns:enoddi32="http://xml.insee.fr/apps/eno/out/ddi32" xmlns:xhtml="http://www.w3.org/1999/xhtml" xsi:schemaLocation="ddi:instance:3_2 ../../../src/main/resources/schema/instance.xsd" isMaintainable="true"> +<?xml version="1.0" encoding="UTF-8"?><DDIInstance xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="ddi:instance:3_3" xmlns:g="ddi:group:3_3" xmlns:d="ddi:datacollection:3_3" xmlns:s="ddi:studyunit:3_3" xmlns:r="ddi:reusable:3_3" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:a="ddi:archive:3_3" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:l="ddi:logicalproduct:3_3" xsi:schemaLocation="ddi:instance:3_3 https://www.ddialliance.org/Specification/DDI-Lifecycle/3.3/XMLSchema/instance.xsd" isMaintainable="true"> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-i6vwi0</r:ID> <r:Version>1</r:Version> @@ -144,7 +144,7 @@ <r:Label> <r:Content xml:lang="fr-FR">Questionnaire SIMPSONS</r:Content> </r:Label> - <d:TypeOfSequence codeListID="INSEE-TOS-CL-1">template</d:TypeOfSequence> + <d:TypeOfSequence controlledVocabularyID="INSEE-TOS-CL-1">template</d:TypeOfSequence> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p0ti5h</r:ID> @@ -180,7 +180,7 @@ <r:Version>1</r:Version> <r:TypeOfObject>Instruction</r:TypeOfObject> </d:InterviewerInstructionReference> - <d:TypeOfSequence codeListID="INSEE-TOS-CL-1">module</d:TypeOfSequence> + <d:TypeOfSequence controlledVocabularyID="INSEE-TOS-CL-1">module</d:TypeOfSequence> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p3dkx6-QC</r:ID> @@ -210,7 +210,7 @@ <r:Label> <r:Content xml:lang="fr-FR">General knowledge of the series</r:Content> </r:Label> - <d:TypeOfSequence codeListID="INSEE-TOS-CL-1">submodule</d:TypeOfSequence> + <d:TypeOfSequence controlledVocabularyID="INSEE-TOS-CL-1">submodule</d:TypeOfSequence> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j3343qhx-QC</r:ID> @@ -252,7 +252,7 @@ <r:Version>1</r:Version> <r:TypeOfObject>Instruction</r:TypeOfObject> </d:InterviewerInstructionReference> - <d:TypeOfSequence codeListID="INSEE-TOS-CL-1">module</d:TypeOfSequence> + <d:TypeOfSequence controlledVocabularyID="INSEE-TOS-CL-1">module</d:TypeOfSequence> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j3343clt-QC</r:ID> @@ -282,7 +282,7 @@ <r:Label> <r:Content xml:lang="fr-FR">Characters</r:Content> </r:Label> - <d:TypeOfSequence codeListID="INSEE-TOS-CL-1">module</d:TypeOfSequence> + <d:TypeOfSequence controlledVocabularyID="INSEE-TOS-CL-1">module</d:TypeOfSequence> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-QC</r:ID> @@ -324,7 +324,7 @@ <r:Label> <r:Content xml:lang="fr-FR">General questions</r:Content> </r:Label> - <d:TypeOfSequence codeListID="INSEE-TOS-CL-1">module</d:TypeOfSequence> + <d:TypeOfSequence controlledVocabularyID="INSEE-TOS-CL-1">module</d:TypeOfSequence> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qe237q</r:ID> @@ -354,7 +354,7 @@ <r:Label> <r:Content xml:lang="fr-FR">Kwik-E-Mart</r:Content> </r:Label> - <d:TypeOfSequence codeListID="INSEE-TOS-CL-1">submodule</d:TypeOfSequence> + <d:TypeOfSequence controlledVocabularyID="INSEE-TOS-CL-1">submodule</d:TypeOfSequence> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QC</r:ID> @@ -378,7 +378,7 @@ <r:Label> <r:Content xml:lang="fr-FR">Clowning</r:Content> </r:Label> - <d:TypeOfSequence codeListID="INSEE-TOS-CL-1">submodule</d:TypeOfSequence> + <d:TypeOfSequence controlledVocabularyID="INSEE-TOS-CL-1">submodule</d:TypeOfSequence> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QC</r:ID> @@ -396,7 +396,7 @@ <r:Label> <r:Content xml:lang="fr-FR">Transport</r:Content> </r:Label> - <d:TypeOfSequence codeListID="INSEE-TOS-CL-1">submodule</d:TypeOfSequence> + <d:TypeOfSequence controlledVocabularyID="INSEE-TOS-CL-1">submodule</d:TypeOfSequence> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QC</r:ID> @@ -414,7 +414,7 @@ <r:Label> <r:Content xml:lang="fr-FR">Favourite characters</r:Content> </r:Label> - <d:TypeOfSequence codeListID="INSEE-TOS-CL-1">module</d:TypeOfSequence> + <d:TypeOfSequence controlledVocabularyID="INSEE-TOS-CL-1">module</d:TypeOfSequence> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QC</r:ID> @@ -432,7 +432,7 @@ <r:Label> <r:Content xml:lang="fr-FR">Comment</r:Content> </r:Label> - <d:TypeOfSequence codeListID="INSEE-TOS-CL-1">module</d:TypeOfSequence> + <d:TypeOfSequence controlledVocabularyID="INSEE-TOS-CL-1">module</d:TypeOfSequence> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6z0z3us-QC</r:ID> @@ -450,6 +450,7 @@ <r:Description> <r:Content xml:lang="fr-FR"/> </r:Description> + <d:TypeOfIfThenElse controlledVocabularyID="INSEE-TOITE-CL-1">hideable</d:TypeOfIfThenElse> <d:IfCondition> <r:Command> <r:ProgramLanguage>xpath</r:ProgramLanguage> @@ -492,7 +493,6 @@ <r:Label> <r:Content xml:lang="fr-FR"/> </r:Label> - <d:TypeOfSequence codeListID="INSEE-TOS-CL-1">hideable</d:TypeOfSequence> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p0s7o5</r:ID> @@ -510,6 +510,7 @@ <r:Description> <r:Content xml:lang="fr-FR"/> </r:Description> + <d:TypeOfIfThenElse controlledVocabularyID="INSEE-TOITE-CL-1">hideable</d:TypeOfIfThenElse> <d:IfCondition> <r:Command> <r:ProgramLanguage>xpath</r:ProgramLanguage> @@ -552,7 +553,6 @@ <r:Label> <r:Content xml:lang="fr-FR"/> </r:Label> - <d:TypeOfSequence codeListID="INSEE-TOS-CL-1">hideable</d:TypeOfSequence> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j3341528</r:ID> @@ -846,6 +846,7 @@ <r:Version>1</r:Version> <r:TypeOfObject>Instruction</r:TypeOfObject> </d:InterviewerInstructionReference> + <d:TypeOfComputationItem controlledVocabularyID="INSEE-TOCI-CL-3">stumblingblock</d:TypeOfComputationItem> <r:CommandCode> <r:Command> <r:ProgramLanguage>xpath</r:ProgramLanguage> @@ -1075,7 +1076,6 @@ number(if (j4nwc63q-CI-0-IP-9='') then '0' else j4nwc63q-CI-0-IP-9)+ number(if (j4nwc63q-CI-0-IP-10='') then '0' else j4nwc63q-CI-0-IP-10)!= 100 </r:CommandContent> </r:Command> </r:CommandCode> - <!--<r:TypeOfComputationItem>error</r:TypeOfComputationItem>--> </d:ComputationItem> <d:StatementItem> <r:Agency>fr.insee</r:Agency> @@ -1194,19 +1194,21 @@ <r:ResponseCardinality maximumResponses="1"/> </d:NominalDomain> <d:ExternalAid> - <r:Agency>fr.insee</r:Agency> - <r:ID>j6p6my1d</r:ID> - <r:Version>1</r:Version> - <r:Description> - <r:Content> - <xhtml:div class="FlowControl" id="j6p6my1d"> - <xhtml:div class="Description">If you are not ready, please go to the end of the + <r:OtherMaterial> + <r:Agency>fr.insee</r:Agency> + <r:ID>j6p6my1d</r:ID> + <r:Version>1</r:Version> + <r:Description> + <r:Content> + <xhtml:div class="FlowControl" id="j6p6my1d"> + <xhtml:div class="Description">If you are not ready, please go to the end of the questionnaire</xhtml:div> - <xhtml:div class="Expression">$READY != '1'</xhtml:div> - <xhtml:div class="IfTrue">j6z12s2d</xhtml:div> - </xhtml:div> - </r:Content> - </r:Description> + <xhtml:div class="Expression">$READY != '1'</xhtml:div> + <xhtml:div class="IfTrue">j6z12s2d</xhtml:div> + </xhtml:div> + </r:Content> + </r:Description> + </r:OtherMaterial> </d:ExternalAid> </d:QuestionItem> <d:QuestionItem> @@ -1291,7 +1293,7 @@ <r:Low isInclusive="true">0</r:Low> <r:High isInclusive="true">99</r:High> </r:NumberRange> - <r:NumericTypeCode codeListID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6q9h8tj-RDOP-jbgdjy8h</r:ID> @@ -1397,7 +1399,7 @@ <r:Low isInclusive="true">0</r:Low> <r:High isInclusive="true">99</r:High> </r:NumberRange> - <r:NumericTypeCode codeListID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6z06z1e-RDOP-jbgddnrd</r:ID> @@ -1440,7 +1442,7 @@ </d:LiteralText> </d:QuestionText> <d:CodeDomain> - <r:GenericOutputFormat codeListID="INSEE-GOF-CV">radio-button</r:GenericOutputFormat> + <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV">radio-button</r:GenericOutputFormat> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334iumu</r:ID> @@ -1504,7 +1506,7 @@ </d:LiteralText> </d:QuestionText> <d:CodeDomain> - <r:GenericOutputFormat codeListID="INSEE-GOF-CV">checkbox</r:GenericOutputFormat> + <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV">checkbox</r:GenericOutputFormat> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qdqoen</r:ID> @@ -1568,7 +1570,7 @@ </d:LiteralText> </d:QuestionText> <d:CodeDomain> - <r:GenericOutputFormat codeListID="INSEE-GOF-CV">drop-down-list</r:GenericOutputFormat> + <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV">drop-down-list</r:GenericOutputFormat> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwo00f</r:ID> @@ -1745,7 +1747,7 @@ </d:CodeDomain> </d:GridDimension> <d:StructuredMixedGridResponseDomain> - <d:GridResponseDomain> + <d:GridResponseDomainInMixed> <d:NominalDomain> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> @@ -1772,8 +1774,8 @@ <d:SelectDimension rank="1" rangeMinimum="1" rangeMaximum="1"/> </d:CellCoordinatesAsDefined> </d:GridAttachment> - </d:GridResponseDomain> - <d:GridResponseDomain> + </d:GridResponseDomainInMixed> + <d:GridResponseDomainInMixed> <d:NominalDomain> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> @@ -1800,8 +1802,8 @@ <d:SelectDimension rank="1" rangeMinimum="2" rangeMaximum="2"/> </d:CellCoordinatesAsDefined> </d:GridAttachment> - </d:GridResponseDomain> - <d:GridResponseDomain> + </d:GridResponseDomainInMixed> + <d:GridResponseDomainInMixed> <d:NominalDomain> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> @@ -1828,8 +1830,8 @@ <d:SelectDimension rank="1" rangeMinimum="3" rangeMaximum="3"/> </d:CellCoordinatesAsDefined> </d:GridAttachment> - </d:GridResponseDomain> - <d:GridResponseDomain> + </d:GridResponseDomainInMixed> + <d:GridResponseDomainInMixed> <d:NominalDomain> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> @@ -1856,7 +1858,7 @@ <d:SelectDimension rank="1" rangeMinimum="4" rangeMaximum="4"/> </d:CellCoordinatesAsDefined> </d:GridAttachment> - </d:GridResponseDomain> + </d:GridResponseDomainInMixed> </d:StructuredMixedGridResponseDomain> <d:InterviewerInstructionReference> <r:Agency>fr.insee</r:Agency> @@ -1976,9 +1978,9 @@ </d:CodeDomain> </d:GridDimension> <d:StructuredMixedGridResponseDomain> - <d:GridResponseDomain> + <d:GridResponseDomainInMixed> <d:CodeDomain> - <r:GenericOutputFormat codeListID="INSEE-GOF-CV">radio-button</r:GenericOutputFormat> + <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV">radio-button</r:GenericOutputFormat> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> @@ -2005,10 +2007,10 @@ <d:SelectDimension rank="1" rangeMinimum="1" rangeMaximum="1"/> </d:CellCoordinatesAsDefined> </d:GridAttachment> - </d:GridResponseDomain> - <d:GridResponseDomain> + </d:GridResponseDomainInMixed> + <d:GridResponseDomainInMixed> <d:CodeDomain> - <r:GenericOutputFormat codeListID="INSEE-GOF-CV">radio-button</r:GenericOutputFormat> + <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV">radio-button</r:GenericOutputFormat> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> @@ -2035,10 +2037,10 @@ <d:SelectDimension rank="1" rangeMinimum="2" rangeMaximum="2"/> </d:CellCoordinatesAsDefined> </d:GridAttachment> - </d:GridResponseDomain> - <d:GridResponseDomain> + </d:GridResponseDomainInMixed> + <d:GridResponseDomainInMixed> <d:CodeDomain> - <r:GenericOutputFormat codeListID="INSEE-GOF-CV">radio-button</r:GenericOutputFormat> + <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV">radio-button</r:GenericOutputFormat> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> @@ -2065,10 +2067,10 @@ <d:SelectDimension rank="1" rangeMinimum="3" rangeMaximum="3"/> </d:CellCoordinatesAsDefined> </d:GridAttachment> - </d:GridResponseDomain> - <d:GridResponseDomain> + </d:GridResponseDomainInMixed> + <d:GridResponseDomainInMixed> <d:CodeDomain> - <r:GenericOutputFormat codeListID="INSEE-GOF-CV">radio-button</r:GenericOutputFormat> + <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV">radio-button</r:GenericOutputFormat> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> @@ -2095,7 +2097,7 @@ <d:SelectDimension rank="1" rangeMinimum="4" rangeMaximum="4"/> </d:CellCoordinatesAsDefined> </d:GridAttachment> - </d:GridResponseDomain> + </d:GridResponseDomainInMixed> </d:StructuredMixedGridResponseDomain> </d:QuestionGrid> <d:QuestionGrid> @@ -2209,9 +2211,9 @@ </d:CodeDomain> </d:GridDimension> <d:StructuredMixedGridResponseDomain> - <d:GridResponseDomain> + <d:GridResponseDomainInMixed> <d:CodeDomain> - <r:GenericOutputFormat codeListID="INSEE-GOF-CV">drop-down-list</r:GenericOutputFormat> + <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV">drop-down-list</r:GenericOutputFormat> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> @@ -2238,10 +2240,10 @@ <d:SelectDimension rank="1" rangeMinimum="1" rangeMaximum="1"/> </d:CellCoordinatesAsDefined> </d:GridAttachment> - </d:GridResponseDomain> - <d:GridResponseDomain> + </d:GridResponseDomainInMixed> + <d:GridResponseDomainInMixed> <d:CodeDomain> - <r:GenericOutputFormat codeListID="INSEE-GOF-CV">drop-down-list</r:GenericOutputFormat> + <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV">drop-down-list</r:GenericOutputFormat> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> @@ -2268,10 +2270,10 @@ <d:SelectDimension rank="1" rangeMinimum="2" rangeMaximum="2"/> </d:CellCoordinatesAsDefined> </d:GridAttachment> - </d:GridResponseDomain> - <d:GridResponseDomain> + </d:GridResponseDomainInMixed> + <d:GridResponseDomainInMixed> <d:CodeDomain> - <r:GenericOutputFormat codeListID="INSEE-GOF-CV">drop-down-list</r:GenericOutputFormat> + <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV">drop-down-list</r:GenericOutputFormat> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> @@ -2298,10 +2300,10 @@ <d:SelectDimension rank="1" rangeMinimum="3" rangeMaximum="3"/> </d:CellCoordinatesAsDefined> </d:GridAttachment> - </d:GridResponseDomain> - <d:GridResponseDomain> + </d:GridResponseDomainInMixed> + <d:GridResponseDomainInMixed> <d:CodeDomain> - <r:GenericOutputFormat codeListID="INSEE-GOF-CV">drop-down-list</r:GenericOutputFormat> + <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV">drop-down-list</r:GenericOutputFormat> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> @@ -2328,7 +2330,7 @@ <d:SelectDimension rank="1" rangeMinimum="4" rangeMaximum="4"/> </d:CellCoordinatesAsDefined> </d:GridAttachment> - </d:GridResponseDomain> + </d:GridResponseDomainInMixed> </d:StructuredMixedGridResponseDomain> </d:QuestionGrid> <d:QuestionGrid> @@ -2464,9 +2466,9 @@ </d:CodeDomain> </d:GridDimension> <d:StructuredMixedGridResponseDomain> - <d:GridResponseDomain> + <d:GridResponseDomainInMixed> <d:CodeDomain> - <r:GenericOutputFormat codeListID="INSEE-GOF-CV">checkbox</r:GenericOutputFormat> + <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV">checkbox</r:GenericOutputFormat> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxricm</r:ID> @@ -2493,10 +2495,10 @@ <d:SelectDimension rank="1" rangeMinimum="1" rangeMaximum="1"/> </d:CellCoordinatesAsDefined> </d:GridAttachment> - </d:GridResponseDomain> - <d:GridResponseDomain> + </d:GridResponseDomainInMixed> + <d:GridResponseDomainInMixed> <d:CodeDomain> - <r:GenericOutputFormat codeListID="INSEE-GOF-CV">checkbox</r:GenericOutputFormat> + <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV">checkbox</r:GenericOutputFormat> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxricm</r:ID> @@ -2523,10 +2525,10 @@ <d:SelectDimension rank="1" rangeMinimum="2" rangeMaximum="2"/> </d:CellCoordinatesAsDefined> </d:GridAttachment> - </d:GridResponseDomain> - <d:GridResponseDomain> + </d:GridResponseDomainInMixed> + <d:GridResponseDomainInMixed> <d:CodeDomain> - <r:GenericOutputFormat codeListID="INSEE-GOF-CV">checkbox</r:GenericOutputFormat> + <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV">checkbox</r:GenericOutputFormat> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxricm</r:ID> @@ -2553,10 +2555,10 @@ <d:SelectDimension rank="1" rangeMinimum="3" rangeMaximum="3"/> </d:CellCoordinatesAsDefined> </d:GridAttachment> - </d:GridResponseDomain> - <d:GridResponseDomain> + </d:GridResponseDomainInMixed> + <d:GridResponseDomainInMixed> <d:CodeDomain> - <r:GenericOutputFormat codeListID="INSEE-GOF-CV">checkbox</r:GenericOutputFormat> + <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV">checkbox</r:GenericOutputFormat> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxricm</r:ID> @@ -2583,10 +2585,10 @@ <d:SelectDimension rank="1" rangeMinimum="4" rangeMaximum="4"/> </d:CellCoordinatesAsDefined> </d:GridAttachment> - </d:GridResponseDomain> - <d:GridResponseDomain> + </d:GridResponseDomainInMixed> + <d:GridResponseDomainInMixed> <d:CodeDomain> - <r:GenericOutputFormat codeListID="INSEE-GOF-CV">checkbox</r:GenericOutputFormat> + <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV">checkbox</r:GenericOutputFormat> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxricm</r:ID> @@ -2613,7 +2615,7 @@ <d:SelectDimension rank="1" rangeMinimum="5" rangeMaximum="5"/> </d:CellCoordinatesAsDefined> </d:GridAttachment> - </d:GridResponseDomain> + </d:GridResponseDomainInMixed> </d:StructuredMixedGridResponseDomain> </d:QuestionGrid> <d:QuestionGrid> @@ -2870,13 +2872,13 @@ </d:CodeDomain> </d:GridDimension> <d:StructuredMixedGridResponseDomain> - <d:GridResponseDomain> + <d:GridResponseDomainInMixed> <d:NumericDomain decimalPositions="1"> <r:NumberRange> <r:Low isInclusive="true">0</r:Low> <r:High isInclusive="true">100</r:High> </r:NumberRange> - <r:NumericTypeCode codeListID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgde5yl</r:ID> @@ -2889,14 +2891,14 @@ <d:SelectDimension rank="2" rangeMinimum="1" rangeMaximum="1"/> </d:CellCoordinatesAsDefined> </d:GridAttachment> - </d:GridResponseDomain> - <d:GridResponseDomain> + </d:GridResponseDomainInMixed> + <d:GridResponseDomainInMixed> <d:NumericDomain decimalPositions="1"> <r:NumberRange> <r:Low isInclusive="true">0</r:Low> <r:High isInclusive="true">100</r:High> </r:NumberRange> - <r:NumericTypeCode codeListID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgd2x2t</r:ID> @@ -2909,14 +2911,14 @@ <d:SelectDimension rank="2" rangeMinimum="1" rangeMaximum="1"/> </d:CellCoordinatesAsDefined> </d:GridAttachment> - </d:GridResponseDomain> - <d:GridResponseDomain> + </d:GridResponseDomainInMixed> + <d:GridResponseDomainInMixed> <d:NumericDomain decimalPositions="1"> <r:NumberRange> <r:Low isInclusive="true">0</r:Low> <r:High isInclusive="true">100</r:High> </r:NumberRange> - <r:NumericTypeCode codeListID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgdjypz</r:ID> @@ -2929,14 +2931,14 @@ <d:SelectDimension rank="2" rangeMinimum="1" rangeMaximum="1"/> </d:CellCoordinatesAsDefined> </d:GridAttachment> - </d:GridResponseDomain> - <d:GridResponseDomain> + </d:GridResponseDomainInMixed> + <d:GridResponseDomainInMixed> <d:NumericDomain decimalPositions="1"> <r:NumberRange> <r:Low isInclusive="true">0</r:Low> <r:High isInclusive="true">100</r:High> </r:NumberRange> - <r:NumericTypeCode codeListID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgdcftu</r:ID> @@ -2949,14 +2951,14 @@ <d:SelectDimension rank="2" rangeMinimum="1" rangeMaximum="1"/> </d:CellCoordinatesAsDefined> </d:GridAttachment> - </d:GridResponseDomain> - <d:GridResponseDomain> + </d:GridResponseDomainInMixed> + <d:GridResponseDomainInMixed> <d:NumericDomain decimalPositions="1"> <r:NumberRange> <r:Low isInclusive="true">0</r:Low> <r:High isInclusive="true">100</r:High> </r:NumberRange> - <r:NumericTypeCode codeListID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgdiyfe</r:ID> @@ -2969,14 +2971,14 @@ <d:SelectDimension rank="2" rangeMinimum="1" rangeMaximum="1"/> </d:CellCoordinatesAsDefined> </d:GridAttachment> - </d:GridResponseDomain> - <d:GridResponseDomain> + </d:GridResponseDomainInMixed> + <d:GridResponseDomainInMixed> <d:NumericDomain decimalPositions="1"> <r:NumberRange> <r:Low isInclusive="true">0</r:Low> <r:High isInclusive="true">100</r:High> </r:NumberRange> - <r:NumericTypeCode codeListID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgdj1wd</r:ID> @@ -2989,14 +2991,14 @@ <d:SelectDimension rank="2" rangeMinimum="1" rangeMaximum="1"/> </d:CellCoordinatesAsDefined> </d:GridAttachment> - </d:GridResponseDomain> - <d:GridResponseDomain> + </d:GridResponseDomainInMixed> + <d:GridResponseDomainInMixed> <d:NumericDomain decimalPositions="1"> <r:NumberRange> <r:Low isInclusive="true">0</r:Low> <r:High isInclusive="true">100</r:High> </r:NumberRange> - <r:NumericTypeCode codeListID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgddylk</r:ID> @@ -3009,14 +3011,14 @@ <d:SelectDimension rank="2" rangeMinimum="1" rangeMaximum="1"/> </d:CellCoordinatesAsDefined> </d:GridAttachment> - </d:GridResponseDomain> - <d:GridResponseDomain> + </d:GridResponseDomainInMixed> + <d:GridResponseDomainInMixed> <d:NumericDomain decimalPositions="1"> <r:NumberRange> <r:Low isInclusive="true">0</r:Low> <r:High isInclusive="true">100</r:High> </r:NumberRange> - <r:NumericTypeCode codeListID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgd3jj6</r:ID> @@ -3029,14 +3031,14 @@ <d:SelectDimension rank="2" rangeMinimum="1" rangeMaximum="1"/> </d:CellCoordinatesAsDefined> </d:GridAttachment> - </d:GridResponseDomain> - <d:GridResponseDomain> + </d:GridResponseDomainInMixed> + <d:GridResponseDomainInMixed> <d:NumericDomain decimalPositions="1"> <r:NumberRange> <r:Low isInclusive="true">0</r:Low> <r:High isInclusive="true">100</r:High> </r:NumberRange> - <r:NumericTypeCode codeListID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgd4w3k</r:ID> @@ -3049,14 +3051,14 @@ <d:SelectDimension rank="2" rangeMinimum="1" rangeMaximum="1"/> </d:CellCoordinatesAsDefined> </d:GridAttachment> - </d:GridResponseDomain> - <d:GridResponseDomain> + </d:GridResponseDomainInMixed> + <d:GridResponseDomainInMixed> <d:NumericDomain decimalPositions="1"> <r:NumberRange> <r:Low isInclusive="true">0</r:Low> <r:High isInclusive="true">100</r:High> </r:NumberRange> - <r:NumericTypeCode codeListID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgd4w4k</r:ID> @@ -3069,7 +3071,7 @@ <d:SelectDimension rank="2" rangeMinimum="1" rangeMaximum="1"/> </d:CellCoordinatesAsDefined> </d:GridAttachment> - </d:GridResponseDomain> + </d:GridResponseDomainInMixed> </d:StructuredMixedGridResponseDomain> </d:QuestionGrid> <d:QuestionGrid> @@ -3281,9 +3283,9 @@ </d:CodeDomain> </d:GridDimension> <d:StructuredMixedGridResponseDomain> - <d:GridResponseDomain> + <d:GridResponseDomainInMixed> <d:CodeDomain> - <r:GenericOutputFormat codeListID="INSEE-GOF-CV">drop-down-list</r:GenericOutputFormat> + <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV">drop-down-list</r:GenericOutputFormat> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdyh6b5</r:ID> @@ -3311,10 +3313,10 @@ <d:SelectDimension rank="2" rangeMinimum="1" rangeMaximum="1"/> </d:CellCoordinatesAsDefined> </d:GridAttachment> - </d:GridResponseDomain> - <d:GridResponseDomain> + </d:GridResponseDomainInMixed> + <d:GridResponseDomainInMixed> <d:CodeDomain> - <r:GenericOutputFormat codeListID="INSEE-GOF-CV">drop-down-list</r:GenericOutputFormat> + <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV">drop-down-list</r:GenericOutputFormat> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdyh6b5</r:ID> @@ -3342,10 +3344,10 @@ <d:SelectDimension rank="2" rangeMinimum="1" rangeMaximum="1"/> </d:CellCoordinatesAsDefined> </d:GridAttachment> - </d:GridResponseDomain> - <d:GridResponseDomain> + </d:GridResponseDomainInMixed> + <d:GridResponseDomainInMixed> <d:CodeDomain> - <r:GenericOutputFormat codeListID="INSEE-GOF-CV">drop-down-list</r:GenericOutputFormat> + <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV">drop-down-list</r:GenericOutputFormat> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdyh6b5</r:ID> @@ -3373,10 +3375,10 @@ <d:SelectDimension rank="2" rangeMinimum="1" rangeMaximum="1"/> </d:CellCoordinatesAsDefined> </d:GridAttachment> - </d:GridResponseDomain> - <d:GridResponseDomain> + </d:GridResponseDomainInMixed> + <d:GridResponseDomainInMixed> <d:CodeDomain> - <r:GenericOutputFormat codeListID="INSEE-GOF-CV">drop-down-list</r:GenericOutputFormat> + <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV">drop-down-list</r:GenericOutputFormat> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdyh6b5</r:ID> @@ -3404,8 +3406,8 @@ <d:SelectDimension rank="2" rangeMinimum="1" rangeMaximum="1"/> </d:CellCoordinatesAsDefined> </d:GridAttachment> - </d:GridResponseDomain> - <d:GridResponseDomain> + </d:GridResponseDomainInMixed> + <d:GridResponseDomainInMixed> <d:TextDomain maxLength="255"> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> @@ -3420,8 +3422,8 @@ <d:SelectDimension rank="2" rangeMinimum="2" rangeMaximum="2"/> </d:CellCoordinatesAsDefined> </d:GridAttachment> - </d:GridResponseDomain> - <d:GridResponseDomain> + </d:GridResponseDomainInMixed> + <d:GridResponseDomainInMixed> <d:TextDomain maxLength="255"> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> @@ -3436,8 +3438,8 @@ <d:SelectDimension rank="2" rangeMinimum="2" rangeMaximum="2"/> </d:CellCoordinatesAsDefined> </d:GridAttachment> - </d:GridResponseDomain> - <d:GridResponseDomain> + </d:GridResponseDomainInMixed> + <d:GridResponseDomainInMixed> <d:TextDomain maxLength="255"> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> @@ -3452,8 +3454,8 @@ <d:SelectDimension rank="2" rangeMinimum="2" rangeMaximum="2"/> </d:CellCoordinatesAsDefined> </d:GridAttachment> - </d:GridResponseDomain> - <d:GridResponseDomain> + </d:GridResponseDomainInMixed> + <d:GridResponseDomainInMixed> <d:TextDomain maxLength="255"> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> @@ -3468,7 +3470,7 @@ <d:SelectDimension rank="2" rangeMinimum="2" rangeMaximum="2"/> </d:CellCoordinatesAsDefined> </d:GridAttachment> - </d:GridResponseDomain> + </d:GridResponseDomainInMixed> </d:StructuredMixedGridResponseDomain> </d:QuestionGrid> <d:QuestionGrid> @@ -4033,7 +4035,7 @@ </d:CodeDomain> </d:GridDimension> <d:StructuredMixedGridResponseDomain> - <d:GridResponseDomain> + <d:GridResponseDomainInMixed> <d:NominalDomain> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> @@ -4061,8 +4063,8 @@ <d:SelectDimension rank="2" rangeMinimum="1" rangeMaximum="1"/> </d:CellCoordinatesAsDefined> </d:GridAttachment> - </d:GridResponseDomain> - <d:GridResponseDomain> + </d:GridResponseDomainInMixed> + <d:GridResponseDomainInMixed> <d:NominalDomain> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> @@ -4090,8 +4092,8 @@ <d:SelectDimension rank="2" rangeMinimum="1" rangeMaximum="1"/> </d:CellCoordinatesAsDefined> </d:GridAttachment> - </d:GridResponseDomain> - <d:GridResponseDomain> + </d:GridResponseDomainInMixed> + <d:GridResponseDomainInMixed> <d:NominalDomain> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> @@ -4119,8 +4121,8 @@ <d:SelectDimension rank="2" rangeMinimum="1" rangeMaximum="1"/> </d:CellCoordinatesAsDefined> </d:GridAttachment> - </d:GridResponseDomain> - <d:GridResponseDomain> + </d:GridResponseDomainInMixed> + <d:GridResponseDomainInMixed> <d:NominalDomain> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> @@ -4148,8 +4150,8 @@ <d:SelectDimension rank="2" rangeMinimum="1" rangeMaximum="1"/> </d:CellCoordinatesAsDefined> </d:GridAttachment> - </d:GridResponseDomain> - <d:GridResponseDomain> + </d:GridResponseDomainInMixed> + <d:GridResponseDomainInMixed> <d:NominalDomain> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> @@ -4177,8 +4179,8 @@ <d:SelectDimension rank="2" rangeMinimum="2" rangeMaximum="2"/> </d:CellCoordinatesAsDefined> </d:GridAttachment> - </d:GridResponseDomain> - <d:GridResponseDomain> + </d:GridResponseDomainInMixed> + <d:GridResponseDomainInMixed> <d:NominalDomain> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> @@ -4206,8 +4208,8 @@ <d:SelectDimension rank="2" rangeMinimum="2" rangeMaximum="2"/> </d:CellCoordinatesAsDefined> </d:GridAttachment> - </d:GridResponseDomain> - <d:GridResponseDomain> + </d:GridResponseDomainInMixed> + <d:GridResponseDomainInMixed> <d:NominalDomain> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> @@ -4235,8 +4237,8 @@ <d:SelectDimension rank="2" rangeMinimum="2" rangeMaximum="2"/> </d:CellCoordinatesAsDefined> </d:GridAttachment> - </d:GridResponseDomain> - <d:GridResponseDomain> + </d:GridResponseDomainInMixed> + <d:GridResponseDomainInMixed> <d:NominalDomain> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> @@ -4264,8 +4266,8 @@ <d:SelectDimension rank="2" rangeMinimum="2" rangeMaximum="2"/> </d:CellCoordinatesAsDefined> </d:GridAttachment> - </d:GridResponseDomain> - <d:GridResponseDomain> + </d:GridResponseDomainInMixed> + <d:GridResponseDomainInMixed> <d:NominalDomain> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> @@ -4293,8 +4295,8 @@ <d:SelectDimension rank="2" rangeMinimum="3" rangeMaximum="3"/> </d:CellCoordinatesAsDefined> </d:GridAttachment> - </d:GridResponseDomain> - <d:GridResponseDomain> + </d:GridResponseDomainInMixed> + <d:GridResponseDomainInMixed> <d:NominalDomain> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> @@ -4322,8 +4324,8 @@ <d:SelectDimension rank="2" rangeMinimum="3" rangeMaximum="3"/> </d:CellCoordinatesAsDefined> </d:GridAttachment> - </d:GridResponseDomain> - <d:GridResponseDomain> + </d:GridResponseDomainInMixed> + <d:GridResponseDomainInMixed> <d:NominalDomain> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> @@ -4351,8 +4353,8 @@ <d:SelectDimension rank="2" rangeMinimum="3" rangeMaximum="3"/> </d:CellCoordinatesAsDefined> </d:GridAttachment> - </d:GridResponseDomain> - <d:GridResponseDomain> + </d:GridResponseDomainInMixed> + <d:GridResponseDomainInMixed> <d:NominalDomain> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> @@ -4380,8 +4382,8 @@ <d:SelectDimension rank="2" rangeMinimum="3" rangeMaximum="3"/> </d:CellCoordinatesAsDefined> </d:GridAttachment> - </d:GridResponseDomain> - <d:GridResponseDomain> + </d:GridResponseDomainInMixed> + <d:GridResponseDomainInMixed> <d:NominalDomain> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> @@ -4409,8 +4411,8 @@ <d:SelectDimension rank="2" rangeMinimum="4" rangeMaximum="4"/> </d:CellCoordinatesAsDefined> </d:GridAttachment> - </d:GridResponseDomain> - <d:GridResponseDomain> + </d:GridResponseDomainInMixed> + <d:GridResponseDomainInMixed> <d:NominalDomain> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> @@ -4438,8 +4440,8 @@ <d:SelectDimension rank="2" rangeMinimum="4" rangeMaximum="4"/> </d:CellCoordinatesAsDefined> </d:GridAttachment> - </d:GridResponseDomain> - <d:GridResponseDomain> + </d:GridResponseDomainInMixed> + <d:GridResponseDomainInMixed> <d:NominalDomain> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> @@ -4467,8 +4469,8 @@ <d:SelectDimension rank="2" rangeMinimum="4" rangeMaximum="4"/> </d:CellCoordinatesAsDefined> </d:GridAttachment> - </d:GridResponseDomain> - <d:GridResponseDomain> + </d:GridResponseDomainInMixed> + <d:GridResponseDomainInMixed> <d:NominalDomain> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> @@ -4496,8 +4498,8 @@ <d:SelectDimension rank="2" rangeMinimum="4" rangeMaximum="4"/> </d:CellCoordinatesAsDefined> </d:GridAttachment> - </d:GridResponseDomain> - <d:GridResponseDomain> + </d:GridResponseDomainInMixed> + <d:GridResponseDomainInMixed> <d:NominalDomain> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> @@ -4525,8 +4527,8 @@ <d:SelectDimension rank="2" rangeMinimum="5" rangeMaximum="5"/> </d:CellCoordinatesAsDefined> </d:GridAttachment> - </d:GridResponseDomain> - <d:GridResponseDomain> + </d:GridResponseDomainInMixed> + <d:GridResponseDomainInMixed> <d:NominalDomain> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> @@ -4554,8 +4556,8 @@ <d:SelectDimension rank="2" rangeMinimum="5" rangeMaximum="5"/> </d:CellCoordinatesAsDefined> </d:GridAttachment> - </d:GridResponseDomain> - <d:GridResponseDomain> + </d:GridResponseDomainInMixed> + <d:GridResponseDomainInMixed> <d:NominalDomain> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> @@ -4583,8 +4585,8 @@ <d:SelectDimension rank="2" rangeMinimum="5" rangeMaximum="5"/> </d:CellCoordinatesAsDefined> </d:GridAttachment> - </d:GridResponseDomain> - <d:GridResponseDomain> + </d:GridResponseDomainInMixed> + <d:GridResponseDomainInMixed> <d:NominalDomain> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> @@ -4612,8 +4614,8 @@ <d:SelectDimension rank="2" rangeMinimum="5" rangeMaximum="5"/> </d:CellCoordinatesAsDefined> </d:GridAttachment> - </d:GridResponseDomain> - <d:GridResponseDomain> + </d:GridResponseDomainInMixed> + <d:GridResponseDomainInMixed> <d:NominalDomain> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> @@ -4641,8 +4643,8 @@ <d:SelectDimension rank="2" rangeMinimum="6" rangeMaximum="6"/> </d:CellCoordinatesAsDefined> </d:GridAttachment> - </d:GridResponseDomain> - <d:GridResponseDomain> + </d:GridResponseDomainInMixed> + <d:GridResponseDomainInMixed> <d:NominalDomain> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> @@ -4670,8 +4672,8 @@ <d:SelectDimension rank="2" rangeMinimum="6" rangeMaximum="6"/> </d:CellCoordinatesAsDefined> </d:GridAttachment> - </d:GridResponseDomain> - <d:GridResponseDomain> + </d:GridResponseDomainInMixed> + <d:GridResponseDomainInMixed> <d:NominalDomain> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> @@ -4699,8 +4701,8 @@ <d:SelectDimension rank="2" rangeMinimum="6" rangeMaximum="6"/> </d:CellCoordinatesAsDefined> </d:GridAttachment> - </d:GridResponseDomain> - <d:GridResponseDomain> + </d:GridResponseDomainInMixed> + <d:GridResponseDomainInMixed> <d:NominalDomain> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> @@ -4728,7 +4730,7 @@ <d:SelectDimension rank="2" rangeMinimum="6" rangeMaximum="6"/> </d:CellCoordinatesAsDefined> </d:GridAttachment> - </d:GridResponseDomain> + </d:GridResponseDomainInMixed> </d:StructuredMixedGridResponseDomain> <d:InterviewerInstructionReference> <r:Agency>fr.insee</r:Agency> @@ -5203,7 +5205,7 @@ </d:CodeDomain> </d:GridDimension> <d:StructuredMixedGridResponseDomain> - <d:GridResponseDomain> + <d:GridResponseDomainInMixed> <d:TextDomain maxLength="255"> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> @@ -5218,8 +5220,8 @@ <d:SelectDimension rank="2" rangeMinimum="1" rangeMaximum="1"/> </d:CellCoordinatesAsDefined> </d:GridAttachment> - </d:GridResponseDomain> - <d:GridResponseDomain> + </d:GridResponseDomainInMixed> + <d:GridResponseDomainInMixed> <d:TextDomain maxLength="255"> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> @@ -5234,8 +5236,8 @@ <d:SelectDimension rank="2" rangeMinimum="1" rangeMaximum="1"/> </d:CellCoordinatesAsDefined> </d:GridAttachment> - </d:GridResponseDomain> - <d:GridResponseDomain> + </d:GridResponseDomainInMixed> + <d:GridResponseDomainInMixed> <d:TextDomain maxLength="255"> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> @@ -5250,8 +5252,8 @@ <d:SelectDimension rank="2" rangeMinimum="1" rangeMaximum="1"/> </d:CellCoordinatesAsDefined> </d:GridAttachment> - </d:GridResponseDomain> - <d:GridResponseDomain> + </d:GridResponseDomainInMixed> + <d:GridResponseDomainInMixed> <d:TextDomain maxLength="255"> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> @@ -5266,8 +5268,8 @@ <d:SelectDimension rank="2" rangeMinimum="1" rangeMaximum="1"/> </d:CellCoordinatesAsDefined> </d:GridAttachment> - </d:GridResponseDomain> - <d:GridResponseDomain> + </d:GridResponseDomainInMixed> + <d:GridResponseDomainInMixed> <d:TextDomain maxLength="255"> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> @@ -5282,8 +5284,8 @@ <d:SelectDimension rank="2" rangeMinimum="1" rangeMaximum="1"/> </d:CellCoordinatesAsDefined> </d:GridAttachment> - </d:GridResponseDomain> - <d:GridResponseDomain> + </d:GridResponseDomainInMixed> + <d:GridResponseDomainInMixed> <d:TextDomain maxLength="255"> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> @@ -5298,8 +5300,8 @@ <d:SelectDimension rank="2" rangeMinimum="1" rangeMaximum="1"/> </d:CellCoordinatesAsDefined> </d:GridAttachment> - </d:GridResponseDomain> - <d:GridResponseDomain> + </d:GridResponseDomainInMixed> + <d:GridResponseDomainInMixed> <d:TextDomain maxLength="255"> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> @@ -5314,8 +5316,8 @@ <d:SelectDimension rank="2" rangeMinimum="1" rangeMaximum="1"/> </d:CellCoordinatesAsDefined> </d:GridAttachment> - </d:GridResponseDomain> - <d:GridResponseDomain> + </d:GridResponseDomainInMixed> + <d:GridResponseDomainInMixed> <d:TextDomain maxLength="255"> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> @@ -5330,8 +5332,8 @@ <d:SelectDimension rank="2" rangeMinimum="1" rangeMaximum="1"/> </d:CellCoordinatesAsDefined> </d:GridAttachment> - </d:GridResponseDomain> - <d:GridResponseDomain> + </d:GridResponseDomainInMixed> + <d:GridResponseDomainInMixed> <d:TextDomain maxLength="255"> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> @@ -5346,8 +5348,8 @@ <d:SelectDimension rank="2" rangeMinimum="1" rangeMaximum="1"/> </d:CellCoordinatesAsDefined> </d:GridAttachment> - </d:GridResponseDomain> - <d:GridResponseDomain> + </d:GridResponseDomainInMixed> + <d:GridResponseDomainInMixed> <d:TextDomain maxLength="255"> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> @@ -5362,14 +5364,14 @@ <d:SelectDimension rank="2" rangeMinimum="1" rangeMaximum="1"/> </d:CellCoordinatesAsDefined> </d:GridAttachment> - </d:GridResponseDomain> - <d:GridResponseDomain> + </d:GridResponseDomainInMixed> + <d:GridResponseDomainInMixed> <d:NumericDomain> <r:NumberRange> <r:Low isInclusive="true">0</r:Low> <r:High isInclusive="true">120</r:High> </r:NumberRange> - <r:NumericTypeCode codeListID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdfndq</r:ID> @@ -5382,14 +5384,14 @@ <d:SelectDimension rank="2" rangeMinimum="2" rangeMaximum="2"/> </d:CellCoordinatesAsDefined> </d:GridAttachment> - </d:GridResponseDomain> - <d:GridResponseDomain> + </d:GridResponseDomainInMixed> + <d:GridResponseDomainInMixed> <d:NumericDomain> <r:NumberRange> <r:Low isInclusive="true">0</r:Low> <r:High isInclusive="true">120</r:High> </r:NumberRange> - <r:NumericTypeCode codeListID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgd7osi</r:ID> @@ -5402,14 +5404,14 @@ <d:SelectDimension rank="2" rangeMinimum="2" rangeMaximum="2"/> </d:CellCoordinatesAsDefined> </d:GridAttachment> - </d:GridResponseDomain> - <d:GridResponseDomain> + </d:GridResponseDomainInMixed> + <d:GridResponseDomainInMixed> <d:NumericDomain> <r:NumberRange> <r:Low isInclusive="true">0</r:Low> <r:High isInclusive="true">120</r:High> </r:NumberRange> - <r:NumericTypeCode codeListID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgd7bnw</r:ID> @@ -5422,14 +5424,14 @@ <d:SelectDimension rank="2" rangeMinimum="2" rangeMaximum="2"/> </d:CellCoordinatesAsDefined> </d:GridAttachment> - </d:GridResponseDomain> - <d:GridResponseDomain> + </d:GridResponseDomainInMixed> + <d:GridResponseDomainInMixed> <d:NumericDomain> <r:NumberRange> <r:Low isInclusive="true">0</r:Low> <r:High isInclusive="true">120</r:High> </r:NumberRange> - <r:NumericTypeCode codeListID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgd9k71</r:ID> @@ -5442,14 +5444,14 @@ <d:SelectDimension rank="2" rangeMinimum="2" rangeMaximum="2"/> </d:CellCoordinatesAsDefined> </d:GridAttachment> - </d:GridResponseDomain> - <d:GridResponseDomain> + </d:GridResponseDomainInMixed> + <d:GridResponseDomainInMixed> <d:NumericDomain> <r:NumberRange> <r:Low isInclusive="true">0</r:Low> <r:High isInclusive="true">120</r:High> </r:NumberRange> - <r:NumericTypeCode codeListID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdimks</r:ID> @@ -5462,14 +5464,14 @@ <d:SelectDimension rank="2" rangeMinimum="2" rangeMaximum="2"/> </d:CellCoordinatesAsDefined> </d:GridAttachment> - </d:GridResponseDomain> - <d:GridResponseDomain> + </d:GridResponseDomainInMixed> + <d:GridResponseDomainInMixed> <d:NumericDomain> <r:NumberRange> <r:Low isInclusive="true">0</r:Low> <r:High isInclusive="true">120</r:High> </r:NumberRange> - <r:NumericTypeCode codeListID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdjquz</r:ID> @@ -5482,14 +5484,14 @@ <d:SelectDimension rank="2" rangeMinimum="2" rangeMaximum="2"/> </d:CellCoordinatesAsDefined> </d:GridAttachment> - </d:GridResponseDomain> - <d:GridResponseDomain> + </d:GridResponseDomainInMixed> + <d:GridResponseDomainInMixed> <d:NumericDomain> <r:NumberRange> <r:Low isInclusive="true">0</r:Low> <r:High isInclusive="true">120</r:High> </r:NumberRange> - <r:NumericTypeCode codeListID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdd2w3</r:ID> @@ -5502,14 +5504,14 @@ <d:SelectDimension rank="2" rangeMinimum="2" rangeMaximum="2"/> </d:CellCoordinatesAsDefined> </d:GridAttachment> - </d:GridResponseDomain> - <d:GridResponseDomain> + </d:GridResponseDomainInMixed> + <d:GridResponseDomainInMixed> <d:NumericDomain> <r:NumberRange> <r:Low isInclusive="true">0</r:Low> <r:High isInclusive="true">120</r:High> </r:NumberRange> - <r:NumericTypeCode codeListID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdkosc</r:ID> @@ -5522,14 +5524,14 @@ <d:SelectDimension rank="2" rangeMinimum="2" rangeMaximum="2"/> </d:CellCoordinatesAsDefined> </d:GridAttachment> - </d:GridResponseDomain> - <d:GridResponseDomain> + </d:GridResponseDomainInMixed> + <d:GridResponseDomainInMixed> <d:NumericDomain> <r:NumberRange> <r:Low isInclusive="true">0</r:Low> <r:High isInclusive="true">120</r:High> </r:NumberRange> - <r:NumericTypeCode codeListID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdk0x4</r:ID> @@ -5542,14 +5544,14 @@ <d:SelectDimension rank="2" rangeMinimum="2" rangeMaximum="2"/> </d:CellCoordinatesAsDefined> </d:GridAttachment> - </d:GridResponseDomain> - <d:GridResponseDomain> + </d:GridResponseDomainInMixed> + <d:GridResponseDomainInMixed> <d:NumericDomain> <r:NumberRange> <r:Low isInclusive="true">0</r:Low> <r:High isInclusive="true">120</r:High> </r:NumberRange> - <r:NumericTypeCode codeListID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgd2wgf</r:ID> @@ -5562,7 +5564,7 @@ <d:SelectDimension rank="2" rangeMinimum="2" rangeMaximum="2"/> </d:CellCoordinatesAsDefined> </d:GridAttachment> - </d:GridResponseDomain> + </d:GridResponseDomainInMixed> </d:StructuredMixedGridResponseDomain> </d:QuestionGrid> </d:QuestionScheme> @@ -7668,7 +7670,7 @@ <r:Low isInclusive="true">0</r:Low> <r:High isInclusive="true">99</r:High> </r:NumberRange> - <r:NumericTypeCode codeListID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> </r:NumericRepresentation> </l:VariableRepresentation> </l:Variable> @@ -7731,7 +7733,7 @@ <r:Low isInclusive="true">0</r:Low> <r:High isInclusive="true">99</r:High> </r:NumberRange> - <r:NumericTypeCode codeListID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> </r:NumericRepresentation> </l:VariableRepresentation> </l:Variable> @@ -8435,13 +8437,13 @@ </r:QuestionReference> <l:VariableRepresentation> <r:NumericRepresentation decimalPositions="1"> + <r:MeasurementUnit>%</r:MeasurementUnit> <r:NumberRange> <r:Low isInclusive="true">0</r:Low> <r:High isInclusive="true">100</r:High> </r:NumberRange> - <r:NumericTypeCode codeListID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> </r:NumericRepresentation> - <r:MeasurementUnit>%</r:MeasurementUnit> </l:VariableRepresentation> </l:Variable> <l:Variable> @@ -8468,13 +8470,13 @@ </r:QuestionReference> <l:VariableRepresentation> <r:NumericRepresentation decimalPositions="1"> + <r:MeasurementUnit>%</r:MeasurementUnit> <r:NumberRange> <r:Low isInclusive="true">0</r:Low> <r:High isInclusive="true">100</r:High> </r:NumberRange> - <r:NumericTypeCode codeListID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> </r:NumericRepresentation> - <r:MeasurementUnit>%</r:MeasurementUnit> </l:VariableRepresentation> </l:Variable> <l:Variable> @@ -8501,13 +8503,13 @@ </r:QuestionReference> <l:VariableRepresentation> <r:NumericRepresentation decimalPositions="1"> + <r:MeasurementUnit>%</r:MeasurementUnit> <r:NumberRange> <r:Low isInclusive="true">0</r:Low> <r:High isInclusive="true">100</r:High> </r:NumberRange> - <r:NumericTypeCode codeListID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> </r:NumericRepresentation> - <r:MeasurementUnit>%</r:MeasurementUnit> </l:VariableRepresentation> </l:Variable> <l:Variable> @@ -8534,13 +8536,13 @@ </r:QuestionReference> <l:VariableRepresentation> <r:NumericRepresentation decimalPositions="1"> + <r:MeasurementUnit>%</r:MeasurementUnit> <r:NumberRange> <r:Low isInclusive="true">0</r:Low> <r:High isInclusive="true">100</r:High> </r:NumberRange> - <r:NumericTypeCode codeListID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> </r:NumericRepresentation> - <r:MeasurementUnit>%</r:MeasurementUnit> </l:VariableRepresentation> </l:Variable> <l:Variable> @@ -8567,13 +8569,13 @@ </r:QuestionReference> <l:VariableRepresentation> <r:NumericRepresentation decimalPositions="1"> + <r:MeasurementUnit>%</r:MeasurementUnit> <r:NumberRange> <r:Low isInclusive="true">0</r:Low> <r:High isInclusive="true">100</r:High> </r:NumberRange> - <r:NumericTypeCode codeListID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> </r:NumericRepresentation> - <r:MeasurementUnit>%</r:MeasurementUnit> </l:VariableRepresentation> </l:Variable> <l:Variable> @@ -8600,13 +8602,13 @@ </r:QuestionReference> <l:VariableRepresentation> <r:NumericRepresentation decimalPositions="1"> + <r:MeasurementUnit>%</r:MeasurementUnit> <r:NumberRange> <r:Low isInclusive="true">0</r:Low> <r:High isInclusive="true">100</r:High> </r:NumberRange> - <r:NumericTypeCode codeListID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> </r:NumericRepresentation> - <r:MeasurementUnit>%</r:MeasurementUnit> </l:VariableRepresentation> </l:Variable> <l:Variable> @@ -8633,13 +8635,13 @@ </r:QuestionReference> <l:VariableRepresentation> <r:NumericRepresentation decimalPositions="1"> + <r:MeasurementUnit>%</r:MeasurementUnit> <r:NumberRange> <r:Low isInclusive="true">0</r:Low> <r:High isInclusive="true">100</r:High> </r:NumberRange> - <r:NumericTypeCode codeListID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> </r:NumericRepresentation> - <r:MeasurementUnit>%</r:MeasurementUnit> </l:VariableRepresentation> </l:Variable> <l:Variable> @@ -8666,13 +8668,13 @@ </r:QuestionReference> <l:VariableRepresentation> <r:NumericRepresentation decimalPositions="1"> + <r:MeasurementUnit>%</r:MeasurementUnit> <r:NumberRange> <r:Low isInclusive="true">0</r:Low> <r:High isInclusive="true">100</r:High> </r:NumberRange> - <r:NumericTypeCode codeListID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> </r:NumericRepresentation> - <r:MeasurementUnit>%</r:MeasurementUnit> </l:VariableRepresentation> </l:Variable> <l:Variable> @@ -8699,13 +8701,13 @@ </r:QuestionReference> <l:VariableRepresentation> <r:NumericRepresentation decimalPositions="1"> + <r:MeasurementUnit>%</r:MeasurementUnit> <r:NumberRange> <r:Low isInclusive="true">0</r:Low> <r:High isInclusive="true">100</r:High> </r:NumberRange> - <r:NumericTypeCode codeListID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> </r:NumericRepresentation> - <r:MeasurementUnit>%</r:MeasurementUnit> </l:VariableRepresentation> </l:Variable> <l:Variable> @@ -8732,13 +8734,13 @@ </r:QuestionReference> <l:VariableRepresentation> <r:NumericRepresentation decimalPositions="1"> + <r:MeasurementUnit>%</r:MeasurementUnit> <r:NumberRange> <r:Low isInclusive="true">0</r:Low> <r:High isInclusive="true">100</r:High> </r:NumberRange> - <r:NumericTypeCode codeListID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> </r:NumericRepresentation> - <r:MeasurementUnit>%</r:MeasurementUnit> </l:VariableRepresentation> </l:Variable> <l:Variable> @@ -10153,7 +10155,7 @@ <r:Low isInclusive="true">0</r:Low> <r:High isInclusive="true">120</r:High> </r:NumberRange> - <r:NumericTypeCode codeListID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> </r:NumericRepresentation> </l:VariableRepresentation> </l:Variable> @@ -10185,7 +10187,7 @@ <r:Low isInclusive="true">0</r:Low> <r:High isInclusive="true">120</r:High> </r:NumberRange> - <r:NumericTypeCode codeListID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> </r:NumericRepresentation> </l:VariableRepresentation> </l:Variable> @@ -10217,7 +10219,7 @@ <r:Low isInclusive="true">0</r:Low> <r:High isInclusive="true">120</r:High> </r:NumberRange> - <r:NumericTypeCode codeListID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> </r:NumericRepresentation> </l:VariableRepresentation> </l:Variable> @@ -10249,7 +10251,7 @@ <r:Low isInclusive="true">0</r:Low> <r:High isInclusive="true">120</r:High> </r:NumberRange> - <r:NumericTypeCode codeListID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> </r:NumericRepresentation> </l:VariableRepresentation> </l:Variable> @@ -10281,7 +10283,7 @@ <r:Low isInclusive="true">0</r:Low> <r:High isInclusive="true">120</r:High> </r:NumberRange> - <r:NumericTypeCode codeListID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> </r:NumericRepresentation> </l:VariableRepresentation> </l:Variable> @@ -10313,7 +10315,7 @@ <r:Low isInclusive="true">0</r:Low> <r:High isInclusive="true">120</r:High> </r:NumberRange> - <r:NumericTypeCode codeListID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> </r:NumericRepresentation> </l:VariableRepresentation> </l:Variable> @@ -10345,7 +10347,7 @@ <r:Low isInclusive="true">0</r:Low> <r:High isInclusive="true">120</r:High> </r:NumberRange> - <r:NumericTypeCode codeListID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> </r:NumericRepresentation> </l:VariableRepresentation> </l:Variable> @@ -10377,7 +10379,7 @@ <r:Low isInclusive="true">0</r:Low> <r:High isInclusive="true">120</r:High> </r:NumberRange> - <r:NumericTypeCode codeListID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> </r:NumericRepresentation> </l:VariableRepresentation> </l:Variable> @@ -10409,7 +10411,7 @@ <r:Low isInclusive="true">0</r:Low> <r:High isInclusive="true">120</r:High> </r:NumberRange> - <r:NumericTypeCode codeListID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> </r:NumericRepresentation> </l:VariableRepresentation> </l:Variable> @@ -10441,7 +10443,7 @@ <r:Low isInclusive="true">0</r:Low> <r:High isInclusive="true">120</r:High> </r:NumberRange> - <r:NumericTypeCode codeListID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> </r:NumericRepresentation> </l:VariableRepresentation> </l:Variable> @@ -10940,11 +10942,15 @@ <r:ID>INSEE-COMMUN-MNR-DateTimedate-YYYY-MM-DD</r:ID> <r:Version>1</r:Version> <r:DateFieldFormat>YYYY-MM-DD</r:DateFieldFormat> - <r:DateTypeCode codeListID="INSEE-DTC-CV">date</r:DateTypeCode> + <r:DateTypeCode controlledVocabularyID="INSEE-DTC-CV">date</r:DateTypeCode> + <r:Range> + <r:MinimumValue included="true">1900-01-01</r:MinimumValue> + <r:MaximumValue included="true">format-dateTime(current-date(),'YYYY-MM-DD')</r:MaximumValue> + </r:Range> </r:ManagedDateTimeRepresentation> </r:ManagedRepresentationScheme> </g:ResourcePackage> - <s:StudyUnit xmlns="ddi:studyunit:3_2"> + <s:StudyUnit> <r:Agency>fr.insee</r:Agency> <r:ID>StudyUnit-i6vwi0</r:ID> <r:Version>1</r:Version> @@ -10975,7 +10981,7 @@ <r:Agency>fr.insee</r:Agency> <r:ID>InstrumentScheme-i6vwi0</r:ID> <r:Version>1</r:Version> - <d:Instrument xmlns:pogues="http://xml.insee.fr/schema/applis/pogues" xmlns:pr="ddi:ddiprofile:3_2" xmlns:c="ddi:conceptualcomponent:3_2" xmlns:cm="ddi:comparative:3_2"> + <d:Instrument xmlns:pogues="http://xml.insee.fr/schema/applis/pogues" xmlns:pr="ddi:ddiprofile:3_3" xmlns:c="ddi:conceptualcomponent:3_3" xmlns:cm="ddi:comparative:3_3"> <r:Agency>fr.insee</r:Agency> <r:ID>Instrument-i6vwi0</r:ID> <r:Version>1</r:Version> @@ -10996,3 +11002,4 @@ </d:InstrumentScheme> </d:DataCollection> </s:StudyUnit> +</DDIInstance> \ No newline at end of file From 621dcee73bb669307740ec2ce9f4bdab109c2b3b Mon Sep 17 00:00:00 2001 From: CHTAINET Badr <Badr.CHTAINET@akka.eu> Date: Fri, 19 Jul 2019 11:21:32 +0200 Subject: [PATCH 049/439] 289 change enoddi32 to enoddi33 --- .../resources/xslt/outputs/ddi/models.xsl | 587 +++++++++--------- .../pogues-xml2ddi/functions.fods | 347 +++++------ .../pogues-xml2ddi/pogues-xml2ddi-fixed.xsl | 148 ++--- 3 files changed, 517 insertions(+), 565 deletions(-) diff --git a/src/main/resources/xslt/outputs/ddi/models.xsl b/src/main/resources/xslt/outputs/ddi/models.xsl index 8b84717df..eed44145b 100644 --- a/src/main/resources/xslt/outputs/ddi/models.xsl +++ b/src/main/resources/xslt/outputs/ddi/models.xsl @@ -4,8 +4,8 @@ xmlns:eno="http://xml.insee.fr/apps/eno" xmlns:g="ddi:group:3_3" xmlns:d="ddi:datacollection:3_3" xmlns:s="ddi:studyunit:3_3" xmlns:r="ddi:reusable:3_3" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:a="ddi:archive:3_3" - xmlns:l="ddi:logicalproduct:3_3" xmlns:enoddi32="http://xml.insee.fr/apps/eno/out/ddi32" - exclude-result-prefixes="xd eno enoddi32" version="2.0"> + xmlns:l="ddi:logicalproduct:3_3" xmlns:enoddi33="http://xml.insee.fr/apps/eno/out/ddi33" + exclude-result-prefixes="xd eno enoddi33" version="2.0"> <xd:doc> @@ -26,8 +26,8 @@ </xd:doc> <xsl:template match="Form" mode="model"> <xsl:param name="source-context" as="item()" tunnel="yes"/> - <xsl:variable name="citation" select="enoddi32:get-citation($source-context)" as="xs:string"/> - <xsl:variable name="agency" select="enoddi32:get-agency($source-context)" as="xs:string"/> + <xsl:variable name="citation" select="enoddi33:get-citation($source-context)" as="xs:string"/> + <xsl:variable name="agency" select="enoddi33:get-agency($source-context)" as="xs:string"/> <DDIInstance xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="ddi:instance:3_3 https://www.ddialliance.org/Specification/DDI-Lifecycle/3.3/XMLSchema/instance.xsd" xmlns="ddi:instance:3_3" xmlns:g="ddi:group:3_3" xmlns:d="ddi:datacollection:3_3" @@ -35,8 +35,8 @@ xmlns:a="ddi:archive:3_3" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:l="ddi:logicalproduct:3_3" isMaintainable="true"> <r:Agency><xsl:value-of select="$agency"/></r:Agency> - <r:ID><xsl:value-of select="concat('INSEE-', enoddi32:get-id($source-context))"/></r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> + <r:ID><xsl:value-of select="concat('INSEE-', enoddi33:get-id($source-context))"/></r:ID> + <r:Version><xsl:value-of select="enoddi33:get-version($source-context)"/></r:Version> <r:Citation> <r:Title> <r:String> @@ -46,29 +46,29 @@ </r:Citation> <g:ResourcePackage isMaintainable="true" versionDate="2018-01-25+01:00"> <r:Agency><xsl:value-of select="$agency"/></r:Agency> - <r:ID><xsl:value-of select="concat('RessourcePackage-', enoddi32:get-id($source-context))"/></r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> + <r:ID><xsl:value-of select="concat('RessourcePackage-', enoddi33:get-id($source-context))"/></r:ID> + <r:Version><xsl:value-of select="enoddi33:get-version($source-context)"/></r:Version> <d:InterviewerInstructionScheme> <r:Agency><xsl:value-of select="$agency"/></r:Agency> - <r:ID><xsl:value-of select="concat('InterviewerInstructionScheme-', enoddi32:get-id($source-context))"/></r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> - <r:Label><r:Content xml:lang="{enoddi32:get-lang($source-context)}">A définir</r:Content></r:Label> - <xsl:apply-templates select="enoddi32:get-instructions($source-context)[not(enoddi32:get-position(.) = 'BEFORE_QUESTION_TEXT')] | enoddi32:get-controls($source-context)" mode="source"> + <r:ID><xsl:value-of select="concat('InterviewerInstructionScheme-', enoddi33:get-id($source-context))"/></r:ID> + <r:Version><xsl:value-of select="enoddi33:get-version($source-context)"/></r:Version> + <r:Label><r:Content xml:lang="{enoddi33:get-lang($source-context)}">A définir</r:Content></r:Label> + <xsl:apply-templates select="enoddi33:get-instructions($source-context)[not(enoddi33:get-position(.) = 'BEFORE_QUESTION_TEXT')] | enoddi33:get-controls($source-context)" mode="source"> <xsl:with-param name="driver" select="eno:append-empty-element('driver-InterviewerInstructionScheme', .)" tunnel="yes"/> <xsl:with-param name="agency" select="$agency" as="xs:string" tunnel="yes"/> </xsl:apply-templates> </d:InterviewerInstructionScheme> <d:ControlConstructScheme> <r:Agency><xsl:value-of select="$agency"/></r:Agency> - <r:ID><xsl:value-of select="concat('ControlConstructScheme-', enoddi32:get-id($source-context))"/></r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> + <r:ID><xsl:value-of select="concat('ControlConstructScheme-', enoddi33:get-id($source-context))"/></r:ID> + <r:Version><xsl:value-of select="enoddi33:get-version($source-context)"/></r:Version> <d:Sequence> <r:Agency><xsl:value-of select="$agency"/></r:Agency> - <r:ID><xsl:value-of select="enoddi32:get-main-sequence-id($source-context)"/></r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> + <r:ID><xsl:value-of select="enoddi33:get-main-sequence-id($source-context)"/></r:ID> + <r:Version><xsl:value-of select="enoddi33:get-version($source-context)"/></r:Version> <r:Label> - <r:Content xml:lang="{enoddi32:get-lang($source-context)}"> - <xsl:value-of select="enoddi32:get-label($source-context)"/> + <r:Content xml:lang="{enoddi33:get-lang($source-context)}"> + <xsl:value-of select="enoddi33:get-label($source-context)"/> </r:Content> </r:Label> <d:TypeOfSequence controlledVocabularyID="INSEE-TOS-CL-1">template</d:TypeOfSequence> @@ -79,38 +79,38 @@ </xsl:apply-templates> </d:Sequence> <!--creation of control construct from children (everything since we are at the root node), whose reference were created sooner--> - <xsl:apply-templates select="enoddi32:get-sequences($source-context)" mode="source"> + <xsl:apply-templates select="enoddi33:get-sequences($source-context)" mode="source"> <xsl:with-param name="driver" select="eno:append-empty-element('driver-ControlConstructScheme', .)" tunnel="yes"/> <xsl:with-param name="agency" select="$agency" as="xs:string" tunnel="yes"/> </xsl:apply-templates> - <xsl:apply-templates select="enoddi32:get-ifthenelses($source-context)" mode="source"> + <xsl:apply-templates select="enoddi33:get-ifthenelses($source-context)" mode="source"> <xsl:with-param name="driver" select="eno:append-empty-element('driver-ControlConstructScheme', .)" tunnel="yes"/> <xsl:with-param name="agency" select="$agency" as="xs:string" tunnel="yes"/> </xsl:apply-templates> - <xsl:apply-templates select="enoddi32:get-questions($source-context)" mode="source"> + <xsl:apply-templates select="enoddi33:get-questions($source-context)" mode="source"> <xsl:with-param name="driver" select="eno:append-empty-element('driver-ControlConstructScheme', .)" tunnel="yes"/> <xsl:with-param name="agency" select="$agency" as="xs:string" tunnel="yes"/> </xsl:apply-templates> - <xsl:apply-templates select="enoddi32:get-controls($source-context)" mode="source"> + <xsl:apply-templates select="enoddi33:get-controls($source-context)" mode="source"> <xsl:with-param name="driver" select="eno:append-empty-element('driver-ControlConstructScheme', .)" tunnel="yes"/> <xsl:with-param name="agency" select="$agency" as="xs:string" tunnel="yes"/> </xsl:apply-templates> - <xsl:apply-templates select="enoddi32:get-statement-item($source-context)" mode="source"> + <xsl:apply-templates select="enoddi33:get-statement-item($source-context)" mode="source"> <xsl:with-param name="driver" select="eno:append-empty-element('driver-StatementItem', .)" tunnel="yes"/> <xsl:with-param name="agency" select="$agency" as="xs:string" tunnel="yes"/> </xsl:apply-templates> </d:ControlConstructScheme> <d:QuestionScheme> <r:Agency><xsl:value-of select="$agency"/></r:Agency> - <r:ID><xsl:value-of select="concat('QuestionScheme-',enoddi32:get-id($source-context))"/></r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> - <r:Label><r:Content xml:lang="{enoddi32:get-lang($source-context)}">A définir</r:Content></r:Label> + <r:ID><xsl:value-of select="concat('QuestionScheme-',enoddi33:get-id($source-context))"/></r:ID> + <r:Version><xsl:value-of select="enoddi33:get-version($source-context)"/></r:Version> + <r:Label><r:Content xml:lang="{enoddi33:get-lang($source-context)}">A définir</r:Content></r:Label> <!-- This 'hack' is needed to output the question in correct order (QuestionItem first, then QuestionGrid). --> - <xsl:apply-templates select="enoddi32:get-questions-simple($source-context)" mode="source"> + <xsl:apply-templates select="enoddi33:get-questions-simple($source-context)" mode="source"> <xsl:with-param name="driver" select="eno:append-empty-element('driver-QuestionScheme', .)" tunnel="yes"/> <xsl:with-param name="agency" select="$agency" as="xs:string" tunnel="yes"/> </xsl:apply-templates> - <xsl:apply-templates select="enoddi32:get-questions-table($source-context)" mode="source"> + <xsl:apply-templates select="enoddi33:get-questions-table($source-context)" mode="source"> <xsl:with-param name="driver" select="eno:append-empty-element('driver-QuestionScheme', .)" tunnel="yes"/> <xsl:with-param name="agency" select="$agency" as="xs:string" tunnel="yes"/> </xsl:apply-templates> @@ -122,17 +122,17 @@ <xsl:with-param name="agency" select="$agency" as="xs:string" tunnel="yes"/> </xsl:apply-templates> <!-- If needed, add of a codeList for boolean representation. --> - <xsl:if test="enoddi32:exist-boolean($source-context)"> + <xsl:if test="enoddi33:exist-boolean($source-context)"> <l:CategoryScheme> - <r:Agency><xsl:value-of select="enoddi32:get-agency($source-context)"/></r:Agency> - <r:ID><xsl:value-of select="concat('CategoryScheme-',enoddi32:get-id($source-context))"/></r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> - <r:Label><r:Content xml:lang="{enoddi32:get-lang($source-context)}">A définir</r:Content></r:Label> + <r:Agency><xsl:value-of select="enoddi33:get-agency($source-context)"/></r:Agency> + <r:ID><xsl:value-of select="concat('CategoryScheme-',enoddi33:get-id($source-context))"/></r:ID> + <r:Version><xsl:value-of select="enoddi33:get-version($source-context)"/></r:Version> + <r:Label><r:Content xml:lang="{enoddi33:get-lang($source-context)}">A définir</r:Content></r:Label> <l:Category> <r:Agency><xsl:value-of select="$agency"/></r:Agency> <r:ID>INSEE-COMMUN-CA-Booleen-1</r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> - <r:Label><r:Content xml:lang="{enoddi32:get-lang($source-context)}"/></r:Label> + <r:Version><xsl:value-of select="enoddi33:get-version($source-context)"/></r:Version> + <r:Label><r:Content xml:lang="{enoddi33:get-lang($source-context)}"/></r:Label> </l:Category> </l:CategoryScheme> </xsl:if> @@ -144,14 +144,14 @@ <!-- VariableScheme --> <l:VariableScheme> <r:Agency><xsl:value-of select="$agency"/></r:Agency> - <r:ID><xsl:value-of select="concat('VariableScheme-',enoddi32:get-id($source-context))"/></r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> - <r:Label><r:Content xml:lang="{enoddi32:get-lang($source-context)}">Variable Scheme for the survey</r:Content></r:Label> + <r:ID><xsl:value-of select="concat('VariableScheme-',enoddi33:get-id($source-context))"/></r:ID> + <r:Version><xsl:value-of select="enoddi33:get-version($source-context)"/></r:Version> + <r:Label><r:Content xml:lang="{enoddi33:get-lang($source-context)}">Variable Scheme for the survey</r:Content></r:Label> <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> <xsl:with-param name="driver" select="eno:append-empty-element('driver-VariableScheme', .)" tunnel="yes"/> <xsl:with-param name="agency" select="$agency" as="xs:string" tunnel="yes"/> </xsl:apply-templates> - <xsl:apply-templates select="enoddi32:get-questions-table($source-context)" mode="source"> + <xsl:apply-templates select="enoddi33:get-questions-table($source-context)" mode="source"> <xsl:with-param name="driver" select="eno:append-empty-element('driver-VariableGroup', .)" tunnel="yes"/> <xsl:with-param name="agency" select="$agency" as="xs:string" tunnel="yes"/> </xsl:apply-templates> @@ -160,14 +160,14 @@ <d:ProcessingInstructionScheme> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-SIMPSONS-PIS-1</r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> + <r:Version><xsl:value-of select="enoddi33:get-version($source-context)"/></r:Version> <d:ProcessingInstructionSchemeName> <r:String xml:lang="en-IE">SIMPSONS</r:String> </d:ProcessingInstructionSchemeName> <r:Label> <r:Content xml:lang="en-IE">Processing instructions of the Simpsons questionnaire</r:Content> </r:Label> - <xsl:apply-templates select="enoddi32:get-generation-instructions($source-context)" mode="source"> + <xsl:apply-templates select="enoddi33:get-generation-instructions($source-context)" mode="source"> <xsl:with-param name="driver" select="eno:append-empty-element('driver-ProcessingInstructionScheme', .)" tunnel="yes"/> <xsl:with-param name="agency" select="$agency" tunnel="yes"/> </xsl:apply-templates> @@ -176,7 +176,7 @@ <r:ManagedRepresentationScheme> <r:Agency><xsl:value-of select="$agency"/></r:Agency> <r:ID>INSEE-SIMPSONS-MRS</r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> + <r:Version><xsl:value-of select="enoddi33:get-version($source-context)"/></r:Version> <r:Label> <r:Content xml:lang="en-IE">Liste de formats numériques et dates de l'enquête</r:Content> @@ -227,7 +227,7 @@ <r:ManagedDateTimeRepresentation> <r:Agency><xsl:value-of select="$agency"/></r:Agency> <r:ID>INSEE-COMMUN-MNR-<xsl:value-of select="$id-date-duration"/>-<xsl:value-of select="$formatDate"/></r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> + <r:Version><xsl:value-of select="enoddi33:get-version($source-context)"/></r:Version> <r:DateFieldFormat><xsl:value-of select="$formatDate"/></r:DateFieldFormat> <r:DateTypeCode controlledVocabularyID="INSEE-DTC-CV"><xsl:value-of select="$DateTypeCode"/></r:DateTypeCode> <r:Range> @@ -241,52 +241,52 @@ </g:ResourcePackage> <s:StudyUnit> <r:Agency><xsl:value-of select="$agency"/></r:Agency> - <r:ID><xsl:value-of select="concat('StudyUnit-',enoddi32:get-id($source-context))"/></r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> + <r:ID><xsl:value-of select="concat('StudyUnit-',enoddi33:get-id($source-context))"/></r:ID> + <r:Version><xsl:value-of select="enoddi33:get-version($source-context)"/></r:Version> <r:ExPostEvaluation/> <d:DataCollection> <r:Agency><xsl:value-of select="$agency"/></r:Agency> - <r:ID><xsl:value-of select="concat('DataCollection-',enoddi32:get-id($source-context))"/></r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> + <r:ID><xsl:value-of select="concat('DataCollection-',enoddi33:get-id($source-context))"/></r:ID> + <r:Version><xsl:value-of select="enoddi33:get-version($source-context)"/></r:Version> <r:QuestionSchemeReference> <r:Agency><xsl:value-of select="$agency"/></r:Agency> - <r:ID><xsl:value-of select="concat('QuestionScheme-',enoddi32:get-id($source-context))"/></r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> + <r:ID><xsl:value-of select="concat('QuestionScheme-',enoddi33:get-id($source-context))"/></r:ID> + <r:Version><xsl:value-of select="enoddi33:get-version($source-context)"/></r:Version> <r:TypeOfObject>QuestionScheme</r:TypeOfObject> </r:QuestionSchemeReference> <r:ControlConstructSchemeReference> <r:Agency><xsl:value-of select="$agency"/></r:Agency> - <r:ID><xsl:value-of select="concat('ControlConstructScheme-',enoddi32:get-id($source-context))"/></r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> + <r:ID><xsl:value-of select="concat('ControlConstructScheme-',enoddi33:get-id($source-context))"/></r:ID> + <r:Version><xsl:value-of select="enoddi33:get-version($source-context)"/></r:Version> <r:TypeOfObject>ControlConstructScheme</r:TypeOfObject> </r:ControlConstructSchemeReference> <r:InterviewerInstructionSchemeReference> <r:Agency><xsl:value-of select="$agency"/></r:Agency> - <r:ID><xsl:value-of select="concat('InterviewerInstructionScheme-',enoddi32:get-id($source-context))"/></r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> + <r:ID><xsl:value-of select="concat('InterviewerInstructionScheme-',enoddi33:get-id($source-context))"/></r:ID> + <r:Version><xsl:value-of select="enoddi33:get-version($source-context)"/></r:Version> <r:TypeOfObject>InterviewerInstructionScheme</r:TypeOfObject> </r:InterviewerInstructionSchemeReference> - <d:InstrumentScheme xml:lang="{enoddi32:get-lang($source-context)}"> + <d:InstrumentScheme xml:lang="{enoddi33:get-lang($source-context)}"> <r:Agency><xsl:value-of select="$agency"/></r:Agency> - <r:ID><xsl:value-of select="concat('InstrumentScheme-',enoddi32:get-id($source-context))"/></r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> + <r:ID><xsl:value-of select="concat('InstrumentScheme-',enoddi33:get-id($source-context))"/></r:ID> + <r:Version><xsl:value-of select="enoddi33:get-version($source-context)"/></r:Version> <d:Instrument xmlns:pogues="http://xml.insee.fr/schema/applis/pogues" xmlns:pr="ddi:ddiprofile:3_3" xmlns:c="ddi:conceptualcomponent:3_3" xmlns:cm="ddi:comparative:3_3"> <r:Agency><xsl:value-of select="$agency"/></r:Agency> - <r:ID><xsl:value-of select="concat('Instrument-',enoddi32:get-id($source-context))"/></r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> + <r:ID><xsl:value-of select="concat('Instrument-',enoddi33:get-id($source-context))"/></r:ID> + <r:Version><xsl:value-of select="enoddi33:get-version($source-context)"/></r:Version> <d:InstrumentName> - <r:String><xsl:value-of select="enoddi32:get-name($source-context)"/></r:String> + <r:String><xsl:value-of select="enoddi33:get-name($source-context)"/></r:String> </d:InstrumentName> <r:Label> - <r:Content xml:lang="{enoddi32:get-lang($source-context)}"><xsl:value-of select="enoddi32:get-label($source-context)"/> questionnaire</r:Content> + <r:Content xml:lang="{enoddi33:get-lang($source-context)}"><xsl:value-of select="enoddi33:get-label($source-context)"/> questionnaire</r:Content> </r:Label> <d:TypeOfInstrument>A définir</d:TypeOfInstrument> <d:ControlConstructReference> <r:Agency><xsl:value-of select="$agency"/></r:Agency> - <r:ID><xsl:value-of select="enoddi32:get-main-sequence-id($source-context)"/></r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> + <r:ID><xsl:value-of select="enoddi33:get-main-sequence-id($source-context)"/></r:ID> + <r:Version><xsl:value-of select="enoddi33:get-version($source-context)"/></r:Version> <r:TypeOfObject>Sequence</r:TypeOfObject> </d:ControlConstructReference> </d:Instrument> @@ -300,29 +300,29 @@ <xsl:template match="driver-VariableScheme//Variable" mode="model"> <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="agency" as="xs:string" tunnel="yes"/> - <xsl:variable name="id" select="enoddi32:get-id($source-context)"/> + <xsl:variable name="id" select="enoddi33:get-id($source-context)"/> <xsl:variable name="driver" select="."/> <l:Variable> <r:Agency><xsl:value-of select="$agency"/></r:Agency> <r:ID><xsl:value-of select="$id"/></r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> + <r:Version><xsl:value-of select="enoddi33:get-version($source-context)"/></r:Version> <l:VariableName> - <r:String xml:lang="fr-FR"><xsl:value-of select="enoddi32:get-name($source-context)"/></r:String> + <r:String xml:lang="fr-FR"><xsl:value-of select="enoddi33:get-name($source-context)"/></r:String> </l:VariableName> <r:Label> - <r:Content xml:lang="fr-FR"><xsl:value-of select="enoddi32:get-label($source-context)"/></r:Content> + <r:Content xml:lang="fr-FR"><xsl:value-of select="enoddi33:get-label($source-context)"/></r:Content> </r:Label> <!-- It's a hack to test if Variable got a related-response (aka = CollectedVariable), only 0 or 1 are expected, could be done better way (@att on driver ?). --> - <xsl:for-each select="enoddi32:get-related-response($source-context)"> - <xsl:variable name="idQuestion" select="enoddi32:get-parent-id(current())"/> - <xsl:variable name="idResponse" select="enoddi32:get-id(current())"/> + <xsl:for-each select="enoddi33:get-related-response($source-context)"> + <xsl:variable name="idQuestion" select="enoddi33:get-parent-id(current())"/> + <xsl:variable name="idResponse" select="enoddi33:get-id(current())"/> <r:SourceParameterReference> <r:Agency><xsl:value-of select="$agency"/></r:Agency> - <r:ID><xsl:value-of select="enoddi32:get-qop-id(current())"/></r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version(current())"/></r:Version> + <r:ID><xsl:value-of select="enoddi33:get-qop-id(current())"/></r:ID> + <r:Version><xsl:value-of select="enoddi33:get-version(current())"/></r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> - <xsl:apply-templates select="." mode="enoddi32:question-reference"/> + <xsl:apply-templates select="." mode="enoddi33:question-reference"/> <l:VariableRepresentation> <!-- Representation of variable: text, numeric, date ... --> <xsl:apply-templates select="eno:child-fields(.)" mode="source"> @@ -331,29 +331,29 @@ </l:VariableRepresentation> </xsl:for-each> <!-- It's a dirty (large part is static) hack to test if Variable got formula (aka = CalcultatedVariable), only 0 or 1 are expected, could be done better way (@att on driver ?) --> - <xsl:for-each select="enoddi32:get-processing-instruction($source-context)"> + <xsl:for-each select="enoddi33:get-processing-instruction($source-context)"> <r:OutParameter> <r:Agency><xsl:value-of select="$agency"/></r:Agency> - <r:ID><xsl:value-of select="enoddi32:get-vrop-id(current())"/></r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version(current())"/></r:Version> + <r:ID><xsl:value-of select="enoddi33:get-vrop-id(current())"/></r:ID> + <r:Version><xsl:value-of select="enoddi33:get-version(current())"/></r:Version> </r:OutParameter> <l:VariableRepresentation> <r:ProcessingInstructionReference> <r:Agency><xsl:value-of select="$agency"/></r:Agency> - <r:ID><xsl:value-of select="enoddi32:get-gi-id(current())"/></r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version(current())"/></r:Version> + <r:ID><xsl:value-of select="enoddi33:get-gi-id(current())"/></r:ID> + <r:Version><xsl:value-of select="enoddi33:get-version(current())"/></r:Version> <r:TypeOfObject>GenerationInstruction</r:TypeOfObject> <r:Binding> <r:SourceParameterReference> <r:Agency><xsl:value-of select="$agency"/></r:Agency> - <r:ID><xsl:value-of select="enoddi32:get-qop-id(current())"/></r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version(current())"/></r:Version> + <r:ID><xsl:value-of select="enoddi33:get-qop-id(current())"/></r:ID> + <r:Version><xsl:value-of select="enoddi33:get-version(current())"/></r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency><xsl:value-of select="$agency"/></r:Agency> - <r:ID><xsl:value-of select="enoddi32:get-vrop-id(current())"/></r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version(current())"/></r:Version> + <r:ID><xsl:value-of select="enoddi33:get-vrop-id(current())"/></r:ID> + <r:Version><xsl:value-of select="enoddi33:get-version(current())"/></r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -367,12 +367,12 @@ <xsl:template match="driver-VariableScheme//CodeListReference" mode="model"> <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="agency" as="xs:string" tunnel="yes"/> - <xsl:if test="enoddi32:get-code-list-id($source-context) != '' "> + <xsl:if test="enoddi33:get-code-list-id($source-context) != '' "> <r:CodeRepresentation> <r:CodeListReference> <r:Agency><xsl:value-of select="$agency"/></r:Agency> - <r:ID><xsl:value-of select="enoddi32:get-id($source-context)"/></r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> + <r:ID><xsl:value-of select="enoddi33:get-id($source-context)"/></r:ID> + <r:Version><xsl:value-of select="enoddi33:get-version($source-context)"/></r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -381,7 +381,7 @@ <xsl:template match="driver-VariableScheme//Unit" mode="model"> <xsl:param name="source-context" as="item()" tunnel="yes"/> - <xsl:variable name="unit" select="enoddi32:get-unit($source-context)"/> + <xsl:variable name="unit" select="enoddi33:get-unit($source-context)"/> <xsl:if test="not(normalize-space($unit) = ('',' '))"> <r:MeasurementUnit><xsl:value-of select="$unit"/></r:MeasurementUnit> </xsl:if> @@ -390,23 +390,23 @@ <xsl:template match="driver-VariableGroup//QuestionDynamicTable" mode="model"> <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="agency" as="xs:string" tunnel="yes"/> - <xsl:variable name="id" select="enoddi32:get-id($source-context)"/> + <xsl:variable name="id" select="enoddi33:get-id($source-context)"/> <l:VariableGroup> <r:Agency><xsl:value-of select="$agency"/></r:Agency> <r:ID><xsl:value-of select="concat($id,'-gp')"/></r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> + <r:Version><xsl:value-of select="enoddi33:get-version($source-context)"/></r:Version> <r:BasedOnObject> <r:BasedOnReference> <r:Agency><xsl:value-of select="$agency"/></r:Agency> <r:ID><xsl:value-of select="$id"/></r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> + <r:Version><xsl:value-of select="enoddi33:get-version($source-context)"/></r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:BasedOnReference> </r:BasedOnObject> <l:TypeOfVariableGroup>TableLoop</l:TypeOfVariableGroup> <l:VariableGroupName> - <r:String><xsl:value-of select="enoddi32:get-name($source-context)"/></r:String> + <r:String><xsl:value-of select="enoddi33:get-name($source-context)"/></r:String> </l:VariableGroupName> <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> <xsl:with-param name="driver" select="." tunnel="yes"/> @@ -418,12 +418,12 @@ <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="agency" as="xs:string" tunnel="yes"/> - <xsl:variable name="relatedVariable" select="enoddi32:get-related-variable($source-context)"/> + <xsl:variable name="relatedVariable" select="enoddi33:get-related-variable($source-context)"/> <r:VariableReference> <r:Agency><xsl:value-of select="$agency"/></r:Agency> - <r:ID><xsl:value-of select="enoddi32:get-id($relatedVariable)"/></r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> + <r:ID><xsl:value-of select="enoddi33:get-id($relatedVariable)"/></r:ID> + <r:Version><xsl:value-of select="enoddi33:get-version($source-context)"/></r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </r:VariableReference> </xsl:template> @@ -434,45 +434,45 @@ <d:Instruction> <r:Agency><xsl:value-of select="$agency"/></r:Agency> <!-- Use of a specific getter for instruction to cover both Instruction&Control in one case, regular getter are called in Instruction context, specific in Control context --> - <r:ID><xsl:value-of select="enoddi32:get-instruction-id($source-context)"/></r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> + <r:ID><xsl:value-of select="enoddi33:get-instruction-id($source-context)"/></r:ID> + <r:Version><xsl:value-of select="enoddi33:get-version($source-context)"/></r:Version> <d:InstructionName> - <r:String xml:lang="{enoddi32:get-lang($source-context)}"> + <r:String xml:lang="{enoddi33:get-lang($source-context)}"> <!-- Use of a specific getter for instruction to cover both Instruction&Control in one case, regular getter are called in Instruction context, specific in Control context --> - <xsl:value-of select="enoddi32:get-instruction-name($source-context)"/> + <xsl:value-of select="enoddi33:get-instruction-name($source-context)"/> </r:String> </d:InstructionName> <d:InstructionText> <d:LiteralText> - <d:Text xml:lang="{enoddi32:get-lang($source-context)}"> + <d:Text xml:lang="{enoddi33:get-lang($source-context)}"> <!-- Use of a specific getter for instruction to cover both Instruction&Control in one case, regular getter are called in Instruction context, specific in Control context --> - <xsl:value-of select="enoddi32:get-instruction-text($source-context)"/> + <xsl:value-of select="enoddi33:get-instruction-text($source-context)"/> </d:Text> </d:LiteralText> - <xsl:if test="enoddi32:is-with-conditionnal-text($source-context) = true()"> + <xsl:if test="enoddi33:is-with-conditionnal-text($source-context) = true()"> <xsl:for-each - select="enoddi32:get-related-variable($source-context)[enoddi32:get-type(.) = ('CollectedVariableType', 'CalculatedVariableType')]"> + select="enoddi33:get-related-variable($source-context)[enoddi33:get-type(.) = ('CollectedVariableType', 'CalculatedVariableType')]"> <d:ConditionalText> <r:SourceParameterReference> <r:Agency><xsl:value-of select="$agency"/></r:Agency> - <r:ID><xsl:value-of select="enoddi32:get-qop-id(.)"/></r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version(.)"/></r:Version> + <r:ID><xsl:value-of select="enoddi33:get-qop-id(.)"/></r:ID> + <r:Version><xsl:value-of select="enoddi33:get-version(.)"/></r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> </d:ConditionalText> </xsl:for-each> <xsl:for-each - select="enoddi32:get-related-variable($source-context)[enoddi32:get-type(.) = ('ExternalVariableType')]"> + select="enoddi33:get-related-variable($source-context)[enoddi33:get-type(.) = ('ExternalVariableType')]"> <d:ConditionalText> <r:SourceParameterReference> <r:Agency> <xsl:value-of select="$agency"/> </r:Agency> <r:ID> - <xsl:value-of select="enoddi32:get-name(.)"/> + <xsl:value-of select="enoddi33:get-name(.)"/> </r:ID> <r:Version> - <xsl:value-of select="enoddi32:get-version(.)"/> + <xsl:value-of select="enoddi33:get-version(.)"/> </r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:SourceParameterReference> @@ -484,7 +484,7 @@ </d:Instruction> </xsl:template> - <!--this part is disigned in this complicated way to maintain the order of the ddi 3.2 xsd schema--> + <!--this part is disigned in this complicated way to maintain the order of the ddi 3.3 xsd schema--> <xsl:template match="driver-InterviewerInstructionReference//*" mode="model" priority="2"> <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="agency" as="xs:string" tunnel="yes"/> @@ -495,8 +495,8 @@ <xsl:param name="agency" as="xs:string" tunnel="yes"/> <d:InterviewerInstructionReference> <r:Agency><xsl:value-of select="$agency"/></r:Agency> - <r:ID><xsl:value-of select="enoddi32:get-id($source-context)"/></r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> + <r:ID><xsl:value-of select="enoddi33:get-id($source-context)"/></r:ID> + <r:Version><xsl:value-of select="enoddi33:get-version($source-context)"/></r:Version> <r:TypeOfObject>Instruction</r:TypeOfObject> </d:InterviewerInstructionReference> </xsl:template> @@ -512,16 +512,16 @@ <xsl:param name="agency" as="xs:string" tunnel="yes"/> <d:ExternalAid> <r:OtherMaterial> - <xsl:variable name="ID" select="enoddi32:get-id($source-context)"/> + <xsl:variable name="ID" select="enoddi33:get-id($source-context)"/> <r:Agency><xsl:value-of select="$agency"/></r:Agency> <r:ID><xsl:value-of select="$ID"/></r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> + <r:Version><xsl:value-of select="enoddi33:get-version($source-context)"/></r:Version> <r:Description> <r:Content> <xhtml:div class="FlowControl" id="{$ID}"> - <xhtml:div class="Description"><xsl:value-of select="enoddi32:get-description($source-context)"/></xhtml:div> - <xhtml:div class="Expression"><xsl:value-of select="enoddi32:get-expression($source-context)"/></xhtml:div> - <xhtml:div class="IfTrue"><xsl:value-of select="enoddi32:get-if-true($source-context)"/></xhtml:div> + <xhtml:div class="Description"><xsl:value-of select="enoddi33:get-description($source-context)"/></xhtml:div> + <xhtml:div class="Expression"><xsl:value-of select="enoddi33:get-expression($source-context)"/></xhtml:div> + <xhtml:div class="IfTrue"><xsl:value-of select="enoddi33:get-if-true($source-context)"/></xhtml:div> </xhtml:div> </r:Content> </r:Description> @@ -535,28 +535,28 @@ <!-- All CodeLists (regular, fakes and boolean) are stored in a same CodeListScheme. --> <l:CodeListScheme> <r:Agency><xsl:value-of select="$agency"/></r:Agency> - <r:ID><xsl:value-of select="concat(enoddi32:get-survey-name($source-context),'-CLS')"/></r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> + <r:ID><xsl:value-of select="concat(enoddi33:get-survey-name($source-context),'-CLS')"/></r:ID> + <r:Version><xsl:value-of select="enoddi33:get-version($source-context)"/></r:Version> <l:CodeListSchemeName> - <r:String xml:lang="en-IE"><xsl:value-of select="enoddi32:get-survey-name($source-context)"/></r:String> + <r:String xml:lang="en-IE"><xsl:value-of select="enoddi33:get-survey-name($source-context)"/></r:String> </l:CodeListSchemeName> <!-- Output the regular codeLists --> <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> <xsl:with-param name="driver" select="." tunnel="yes"/> </xsl:apply-templates> <!-- If needed, create the fake codeLists for TABLE question with implicit second dimension. --> - <xsl:variable name="fake-code-lists" select="enoddi32:get-fake-code-lists($source-context)"/> + <xsl:variable name="fake-code-lists" select="enoddi33:get-fake-code-lists($source-context)"/> <xsl:if test="$fake-code-lists"> <xsl:apply-templates select="$fake-code-lists" mode="source"> <xsl:with-param name="driver" select="." tunnel="yes"/> </xsl:apply-templates> </xsl:if> <!-- If needed, create the boolean codeList. --> - <xsl:if test="enoddi32:exist-boolean($source-context)"> + <xsl:if test="enoddi33:exist-boolean($source-context)"> <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen</r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> + <r:Version><xsl:value-of select="enoddi33:get-version($source-context)"/></r:Version> <l:CodeListName> <r:String xml:lang="fr-FR">Booleen</r:String> </l:CodeListName> @@ -567,11 +567,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> + <r:Version><xsl:value-of select="enoddi33:get-version($source-context)"/></r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CA-Booleen-1</r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> + <r:Version><xsl:value-of select="enoddi33:get-version($source-context)"/></r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>1</r:Value> @@ -587,11 +587,11 @@ <l:CodeList> <r:Agency><xsl:value-of select="$agency"/></r:Agency> <r:ID> - <xsl:value-of select="enoddi32:get-id($source-context)"/></r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> + <xsl:value-of select="enoddi33:get-id($source-context)"/></r:ID> + <r:Version><xsl:value-of select="enoddi33:get-version($source-context)"/></r:Version> <r:Label> - <r:Content xml:lang="{enoddi32:get-lang($source-context)}"> - <xsl:value-of select="enoddi32:get-label($source-context)"/> + <r:Content xml:lang="{enoddi33:get-lang($source-context)}"> + <xsl:value-of select="enoddi33:get-label($source-context)"/> </r:Content> </r:Label> <!--TODO define HierarchyType--> @@ -620,19 +620,19 @@ <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="agency" as="xs:string" tunnel="yes"/> <xsl:param name="levelNumber" as="xs:integer" tunnel="yes" select="1"/> - <l:Code levelNumber="{$levelNumber}" isDiscrete="{enoddi32:is-discrete($source-context)}"> + <l:Code levelNumber="{$levelNumber}" isDiscrete="{enoddi33:is-discrete($source-context)}"> <r:Agency><xsl:value-of select="$agency"/></r:Agency> <r:ID> - <xsl:value-of select="enoddi32:get-id($source-context)"/></r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> + <xsl:value-of select="enoddi33:get-id($source-context)"/></r:ID> + <r:Version><xsl:value-of select="enoddi33:get-version($source-context)"/></r:Version> <r:CategoryReference> <r:Agency><xsl:value-of select="$agency"/></r:Agency> - <r:ID>CA-<xsl:value-of select="enoddi32:get-id($source-context)"/></r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> + <r:ID>CA-<xsl:value-of select="enoddi33:get-id($source-context)"/></r:ID> + <r:Version><xsl:value-of select="enoddi33:get-version($source-context)"/></r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value> - <xsl:value-of select="enoddi32:get-value($source-context)"/> + <xsl:value-of select="enoddi33:get-value($source-context)"/> </r:Value> <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> <xsl:with-param name="driver" select="." tunnel="yes"/> @@ -647,7 +647,7 @@ <xsl:with-param name="driver" select="." tunnel="yes"/> </xsl:apply-templates> <!-- Adding fake categorySchemes --> - <xsl:variable name="fake-code-lists" select="enoddi32:get-fake-code-lists($source-context)"/> + <xsl:variable name="fake-code-lists" select="enoddi33:get-fake-code-lists($source-context)"/> <xsl:if test="$fake-code-lists"> <xsl:apply-templates select="$fake-code-lists" mode="source"> <xsl:with-param name="driver" select="." tunnel="yes"/> @@ -660,9 +660,9 @@ <xsl:param name="agency" tunnel="yes"/> <l:CategoryScheme> <r:Agency><xsl:value-of select="$agency"/></r:Agency> - <r:ID><xsl:value-of select="concat('CategoryScheme-',enoddi32:get-id($source-context))"/></r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> - <r:Label><r:Content xml:lang="{enoddi32:get-lang($source-context)}"><xsl:value-of select="enoddi32:get-label($source-context)"/></r:Content></r:Label> + <r:ID><xsl:value-of select="concat('CategoryScheme-',enoddi33:get-id($source-context))"/></r:ID> + <r:Version><xsl:value-of select="enoddi33:get-version($source-context)"/></r:Version> + <r:Label><r:Content xml:lang="{enoddi33:get-lang($source-context)}"><xsl:value-of select="enoddi33:get-label($source-context)"/></r:Content></r:Label> <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> <xsl:with-param name="driver" select="." tunnel="yes"/> </xsl:apply-templates> @@ -674,11 +674,11 @@ <xsl:param name="agency" as="xs:string" tunnel="yes"/> <l:Category> <r:Agency><xsl:value-of select="$agency"/></r:Agency> - <r:ID>CA-<xsl:value-of select="enoddi32:get-id($source-context)"/></r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> + <r:ID>CA-<xsl:value-of select="enoddi33:get-id($source-context)"/></r:ID> + <r:Version><xsl:value-of select="enoddi33:get-version($source-context)"/></r:Version> <r:Label> - <r:Content xml:lang="{enoddi32:get-lang($source-context)}"> - <xsl:value-of select="enoddi32:get-label($source-context)"/> + <r:Content xml:lang="{enoddi33:get-lang($source-context)}"> + <xsl:value-of select="enoddi33:get-label($source-context)"/> </r:Content> </r:Label> </l:Category> @@ -693,23 +693,23 @@ <xsl:param name="agency" as="xs:string" tunnel="yes"/> <d:Sequence> <r:Agency><xsl:value-of select="$agency"/></r:Agency> - <r:ID><xsl:value-of select="enoddi32:get-id($source-context)"/></r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> + <r:ID><xsl:value-of select="enoddi33:get-id($source-context)"/></r:ID> + <r:Version><xsl:value-of select="enoddi33:get-version($source-context)"/></r:Version> <d:ConstructName> - <r:String xml:lang="{enoddi32:get-lang($source-context)}"><xsl:value-of select="enoddi32:get-name($source-context)"></xsl:value-of></r:String> + <r:String xml:lang="{enoddi33:get-lang($source-context)}"><xsl:value-of select="enoddi33:get-name($source-context)"></xsl:value-of></r:String> </d:ConstructName> <r:Label> - <r:Content xml:lang="{enoddi32:get-lang($source-context)}"> - <xsl:value-of select="enoddi32:get-label($source-context)"/> + <r:Content xml:lang="{enoddi33:get-lang($source-context)}"> + <xsl:value-of select="enoddi33:get-label($source-context)"/> </r:Content> </r:Label> <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> <xsl:with-param name="driver" select="eno:append-empty-element('driver-InterviewerInstructionReference', .)" tunnel="yes"/> </xsl:apply-templates> <d:TypeOfSequence controlledVocabularyID="INSEE-TOS-CL-1"> - <xsl:value-of select="enoddi32:get-sequence-type($source-context)"/> + <xsl:value-of select="enoddi33:get-sequence-type($source-context)"/> </d:TypeOfSequence> - <xsl:apply-templates select="enoddi32:get-related-controls($source-context)" mode="source"> + <xsl:apply-templates select="enoddi33:get-related-controls($source-context)" mode="source"> <xsl:with-param name="driver" select="." tunnel="yes"/> </xsl:apply-templates> <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> @@ -723,15 +723,15 @@ <xsl:param name="agency" as="xs:string" tunnel="yes"/> <d:StatementItem> <r:Agency><xsl:value-of select="$agency"/></r:Agency> - <r:ID><xsl:value-of select="enoddi32:get-si-id($source-context)"/></r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> + <r:ID><xsl:value-of select="enoddi33:get-si-id($source-context)"/></r:ID> + <r:Version><xsl:value-of select="enoddi33:get-version($source-context)"/></r:Version> <!--<xsl:apply-templates select="$source-context" mode="source"> <xsl:with-param name="driver" select="eno:append-empty-element('driver-InterviewerInstructionReference',.)" tunnel="yes"/> </xsl:apply-templates>--> <d:DisplayText> <d:LiteralText> - <d:Text xml:lang="{enoddi32:get-lang($source-context)}"> - <xsl:value-of select="enoddi32:get-instruction-text($source-context)"/> + <d:Text xml:lang="{enoddi33:get-lang($source-context)}"> + <xsl:value-of select="enoddi33:get-instruction-text($source-context)"/> </d:Text> </d:LiteralText> </d:DisplayText> @@ -744,42 +744,29 @@ <xsl:param name="agency" as="xs:string" tunnel="yes"/> <d:ComputationItem> <r:Agency><xsl:value-of select="$agency"/></r:Agency> - <r:ID><xsl:value-of select="enoddi32:get-ci-id($source-context)"/></r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> + <r:ID><xsl:value-of select="enoddi33:get-ci-id($source-context)"/></r:ID> + <r:Version><xsl:value-of select="enoddi33:get-version($source-context)"/></r:Version> <d:ConstructName> - <r:String xml:lang="{enoddi32:get-lang($source-context)}"><xsl:value-of select="enoddi32:get-ci-name($source-context)"/></r:String> + <r:String xml:lang="{enoddi33:get-lang($source-context)}"><xsl:value-of select="enoddi33:get-ci-name($source-context)"/></r:String> </d:ConstructName> <r:Description> - <r:Content xml:lang="{enoddi32:get-lang($source-context)}"><xsl:value-of select="enoddi32:get-ci-name($source-context)"/></r:Content> + <r:Content xml:lang="{enoddi33:get-lang($source-context)}"><xsl:value-of select="enoddi33:get-ci-name($source-context)"/></r:Content> </r:Description> <!-- If it's a control, an instruction would be generated, if it's a mandatory response, the instruction is not generated, it's handled by the output format. --> <xsl:if test="self::Control"> <d:InterviewerInstructionReference> <r:Agency><xsl:value-of select="$agency"/></r:Agency> - <r:ID><xsl:value-of select="enoddi32:get-generated-instruction-id($source-context)"/></r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> + <r:ID><xsl:value-of select="enoddi33:get-generated-instruction-id($source-context)"/></r:ID> + <r:Version><xsl:value-of select="enoddi33:get-version($source-context)"/></r:Version> <r:TypeOfObject>Instruction</r:TypeOfObject> </d:InterviewerInstructionReference> </xsl:if> - <xsl:variable name="type" select="enoddi32:get-ci-type($source-context)"/> - <xsl:variable name="idCrticity"> - <xsl:choose> - <xsl:when test="normalize-space($type)='warn'">2</xsl:when> - <xsl:when test="normalize-space($type)='error'">3</xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:variable name="controlCrticity"> - <xsl:choose> - <xsl:when test="normalize-space($type)='warn'">warning</xsl:when> - <xsl:when test="normalize-space($type)='error'">stumblingblock</xsl:when> - <xsl:otherwise>informational</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <d:TypeOfComputationItem> - <xsl:attribute name="controlledVocabularyID">INSEE-TOCI-CL-<xsl:value-of select="$idCrticity"/></xsl:attribute> - <xsl:value-of select="$controlCrticity"/> - </d:TypeOfComputationItem> + <xsl:variable name="type" select="enoddi33:get-ci-type($source-context)"/> + <xsl:choose> + <xsl:when test="normalize-space($type)='warn'"><d:TypeOfComputationItem controlledVocabularyID="INSEE-TOCI-CL-2">warning</d:TypeOfComputationItem></xsl:when> + <xsl:when test="normalize-space($type)='error'"><d:TypeOfComputationItem controlledVocabularyID="INSEE-TOCI-CL-3">stumblingblock</d:TypeOfComputationItem></xsl:when> + <xsl:otherwise><d:TypeOfComputationItem controlledVocabularyID="INSEE-TOCI-CL-1">informational</d:TypeOfComputationItem></xsl:otherwise> + </xsl:choose> <!-- Have a simpler way to deal with regular controls & mandatory response. --> <!-- An apply-templates on Expression will Output CommandeCode for Regular Control. --> <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> @@ -818,8 +805,8 @@ <xsl:if test="ancestor::driver-ProcessingInstructionScheme"> <d:ControlConstructReference> <r:Agency><xsl:value-of select="$agency"/></r:Agency> - <r:ID><xsl:value-of select="enoddi32:get-referenced-sequence-id($source-context)"/></r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> + <r:ID><xsl:value-of select="enoddi33:get-referenced-sequence-id($source-context)"/></r:ID> + <r:Version><xsl:value-of select="enoddi33:get-version($source-context)"/></r:Version> <r:TypeOfObject>Sequence</r:TypeOfObject> </d:ControlConstructReference> </xsl:if> @@ -831,26 +818,26 @@ <xsl:param name="agency" tunnel="yes"/> <!-- Getting all related variables from the command expression to build parameters and bindings --> <!-- Could be done if needed in the parent (external variable case) so it's a param not a variable --> - <xsl:param name="related-variables" select="enoddi32:get-related-variable($source-context)" tunnel="yes"/> + <xsl:param name="related-variables" select="enoddi33:get-related-variable($source-context)" tunnel="yes"/> <!-- Calculating ids needed from the related-variable --> <xsl:variable name="related-variables-with-id"> <xsl:for-each select="$related-variables"> - <xsl:variable name="ip-id" select="enoddi32:get-ip-id($source-context,position())"/> - <xsl:variable name="related-response" select="enoddi32:get-related-response(.)"/> + <xsl:variable name="ip-id" select="enoddi33:get-ip-id($source-context,position())"/> + <xsl:variable name="related-response" select="enoddi33:get-related-response(.)"/> <!-- A container is created to save all the pre-calculted data to output the command. --> <Container xmlns="" xsl:exclude-result-prefixes="#all"> <!-- Corresponding to the inputParameter id. --> <ip-id><xsl:value-of select="$ip-id"/></ip-id> <!-- Corresponding to the id used in the final command code for the current variable. --> - <command-id><xsl:value-of select="enoddi32:get-command-id(.,$ip-id)"/></command-id> + <command-id><xsl:value-of select="enoddi33:get-command-id(.,$ip-id)"/></command-id> <!-- Corresponding to the Out Parameter. TODO : Rename correctly the getter, to get-op-id ?--> <qop-id> - <xsl:value-of select="enoddi32:get-qop-id(.)"/> + <xsl:value-of select="enoddi33:get-qop-id(.)"/> </qop-id> - <name><xsl:value-of select="enoddi32:get-name(.)"/></name> + <name><xsl:value-of select="enoddi33:get-name(.)"/></name> <type> - <xsl:value-of select="enoddi32:get-type(.)"/> + <xsl:value-of select="enoddi33:get-type(.)"/> </type> </Container> </xsl:for-each> @@ -861,9 +848,9 @@ <r:InParameter isArray="false"> <r:Agency><xsl:value-of select="$agency"/></r:Agency> <r:ID><xsl:value-of select="ip-id"/></r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> + <r:Version><xsl:value-of select="enoddi33:get-version($source-context)"/></r:Version> <r:ParameterName> - <r:String xml:lang="{enoddi32:get-lang($source-context)}"><xsl:value-of select="name"/></r:String> + <r:String xml:lang="{enoddi33:get-lang($source-context)}"><xsl:value-of select="name"/></r:String> </r:ParameterName> </r:InParameter> </xsl:for-each> @@ -871,8 +858,8 @@ <xsl:if test="ancestor::driver-ProcessingInstructionScheme"> <r:OutParameter> <r:Agency><xsl:value-of select="$agency"/></r:Agency> - <r:ID><xsl:value-of select="enoddi32:get-qop-id($source-context)"/></r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> + <r:ID><xsl:value-of select="enoddi33:get-qop-id($source-context)"/></r:ID> + <r:Version><xsl:value-of select="enoddi33:get-version($source-context)"/></r:Version> </r:OutParameter> </xsl:if> <xsl:for-each select="$related-variables-with-id/*"> @@ -886,7 +873,7 @@ <xsl:value-of select="./name"/> </r:ID> <r:Version> - <xsl:value-of select="enoddi32:get-version($source-context)"/> + <xsl:value-of select="enoddi33:get-version($source-context)"/> </r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </xsl:when> @@ -895,7 +882,7 @@ <xsl:value-of select="./qop-id"/> </r:ID> <r:Version> - <xsl:value-of select="enoddi32:get-version($source-context)"/> + <xsl:value-of select="enoddi33:get-version($source-context)"/> </r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </xsl:otherwise> @@ -904,7 +891,7 @@ <r:TargetParameterReference> <r:Agency><xsl:value-of select="$agency"/></r:Agency> <r:ID><xsl:value-of select="ip-id"/></r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> + <r:Version><xsl:value-of select="enoddi33:get-version($source-context)"/></r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -967,15 +954,15 @@ <xsl:param name="agency" as="xs:string" tunnel="yes"/> <d:GenerationInstruction> <r:Agency><xsl:value-of select="$agency"/></r:Agency> - <r:ID><xsl:value-of select="enoddi32:get-gi-id($source-context)"/></r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> - <xsl:variable name="related-variables" select="enoddi32:get-related-variable($source-context)"/> + <r:ID><xsl:value-of select="enoddi33:get-gi-id($source-context)"/></r:ID> + <r:Version><xsl:value-of select="enoddi33:get-version($source-context)"/></r:Version> + <xsl:variable name="related-variables" select="enoddi33:get-related-variable($source-context)"/> <xsl:comment><![CDATA[<d:SourceQuestion>Not implemented.</d:SourceQuestion>]]></xsl:comment> <xsl:for-each select="$related-variables"> <d:SourceVariable> <r:Agency><xsl:value-of select="$agency"/></r:Agency> - <r:ID><xsl:value-of select="enoddi32:get-id(.)"/></r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> + <r:ID><xsl:value-of select="enoddi33:get-id(.)"/></r:ID> + <r:Version><xsl:value-of select="enoddi33:get-version($source-context)"/></r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </d:SourceVariable> </xsl:for-each> @@ -992,36 +979,36 @@ <xsl:param name="agency" as="xs:string" tunnel="yes"/> <d:IfThenElse> <r:Agency><xsl:value-of select="$agency"/></r:Agency> - <r:ID><xsl:value-of select="enoddi32:get-id($source-context)"/></r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> + <r:ID><xsl:value-of select="enoddi33:get-id($source-context)"/></r:ID> + <r:Version><xsl:value-of select="enoddi33:get-version($source-context)"/></r:Version> <r:Label> - <r:Content xml:lang="{enoddi32:get-lang($source-context)}">A définir</r:Content> + <r:Content xml:lang="{enoddi33:get-lang($source-context)}">A définir</r:Content> </r:Label> <r:Description> - <r:Content xml:lang="{enoddi32:get-lang($source-context)}"> - <xsl:value-of select="enoddi32:get-description($source-context)"/> + <r:Content xml:lang="{enoddi33:get-lang($source-context)}"> + <xsl:value-of select="enoddi33:get-description($source-context)"/> </r:Content> </r:Description> <d:TypeOfIfThenElse controlledVocabularyID="INSEE-TOITE-CL-1">hideable</d:TypeOfIfThenElse> <d:IfCondition> <xsl:call-template name="Command"> - <xsl:with-param name="source-context" select="enoddi32:get-command($source-context)" tunnel="yes"/> + <xsl:with-param name="source-context" select="enoddi33:get-command($source-context)" tunnel="yes"/> </xsl:call-template> </d:IfCondition> <d:ThenConstructReference> <r:Agency><xsl:value-of select="$agency"/></r:Agency> - <r:ID><xsl:value-of select="enoddi32:get-then-sequence-id($source-context)"/></r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> + <r:ID><xsl:value-of select="enoddi33:get-then-sequence-id($source-context)"/></r:ID> + <r:Version><xsl:value-of select="enoddi33:get-version($source-context)"/></r:Version> <r:TypeOfObject>Sequence</r:TypeOfObject> </d:ThenConstructReference> </d:IfThenElse> <d:Sequence> <r:Agency><xsl:value-of select="$agency"/></r:Agency> - <r:ID><xsl:value-of select="enoddi32:get-then-sequence-id($source-context)"/></r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> + <r:ID><xsl:value-of select="enoddi33:get-then-sequence-id($source-context)"/></r:ID> + <r:Version><xsl:value-of select="enoddi33:get-version($source-context)"/></r:Version> <r:Label> - <r:Content xml:lang="{enoddi32:get-lang($source-context)}"> - <xsl:value-of select="enoddi32:get-label($source-context)"/> + <r:Content xml:lang="{enoddi33:get-lang($source-context)}"> + <xsl:value-of select="enoddi33:get-label($source-context)"/> </r:Content> </r:Label> <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> @@ -1035,22 +1022,22 @@ <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="agency" as="xs:string" tunnel="yes"/> <xsl:variable name="driver" select="."/> - <xsl:for-each select="enoddi32:get-instructions($source-context)[enoddi32:get-position(.) = 'BEFORE_QUESTION_TEXT']"> + <xsl:for-each select="enoddi33:get-instructions($source-context)[enoddi33:get-position(.) = 'BEFORE_QUESTION_TEXT']"> <d:ControlConstructReference> <r:Agency><xsl:value-of select="$agency"/></r:Agency> - <r:ID><xsl:value-of select="enoddi32:get-si-id(.)"/></r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version(.)"/></r:Version> + <r:ID><xsl:value-of select="enoddi33:get-si-id(.)"/></r:ID> + <r:Version><xsl:value-of select="enoddi33:get-version(.)"/></r:Version> <r:TypeOfObject>StatementItem</r:TypeOfObject> </d:ControlConstructReference> </xsl:for-each> <d:ControlConstructReference> <r:Agency><xsl:value-of select="$agency"/></r:Agency> - <r:ID><xsl:value-of select="enoddi32:get-reference-id($source-context)"/></r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> - <r:TypeOfObject><xsl:value-of select="enoddi32:get-reference-element-name($source-context)"/></r:TypeOfObject> + <r:ID><xsl:value-of select="enoddi33:get-reference-id($source-context)"/></r:ID> + <r:Version><xsl:value-of select="enoddi33:get-version($source-context)"/></r:Version> + <r:TypeOfObject><xsl:value-of select="enoddi33:get-reference-element-name($source-context)"/></r:TypeOfObject> </d:ControlConstructReference> <xsl:if test="not(name()=('Sequence','IfThenElse'))"> - <xsl:apply-templates select="enoddi32:get-related-controls($source-context)" mode="source"> + <xsl:apply-templates select="enoddi33:get-related-controls($source-context)" mode="source"> <xsl:with-param name="driver" select="." tunnel="yes"/> </xsl:apply-templates> </xsl:if> @@ -1061,11 +1048,11 @@ <xsl:param name="agency" as="xs:string" tunnel="yes"/> <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> <xsl:with-param name="driver" select="." tunnel="yes"/> - <xsl:with-param name="mandatory" select="enoddi32:get-ci-type($source-context)" tunnel="yes"/> + <xsl:with-param name="mandatory" select="enoddi33:get-ci-type($source-context)" tunnel="yes"/> </xsl:apply-templates> </xsl:template> - <!--this part is disigned in this complicated way to maintain the order of the ddi 3.2 xsd schema--> + <!--this part is disigned in this complicated way to maintain the order of the ddi 3.3 xsd schema--> <xsl:template match="driver-Binding//*" mode="model" priority="1"> <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="agency" as="xs:string" tunnel="yes"/> @@ -1076,31 +1063,31 @@ <xsl:param name="agency" as="xs:string" tunnel="yes"/> <d:QuestionConstruct> <r:Agency><xsl:value-of select="$agency"/></r:Agency> - <r:ID><xsl:value-of select="enoddi32:get-qc-id($source-context)"/></r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> + <r:ID><xsl:value-of select="enoddi33:get-qc-id($source-context)"/></r:ID> + <r:Version><xsl:value-of select="enoddi33:get-version($source-context)"/></r:Version> <d:ConstructName> <xsl:element name="r:String"> - <xsl:attribute name="xml:lang" select="enoddi32:get-lang($source-context)"/> - <xsl:value-of select="enoddi32:get-name($source-context)"/> + <xsl:attribute name="xml:lang" select="enoddi33:get-lang($source-context)"/> + <xsl:value-of select="enoddi33:get-name($source-context)"/> </xsl:element> </d:ConstructName> - <xsl:apply-templates select="$source-context" mode="enoddi32:question-reference"/> + <xsl:apply-templates select="$source-context" mode="enoddi33:question-reference"/> </d:QuestionConstruct> </xsl:template> <xsl:template match="driver-QuestionScheme//QuestionSingleChoice//ResponseDomain" mode="model" priority="1"> <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="agency" as="xs:string" tunnel="yes"/> - <xsl:variable name="mandatory" select="enoddi32:get-ci-type($source-context)"/> + <xsl:variable name="mandatory" select="enoddi33:get-ci-type($source-context)"/> <d:CodeDomain> - <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV"><xsl:value-of select="enoddi32:get-generic-output-format($source-context)"/></r:GenericOutputFormat> + <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV"><xsl:value-of select="enoddi33:get-generic-output-format($source-context)"/></r:GenericOutputFormat> <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> <xsl:with-param name="driver" select="." tunnel="yes"/> </xsl:apply-templates> <r:OutParameter isArray="false"> <r:Agency><xsl:value-of select="$agency"/></r:Agency> - <r:ID><xsl:value-of select="enoddi32:get-rdop-id($source-context)"/></r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> + <r:ID><xsl:value-of select="enoddi33:get-rdop-id($source-context)"/></r:ID> + <r:Version><xsl:value-of select="enoddi33:get-version($source-context)"/></r:Version> <r:CodeRepresentation> <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> <xsl:with-param name="driver" select="eno:append-empty-element('driver-CodeListReference', .)" tunnel="yes"/> @@ -1122,15 +1109,15 @@ <xsl:param name="agency" as="xs:string" tunnel="yes"/> <!-- Because of the xsl:for-each, driver context needs to be kept. --> <xsl:variable name="driver" select="."/> - <xsl:for-each select="enoddi32:get-grid-dimensions($source-context)"> + <xsl:for-each select="enoddi33:get-grid-dimensions($source-context)"> <d:GridResponseDomainInMixed> <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> <xsl:with-param name="driver" select="$driver" tunnel="yes"/> - <xsl:with-param name="mandatory" select="enoddi32:get-ci-type($source-context)" tunnel="yes"/> + <xsl:with-param name="mandatory" select="enoddi33:get-ci-type($source-context)" tunnel="yes"/> </xsl:apply-templates> <d:GridAttachment> <d:CellCoordinatesAsDefined> - <xsl:for-each select="enoddi32:get-cell-coordinates($source-context)"> + <xsl:for-each select="enoddi33:get-cell-coordinates($source-context)"> <d:SelectDimension rank="{position()}" rangeMinimum="{.}" rangeMaximum="{.}"/> </xsl:for-each> </d:CellCoordinatesAsDefined> @@ -1193,13 +1180,13 @@ <xsl:element name="{$ddi-element-name}"> <!-- Getting the triplet Agency/Id/Version --> <xsl:element name="r:Agency"><xsl:value-of select="$agency"/></xsl:element> - <xsl:element name="r:ID"><xsl:value-of select="enoddi32:get-id($source-context)"/></xsl:element> - <xsl:element name="r:Version"><xsl:value-of select="enoddi32:get-version($source-context)"/></xsl:element> + <xsl:element name="r:ID"><xsl:value-of select="enoddi33:get-id($source-context)"/></xsl:element> + <xsl:element name="r:Version"><xsl:value-of select="enoddi33:get-version($source-context)"/></xsl:element> <!-- QuestionName part --> <xsl:element name="{$ddi-question-name-element}"> <xsl:element name="r:String"> - <xsl:attribute name="xml:lang" select="enoddi32:get-lang($source-context)"/> - <xsl:value-of select="enoddi32:get-name($source-context)"/> + <xsl:attribute name="xml:lang" select="enoddi33:get-lang($source-context)"/> + <xsl:value-of select="enoddi33:get-name($source-context)"/> </xsl:element> </xsl:element> <!-- OutParameter part --> @@ -1216,8 +1203,8 @@ <xsl:element name="d:QuestionText"> <xsl:element name="d:LiteralText"> <xsl:element name="d:Text"> - <xsl:attribute name="xml:lang" select="enoddi32:get-lang($source-context)"/> - <xsl:value-of select="enoddi32:get-label($source-context)"/> + <xsl:attribute name="xml:lang" select="enoddi33:get-lang($source-context)"/> + <xsl:value-of select="enoddi33:get-label($source-context)"/> </xsl:element> </xsl:element> </xsl:element> @@ -1246,46 +1233,46 @@ </xsl:element> </xsl:template> - <!--this part is disigned in this complicated way to maintain the order of the ddi 3.2 xsd schema--> + <!--this part is disigned in this complicated way to maintain the order of the ddi 3.3 xsd schema--> <xsl:template match="driver-OutParameter//*" mode="model" priority="1"> <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="agency" as="xs:string" tunnel="yes"/> </xsl:template> - <!--this part is disigned in this complicated way to maintain the order of the ddi 3.2 xsd schema--> + <!--this part is disigned in this complicated way to maintain the order of the ddi 3.3 xsd schema--> <xsl:template match="driver-OutParameter//ResponseDomain" mode="model" priority="2"> <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="agency" as="xs:string" tunnel="yes"/> <xsl:element name="r:OutParameter"> <xsl:attribute name="isArray" select="'false'"/> <xsl:element name="r:Agency"><xsl:value-of select="$agency"/></xsl:element> - <xsl:element name="r:ID"><xsl:value-of select="enoddi32:get-qop-id($source-context)"/></xsl:element> - <xsl:element name="r:Version"><xsl:value-of select="enoddi32:get-version($source-context)"/></xsl:element><xsl:element name="r:ParameterName"> - <xsl:variable name="relatedVariable" select="enoddi32:get-related-variable($source-context)"/> + <xsl:element name="r:ID"><xsl:value-of select="enoddi33:get-qop-id($source-context)"/></xsl:element> + <xsl:element name="r:Version"><xsl:value-of select="enoddi33:get-version($source-context)"/></xsl:element><xsl:element name="r:ParameterName"> + <xsl:variable name="relatedVariable" select="enoddi33:get-related-variable($source-context)"/> <xsl:element name="r:String"> - <xsl:attribute name="xml:lang" select="enoddi32:get-lang($source-context)"/> - <xsl:value-of select="enoddi32:get-name($relatedVariable)"/> + <xsl:attribute name="xml:lang" select="enoddi33:get-lang($source-context)"/> + <xsl:value-of select="enoddi33:get-name($relatedVariable)"/> </xsl:element> </xsl:element> </xsl:element> </xsl:template> - <!--this part is designed in this complicated way to maintain the order of the ddi 3.2 xsd schema--> + <!--this part is designed in this complicated way to maintain the order of the ddi 3.3 xsd schema--> <xsl:template match="driver-Binding//ResponseDomain" mode="model" priority="2"> <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="agency" as="xs:string" tunnel="yes"/> <r:Binding> <r:SourceParameterReference> <r:Agency><xsl:value-of select="$agency"/></r:Agency> - <r:ID><xsl:value-of select="enoddi32:get-rdop-id($source-context)"/></r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> + <r:ID><xsl:value-of select="enoddi33:get-rdop-id($source-context)"/></r:ID> + <r:Version><xsl:value-of select="enoddi33:get-version($source-context)"/></r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency><xsl:value-of select="$agency"/></r:Agency> - <r:ID><xsl:value-of select="enoddi32:get-qop-id($source-context)"/></r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> + <r:ID><xsl:value-of select="enoddi33:get-qop-id($source-context)"/></r:ID> + <r:Version><xsl:value-of select="enoddi33:get-version($source-context)"/></r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1306,7 +1293,7 @@ <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> <xsl:with-param name="driver" select="." tunnel="yes"/> </xsl:apply-templates> - <xsl:variable name="fake-dimension" select="enoddi32:get-fake-dimension($source-context)"/> + <xsl:variable name="fake-dimension" select="enoddi33:get-fake-dimension($source-context)"/> <xsl:if test="$fake-dimension"> <xsl:apply-templates select="$fake-dimension" mode="source"> <xsl:with-param name="driver" select="." tunnel="yes"/> @@ -1319,8 +1306,8 @@ <xsl:param name="agency" as="xs:string" tunnel="yes"/> <d:ControlConstructReference> <r:Agency><xsl:value-of select="$agency"/></r:Agency> - <r:ID><xsl:value-of select="enoddi32:get-id($source-context)"/></r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> + <r:ID><xsl:value-of select="enoddi33:get-id($source-context)"/></r:ID> + <r:Version><xsl:value-of select="enoddi33:get-version($source-context)"/></r:Version> <r:TypeOfObject>ComputationItem</r:TypeOfObject> </d:ControlConstructReference> </xsl:template>--> @@ -1333,8 +1320,8 @@ <xsl:param name="agency" as="xs:string" tunnel="yes"/> <r:CodeListReference> <r:Agency><xsl:value-of select="$agency"/></r:Agency> - <r:ID><xsl:value-of select="enoddi32:get-id($source-context)"/></r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> + <r:ID><xsl:value-of select="enoddi33:get-id($source-context)"/></r:ID> + <r:Version><xsl:value-of select="enoddi33:get-version($source-context)"/></r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </xsl:template> @@ -1343,12 +1330,12 @@ <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="agency" as="xs:string" tunnel="yes"/> <xsl:param name="mandatory" as="xs:string" tunnel="yes" select="''"/> - <d:TextDomain maxLength="{enoddi32:get-max-length($source-context)}"> + <d:TextDomain maxLength="{enoddi33:get-max-length($source-context)}"> <r:OutParameter isArray="false"> <r:Agency><xsl:value-of select="$agency"/></r:Agency> - <r:ID><xsl:value-of select="enoddi32:get-rdop-id($source-context)"/></r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> - <r:TextRepresentation maxLength="{enoddi32:get-max-length($source-context)}"/> + <r:ID><xsl:value-of select="enoddi33:get-rdop-id($source-context)"/></r:ID> + <r:Version><xsl:value-of select="enoddi33:get-version($source-context)"/></r:Version> + <r:TextRepresentation maxLength="{enoddi33:get-max-length($source-context)}"/> </r:OutParameter> <xsl:if test="$mandatory = 'mandatory'"> <r:ResponseCardinality minimumResponses="1" maximumResponses="1"/> @@ -1359,7 +1346,7 @@ <xsl:template match="driver-VariableScheme//TextDomain" mode="model"> <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="agency" as="xs:string" tunnel="yes"/> - <r:TextRepresentation maxLength="{enoddi32:get-max-length($source-context)}"/> + <r:TextRepresentation maxLength="{enoddi33:get-max-length($source-context)}"/> </xsl:template> <xsl:template match="NumericDomain" mode="model"> @@ -1367,23 +1354,23 @@ <xsl:param name="agency" as="xs:string" tunnel="yes"/> <xsl:param name="mandatory" as="xs:string" tunnel="yes" select="''"/> <d:NumericDomain> - <xsl:variable name="decimalPositions" select="enoddi32:get-decimal-positions($source-context)"/> + <xsl:variable name="decimalPositions" select="enoddi33:get-decimal-positions($source-context)"/> <xsl:if test="number($decimalPositions) = number($decimalPositions) and number($decimalPositions) > 0"> <xsl:attribute name="decimalPositions" select="$decimalPositions"/> </xsl:if> <r:NumberRange> <r:Low isInclusive="true"> - <xsl:value-of select="enoddi32:get-low($source-context)"/> + <xsl:value-of select="enoddi33:get-low($source-context)"/> </r:Low> <r:High isInclusive="true"> - <xsl:value-of select="enoddi32:get-high($source-context)"/> + <xsl:value-of select="enoddi33:get-high($source-context)"/> </r:High> </r:NumberRange> <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> <r:OutParameter isArray="false"> <r:Agency><xsl:value-of select="$agency"/></r:Agency> - <r:ID><xsl:value-of select="enoddi32:get-rdop-id($source-context)"/></r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> + <r:ID><xsl:value-of select="enoddi33:get-rdop-id($source-context)"/></r:ID> + <r:Version><xsl:value-of select="enoddi33:get-version($source-context)"/></r:Version> </r:OutParameter> <xsl:if test="$mandatory = 'mandatory'"> <r:ResponseCardinality minimumResponses="1" maximumResponses="1"/> @@ -1395,7 +1382,7 @@ <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="agency" as="xs:string" tunnel="yes"/> <xsl:variable name="driver" select="."/> - <xsl:variable name="decimalPositions" select="enoddi32:get-decimal-positions($source-context)"/> + <xsl:variable name="decimalPositions" select="enoddi33:get-decimal-positions($source-context)"/> <r:NumericRepresentation> <xsl:if test="number($decimalPositions) = number($decimalPositions) and number($decimalPositions) > 0"> <xsl:attribute name="decimalPositions" select="$decimalPositions"/> @@ -1407,10 +1394,10 @@ </xsl:apply-templates> <r:NumberRange> <r:Low isInclusive="true"> - <xsl:value-of select="enoddi32:get-low($source-context)"/> + <xsl:value-of select="enoddi33:get-low($source-context)"/> </r:Low> <r:High isInclusive="true"> - <xsl:value-of select="enoddi32:get-high($source-context)"/> + <xsl:value-of select="enoddi33:get-high($source-context)"/> </r:High> </r:NumberRange> <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> @@ -1421,12 +1408,12 @@ <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="agency" as="xs:string" tunnel="yes"/> <xsl:param name="mandatory" as="xs:string" tunnel="yes" select="''"/> - <xsl:variable name="maxVal" select="enoddi32:get-high($source-context)"/> - <xsl:variable name="minVal" select="enoddi32:get-low($source-context)"/> + <xsl:variable name="maxVal" select="enoddi33:get-high($source-context)"/> + <xsl:variable name="minVal" select="enoddi33:get-low($source-context)"/> <!-- Keep compatibility with old date if they don't have format --> <xsl:variable name="format"> <xsl:choose> - <xsl:when test="enoddi32:get-format($source-context) != ''"><xsl:value-of select="enoddi32:get-format($source-context)"/></xsl:when> + <xsl:when test="enoddi33:get-format($source-context) != ''"><xsl:value-of select="enoddi33:get-format($source-context)"/></xsl:when> <xsl:otherwise>YYYY-MM-DD</xsl:otherwise> </xsl:choose> </xsl:variable> @@ -1462,8 +1449,8 @@ </r:Range> <r:OutParameter isArray="false"> <r:Agency><xsl:value-of select="$agency"/></r:Agency> - <r:ID><xsl:value-of select="enoddi32:get-rdop-id($source-context)"/></r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> + <r:ID><xsl:value-of select="enoddi33:get-rdop-id($source-context)"/></r:ID> + <r:Version><xsl:value-of select="enoddi33:get-version($source-context)"/></r:Version> </r:OutParameter> <xsl:if test="$mandatory = 'mandatory'"> <r:ResponseCardinality minimumResponses="1" maximumResponses="1"/> @@ -1474,16 +1461,16 @@ <d:DateTimeDomainReference> <r:Agency><xsl:value-of select="$agency"/></r:Agency> <r:ID>INSEE-COMMUN-MNR-<xsl:value-of select="$id-date-duration"/></r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> + <r:Version><xsl:value-of select="enoddi33:get-version($source-context)"/></r:Version> <r:TypeOfObject>ManagedDateTimeRepresentation</r:TypeOfObject> <r:OutParameter isArray="false"> <r:Agency><xsl:value-of select="$agency"/></r:Agency> - <r:ID><xsl:value-of select="enoddi32:get-rdop-id($source-context)"/></r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> + <r:ID><xsl:value-of select="enoddi33:get-rdop-id($source-context)"/></r:ID> + <r:Version><xsl:value-of select="enoddi33:get-version($source-context)"/></r:Version> <r:DateTimeRepresentationReference> <r:Agency><xsl:value-of select="$agency"/></r:Agency> <r:ID>INSEE-COMMUN-MNR-<xsl:value-of select="$id-date-duration"/></r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> + <r:Version><xsl:value-of select="enoddi33:get-version($source-context)"/></r:Version> <r:TypeOfObject>ManagedDateTimeRepresentation</r:TypeOfObject> </r:DateTimeRepresentationReference> </r:OutParameter> @@ -1498,12 +1485,12 @@ <xsl:template match="driver-VariableScheme//DateTimeDomain | driver-VariableScheme//DurationDomain" mode="model"> <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="agency" as="xs:string" tunnel="yes"/> - <xsl:variable name="maxVal" select="enoddi32:get-high($source-context)"/> - <xsl:variable name="minVal" select="enoddi32:get-low($source-context)"/> + <xsl:variable name="maxVal" select="enoddi33:get-high($source-context)"/> + <xsl:variable name="minVal" select="enoddi33:get-low($source-context)"/> <!-- Keep compatibility with old date if they don't have format --> <xsl:variable name="format"> <xsl:choose> - <xsl:when test="enoddi32:get-format($source-context) != ''"><xsl:value-of select="enoddi32:get-format($source-context)"/></xsl:when> + <xsl:when test="enoddi33:get-format($source-context) != ''"><xsl:value-of select="enoddi33:get-format($source-context)"/></xsl:when> <xsl:otherwise>YYYY-MM-DD</xsl:otherwise> </xsl:choose> </xsl:variable> @@ -1543,7 +1530,7 @@ <r:DateTimeRepresentationReference> <r:Agency><xsl:value-of select="$agency"/></r:Agency> <r:ID>INSEE-COMMUN-MNR-<xsl:value-of select="$id-date-duration"/></r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> + <r:Version><xsl:value-of select="enoddi33:get-version($source-context)"/></r:Version> <r:TypeOfObject>ManagedDateTimeRepresentation</r:TypeOfObject> </r:DateTimeRepresentationReference> </xsl:otherwise> @@ -1588,15 +1575,15 @@ <d:NominalDomain> <r:OutParameter isArray="false"> <r:Agency><xsl:value-of select="$agency"/></r:Agency> - <r:ID><xsl:value-of select="enoddi32:get-rdop-id($source-context)"/></r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> + <r:ID><xsl:value-of select="enoddi33:get-rdop-id($source-context)"/></r:ID> + <r:Version><xsl:value-of select="enoddi33:get-version($source-context)"/></r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency><xsl:value-of select="$agency"/></r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> + <r:Version><xsl:value-of select="enoddi33:get-version($source-context)"/></r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -1622,7 +1609,7 @@ <r:CodeReference> <r:Agency><xsl:value-of select="$agency"/></r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> + <r:Version><xsl:value-of select="enoddi33:get-version($source-context)"/></r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -1637,22 +1624,22 @@ <xsl:param name="agency" as="xs:string" tunnel="yes"/> <xsl:param name="mandatory" as="xs:string" tunnel="yes" select="''"/> <d:CodeDomain> - <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV"><xsl:value-of select="enoddi32:get-generic-output-format($source-context)"/></r:GenericOutputFormat> + <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV"><xsl:value-of select="enoddi33:get-generic-output-format($source-context)"/></r:GenericOutputFormat> <r:CodeListReference> <r:Agency><xsl:value-of select="$agency"/></r:Agency> - <r:ID><xsl:value-of select="enoddi32:get-code-list-id($source-context)"/></r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> + <r:ID><xsl:value-of select="enoddi33:get-code-list-id($source-context)"/></r:ID> + <r:Version><xsl:value-of select="enoddi33:get-version($source-context)"/></r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency><xsl:value-of select="$agency"/></r:Agency> - <r:ID><xsl:value-of select="enoddi32:get-rdop-id($source-context)"/></r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> + <r:ID><xsl:value-of select="enoddi33:get-rdop-id($source-context)"/></r:ID> + <r:Version><xsl:value-of select="enoddi33:get-version($source-context)"/></r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency><xsl:value-of select="$agency"/></r:Agency> - <r:ID><xsl:value-of select="enoddi32:get-code-list-id($source-context)"/></r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> + <r:ID><xsl:value-of select="enoddi33:get-code-list-id($source-context)"/></r:ID> + <r:Version><xsl:value-of select="enoddi33:get-version($source-context)"/></r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -1669,13 +1656,13 @@ <xsl:template match="RosterDimension" mode="model"> <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="agency" as="xs:string" tunnel="yes"/> - <d:GridDimension displayCode="false" displayLabel="false" rank="{enoddi32:get-rank($source-context)}"> + <d:GridDimension displayCode="false" displayLabel="false" rank="{enoddi33:get-rank($source-context)}"> <d:Roster baseCodeValue="1" codeIterationValue="1"> <xsl:attribute name="minimumRequired"> - <xsl:value-of select="substring-before(enoddi32:get-dynamic($source-context), '-')"/> + <xsl:value-of select="substring-before(enoddi33:get-dynamic($source-context), '-')"/> </xsl:attribute> <xsl:attribute name="maximumAllowed"> - <xsl:value-of select="substring-after(enoddi32:get-dynamic($source-context), '-')"/> + <xsl:value-of select="substring-after(enoddi33:get-dynamic($source-context), '-')"/> </xsl:attribute> </d:Roster> </d:GridDimension> @@ -1689,24 +1676,24 @@ <xsl:template match="CodeDomainDimension" mode="model"> <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="agency" as="xs:string" tunnel="yes"/> - <d:GridDimension displayCode="false" displayLabel="false" rank="{enoddi32:get-rank($source-context)}"> + <d:GridDimension displayCode="false" displayLabel="false" rank="{enoddi33:get-rank($source-context)}"> <d:CodeDomain> <r:CodeListReference> <r:Agency><xsl:value-of select="$agency"/></r:Agency> - <r:ID><xsl:value-of select="enoddi32:get-id($source-context)"/></r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> + <r:ID><xsl:value-of select="enoddi33:get-id($source-context)"/></r:ID> + <r:Version><xsl:value-of select="enoddi33:get-version($source-context)"/></r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </d:CodeDomain> </d:GridDimension> </xsl:template> - <xsl:template match="*" mode="enoddi32:question-reference"> - <xsl:variable name="elementName" select="if(enoddi32:get-question-type(.) = ('MULTIPLE_CHOICE','TABLE','DYNAMIC_TABLE')) then('QuestionGrid') else('QuestionItem')"/> + <xsl:template match="*" mode="enoddi33:question-reference"> + <xsl:variable name="elementName" select="if(enoddi33:get-question-type(.) = ('MULTIPLE_CHOICE','TABLE','DYNAMIC_TABLE')) then('QuestionGrid') else('QuestionItem')"/> <r:QuestionReference> - <r:Agency><xsl:value-of select="enoddi32:get-agency(.)"/></r:Agency> - <r:ID><xsl:value-of select="enoddi32:get-question-id(.)"/></r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version(.)"/></r:Version> + <r:Agency><xsl:value-of select="enoddi33:get-agency(.)"/></r:Agency> + <r:ID><xsl:value-of select="enoddi33:get-question-id(.)"/></r:ID> + <r:Version><xsl:value-of select="enoddi33:get-version(.)"/></r:Version> <r:TypeOfObject><xsl:value-of select="$elementName"/></r:TypeOfObject> </r:QuestionReference> </xsl:template> diff --git a/src/main/resources/xslt/transformations/pogues-xml2ddi/functions.fods b/src/main/resources/xslt/transformations/pogues-xml2ddi/functions.fods index eea9da6f0..e22598294 100644 --- a/src/main/resources/xslt/transformations/pogues-xml2ddi/functions.fods +++ b/src/main/resources/xslt/transformations/pogues-xml2ddi/functions.fods @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.spreadsheet"> - <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>P6DT6H41M17S</meta:editing-duration><meta:editing-cycles>146</meta:editing-cycles><meta:generator>LibreOffice/6.1.5.2$Windows_X86_64 LibreOffice_project/90f8dcf33c87b3705e78202e3df5142b201bd805</meta:generator><dc:date>2019-06-21T18:23:48.627000000</dc:date><meta:document-statistic meta:table-count="1" meta:cell-count="151" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> + <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>P6DT6H45M5S</meta:editing-duration><meta:editing-cycles>148</meta:editing-cycles><meta:generator>LibreOffice/6.1.5.2$Windows_X86_64 LibreOffice_project/90f8dcf33c87b3705e78202e3df5142b201bd805</meta:generator><dc:date>2019-07-19T10:51:08.691000000</dc:date><meta:document-statistic meta:table-count="1" meta:cell-count="151" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> <office:settings> <config:config-item-set config:name="ooo:view-settings"> <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item> @@ -14,7 +14,7 @@ <config:config-item-map-named config:name="Tables"> <config:config-item-map-entry config:name="Sheet1"> <config:config-item config:name="CursorPositionX" config:type="int">0</config:config-item> - <config:config-item config:name="CursorPositionY" config:type="int">58</config:config-item> + <config:config-item config:name="CursorPositionY" config:type="int">1</config:config-item> <config:config-item config:name="HorizontalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="VerticalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="HorizontalSplitPosition" config:type="int">0</config:config-item> @@ -23,7 +23,7 @@ <config:config-item config:name="PositionLeft" config:type="int">0</config:config-item> <config:config-item config:name="PositionRight" config:type="int">0</config:config-item> <config:config-item config:name="PositionTop" config:type="int">0</config:config-item> - <config:config-item config:name="PositionBottom" config:type="int">36</config:config-item> + <config:config-item config:name="PositionBottom" config:type="int">25</config:config-item> <config:config-item config:name="ZoomType" config:type="short">0</config:config-item> <config:config-item config:name="ZoomValue" config:type="int">100</config:config-item> <config:config-item config:name="PageViewZoomValue" config:type="int">60</config:config-item> @@ -32,7 +32,7 @@ </config:config-item-map-entry> </config:config-item-map-named> <config:config-item config:name="ActiveTable" config:type="string">Sheet1</config:config-item> - <config:config-item config:name="HorizontalScrollbarWidth" config:type="int">1302</config:config-item> + <config:config-item config:name="HorizontalScrollbarWidth" config:type="int">1286</config:config-item> <config:config-item config:name="ZoomType" config:type="short">0</config:config-item> <config:config-item config:name="ZoomValue" config:type="int">100</config:config-item> <config:config-item config:name="PageViewZoomValue" config:type="int">60</config:config-item> @@ -532,35 +532,6 @@ <style:style style:name="ta1" style:family="table" style:master-page-name="Default"> <style:table-properties table:display="true" style:writing-mode="lr-tb"/> </style:style> - <number:text-style style:name="N100"> - <number:text-content/> - </number:text-style> - <style:style style:name="ce9" style:family="table-cell" style:parent-style-name="Default"> - <style:table-cell-properties fo:background-color="#99ccff"/> - <style:text-properties style:font-name="Arial" fo:font-size="10pt" fo:font-weight="bold" style:font-size-asian="10pt" style:font-weight-asian="bold" style:font-size-complex="10pt" style:font-weight-complex="bold"/> - </style:style> - <style:style style:name="ce10" style:family="table-cell" style:parent-style-name="Default"> - <style:text-properties style:use-window-font-color="true" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:font-name="Arial" fo:font-size="10pt" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="normal" style:text-underline-mode="continuous" style:text-overline-mode="continuous" style:text-line-through-mode="continuous" style:font-name-asian="Tahoma" style:font-size-asian="10pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-name-complex="Tahoma" style:font-size-complex="10pt" style:font-style-complex="normal" style:font-weight-complex="normal" style:text-emphasize="none" style:font-relief="none" style:text-overline-style="none" style:text-overline-color="font-color"/> - </style:style> - <style:style style:name="ce11" style:family="table-cell" style:parent-style-name="Default"> - <style:text-properties style:font-name="Arial" fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/> - </style:style> - <style:style style:name="ce12" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="N100"/> - <style:style style:name="ce13" style:family="table-cell" style:parent-style-name="Default"> - <style:table-cell-properties fo:padding="0.71mm"/> - <style:text-properties style:font-name="Arial" fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/> - </style:style> - <style:style style:name="ce14" style:family="table-cell" style:parent-style-name="Default"> - <style:table-cell-properties fo:background-color="transparent"/> - <style:text-properties style:font-name="Arial" fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/> - </style:style> - <style:style style:name="ce15" style:family="table-cell" style:parent-style-name="Default"> - <style:table-cell-properties style:vertical-align="middle"/> - <style:text-properties style:font-name="Arial" fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/> - </style:style> - <style:style style:name="ce16" style:family="table-cell" style:parent-style-name="Default"> - <style:text-properties style:use-window-font-color="true" style:font-name="Arial" fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/> - </style:style> <style:page-layout style:name="pm1"> <style:page-layout-properties style:first-page-number="continue" style:writing-mode="lr-tb"/> <style:header-style> @@ -610,7 +581,7 @@ <text:p><text:sheet-name>???</text:sheet-name><text:s/>(<text:title>???</text:title>)</text:p> </style:region-left> <style:region-right> - <text:p><text:date style:data-style-name="N2" text:date-value="2019-06-21">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="17:42:57.602000000">00:00:00</text:time></text:p> + <text:p><text:date style:data-style-name="N2" text:date-value="2019-07-19">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="10:47:20.537000000">00:00:00</text:time></text:p> </style:region-right> </style:header> <style:header-left style:display="false"/> @@ -707,30 +678,30 @@ <office:body> <office:spreadsheet> <table:table table:name="Sheet1" table:style-name="ta1" table:print="false"> - <table:table-column table:style-name="co1" table:default-cell-style-name="ce11"/> - <table:table-column table:style-name="co2" table:default-cell-style-name="ce11"/> - <table:table-column table:style-name="co3" table:default-cell-style-name="ce15"/> - <table:table-column table:style-name="co4" table:default-cell-style-name="ce11"/> + <table:table-column table:style-name="co1" table:default-cell-style-name="Default"/> + <table:table-column table:style-name="co2" table:default-cell-style-name="Default"/> + <table:table-column table:style-name="co3" table:default-cell-style-name="Default"/> + <table:table-column table:style-name="co4" table:default-cell-style-name="Default"/> <table:table-row table:style-name="ro1"> - <table:table-cell table:style-name="ce9" office:value-type="string" calcext:value-type="string"> + <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>Out_Function</text:p> </table:table-cell> - <table:table-cell table:style-name="ce9" office:value-type="string" calcext:value-type="string"> + <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>Parameters</text:p> </table:table-cell> - <table:table-cell table:style-name="ce9" office:value-type="string" calcext:value-type="string"> + <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>In_Function</text:p> </table:table-cell> - <table:table-cell table:style-name="ce9" office:value-type="string" calcext:value-type="string"> + <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>Documentation</text:p> </table:table-cell> </table:table-row> <table:table-row table:style-name="ro2"> - <table:table-cell table:style-name="ce10" office:value-type="string" calcext:value-type="string"> - <text:p>enoddi32:exist-boolean</text:p> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p>enoddi33:exist-boolean</text:p> </table:table-cell> <table:table-cell/> - <table:table-cell table:style-name="ce10" office:value-type="string" calcext:value-type="string"> + <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>enopogues:exist-boolean</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> @@ -739,10 +710,10 @@ </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>enoddi32:get-agency</text:p> + <text:p>enoddi33:get-agency</text:p> </table:table-cell> <table:table-cell/> - <table:table-cell table:style-name="ce11" office:value-type="string" calcext:value-type="string"> + <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>enopogues:get-agency</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> @@ -751,30 +722,30 @@ </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>enoddi32:get-cell-coordinates</text:p> + <text:p>enoddi33:get-cell-coordinates</text:p> </table:table-cell> <table:table-cell/> - <table:table-cell table:style-name="ce11" office:value-type="string" calcext:value-type="string"> + <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>enopogues:get-cell-coordinates</text:p> </table:table-cell> <table:table-cell/> </table:table-row> <table:table-row table:style-name="ro2"> - <table:table-cell table:style-name="Default" office:value-type="string" calcext:value-type="string"> - <text:p>enoddi32:get-ci-id</text:p> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p>enoddi33:get-ci-id</text:p> </table:table-cell> - <table:table-cell table:style-name="Default"/> - <table:table-cell table:style-name="Default" office:value-type="string" calcext:value-type="string"> + <table:table-cell/> + <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>enopogues:get-ci-id</text:p> </table:table-cell> <table:table-cell/> </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>enoddi32:get-citation</text:p> + <text:p>enoddi33:get-citation</text:p> </table:table-cell> <table:table-cell/> - <table:table-cell table:style-name="ce11" office:value-type="string" calcext:value-type="string"> + <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>enopogues:get-label</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> @@ -783,42 +754,42 @@ </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>enoddi32:get-code-list-id</text:p> + <text:p>enoddi33:get-code-list-id</text:p> </table:table-cell> <table:table-cell/> - <table:table-cell table:style-name="ce11" office:value-type="string" calcext:value-type="string"> + <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>enopogues:get-code-list-id</text:p> </table:table-cell> <table:table-cell/> </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>enoddi32:get-command-id</text:p> + <text:p>enoddi33:get-command-id</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>ip-id</text:p> </table:table-cell> - <table:table-cell table:style-name="ce11" office:value-type="string" calcext:value-type="string"> + <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>enopogues:get-command-id</text:p> </table:table-cell> <table:table-cell/> </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>enoddi32:get-controls</text:p> + <text:p>enoddi33:get-controls</text:p> </table:table-cell> <table:table-cell/> - <table:table-cell table:style-name="ce11" office:value-type="string" calcext:value-type="string"> + <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>enopogues:get-controls</text:p> </table:table-cell> <table:table-cell/> </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>enoddi32:get-decimal-positions</text:p> + <text:p>enoddi33:get-decimal-positions</text:p> </table:table-cell> <table:table-cell/> - <table:table-cell table:style-name="ce11" office:value-type="string" calcext:value-type="string"> + <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>enopogues:get-decimals</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> @@ -826,94 +797,94 @@ </table:table-cell> </table:table-row> <table:table-row table:style-name="ro2"> - <table:table-cell table:style-name="ce12" office:value-type="string" calcext:value-type="string"> - <text:p>enoddi32:get-description</text:p> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p>enoddi33:get-description</text:p> </table:table-cell> <table:table-cell/> - <table:table-cell table:style-name="ce12" office:value-type="string" calcext:value-type="string"> + <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>enopogues:get-description</text:p> </table:table-cell> <table:table-cell/> </table:table-row> <table:table-row table:style-name="ro2"> - <table:table-cell table:style-name="Default" office:value-type="string" calcext:value-type="string"> - <text:p>enoddi32:get-dynamic</text:p> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p>enoddi33:get-dynamic</text:p> </table:table-cell> <table:table-cell/> - <table:table-cell table:style-name="ce13" office:value-type="string" calcext:value-type="string"> + <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>enopogues:get-dynamic</text:p> </table:table-cell> - <table:table-cell table:style-name="ce16" office:value-type="string" calcext:value-type="string"> + <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>This is used to implement the code of booleans if this return something</text:p> </table:table-cell> </table:table-row> <table:table-row table:style-name="ro2"> - <table:table-cell table:style-name="ce13" office:value-type="string" calcext:value-type="string"> - <text:p>enoddi32:get-expression</text:p> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p>enoddi33:get-expression</text:p> </table:table-cell> <table:table-cell/> - <table:table-cell table:style-name="ce13" office:value-type="string" calcext:value-type="string"> + <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>enopogues:get-expression</text:p> </table:table-cell> - <table:table-cell table:style-name="ce16" office:value-type="string" calcext:value-type="string"> + <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>Return the ID of the element that result a true condition.</text:p> </table:table-cell> </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>enoddi32:get-fake-code-lists</text:p> + <text:p>enoddi33:get-fake-code-lists</text:p> </table:table-cell> <table:table-cell/> - <table:table-cell table:style-name="ce11" office:value-type="string" calcext:value-type="string"> + <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>enopogues:get-fake-code-lists</text:p> </table:table-cell> <table:table-cell/> </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>enoddi32:get-fake-dimension</text:p> + <text:p>enoddi33:get-fake-dimension</text:p> </table:table-cell> <table:table-cell/> - <table:table-cell table:style-name="ce11" office:value-type="string" calcext:value-type="string"> + <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>enopogues:get-fake-dimension</text:p> </table:table-cell> <table:table-cell/> </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>enoddi32:get-generated-instruction-id</text:p> + <text:p>enoddi33:get-generated-instruction-id</text:p> </table:table-cell> <table:table-cell/> - <table:table-cell table:style-name="ce11" office:value-type="string" calcext:value-type="string"> + <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>enopogues:get-generated-instruction-id</text:p> </table:table-cell> <table:table-cell/> </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>enoddi32:get-generation-instructions</text:p> + <text:p>enoddi33:get-generation-instructions</text:p> </table:table-cell> <table:table-cell/> - <table:table-cell table:style-name="ce12" office:value-type="string" calcext:value-type="string"> + <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>enopogues:get-calculated-variables</text:p> </table:table-cell> <table:table-cell/> </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>enoddi32:get-generic-output-format</text:p> + <text:p>enoddi33:get-generic-output-format</text:p> </table:table-cell> <table:table-cell/> - <table:table-cell table:style-name="ce14" office:value-type="string" calcext:value-type="string"> + <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>enopogues:get-visualization-hint</text:p> </table:table-cell> - <table:table-cell table:style-name="Default" office:value-type="string" calcext:value-type="string"> + <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>Return the type of a question or of the data of a response</text:p> </table:table-cell> </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>enoddi32:get-grid-dimensions</text:p> + <text:p>enoddi33:get-grid-dimensions</text:p> </table:table-cell> <table:table-cell/> <table:table-cell office:value-type="string" calcext:value-type="string"> @@ -923,10 +894,10 @@ </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>enoddi32:get-high</text:p> + <text:p>enoddi33:get-high</text:p> </table:table-cell> <table:table-cell/> - <table:table-cell table:style-name="ce11" office:value-type="string" calcext:value-type="string"> + <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>enopogues:get-maximum</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> @@ -935,10 +906,10 @@ </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>enoddi32:get-id</text:p> + <text:p>enoddi33:get-id</text:p> </table:table-cell> <table:table-cell/> - <table:table-cell table:style-name="ce14" office:value-type="string" calcext:value-type="string"> + <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>enopogues:get-id</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> @@ -946,65 +917,65 @@ </table:table-cell> </table:table-row> <table:table-row table:style-name="ro2"> - <table:table-cell table:style-name="ce10" office:value-type="string" calcext:value-type="string"> - <text:p>enoddi32:get-if-true</text:p> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p>enoddi33:get-if-true</text:p> </table:table-cell> <table:table-cell/> - <table:table-cell table:style-name="ce10" office:value-type="string" calcext:value-type="string"> + <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>enopogues:get-if-true</text:p> </table:table-cell> - <table:table-cell table:style-name="ce16" office:value-type="string" calcext:value-type="string"> + <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>Return the ID to which the GoTo aim</text:p> </table:table-cell> </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>enoddi32:get-ifthenelses</text:p> + <text:p>enoddi33:get-ifthenelses</text:p> </table:table-cell> <table:table-cell/> - <table:table-cell table:style-name="ce11" office:value-type="string" calcext:value-type="string"> + <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>enopogues:get-ifthenelses</text:p> </table:table-cell> - <table:table-cell table:style-name="ce16" office:value-type="string" calcext:value-type="string"> + <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>Return all IfThenElses elements of the survey.</text:p> </table:table-cell> </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>enoddi32:get-instruction-id</text:p> + <text:p>enoddi33:get-instruction-id</text:p> </table:table-cell> <table:table-cell/> - <table:table-cell table:style-name="ce11" office:value-type="string" calcext:value-type="string"> + <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>enopogues:get-instruction-id</text:p> </table:table-cell> <table:table-cell/> </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>enoddi32:get-instruction-name</text:p> + <text:p>enoddi33:get-instruction-name</text:p> </table:table-cell> <table:table-cell/> - <table:table-cell table:style-name="ce11" office:value-type="string" calcext:value-type="string"> + <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>enopogues:get-instruction-name</text:p> </table:table-cell> <table:table-cell/> </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>enoddi32:get-instruction-text</text:p> + <text:p>enoddi33:get-instruction-text</text:p> </table:table-cell> <table:table-cell/> - <table:table-cell table:style-name="ce11" office:value-type="string" calcext:value-type="string"> + <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>enopogues:get-instruction-text</text:p> </table:table-cell> <table:table-cell/> </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>enoddi32:get-instructions</text:p> + <text:p>enoddi33:get-instructions</text:p> </table:table-cell> <table:table-cell/> - <table:table-cell table:style-name="ce11" office:value-type="string" calcext:value-type="string"> + <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>enopogues:get-instructions</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> @@ -1013,22 +984,22 @@ </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>enoddi32:get-ip-id</text:p> + <text:p>enoddi33:get-ip-id</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>index</text:p> </table:table-cell> - <table:table-cell table:style-name="ce11" office:value-type="string" calcext:value-type="string"> + <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>enopogues:get-ip-id</text:p> </table:table-cell> <table:table-cell/> </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>enoddi32:get-label</text:p> + <text:p>enoddi33:get-label</text:p> </table:table-cell> <table:table-cell/> - <table:table-cell table:style-name="ce11" office:value-type="string" calcext:value-type="string"> + <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>enopogues:get-label</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> @@ -1037,22 +1008,22 @@ </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>enoddi32:get-lang</text:p> + <text:p>enoddi33:get-lang</text:p> </table:table-cell> <table:table-cell/> - <table:table-cell table:style-name="ce14" office:value-type="string" calcext:value-type="string"> + <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>enopogues:get-lang</text:p> </table:table-cell> - <table:table-cell table:style-name="ce16" office:value-type="string" calcext:value-type="string"> + <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>Return a version for the survey. As this information in not available in PoguesXML, it is hard-coded</text:p> </table:table-cell> </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>enoddi32:get-low</text:p> + <text:p>enoddi33:get-low</text:p> </table:table-cell> <table:table-cell/> - <table:table-cell table:style-name="ce11" office:value-type="string" calcext:value-type="string"> + <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>enopogues:get-minimum</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> @@ -1061,10 +1032,10 @@ </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>enoddi32:get-mandatory</text:p> + <text:p>enoddi33:get-mandatory</text:p> </table:table-cell> <table:table-cell/> - <table:table-cell table:style-name="ce11" office:value-type="string" calcext:value-type="string"> + <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>enopogues:get-mandatory</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> @@ -1073,10 +1044,10 @@ </table:table-row> <table:table-row table:style-name="ro1"> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>enoddi32:get-max-length</text:p> + <text:p>enoddi33:get-max-length</text:p> </table:table-cell> <table:table-cell/> - <table:table-cell table:style-name="ce11" office:value-type="string" calcext:value-type="string"> + <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>enopogues:get-max-length</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> @@ -1085,10 +1056,10 @@ </table:table-row> <table:table-row table:style-name="ro1"> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>enoddi32:get-name</text:p> + <text:p>enoddi33:get-name</text:p> </table:table-cell> <table:table-cell/> - <table:table-cell table:style-name="ce11" office:value-type="string" calcext:value-type="string"> + <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>enopogues:get-name</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> @@ -1096,20 +1067,20 @@ </table:table-cell> </table:table-row> <table:table-row table:style-name="ro1"> - <table:table-cell table:style-name="Default" office:value-type="string" calcext:value-type="string"> - <text:p>enoddi32:get-parent-id</text:p> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p>enoddi33:get-parent-id</text:p> </table:table-cell> <table:table-cell/> - <table:table-cell table:style-name="Default" office:value-type="string" calcext:value-type="string"> + <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>enopogues:get-parent-id</text:p> </table:table-cell> - <table:table-cell table:style-name="ce16" office:value-type="string" calcext:value-type="string"> + <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>Return the ID of the parent of the current element</text:p> </table:table-cell> </table:table-row> <table:table-row table:style-name="ro1"> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>enoddi32:get-position</text:p> + <text:p>enoddi33:get-position</text:p> </table:table-cell> <table:table-cell/> <table:table-cell office:value-type="string" calcext:value-type="string"> @@ -1119,40 +1090,40 @@ </table:table-row> <table:table-row table:style-name="ro1"> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>enoddi32:get-qop-id</text:p> + <text:p>enoddi33:get-qop-id</text:p> </table:table-cell> <table:table-cell/> - <table:table-cell table:style-name="ce11" office:value-type="string" calcext:value-type="string"> + <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>enopogues:get-qop-id</text:p> </table:table-cell> - <table:table-cell table:style-name="Default"/> + <table:table-cell/> </table:table-row> <table:table-row table:style-name="ro1"> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>enoddi32:get-question-id</text:p> + <text:p>enoddi33:get-question-id</text:p> </table:table-cell> <table:table-cell/> - <table:table-cell table:style-name="ce11" office:value-type="string" calcext:value-type="string"> + <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>enopogues:get-question-id</text:p> </table:table-cell> <table:table-cell/> </table:table-row> <table:table-row table:style-name="ro1"> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>enoddi32:get-question-type</text:p> + <text:p>enoddi33:get-question-type</text:p> </table:table-cell> <table:table-cell/> - <table:table-cell table:style-name="ce11" office:value-type="string" calcext:value-type="string"> + <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>enopogues:get-question-type</text:p> </table:table-cell> <table:table-cell/> </table:table-row> <table:table-row table:style-name="ro1"> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>enoddi32:get-questions</text:p> + <text:p>enoddi33:get-questions</text:p> </table:table-cell> <table:table-cell/> - <table:table-cell table:style-name="ce11" office:value-type="string" calcext:value-type="string"> + <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>enopogues:get-questions</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> @@ -1160,73 +1131,73 @@ </table:table-cell> </table:table-row> <table:table-row table:style-name="ro1"> - <table:table-cell table:style-name="ce12" office:value-type="string" calcext:value-type="string"> - <text:p>enoddi32:get-questions-simple</text:p> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p>enoddi33:get-questions-simple</text:p> </table:table-cell> <table:table-cell/> - <table:table-cell table:style-name="ce12" office:value-type="string" calcext:value-type="string"> + <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>enopogues:get-questions-simple</text:p> </table:table-cell> <table:table-cell/> </table:table-row> <table:table-row table:style-name="ro1"> - <table:table-cell table:style-name="ce12" office:value-type="string" calcext:value-type="string"> - <text:p>enoddi32:get-questions-table</text:p> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p>enoddi33:get-questions-table</text:p> </table:table-cell> <table:table-cell/> - <table:table-cell table:style-name="ce12" office:value-type="string" calcext:value-type="string"> + <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>enopogues:get-questions-table</text:p> </table:table-cell> <table:table-cell/> </table:table-row> <table:table-row table:style-name="ro1"> - <table:table-cell table:style-name="Default" office:value-type="string" calcext:value-type="string"> - <text:p>enoddi32:get-rank</text:p> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p>enoddi33:get-rank</text:p> </table:table-cell> - <table:table-cell table:style-name="Default"/> - <table:table-cell table:style-name="Default" office:value-type="string" calcext:value-type="string"> + <table:table-cell/> + <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>enopogues:get-rank</text:p> </table:table-cell> <table:table-cell/> </table:table-row> <table:table-row table:style-name="ro1"> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>enoddi32:get-related-controls</text:p> + <text:p>enoddi33:get-related-controls</text:p> </table:table-cell> <table:table-cell/> - <table:table-cell table:style-name="ce11" office:value-type="string" calcext:value-type="string"> + <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>enopogues:get-related-controls</text:p> </table:table-cell> <table:table-cell/> </table:table-row> <table:table-row table:style-name="ro1"> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>enoddi32:get-related-response</text:p> + <text:p>enoddi33:get-related-response</text:p> </table:table-cell> <table:table-cell/> - <table:table-cell table:style-name="ce11" office:value-type="string" calcext:value-type="string"> + <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>enopogues:get-related-response</text:p> </table:table-cell> - <table:table-cell table:style-name="Default" office:value-type="string" calcext:value-type="string"> + <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>Return the responses referencing the current element</text:p> </table:table-cell> </table:table-row> <table:table-row table:style-name="ro1"> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>enoddi32:get-related-variable</text:p> + <text:p>enoddi33:get-related-variable</text:p> </table:table-cell> <table:table-cell/> - <table:table-cell table:style-name="ce11" office:value-type="string" calcext:value-type="string"> + <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>enopogues:get-related-variable</text:p> </table:table-cell> - <table:table-cell table:style-name="Default"/> + <table:table-cell/> </table:table-row> <table:table-row table:style-name="ro1"> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>enoddi32:get-sequence-type</text:p> + <text:p>enoddi33:get-sequence-type</text:p> </table:table-cell> <table:table-cell/> - <table:table-cell table:style-name="ce11" office:value-type="string" calcext:value-type="string"> + <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>enopogues:get-generic-name</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> @@ -1235,10 +1206,10 @@ </table:table-row> <table:table-row table:style-name="ro1"> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>enoddi32:get-sequences</text:p> + <text:p>enoddi33:get-sequences</text:p> </table:table-cell> <table:table-cell/> - <table:table-cell table:style-name="ce11" office:value-type="string" calcext:value-type="string"> + <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>enopogues:get-sequences</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> @@ -1246,31 +1217,31 @@ </table:table-cell> </table:table-row> <table:table-row table:style-name="ro1"> - <table:table-cell table:style-name="Default" office:value-type="string" calcext:value-type="string"> - <text:p>enoddi32:get-statement-item</text:p> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p>enoddi33:get-statement-item</text:p> </table:table-cell> <table:table-cell/> - <table:table-cell table:style-name="Default" office:value-type="string" calcext:value-type="string"> + <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>enopogues:get-instructions-before</text:p> </table:table-cell> <table:table-cell/> </table:table-row> <table:table-row table:style-name="ro1"> - <table:table-cell table:style-name="Default" office:value-type="string" calcext:value-type="string"> - <text:p>enoddi32:get-survey-name</text:p> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p>enoddi33:get-survey-name</text:p> </table:table-cell> <table:table-cell/> - <table:table-cell table:style-name="Default" office:value-type="string" calcext:value-type="string"> + <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>enopogues:get-survey-name</text:p> </table:table-cell> <table:table-cell/> </table:table-row> <table:table-row table:style-name="ro1"> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>enoddi32:get-type</text:p> + <text:p>enoddi33:get-type</text:p> </table:table-cell> <table:table-cell/> - <table:table-cell table:style-name="ce11" office:value-type="string" calcext:value-type="string"> + <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>enopogues:get-type</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> @@ -1279,10 +1250,10 @@ </table:table-row> <table:table-row table:style-name="ro1"> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>enoddi32:get-type-name</text:p> + <text:p>enoddi33:get-type-name</text:p> </table:table-cell> <table:table-cell/> - <table:table-cell table:style-name="ce11" office:value-type="string" calcext:value-type="string"> + <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>enopogues:get-type-name</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> @@ -1291,32 +1262,32 @@ </table:table-row> <table:table-row table:style-name="ro1"> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>enoddi32:get-unit</text:p> + <text:p>enoddi33:get-unit</text:p> </table:table-cell> <table:table-cell/> - <table:table-cell table:style-name="ce11" office:value-type="string" calcext:value-type="string"> + <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>enopogues:get-unit</text:p> </table:table-cell> <table:table-cell/> </table:table-row> <table:table-row table:style-name="ro1"> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>enoddi32:get-value</text:p> + <text:p>enoddi33:get-value</text:p> </table:table-cell> <table:table-cell/> - <table:table-cell table:style-name="ce11" office:value-type="string" calcext:value-type="string"> + <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>enopogues:get-value</text:p> </table:table-cell> - <table:table-cell table:style-name="ce16" office:value-type="string" calcext:value-type="string"> + <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>Return a lang for the survey. As this information in not available in PoguesXML, it is hard-coded</text:p> </table:table-cell> </table:table-row> <table:table-row table:style-name="ro1"> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>enoddi32:get-version</text:p> + <text:p>enoddi33:get-version</text:p> </table:table-cell> <table:table-cell/> - <table:table-cell table:style-name="ce14" office:value-type="string" calcext:value-type="string"> + <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>enopogues:get-version</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> @@ -1325,29 +1296,29 @@ </table:table-row> <table:table-row table:style-name="ro1"> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>enoddi32:is-discrete</text:p> + <text:p>enoddi33:is-discrete</text:p> </table:table-cell> <table:table-cell/> - <table:table-cell table:style-name="Default" office:value-type="string" calcext:value-type="string"> + <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>enopogues:is-discrete</text:p> </table:table-cell> - <table:table-cell table:style-name="ce16" office:value-type="string" calcext:value-type="string"> + <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>Return the dynamic attribute of the pogues:Dimension. This value is used to compute positions in grids</text:p> </table:table-cell> </table:table-row> <table:table-row table:style-name="ro1"> - <table:table-cell table:style-name="Default" office:value-type="string" calcext:value-type="string"> - <text:p>enoddi32:get-processing-instruction</text:p> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p>enoddi33:get-processing-instruction</text:p> </table:table-cell> - <table:table-cell table:style-name="Default"/> - <table:table-cell table:style-name="Default" office:value-type="string" calcext:value-type="string"> + <table:table-cell/> + <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>enopogues:get-related-formula</text:p> </table:table-cell> <table:table-cell/> </table:table-row> <table:table-row table:style-name="ro1"> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>enoddi32:get-command</text:p> + <text:p>enoddi33:get-command</text:p> </table:table-cell> <table:table-cell/> <table:table-cell office:value-type="string" calcext:value-type="string"> @@ -1356,23 +1327,17 @@ <table:table-cell/> </table:table-row> <table:table-row table:style-name="ro1"> - <table:table-cell table:style-name="Default" office:value-type="string" calcext:value-type="string"> - <text:p>enoddi32:get-format</text:p> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p>enoddi33:get-format</text:p> </table:table-cell> <table:table-cell/> - <table:table-cell table:style-name="Default" office:value-type="string" calcext:value-type="string"> + <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>enopogues:get-format</text:p> </table:table-cell> - <table:table-cell table:style-name="Default" office:value-type="string" calcext:value-type="string"> + <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>Return format</text:p> </table:table-cell> </table:table-row> - <table:table-row table:style-name="ro1" table:number-rows-repeated="1048516"> - <table:table-cell table:number-columns-repeated="4"/> - </table:table-row> - <table:table-row table:style-name="ro1"> - <table:table-cell table:number-columns-repeated="4"/> - </table:table-row> </table:table> <table:named-expressions/> <table:database-ranges> diff --git a/src/main/resources/xslt/transformations/pogues-xml2ddi/pogues-xml2ddi-fixed.xsl b/src/main/resources/xslt/transformations/pogues-xml2ddi/pogues-xml2ddi-fixed.xsl index 60d17ee57..e096e02c9 100644 --- a/src/main/resources/xslt/transformations/pogues-xml2ddi/pogues-xml2ddi-fixed.xsl +++ b/src/main/resources/xslt/transformations/pogues-xml2ddi/pogues-xml2ddi-fixed.xsl @@ -8,7 +8,7 @@ xmlns:enoddi2fr="http://xml.insee.fr/apps/eno/ddi2form-runner" xmlns:d="ddi:datacollection:3_3" xmlns:r="ddi:reusable:3_3" xmlns:l="ddi:logicalproduct:3_3" - xmlns:enoddi32="http://xml.insee.fr/apps/eno/out/ddi32" + xmlns:enoddi33="http://xml.insee.fr/apps/eno/out/ddi33" xmlns:enopogues="http://xml.insee.fr/apps/eno/in/pogues-xml" version="2.0"> @@ -53,39 +53,39 @@ </xsl:template> <!--TODO The implementation of retrieving reference id (aka qc-id,cc-id...) should be done with "rich" outGetter mechanism =>@v2.0 --> - <xsl:function name="enoddi32:get-reference-id"> + <xsl:function name="enoddi33:get-reference-id"> <xsl:param name="context" as="item()"/> - <xsl:apply-templates select="$context" mode="enoddi32:get-reference-id"/> + <xsl:apply-templates select="$context" mode="enoddi33:get-reference-id"/> </xsl:function> - <xsl:template match="*[enopogues:is-question(.) = 'true']" mode="enoddi32:get-reference-id"> - <xsl:value-of select="enoddi32:get-qc-id(.)"/> + <xsl:template match="*[enopogues:is-question(.) = 'true']" mode="enoddi33:get-reference-id"> + <xsl:value-of select="enoddi33:get-qc-id(.)"/> </xsl:template> - <xsl:template match="*[enopogues:is-sequence(.) = 'true']" mode="enoddi32:get-reference-id"> - <xsl:value-of select="enoddi32:get-id(.)"/> + <xsl:template match="*[enopogues:is-sequence(.) = 'true']" mode="enoddi33:get-reference-id"> + <xsl:value-of select="enoddi33:get-id(.)"/> </xsl:template> - <xsl:template match="pogues:Control" mode="enoddi32:get-reference-id"> - <xsl:value-of select="enoddi32:get-id(.)"/> + <xsl:template match="pogues:Control" mode="enoddi33:get-reference-id"> + <xsl:value-of select="enoddi33:get-id(.)"/> </xsl:template> - <xsl:template match="pogues:Response[@mandatory='true']" mode="enoddi32:get-reference-id"> - <xsl:value-of select="enoddi32:get-ci-id(.)"/> + <xsl:template match="pogues:Response[@mandatory='true']" mode="enoddi33:get-reference-id"> + <xsl:value-of select="enoddi33:get-ci-id(.)"/> </xsl:template> <!--TODO The implementation of retrieving reference element name (aka Sequence,QuestionConstruct...) should be done with "rich" outGetter mechanism =>@v2.0 --> - <xsl:function name="enoddi32:get-reference-element-name"> + <xsl:function name="enoddi33:get-reference-element-name"> <xsl:param name="context" as="item()"/> - <xsl:apply-templates select="$context" mode="enoddi32:get-reference-element-name"/> + <xsl:apply-templates select="$context" mode="enoddi33:get-reference-element-name"/> </xsl:function> - <xsl:template match="*[enopogues:is-question(.) = 'true']" mode="enoddi32:get-reference-element-name"> + <xsl:template match="*[enopogues:is-question(.) = 'true']" mode="enoddi33:get-reference-element-name"> <xsl:value-of select="'QuestionConstruct'"/> </xsl:template> - <xsl:template match="*[enopogues:is-sequence(.) = 'true']" mode="enoddi32:get-reference-element-name"> + <xsl:template match="*[enopogues:is-sequence(.) = 'true']" mode="enoddi33:get-reference-element-name"> <xsl:choose> <xsl:when test="local-name(.)='IfThenElse'"> <xsl:value-of select="'IfThenElse'"/> @@ -94,17 +94,17 @@ <xsl:value-of select="'Sequence'"/> </xsl:when> <xsl:otherwise> - <xsl:message select="concat('enoddi32:get-reference-element-name does not explicitly support ',name(.))"/> + <xsl:message select="concat('enoddi33:get-reference-element-name does not explicitly support ',name(.))"/> <xsl:value-of select="local-name(.)"/> </xsl:otherwise> </xsl:choose> </xsl:template> - <xsl:template match="pogues:Control | pogues:Response[@mandatory='true']" mode="enoddi32:get-reference-element-name"> + <xsl:template match="pogues:Control | pogues:Response[@mandatory='true']" mode="enoddi33:get-reference-element-name"> <xsl:value-of select="'ComputationItem'"/> </xsl:template> - <xsl:template match="pogues:IfThenElse" mode="enoddi32:get-reference-element-name"> + <xsl:template match="pogues:IfThenElse" mode="enoddi33:get-reference-element-name"> <xsl:value-of select="local-name(.)"/> </xsl:template> @@ -112,147 +112,147 @@ <!-- **************************************************************************** --> <!-- Id for QuestionConstruct (QC) --> - <xsl:function name="enoddi32:get-qc-id"> + <xsl:function name="enoddi33:get-qc-id"> <xsl:param name="context" as="item()"/> - <xsl:apply-templates select="$context" mode="enoddi32:get-qc-id"/> + <xsl:apply-templates select="$context" mode="enoddi33:get-qc-id"/> </xsl:function> - <xsl:template match="*[enopogues:is-question(.)]" mode="enoddi32:get-qc-id"> + <xsl:template match="*[enopogues:is-question(.)]" mode="enoddi33:get-qc-id"> <xsl:value-of select="concat(enopogues:get-id(.),'-QC')"/> </xsl:template> <!-- Id for Then Sequence in IfThenElse --> - <xsl:function name="enoddi32:get-then-sequence-id"> + <xsl:function name="enoddi33:get-then-sequence-id"> <xsl:param name="context" as="item()"/> - <xsl:apply-templates select="$context" mode="enoddi32:get-then-sequence-id"/> + <xsl:apply-templates select="$context" mode="enoddi33:get-then-sequence-id"/> </xsl:function> <!-- TODO : Reduce the XPath, * is needed because of a bug on the namespace for outputted pogues:IfThenElse--> - <xsl:template match="*" mode="enoddi32:get-then-sequence-id"> - <xsl:value-of select="concat(enoddi32:get-id(.),'-THEN')"/> + <xsl:template match="*" mode="enoddi33:get-then-sequence-id"> + <xsl:value-of select="concat(enoddi33:get-id(.),'-THEN')"/> </xsl:template> <!-- Id for ResponseDomain OutParameter (rdop) --> - <xsl:function name="enoddi32:get-rdop-id"> + <xsl:function name="enoddi33:get-rdop-id"> <xsl:param name="context" as="item()"/> - <xsl:apply-templates select="$context" mode="enoddi32:get-rdop-id"/> + <xsl:apply-templates select="$context" mode="enoddi33:get-rdop-id"/> </xsl:function> - <xsl:template match="pogues:Response" mode="enoddi32:get-rdop-id"> + <xsl:template match="pogues:Response" mode="enoddi33:get-rdop-id"> <xsl:value-of select="concat(parent::*/@id,'-RDOP-',@id)"/> </xsl:template> - <xsl:template match="pogues:Datatype" mode="enoddi32:get-rdop-id"> - <xsl:value-of select="enoddi32:get-rdop-id(parent::*)"/> + <xsl:template match="pogues:Datatype" mode="enoddi33:get-rdop-id"> + <xsl:value-of select="enoddi33:get-rdop-id(parent::*)"/> </xsl:template> - <xsl:function name="enoddi32:get-si-id"> + <xsl:function name="enoddi33:get-si-id"> <xsl:param name="context" as="item()"/> - <xsl:apply-templates select="$context" mode="enoddi32:get-si-id"/> + <xsl:apply-templates select="$context" mode="enoddi33:get-si-id"/> </xsl:function> - <xsl:template match="pogues:Declaration" mode="enoddi32:get-si-id"> - <xsl:value-of select="concat(enoddi32:get-id(.),'-SI')"/> + <xsl:template match="pogues:Declaration" mode="enoddi33:get-si-id"> + <xsl:value-of select="concat(enoddi33:get-id(.),'-SI')"/> </xsl:template> <!--TODO The implementation of building id should be done with "rich" outGetter mechanism =>@v2.0 --> - <xsl:function name="enoddi32:get-vrop-id"> + <xsl:function name="enoddi33:get-vrop-id"> <xsl:param name="context" as="item()"/> - <xsl:apply-templates select="$context" mode="enoddi32:get-vrop-id"/> + <xsl:apply-templates select="$context" mode="enoddi33:get-vrop-id"/> </xsl:function> - <xsl:template match="pogues:Formula" mode="enoddi32:get-vrop-id"> - <xsl:value-of select="concat(enoddi32:get-id(parent::pogues:Variable),'-VROP')"/> + <xsl:template match="pogues:Formula" mode="enoddi33:get-vrop-id"> + <xsl:value-of select="concat(enoddi33:get-id(parent::pogues:Variable),'-VROP')"/> </xsl:template> <!--TODO The implementation of building id should be done with "rich" outGetter mechanism =>@v2.0 --> - <xsl:function name="enoddi32:get-gi-id"> + <xsl:function name="enoddi33:get-gi-id"> <xsl:param name="context" as="item()"/> - <xsl:apply-templates select="$context" mode="enoddi32:get-gi-id"/> + <xsl:apply-templates select="$context" mode="enoddi33:get-gi-id"/> </xsl:function> - <xsl:template match="pogues:Variable[@xsi:type='CalculatedVariableType']" mode="enoddi32:get-gi-id"> - <xsl:value-of select="concat(enoddi32:get-id(.),'-GI')"/> + <xsl:template match="pogues:Variable[@xsi:type='CalculatedVariableType']" mode="enoddi33:get-gi-id"> + <xsl:value-of select="concat(enoddi33:get-id(.),'-GI')"/> </xsl:template> - <xsl:template match="pogues:Formula" mode="enoddi32:get-gi-id"> - <xsl:apply-templates select="parent::pogues:Variable" mode="enoddi32:get-gi-id"/> + <xsl:template match="pogues:Formula" mode="enoddi33:get-gi-id"> + <xsl:apply-templates select="parent::pogues:Variable" mode="enoddi33:get-gi-id"/> </xsl:template> <!--TODO The implementation building id should be done with "rich" outGetter mechanism =>@v2.0 --> - <xsl:function name="enoddi32:get-main-sequence-id"> + <xsl:function name="enoddi33:get-main-sequence-id"> <xsl:param name="context" as="item()"/> - <xsl:apply-templates select="$context" mode="enoddi32:get-main-sequence-id"/> + <xsl:apply-templates select="$context" mode="enoddi33:get-main-sequence-id"/> </xsl:function> - <xsl:template match="*" mode="enoddi32:get-main-sequence-id"> + <xsl:template match="*" mode="enoddi33:get-main-sequence-id"> <xsl:value-of select="concat('Sequence-',enopogues:get-questionnaire-id(.))"/> </xsl:template> <!--TODO The implementation building id should be done with "rich" outGetter mechanism =>@v2.0 --> - <xsl:function name="enoddi32:get-referenced-sequence-id"> + <xsl:function name="enoddi33:get-referenced-sequence-id"> <xsl:param name="context" as="item()"/> - <xsl:apply-templates select="$context" mode="enoddi32:get-referenced-sequence-id"/> + <xsl:apply-templates select="$context" mode="enoddi33:get-referenced-sequence-id"/> </xsl:function> - <xsl:template match="pogues:Formula" mode="enoddi32:get-referenced-sequence-id"> - <xsl:value-of select="enoddi32:get-main-sequence-id(.)"/> + <xsl:template match="pogues:Formula" mode="enoddi33:get-referenced-sequence-id"> + <xsl:value-of select="enoddi33:get-main-sequence-id(.)"/> </xsl:template> <!--TODO The implementation of ComputationItem type should be done with "rich" outGetter mechanism =>@v2.0 --> - <xsl:function name="enoddi32:get-ci-type"> + <xsl:function name="enoddi33:get-ci-type"> <xsl:param name="context" as="item()"/> - <xsl:apply-templates select="$context" mode="enoddi32:get-ci-type"/> + <xsl:apply-templates select="$context" mode="enoddi33:get-ci-type"/> </xsl:function> - <xsl:template match="pogues:Control" mode="enoddi32:get-ci-type"> - <xsl:value-of select="enoddi32:get-type(.)"/> + <xsl:template match="pogues:Control" mode="enoddi33:get-ci-type"> + <xsl:value-of select="enoddi33:get-type(.)"/> </xsl:template> - <xsl:template match="pogues:Response[@mandatory='true']" mode="enoddi32:get-ci-type"> + <xsl:template match="pogues:Response[@mandatory='true']" mode="enoddi33:get-ci-type"> <xsl:value-of select="'mandatory'"/> </xsl:template> <!--TODO The implementation of ComputationItem type should be done with "rich" outGetter mechanism =>@v2.0 --> - <xsl:function name="enoddi32:get-ci-name"> + <xsl:function name="enoddi33:get-ci-name"> <xsl:param name="context" as="item()"/> - <xsl:apply-templates select="$context" mode="enoddi32:get-ci-name"/> + <xsl:apply-templates select="$context" mode="enoddi33:get-ci-name"/> </xsl:function> - <xsl:template match="pogues:Control" mode="enoddi32:get-ci-name"> - <xsl:value-of select="enoddi32:get-description(.)"/> + <xsl:template match="pogues:Control" mode="enoddi33:get-ci-name"> + <xsl:value-of select="enoddi33:get-description(.)"/> </xsl:template> - <xsl:template match="pogues:Response[@mandatory='true']" mode="enoddi32:get-ci-name"> - <xsl:value-of select="concat('ComputationItem for the mandatory question ',enoddi32:get-id(.))"/> + <xsl:template match="pogues:Response[@mandatory='true']" mode="enoddi33:get-ci-name"> + <xsl:value-of select="concat('ComputationItem for the mandatory question ',enoddi33:get-id(.))"/> </xsl:template> <!--TODO The implementation of Parameter Reference for conditional text should be done with "rich" outGetter mechanism =>@v2.0 --> - <xsl:function name="enoddi32:get-qop-conditional-text-id"> + <xsl:function name="enoddi33:get-qop-conditional-text-id"> <xsl:param name="context" as="item()"/> - <xsl:apply-templates select="$context" mode="enoddi32:get-qop-conditional-text-id"/> + <xsl:apply-templates select="$context" mode="enoddi33:get-qop-conditional-text-id"/> </xsl:function> - <xsl:template match="pogues:Control[pogues:FailMessage]" mode="enoddi32:get-qop-conditional-text-id"> - <xsl:value-of select="enoddi32:get-qop-id(pogues:FailMessage)"/> + <xsl:template match="pogues:Control[pogues:FailMessage]" mode="enoddi33:get-qop-conditional-text-id"> + <xsl:value-of select="enoddi33:get-qop-id(pogues:FailMessage)"/> </xsl:template> - <xsl:template match="pogues:Declaration" mode="enoddi32:get-qop-conditional-text-id"> - <xsl:value-of select="enoddi32:get-qop-id(pogues:Text)"/> + <xsl:template match="pogues:Declaration" mode="enoddi33:get-qop-conditional-text-id"> + <xsl:value-of select="enoddi33:get-qop-id(pogues:Text)"/> </xsl:template> <!--TODO The implementation of Parameter Reference for conditional text should be done with "rich" outGetter mechanism =>@v2.0 --> - <xsl:function name="enoddi32:is-with-conditionnal-text"> + <xsl:function name="enoddi33:is-with-conditionnal-text"> <xsl:param name="context" as="item()"/> - <xsl:apply-templates select="$context" mode="enoddi32:is-with-conditionnal-text"/> + <xsl:apply-templates select="$context" mode="enoddi33:is-with-conditionnal-text"/> </xsl:function> - <xsl:template match="*[pogues:Text or pogues:FailMessage]" mode="enoddi32:is-with-conditionnal-text"> - <xsl:value-of select="enoddi32:is-with-conditionnal-text(*[self::pogues:Text or self::pogues:FailMessage])"/> + <xsl:template match="*[pogues:Text or pogues:FailMessage]" mode="enoddi33:is-with-conditionnal-text"> + <xsl:value-of select="enoddi33:is-with-conditionnal-text(*[self::pogues:Text or self::pogues:FailMessage])"/> </xsl:template> <!-- ConditionnalText are required when dynamic text with at least one non external variable. --> - <xsl:template match="pogues:Text | pogues:FailMessage" mode="enoddi32:is-with-conditionnal-text"> + <xsl:template match="pogues:Text | pogues:FailMessage" mode="enoddi33:is-with-conditionnal-text"> <xsl:choose> <xsl:when test="enopogues:is-with-dynamic-text(.) = true()"> <xsl:variable name="variables" select="enopogues:get-related-variable(.)"/> @@ -264,7 +264,7 @@ </xsl:choose> </xsl:template> - <xsl:template match="*" mode="enoddi32:is-with-conditionnal-text"> + <xsl:template match="*" mode="enoddi33:is-with-conditionnal-text"> <xsl:apply-templates select="." mode="enopogues:is-with-dynamic-text"/> </xsl:template> From 9007a962ddcd5e77dcbdfeee264c77ab39390a97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bulot=20Fran=C3=A7ois?= <U7ZR1J@ad.insee.intra> Date: Fri, 19 Jul 2019 16:22:30 +0200 Subject: [PATCH 050/439] duration maximum effect on pdf --- .../resources/xslt/inputs/ddi/templates.fods | 16 ++++----- .../resources/xslt/outputs/pdf/models.xsl | 35 ++++++++++++++----- .../transformations/ddi2pdf/functions.fods | 27 +++++++++----- 3 files changed, 53 insertions(+), 25 deletions(-) diff --git a/src/main/resources/xslt/inputs/ddi/templates.fods b/src/main/resources/xslt/inputs/ddi/templates.fods index 030c771e8..55aa08ff8 100644 --- a/src/main/resources/xslt/inputs/ddi/templates.fods +++ b/src/main/resources/xslt/inputs/ddi/templates.fods @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.spreadsheet"> - <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>P3DT4H19M45S</meta:editing-duration><meta:editing-cycles>413</meta:editing-cycles><meta:generator>LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab8</meta:generator><dc:date>2019-07-16T15:56:58.475000000</dc:date><dc:creator>François Bulot</dc:creator><meta:document-statistic meta:table-count="1" meta:cell-count="484" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> + <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>P3DT4H21M54S</meta:editing-duration><meta:editing-cycles>414</meta:editing-cycles><meta:generator>LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab8</meta:generator><dc:date>2019-07-18T15:35:20.549000000</dc:date><dc:creator>François Bulot</dc:creator><meta:document-statistic meta:table-count="1" meta:cell-count="484" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> <office:settings> <config:config-item-set config:name="ooo:view-settings"> <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item> @@ -13,8 +13,8 @@ <config:config-item config:name="ViewId" config:type="string">view1</config:config-item> <config:config-item-map-named config:name="Tables"> <config:config-item-map-entry config:name="Sheet1"> - <config:config-item config:name="CursorPositionX" config:type="int">1</config:config-item> - <config:config-item config:name="CursorPositionY" config:type="int">38</config:config-item> + <config:config-item config:name="CursorPositionX" config:type="int">2</config:config-item> + <config:config-item config:name="CursorPositionY" config:type="int">100</config:config-item> <config:config-item config:name="HorizontalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="VerticalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="HorizontalSplitPosition" config:type="int">0</config:config-item> @@ -23,7 +23,7 @@ <config:config-item config:name="PositionLeft" config:type="int">0</config:config-item> <config:config-item config:name="PositionRight" config:type="int">0</config:config-item> <config:config-item config:name="PositionTop" config:type="int">0</config:config-item> - <config:config-item config:name="PositionBottom" config:type="int">14</config:config-item> + <config:config-item config:name="PositionBottom" config:type="int">84</config:config-item> <config:config-item config:name="ZoomType" config:type="short">0</config:config-item> <config:config-item config:name="ZoomValue" config:type="int">100</config:config-item> <config:config-item config:name="PageViewZoomValue" config:type="int">60</config:config-item> @@ -32,7 +32,7 @@ </config:config-item-map-entry> </config:config-item-map-named> <config:config-item config:name="ActiveTable" config:type="string">Sheet1</config:config-item> - <config:config-item config:name="HorizontalScrollbarWidth" config:type="int">1655</config:config-item> + <config:config-item config:name="HorizontalScrollbarWidth" config:type="int">1255</config:config-item> <config:config-item config:name="ZoomType" config:type="short">0</config:config-item> <config:config-item config:name="ZoomValue" config:type="int">100</config:config-item> <config:config-item config:name="PageViewZoomValue" config:type="int">60</config:config-item> @@ -632,7 +632,7 @@ <text:p><text:sheet-name>???</text:sheet-name><text:s/>(<text:title>???</text:title>)</text:p> </style:region-left> <style:region-right> - <text:p><text:date style:data-style-name="N2" text:date-value="2019-07-16">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="15:50:34.202000000">00:00:00</text:time></text:p> + <text:p><text:date style:data-style-name="N2" text:date-value="2019-07-18">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="15:33:11.075000000">00:00:00</text:time></text:p> </style:region-right> </style:header> <style:header-left style:display="false"/> @@ -2234,7 +2234,7 @@ <text:p>enoddi:get-minimum</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>descendant::r:Low[not(ancestor::r:OutParameter)]</text:p> + <text:p>descendant::r:MinimumValue[not(ancestor::r:OutParameter)]</text:p> </table:table-cell> <table:table-cell/> <table:table-cell office:value-type="string" calcext:value-type="string"> @@ -2267,7 +2267,7 @@ <text:p>enoddi:get-maximum</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>descendant::r:High[not(ancestor::r:OutParameter)]</text:p> + <text:p>descendant::r:MaximumValue[not(ancestor::r:OutParameter)]</text:p> </table:table-cell> <table:table-cell/> <table:table-cell office:value-type="string" calcext:value-type="string"> diff --git a/src/main/resources/xslt/outputs/pdf/models.xsl b/src/main/resources/xslt/outputs/pdf/models.xsl index 89cb85612..25fabde79 100644 --- a/src/main/resources/xslt/outputs/pdf/models.xsl +++ b/src/main/resources/xslt/outputs/pdf/models.xsl @@ -232,7 +232,6 @@ <xsl:template match="main//Clarification" mode="model"> <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="languages" tunnel="yes"/> - <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> <xsl:with-param name="driver" select="." tunnel="yes"/> </xsl:apply-templates> @@ -850,18 +849,38 @@ <fo:inline padding-start="1mm" padding-end="2mm">centièmes</fo:inline> </xsl:when> <xsl:otherwise> + <xsl:variable name="first-number-position" select="string-length(substring-before($field,'N'))+1"/> + <xsl:variable name="maximum-duration" select="enopdf:get-maximum($source-context)"/> <xsl:for-each select="1 to string-length($field)"> - <xsl:variable name="current-character" select="substring($field,position(),1)"/> + <xsl:variable name="current-position" select="position()"/> + <xsl:variable name="current-character" select="substring($field,$current-position,1)"/> <xsl:choose> <xsl:when test="$current-character = 'P'"/> <xsl:when test="$current-character = 'T'"/> <xsl:when test="$current-character = 'N'"> - <xsl:call-template name="insert-image"> - <xsl:with-param name="image-name" select="'mask_number.png'"/> - </xsl:call-template> - <xsl:call-template name="insert-image"> - <xsl:with-param name="image-name" select="'mask_number.png'"/> - </xsl:call-template> + <xsl:variable name="number-of-characters"> + <xsl:choose> + <xsl:when test="$current-position = $first-number-position and $maximum-duration != ''"> + <xsl:variable name="duration-regex" select="concat('^PT?([0-9]+)',substring($field,$current-position+1,1),'.*$')"/> + <xsl:analyze-string select="$maximum-duration" regex="{$duration-regex}"> + <xsl:matching-substring> + <xsl:value-of select="string-length(regex-group(1))"/> + </xsl:matching-substring> + <xsl:non-matching-substring> + <xsl:value-of select="'2'"/> + </xsl:non-matching-substring> + </xsl:analyze-string> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="'2'"/> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + <xsl:for-each select="1 to xs:integer(number($number-of-characters))"> + <xsl:call-template name="insert-image"> + <xsl:with-param name="image-name" select="'mask_number.png'"/> + </xsl:call-template> + </xsl:for-each> </xsl:when> <xsl:when test="$current-character = 'Y' or $current-character = 'A'"> <fo:inline padding-start="1mm" padding-end="3mm"> diff --git a/src/main/resources/xslt/transformations/ddi2pdf/functions.fods b/src/main/resources/xslt/transformations/ddi2pdf/functions.fods index 36e5cd7d1..75722488f 100644 --- a/src/main/resources/xslt/transformations/ddi2pdf/functions.fods +++ b/src/main/resources/xslt/transformations/ddi2pdf/functions.fods @@ -1,20 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> <office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.spreadsheet"> - <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>PT19H9M36S</meta:editing-duration><meta:editing-cycles>108</meta:editing-cycles><meta:generator>LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab8</meta:generator><dc:date>2019-07-16T16:38:12.923000000</dc:date><dc:creator>François Bulot</dc:creator><meta:document-statistic meta:table-count="1" meta:cell-count="129" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> + <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>PT19H8M35S</meta:editing-duration><meta:editing-cycles>107</meta:editing-cycles><meta:generator>LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab8</meta:generator><dc:date>2019-07-18T14:16:29.404000000</dc:date><dc:creator>François Bulot</dc:creator><meta:document-statistic meta:table-count="1" meta:cell-count="124" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> <office:settings> <config:config-item-set config:name="ooo:view-settings"> <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item> <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item> <config:config-item config:name="VisibleAreaWidth" config:type="int">36807</config:config-item> - <config:config-item config:name="VisibleAreaHeight" config:type="int">22253</config:config-item> + <config:config-item config:name="VisibleAreaHeight" config:type="int">21674</config:config-item> <config:config-item-map-indexed config:name="Views"> <config:config-item-map-entry> <config:config-item config:name="ViewId" config:type="string">view1</config:config-item> <config:config-item-map-named config:name="Tables"> <config:config-item-map-entry config:name="Sheet1"> - <config:config-item config:name="CursorPositionX" config:type="int">3</config:config-item> - <config:config-item config:name="CursorPositionY" config:type="int">16</config:config-item> + <config:config-item config:name="CursorPositionX" config:type="int">0</config:config-item> + <config:config-item config:name="CursorPositionY" config:type="int">39</config:config-item> <config:config-item config:name="HorizontalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="VerticalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="HorizontalSplitPosition" config:type="int">0</config:config-item> @@ -32,7 +32,7 @@ </config:config-item-map-entry> </config:config-item-map-named> <config:config-item config:name="ActiveTable" config:type="string">Sheet1</config:config-item> - <config:config-item config:name="HorizontalScrollbarWidth" config:type="int">1655</config:config-item> + <config:config-item config:name="HorizontalScrollbarWidth" config:type="int">1255</config:config-item> <config:config-item config:name="ZoomType" config:type="short">0</config:config-item> <config:config-item config:name="ZoomValue" config:type="int">100</config:config-item> <config:config-item config:name="PageViewZoomValue" config:type="int">60</config:config-item> @@ -598,7 +598,7 @@ <text:p><text:sheet-name>???</text:sheet-name><text:s/>(<text:title>???</text:title>)</text:p> </style:region-left> <style:region-right> - <text:p><text:date style:data-style-name="N2" text:date-value="2019-07-16">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="16:36:47.580000000">00:00:00</text:time></text:p> + <text:p><text:date style:data-style-name="N2" text:date-value="2019-07-18">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="14:15:21.128000000">00:00:00</text:time></text:p> </style:region-right> </style:header> <style:header-left style:display="false"/> @@ -1197,10 +1197,19 @@ <text:p>Linking output function enopdf:get-flowcontrol-label to input function enoddi:get-flowcontrol-label.</text:p> </table:table-cell> </table:table-row> - <table:table-row table:style-name="ro1" table:number-rows-repeated="1048535"> - <table:table-cell table:number-columns-repeated="4"/> - </table:table-row> <table:table-row table:style-name="ro1"> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p>enopdf:get-maximum</text:p> + </table:table-cell> + <table:table-cell/> + <table:table-cell table:style-name="ce2" office:value-type="string" calcext:value-type="string"> + <text:p>enoddi:get-maximum</text:p> + </table:table-cell> + <table:table-cell table:style-name="Default" office:value-type="string" calcext:value-type="string"> + <text:p>Linking output function enopdf:get-maximum to input function enoddi:get-maximum.</text:p> + </table:table-cell> + </table:table-row> + <table:table-row table:style-name="ro1" table:number-rows-repeated="1048534"> <table:table-cell table:number-columns-repeated="4"/> </table:table-row> </table:table> From a71411d69f9fddec85ff0dede66d817fca491cc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bulot=20Fran=C3=A7ois?= <U7ZR1J@ad.insee.intra> Date: Fri, 19 Jul 2019 17:33:33 +0200 Subject: [PATCH 051/439] correct calculation of date minimum and maximum --- src/main/resources/xslt/outputs/fr/models.xsl | 32 +++++++++++++------ 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/src/main/resources/xslt/outputs/fr/models.xsl b/src/main/resources/xslt/outputs/fr/models.xsl index 646f61f41..39c3a7649 100644 --- a/src/main/resources/xslt/outputs/fr/models.xsl +++ b/src/main/resources/xslt/outputs/fr/models.xsl @@ -2357,8 +2357,11 @@ <format id="Y" unit="Year"> <xsl:attribute name="minimum"> <xsl:choose> + <xsl:when test="$minimum != '' and contains($minimum,'-')"> + <xsl:value-of select="substring-before($minimum,'-')"/> + </xsl:when> <xsl:when test="$minimum != ''"> - <xsl:value-of select="year-from-date($minimum)"/> + <xsl:value-of select="$minimum"/> </xsl:when> <xsl:otherwise> <xsl:value-of select="1900"/> @@ -2367,8 +2370,11 @@ </xsl:attribute> <xsl:attribute name="maximum"> <xsl:choose> + <xsl:when test="$maximum != '' and contains($maximum,'-')"> + <xsl:value-of select="substring-before($maximum,'-')"/> + </xsl:when> <xsl:when test="$maximum != ''"> - <xsl:value-of select="year-from-date($maximum)"/> + <xsl:value-of select="$maximum"/> </xsl:when> <xsl:otherwise> <xsl:value-of select="year-from-date(current-date())"/> @@ -2387,8 +2393,11 @@ <format id="M" unit="Month"> <xsl:attribute name="minimum"> <xsl:choose> - <xsl:when test="$minimum != ''"> - <xsl:value-of select="month-from-date($minimum)"/> + <xsl:when test="not(contains($format,'Y') or contains($format,'A')) and contains($minimum,'-')"> + <xsl:value-of select="substring-before($minimum,'-')"/> + </xsl:when> + <xsl:when test="not(contains($format,'Y') or contains($format,'A')) and $minimum != ''"> + <xsl:value-of select="$minimum"/> </xsl:when> <xsl:otherwise> <xsl:value-of select="1"/> @@ -2397,8 +2406,11 @@ </xsl:attribute> <xsl:attribute name="maximum"> <xsl:choose> - <xsl:when test="$maximum != ''"> - <xsl:value-of select="month-from-date($maximum)"/> + <xsl:when test="not(contains($format,'Y') or contains($format,'A')) and contains($maximum,'-')"> + <xsl:value-of select="substring-before($maximum,'-')"/> + </xsl:when> + <xsl:when test="not(contains($format,'Y') or contains($format,'A')) and $maximum != ''"> + <xsl:value-of select="$maximum"/> </xsl:when> <xsl:otherwise> <xsl:value-of select="12"/> @@ -2417,8 +2429,8 @@ <format id="D" unit="Day"> <xsl:attribute name="minimum"> <xsl:choose> - <xsl:when test="$minimum != ''"> - <xsl:value-of select="day-from-date($minimum)"/> + <xsl:when test="not(contains($format,'Y') or contains($format,'A')) and not(contains($format,'M') and not(contains(substring-before($format,'M'),'T'))) and $minimum != ''"> + <xsl:value-of select="$minimum"/> </xsl:when> <xsl:otherwise> <xsl:value-of select="1"/> @@ -2427,8 +2439,8 @@ </xsl:attribute> <xsl:attribute name="maximum"> <xsl:choose> - <xsl:when test="$maximum != ''"> - <xsl:value-of select="day-from-date($maximum)"/> + <xsl:when test="not(contains($format,'Y') or contains($format,'A')) and not(contains($format,'M') and not(contains(substring-before($format,'M'),'T'))) and $maximum != ''"> + <xsl:value-of select="$maximum"/> </xsl:when> <xsl:otherwise> <xsl:value-of select="31"/> From 067a4f18ea83c9b010e60fee938ef14710ca221d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bulot=20Fran=C3=A7ois?= <U7ZR1J@ad.insee.intra> Date: Mon, 22 Jul 2019 16:55:56 +0200 Subject: [PATCH 052/439] manage required response in Xforms --- src/main/resources/xslt/outputs/fr/models.xsl | 16 ++++++------ .../transformations/ddi2fr/functions.fods | 16 ++++++------ .../transformations/ddi2odt/functions.fods | 24 ++++++++++-------- .../transformations/ddi2pdf/functions.fods | 25 +++++++------------ 4 files changed, 39 insertions(+), 42 deletions(-) diff --git a/src/main/resources/xslt/outputs/fr/models.xsl b/src/main/resources/xslt/outputs/fr/models.xsl index 39c3a7649..98a2e19b2 100644 --- a/src/main/resources/xslt/outputs/fr/models.xsl +++ b/src/main/resources/xslt/outputs/fr/models.xsl @@ -352,7 +352,7 @@ <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="instance-ancestor" tunnel="yes"/> <xsl:variable name="name" select="enofr:get-name($source-context)"/> - <xsl:variable name="required" select="enofr:get-required($source-context)"/> + <xsl:variable name="required" select="enofr:is-required($source-context)" as="xs:boolean"/> <xsl:variable name="relevant" select="enofr:get-relevant($source-context)"/> <xsl:variable name="variable-calculate" select="enofr:get-variable-calculation($source-context)"/> <xsl:variable name="fixed-cell-calculate" select="enofr:get-cell-value($source-context)"/> @@ -362,7 +362,7 @@ <xsl:variable name="format-constraint" select="enofr:get-format-constraint($source-context)"/> <xf:bind id="{$name}-bind" name="{$name}" ref="{$name}"> - <xsl:if test="not($required = ('false()', ''))"> + <xsl:if test="$required"> <xsl:attribute name="required" select="$required"/> </xsl:if> <xsl:if test="$relevant != ''"> @@ -510,14 +510,14 @@ <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="instance-ancestor" tunnel="yes"/> <xsl:variable name="name" select="enofr:get-name($source-context)"/> - <xsl:variable name="required" select="enofr:get-required($source-context)"/> + <xsl:variable name="required" select="enofr:is-required($source-context)" as="xs:boolean"/> <xsl:variable name="relevant" select="enofr:get-relevant($source-context)"/> <xsl:variable name="type" select="enofr:get-type($source-context)"/> <xsl:variable name="readonly" select="enofr:get-readonly($source-context)"/> <xsl:variable name="format-constraint" select="enofr:get-format-constraint($source-context)"/> <xf:bind id="{$name}-bind" name="{$name}" ref="{$name}"> - <xsl:if test="not($required = ('false()', ''))"> + <xsl:if test="$required"> <xsl:attribute name="required" select="$required"/> </xsl:if> <xsl:if test="$relevant != ''"> @@ -589,7 +589,7 @@ <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="instance-ancestor" tunnel="yes"/> <xsl:variable name="name" select="enofr:get-name($source-context)"/> - <xsl:variable name="required" select="enofr:get-required($source-context)"/> + <xsl:variable name="required" select="enofr:is-required($source-context)" as="xs:boolean"/> <xsl:variable name="relevant" select="enofr:get-relevant($source-context)"/> <xsl:variable name="type" select="enofr:get-type($source-context)"/> <xsl:variable name="readonly" select="enofr:get-readonly($source-context)"/> @@ -605,7 +605,7 @@ </xsl:variable> <xf:bind id="{$name}-bind" name="{$name}" ref="{$name}"> - <xsl:if test="not($required = ('false()', ''))"> + <xsl:if test="$required"> <xsl:attribute name="required" select="$required"/> </xsl:if> <xsl:if test="$relevant != ''"> @@ -1068,7 +1068,7 @@ <xsl:param name="instance-ancestor" tunnel="yes"/> <xsl:variable name="current-driver" select="self::*/local-name()"/> <xsl:variable name="name" select="enofr:get-name($source-context)"/> - <xsl:variable name="required" select="enofr:get-required($source-context)"/> + <xsl:variable name="required" select="enofr:is-required($source-context)" as="xs:boolean"/> <xsl:variable name="relevant" select="enofr:get-relevant($source-context)"/> <xsl:variable name="readonly" select="enofr:get-readonly($source-context)"/> <xsl:variable name="dateduration-format" select="upper-case(enofr:get-format($source-context))"/> @@ -1162,7 +1162,7 @@ <xsl:if test="self::DurationDomain"> <xsl:attribute name="type" select="'xf:number'"/> </xsl:if> - <xsl:if test="not($required = ('false()', ''))"> + <xsl:if test="$required"> <xsl:attribute name="required" select="$required"/> </xsl:if> <xsl:if test="$relevant != ''"> diff --git a/src/main/resources/xslt/transformations/ddi2fr/functions.fods b/src/main/resources/xslt/transformations/ddi2fr/functions.fods index 948198a16..19a732fa7 100644 --- a/src/main/resources/xslt/transformations/ddi2fr/functions.fods +++ b/src/main/resources/xslt/transformations/ddi2fr/functions.fods @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.spreadsheet"> - <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>PT10H47M25S</meta:editing-duration><meta:editing-cycles>85</meta:editing-cycles><meta:generator>LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab8</meta:generator><dc:date>2019-07-05T11:13:04.457000000</dc:date><dc:creator>François Bulot</dc:creator><meta:document-statistic meta:table-count="1" meta:cell-count="177" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> + <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>PT10H48M10S</meta:editing-duration><meta:editing-cycles>86</meta:editing-cycles><meta:generator>LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab8</meta:generator><dc:date>2019-07-22T16:43:30.878000000</dc:date><dc:creator>François Bulot</dc:creator><meta:document-statistic meta:table-count="1" meta:cell-count="178" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> <office:settings> <config:config-item-set config:name="ooo:view-settings"> <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item> @@ -14,7 +14,7 @@ <config:config-item-map-named config:name="Tables"> <config:config-item-map-entry config:name="Sheet1"> <config:config-item config:name="CursorPositionX" config:type="int">3</config:config-item> - <config:config-item config:name="CursorPositionY" config:type="int">56</config:config-item> + <config:config-item config:name="CursorPositionY" config:type="int">7</config:config-item> <config:config-item config:name="HorizontalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="VerticalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="HorizontalSplitPosition" config:type="int">0</config:config-item> @@ -23,7 +23,7 @@ <config:config-item config:name="PositionLeft" config:type="int">0</config:config-item> <config:config-item config:name="PositionRight" config:type="int">0</config:config-item> <config:config-item config:name="PositionTop" config:type="int">0</config:config-item> - <config:config-item config:name="PositionBottom" config:type="int">27</config:config-item> + <config:config-item config:name="PositionBottom" config:type="int">0</config:config-item> <config:config-item config:name="ZoomType" config:type="short">0</config:config-item> <config:config-item config:name="ZoomValue" config:type="int">100</config:config-item> <config:config-item config:name="PageViewZoomValue" config:type="int">60</config:config-item> @@ -598,7 +598,7 @@ <text:p><text:sheet-name>???</text:sheet-name><text:s/>(<text:title>???</text:title>)</text:p> </style:region-left> <style:region-right> - <text:p><text:date style:data-style-name="N2" text:date-value="2019-07-05">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="10:30:31.121000000">00:00:00</text:time></text:p> + <text:p><text:date style:data-style-name="N2" text:date-value="2019-07-22">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="16:42:45.927000000">00:00:00</text:time></text:p> </style:region-right> </style:header> <style:header-left style:display="false"/> @@ -777,12 +777,14 @@ </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>enofr:get-required</text:p> + <text:p>enofr:is-required</text:p> </table:table-cell> <table:table-cell/> - <table:table-cell table:style-name="ce2"/> + <table:table-cell table:style-name="ce2" office:value-type="string" calcext:value-type="string"> + <text:p>enoddi:is-required</text:p> + </table:table-cell> <table:table-cell table:style-name="Default" office:value-type="string" calcext:value-type="string"> - <text:p>Not linked yet.</text:p> + <text:p>Linking output function enofr:is-required to input function enoddi:is-required.</text:p> </table:table-cell> </table:table-row> <table:table-row table:style-name="ro2"> diff --git a/src/main/resources/xslt/transformations/ddi2odt/functions.fods b/src/main/resources/xslt/transformations/ddi2odt/functions.fods index 560598dbe..06d38b997 100644 --- a/src/main/resources/xslt/transformations/ddi2odt/functions.fods +++ b/src/main/resources/xslt/transformations/ddi2odt/functions.fods @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.spreadsheet"> - <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>P2DT10H56M53S</meta:editing-duration><meta:editing-cycles>128</meta:editing-cycles><meta:generator>LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab8</meta:generator><dc:date>2018-08-23T12:02:01.175000000</dc:date><dc:creator>François Bulot</dc:creator><meta:document-statistic meta:table-count="1" meta:cell-count="173" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> + <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>P2DT10H57M46S</meta:editing-duration><meta:editing-cycles>130</meta:editing-cycles><meta:generator>LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab8</meta:generator><dc:date>2019-07-22T16:55:28.234000000</dc:date><dc:creator>François Bulot</dc:creator><meta:document-statistic meta:table-count="1" meta:cell-count="174" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> <office:settings> <config:config-item-set config:name="ooo:view-settings"> <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item> @@ -13,8 +13,8 @@ <config:config-item config:name="ViewId" config:type="string">view1</config:config-item> <config:config-item-map-named config:name="Tables"> <config:config-item-map-entry config:name="Sheet1"> - <config:config-item config:name="CursorPositionX" config:type="int">0</config:config-item> - <config:config-item config:name="CursorPositionY" config:type="int">49</config:config-item> + <config:config-item config:name="CursorPositionX" config:type="int">3</config:config-item> + <config:config-item config:name="CursorPositionY" config:type="int">4</config:config-item> <config:config-item config:name="HorizontalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="VerticalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="HorizontalSplitPosition" config:type="int">0</config:config-item> @@ -23,7 +23,7 @@ <config:config-item config:name="PositionLeft" config:type="int">0</config:config-item> <config:config-item config:name="PositionRight" config:type="int">0</config:config-item> <config:config-item config:name="PositionTop" config:type="int">0</config:config-item> - <config:config-item config:name="PositionBottom" config:type="int">30</config:config-item> + <config:config-item config:name="PositionBottom" config:type="int">0</config:config-item> <config:config-item config:name="ZoomType" config:type="short">0</config:config-item> <config:config-item config:name="ZoomValue" config:type="int">100</config:config-item> <config:config-item config:name="PageViewZoomValue" config:type="int">60</config:config-item> @@ -32,7 +32,7 @@ </config:config-item-map-entry> </config:config-item-map-named> <config:config-item config:name="ActiveTable" config:type="string">Sheet1</config:config-item> - <config:config-item config:name="HorizontalScrollbarWidth" config:type="int">1216</config:config-item> + <config:config-item config:name="HorizontalScrollbarWidth" config:type="int">1655</config:config-item> <config:config-item config:name="ZoomType" config:type="short">0</config:config-item> <config:config-item config:name="ZoomValue" config:type="int">100</config:config-item> <config:config-item config:name="PageViewZoomValue" config:type="int">60</config:config-item> @@ -77,8 +77,8 @@ <config:config-item config:name="IsRasterAxisSynchronized" config:type="boolean">true</config:config-item> <config:config-item config:name="AutoCalculate" config:type="boolean">true</config:config-item> <config:config-item config:name="ApplyUserData" config:type="boolean">true</config:config-item> - <config:config-item config:name="PrinterName" config:type="string">\\S20slinng\m20-207-ricoh mp2554sp</config:config-item> - <config:config-item config:name="PrinterSetup" config:type="base64Binary">1hP+/1xcUzIwc2xpbm5nXG0yMC0yMDctcmljb2ggbXAyNTU0c3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUklDT0ggUENMNiBVbml2ZXJzYWxEcml2ZXIgVjQuMQAWAAEA8hIAAAAAAAAEAAhSAAAEdAAAM1ROVwAAAAAKAFwAXABTADIAMABzAGwAaQBuAG4AZwBcAG0AMgAwAC0AMgAwADcALQByAGkAYwBvAGgAIABtAHAAMgA1AAAAAAABBAAg3AAMEg//gAMBAAkAmgs0CGQAAQAHAFgCAQACAFgCAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAIAAAAAAgAAAQAAAAAAAAAAAAAAAAAAAAAAAAAxMERSDFhkDpG++hkAAAAAKQQAAHicdVPRcuMwCPwXP/ch6dy01/yMB0vYVouERkJJ05v790OyE6eX9M1mVwss8KfLAsFCshEmzL0LsYgkOHeHDopw/cxIaKR7+o/q0TqQc0SlRgIXFExozobQKplQBNOMYD3bxkkuaMTiCIWqnC2R8HNFeRw1VLIS2KtYAI/9ql4LqYo8uVAZt1h7gaMLLek7D2s8cPJALeeq6+zjNxmOyEdMBGcLAv3oCCPIrERFIUZyBsRx+GL2R6BSJfa7Xe2ATfEYJLuvVucvjZmShX2EiKmG+xKcKOb9A+zkrMzquanJfj+/PqAQhkk5+vzQPb+97n5UWRhLXT+IrIn2+5c3JSW0xSAGgjTV6kcnws2w1s5Td9/vhh7UNo+QOTkdCtD6RH/VjuZWnTgn3R9XB5BYo2r3ZdA6KP3IKNeI2s+l/u7retXKZ8RtTRQgDhPaSbdxFFXmqODA/EE3KjbBaUxa2sA64nSNV81LJHDA7Wl/C3HU8vk2gWHiNJwUGwjMh+74aXaCzb/MVNZWX5o/U4I4O5PXnT7q2XC6+AZEgp8CuQldK8MAg94XE6lB25m0BLqVGb83ojeodmx9lWWmy5/h6DBXD5fK7yTV4e2+7w4yz9q1KdKbkpIaoZwL+PcfWFN6vgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASAENPTVBBVF9EVVBMRVhfTU9ERRQARHVwbGV4TW9kZTo6TG9uZ0VkZ2U=</config:config-item> + <config:config-item config:name="PrinterName" config:type="string">Envoyer à OneNote 16</config:config-item> + <config:config-item config:name="PrinterSetup" config:type="base64Binary">xQT+/0Vudm95ZXIgw6AgT25lTm90ZcKgMTYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAU2VuZCB0byBNaWNyb3NvZnQgT25lTm90ZSAxNiBEcgAWAAEA4gMAAAAAAAAEAAhSAAAEdAAAM1ROVwAAAAAKAEUAbgB2AG8AeQBlAHIAIADgACAATwBuAGUATgBvAHQAZQCgADEANgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBAAG3AD8AgMvAAABAAkAmgs0CGQAAQAPAFgCAgABAFgCAwABAEEANAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAQAAAAIAAAABAAAA/////wAAAAAAAAAAAAAAAAAAAABESU5VIgDAAPwCAACsE9jAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAMAAAABTTVRKAAAAABAAsABTAGUAbgBkACAAdABvACAATQBpAGMAcgBvAHMAbwBmAHQAIABPAG4AZQBOAG8AdABlACAAMQA2ACAARAByAGkAdgBlAHIAAABSRVNETEwAVW5pcmVzRExMAFBhcGVyU2l6ZQBMRVRURVIAT3JpZW50YXRpb24AUE9SVFJBSVQAUmVzb2x1dGlvbgBEUEk2MDAAQ29sb3JNb2RlADI0YnBwAAAAAAAAAAAAAAAAAAAAABIAQ09NUEFUX0RVUExFWF9NT0RFEwBEdXBsZXhNb2RlOjpVbmtub3du</config:config-item> <config:config-item-map-indexed config:name="ForbiddenCharacters"> <config:config-item-map-entry> <config:config-item config:name="Language" config:type="string">zxx</config:config-item> @@ -598,7 +598,7 @@ <text:p><text:sheet-name>???</text:sheet-name><text:s/>(<text:title>???</text:title>)</text:p> </style:region-left> <style:region-right> - <text:p><text:date style:data-style-name="N2" text:date-value="2018-08-23">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="11:49:34.706000000">00:00:00</text:time></text:p> + <text:p><text:date style:data-style-name="N2" text:date-value="2019-07-22">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="16:54:35.066000000">00:00:00</text:time></text:p> </style:region-right> </style:header> <style:header-left style:display="false"/> @@ -789,12 +789,14 @@ </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>enoodt:get-required</text:p> + <text:p>enoodt:is-required</text:p> </table:table-cell> <table:table-cell/> - <table:table-cell table:style-name="ce2"/> + <table:table-cell table:style-name="ce2" office:value-type="string" calcext:value-type="string"> + <text:p>enoddi:is-required</text:p> + </table:table-cell> <table:table-cell table:style-name="Default" office:value-type="string" calcext:value-type="string"> - <text:p>Not linked yet.</text:p> + <text:p>Linking output function enoodt:is-required to input function enoddi:is-required.</text:p> </table:table-cell> </table:table-row> <table:table-row table:style-name="ro2"> diff --git a/src/main/resources/xslt/transformations/ddi2pdf/functions.fods b/src/main/resources/xslt/transformations/ddi2pdf/functions.fods index 75722488f..96267e950 100644 --- a/src/main/resources/xslt/transformations/ddi2pdf/functions.fods +++ b/src/main/resources/xslt/transformations/ddi2pdf/functions.fods @@ -1,20 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> <office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.spreadsheet"> - <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>PT19H8M35S</meta:editing-duration><meta:editing-cycles>107</meta:editing-cycles><meta:generator>LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab8</meta:generator><dc:date>2019-07-18T14:16:29.404000000</dc:date><dc:creator>François Bulot</dc:creator><meta:document-statistic meta:table-count="1" meta:cell-count="124" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> + <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>PT19H8M46S</meta:editing-duration><meta:editing-cycles>108</meta:editing-cycles><meta:generator>LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab8</meta:generator><dc:date>2019-07-22T16:54:22.891000000</dc:date><dc:creator>François Bulot</dc:creator><meta:document-statistic meta:table-count="1" meta:cell-count="130" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> <office:settings> <config:config-item-set config:name="ooo:view-settings"> <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item> <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item> <config:config-item config:name="VisibleAreaWidth" config:type="int">36807</config:config-item> - <config:config-item config:name="VisibleAreaHeight" config:type="int">21674</config:config-item> + <config:config-item config:name="VisibleAreaHeight" config:type="int">22126</config:config-item> <config:config-item-map-indexed config:name="Views"> <config:config-item-map-entry> <config:config-item config:name="ViewId" config:type="string">view1</config:config-item> <config:config-item-map-named config:name="Tables"> <config:config-item-map-entry config:name="Sheet1"> <config:config-item config:name="CursorPositionX" config:type="int">0</config:config-item> - <config:config-item config:name="CursorPositionY" config:type="int">39</config:config-item> + <config:config-item config:name="CursorPositionY" config:type="int">7</config:config-item> <config:config-item config:name="HorizontalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="VerticalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="HorizontalSplitPosition" config:type="int">0</config:config-item> @@ -32,7 +32,7 @@ </config:config-item-map-entry> </config:config-item-map-named> <config:config-item config:name="ActiveTable" config:type="string">Sheet1</config:config-item> - <config:config-item config:name="HorizontalScrollbarWidth" config:type="int">1255</config:config-item> + <config:config-item config:name="HorizontalScrollbarWidth" config:type="int">1655</config:config-item> <config:config-item config:name="ZoomType" config:type="short">0</config:config-item> <config:config-item config:name="ZoomValue" config:type="int">100</config:config-item> <config:config-item config:name="PageViewZoomValue" config:type="int">60</config:config-item> @@ -598,7 +598,7 @@ <text:p><text:sheet-name>???</text:sheet-name><text:s/>(<text:title>???</text:title>)</text:p> </style:region-left> <style:region-right> - <text:p><text:date style:data-style-name="N2" text:date-value="2019-07-18">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="14:15:21.128000000">00:00:00</text:time></text:p> + <text:p><text:date style:data-style-name="N2" text:date-value="2019-07-22">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="16:54:11.334000000">00:00:00</text:time></text:p> </style:region-right> </style:header> <style:header-left style:display="false"/> @@ -787,16 +787,6 @@ <text:p>Linking output function enopdf:get-readonly to input function enoddi:get-deactivatable-command.</text:p> </table:table-cell> </table:table-row> - <table:table-row table:style-name="ro2"> - <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>enopdf:get-required</text:p> - </table:table-cell> - <table:table-cell/> - <table:table-cell table:style-name="ce2"/> - <table:table-cell table:style-name="Default" office:value-type="string" calcext:value-type="string"> - <text:p>Not linked yet.</text:p> - </table:table-cell> - </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>enopdf:get-calculate</text:p> @@ -1209,7 +1199,10 @@ <text:p>Linking output function enopdf:get-maximum to input function enoddi:get-maximum.</text:p> </table:table-cell> </table:table-row> - <table:table-row table:style-name="ro1" table:number-rows-repeated="1048534"> + <table:table-row table:style-name="ro1" table:number-rows-repeated="1048533"> + <table:table-cell table:number-columns-repeated="4"/> + </table:table-row> + <table:table-row table:style-name="ro1"> <table:table-cell table:number-columns-repeated="4"/> </table:table-row> </table:table> From 321f5205278fc5c1a3623d5c00a047075ef574e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bulot=20Fran=C3=A7ois?= <U7ZR1J@ad.insee.intra> Date: Tue, 23 Jul 2019 11:24:57 +0200 Subject: [PATCH 053/439] improve clarification --- src/main/resources/xslt/outputs/pdf/models.xsl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/resources/xslt/outputs/pdf/models.xsl b/src/main/resources/xslt/outputs/pdf/models.xsl index 25fabde79..be50abde4 100644 --- a/src/main/resources/xslt/outputs/pdf/models.xsl +++ b/src/main/resources/xslt/outputs/pdf/models.xsl @@ -234,6 +234,7 @@ <xsl:param name="languages" tunnel="yes"/> <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> <xsl:with-param name="driver" select="." tunnel="yes"/> + <xsl:with-param name="other-give-details" select="true()" tunnel="yes"/> </xsl:apply-templates> </xsl:template> @@ -1000,7 +1001,6 @@ </fo:inline> <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> <xsl:with-param name="driver" select="." tunnel="yes"/> - <xsl:with-param name="other-give-details" select="true()" tunnel="yes"/> </xsl:apply-templates> </xsl:when> <xsl:otherwise> @@ -1027,7 +1027,6 @@ </fo:block> <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> <xsl:with-param name="driver" select="." tunnel="yes"/> - <xsl:with-param name="other-give-details" select="true()" tunnel="yes"/> </xsl:apply-templates> </fo:list-item-body> </fo:list-item> From 5d2c3caf8f64e7ad49fe8a858c8e3e02a6ec53c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bulot=20Fran=C3=A7ois?= <U7ZR1J@ad.insee.intra> Date: Tue, 23 Jul 2019 11:25:39 +0200 Subject: [PATCH 054/439] correct FixedCellValue definition --- .../resources/xslt/inputs/ddi/templates.fods | 64 ++++++------------- .../xslt/transformations/ddi2fr/drivers.fods | 23 ++----- .../xslt/transformations/ddi2js/drivers.fods | 25 ++------ .../xslt/transformations/ddi2odt/drivers.fods | 25 ++------ .../xslt/transformations/ddi2pdf/drivers.fods | 27 +++----- 5 files changed, 48 insertions(+), 116 deletions(-) diff --git a/src/main/resources/xslt/inputs/ddi/templates.fods b/src/main/resources/xslt/inputs/ddi/templates.fods index fdde30f59..5cefeb24e 100644 --- a/src/main/resources/xslt/inputs/ddi/templates.fods +++ b/src/main/resources/xslt/inputs/ddi/templates.fods @@ -1,20 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> <office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.spreadsheet"> - <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>P3DT2H39M35S</meta:editing-duration><meta:editing-cycles>397</meta:editing-cycles><meta:generator>LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab8</meta:generator><dc:date>2019-07-22T16:05:08.731000000</dc:date><meta:document-statistic meta:table-count="1" meta:cell-count="430" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> + <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>P3DT2H43M20S</meta:editing-duration><meta:editing-cycles>398</meta:editing-cycles><meta:generator>LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab8</meta:generator><dc:date>2019-07-23T11:21:03.132000000</dc:date><dc:creator>François Bulot</dc:creator><meta:document-statistic meta:table-count="1" meta:cell-count="479" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> <office:settings> <config:config-item-set config:name="ooo:view-settings"> <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item> <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item> <config:config-item config:name="VisibleAreaWidth" config:type="int">63256</config:config-item> - <config:config-item config:name="VisibleAreaHeight" config:type="int">76129</config:config-item> + <config:config-item config:name="VisibleAreaHeight" config:type="int">84229</config:config-item> <config:config-item-map-indexed config:name="Views"> <config:config-item-map-entry> <config:config-item config:name="ViewId" config:type="string">view1</config:config-item> <config:config-item-map-named config:name="Tables"> <config:config-item-map-entry config:name="Sheet1"> <config:config-item config:name="CursorPositionX" config:type="int">0</config:config-item> - <config:config-item config:name="CursorPositionY" config:type="int">136</config:config-item> + <config:config-item config:name="CursorPositionY" config:type="int">13</config:config-item> <config:config-item config:name="HorizontalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="VerticalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="HorizontalSplitPosition" config:type="int">0</config:config-item> @@ -23,7 +23,7 @@ <config:config-item config:name="PositionLeft" config:type="int">0</config:config-item> <config:config-item config:name="PositionRight" config:type="int">0</config:config-item> <config:config-item config:name="PositionTop" config:type="int">0</config:config-item> - <config:config-item config:name="PositionBottom" config:type="int">114</config:config-item> + <config:config-item config:name="PositionBottom" config:type="int">9</config:config-item> <config:config-item config:name="ZoomType" config:type="short">0</config:config-item> <config:config-item config:name="ZoomValue" config:type="int">100</config:config-item> <config:config-item config:name="PageViewZoomValue" config:type="int">60</config:config-item> @@ -32,7 +32,7 @@ </config:config-item-map-entry> </config:config-item-map-named> <config:config-item config:name="ActiveTable" config:type="string">Sheet1</config:config-item> - <config:config-item config:name="HorizontalScrollbarWidth" config:type="int">1616</config:config-item> + <config:config-item config:name="HorizontalScrollbarWidth" config:type="int">1655</config:config-item> <config:config-item config:name="ZoomType" config:type="short">0</config:config-item> <config:config-item config:name="ZoomValue" config:type="int">100</config:config-item> <config:config-item config:name="PageViewZoomValue" config:type="int">60</config:config-item> @@ -545,6 +545,9 @@ <style:style style:name="ta1" style:family="table" style:master-page-name="Default"> <style:table-properties table:display="true" style:writing-mode="lr-tb"/> </style:style> + <number:boolean-style style:name="N99"> + <number:boolean/> + </number:boolean-style> <style:style style:name="ce1" style:family="table-cell" style:parent-style-name="Default"> <style:table-cell-properties fo:background-color="#99ccff"/> <style:text-properties style:font-name="Arial" fo:font-size="10pt" fo:font-weight="bold" style:font-size-asian="10pt" style:font-weight-asian="bold" style:font-size-complex="10pt" style:font-weight-complex="bold"/> @@ -583,6 +586,9 @@ <style:table-cell-properties fo:padding="0.71mm"/> <style:text-properties style:font-name="Arial" fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/> </style:style> + <style:style style:name="ce23" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="N99"> + <style:text-properties style:font-name="Arial" fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/> + </style:style> <style:page-layout style:name="pm1"> <style:page-layout-properties style:first-page-number="continue" style:writing-mode="lr-tb"/> <style:header-style> @@ -632,7 +638,7 @@ <text:p><text:sheet-name>???</text:sheet-name><text:s/>(<text:title>???</text:title>)</text:p> </style:region-left> <style:region-right> - <text:p><text:date style:data-style-name="N2" text:date-value="2019-07-22">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="15:43:21.013000000">00:00:00</text:time></text:p> + <text:p><text:date style:data-style-name="N2" text:date-value="2019-07-23">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="11:17:17.856000000">00:00:00</text:time></text:p> </style:region-right> </style:header> <style:header-left style:display="false"/> @@ -1081,24 +1087,9 @@ <text:p>Identifier for the hideable group in "other – give details" in QuestionGrid</text:p> </table:table-cell> </table:table-row> - <table:table-row table:style-name="ro2"> - <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>d:NoDataByDefinition[../../d:CellLabel[eno:serialize(d:GridAttachment/d:CellCoordinatesAsDefined)=eno:serialize(current()/child::d:CellCoordinatesAsDefined)]]</text:p> - </table:table-cell> - <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>enoddi:get-id</text:p> - </table:table-cell> - <table:table-cell table:style-name="ce6" office:value-type="string" calcext:value-type="string"> - <text:p>concat(ancestor::d:QuestionGrid/r:ID,'-Cell-',d:CellCoordinatesAsDefined/d:SelectDimension[@rank='1']/@rangeMinimum,d:CellCoordinatesAsDefined/d:SelectDimension[@rank='1']/@specificValue,'_',d:CellCoordinatesAsDefined/d:SelectDimension[@rank='2']/@rangeMinimum,d:CellCoordinatesAsDefined/d:SelectDimension[@rank='2']/@specificValue)</text:p> - </table:table-cell> - <table:table-cell/> - <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>Identifier for FixedCell : concat the name of the Grid, "Cell" and the position of the top-left corner</text:p> - </table:table-cell> - </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell table:style-name="Default" office:value-type="string" calcext:value-type="string"> - <text:p>d:FixedCellValue</text:p> + <text:p>d:NoDataByDefinition[../../d:CellLabel[eno:serialize(d:GridAttachment/d:CellCoordinatesAsDefined)=eno:serialize(current()/child::d:CellCoordinatesAsDefined)] or ../../d:FixedCellValue[eno:serialize(d:GridAttachment/d:CellCoordinatesAsDefined)=eno:serialize(current()/child::d:CellCoordinatesAsDefined)]]</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>enoddi:get-id</text:p> @@ -1157,7 +1148,9 @@ </table:table-cell> </table:table-row> <table:table-row table:style-name="ro2"> - <table:table-cell table:number-columns-repeated="5"/> + <table:table-cell table:number-columns-repeated="2"/> + <table:table-cell table:style-name="ce23"/> + <table:table-cell table:number-columns-repeated="2"/> </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell office:value-type="string" calcext:value-type="string"> @@ -1344,23 +1337,6 @@ <text:p>The label of grid cells without Response</text:p> </table:table-cell> </table:table-row> - <table:table-row table:style-name="ro2"> - <table:table-cell table:style-name="Default" office:value-type="string" calcext:value-type="string"> - <text:p>d:FixedCellValue</text:p> - </table:table-cell> - <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>enoddi:get-label</text:p> - </table:table-cell> - <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>../../d:CellLabel[eno:serialize(d:GridAttachment/d:CellCoordinatesAsDefined)=eno:serialize(current()/child::d:CellCoordinatesAsDefined)]/r:Content</text:p> - </table:table-cell> - <table:table-cell table:style-name="ce7" office:value-type="string" calcext:value-type="string"> - <text:p>lang-choice</text:p> - </table:table-cell> - <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>The label of grid cells without Response</text:p> - </table:table-cell> - </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell table:style-name="Default" office:value-type="string" calcext:value-type="string"> <text:p>d:ExternalAid[r:OtherMaterial/r:Description/r:Content/xhtml:div/@class='FlowControl']</text:p> @@ -1418,14 +1394,14 @@ <table:table-cell/> </table:table-row> <table:table-row table:style-name="ro2"> - <table:table-cell table:style-name="Default" office:value-type="string" calcext:value-type="string"> - <text:p>d:FixedCellValue</text:p> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p>d:NoDataByDefinition[../../d:FixedCellValue[eno:serialize(d:GridAttachment/d:CellCoordinatesAsDefined)=eno:serialize(current()/child::d:CellCoordinatesAsDefined)]]</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>enoddi:get-cell-value</text:p> </table:table-cell> - <table:table-cell table:style-name="ce7" office:value-type="string" calcext:value-type="string"> - <text:p>r:Value</text:p> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p>../../d:FixedCellValue[eno:serialize(d:GridAttachment/d:CellCoordinatesAsDefined)=eno:serialize(current()/child::d:CellCoordinatesAsDefined)]/r:Value</text:p> </table:table-cell> <table:table-cell table:style-name="ce7"/> <table:table-cell office:value-type="string" calcext:value-type="string"> diff --git a/src/main/resources/xslt/transformations/ddi2fr/drivers.fods b/src/main/resources/xslt/transformations/ddi2fr/drivers.fods index 9188a49a2..fc6405357 100644 --- a/src/main/resources/xslt/transformations/ddi2fr/drivers.fods +++ b/src/main/resources/xslt/transformations/ddi2fr/drivers.fods @@ -1,20 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> <office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.spreadsheet"> - <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>P1DT3H49M34S</meta:editing-duration><meta:editing-cycles>176</meta:editing-cycles><meta:generator>LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab8</meta:generator><dc:date>2019-07-16T16:13:44.924000000</dc:date><dc:creator>François Bulot</dc:creator><meta:document-statistic meta:table-count="1" meta:cell-count="132" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> + <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>P1DT3H49M58S</meta:editing-duration><meta:editing-cycles>177</meta:editing-cycles><meta:generator>LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab8</meta:generator><dc:date>2019-07-23T11:23:02.018000000</dc:date><dc:creator>François Bulot</dc:creator><meta:document-statistic meta:table-count="1" meta:cell-count="129" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> <office:settings> <config:config-item-set config:name="ooo:view-settings"> <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item> <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item> <config:config-item config:name="VisibleAreaWidth" config:type="int">50597</config:config-item> - <config:config-item config:name="VisibleAreaHeight" config:type="int">31222</config:config-item> + <config:config-item config:name="VisibleAreaHeight" config:type="int">30771</config:config-item> <config:config-item-map-indexed config:name="Views"> <config:config-item-map-entry> <config:config-item config:name="ViewId" config:type="string">view1</config:config-item> <config:config-item-map-named config:name="Tables"> <config:config-item-map-entry config:name="Sheet1"> <config:config-item config:name="CursorPositionX" config:type="int">0</config:config-item> - <config:config-item config:name="CursorPositionY" config:type="int">13</config:config-item> + <config:config-item config:name="CursorPositionY" config:type="int">50</config:config-item> <config:config-item config:name="HorizontalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="VerticalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="HorizontalSplitPosition" config:type="int">0</config:config-item> @@ -23,7 +23,7 @@ <config:config-item config:name="PositionLeft" config:type="int">0</config:config-item> <config:config-item config:name="PositionRight" config:type="int">0</config:config-item> <config:config-item config:name="PositionTop" config:type="int">0</config:config-item> - <config:config-item config:name="PositionBottom" config:type="int">0</config:config-item> + <config:config-item config:name="PositionBottom" config:type="int">27</config:config-item> <config:config-item config:name="ZoomType" config:type="short">0</config:config-item> <config:config-item config:name="ZoomValue" config:type="int">100</config:config-item> <config:config-item config:name="PageViewZoomValue" config:type="int">60</config:config-item> @@ -591,7 +591,7 @@ <text:p><text:sheet-name>???</text:sheet-name><text:s/>(<text:title>???</text:title>)</text:p> </style:region-left> <style:region-right> - <text:p><text:date style:data-style-name="N2" text:date-value="2019-07-16">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="15:49:51.749000000">00:00:00</text:time></text:p> + <text:p><text:date style:data-style-name="N2" text:date-value="2019-07-23">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="11:22:37.369000000">00:00:00</text:time></text:p> </style:region-right> </style:header> <style:header-left style:display="false"/> @@ -1026,7 +1026,7 @@ </table:table-row> <table:table-row table:style-name="ro1"> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>d:NoDataByDefinition[../../d:CellLabel[eno:serialize(d:GridAttachment/d:CellCoordinatesAsDefined)=eno:serialize(current()/child::d:CellCoordinatesAsDefined)]]</text:p> + <text:p>d:NoDataByDefinition[../../d:CellLabel[eno:serialize(d:GridAttachment/d:CellCoordinatesAsDefined)=eno:serialize(current()/child::d:CellCoordinatesAsDefined)] or ../../d:FixedCellValue[eno:serialize(d:GridAttachment/d:CellCoordinatesAsDefined)=eno:serialize(current()/child::d:CellCoordinatesAsDefined)]]</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>FixedCell</text:p> @@ -1035,17 +1035,6 @@ <text:p>Those NoDataByDefinition elements which are linked to a text activate the FixedCell driver.</text:p> </table:table-cell> </table:table-row> - <table:table-row table:style-name="ro1"> - <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>d:FixedCellValue</text:p> - </table:table-cell> - <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>FixedCell</text:p> - </table:table-cell> - <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>DDI 3.3 way to define FixedCell</text:p> - </table:table-cell> - </table:table-row> <table:table-row table:style-name="ro1"> <table:table-cell table:number-columns-repeated="3"/> </table:table-row> diff --git a/src/main/resources/xslt/transformations/ddi2js/drivers.fods b/src/main/resources/xslt/transformations/ddi2js/drivers.fods index a7794a390..9a8840bac 100644 --- a/src/main/resources/xslt/transformations/ddi2js/drivers.fods +++ b/src/main/resources/xslt/transformations/ddi2js/drivers.fods @@ -1,20 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> <office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.spreadsheet"> - <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>P5DT2H2M31S</meta:editing-duration><meta:editing-cycles>226</meta:editing-cycles><meta:generator>LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab8</meta:generator><dc:date>2019-07-16T16:14:13.602000000</dc:date><dc:creator>François Bulot</dc:creator><meta:document-statistic meta:table-count="1" meta:cell-count="132" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> + <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>P5DT2H2M40S</meta:editing-duration><meta:editing-cycles>227</meta:editing-cycles><meta:generator>LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab8</meta:generator><dc:date>2019-07-23T11:23:39.427000000</dc:date><dc:creator>François Bulot</dc:creator><meta:document-statistic meta:table-count="1" meta:cell-count="129" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> <office:settings> <config:config-item-set config:name="ooo:view-settings"> <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item> <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item> <config:config-item config:name="VisibleAreaWidth" config:type="int">51722</config:config-item> - <config:config-item config:name="VisibleAreaHeight" config:type="int">30769</config:config-item> + <config:config-item config:name="VisibleAreaHeight" config:type="int">30317</config:config-item> <config:config-item-map-indexed config:name="Views"> <config:config-item-map-entry> <config:config-item config:name="ViewId" config:type="string">view1</config:config-item> <config:config-item-map-named config:name="Tables"> <config:config-item-map-entry config:name="Sheet1"> - <config:config-item config:name="CursorPositionX" config:type="int">1</config:config-item> - <config:config-item config:name="CursorPositionY" config:type="int">13</config:config-item> + <config:config-item config:name="CursorPositionX" config:type="int">0</config:config-item> + <config:config-item config:name="CursorPositionY" config:type="int">50</config:config-item> <config:config-item config:name="HorizontalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="VerticalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="HorizontalSplitPosition" config:type="int">0</config:config-item> @@ -23,7 +23,7 @@ <config:config-item config:name="PositionLeft" config:type="int">0</config:config-item> <config:config-item config:name="PositionRight" config:type="int">0</config:config-item> <config:config-item config:name="PositionTop" config:type="int">0</config:config-item> - <config:config-item config:name="PositionBottom" config:type="int">0</config:config-item> + <config:config-item config:name="PositionBottom" config:type="int">27</config:config-item> <config:config-item config:name="ZoomType" config:type="short">0</config:config-item> <config:config-item config:name="ZoomValue" config:type="int">100</config:config-item> <config:config-item config:name="PageViewZoomValue" config:type="int">60</config:config-item> @@ -588,7 +588,7 @@ <text:p><text:sheet-name>???</text:sheet-name><text:s/>(<text:title>???</text:title>)</text:p> </style:region-left> <style:region-right> - <text:p><text:date style:data-style-name="N2" text:date-value="2019-07-16">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="16:07:47.079000000">00:00:00</text:time></text:p> + <text:p><text:date style:data-style-name="N2" text:date-value="2019-07-23">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="11:23:29.989000000">00:00:00</text:time></text:p> </style:region-right> </style:header> <style:header-left style:display="false"/> @@ -1020,7 +1020,7 @@ </table:table-row> <table:table-row table:style-name="ro1"> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>d:NoDataByDefinition[../../d:CellLabel[eno:serialize(d:GridAttachment/d:CellCoordinatesAsDefined)=eno:serialize(current()/child::d:CellCoordinatesAsDefined)]]</text:p> + <text:p>d:NoDataByDefinition[../../d:CellLabel[eno:serialize(d:GridAttachment/d:CellCoordinatesAsDefined)=eno:serialize(current()/child::d:CellCoordinatesAsDefined)] or ../../d:FixedCellValue[eno:serialize(d:GridAttachment/d:CellCoordinatesAsDefined)=eno:serialize(current()/child::d:CellCoordinatesAsDefined)]]</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>FixedCell</text:p> @@ -1029,17 +1029,6 @@ <text:p>Those NoDataByDefinition elements which are linked to a text activate the FixedCell driver.</text:p> </table:table-cell> </table:table-row> - <table:table-row table:style-name="ro1"> - <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>d:FixedCellValue</text:p> - </table:table-cell> - <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>FixedCell</text:p> - </table:table-cell> - <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>DDI 3.3 way to define FixedCell</text:p> - </table:table-cell> - </table:table-row> <table:table-row table:style-name="ro1"> <table:table-cell table:number-columns-repeated="3"/> </table:table-row> diff --git a/src/main/resources/xslt/transformations/ddi2odt/drivers.fods b/src/main/resources/xslt/transformations/ddi2odt/drivers.fods index b15e5cfaf..631eca09f 100644 --- a/src/main/resources/xslt/transformations/ddi2odt/drivers.fods +++ b/src/main/resources/xslt/transformations/ddi2odt/drivers.fods @@ -1,20 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> <office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.spreadsheet"> - <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>P3DT6H25M55S</meta:editing-duration><meta:editing-cycles>219</meta:editing-cycles><meta:generator>LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab8</meta:generator><dc:date>2019-07-16T16:14:29.699000000</dc:date><dc:creator>François Bulot</dc:creator><meta:document-statistic meta:table-count="1" meta:cell-count="132" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> + <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>P3DT6H26M5S</meta:editing-duration><meta:editing-cycles>220</meta:editing-cycles><meta:generator>LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab8</meta:generator><dc:date>2019-07-23T11:23:20.653000000</dc:date><dc:creator>François Bulot</dc:creator><meta:document-statistic meta:table-count="1" meta:cell-count="129" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> <office:settings> <config:config-item-set config:name="ooo:view-settings"> <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item> <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item> <config:config-item config:name="VisibleAreaWidth" config:type="int">60138</config:config-item> - <config:config-item config:name="VisibleAreaHeight" config:type="int">30769</config:config-item> + <config:config-item config:name="VisibleAreaHeight" config:type="int">30317</config:config-item> <config:config-item-map-indexed config:name="Views"> <config:config-item-map-entry> <config:config-item config:name="ViewId" config:type="string">view1</config:config-item> <config:config-item-map-named config:name="Tables"> <config:config-item-map-entry config:name="Sheet1"> - <config:config-item config:name="CursorPositionX" config:type="int">1</config:config-item> - <config:config-item config:name="CursorPositionY" config:type="int">14</config:config-item> + <config:config-item config:name="CursorPositionX" config:type="int">0</config:config-item> + <config:config-item config:name="CursorPositionY" config:type="int">50</config:config-item> <config:config-item config:name="HorizontalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="VerticalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="HorizontalSplitPosition" config:type="int">0</config:config-item> @@ -23,7 +23,7 @@ <config:config-item config:name="PositionLeft" config:type="int">0</config:config-item> <config:config-item config:name="PositionRight" config:type="int">0</config:config-item> <config:config-item config:name="PositionTop" config:type="int">0</config:config-item> - <config:config-item config:name="PositionBottom" config:type="int">2</config:config-item> + <config:config-item config:name="PositionBottom" config:type="int">23</config:config-item> <config:config-item config:name="ZoomType" config:type="short">0</config:config-item> <config:config-item config:name="ZoomValue" config:type="int">100</config:config-item> <config:config-item config:name="PageViewZoomValue" config:type="int">60</config:config-item> @@ -588,7 +588,7 @@ <text:p><text:sheet-name>???</text:sheet-name><text:s/>(<text:title>???</text:title>)</text:p> </style:region-left> <style:region-right> - <text:p><text:date style:data-style-name="N2" text:date-value="2019-07-16">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="16:08:04.483000000">00:00:00</text:time></text:p> + <text:p><text:date style:data-style-name="N2" text:date-value="2019-07-23">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="11:23:10.563000000">00:00:00</text:time></text:p> </style:region-right> </style:header> <style:header-left style:display="false"/> @@ -1020,7 +1020,7 @@ </table:table-row> <table:table-row table:style-name="ro1"> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>d:NoDataByDefinition[../../d:CellLabel[eno:serialize(d:GridAttachment/d:CellCoordinatesAsDefined)=eno:serialize(current()/child::d:CellCoordinatesAsDefined)]]</text:p> + <text:p>d:NoDataByDefinition[../../d:CellLabel[eno:serialize(d:GridAttachment/d:CellCoordinatesAsDefined)=eno:serialize(current()/child::d:CellCoordinatesAsDefined)] or ../../d:FixedCellValue[eno:serialize(d:GridAttachment/d:CellCoordinatesAsDefined)=eno:serialize(current()/child::d:CellCoordinatesAsDefined)]]</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>FixedCell</text:p> @@ -1029,17 +1029,6 @@ <text:p>Those NoDataByDefinition elements which are linked to a text activate the FixedCell driver.</text:p> </table:table-cell> </table:table-row> - <table:table-row table:style-name="ro1"> - <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>d:FixedCellValue</text:p> - </table:table-cell> - <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>FixedCell</text:p> - </table:table-cell> - <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>DDI 3.3 way to define FixedCell</text:p> - </table:table-cell> - </table:table-row> <table:table-row table:style-name="ro1"> <table:table-cell table:number-columns-repeated="3"/> </table:table-row> diff --git a/src/main/resources/xslt/transformations/ddi2pdf/drivers.fods b/src/main/resources/xslt/transformations/ddi2pdf/drivers.fods index d4985e322..fc8f6638b 100644 --- a/src/main/resources/xslt/transformations/ddi2pdf/drivers.fods +++ b/src/main/resources/xslt/transformations/ddi2pdf/drivers.fods @@ -1,20 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> <office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.spreadsheet"> - <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>P2DT2H36M43S</meta:editing-duration><meta:editing-cycles>178</meta:editing-cycles><meta:generator>LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab8</meta:generator><dc:date>2019-07-16T16:14:00.083000000</dc:date><dc:creator>François Bulot</dc:creator><meta:document-statistic meta:table-count="1" meta:cell-count="132" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> + <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>P2DT2H39M8S</meta:editing-duration><meta:editing-cycles>179</meta:editing-cycles><meta:generator>LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab8</meta:generator><dc:date>2019-07-23T11:17:07.134000000</dc:date><dc:creator>François Bulot</dc:creator><meta:document-statistic meta:table-count="1" meta:cell-count="129" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> <office:settings> <config:config-item-set config:name="ooo:view-settings"> <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item> <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item> <config:config-item config:name="VisibleAreaWidth" config:type="int">54828</config:config-item> - <config:config-item config:name="VisibleAreaHeight" config:type="int">31612</config:config-item> + <config:config-item config:name="VisibleAreaHeight" config:type="int">31160</config:config-item> <config:config-item-map-indexed config:name="Views"> <config:config-item-map-entry> <config:config-item config:name="ViewId" config:type="string">view1</config:config-item> <config:config-item-map-named config:name="Tables"> <config:config-item-map-entry config:name="Sheet1"> - <config:config-item config:name="CursorPositionX" config:type="int">1</config:config-item> - <config:config-item config:name="CursorPositionY" config:type="int">16</config:config-item> + <config:config-item config:name="CursorPositionX" config:type="int">0</config:config-item> + <config:config-item config:name="CursorPositionY" config:type="int">51</config:config-item> <config:config-item config:name="HorizontalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="VerticalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="HorizontalSplitPosition" config:type="int">0</config:config-item> @@ -23,7 +23,7 @@ <config:config-item config:name="PositionLeft" config:type="int">0</config:config-item> <config:config-item config:name="PositionRight" config:type="int">0</config:config-item> <config:config-item config:name="PositionTop" config:type="int">0</config:config-item> - <config:config-item config:name="PositionBottom" config:type="int">0</config:config-item> + <config:config-item config:name="PositionBottom" config:type="int">24</config:config-item> <config:config-item config:name="ZoomType" config:type="short">0</config:config-item> <config:config-item config:name="ZoomValue" config:type="int">100</config:config-item> <config:config-item config:name="PageViewZoomValue" config:type="int">60</config:config-item> @@ -599,7 +599,7 @@ <text:p><text:sheet-name>???</text:sheet-name><text:s/>(<text:title>???</text:title>)</text:p> </style:region-left> <style:region-right> - <text:p><text:date style:data-style-name="N2" text:date-value="2019-07-16">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="15:59:36.201000000">00:00:00</text:time></text:p> + <text:p><text:date style:data-style-name="N2" text:date-value="2019-07-23">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="11:14:41.465000000">00:00:00</text:time></text:p> </style:region-right> </style:header> <style:header-left style:display="false"/> @@ -1024,7 +1024,7 @@ </table:table-row> <table:table-row table:style-name="ro1"> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>d:NoDataByDefinition[not(../../d:CellLabel[eno:serialize(d:GridAttachment/d:CellCoordinatesAsDefined)=eno:serialize(current()/child::d:CellCoordinatesAsDefined)])]</text:p> + <text:p>d:NoDataByDefinition[not(../../d:CellLabel[eno:serialize(d:GridAttachment/d:CellCoordinatesAsDefined)=eno:serialize(current()/child::d:CellCoordinatesAsDefined)]) and not(../../d:FixedCellValue[eno:serialize(d:GridAttachment/d:CellCoordinatesAsDefined)=eno:serialize(current()/child::d:CellCoordinatesAsDefined)])]</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>EmptyCell</text:p> @@ -1035,7 +1035,7 @@ </table:table-row> <table:table-row table:style-name="ro1"> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>d:NoDataByDefinition[../../d:CellLabel[eno:serialize(d:GridAttachment/d:CellCoordinatesAsDefined)=eno:serialize(current()/child::d:CellCoordinatesAsDefined)]]</text:p> + <text:p>d:NoDataByDefinition[../../d:CellLabel[eno:serialize(d:GridAttachment/d:CellCoordinatesAsDefined)=eno:serialize(current()/child::d:CellCoordinatesAsDefined)] or ../../d:FixedCellValue[eno:serialize(d:GridAttachment/d:CellCoordinatesAsDefined)=eno:serialize(current()/child::d:CellCoordinatesAsDefined)]]</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>FixedCell</text:p> @@ -1044,17 +1044,6 @@ <text:p>Those NoDataByDefinition elements which are linked to a text activate the FixedCell driver.</text:p> </table:table-cell> </table:table-row> - <table:table-row table:style-name="ro1"> - <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>d:FixedCellValue</text:p> - </table:table-cell> - <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>FixedCell</text:p> - </table:table-cell> - <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>DDI 3.3 way to define FixedCell</text:p> - </table:table-cell> - </table:table-row> <table:table-row table:style-name="ro1"> <table:table-cell table:number-columns-repeated="3"/> </table:table-row> From 1e556f42ae3969cbd493b4386e7a076bbe91a532 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bulot=20Fran=C3=A7ois?= <U7ZR1J@ad.insee.intra> Date: Tue, 23 Jul 2019 11:28:54 +0200 Subject: [PATCH 055/439] driver emptyCell not updated --- .../resources/xslt/transformations/ddi2fr/drivers.fods | 8 ++++---- .../resources/xslt/transformations/ddi2js/drivers.fods | 8 ++++---- .../resources/xslt/transformations/ddi2odt/drivers.fods | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main/resources/xslt/transformations/ddi2fr/drivers.fods b/src/main/resources/xslt/transformations/ddi2fr/drivers.fods index fc6405357..89fa4a462 100644 --- a/src/main/resources/xslt/transformations/ddi2fr/drivers.fods +++ b/src/main/resources/xslt/transformations/ddi2fr/drivers.fods @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.spreadsheet"> - <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>P1DT3H49M58S</meta:editing-duration><meta:editing-cycles>177</meta:editing-cycles><meta:generator>LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab8</meta:generator><dc:date>2019-07-23T11:23:02.018000000</dc:date><dc:creator>François Bulot</dc:creator><meta:document-statistic meta:table-count="1" meta:cell-count="129" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> + <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>P1DT3H50M3S</meta:editing-duration><meta:editing-cycles>178</meta:editing-cycles><meta:generator>LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab8</meta:generator><dc:date>2019-07-23T11:28:26.007000000</dc:date><dc:creator>François Bulot</dc:creator><meta:document-statistic meta:table-count="1" meta:cell-count="129" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> <office:settings> <config:config-item-set config:name="ooo:view-settings"> <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item> @@ -14,7 +14,7 @@ <config:config-item-map-named config:name="Tables"> <config:config-item-map-entry config:name="Sheet1"> <config:config-item config:name="CursorPositionX" config:type="int">0</config:config-item> - <config:config-item config:name="CursorPositionY" config:type="int">50</config:config-item> + <config:config-item config:name="CursorPositionY" config:type="int">49</config:config-item> <config:config-item config:name="HorizontalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="VerticalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="HorizontalSplitPosition" config:type="int">0</config:config-item> @@ -591,7 +591,7 @@ <text:p><text:sheet-name>???</text:sheet-name><text:s/>(<text:title>???</text:title>)</text:p> </style:region-left> <style:region-right> - <text:p><text:date style:data-style-name="N2" text:date-value="2019-07-23">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="11:22:37.369000000">00:00:00</text:time></text:p> + <text:p><text:date style:data-style-name="N2" text:date-value="2019-07-23">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="11:28:21.009000000">00:00:00</text:time></text:p> </style:region-right> </style:header> <style:header-left style:display="false"/> @@ -1015,7 +1015,7 @@ </table:table-row> <table:table-row table:style-name="ro1"> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>d:NoDataByDefinition[not(../../d:CellLabel[eno:serialize(d:GridAttachment/d:CellCoordinatesAsDefined)=eno:serialize(current()/child::d:CellCoordinatesAsDefined)])]</text:p> + <text:p>d:NoDataByDefinition[not(../../d:CellLabel[eno:serialize(d:GridAttachment/d:CellCoordinatesAsDefined)=eno:serialize(current()/child::d:CellCoordinatesAsDefined)]) and not(../../d:FixedCellValue[eno:serialize(d:GridAttachment/d:CellCoordinatesAsDefined)=eno:serialize(current()/child::d:CellCoordinatesAsDefined)])]</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>EmptyCell</text:p> diff --git a/src/main/resources/xslt/transformations/ddi2js/drivers.fods b/src/main/resources/xslt/transformations/ddi2js/drivers.fods index 9a8840bac..19c5f28ca 100644 --- a/src/main/resources/xslt/transformations/ddi2js/drivers.fods +++ b/src/main/resources/xslt/transformations/ddi2js/drivers.fods @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.spreadsheet"> - <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>P5DT2H2M40S</meta:editing-duration><meta:editing-cycles>227</meta:editing-cycles><meta:generator>LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab8</meta:generator><dc:date>2019-07-23T11:23:39.427000000</dc:date><dc:creator>François Bulot</dc:creator><meta:document-statistic meta:table-count="1" meta:cell-count="129" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> + <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>P5DT2H3M</meta:editing-duration><meta:editing-cycles>228</meta:editing-cycles><meta:generator>LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab8</meta:generator><dc:date>2019-07-23T11:28:11.614000000</dc:date><dc:creator>François Bulot</dc:creator><meta:document-statistic meta:table-count="1" meta:cell-count="129" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> <office:settings> <config:config-item-set config:name="ooo:view-settings"> <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item> @@ -14,7 +14,7 @@ <config:config-item-map-named config:name="Tables"> <config:config-item-map-entry config:name="Sheet1"> <config:config-item config:name="CursorPositionX" config:type="int">0</config:config-item> - <config:config-item config:name="CursorPositionY" config:type="int">50</config:config-item> + <config:config-item config:name="CursorPositionY" config:type="int">48</config:config-item> <config:config-item config:name="HorizontalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="VerticalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="HorizontalSplitPosition" config:type="int">0</config:config-item> @@ -588,7 +588,7 @@ <text:p><text:sheet-name>???</text:sheet-name><text:s/>(<text:title>???</text:title>)</text:p> </style:region-left> <style:region-right> - <text:p><text:date style:data-style-name="N2" text:date-value="2019-07-23">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="11:23:29.989000000">00:00:00</text:time></text:p> + <text:p><text:date style:data-style-name="N2" text:date-value="2019-07-23">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="11:27:51.544000000">00:00:00</text:time></text:p> </style:region-right> </style:header> <style:header-left style:display="false"/> @@ -1009,7 +1009,7 @@ </table:table-row> <table:table-row table:style-name="ro1"> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>d:NoDataByDefinition[not(../../d:CellLabel[eno:serialize(d:GridAttachment/d:CellCoordinatesAsDefined)=eno:serialize(current()/child::d:CellCoordinatesAsDefined)])]</text:p> + <text:p>d:NoDataByDefinition[not(../../d:CellLabel[eno:serialize(d:GridAttachment/d:CellCoordinatesAsDefined)=eno:serialize(current()/child::d:CellCoordinatesAsDefined)]) and not(../../d:FixedCellValue[eno:serialize(d:GridAttachment/d:CellCoordinatesAsDefined)=eno:serialize(current()/child::d:CellCoordinatesAsDefined)])]</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>EmptyCell</text:p> diff --git a/src/main/resources/xslt/transformations/ddi2odt/drivers.fods b/src/main/resources/xslt/transformations/ddi2odt/drivers.fods index 631eca09f..2a527759e 100644 --- a/src/main/resources/xslt/transformations/ddi2odt/drivers.fods +++ b/src/main/resources/xslt/transformations/ddi2odt/drivers.fods @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.spreadsheet"> - <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>P3DT6H26M5S</meta:editing-duration><meta:editing-cycles>220</meta:editing-cycles><meta:generator>LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab8</meta:generator><dc:date>2019-07-23T11:23:20.653000000</dc:date><dc:creator>François Bulot</dc:creator><meta:document-statistic meta:table-count="1" meta:cell-count="129" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> + <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>P3DT6H26M10S</meta:editing-duration><meta:editing-cycles>221</meta:editing-cycles><meta:generator>LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab8</meta:generator><dc:date>2019-07-23T11:28:37.720000000</dc:date><dc:creator>François Bulot</dc:creator><meta:document-statistic meta:table-count="1" meta:cell-count="129" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> <office:settings> <config:config-item-set config:name="ooo:view-settings"> <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item> @@ -14,7 +14,7 @@ <config:config-item-map-named config:name="Tables"> <config:config-item-map-entry config:name="Sheet1"> <config:config-item config:name="CursorPositionX" config:type="int">0</config:config-item> - <config:config-item config:name="CursorPositionY" config:type="int">50</config:config-item> + <config:config-item config:name="CursorPositionY" config:type="int">48</config:config-item> <config:config-item config:name="HorizontalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="VerticalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="HorizontalSplitPosition" config:type="int">0</config:config-item> @@ -588,7 +588,7 @@ <text:p><text:sheet-name>???</text:sheet-name><text:s/>(<text:title>???</text:title>)</text:p> </style:region-left> <style:region-right> - <text:p><text:date style:data-style-name="N2" text:date-value="2019-07-23">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="11:23:10.563000000">00:00:00</text:time></text:p> + <text:p><text:date style:data-style-name="N2" text:date-value="2019-07-23">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="11:28:32.630000000">00:00:00</text:time></text:p> </style:region-right> </style:header> <style:header-left style:display="false"/> @@ -1009,7 +1009,7 @@ </table:table-row> <table:table-row table:style-name="ro1"> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>d:NoDataByDefinition[not(../../d:CellLabel[eno:serialize(d:GridAttachment/d:CellCoordinatesAsDefined)=eno:serialize(current()/child::d:CellCoordinatesAsDefined)])]</text:p> + <text:p>d:NoDataByDefinition[not(../../d:CellLabel[eno:serialize(d:GridAttachment/d:CellCoordinatesAsDefined)=eno:serialize(current()/child::d:CellCoordinatesAsDefined)]) and not(../../d:FixedCellValue[eno:serialize(d:GridAttachment/d:CellCoordinatesAsDefined)=eno:serialize(current()/child::d:CellCoordinatesAsDefined)])]</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>EmptyCell</text:p> From 7b93c74c6e6feb5694fad30e270edd50754d11c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bulot=20Fran=C3=A7ois?= <U7ZR1J@ad.insee.intra> Date: Tue, 23 Jul 2019 15:04:47 +0200 Subject: [PATCH 056/439] manage current-year as maximum date --- src/main/resources/xslt/outputs/fr/models.xsl | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/resources/xslt/outputs/fr/models.xsl b/src/main/resources/xslt/outputs/fr/models.xsl index 98a2e19b2..49e24a372 100644 --- a/src/main/resources/xslt/outputs/fr/models.xsl +++ b/src/main/resources/xslt/outputs/fr/models.xsl @@ -2357,7 +2357,10 @@ <format id="Y" unit="Year"> <xsl:attribute name="minimum"> <xsl:choose> - <xsl:when test="$minimum != '' and contains($minimum,'-')"> + <xsl:when test="contains($minimum,'current-date')"> + <xsl:value-of select="year-from-date(current-date())"/> + </xsl:when> + <xsl:when test="contains($minimum,'-')"> <xsl:value-of select="substring-before($minimum,'-')"/> </xsl:when> <xsl:when test="$minimum != ''"> @@ -2370,7 +2373,10 @@ </xsl:attribute> <xsl:attribute name="maximum"> <xsl:choose> - <xsl:when test="$maximum != '' and contains($maximum,'-')"> + <xsl:when test="contains($maximum,'current-date')"> + <xsl:value-of select="year-from-date(current-date())"/> + </xsl:when> + <xsl:when test="contains($maximum,'-')"> <xsl:value-of select="substring-before($maximum,'-')"/> </xsl:when> <xsl:when test="$maximum != ''"> From 3bc007745ef22da53c14edb464eee507828e730d Mon Sep 17 00:00:00 2001 From: CHTAINET Badr <Badr.CHTAINET@akka.eu> Date: Tue, 21 May 2019 12:07:01 +0200 Subject: [PATCH 057/439] 189D-BO Add Clarification element to pogues-xml2ddi --- .../resources/xslt/outputs/ddi/models.xsl | 72 +++++++++++++++++-- .../pogues-xml2ddi/drivers.fods | 38 ++++++---- 2 files changed, 93 insertions(+), 17 deletions(-) diff --git a/src/main/resources/xslt/outputs/ddi/models.xsl b/src/main/resources/xslt/outputs/ddi/models.xsl index eed44145b..2bd97aa42 100644 --- a/src/main/resources/xslt/outputs/ddi/models.xsl +++ b/src/main/resources/xslt/outputs/ddi/models.xsl @@ -1075,7 +1075,7 @@ </d:QuestionConstruct> </xsl:template> - <xsl:template match="driver-QuestionScheme//QuestionSingleChoice//ResponseDomain" mode="model" priority="1"> + <xsl:template match="driver-QuestionScheme//QuestionSingleChoice//ResponseDomain | driver-QuestionOtherDetails/ResponseDomain" mode="model" priority="1"> <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="agency" as="xs:string" tunnel="yes"/> <xsl:variable name="mandatory" select="enoddi33:get-ci-type($source-context)"/> @@ -1104,6 +1104,68 @@ </d:CodeDomain> </xsl:template> + <!-- Question with a complementary sub-question for clarrification which are linked to each other --> + <xsl:template match="driver-QuestionScheme//QuestionOtherDetails" mode="model" priority="1"> + <xsl:param name="source-context" as="item()" tunnel="yes"/> + <xsl:param name="agency" as="xs:string" tunnel="yes"/> + + <!-- Value of expresion to show the clarification question --> + <xsl:variable name="ValueOfExpression"> + <xsl:value-of select="enoddi32:get-command(.)"/> + </xsl:variable> + + ----- ValueOfExpression : <xsl:value-of select="$ValueOfExpression"/> + <d:StructuredMixedResponseDomain> + <d:ResponseDomainInMixed attachmentBase="1"> + <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> + <xsl:with-param name="driver" select="eno:append-empty-element('driver-QuestionOtherDetails', .)" tunnel="yes"/> + <xsl:with-param name="agency" select="$agency" as="xs:string" tunnel="yes"/> + </xsl:apply-templates> + </d:ResponseDomainInMixed> + <d:ResponseDomainInMixed> + <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> + <xsl:with-param name="driver" select="eno:append-empty-element('driver-ClarificationQuestion', .)" tunnel="yes"/> + <xsl:with-param name="agency" select="$agency" as="xs:string" tunnel="yes"/> + </xsl:apply-templates> + </d:ResponseDomainInMixed> + </d:StructuredMixedResponseDomain> + </xsl:template> + + <xsl:template match="driver-ExpressionOtherDetails/ResponseDomain" mode="model" priority="1"> + <xsl:param name="source-context" as="item()" tunnel="yes"/> + <xsl:param name="agency" as="xs:string" tunnel="yes"/> + <xsl:value-of select="enoddi32:get-expression($source-context)"/> + </xsl:template> + + <xsl:template match="driver-ClarificationQuestion/Clarification" mode="model" priority="3"> + <xsl:param name="source-context" as="item()" tunnel="yes"/> + <xsl:param name="agency" as="xs:string" tunnel="yes"/> + <d:TextDomain> + <r:Label> + <r:Content xml:lang="fr-FR"> + <xhtml:p> + <xhtml:b><xsl:value-of select="enoddi32:get-label($source-context)"/></xhtml:b> + </xhtml:p> + </r:Content> + </r:Label> + <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> + <xsl:with-param name="driver" select="eno:append-empty-element('driver-OutParameter', .)" tunnel="yes"/> + <xsl:with-param name="agency" select="$agency" as="xs:string" tunnel="yes"/> + </xsl:apply-templates> + </d:TextDomain> + <d:AttachmentLocation> + <d:DomainSpecificValue attachmentDomain="1"> + <r:Value>6!!!!!!!!!!!!!!!!!!!!!!!</r:Value> + </d:DomainSpecificValue> + <r:CodeReference> + <r:Agency><xsl:value-of select="$agency"/></r:Agency> + <r:ID><xsl:value-of select="enoddi32:get-id($source-context)"/></r:ID> + <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </d:AttachmentLocation> + </xsl:template> + <xsl:template match="driver-SMGRD/ResponseDomain" mode="model" priority="3"> <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="agency" as="xs:string" tunnel="yes"/> @@ -1127,7 +1189,7 @@ </xsl:template> <!-- This template is only matched when call just after driver-ResponseDomain (why it got 3 priority), to check if SMR is needed. --> - <xsl:template match="driver-ResponseDomain/QuestionSimple | driver-ResponseDomain/QuestionSingleChoice" mode="model" priority="3"> + <xsl:template match="driver-ResponseDomain/QuestionSimple | driver-ResponseDomain/QuestionSingleChoice | driver-ResponseDomain/QuestionOtherDetails" mode="model" priority="3"> <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> <xsl:with-param name="driver" select="." tunnel="yes"/> @@ -1144,7 +1206,7 @@ </d:StructuredMixedGridResponseDomain> </xsl:template> - <xsl:template name="Question" match="driver-QuestionScheme//*[name() = ('QuestionMultipleChoice','QuestionTable','QuestionDynamicTable','QuestionSimple','QuestionSingleChoice')]" mode="model"> + <xsl:template name="Question" match="driver-QuestionScheme//*[name() = ('QuestionMultipleChoice','QuestionTable','QuestionDynamicTable','QuestionSimple','QuestionSingleChoice','QuestionOtherDetails')]" mode="model"> <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="agency" as="xs:string" tunnel="yes"/> <!-- @@ -1157,7 +1219,7 @@ <xsl:when test="./name() = ('QuestionMultipleChoice','QuestionTable','QuestionDynamicTable')"> <xsl:value-of select="'d:QuestionGrid'"/> </xsl:when> - <xsl:when test="./name() = ('QuestionSimple','QuestionSingleChoice')"> + <xsl:when test="./name() = ('QuestionSimple','QuestionSingleChoice','QuestionOtherDetails')"> <xsl:value-of select="'d:QuestionItem'"/> </xsl:when> <xsl:otherwise> @@ -1315,7 +1377,7 @@ <xsl:template match="driver-CodeListReference//*" mode="model"/> - <xsl:template match="driver-CodeListReference//CodeListReference | QuestionSingleChoice//ResponseDomain/CodeListReference" mode="model" priority="2"> + <xsl:template match="driver-CodeListReference//CodeListReference | QuestionSingleChoice//ResponseDomain/CodeListReference | QuestionOtherDetails//ResponseDomain/CodeListReference" mode="model" priority="2"> <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="agency" as="xs:string" tunnel="yes"/> <r:CodeListReference> diff --git a/src/main/resources/xslt/transformations/pogues-xml2ddi/drivers.fods b/src/main/resources/xslt/transformations/pogues-xml2ddi/drivers.fods index 67ffe196a..91e06151f 100644 --- a/src/main/resources/xslt/transformations/pogues-xml2ddi/drivers.fods +++ b/src/main/resources/xslt/transformations/pogues-xml2ddi/drivers.fods @@ -1,20 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> <office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.spreadsheet"> - <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>P6DT3H21M34S</meta:editing-duration><meta:editing-cycles>195</meta:editing-cycles><meta:generator>LibreOffice/6.1.5.2$Windows_X86_64 LibreOffice_project/90f8dcf33c87b3705e78202e3df5142b201bd805</meta:generator><dc:date>2019-06-14T16:12:16.537000000</dc:date><meta:document-statistic meta:table-count="1" meta:cell-count="101" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> + <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>P6DT3H23M44S</meta:editing-duration><meta:editing-cycles>192</meta:editing-cycles><meta:generator>LibreOffice/6.1.5.2$Windows_X86_64 LibreOffice_project/90f8dcf33c87b3705e78202e3df5142b201bd805</meta:generator><dc:date>2019-07-23T15:37:17.627000000</dc:date><meta:document-statistic meta:table-count="1" meta:cell-count="104" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> <office:settings> <config:config-item-set config:name="ooo:view-settings"> <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item> <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item> - <config:config-item config:name="VisibleAreaWidth" config:type="int">43042</config:config-item> - <config:config-item config:name="VisibleAreaHeight" config:type="int">18062</config:config-item> + <config:config-item config:name="VisibleAreaWidth" config:type="int">54948</config:config-item> + <config:config-item config:name="VisibleAreaHeight" config:type="int">18513</config:config-item> <config:config-item-map-indexed config:name="Views"> <config:config-item-map-entry> <config:config-item config:name="ViewId" config:type="string">view1</config:config-item> <config:config-item-map-named config:name="Tables"> <config:config-item-map-entry config:name="Sheet1"> <config:config-item config:name="CursorPositionX" config:type="int">0</config:config-item> - <config:config-item config:name="CursorPositionY" config:type="int">39</config:config-item> + <config:config-item config:name="CursorPositionY" config:type="int">34</config:config-item> <config:config-item config:name="HorizontalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="VerticalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="HorizontalSplitPosition" config:type="int">0</config:config-item> @@ -23,7 +23,7 @@ <config:config-item config:name="PositionLeft" config:type="int">0</config:config-item> <config:config-item config:name="PositionRight" config:type="int">0</config:config-item> <config:config-item config:name="PositionTop" config:type="int">0</config:config-item> - <config:config-item config:name="PositionBottom" config:type="int">24</config:config-item> + <config:config-item config:name="PositionBottom" config:type="int">0</config:config-item> <config:config-item config:name="ZoomType" config:type="short">0</config:config-item> <config:config-item config:name="ZoomValue" config:type="int">100</config:config-item> <config:config-item config:name="PageViewZoomValue" config:type="int">60</config:config-item> @@ -32,7 +32,7 @@ </config:config-item-map-entry> </config:config-item-map-named> <config:config-item config:name="ActiveTable" config:type="string">Sheet1</config:config-item> - <config:config-item config:name="HorizontalScrollbarWidth" config:type="int">1302</config:config-item> + <config:config-item config:name="HorizontalScrollbarWidth" config:type="int">1840</config:config-item> <config:config-item config:name="ZoomType" config:type="short">0</config:config-item> <config:config-item config:name="ZoomValue" config:type="int">100</config:config-item> <config:config-item config:name="PageViewZoomValue" config:type="int">60</config:config-item> @@ -235,7 +235,7 @@ </office:styles> <office:automatic-styles> <style:style style:name="co1" style:family="table-column"> - <style:table-column-properties fo:break-before="auto" style:column-width="166.42mm"/> + <style:table-column-properties fo:break-before="auto" style:column-width="285.49mm"/> </style:style> <style:style style:name="co2" style:family="table-column"> <style:table-column-properties fo:break-before="auto" style:column-width="41.19mm"/> @@ -302,7 +302,7 @@ <text:p><text:sheet-name>???</text:sheet-name><text:s/>(<text:title>???</text:title>)</text:p> </style:region-left> <style:region-right> - <text:p><text:date style:data-style-name="N2" text:date-value="2019-06-14">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="16:11:35.679000000">00:00:00</text:time></text:p> + <text:p><text:date style:data-style-name="N2" text:date-value="2019-07-23">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="15:33:56.065000000">00:00:00</text:time></text:p> </style:region-right> </style:header> <style:header-left style:display="false"/> @@ -431,7 +431,7 @@ </table:table-row> <table:table-row table:style-name="ro1"> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>pogues:Child[@xsi:type='QuestionType' and @questionType='SINGLE_CHOICE' ]</text:p> + <text:p>pogues:Child[@xsi:type='QuestionType' and @questionType='SINGLE_CHOICE' and not(pogues:ClarificationQuestion) ]</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>QuestionSingleChoice</text:p> @@ -440,6 +440,17 @@ <text:p>A question with a choice to be made between categories or elementsof a CodeList</text:p> </table:table-cell> </table:table-row> + <table:table-row table:style-name="ro1"> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p>pogues:Child[@xsi:type='QuestionType' and @questionType='SINGLE_CHOICE' and pogues:ClarificationQuestion]</text:p> + </table:table-cell> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p>QuestionOtherDetails</text:p> + </table:table-cell> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p>A question with a choice to be made between categories or elementsof a CodeList and with an sub-question to give more details</text:p> + </table:table-cell> + </table:table-row> <table:table-row table:style-name="ro1"> <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>pogues:Child[@xsi:type='QuestionType' and @questionType='MULTIPLE_CHOICE' ]</text:p> @@ -693,10 +704,13 @@ </table:table-row> <table:table-row table:style-name="ro1"> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>pogues:Format</text:p> + <text:p>pogues:ClarificationQuestion</text:p> </table:table-cell> - <table:table-cell table:number-columns-repeated="2" office:value-type="string" calcext:value-type="string"> - <text:p>Format</text:p> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p>Clarification</text:p> + </table:table-cell> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p>A clarification question is linked to a main question (QuestionOtherDetails)</text:p> </table:table-cell> </table:table-row> <table:table-row table:style-name="ro1"> From 53ffb4872eb1057abfd337a9780ef749f6f0bfde Mon Sep 17 00:00:00 2001 From: CHTAINET Badr <Badr.CHTAINET@akka.eu> Date: Fri, 24 May 2019 11:14:23 +0200 Subject: [PATCH 058/439] 189D generate new Clarification element --- .../xslt/inputs/pogues-xml/templates.fods | 130 +++++++----------- .../resources/xslt/outputs/ddi/models.xsl | 111 ++++++++------- 2 files changed, 106 insertions(+), 135 deletions(-) diff --git a/src/main/resources/xslt/inputs/pogues-xml/templates.fods b/src/main/resources/xslt/inputs/pogues-xml/templates.fods index fd803c21a..fda693389 100644 --- a/src/main/resources/xslt/inputs/pogues-xml/templates.fods +++ b/src/main/resources/xslt/inputs/pogues-xml/templates.fods @@ -1,20 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> <office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.spreadsheet"> - <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>P11DT14H3M37S</meta:editing-duration><meta:editing-cycles>473</meta:editing-cycles><meta:generator>LibreOffice/6.1.5.2$Windows_X86_64 LibreOffice_project/90f8dcf33c87b3705e78202e3df5142b201bd805</meta:generator><dc:date>2019-07-18T12:46:55.911000000</dc:date><meta:document-statistic meta:table-count="1" meta:cell-count="358" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> + <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>P11DT13H57M12S</meta:editing-duration><meta:editing-cycles>464</meta:editing-cycles><meta:generator>LibreOffice/6.1.5.2$Windows_X86_64 LibreOffice_project/90f8dcf33c87b3705e78202e3df5142b201bd805</meta:generator><dc:date>2019-07-22T15:17:49.937000000</dc:date><meta:document-statistic meta:table-count="1" meta:cell-count="350" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> <office:settings> <config:config-item-set config:name="ooo:view-settings"> <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item> <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item> - <config:config-item config:name="VisibleAreaWidth" config:type="int">53973</config:config-item> - <config:config-item config:name="VisibleAreaHeight" config:type="int">55414</config:config-item> + <config:config-item config:name="VisibleAreaWidth" config:type="int">64075</config:config-item> + <config:config-item config:name="VisibleAreaHeight" config:type="int">54257</config:config-item> <config:config-item-map-indexed config:name="Views"> <config:config-item-map-entry> <config:config-item config:name="ViewId" config:type="string">view1</config:config-item> <config:config-item-map-named config:name="Tables"> <config:config-item-map-entry config:name="Sheet1"> <config:config-item config:name="CursorPositionX" config:type="int">0</config:config-item> - <config:config-item config:name="CursorPositionY" config:type="int">41</config:config-item> + <config:config-item config:name="CursorPositionY" config:type="int">92</config:config-item> <config:config-item config:name="HorizontalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="VerticalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="HorizontalSplitPosition" config:type="int">0</config:config-item> @@ -23,7 +23,7 @@ <config:config-item config:name="PositionLeft" config:type="int">0</config:config-item> <config:config-item config:name="PositionRight" config:type="int">0</config:config-item> <config:config-item config:name="PositionTop" config:type="int">0</config:config-item> - <config:config-item config:name="PositionBottom" config:type="int">24</config:config-item> + <config:config-item config:name="PositionBottom" config:type="int">72</config:config-item> <config:config-item config:name="ZoomType" config:type="short">0</config:config-item> <config:config-item config:name="ZoomValue" config:type="int">100</config:config-item> <config:config-item config:name="PageViewZoomValue" config:type="int">60</config:config-item> @@ -32,7 +32,7 @@ </config:config-item-map-entry> </config:config-item-map-named> <config:config-item config:name="ActiveTable" config:type="string">Sheet1</config:config-item> - <config:config-item config:name="HorizontalScrollbarWidth" config:type="int">1286</config:config-item> + <config:config-item config:name="HorizontalScrollbarWidth" config:type="int">1840</config:config-item> <config:config-item config:name="ZoomType" config:type="short">0</config:config-item> <config:config-item config:name="ZoomValue" config:type="int">100</config:config-item> <config:config-item config:name="PageViewZoomValue" config:type="int">60</config:config-item> @@ -516,13 +516,13 @@ </office:styles> <office:automatic-styles> <style:style style:name="co1" style:family="table-column"> - <style:table-column-properties fo:break-before="auto" style:column-width="121.07mm"/> + <style:table-column-properties fo:break-before="auto" style:column-width="204.79mm"/> </style:style> <style:style style:name="co2" style:family="table-column"> - <style:table-column-properties fo:break-before="auto" style:column-width="73.11mm"/> + <style:table-column-properties fo:break-before="auto" style:column-width="63.71mm"/> </style:style> <style:style style:name="co3" style:family="table-column"> - <style:table-column-properties fo:break-before="auto" style:column-width="126.61mm"/> + <style:table-column-properties fo:break-before="auto" style:column-width="153.32mm"/> </style:style> <style:style style:name="co4" style:family="table-column"> <style:table-column-properties fo:break-before="auto" style:column-width="35.93mm"/> @@ -549,6 +549,10 @@ <style:style style:name="ce2" style:family="table-cell" style:parent-style-name="Default"> <style:text-properties style:font-name="Arial" fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/> </style:style> + <style:style style:name="ce5" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="N100"/> + <style:style style:name="ce6" style:family="table-cell" style:parent-style-name="Default"> + <style:text-properties style:font-name="Arial" fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/> + </style:style> <style:page-layout style:name="pm1"> <style:page-layout-properties style:first-page-number="continue" style:writing-mode="lr-tb"/> <style:header-style> @@ -598,7 +602,7 @@ <text:p><text:sheet-name>???</text:sheet-name><text:s/>(<text:title>???</text:title>)</text:p> </style:region-left> <style:region-right> - <text:p><text:date style:data-style-name="N2" text:date-value="2019-07-18">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="12:42:00.639000000">00:00:00</text:time></text:p> + <text:p><text:date style:data-style-name="N2" text:date-value="2019-07-23">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="15:39:26.133000000">00:00:00</text:time></text:p> </style:region-right> </style:header> <style:header-left style:display="false"/> @@ -857,12 +861,12 @@ <office:body> <office:spreadsheet> <table:table table:name="Sheet1" table:style-name="ta1" table:print="false"> - <table:table-column table:style-name="co1" table:default-cell-style-name="ce1"/> - <table:table-column table:style-name="co2" table:default-cell-style-name="ce1"/> - <table:table-column table:style-name="co3" table:default-cell-style-name="ce1"/> - <table:table-column table:style-name="co4" table:default-cell-style-name="ce1"/> - <table:table-column table:style-name="co5" table:default-cell-style-name="ce1"/> - <table:table-column table:style-name="co6" table:number-columns-repeated="1019" table:default-cell-style-name="ce1"/> + <table:table-column table:style-name="co1" table:default-cell-style-name="ce5"/> + <table:table-column table:style-name="co2" table:default-cell-style-name="ce5"/> + <table:table-column table:style-name="co3" table:default-cell-style-name="ce5"/> + <table:table-column table:style-name="co4" table:default-cell-style-name="ce5"/> + <table:table-column table:style-name="co5" table:default-cell-style-name="ce5"/> + <table:table-column table:style-name="co6" table:number-columns-repeated="1019" table:default-cell-style-name="ce5"/> <table:table-row table:style-name="ro1"> <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>Xpath</text:p> @@ -976,6 +980,18 @@ </table:table-cell> <table:table-cell table:number-columns-repeated="1021"/> </table:table-row> + <table:table-row table:style-name="ro2"> + <table:table-cell table:style-name="Default" office:value-type="string" calcext:value-type="string"> + <text:p>*[ancestor-or-self::pogues:ClarificationQuestion]</text:p> + </table:table-cell> + <table:table-cell table:style-name="Default" office:value-type="string" calcext:value-type="string"> + <text:p>enopogues:get-code-list-id</text:p> + </table:table-cell> + <table:table-cell table:style-name="Default" office:value-type="string" calcext:value-type="string"> + <text:p>enopogues:get-id(preceding::pogues:CodeListReference)</text:p> + </table:table-cell> + <table:table-cell table:number-columns-repeated="1021"/> + </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>*</text:p> @@ -1441,22 +1457,6 @@ </table:table-cell> <table:table-cell table:number-columns-repeated="1019"/> </table:table-row> - <table:table-row table:style-name="ro2"> - <table:table-cell table:style-name="Default" office:value-type="string" calcext:value-type="string"> - <text:p>*</text:p> - </table:table-cell> - <table:table-cell table:style-name="Default" office:value-type="string" calcext:value-type="string"> - <text:p>enopogues:get-maximum</text:p> - </table:table-cell> - <table:table-cell table:style-name="Default" office:value-type="string" calcext:value-type="string"> - <text:p>pogues:Maximum</text:p> - </table:table-cell> - <table:table-cell table:style-name="Default"/> - <table:table-cell table:style-name="Default" office:value-type="string" calcext:value-type="string"> - <text:p>Return the maximal value of the data type</text:p> - </table:table-cell> - <table:table-cell table:style-name="Default" table:number-columns-repeated="1019"/> - </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>pogues:Datatype[not(@visualizationHint) and @xsi:type='NumericDatatypeType']</text:p> @@ -1473,22 +1473,6 @@ </table:table-cell> <table:table-cell table:number-columns-repeated="1019"/> </table:table-row> - <table:table-row table:style-name="ro2"> - <table:table-cell table:style-name="Default" office:value-type="string" calcext:value-type="string"> - <text:p>*</text:p> - </table:table-cell> - <table:table-cell table:style-name="Default" office:value-type="string" calcext:value-type="string"> - <text:p>enopogues:get-minimum</text:p> - </table:table-cell> - <table:table-cell table:style-name="Default" office:value-type="string" calcext:value-type="string"> - <text:p>pogues:Minimum</text:p> - </table:table-cell> - <table:table-cell table:style-name="Default"/> - <table:table-cell table:style-name="Default" office:value-type="string" calcext:value-type="string"> - <text:p>Return the minimal value of the data type</text:p> - </table:table-cell> - <table:table-cell table:style-name="Default" table:number-columns-repeated="1019"/> - </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>pogues:Datatype[not(@visualizationHint) and @xsi:type='NumericDatatypeType']</text:p> @@ -1695,7 +1679,7 @@ <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>*</text:p> </table:table-cell> - <table:table-cell table:style-name="ce2" office:value-type="string" calcext:value-type="string"> + <table:table-cell table:style-name="ce6" office:value-type="string" calcext:value-type="string"> <text:p>enopogues:get-questionnaire-id</text:p> </table:table-cell> <table:table-cell table:style-name="Default" office:value-type="string" calcext:value-type="string"> @@ -1893,7 +1877,7 @@ <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>*</text:p> </table:table-cell> - <table:table-cell table:style-name="ce2" office:value-type="string" calcext:value-type="string"> + <table:table-cell table:style-name="ce6" office:value-type="string" calcext:value-type="string"> <text:p>enopogues:get-sequences</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> @@ -1911,7 +1895,7 @@ <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>*</text:p> </table:table-cell> - <table:table-cell table:style-name="ce2" office:value-type="string" calcext:value-type="string"> + <table:table-cell table:style-name="ce6" office:value-type="string" calcext:value-type="string"> <text:p>enopogues:get-survey-name</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> @@ -1923,7 +1907,7 @@ <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>pogues:IfThenElse</text:p> </table:table-cell> - <table:table-cell table:style-name="ce2" office:value-type="string" calcext:value-type="string"> + <table:table-cell table:style-name="ce6" office:value-type="string" calcext:value-type="string"> <text:p>enopogues:get-then-id</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> @@ -1939,7 +1923,7 @@ <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>pogues:Response</text:p> </table:table-cell> - <table:table-cell table:style-name="ce2" office:value-type="string" calcext:value-type="string"> + <table:table-cell table:style-name="ce6" office:value-type="string" calcext:value-type="string"> <text:p>enopogues:get-type</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> @@ -1955,7 +1939,7 @@ <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>pogues:Child[@xsi:type='QuestionType' and @questionType!='TABLE']</text:p> </table:table-cell> - <table:table-cell table:style-name="ce2" office:value-type="string" calcext:value-type="string"> + <table:table-cell table:style-name="ce6" office:value-type="string" calcext:value-type="string"> <text:p>enopogues:get-type</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> @@ -1971,7 +1955,7 @@ <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>pogues:Child[@questionType='TABLE' and not(pogues:ResponseStructure/pogues:Dimension[@dimensionType="PRIMARY" and @dynamic != '0'])]</text:p> </table:table-cell> - <table:table-cell table:style-name="ce2" office:value-type="string" calcext:value-type="string"> + <table:table-cell table:style-name="ce6" office:value-type="string" calcext:value-type="string"> <text:p>enopogues:get-type</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> @@ -1987,7 +1971,7 @@ <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>pogues:Child[@questionType='TABLE' and pogues:ResponseStructure/pogues:Dimension[@dimensionType="PRIMARY" and @dynamic != '0']]</text:p> </table:table-cell> - <table:table-cell table:style-name="ce2" office:value-type="string" calcext:value-type="string"> + <table:table-cell table:style-name="ce6" office:value-type="string" calcext:value-type="string"> <text:p>enopogues:get-type</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> @@ -1999,7 +1983,7 @@ <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>pogues:Control</text:p> </table:table-cell> - <table:table-cell table:style-name="ce2" office:value-type="string" calcext:value-type="string"> + <table:table-cell table:style-name="ce6" office:value-type="string" calcext:value-type="string"> <text:p>enopogues:get-type</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> @@ -2014,7 +1998,7 @@ <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>pogues:Variable</text:p> </table:table-cell> - <table:table-cell table:style-name="ce2" office:value-type="string" calcext:value-type="string"> + <table:table-cell table:style-name="ce6" office:value-type="string" calcext:value-type="string"> <text:p>enopogues:get-type</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> @@ -2026,7 +2010,7 @@ <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>pogues:Response</text:p> </table:table-cell> - <table:table-cell table:style-name="ce2" office:value-type="string" calcext:value-type="string"> + <table:table-cell table:style-name="ce6" office:value-type="string" calcext:value-type="string"> <text:p>enopogues:get-type-name</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> @@ -2073,11 +2057,11 @@ <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>*</text:p> </table:table-cell> - <table:table-cell table:style-name="ce2" office:value-type="string" calcext:value-type="string"> + <table:table-cell table:style-name="ce6" office:value-type="string" calcext:value-type="string"> <text:p>enopogues:get-version</text:p> </table:table-cell> <table:table-cell table:style-name="Default" office:value-type="string" calcext:value-type="string"> - <text:p>'1'</text:p> + <text:p>'1.0'</text:p> </table:table-cell> <table:table-cell/> <table:table-cell office:value-type="string" calcext:value-type="string"> @@ -2089,7 +2073,7 @@ <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>pogues:Response</text:p> </table:table-cell> - <table:table-cell table:style-name="ce2" office:value-type="string" calcext:value-type="string"> + <table:table-cell table:style-name="ce6" office:value-type="string" calcext:value-type="string"> <text:p>enopogues:get-visualization-hint</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> @@ -2242,27 +2226,7 @@ </table:table-cell> <table:table-cell table:number-columns-repeated="1021"/> </table:table-row> - <table:table-row table:style-name="ro2"> - <table:table-cell table:style-name="Default" office:value-type="string" calcext:value-type="string"> - <text:p>*</text:p> - </table:table-cell> - <table:table-cell table:style-name="Default" office:value-type="string" calcext:value-type="string"> - <text:p>enopogues:get-format</text:p> - </table:table-cell> - <table:table-cell table:style-name="Default" office:value-type="string" calcext:value-type="string"> - <text:p>pogues:Format</text:p> - </table:table-cell> - <table:table-cell table:number-columns-repeated="1021"/> - </table:table-row> - <table:table-row table:style-name="ro2"> - <table:table-cell table:number-columns-repeated="1024"/> - </table:table-row> - <table:table-row table:style-name="ro2"> - <table:table-cell table:number-columns-repeated="2"/> - <table:table-cell table:style-name="Default"/> - <table:table-cell table:number-columns-repeated="1021"/> - </table:table-row> - <table:table-row table:style-name="ro2" table:number-rows-repeated="61"> + <table:table-row table:style-name="ro2" table:number-rows-repeated="65"> <table:table-cell table:number-columns-repeated="1024"/> </table:table-row> <table:table-row table:style-name="ro1" table:number-rows-repeated="1048416"> diff --git a/src/main/resources/xslt/outputs/ddi/models.xsl b/src/main/resources/xslt/outputs/ddi/models.xsl index 2bd97aa42..19f6e4390 100644 --- a/src/main/resources/xslt/outputs/ddi/models.xsl +++ b/src/main/resources/xslt/outputs/ddi/models.xsl @@ -1018,7 +1018,7 @@ </xsl:template> - <xsl:template name="ControlConstructReference" match="*[name()=('Sequence','IfThenElse')]//*[name() =('Sequence','IfThenElse','QuestionMultipleChoice','QuestionSingleChoice','QuestionTable','QuestionDynamicTable','QuestionSimple','Control') and not(ancestor::driver-ManagedRepresentationScheme)]" mode="model" priority="1"> + <xsl:template name="ControlConstructReference" match="*[name()=('Sequence','IfThenElse')]//*[name() =('Sequence','IfThenElse','QuestionMultipleChoice','QuestionSingleChoice','QuestionOtherDetails','QuestionTable','QuestionDynamicTable','QuestionSimple','Control') and not(ancestor::driver-ManagedRepresentationScheme)]" mode="model" priority="1"> <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="agency" as="xs:string" tunnel="yes"/> <xsl:variable name="driver" select="."/> @@ -1057,8 +1057,17 @@ <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="agency" as="xs:string" tunnel="yes"/> </xsl:template> + + <xsl:template match="driver-Binding//Clarification" mode="model" priority="1"> + <xsl:param name="source-context" as="item()" tunnel="yes"/> + <xsl:param name="agency" as="xs:string" tunnel="yes"/> + + <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> + <xsl:with-param name="driver" select="." tunnel="yes"/> + </xsl:apply-templates> + </xsl:template> - <xsl:template name="QuestionConstruct" match="driver-ControlConstructScheme//*[name() = ('QuestionMultipleChoice','QuestionTable','QuestionDynamicTable','QuestionSimple','QuestionSingleChoice')]" mode="model"> + <xsl:template name="QuestionConstruct" match="driver-ControlConstructScheme//*[name() = ('QuestionMultipleChoice','QuestionTable','QuestionDynamicTable','QuestionSimple','QuestionSingleChoice','QuestionOtherDetails')]" mode="model"> <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="agency" as="xs:string" tunnel="yes"/> <d:QuestionConstruct> @@ -1075,7 +1084,7 @@ </d:QuestionConstruct> </xsl:template> - <xsl:template match="driver-QuestionScheme//QuestionSingleChoice//ResponseDomain | driver-QuestionOtherDetails/ResponseDomain" mode="model" priority="1"> + <xsl:template match="driver-QuestionScheme//QuestionSingleChoice//ResponseDomain" mode="model" priority="1"> <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="agency" as="xs:string" tunnel="yes"/> <xsl:variable name="mandatory" select="enoddi33:get-ci-type($source-context)"/> @@ -1104,68 +1113,49 @@ </d:CodeDomain> </xsl:template> - <!-- Question with a complementary sub-question for clarrification which are linked to each other --> - <xsl:template match="driver-QuestionScheme//QuestionOtherDetails" mode="model" priority="1"> + <!-- Question with a complementary sub-response for clarrification which are linked to each other --> + <xsl:template match="driver-SMRD//ResponseDomain[not(ancestor::Clarification)]" mode="model" priority="1"> <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="agency" as="xs:string" tunnel="yes"/> - - <!-- Value of expresion to show the clarification question --> - <xsl:variable name="ValueOfExpression"> - <xsl:value-of select="enoddi32:get-command(.)"/> - </xsl:variable> - - ----- ValueOfExpression : <xsl:value-of select="$ValueOfExpression"/> - <d:StructuredMixedResponseDomain> - <d:ResponseDomainInMixed attachmentBase="1"> + <d:ResponseDomainInMixed attachmentBase="1"> <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> - <xsl:with-param name="driver" select="eno:append-empty-element('driver-QuestionOtherDetails', .)" tunnel="yes"/> - <xsl:with-param name="agency" select="$agency" as="xs:string" tunnel="yes"/> - </xsl:apply-templates> - </d:ResponseDomainInMixed> - <d:ResponseDomainInMixed> - <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> - <xsl:with-param name="driver" select="eno:append-empty-element('driver-ClarificationQuestion', .)" tunnel="yes"/> - <xsl:with-param name="agency" select="$agency" as="xs:string" tunnel="yes"/> - </xsl:apply-templates> - </d:ResponseDomainInMixed> - </d:StructuredMixedResponseDomain> - </xsl:template> - - <xsl:template match="driver-ExpressionOtherDetails/ResponseDomain" mode="model" priority="1"> - <xsl:param name="source-context" as="item()" tunnel="yes"/> - <xsl:param name="agency" as="xs:string" tunnel="yes"/> - <xsl:value-of select="enoddi32:get-expression($source-context)"/> + <xsl:with-param name="driver" select="." tunnel="yes"/> + </xsl:apply-templates> + </d:ResponseDomainInMixed> </xsl:template> - <xsl:template match="driver-ClarificationQuestion/Clarification" mode="model" priority="3"> + <!-- Clarification --> + <xsl:template match="driver-SMRD//Clarification" mode="model" priority="1"> <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="agency" as="xs:string" tunnel="yes"/> - <d:TextDomain> - <r:Label> - <r:Content xml:lang="fr-FR"> - <xhtml:p> - <xhtml:b><xsl:value-of select="enoddi32:get-label($source-context)"/></xhtml:b> - </xhtml:p> - </r:Content> - </r:Label> - <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> - <xsl:with-param name="driver" select="eno:append-empty-element('driver-OutParameter', .)" tunnel="yes"/> - <xsl:with-param name="agency" select="$agency" as="xs:string" tunnel="yes"/> - </xsl:apply-templates> - </d:TextDomain> - <d:AttachmentLocation> + <d:ResponseDomainInMixed> + <d:TextDomain> + <r:Label> + <r:Content xml:lang="{enoddi32:get-lang($source-context)}"> + <xhtml:p> + <xhtml:b><xsl:value-of select="enoddi32:get-label($source-context)"/></xhtml:b> + </xhtml:p> + </r:Content> + </r:Label> + <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> + <xsl:with-param name="driver" select="eno:append-empty-element('driver-OutParameter', .)" tunnel="yes"/> + <xsl:with-param name="agency" select="$agency" as="xs:string" tunnel="yes"/> + </xsl:apply-templates> + </d:TextDomain> + <d:AttachmentLocation> <d:DomainSpecificValue attachmentDomain="1"> - <r:Value>6!!!!!!!!!!!!!!!!!!!!!!!</r:Value> + <r:Value></r:Value> </d:DomainSpecificValue> <r:CodeReference> <r:Agency><xsl:value-of select="$agency"/></r:Agency> - <r:ID><xsl:value-of select="enoddi32:get-id($source-context)"/></r:ID> + <r:ID><xsl:value-of select="enoddi32:get-code-list-id($source-context)"/>-</r:ID> <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </d:AttachmentLocation> + </d:ResponseDomainInMixed> </xsl:template> - + <xsl:template match="driver-SMGRD/ResponseDomain" mode="model" priority="3"> <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="agency" as="xs:string" tunnel="yes"/> @@ -1189,13 +1179,23 @@ </xsl:template> <!-- This template is only matched when call just after driver-ResponseDomain (why it got 3 priority), to check if SMR is needed. --> - <xsl:template match="driver-ResponseDomain/QuestionSimple | driver-ResponseDomain/QuestionSingleChoice | driver-ResponseDomain/QuestionOtherDetails" mode="model" priority="3"> + <xsl:template match="driver-ResponseDomain/QuestionSimple | driver-ResponseDomain/QuestionSingleChoice" mode="model" priority="3"> <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> <xsl:with-param name="driver" select="." tunnel="yes"/> </xsl:apply-templates> </xsl:template> + <!-- This template is only matched when call just after driver-ResponseDomain (why it got 3 priority), to check if SMR is needed. --> + <xsl:template match="driver-ResponseDomain/QuestionOtherDetails" mode="model" priority="3"> + <xsl:param name="source-context" as="item()" tunnel="yes"/> + <d:StructuredMixedResponseDomain> + <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> + <xsl:with-param name="driver" select="eno:append-empty-element('driver-SMRD', .)" tunnel="yes"/> + </xsl:apply-templates> + </d:StructuredMixedResponseDomain> + </xsl:template> + <!-- This template is only matched when call just after driver-ResponseDomain (why it got 3 priority), to check if SMR is needed. --> <xsl:template match="driver-ResponseDomain/QuestionDynamicTable | driver-ResponseDomain/QuestionTable | driver-ResponseDomain/QuestionMultipleChoice" mode="model" priority="3"> <xsl:param name="source-context" as="item()" tunnel="yes"/> @@ -1301,6 +1301,13 @@ <xsl:param name="agency" as="xs:string" tunnel="yes"/> </xsl:template> + <xsl:template match="driver-OutParameter//Clarification" mode="model" priority="1"> + <xsl:param name="source-context" as="item()" tunnel="yes"/> + <xsl:param name="agency" as="xs:string" tunnel="yes"/> + <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> + <xsl:with-param name="driver" select="." tunnel="yes"/> + </xsl:apply-templates> + </xsl:template> <!--this part is disigned in this complicated way to maintain the order of the ddi 3.3 xsd schema--> <xsl:template match="driver-OutParameter//ResponseDomain" mode="model" priority="2"> @@ -1377,7 +1384,7 @@ <xsl:template match="driver-CodeListReference//*" mode="model"/> - <xsl:template match="driver-CodeListReference//CodeListReference | QuestionSingleChoice//ResponseDomain/CodeListReference | QuestionOtherDetails//ResponseDomain/CodeListReference" mode="model" priority="2"> + <xsl:template match="driver-CodeListReference//CodeListReference | QuestionSingleChoice//ResponseDomain/CodeListReference" mode="model" priority="2"> <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="agency" as="xs:string" tunnel="yes"/> <r:CodeListReference> @@ -1681,7 +1688,7 @@ <xsl:template match="driver-SMGRD/*" mode="model" priority="2"/> - <xsl:template match="driver-SMGRD/ResponseDomain/CodeDomain" mode="model" priority="3"> + <xsl:template match="driver-SMGRD/ResponseDomain/CodeDomain | driver-SMRD/ResponseDomain/CodeDomain" mode="model" priority="3"> <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="agency" as="xs:string" tunnel="yes"/> <xsl:param name="mandatory" as="xs:string" tunnel="yes" select="''"/> From e58ccbd52e85105d390c4bbee81b7b4b19dfbe56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bulot=20Fran=C3=A7ois?= <U7ZR1J@ad.insee.intra> Date: Tue, 23 Jul 2019 17:02:16 +0200 Subject: [PATCH 059/439] update date/duration minimum and maximum by unit calculation --- src/main/resources/xslt/outputs/fr/models.xsl | 66 +++++++++---------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/src/main/resources/xslt/outputs/fr/models.xsl b/src/main/resources/xslt/outputs/fr/models.xsl index 49e24a372..641060c5c 100644 --- a/src/main/resources/xslt/outputs/fr/models.xsl +++ b/src/main/resources/xslt/outputs/fr/models.xsl @@ -2475,7 +2475,7 @@ </xsl:analyze-string> </xsl:when> <xsl:otherwise> - <xsl:value-of select="0"/> + <xsl:value-of select="'0'"/> </xsl:otherwise> </xsl:choose> </xsl:attribute> @@ -2489,7 +2489,7 @@ </xsl:analyze-string> </xsl:when> <xsl:otherwise> - <xsl:value-of select="99"/> + <xsl:value-of select="'99'"/> </xsl:otherwise> </xsl:choose> </xsl:attribute> @@ -2500,33 +2500,33 @@ <xsl:attribute name="minimum"> <xsl:choose> <xsl:when test="$minimum != ''"> - <xsl:analyze-string select="$minimum" regex="^P[^T]*^[T0-9]([0-9]+)M.*$"> + <xsl:analyze-string select="$minimum" regex="^P([^T]*[^T0-9])?([0-9]+)M.*$"> <xsl:matching-substring> - <xsl:value-of select="regex-group(3)"/> + <xsl:value-of select="regex-group(2)"/> </xsl:matching-substring> </xsl:analyze-string> </xsl:when> <xsl:otherwise> - <xsl:value-of select="0"/> + <xsl:value-of select="'0'"/> </xsl:otherwise> </xsl:choose> </xsl:attribute> <xsl:attribute name="maximum"> <xsl:choose> <xsl:when test="$maximum != ''"> - <xsl:analyze-string select="$maximum" regex="^P[^T]*^[T0-9]([0-9]+)M.*$"> + <xsl:analyze-string select="$maximum" regex="^P([^T]*[^T0-9])?([0-9]+)M.*$"> <xsl:matching-substring> - <xsl:value-of select="regex-group(3)"/> + <xsl:value-of select="regex-group(2)"/> </xsl:matching-substring> </xsl:analyze-string> </xsl:when> <xsl:otherwise> <xsl:analyze-string select="$format" regex="^PN+M.*$"> <xsl:matching-substring> - <xsl:value-of select="99"/> + <xsl:value-of select="'99'"/> </xsl:matching-substring> <xsl:non-matching-substring> - <xsl:value-of select="11"/> + <xsl:value-of select="'11'"/> </xsl:non-matching-substring> </xsl:analyze-string> </xsl:otherwise> @@ -2541,12 +2541,12 @@ <xsl:when test="$minimum != ''"> <xsl:analyze-string select="$minimum" regex="^P.*([0-9]+)D.*$"> <xsl:matching-substring> - <xsl:value-of select="regex-group(2)"/> + <xsl:value-of select="regex-group(1)"/> </xsl:matching-substring> </xsl:analyze-string> </xsl:when> <xsl:otherwise> - <xsl:value-of select="0"/> + <xsl:value-of select="'0'"/> </xsl:otherwise> </xsl:choose> </xsl:attribute> @@ -2555,17 +2555,17 @@ <xsl:when test="$maximum != ''"> <xsl:analyze-string select="$maximum" regex="^P.*([0-9]+)D.*$"> <xsl:matching-substring> - <xsl:value-of select="regex-group(2)"/> + <xsl:value-of select="regex-group(1)"/> </xsl:matching-substring> </xsl:analyze-string> </xsl:when> <xsl:otherwise> <xsl:analyze-string select="$format" regex="^PN+D.*$"> <xsl:matching-substring> - <xsl:value-of select="99"/> + <xsl:value-of select="'99'"/> </xsl:matching-substring> <xsl:non-matching-substring> - <xsl:value-of select="30"/> + <xsl:value-of select="'30'"/> </xsl:non-matching-substring> </xsl:analyze-string> </xsl:otherwise> @@ -2580,12 +2580,12 @@ <xsl:when test="$minimum != ''"> <xsl:analyze-string select="$minimum" regex="^P.*T([0-9]+)H.*$"> <xsl:matching-substring> - <xsl:value-of select="regex-group(2)"/> + <xsl:value-of select="regex-group(1)"/> </xsl:matching-substring> </xsl:analyze-string> </xsl:when> <xsl:otherwise> - <xsl:value-of select="0"/> + <xsl:value-of select="'0'"/> </xsl:otherwise> </xsl:choose> </xsl:attribute> @@ -2594,17 +2594,17 @@ <xsl:when test="$maximum != ''"> <xsl:analyze-string select="$maximum" regex="^P.*T([0-9]+)H.*$"> <xsl:matching-substring> - <xsl:value-of select="regex-group(2)"/> + <xsl:value-of select="regex-group(1)"/> </xsl:matching-substring> </xsl:analyze-string> </xsl:when> <xsl:otherwise> <xsl:analyze-string select="$format" regex="^PTN+H.*$"> <xsl:matching-substring> - <xsl:value-of select="99"/> + <xsl:value-of select="'99'"/> </xsl:matching-substring> <xsl:non-matching-substring> - <xsl:value-of select="23"/> + <xsl:value-of select="'23'"/> </xsl:non-matching-substring> </xsl:analyze-string> </xsl:otherwise> @@ -2617,33 +2617,33 @@ <xsl:attribute name="minimum"> <xsl:choose> <xsl:when test="$minimum != ''"> - <xsl:analyze-string select="$minimum" regex="^P.*T(.*^[0-9])*([0-9]+)M.*$"> + <xsl:analyze-string select="$minimum" regex="^P.*T(.*[^0-9])?([0-9]+)M.*$"> <xsl:matching-substring> - <xsl:value-of select="regex-group(4)"/> + <xsl:value-of select="regex-group(2)"/> </xsl:matching-substring> </xsl:analyze-string> </xsl:when> <xsl:otherwise> - <xsl:value-of select="0"/> + <xsl:value-of select="'0'"/> </xsl:otherwise> </xsl:choose> </xsl:attribute> <xsl:attribute name="maximum"> <xsl:choose> <xsl:when test="$maximum != ''"> - <xsl:analyze-string select="$maximum" regex="^P.*T(.*^[0-9])*([0-9]+)M.*$"> + <xsl:analyze-string select="$maximum" regex="^P.*T(.*[^0-9])?([0-9]+)M.*$"> <xsl:matching-substring> - <xsl:value-of select="regex-group(4)"/> + <xsl:value-of select="regex-group(2)"/> </xsl:matching-substring> </xsl:analyze-string> </xsl:when> <xsl:otherwise> <xsl:analyze-string select="$format" regex="^PTN+M.*$"> <xsl:matching-substring> - <xsl:value-of select="99"/> + <xsl:value-of select="'99'"/> </xsl:matching-substring> <xsl:non-matching-substring> - <xsl:value-of select="59"/> + <xsl:value-of select="'59'"/> </xsl:non-matching-substring> </xsl:analyze-string> </xsl:otherwise> @@ -2656,33 +2656,33 @@ <xsl:attribute name="minimum"> <xsl:choose> <xsl:when test="$minimum != ''"> - <xsl:analyze-string select="$minimum" regex="^P.*T(.*^[0-9])*([0-9]+)S.*$"> + <xsl:analyze-string select="$minimum" regex="^P.*T(.*[^0-9])?([0-9]+)S$"> <xsl:matching-substring> - <xsl:value-of select="regex-group(4)"/> + <xsl:value-of select="regex-group(2)"/> </xsl:matching-substring> </xsl:analyze-string> </xsl:when> <xsl:otherwise> - <xsl:value-of select="0"/> + <xsl:value-of select="'0'"/> </xsl:otherwise> </xsl:choose> </xsl:attribute> <xsl:attribute name="maximum"> <xsl:choose> <xsl:when test="$maximum != ''"> - <xsl:analyze-string select="$maximum" regex="^P.*T(.*^[0-9])*([0-9]+)S.*$"> + <xsl:analyze-string select="$maximum" regex="^P.*T(.*[^0-9])?([0-9]+)S$"> <xsl:matching-substring> - <xsl:value-of select="regex-group(4)"/> + <xsl:value-of select="regex-group(2)"/> </xsl:matching-substring> </xsl:analyze-string> </xsl:when> <xsl:otherwise> <xsl:analyze-string select="$format" regex="^PTN+S$"> <xsl:matching-substring> - <xsl:value-of select="99"/> + <xsl:value-of select="'99'"/> </xsl:matching-substring> <xsl:non-matching-substring> - <xsl:value-of select="59"/> + <xsl:value-of select="'59'"/> </xsl:non-matching-substring> </xsl:analyze-string> </xsl:otherwise> From ff0987b380b9399874352bf911399d5db51b77f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bulot=20Fran=C3=A7ois?= <U7ZR1J@ad.insee.intra> Date: Tue, 23 Jul 2019 17:18:37 +0200 Subject: [PATCH 060/439] bug with fixedcell definition update --- src/main/resources/xslt/inputs/ddi/source-fixed.xsl | 2 +- src/main/resources/xslt/outputs/fr/models.xsl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/xslt/inputs/ddi/source-fixed.xsl b/src/main/resources/xslt/inputs/ddi/source-fixed.xsl index e332cc9a7..4cf2c838c 100644 --- a/src/main/resources/xslt/inputs/ddi/source-fixed.xsl +++ b/src/main/resources/xslt/inputs/ddi/source-fixed.xsl @@ -808,7 +808,7 @@ <xd:p>Function that returns the list of the variables of the value of a fixed cell.</xd:p> </xd:desc> </xd:doc> - <xsl:template match="d:FixedCellValue" mode="enoddi:get-cell-value-variables"> + <xsl:template match="d:NoDataByDefinition" mode="enoddi:get-cell-value-variables"> <xsl:param name="language" tunnel="yes"/> <xsl:variable name="variable-list" as="xs:string *"> <xsl:call-template name="enoddi:variables-from-label"> diff --git a/src/main/resources/xslt/outputs/fr/models.xsl b/src/main/resources/xslt/outputs/fr/models.xsl index 641060c5c..557bbc78b 100644 --- a/src/main/resources/xslt/outputs/fr/models.xsl +++ b/src/main/resources/xslt/outputs/fr/models.xsl @@ -409,7 +409,7 @@ <xsl:attribute name="calculate"> <xsl:call-template name="label-ref-condition"> <xsl:with-param name="source-context" select="$source-context"/> - <xsl:with-param name="label" select="$fixed-cell-calculate"/> + <xsl:with-param name="label" select="concat('''',replace($fixed-cell-calculate,'''',''''''),'''')"/> <xsl:with-param name="conditioning-variables" select="enofr:get-cell-value-variables($source-context)"/> <xsl:with-param name="instance-ancestor" select="$instance-ancestor"/> </xsl:call-template> From 631bec1b5042abc747844e7f68cc0b7f09d986b5 Mon Sep 17 00:00:00 2001 From: CHTAINET Badr <badr.chtainet@akka.eu> Date: Thu, 25 Jul 2019 10:25:26 +0200 Subject: [PATCH 061/439] 189D generate the value of clarification question --- .../xslt/inputs/pogues-xml/templates.fods | 46 +++++++++---------- .../resources/xslt/outputs/ddi/models.xsl | 21 +++++---- .../pogues-xml2ddi/drivers.fods | 8 ++-- .../xslt/util/pogues-xml/2suppressionGoto.xsl | 2 +- .../util/pogues-xml/goto-2-if-then-else.xsl | 2 +- 5 files changed, 42 insertions(+), 37 deletions(-) diff --git a/src/main/resources/xslt/inputs/pogues-xml/templates.fods b/src/main/resources/xslt/inputs/pogues-xml/templates.fods index fda693389..65429a1ce 100644 --- a/src/main/resources/xslt/inputs/pogues-xml/templates.fods +++ b/src/main/resources/xslt/inputs/pogues-xml/templates.fods @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.spreadsheet"> - <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>P11DT13H57M12S</meta:editing-duration><meta:editing-cycles>464</meta:editing-cycles><meta:generator>LibreOffice/6.1.5.2$Windows_X86_64 LibreOffice_project/90f8dcf33c87b3705e78202e3df5142b201bd805</meta:generator><dc:date>2019-07-22T15:17:49.937000000</dc:date><meta:document-statistic meta:table-count="1" meta:cell-count="350" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> + <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>P11DT15H8M55S</meta:editing-duration><meta:editing-cycles>479</meta:editing-cycles><meta:generator>LibreOffice/6.1.5.2$Windows_X86_64 LibreOffice_project/90f8dcf33c87b3705e78202e3df5142b201bd805</meta:generator><dc:date>2019-07-24T15:23:04.997000000</dc:date><meta:document-statistic meta:table-count="1" meta:cell-count="351" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> <office:settings> <config:config-item-set config:name="ooo:view-settings"> <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item> @@ -13,8 +13,8 @@ <config:config-item config:name="ViewId" config:type="string">view1</config:config-item> <config:config-item-map-named config:name="Tables"> <config:config-item-map-entry config:name="Sheet1"> - <config:config-item config:name="CursorPositionX" config:type="int">0</config:config-item> - <config:config-item config:name="CursorPositionY" config:type="int">92</config:config-item> + <config:config-item config:name="CursorPositionX" config:type="int">1</config:config-item> + <config:config-item config:name="CursorPositionY" config:type="int">14</config:config-item> <config:config-item config:name="HorizontalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="VerticalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="HorizontalSplitPosition" config:type="int">0</config:config-item> @@ -23,7 +23,7 @@ <config:config-item config:name="PositionLeft" config:type="int">0</config:config-item> <config:config-item config:name="PositionRight" config:type="int">0</config:config-item> <config:config-item config:name="PositionTop" config:type="int">0</config:config-item> - <config:config-item config:name="PositionBottom" config:type="int">72</config:config-item> + <config:config-item config:name="PositionBottom" config:type="int">0</config:config-item> <config:config-item config:name="ZoomType" config:type="short">0</config:config-item> <config:config-item config:name="ZoomValue" config:type="int">100</config:config-item> <config:config-item config:name="PageViewZoomValue" config:type="int">60</config:config-item> @@ -545,10 +545,6 @@ <number:text-style style:name="N100"> <number:text-content/> </number:text-style> - <style:style style:name="ce1" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="N100"/> - <style:style style:name="ce2" style:family="table-cell" style:parent-style-name="Default"> - <style:text-properties style:font-name="Arial" fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/> - </style:style> <style:style style:name="ce5" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="N100"/> <style:style style:name="ce6" style:family="table-cell" style:parent-style-name="Default"> <style:text-properties style:font-name="Arial" fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/> @@ -602,7 +598,7 @@ <text:p><text:sheet-name>???</text:sheet-name><text:s/>(<text:title>???</text:title>)</text:p> </style:region-left> <style:region-right> - <text:p><text:date style:data-style-name="N2" text:date-value="2019-07-23">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="15:39:26.133000000">00:00:00</text:time></text:p> + <text:p><text:date style:data-style-name="N2" text:date-value="2019-07-24">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="14:48:46.282000000">00:00:00</text:time></text:p> </style:region-right> </style:header> <style:header-left style:display="false"/> @@ -980,18 +976,6 @@ </table:table-cell> <table:table-cell table:number-columns-repeated="1021"/> </table:table-row> - <table:table-row table:style-name="ro2"> - <table:table-cell table:style-name="Default" office:value-type="string" calcext:value-type="string"> - <text:p>*[ancestor-or-self::pogues:ClarificationQuestion]</text:p> - </table:table-cell> - <table:table-cell table:style-name="Default" office:value-type="string" calcext:value-type="string"> - <text:p>enopogues:get-code-list-id</text:p> - </table:table-cell> - <table:table-cell table:style-name="Default" office:value-type="string" calcext:value-type="string"> - <text:p>enopogues:get-id(preceding::pogues:CodeListReference)</text:p> - </table:table-cell> - <table:table-cell table:number-columns-repeated="1021"/> - </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>*</text:p> @@ -1085,6 +1069,22 @@ </table:table-cell> <table:table-cell table:number-columns-repeated="1019"/> </table:table-row> + <table:table-row table:style-name="ro2"> + <table:table-cell table:style-name="Default" office:value-type="string" calcext:value-type="string"> + <text:p>*[pogues:FlowControl[@flowControlType="CLARIFICATION"]]</text:p> + </table:table-cell> + <table:table-cell table:style-name="Default" office:value-type="string" calcext:value-type="string"> + <text:p>enopogues:get-expression</text:p> + </table:table-cell> + <table:table-cell table:style-name="Default" office:value-type="string" calcext:value-type="string"> + <text:p>pogues:FlowControl/pogues:Expression</text:p> + </table:table-cell> + <table:table-cell/> + <table:table-cell table:style-name="Default" office:value-type="string" calcext:value-type="string"> + <text:p>Expression is the default element for expressions in Pogues for clarification question</text:p> + </table:table-cell> + <table:table-cell table:number-columns-repeated="1019"/> + </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>*</text:p> @@ -1232,8 +1232,8 @@ <table:table-cell table:number-columns-repeated="1019"/> </table:table-row> <table:table-row table:style-name="ro2"> - <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>pogues:FlowControl</text:p> + <table:table-cell table:style-name="Default" office:value-type="string" calcext:value-type="string"> + <text:p>pogues:FlowControl[not(@flowControlType)]</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>enopogues:get-if-true</text:p> diff --git a/src/main/resources/xslt/outputs/ddi/models.xsl b/src/main/resources/xslt/outputs/ddi/models.xsl index 19f6e4390..b816b224a 100644 --- a/src/main/resources/xslt/outputs/ddi/models.xsl +++ b/src/main/resources/xslt/outputs/ddi/models.xsl @@ -1058,7 +1058,7 @@ <xsl:param name="agency" as="xs:string" tunnel="yes"/> </xsl:template> - <xsl:template match="driver-Binding//Clarification" mode="model" priority="1"> + <xsl:template match="driver-Binding//Clarification" mode="model" priority="2"> <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="agency" as="xs:string" tunnel="yes"/> @@ -1113,7 +1113,7 @@ </d:CodeDomain> </xsl:template> - <!-- Question with a complementary sub-response for clarrification which are linked to each other --> + <!-- Question with a complementary sub-response for clarification which are linked to each other --> <xsl:template match="driver-SMRD//ResponseDomain[not(ancestor::Clarification)]" mode="model" priority="1"> <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="agency" as="xs:string" tunnel="yes"/> @@ -1128,12 +1128,14 @@ <xsl:template match="driver-SMRD//Clarification" mode="model" priority="1"> <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="agency" as="xs:string" tunnel="yes"/> + <xsl:param name="idList" as="xs:string" tunnel="yes"/> + <xsl:param name="clarificationVal" as="xs:string" tunnel="yes"/> <d:ResponseDomainInMixed> <d:TextDomain> <r:Label> - <r:Content xml:lang="{enoddi32:get-lang($source-context)}"> + <r:Content xml:lang="{enoddi33:get-lang($source-context)}"> <xhtml:p> - <xhtml:b><xsl:value-of select="enoddi32:get-label($source-context)"/></xhtml:b> + <xhtml:b><xsl:value-of select="enoddi33:get-label($source-context)"/></xhtml:b> </xhtml:p> </r:Content> </r:Label> @@ -1144,12 +1146,12 @@ </d:TextDomain> <d:AttachmentLocation> <d:DomainSpecificValue attachmentDomain="1"> - <r:Value></r:Value> + <r:Value><xsl:value-of select="$clarificationVal"/></r:Value> </d:DomainSpecificValue> <r:CodeReference> <r:Agency><xsl:value-of select="$agency"/></r:Agency> - <r:ID><xsl:value-of select="enoddi32:get-code-list-id($source-context)"/>-</r:ID> - <r:Version><xsl:value-of select="enoddi32:get-version($source-context)"/></r:Version> + <r:ID><xsl:value-of select="$idList"/>-<xsl:value-of select="$clarificationVal"/></r:ID> + <r:Version><xsl:value-of select="enoddi33:get-version($source-context)"/></r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </d:AttachmentLocation> @@ -1189,9 +1191,12 @@ <!-- This template is only matched when call just after driver-ResponseDomain (why it got 3 priority), to check if SMR is needed. --> <xsl:template match="driver-ResponseDomain/QuestionOtherDetails" mode="model" priority="3"> <xsl:param name="source-context" as="item()" tunnel="yes"/> + <xsl:variable name="clarificationExp" select="substring-after(enoddi33:get-expression($source-context), '=')"/> <d:StructuredMixedResponseDomain> <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> <xsl:with-param name="driver" select="eno:append-empty-element('driver-SMRD', .)" tunnel="yes"/> + <xsl:with-param name="idList" select="enoddi33:get-code-list-id($source-context)" tunnel="yes"/> + <xsl:with-param name="clarificationVal" select='normalize-space(replace($clarificationExp,"'",""))' tunnel="yes"/> </xsl:apply-templates> </d:StructuredMixedResponseDomain> </xsl:template> @@ -1301,7 +1306,7 @@ <xsl:param name="agency" as="xs:string" tunnel="yes"/> </xsl:template> - <xsl:template match="driver-OutParameter//Clarification" mode="model" priority="1"> + <xsl:template match="driver-OutParameter//Clarification" mode="model" priority="2"> <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="agency" as="xs:string" tunnel="yes"/> <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> diff --git a/src/main/resources/xslt/transformations/pogues-xml2ddi/drivers.fods b/src/main/resources/xslt/transformations/pogues-xml2ddi/drivers.fods index 91e06151f..092020147 100644 --- a/src/main/resources/xslt/transformations/pogues-xml2ddi/drivers.fods +++ b/src/main/resources/xslt/transformations/pogues-xml2ddi/drivers.fods @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.spreadsheet"> - <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>P6DT3H23M44S</meta:editing-duration><meta:editing-cycles>192</meta:editing-cycles><meta:generator>LibreOffice/6.1.5.2$Windows_X86_64 LibreOffice_project/90f8dcf33c87b3705e78202e3df5142b201bd805</meta:generator><dc:date>2019-07-23T15:37:17.627000000</dc:date><meta:document-statistic meta:table-count="1" meta:cell-count="104" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> + <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>P6DT3H24M1S</meta:editing-duration><meta:editing-cycles>194</meta:editing-cycles><meta:generator>LibreOffice/6.1.5.2$Windows_X86_64 LibreOffice_project/90f8dcf33c87b3705e78202e3df5142b201bd805</meta:generator><dc:date>2019-07-23T16:18:16.111000000</dc:date><meta:document-statistic meta:table-count="1" meta:cell-count="104" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> <office:settings> <config:config-item-set config:name="ooo:view-settings"> <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item> @@ -14,7 +14,7 @@ <config:config-item-map-named config:name="Tables"> <config:config-item-map-entry config:name="Sheet1"> <config:config-item config:name="CursorPositionX" config:type="int">0</config:config-item> - <config:config-item config:name="CursorPositionY" config:type="int">34</config:config-item> + <config:config-item config:name="CursorPositionY" config:type="int">24</config:config-item> <config:config-item config:name="HorizontalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="VerticalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="HorizontalSplitPosition" config:type="int">0</config:config-item> @@ -302,7 +302,7 @@ <text:p><text:sheet-name>???</text:sheet-name><text:s/>(<text:title>???</text:title>)</text:p> </style:region-left> <style:region-right> - <text:p><text:date style:data-style-name="N2" text:date-value="2019-07-23">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="15:33:56.065000000">00:00:00</text:time></text:p> + <text:p><text:date style:data-style-name="N2" text:date-value="2019-07-23">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="16:17:59.653000000">00:00:00</text:time></text:p> </style:region-right> </style:header> <style:header-left style:display="false"/> @@ -503,7 +503,7 @@ </table:table-row> <table:table-row table:style-name="ro1"> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>pogues:FlowControl</text:p> + <text:p>pogues:FlowControl[not(@flowControlType)]</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>FlowControl</text:p> diff --git a/src/main/resources/xslt/util/pogues-xml/2suppressionGoto.xsl b/src/main/resources/xslt/util/pogues-xml/2suppressionGoto.xsl index 73eabd091..135caeb8c 100644 --- a/src/main/resources/xslt/util/pogues-xml/2suppressionGoto.xsl +++ b/src/main/resources/xslt/util/pogues-xml/2suppressionGoto.xsl @@ -53,7 +53,7 @@ <!-- list of the gotos--> <xsl:variable name="list_goto"> - <xsl:for-each select="//pogues:FlowControl"> + <xsl:for-each select="//pogues:FlowControl[not(@flowControlType)]"> <poguesGoto:gotoValue> <poguesGoto:Expression> <xsl:value-of select="./pogues:Expression"/> diff --git a/src/main/resources/xslt/util/pogues-xml/goto-2-if-then-else.xsl b/src/main/resources/xslt/util/pogues-xml/goto-2-if-then-else.xsl index f889cdbef..860648ce5 100644 --- a/src/main/resources/xslt/util/pogues-xml/goto-2-if-then-else.xsl +++ b/src/main/resources/xslt/util/pogues-xml/goto-2-if-then-else.xsl @@ -105,7 +105,7 @@ </xd:doc> <xsl:variable name="list_goto" as="node()"> <poguesGoto:GotoList> - <xsl:for-each select="//pogues:FlowControl"> + <xsl:for-each select="//pogues:FlowControl[not(@flowControlType)]"> <xsl:variable name="official-To" select="pogues:IfTrue"/> <poguesGoto:gotoValue start="after" flowid="{@id}"> From f16a0b3fce83f1ddfb7116c3bad479b1537c5361 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bulot=20Fran=C3=A7ois?= <U7ZR1J@ad.insee.intra> Date: Thu, 25 Jul 2019 15:44:28 +0200 Subject: [PATCH 062/439] Update models.xsl - required : true() ; not true - calculate unit minimum and maximum for dates and duration - update fixedCellValue content --- src/main/resources/xslt/outputs/fr/models.xsl | 323 +++++++++++------- 1 file changed, 197 insertions(+), 126 deletions(-) diff --git a/src/main/resources/xslt/outputs/fr/models.xsl b/src/main/resources/xslt/outputs/fr/models.xsl index 557bbc78b..87c953683 100644 --- a/src/main/resources/xslt/outputs/fr/models.xsl +++ b/src/main/resources/xslt/outputs/fr/models.xsl @@ -355,7 +355,6 @@ <xsl:variable name="required" select="enofr:is-required($source-context)" as="xs:boolean"/> <xsl:variable name="relevant" select="enofr:get-relevant($source-context)"/> <xsl:variable name="variable-calculate" select="enofr:get-variable-calculation($source-context)"/> - <xsl:variable name="fixed-cell-calculate" select="enofr:get-cell-value($source-context)"/> <xsl:variable name="type" select="enofr:get-type($source-context)"/> <xsl:variable name="readonly" select="enofr:get-readonly($source-context)"/> <xsl:variable name="constraint" select="enofr:get-constraint($source-context)"/> @@ -363,7 +362,7 @@ <xf:bind id="{$name}-bind" name="{$name}" ref="{$name}"> <xsl:if test="$required"> - <xsl:attribute name="required" select="$required"/> + <xsl:attribute name="required" select="'true()'"/> </xsl:if> <xsl:if test="$relevant != ''"> <xsl:attribute name="relevant"> @@ -405,16 +404,6 @@ </xsl:call-template> </xsl:attribute> </xsl:if> - <xsl:if test="$fixed-cell-calculate != ''"> - <xsl:attribute name="calculate"> - <xsl:call-template name="label-ref-condition"> - <xsl:with-param name="source-context" select="$source-context"/> - <xsl:with-param name="label" select="concat('''',replace($fixed-cell-calculate,'''',''''''),'''')"/> - <xsl:with-param name="conditioning-variables" select="enofr:get-cell-value-variables($source-context)"/> - <xsl:with-param name="instance-ancestor" select="$instance-ancestor"/> - </xsl:call-template> - </xsl:attribute> - </xsl:if> <xsl:if test="not($readonly = ('false()', ''))"> <xsl:attribute name="readonly"> <xsl:value-of select="'not('"/> @@ -518,7 +507,7 @@ <xf:bind id="{$name}-bind" name="{$name}" ref="{$name}"> <xsl:if test="$required"> - <xsl:attribute name="required" select="$required"/> + <xsl:attribute name="required" select="'true()'"/> </xsl:if> <xsl:if test="$relevant != ''"> <xsl:attribute name="relevant"> @@ -603,10 +592,10 @@ <xsl:otherwise>xs:integer</xsl:otherwise> </xsl:choose> </xsl:variable> - + <xf:bind id="{$name}-bind" name="{$name}" ref="{$name}"> <xsl:if test="$required"> - <xsl:attribute name="required" select="$required"/> + <xsl:attribute name="required" select="'true()'"/> </xsl:if> <xsl:if test="$relevant != ''"> <xsl:attribute name="relevant"> @@ -781,7 +770,7 @@ <xsl:with-param name="driver" select="." tunnel="yes"/> </xsl:apply-templates> </xsl:template> - + <xd:doc> <xd:desc>Recursive named template which calculated the regex of a positive number</xd:desc> <xd:desc>5 cases : @@ -1099,12 +1088,12 @@ <xsl:value-of select="' and '"/> </xsl:when> <xsl:otherwise> - <xsl:value-of select="' or '"/> + <xsl:value-of select="' or '"/> </xsl:otherwise> </xsl:choose> </xsl:if> <xsl:value-of select="concat('../',@variable,' = '''' ')"/> - </xsl:for-each> + </xsl:for-each> </xsl:otherwise> </xsl:choose> <xsl:value-of select="') then '''' else (concat( '"/> @@ -1163,7 +1152,7 @@ <xsl:attribute name="type" select="'xf:number'"/> </xsl:if> <xsl:if test="$required"> - <xsl:attribute name="required" select="$required"/> + <xsl:attribute name="required" select="'true()'"/> </xsl:if> <xsl:if test="$relevant != ''"> <xsl:attribute name="relevant"> @@ -1318,6 +1307,48 @@ </xsl:apply-templates> </xsl:template> + <xd:doc> + <xd:desc> + <xd:p>Template for Resource for the driver FixedCell.</xd:p> + </xd:desc> + </xd:doc> + <xsl:template match="Resource//FixedCell" mode="model"> + <xsl:param name="source-context" as="item()" tunnel="yes"/> + <xsl:param name="language" tunnel="yes"/> + + <xsl:variable name="label" select="eno:serialize(enofr:get-label($source-context, $language))"/> + <xsl:variable name="value" select="eno:serialize(enofr:get-cell-value($source-context))"/> + + <xsl:element name="{enofr:get-name($source-context)}"> + <label> + <xsl:choose> + <xsl:when test="$label != '' and $value !=''"> + <xsl:choose> + <xsl:when test="contains($label,'xhtml:p') and contains($value,'xhtml:p')"> + <xsl:value-of select="concat($label,$value)"/> + </xsl:when> + <xsl:when test="contains($value,'xhtml:p')"> + <xsl:value-of select="concat('<xhtml:p>',$label,'</xhtml:p>',$value)"/> + </xsl:when> + <xsl:when test="contains($label,'xhtml:p')"> + <xsl:value-of select="concat($label,'<xhtml:p>',$value,'</xhtml:p>')"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="concat($label,' ',$value)"/> + </xsl:otherwise> + </xsl:choose> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="concat($label,$value)"/> + </xsl:otherwise> + </xsl:choose> + </label> + </xsl:element> + <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> + <xsl:with-param name="driver" select="." tunnel="yes"/> + </xsl:apply-templates> + </xsl:template> + <xd:doc> <xd:desc> <xd:p>Template for ResourceItem for xf-item driver.</xd:p> @@ -1457,7 +1488,7 @@ <xsl:value-of select="$labels-resource/Languages/Language[@xml:lang=$language]/DateTime/Months/*[position()=$current-value]/text()"/> </xsl:when> <xsl:otherwise> - <xsl:value-of select="."/> + <xsl:value-of select="."/> </xsl:otherwise> </xsl:choose> </label> @@ -2045,7 +2076,7 @@ <xd:desc>No other - give details out of cells</xd:desc> </xd:doc> <xsl:template match="Body//Clarification[(ancestor::Table or ancestor::TableLoop) and not(ancestor::Cell)]" mode="model" priority="2"/> - + <xd:doc> <xd:desc> <xd:p>The Cell driver produces something only in the Body part but its children can produce something.</xd:p> @@ -2072,6 +2103,10 @@ <xsl:variable name="name" select="enofr:get-name($source-context)"/> <xsl:variable name="label" select="enofr:get-label($source-context, $languages)"/> <xsl:variable name="css-class" select="enofr:get-css-class($source-context)"/> + <xsl:variable name="conditioning-variables" as="xs:string*"> + <xsl:sequence select="enofr:get-label-conditioning-variables($source-context, $languages[1])"/> + <xsl:sequence select="enofr:get-cell-value-variables($source-context)"/> + </xsl:variable> <xhtml:td colspan="{enofr:get-colspan($source-context)}" rowspan="{enofr:get-rowspan($source-context)}"> <xf:output id="{$name}-control" bind="{$name}-bind"> @@ -2083,7 +2118,7 @@ <xsl:call-template name="label-ref-condition"> <xsl:with-param name="source-context" select="$source-context"/> <xsl:with-param name="label" select="concat('$form-resources/',$name,'/label')"/> - <xsl:with-param name="conditioning-variables" select="enofr:get-label-conditioning-variables($source-context, $languages[1])"/> + <xsl:with-param name="conditioning-variables" select="$conditioning-variables"/> <xsl:with-param name="instance-ancestor" select="$instance-ancestor"/> </xsl:call-template> </xsl:attribute> @@ -2186,7 +2221,7 @@ <xsl:otherwise> <xsl:for-each select="$layout-list//format"> <xsl:copy-of select="."/> - </xsl:for-each> + </xsl:for-each> </xsl:otherwise> </xsl:choose> </formats> @@ -2201,7 +2236,7 @@ </xsl:otherwise> </xsl:choose> </xsl:variable> - + <xsl:for-each select="$ordered-layout-list//format"> <xsl:element name="{$input-format}"> <xsl:attribute name="id" select="concat(@variable, '-control')"/> @@ -2228,7 +2263,7 @@ </xsl:attribute> <xsl:attribute name="xxf:order" select="'label control hint help alert'"/> <xsl:if test="$current-driver = 'DurationDomain'"> - <xsl:attribute name="xxf:maxlength" select="'2'"/> + <xsl:attribute name="xxf:maxlength" select="'2'"/> </xsl:if> <xsl:if test="position() = 1 and ($label != '' or $question-label!= '')"> <xsl:variable name="conditioning-variables" as="xs:string*"> @@ -2286,7 +2321,7 @@ <xf:setvalue ref="." value="''"/> </xf:action> </xsl:for-each>--> - + <xsl:for-each select="enofr:get-constraint-dependencies($source-context)"> <xsl:element name="xf:dispatch"> <xsl:attribute name="ev:event">DOMFocusOut xforms-value-changed</xsl:attribute> @@ -2310,13 +2345,13 @@ <xsl:attribute name="class" select="'double-duration-suffix'"/> <xsl:choose> <xsl:when test="$current-driver = 'DurationDomain'"> - <xsl:value-of select="$labels-resource/Languages/Language[@xml:lang=$languages[1]]/Duration/*[name()=current()/@unit]/text()"/> + <xsl:value-of select="$labels-resource/Languages/Language[@xml:lang=$languages[1]]/Duration/*[name()=current()/@unit]/text()"/> </xsl:when> <xsl:otherwise> <xsl:value-of select="$labels-resource/Languages/Language[@xml:lang=$languages[1]]/DateTime/*[name()=current()/@unit]/text()"/> </xsl:otherwise> </xsl:choose> - </xsl:element> + </xsl:element> </xsl:if> </xsl:for-each> </xsl:template> @@ -2472,6 +2507,9 @@ <xsl:matching-substring> <xsl:value-of select="regex-group(1)"/> </xsl:matching-substring> + <xsl:non-matching-substring> + <xsl:value-of select="'0'"/> + </xsl:non-matching-substring> </xsl:analyze-string> </xsl:when> <xsl:otherwise> @@ -2486,6 +2524,9 @@ <xsl:matching-substring> <xsl:value-of select="regex-group(1)"/> </xsl:matching-substring> + <xsl:non-matching-substring> + <xsl:value-of select="'99'"/> + </xsl:non-matching-substring> </xsl:analyze-string> </xsl:when> <xsl:otherwise> @@ -2500,10 +2541,13 @@ <xsl:attribute name="minimum"> <xsl:choose> <xsl:when test="$minimum != ''"> - <xsl:analyze-string select="$minimum" regex="^P([^T]*[^T0-9])?([0-9]+)M.*$"> + <xsl:analyze-string select="$minimum" regex="^P([0-9]+)M.*$"> <xsl:matching-substring> - <xsl:value-of select="regex-group(2)"/> + <xsl:value-of select="regex-group(1)"/> </xsl:matching-substring> + <xsl:non-matching-substring> + <xsl:value-of select="'0'"/> + </xsl:non-matching-substring> </xsl:analyze-string> </xsl:when> <xsl:otherwise> @@ -2512,25 +2556,28 @@ </xsl:choose> </xsl:attribute> <xsl:attribute name="maximum"> - <xsl:choose> - <xsl:when test="$maximum != ''"> - <xsl:analyze-string select="$maximum" regex="^P([^T]*[^T0-9])?([0-9]+)M.*$"> - <xsl:matching-substring> - <xsl:value-of select="regex-group(2)"/> - </xsl:matching-substring> - </xsl:analyze-string> - </xsl:when> - <xsl:otherwise> - <xsl:analyze-string select="$format" regex="^PN+M.*$"> - <xsl:matching-substring> + <xsl:analyze-string select="$format" regex="^PN+M.*$"> + <xsl:matching-substring> + <xsl:choose> + <xsl:when test="$maximum != ''"> + <xsl:analyze-string select="$maximum" regex="^P([0-9]+)M.*$"> + <xsl:matching-substring> + <xsl:value-of select="regex-group(1)"/> + </xsl:matching-substring> + <xsl:non-matching-substring> + <xsl:message select="concat('format ',$format,' incompatible avec le maximum ',$maximum)"/> + </xsl:non-matching-substring> + </xsl:analyze-string> + </xsl:when> + <xsl:otherwise> <xsl:value-of select="'99'"/> - </xsl:matching-substring> - <xsl:non-matching-substring> - <xsl:value-of select="'11'"/> - </xsl:non-matching-substring> - </xsl:analyze-string> - </xsl:otherwise> - </xsl:choose> + </xsl:otherwise> + </xsl:choose> + </xsl:matching-substring> + <xsl:non-matching-substring> + <xsl:value-of select="'11'"/> + </xsl:non-matching-substring> + </xsl:analyze-string> </xsl:attribute> </format> </xsl:if> @@ -2539,10 +2586,13 @@ <xsl:attribute name="minimum"> <xsl:choose> <xsl:when test="$minimum != ''"> - <xsl:analyze-string select="$minimum" regex="^P.*([0-9]+)D.*$"> + <xsl:analyze-string select="$minimum" regex="^P([0-9]+)D.*$"> <xsl:matching-substring> <xsl:value-of select="regex-group(1)"/> </xsl:matching-substring> + <xsl:non-matching-substring> + <xsl:value-of select="'0'"/> + </xsl:non-matching-substring> </xsl:analyze-string> </xsl:when> <xsl:otherwise> @@ -2551,25 +2601,28 @@ </xsl:choose> </xsl:attribute> <xsl:attribute name="maximum"> - <xsl:choose> - <xsl:when test="$maximum != ''"> - <xsl:analyze-string select="$maximum" regex="^P.*([0-9]+)D.*$"> - <xsl:matching-substring> - <xsl:value-of select="regex-group(1)"/> - </xsl:matching-substring> - </xsl:analyze-string> - </xsl:when> - <xsl:otherwise> - <xsl:analyze-string select="$format" regex="^PN+D.*$"> - <xsl:matching-substring> + <xsl:analyze-string select="$format" regex="^PN+D.*$"> + <xsl:matching-substring> + <xsl:choose> + <xsl:when test="$maximum != ''"> + <xsl:analyze-string select="$maximum" regex="^P([0-9]+)D.*$"> + <xsl:matching-substring> + <xsl:value-of select="regex-group(1)"/> + </xsl:matching-substring> + <xsl:non-matching-substring> + <xsl:message select="concat('format ',$format,' incompatible avec le maximum ',$maximum)"/> + </xsl:non-matching-substring> + </xsl:analyze-string> + </xsl:when> + <xsl:otherwise> <xsl:value-of select="'99'"/> - </xsl:matching-substring> - <xsl:non-matching-substring> - <xsl:value-of select="'30'"/> - </xsl:non-matching-substring> - </xsl:analyze-string> - </xsl:otherwise> - </xsl:choose> + </xsl:otherwise> + </xsl:choose> + </xsl:matching-substring> + <xsl:non-matching-substring> + <xsl:value-of select="'30'"/> + </xsl:non-matching-substring> + </xsl:analyze-string> </xsl:attribute> </format> </xsl:if> @@ -2578,10 +2631,13 @@ <xsl:attribute name="minimum"> <xsl:choose> <xsl:when test="$minimum != ''"> - <xsl:analyze-string select="$minimum" regex="^P.*T([0-9]+)H.*$"> + <xsl:analyze-string select="$minimum" regex="^PT([0-9]+)H.*$"> <xsl:matching-substring> <xsl:value-of select="regex-group(1)"/> </xsl:matching-substring> + <xsl:non-matching-substring> + <xsl:value-of select="'0'"/> + </xsl:non-matching-substring> </xsl:analyze-string> </xsl:when> <xsl:otherwise> @@ -2590,25 +2646,28 @@ </xsl:choose> </xsl:attribute> <xsl:attribute name="maximum"> - <xsl:choose> - <xsl:when test="$maximum != ''"> - <xsl:analyze-string select="$maximum" regex="^P.*T([0-9]+)H.*$"> - <xsl:matching-substring> - <xsl:value-of select="regex-group(1)"/> - </xsl:matching-substring> - </xsl:analyze-string> - </xsl:when> - <xsl:otherwise> - <xsl:analyze-string select="$format" regex="^PTN+H.*$"> - <xsl:matching-substring> + <xsl:analyze-string select="$format" regex="^PTN+H.*$"> + <xsl:matching-substring> + <xsl:choose> + <xsl:when test="$maximum != ''"> + <xsl:analyze-string select="$maximum" regex="^PT([0-9]+)H.*$"> + <xsl:matching-substring> + <xsl:value-of select="regex-group(1)"/> + </xsl:matching-substring> + <xsl:non-matching-substring> + <xsl:message select="concat('format ',$format,' incompatible avec le maximum ',$maximum)"/> + </xsl:non-matching-substring> + </xsl:analyze-string> + </xsl:when> + <xsl:otherwise> <xsl:value-of select="'99'"/> - </xsl:matching-substring> - <xsl:non-matching-substring> - <xsl:value-of select="'23'"/> - </xsl:non-matching-substring> - </xsl:analyze-string> - </xsl:otherwise> - </xsl:choose> + </xsl:otherwise> + </xsl:choose> + </xsl:matching-substring> + <xsl:non-matching-substring> + <xsl:value-of select="'23'"/> + </xsl:non-matching-substring> + </xsl:analyze-string> </xsl:attribute> </format> </xsl:if> @@ -2617,10 +2676,13 @@ <xsl:attribute name="minimum"> <xsl:choose> <xsl:when test="$minimum != ''"> - <xsl:analyze-string select="$minimum" regex="^P.*T(.*[^0-9])?([0-9]+)M.*$"> + <xsl:analyze-string select="$minimum" regex="^PT([0-9]+)M.*$"> <xsl:matching-substring> - <xsl:value-of select="regex-group(2)"/> + <xsl:value-of select="regex-group(1)"/> </xsl:matching-substring> + <xsl:non-matching-substring> + <xsl:value-of select="'0'"/> + </xsl:non-matching-substring> </xsl:analyze-string> </xsl:when> <xsl:otherwise> @@ -2629,25 +2691,28 @@ </xsl:choose> </xsl:attribute> <xsl:attribute name="maximum"> - <xsl:choose> - <xsl:when test="$maximum != ''"> - <xsl:analyze-string select="$maximum" regex="^P.*T(.*[^0-9])?([0-9]+)M.*$"> - <xsl:matching-substring> - <xsl:value-of select="regex-group(2)"/> - </xsl:matching-substring> - </xsl:analyze-string> - </xsl:when> - <xsl:otherwise> - <xsl:analyze-string select="$format" regex="^PTN+M.*$"> - <xsl:matching-substring> + <xsl:analyze-string select="$format" regex="^PTN+M.*$"> + <xsl:matching-substring> + <xsl:choose> + <xsl:when test="$maximum != ''"> + <xsl:analyze-string select="$maximum" regex="^PT([0-9]+)M.*$"> + <xsl:matching-substring> + <xsl:value-of select="regex-group(1)"/> + </xsl:matching-substring> + <xsl:non-matching-substring> + <xsl:message select="concat('format ',$format,' incompatible avec le maximum ',$maximum)"/> + </xsl:non-matching-substring> + </xsl:analyze-string> + </xsl:when> + <xsl:otherwise> <xsl:value-of select="'99'"/> - </xsl:matching-substring> - <xsl:non-matching-substring> - <xsl:value-of select="'59'"/> - </xsl:non-matching-substring> - </xsl:analyze-string> - </xsl:otherwise> - </xsl:choose> + </xsl:otherwise> + </xsl:choose> + </xsl:matching-substring> + <xsl:non-matching-substring> + <xsl:value-of select="'59'"/> + </xsl:non-matching-substring> + </xsl:analyze-string> </xsl:attribute> </format> </xsl:if> @@ -2656,10 +2721,13 @@ <xsl:attribute name="minimum"> <xsl:choose> <xsl:when test="$minimum != ''"> - <xsl:analyze-string select="$minimum" regex="^P.*T(.*[^0-9])?([0-9]+)S$"> + <xsl:analyze-string select="$minimum" regex="^PT([0-9]+)S$"> <xsl:matching-substring> - <xsl:value-of select="regex-group(2)"/> + <xsl:value-of select="regex-group(1)"/> </xsl:matching-substring> + <xsl:non-matching-substring> + <xsl:value-of select="'0'"/> + </xsl:non-matching-substring> </xsl:analyze-string> </xsl:when> <xsl:otherwise> @@ -2668,25 +2736,28 @@ </xsl:choose> </xsl:attribute> <xsl:attribute name="maximum"> - <xsl:choose> - <xsl:when test="$maximum != ''"> - <xsl:analyze-string select="$maximum" regex="^P.*T(.*[^0-9])?([0-9]+)S$"> - <xsl:matching-substring> - <xsl:value-of select="regex-group(2)"/> - </xsl:matching-substring> - </xsl:analyze-string> - </xsl:when> - <xsl:otherwise> - <xsl:analyze-string select="$format" regex="^PTN+S$"> - <xsl:matching-substring> + <xsl:analyze-string select="$format" regex="^PTN+S$"> + <xsl:matching-substring> + <xsl:choose> + <xsl:when test="$maximum != ''"> + <xsl:analyze-string select="$maximum" regex="^PT([0-9]+)S$"> + <xsl:matching-substring> + <xsl:value-of select="regex-group(1)"/> + </xsl:matching-substring> + <xsl:non-matching-substring> + <xsl:message select="concat('format ',$format,' incompatible avec le maximum ',$maximum)"/> + </xsl:non-matching-substring> + </xsl:analyze-string> + </xsl:when> + <xsl:otherwise> <xsl:value-of select="'99'"/> - </xsl:matching-substring> - <xsl:non-matching-substring> - <xsl:value-of select="'59'"/> - </xsl:non-matching-substring> - </xsl:analyze-string> - </xsl:otherwise> - </xsl:choose> + </xsl:otherwise> + </xsl:choose> + </xsl:matching-substring> + <xsl:non-matching-substring> + <xsl:value-of select="'59'"/> + </xsl:non-matching-substring> + </xsl:analyze-string> </xsl:attribute> </format> </xsl:if> From c029b62a0dca07f3734a6857bcfdf7f18186511b Mon Sep 17 00:00:00 2001 From: CHTAINET Badr <Badr.CHTAINET@akka.eu> Date: Thu, 25 Jul 2019 18:27:43 +0200 Subject: [PATCH 063/439] 189D Fix file generation --- .../resources/xslt/outputs/ddi/models.xsl | 54 +++++++++++++------ 1 file changed, 38 insertions(+), 16 deletions(-) diff --git a/src/main/resources/xslt/outputs/ddi/models.xsl b/src/main/resources/xslt/outputs/ddi/models.xsl index b816b224a..5a46d4a8d 100644 --- a/src/main/resources/xslt/outputs/ddi/models.xsl +++ b/src/main/resources/xslt/outputs/ddi/models.xsl @@ -1131,19 +1131,11 @@ <xsl:param name="idList" as="xs:string" tunnel="yes"/> <xsl:param name="clarificationVal" as="xs:string" tunnel="yes"/> <d:ResponseDomainInMixed> - <d:TextDomain> - <r:Label> - <r:Content xml:lang="{enoddi33:get-lang($source-context)}"> - <xhtml:p> - <xhtml:b><xsl:value-of select="enoddi33:get-label($source-context)"/></xhtml:b> - </xhtml:p> - </r:Content> - </r:Label> - <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> - <xsl:with-param name="driver" select="eno:append-empty-element('driver-OutParameter', .)" tunnel="yes"/> - <xsl:with-param name="agency" select="$agency" as="xs:string" tunnel="yes"/> - </xsl:apply-templates> - </d:TextDomain> + <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> + <xsl:with-param name="driver" select="eno:append-empty-element('driver-ClarificationResponseDomain', .)" tunnel="yes"/> + <xsl:with-param name="agency" select="$agency" as="xs:string" tunnel="yes"/> + <xsl:with-param name="label" select="enoddi33:get-label($source-context)" as="xs:string" tunnel="yes"/> + </xsl:apply-templates> <d:AttachmentLocation> <d:DomainSpecificValue attachmentDomain="1"> <r:Value><xsl:value-of select="$clarificationVal"/></r:Value> @@ -1306,12 +1298,17 @@ <xsl:param name="agency" as="xs:string" tunnel="yes"/> </xsl:template> - <xsl:template match="driver-OutParameter//Clarification" mode="model" priority="2"> + <xsl:template match="driver-ClarificationResponseDomain//ResponseDomain" mode="model" priority="2"> <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="agency" as="xs:string" tunnel="yes"/> + <xsl:param name="label" as="xs:string" tunnel="yes"/> + <xsl:variable name="relatedVariable" select="enoddi33:get-related-variable($source-context)"/> <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> - <xsl:with-param name="driver" select="." tunnel="yes"/> - </xsl:apply-templates> + <xsl:with-param name="driver" select="eno:append-empty-element('driver-ClarificationTextDomain', .)" tunnel="yes"/> + <xsl:with-param name="agency" select="$agency" as="xs:string" tunnel="yes"/> + <xsl:with-param name="label" select="$label" as="xs:string" tunnel="yes"/> + <xsl:with-param name="nameClarification" select="enoddi33:get-name($relatedVariable)" as="xs:string" tunnel="yes"/> + </xsl:apply-templates> </xsl:template> <!--this part is disigned in this complicated way to maintain the order of the ddi 3.3 xsd schema--> @@ -1417,6 +1414,31 @@ </d:TextDomain> </xsl:template> + <xsl:template match="driver-ClarificationTextDomain//TextDomain" mode="model"> + <xsl:param name="source-context" as="item()" tunnel="yes"/> + <xsl:param name="agency" as="xs:string" tunnel="yes"/> + <xsl:param name="label" as="xs:string" tunnel="yes"/> + <xsl:param name="nameClarification" as="xs:string" tunnel="yes"/> + <d:TextDomain maxLength="{enoddi33:get-max-length($source-context)}"> + <r:Label> + <r:Content xml:lang="{enoddi33:get-lang($source-context)}"> + <xhtml:p> + <xhtml:b><xsl:value-of select="$label"/></xhtml:b> + </xhtml:p> + </r:Content> + </r:Label> + <r:OutParameter isArray="false"> + <r:Agency><xsl:value-of select="$agency"/></r:Agency> + <r:ID><xsl:value-of select="enoddi33:get-rdop-id($source-context)"/></r:ID> + <r:Version><xsl:value-of select="enoddi33:get-version($source-context)"/></r:Version> + <r:ParameterName> + <r:String xml:lang="{enoddi33:get-lang($source-context)}"><xsl:value-of select="$nameClarification"/></r:String> + </r:ParameterName> + <r:TextRepresentation maxLength="{enoddi33:get-max-length($source-context)}"/> + </r:OutParameter> + </d:TextDomain> + </xsl:template> + <xsl:template match="driver-VariableScheme//TextDomain" mode="model"> <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="agency" as="xs:string" tunnel="yes"/> From 6162e78dcdf04b311440c53ee560f28fbfa344f2 Mon Sep 17 00:00:00 2001 From: CHTAINET Badr <Badr.CHTAINET@akka.eu> Date: Fri, 26 Jul 2019 16:29:55 +0200 Subject: [PATCH 064/439] 189D Fix Out-param for clarification --- .../resources/xslt/outputs/ddi/models.xsl | 36 +++++++++++-------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/src/main/resources/xslt/outputs/ddi/models.xsl b/src/main/resources/xslt/outputs/ddi/models.xsl index 5a46d4a8d..093ac437a 100644 --- a/src/main/resources/xslt/outputs/ddi/models.xsl +++ b/src/main/resources/xslt/outputs/ddi/models.xsl @@ -1297,19 +1297,6 @@ <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="agency" as="xs:string" tunnel="yes"/> </xsl:template> - - <xsl:template match="driver-ClarificationResponseDomain//ResponseDomain" mode="model" priority="2"> - <xsl:param name="source-context" as="item()" tunnel="yes"/> - <xsl:param name="agency" as="xs:string" tunnel="yes"/> - <xsl:param name="label" as="xs:string" tunnel="yes"/> - <xsl:variable name="relatedVariable" select="enoddi33:get-related-variable($source-context)"/> - <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> - <xsl:with-param name="driver" select="eno:append-empty-element('driver-ClarificationTextDomain', .)" tunnel="yes"/> - <xsl:with-param name="agency" select="$agency" as="xs:string" tunnel="yes"/> - <xsl:with-param name="label" select="$label" as="xs:string" tunnel="yes"/> - <xsl:with-param name="nameClarification" select="enoddi33:get-name($relatedVariable)" as="xs:string" tunnel="yes"/> - </xsl:apply-templates> - </xsl:template> <!--this part is disigned in this complicated way to maintain the order of the ddi 3.3 xsd schema--> <xsl:template match="driver-OutParameter//ResponseDomain" mode="model" priority="2"> @@ -1328,7 +1315,28 @@ </xsl:element> </xsl:element> </xsl:template> - + + <xsl:template match="driver-OutParameter//Clarification" mode="model" priority="2"> + <xsl:param name="source-context" as="item()" tunnel="yes"/> + <xsl:param name="agency" as="xs:string" tunnel="yes"/> + <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> + <xsl:with-param name="driver" select="." tunnel="yes"/> + </xsl:apply-templates> + </xsl:template> + + <xsl:template match="driver-ClarificationResponseDomain//ResponseDomain" mode="model" priority="1"> + <xsl:param name="source-context" as="item()" tunnel="yes"/> + <xsl:param name="agency" as="xs:string" tunnel="yes"/> + <xsl:param name="label" as="xs:string" tunnel="yes"/> + <xsl:variable name="relatedVariable" select="enoddi33:get-related-variable($source-context)"/> + <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> + <xsl:with-param name="driver" select="eno:append-empty-element('driver-ClarificationTextDomain', .)" tunnel="yes"/> + <xsl:with-param name="agency" select="$agency" as="xs:string" tunnel="yes"/> + <xsl:with-param name="label" select="$label" as="xs:string" tunnel="yes"/> + <xsl:with-param name="nameClarification" select="enoddi33:get-name($relatedVariable)" as="xs:string" tunnel="yes"/> + </xsl:apply-templates> + </xsl:template> + <!--this part is designed in this complicated way to maintain the order of the ddi 3.3 xsd schema--> <xsl:template match="driver-Binding//ResponseDomain" mode="model" priority="2"> <xsl:param name="source-context" as="item()" tunnel="yes"/> From 509c7dc57eac4337c9e65a3b42c7193e25d4d17b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bulot=20Fran=C3=A7ois?= <U7ZR1J@ad.insee.intra> Date: Mon, 29 Jul 2019 15:36:26 +0200 Subject: [PATCH 065/439] Update ddi32toddi33.xsl fill empty VariableRepresentation --- .../resources/xslt/util/ddi/ddi32toddi33.xsl | 33 ++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/src/main/resources/xslt/util/ddi/ddi32toddi33.xsl b/src/main/resources/xslt/util/ddi/ddi32toddi33.xsl index 1f7500771..cb7e7070b 100644 --- a/src/main/resources/xslt/util/ddi/ddi32toddi33.xsl +++ b/src/main/resources/xslt/util/ddi/ddi32toddi33.xsl @@ -8,6 +8,7 @@ exclude-result-prefixes="xs d32 r32 l32 g32 s32 xsl xd" version="2.0"> + <xsl:output indent="yes"/> <xd:doc> <xd:desc>root template : DDIInstance with DDI 3.3 namespaces</xd:desc> </xd:doc> @@ -150,11 +151,41 @@ <xsl:element name="r:MeasurementUnit"> <xsl:value-of select="r32:MeasurementUnit"/> </xsl:element> - <xsl:apply-templates select="$domain/*[not(r32:OutParameter)]"/> + <xsl:apply-templates select="$domain/*[not(self::r32:OutParameter)]"/> </xsl:element> </xsl:element> </xsl:template> + <xd:doc> + <xd:desc>Variables without representation : not new with DDI 3.3, but forgotten till now + evolution needed for MeasurementUnit</xd:desc> + </xd:doc> + <xsl:template match="l32:VariableRepresentation[not(*)]"> + <xsl:variable name="QID" select="../r32:QuestionReference/r32:ID"/> + <xsl:variable name="QOPID" select="../r32:SourceParameterReference/r32:ID"/> + <xsl:variable name="RDOPID" select="//*[not(ends-with(name(),'Reference')) and r32:ID=$QID]/r32:Binding[r32:TargetParameterReference/r32:ID=$QOPID]/r32:SourceParameterReference/r32:ID"/> + <xsl:variable name="domain" select="//*[not(ends-with(name(),'Reference')) and r32:ID=$QID]//*[(ends-with(name(),'Domain') or ends-with(name(),'DomainReference')) and r32:OutParameter/r32:ID=$RDOPID]" as="node()"/> + <xsl:variable name="domain-root"> + <xsl:choose> + <xsl:when test="ends-with($domain/local-name(),'Domain')"> + <xsl:value-of select="concat('d:',$domain/local-name())"/> + </xsl:when> + <xsl:when test="ends-with($domain/local-name(),'DomainReference')"> + <xsl:value-of select="concat('r:',$domain/local-name())"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="'UNKNWON'"/> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + <xsl:element name="l:VariableRepresentation"> + <xsl:element name="{$domain-root}"> + <xsl:apply-templates select="$domain/@*"/> + <xsl:apply-templates select="$domain/*[not(self::r32:OutParameter)]"/> + </xsl:element> + </xsl:element> + </xsl:template> + + <xd:doc> <xd:desc>https://ddi-alliance.atlassian.net/projects/DDILIFE/issues/DDILIFE-3590</xd:desc> </xd:doc> From 8ac13114861d0e63621f7f9a446b185f8e4e2a39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bulot=20Fran=C3=A7ois?= <U7ZR1J@ad.insee.intra> Date: Tue, 30 Jul 2019 18:00:00 +0200 Subject: [PATCH 066/439] global minimum and maximum constraints in dates and durations --- src/main/resources/lang/fr/en.xml | 17 +- src/main/resources/lang/fr/fr.xml | 16 +- .../xslt/inputs/ddi/source-fixed.xsl | 24 ++- .../resources/xslt/inputs/ddi/templates.fods | 25 +-- src/main/resources/xslt/outputs/fr/models.xsl | 124 ++++++++++++- .../transformations/ddi2fr/ddi2fr-fixed.xsl | 165 ++++++++++++------ 6 files changed, 278 insertions(+), 93 deletions(-) diff --git a/src/main/resources/lang/fr/en.xml b/src/main/resources/lang/fr/en.xml index 2dc00687b..c80fed842 100644 --- a/src/main/resources/lang/fr/en.xml +++ b/src/main/resources/lang/fr/en.xml @@ -8,22 +8,25 @@ <Alert> <Text>You shall type a correct value</Text> <Number> - <Integer>You shall type an integer number between</Integer> + <Integer>You shall type an integer number</Integer> <Decimal> - <Beginning>You shall use point as decimal separator, with no spaces, and type a - number between</Beginning> + <Beginning>You shall use point as decimal separator, with no spaces, and type a number</Beginning> <DecimalCondition>(with at most</DecimalCondition> <Digit>digit</Digit> <End>behind the "." separator)</End> </Decimal> </Number> <Date>Type a valid date</Date> - <Duration> - <Hours>The number of hours shall be between 0 and 99.</Hours> - <Minutes>The number of minutes shall be between 0 and 59.</Minutes> - </Duration> + <Date-YYYYMM>Type a valid year and month</Date-YYYYMM> + <Date-YYYY>Type a valid year</Date-YYYY> + <Duration>Type a valid duration</Duration> </Alert> <And>and</And> + <After>after</After> + <Before>before</Before> + <Between>between</Between> + <GreaterThan>greater than</GreaterThan> + <LessThan>less than</LessThan> <Plural>s</Plural> <AddLine>Add a line</AddLine> <DateTime> diff --git a/src/main/resources/lang/fr/fr.xml b/src/main/resources/lang/fr/fr.xml index 220f23933..018d15a23 100644 --- a/src/main/resources/lang/fr/fr.xml +++ b/src/main/resources/lang/fr/fr.xml @@ -8,10 +8,9 @@ <Alert> <Text>Vous devez saisir une valeur correcte</Text> <Number> - <Integer>Vous devez saisir un nombre entier compris entre</Integer> + <Integer>Vous devez saisir un nombre entier compris</Integer> <Decimal> - <Beginning>Vous devez utiliser le point comme séparateur de décimale, sans espace, - et saisir un nombre compris entre</Beginning> + <Beginning>Vous devez utiliser le point comme séparateur de décimale, sans espace, et saisir un nombre compris</Beginning> <DecimalCondition>(avec au plus</DecimalCondition> <Digit>chiffre</Digit> <End>derrière le séparateur ".")</End> @@ -19,12 +18,15 @@ </Number> <Date>Entrez une date valide</Date> <Date-YYYYMM>Merci de renseigner le mois et l'année</Date-YYYYMM> - <Duration> - <Hours>Le nombre d'heures doit être compris entre 0 et 99.</Hours> - <Minutes>Le nombre de minutes doit être compris entre 0 et 59.</Minutes> - </Duration> + <Date-YYYY>Merci de renseigner l'année</Date-YYYY> + <Duration>Entrez une durée valide</Duration> </Alert> <And>et</And> + <After>postérieure à</After> + <Before>antérieure à</Before> + <Between>entre</Between> + <GreaterThan>supérieur à</GreaterThan> + <LessThan>inférieur à</LessThan> <Plural>s</Plural> <AddLine>Ajouter une ligne</AddLine> <DateTime> diff --git a/src/main/resources/xslt/inputs/ddi/source-fixed.xsl b/src/main/resources/xslt/inputs/ddi/source-fixed.xsl index 4cf2c838c..7cf11c088 100644 --- a/src/main/resources/xslt/inputs/ddi/source-fixed.xsl +++ b/src/main/resources/xslt/inputs/ddi/source-fixed.xsl @@ -460,7 +460,29 @@ <xsl:value-of select="string(1 + number($last-line) - number($first-line))"/> </xsl:template> - + <xd:doc> + <xd:desc>getting maximum from date / duration</xd:desc> + </xd:doc> + <xsl:template match="d:DateTimeDomain|d:DateTimeDomainReference" mode="enoddi:get-maximum"> + <xsl:variable name="standart-maximum" select="descendant::r:MaximumValue[not(ancestor::r:OutParameter)]"/> + + <xsl:choose> + <xsl:when test="$standart-maximum = ''"/> + <xsl:when test="$standart-maximum = 'format-date(current-date(),''[Y0001]-[M01]-[D01]'')'"> + <xsl:value-of select="format-date(current-date(),'[Y0001]-[M01]-[D01]')"/> + </xsl:when> + <xsl:when test="$standart-maximum = 'format-date(current-date(),''[Y0001]-[M01]'')'"> + <xsl:value-of select="format-date(current-date(),'[Y0001]-[M01]')"/> + </xsl:when> + <xsl:when test="$standart-maximum = 'year-from-date(current-date())'"> + <xsl:value-of select="year-from-date(current-date())"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="$standart-maximum"/> + </xsl:otherwise> + </xsl:choose> + </xsl:template> + <xd:doc> <xd:desc> <xd:p>For a given element, return a set of the Instruction ids which are dependent of the said.</xd:p> diff --git a/src/main/resources/xslt/inputs/ddi/templates.fods b/src/main/resources/xslt/inputs/ddi/templates.fods index 5cefeb24e..c1796f959 100644 --- a/src/main/resources/xslt/inputs/ddi/templates.fods +++ b/src/main/resources/xslt/inputs/ddi/templates.fods @@ -1,20 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> <office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.spreadsheet"> - <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>P3DT2H43M20S</meta:editing-duration><meta:editing-cycles>398</meta:editing-cycles><meta:generator>LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab8</meta:generator><dc:date>2019-07-23T11:21:03.132000000</dc:date><dc:creator>François Bulot</dc:creator><meta:document-statistic meta:table-count="1" meta:cell-count="479" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> + <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>P3DT8H40M17S</meta:editing-duration><meta:editing-cycles>399</meta:editing-cycles><meta:generator>LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab8</meta:generator><dc:date>2019-07-30T17:07:27.247000000</dc:date><dc:creator>François Bulot</dc:creator><meta:document-statistic meta:table-count="1" meta:cell-count="475" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> <office:settings> <config:config-item-set config:name="ooo:view-settings"> <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item> <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item> <config:config-item config:name="VisibleAreaWidth" config:type="int">63256</config:config-item> - <config:config-item config:name="VisibleAreaHeight" config:type="int">84229</config:config-item> + <config:config-item config:name="VisibleAreaHeight" config:type="int">83650</config:config-item> <config:config-item-map-indexed config:name="Views"> <config:config-item-map-entry> <config:config-item config:name="ViewId" config:type="string">view1</config:config-item> <config:config-item-map-named config:name="Tables"> <config:config-item-map-entry config:name="Sheet1"> <config:config-item config:name="CursorPositionX" config:type="int">0</config:config-item> - <config:config-item config:name="CursorPositionY" config:type="int">13</config:config-item> + <config:config-item config:name="CursorPositionY" config:type="int">100</config:config-item> <config:config-item config:name="HorizontalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="VerticalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="HorizontalSplitPosition" config:type="int">0</config:config-item> @@ -23,7 +23,7 @@ <config:config-item config:name="PositionLeft" config:type="int">0</config:config-item> <config:config-item config:name="PositionRight" config:type="int">0</config:config-item> <config:config-item config:name="PositionTop" config:type="int">0</config:config-item> - <config:config-item config:name="PositionBottom" config:type="int">9</config:config-item> + <config:config-item config:name="PositionBottom" config:type="int">82</config:config-item> <config:config-item config:name="ZoomType" config:type="short">0</config:config-item> <config:config-item config:name="ZoomValue" config:type="int">100</config:config-item> <config:config-item config:name="PageViewZoomValue" config:type="int">60</config:config-item> @@ -638,7 +638,7 @@ <text:p><text:sheet-name>???</text:sheet-name><text:s/>(<text:title>???</text:title>)</text:p> </style:region-left> <style:region-right> - <text:p><text:date style:data-style-name="N2" text:date-value="2019-07-23">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="11:17:17.856000000">00:00:00</text:time></text:p> + <text:p><text:date style:data-style-name="N2" text:date-value="2019-07-30">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="11:10:29.948000000">00:00:00</text:time></text:p> </style:region-right> </style:header> <style:header-left style:display="false"/> @@ -2235,21 +2235,6 @@ <text:p>Getting the maximum of a numeric response domain.</text:p> </table:table-cell> </table:table-row> - <table:table-row table:style-name="ro2"> - <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>d:DateTimeDomain|d:DateTimeDomainReference</text:p> - </table:table-cell> - <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>enoddi:get-maximum</text:p> - </table:table-cell> - <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>descendant::r:MaximumValue[not(ancestor::r:OutParameter)]</text:p> - </table:table-cell> - <table:table-cell/> - <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>Getting the maximum of a dateTime or duration response domain.</text:p> - </table:table-cell> - </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell table:number-columns-repeated="5"/> </table:table-row> diff --git a/src/main/resources/xslt/outputs/fr/models.xsl b/src/main/resources/xslt/outputs/fr/models.xsl index 87c953683..7266ccc11 100644 --- a/src/main/resources/xslt/outputs/fr/models.xsl +++ b/src/main/resources/xslt/outputs/fr/models.xsl @@ -1061,13 +1061,15 @@ <xsl:variable name="relevant" select="enofr:get-relevant($source-context)"/> <xsl:variable name="readonly" select="enofr:get-readonly($source-context)"/> <xsl:variable name="dateduration-format" select="upper-case(enofr:get-format($source-context))"/> + <xsl:variable name="minimum" select="enofr:get-minimum($source-context)"/> + <xsl:variable name="maximum" select="enofr:get-maximum($source-context)"/> <xsl:variable name="layout-list" as="node()"> <xsl:call-template name="dateduration-layout"> <xsl:with-param name="variable-name" select="$name"/> <xsl:with-param name="driver" select="$current-driver"/> <xsl:with-param name="format" select="$dateduration-format"/> - <xsl:with-param name="minimum" select="enofr:get-minimum($source-context)"/> - <xsl:with-param name="maximum" select="enofr:get-maximum($source-context)"/> + <xsl:with-param name="minimum" select="$minimum"/> + <xsl:with-param name="maximum" select="$maximum"/> </xsl:call-template> </xsl:variable> @@ -1120,7 +1122,6 @@ <xsl:otherwise> <xsl:value-of select="'''P'''"/> <xsl:for-each select="$layout-list//format[@id='Y' or @id='M' or @id='D']"> - <!--<xsl:value-of select="concat(', ../',@variable,',''',@id,'''')"/>--> <xsl:value-of select="concat(', if (../',@variable,' != '''') then concat(../',@variable,',''',@id,''') else ''''')"/> </xsl:for-each> <xsl:if test="contains($dateduration-format,'T')"> @@ -1140,6 +1141,64 @@ </xsl:choose> <xsl:value-of select="' ))'"/> </xsl:attribute> + <xsl:if test="$minimum != '' or $maximum != ''"> + <xsl:element name="xf:constraint"> + <xsl:attribute name="value"> + <xsl:choose> + <xsl:when test="$current-driver = 'DurationDomain'"> + <xsl:value-of select="'if (string(.) != '''') then (('"/> + <xsl:if test="$minimum != ''"> + <xsl:for-each select="$layout-list//format"> + <xsl:if test="position() != 1"> + <xsl:value-of select="') or ('"/> + </xsl:if> + <xsl:for-each select="preceding-sibling::format"> + <xsl:value-of select="concat('(',lower-case(@unit),'s-from-duration(.) = ',@global-minimum,') and ')"/> + </xsl:for-each> + <xsl:value-of select="concat('(',lower-case(@unit),'s-from-duration(.) >')"/> + <xsl:if test="not(following-sibling::format)"> + <xsl:value-of select="'='"/> + </xsl:if> + <xsl:value-of select="concat(' ',@global-minimum,')')"/> + </xsl:for-each> + </xsl:if> + <xsl:if test="$minimum != '' and $minimum != ''"> + <xsl:value-of select="')) and (('"/> + </xsl:if> + <xsl:if test="$maximum != ''"> + <xsl:for-each select="$layout-list//format"> + <xsl:if test="position() != 1"> + <xsl:value-of select="') or ('"/> + </xsl:if> + <xsl:for-each select="preceding-sibling::format"> + <xsl:value-of select="concat('(',lower-case(@unit),'s-from-duration(.) = ',@global-maximum,') and ')"/> + </xsl:for-each> + <xsl:value-of select="concat('(',lower-case(@unit),'s-from-duration(.) <')"/> + <xsl:if test="not(following-sibling::format)"> + <xsl:value-of select="'='"/> + </xsl:if> + <xsl:value-of select="concat(' ',@global-maximum,')')"/> + </xsl:for-each> + </xsl:if> + <xsl:value-of select="'))'"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="'if(string(.) != '''') then ('"/> + <xsl:if test="$minimum != ''"> + <xsl:value-of select="concat('string(.) >= ''',$minimum,'''')"/> + </xsl:if> + <xsl:if test="$minimum != '' and $maximum != ''"> + <xsl:value-of select="' and '"/> + </xsl:if> + <xsl:if test="$maximum != ''"> + <xsl:value-of select="concat('string(.) <= ''',$maximum,'''')"/> + </xsl:if> + <xsl:value-of select="')'"/> + </xsl:otherwise> + </xsl:choose> + </xsl:attribute> + </xsl:element> + </xsl:if> </xf:bind> </xsl:if> <!-- real element or layout ones --> @@ -1202,6 +1261,23 @@ <xsl:value-of select="')'"/> </xsl:attribute> </xsl:if> + <xsl:if test="($dateduration-format = 'YYYY-MM-DD' or upper-case($dateduration-format) = 'JJ/MM/AAAA') and ($minimum != '' or $maximum != '')"> + <xsl:element name="xf:constraint"> + <xsl:attribute name="value"> + <xsl:value-of select="'if (. castable as xs:date) then ('"/> + <xsl:if test="$minimum != ''"> + <xsl:value-of select="concat('xs:date(.) >= xs:date(''',$minimum,''')')"/> + </xsl:if> + <xsl:if test="$minimum != '' and $maximum != ''"> + <xsl:value-of select="' and '"/> + </xsl:if> + <xsl:if test="$maximum != ''"> + <xsl:value-of select="concat('xs:date(.) <= xs:date(''',$maximum,''')')"/> + </xsl:if> + <xsl:value-of select="')'"/> + </xsl:attribute> + </xsl:element> + </xsl:if> <xsl:if test="$current-driver = 'DurationDomain'"> <xsl:element name="xf:constraint"> <xsl:attribute name="value" select="concat('if (. castable as xs:integer) then (xs:integer(.)<=',@maximum,' and xs:integer(.)>=',@minimum,') else (.='''')')"/> @@ -1457,7 +1533,8 @@ <xsl:when test="$current-driver = 'DurationDomain'"> <alert> <xsl:value-of select="$labels-resource/Languages/Language[@xml:lang=$language]/Alert/Number/Integer"/> - <xsl:value-of select="concat(' ',@minimum, ' ',$labels-resource/Languages/Language[@xml:lang=$language]/And,' ',@maximum)"/> + <xsl:value-of select="concat(' ',$labels-resource/Languages/Language[@xml:lang=$language]/Between,' ',@minimum)"/> + <xsl:value-of select="concat(' ',$labels-resource/Languages/Language[@xml:lang=$language]/And,' ',@maximum)"/> </alert> </xsl:when> <xsl:when test="$dateduration-format = 'YYYY-MM-DD' or upper-case($dateduration-format) = 'JJ/MM/AAAA' or $dateduration-format = 'YYYY-MM' or upper-case($dateduration-format) = 'MM/AAAA'"> @@ -2387,7 +2464,7 @@ <format id="CH" unit="Hundredth" minimum="0" maximum="99" variable="{$variable-name}-layout-CH"/> </xsl:when> <xsl:when test="$driver = 'DateTimeDomain'"> - <!-- The extremum are different from duration onesorder is different between date dans duration --> + <!-- The extremum are different from duration ones ; order is different between date and duration --> <xsl:if test="contains($format,'Y') or contains($format,'A')"> <format id="Y" unit="Year"> <xsl:attribute name="minimum"> @@ -2498,6 +2575,7 @@ </xsl:if> </xsl:when> <xsl:otherwise> + <!-- duration --> <xsl:if test="contains($format,'Y') or contains($format,'A')"> <format id="Y" unit="Year" variable="{$variable-name}-layout-Y"> <xsl:attribute name="minimum"> @@ -2534,6 +2612,12 @@ </xsl:otherwise> </xsl:choose> </xsl:attribute> + <xsl:if test="$minimum !=''"> + <xsl:attribute name="global-minimum" select="years-from-duration(xs:duration($minimum))"/> + </xsl:if> + <xsl:if test="$maximum !=''"> + <xsl:attribute name="global-maximum" select="years-from-duration(xs:duration($maximum))"/> + </xsl:if> </format> </xsl:if> <xsl:if test="contains($format,'M') and not(contains(substring-before($format,'M'),'T'))"> @@ -2579,6 +2663,12 @@ </xsl:non-matching-substring> </xsl:analyze-string> </xsl:attribute> + <xsl:if test="$minimum !=''"> + <xsl:attribute name="global-minimum" select="months-from-duration(xs:duration($minimum))"/> + </xsl:if> + <xsl:if test="$maximum !=''"> + <xsl:attribute name="global-maximum" select="months-from-duration(xs:duration($maximum))"/> + </xsl:if> </format> </xsl:if> <xsl:if test="contains($format,'D') or contains($format,'J')"> @@ -2624,6 +2714,12 @@ </xsl:non-matching-substring> </xsl:analyze-string> </xsl:attribute> + <xsl:if test="$minimum !=''"> + <xsl:attribute name="global-minimum" select="days-from-duration(xs:duration($minimum))"/> + </xsl:if> + <xsl:if test="$maximum !=''"> + <xsl:attribute name="global-maximum" select="days-from-duration(xs:duration($maximum))"/> + </xsl:if> </format> </xsl:if> <xsl:if test="contains($format,'H')"> @@ -2669,6 +2765,12 @@ </xsl:non-matching-substring> </xsl:analyze-string> </xsl:attribute> + <xsl:if test="$minimum !=''"> + <xsl:attribute name="global-minimum" select="hours-from-duration(xs:duration($minimum))"/> + </xsl:if> + <xsl:if test="$maximum !=''"> + <xsl:attribute name="global-maximum" select="hours-from-duration(xs:duration($maximum))"/> + </xsl:if> </format> </xsl:if> <xsl:if test="contains($format,'T') and contains(substring-after($format,'T'),'M')"> @@ -2714,6 +2816,12 @@ </xsl:non-matching-substring> </xsl:analyze-string> </xsl:attribute> + <xsl:if test="$minimum !=''"> + <xsl:attribute name="global-minimum" select="minutes-from-duration(xs:duration($minimum))"/> + </xsl:if> + <xsl:if test="$maximum !=''"> + <xsl:attribute name="global-maximum" select="minutes-from-duration(xs:duration($maximum))"/> + </xsl:if> </format> </xsl:if> <xsl:if test="contains($format,'S')"> @@ -2759,6 +2867,12 @@ </xsl:non-matching-substring> </xsl:analyze-string> </xsl:attribute> + <xsl:if test="$minimum !=''"> + <xsl:attribute name="global-minimum" select="seconds-from-duration(xs:duration($minimum))"/> + </xsl:if> + <xsl:if test="$maximum !=''"> + <xsl:attribute name="global-maximum" select="seconds-from-duration(xs:duration($maximum))"/> + </xsl:if> </format> </xsl:if> </xsl:otherwise> diff --git a/src/main/resources/xslt/transformations/ddi2fr/ddi2fr-fixed.xsl b/src/main/resources/xslt/transformations/ddi2fr/ddi2fr-fixed.xsl index 8e976fb1e..04bad3bbf 100644 --- a/src/main/resources/xslt/transformations/ddi2fr/ddi2fr-fixed.xsl +++ b/src/main/resources/xslt/transformations/ddi2fr/ddi2fr-fixed.xsl @@ -432,63 +432,122 @@ <xsl:variable name="type"> <xsl:value-of select="enoddi:get-type($context)"/> </xsl:variable> - <!-- We retrieve the format --> <xsl:variable name="format"> <xsl:value-of select="enoddi:get-format($context)"/> </xsl:variable> - <!-- If it is a 'text' and a format is defined, we use a generic sentence as an alert --> - <xsl:if test="$type='text'"> - <xsl:if test="not($format='')"> + <xsl:variable name="minimum"> + <xsl:value-of select="enoddi:get-minimum($context)"/> + </xsl:variable> + <xsl:variable name="maximum"> + <xsl:value-of select="enoddi:get-maximum($context)"/> + </xsl:variable> + <xsl:choose> + <xsl:when test="$type='text'"> + <xsl:if test="not($format='')"> + <xsl:value-of select="$labels-resource/Languages/Language[@xml:lang=$language]/Alert/Text"/> + </xsl:if> + </xsl:when> + <xsl:when test="$type='number'"> + <xsl:variable name="number-of-decimals"> + <xsl:value-of select="enoddi:get-number-of-decimals($context)"/> + </xsl:variable> + <xsl:variable name="beginning"> + <xsl:choose> + <xsl:when test="not($number-of-decimals='' or $number-of-decimals='0')"> + <xsl:value-of select="$labels-resource/Languages/Language[@xml:lang=$language]/Alert/Number/Decimal/Beginning"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="$labels-resource/Languages/Language[@xml:lang=$language]/Alert/Number/Integer"/> + </xsl:otherwise> + </xsl:choose> + <xsl:value-of select="concat(' ',$labels-resource/Languages/Language[@xml:lang=$language]/Between)"/> + </xsl:variable> + <xsl:variable name="end"> + <xsl:choose> + <xsl:when test="not($number-of-decimals='' or $number-of-decimals='0')"> + <xsl:value-of + select="' ', + concat($labels-resource/Languages/Language[@xml:lang=$language]/Alert/Number/Decimal/DecimalCondition, + ' ', + $number-of-decimals, + ' ', + $labels-resource/Languages/Language[@xml:lang=$language]/Alert/Number/Decimal/Digit, + if (number($number-of-decimals)>1) then $labels-resource/Languages/Language[@xml:lang=$language]/Plural else '', + ' ', + $labels-resource/Languages/Language[@xml:lang=$language]/Alert/Number/Decimal/End)" + /> + </xsl:when> + </xsl:choose> + </xsl:variable> + <xsl:value-of select="concat($beginning,' ',$minimum, ' ',$labels-resource/Languages/Language[@xml:lang=$language]/And,' ',$maximum, $end)"/> + </xsl:when> + <xsl:when test="$type='date'"> + <xsl:value-of select="$labels-resource/Languages/Language[@xml:lang=$language]/Alert/Date"/> + <xsl:if test="$minimum != ''"> + <xsl:value-of select="concat(' ',$labels-resource/Languages/Language[@xml:lang=$language]/After,' ',format-date($minimum, '[D] [MNn] [Y]', $language, (), ()))"/> + </xsl:if> + <xsl:if test="$minimum != '' and $maximum != ''"> + <xsl:value-of select="concat(' ',$labels-resource/Languages/Language[@xml:lang=$language]/And)"/> + </xsl:if> + <xsl:if test="$maximum != ''"> + <xsl:value-of select="concat(' ',$labels-resource/Languages/Language[@xml:lang=$language]/Before,' ',format-date($maximum, '[D] [MNn] [Y]', $language, (), ()))"/> + </xsl:if> + </xsl:when> + <xsl:when test="$type='gYearMonth'"> + <xsl:value-of select="$labels-resource/Languages/Language[@xml:lang=$language]/Alert/Date-YYYYMM"/> + <xsl:if test="$minimum != ''"> + <xsl:value-of select="concat(' ',$labels-resource/Languages/Language[@xml:lang=$language]/After,' ',$minimum)"/> + </xsl:if> + <xsl:if test="$minimum != '' and $maximum != ''"> + <xsl:value-of select="concat(' ',$labels-resource/Languages/Language[@xml:lang=$language]/And)"/> + </xsl:if> + <xsl:if test="$maximum != ''"> + <xsl:value-of select="concat(' ',$labels-resource/Languages/Language[@xml:lang=$language]/Before,' ',$maximum)"/> + </xsl:if> + </xsl:when> + <xsl:when test="$type='gYear'"> + <xsl:value-of select="$labels-resource/Languages/Language[@xml:lang=$language]/Alert/Date-YYYY"/> + <xsl:if test="$minimum != ''"> + <xsl:value-of select="concat(' ',$labels-resource/Languages/Language[@xml:lang=$language]/After,' ',$minimum)"/> + </xsl:if> + <xsl:if test="$minimum != '' and $maximum != ''"> + <xsl:value-of select="concat(' ',$labels-resource/Languages/Language[@xml:lang=$language]/And)"/> + </xsl:if> + <xsl:if test="$maximum != ''"> + <xsl:value-of select="concat(' ',$labels-resource/Languages/Language[@xml:lang=$language]/Before,' ',$maximum)"/> + </xsl:if> + </xsl:when> + <xsl:when test="$type='duration'"> + <xsl:value-of select="$labels-resource/Languages/Language[@xml:lang=$language]/Alert/Duration"/> + <xsl:if test="$minimum!=''"> + <xsl:choose> + <xsl:when test="$maximum!=''"> + <xsl:value-of select="concat(' ',$labels-resource/Languages/Language[@xml:lang=$language]/Between,' ')"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="concat(' ',$labels-resource/Languages/Language[@xml:lang=$language]/GreaterThan,' ')"/> + </xsl:otherwise> + </xsl:choose> + <xsl:value-of select="$minimum"/> + </xsl:if> + <xsl:if test="$maximum!=''"> + <xsl:choose> + <xsl:when test="$minimum!=''"> + <xsl:value-of select="concat(' ',$labels-resource/Languages/Language[@xml:lang=$language]/And,' ')"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="concat(' ',$labels-resource/Languages/Language[@xml:lang=$language]/LessThan,' ')"/> + </xsl:otherwise> + </xsl:choose> + <xsl:value-of select="$maximum"/> + </xsl:if> + </xsl:when> + <xsl:when test="$type='boolean'"/> + <xsl:when test="$type!=''"> <xsl:value-of select="$labels-resource/Languages/Language[@xml:lang=$language]/Alert/Text"/> - </xsl:if> - </xsl:if> - <!-- If it is a number, we look for infos about the format and deduce a message for the alert element --> - <xsl:if test="$type='number'"> - <xsl:variable name="number-of-decimals"> - <xsl:value-of select="enoddi:get-number-of-decimals($context)"/> - </xsl:variable> - <xsl:variable name="minimum"> - <xsl:value-of select="enoddi:get-minimum($context)"/> - </xsl:variable> - <xsl:variable name="maximum"> - <xsl:value-of select="enoddi:get-maximum($context)"/> - </xsl:variable> - <xsl:variable name="beginning"> - <xsl:choose> - <xsl:when test="not($number-of-decimals='' or $number-of-decimals='0')"> - <xsl:value-of select="$labels-resource/Languages/Language[@xml:lang=$language]/Alert/Number/Decimal/Beginning"/> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="$labels-resource/Languages/Language[@xml:lang=$language]/Alert/Number/Integer"/> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:variable name="end"> - <xsl:choose> - <xsl:when test="not($number-of-decimals='' or $number-of-decimals='0')"> - <xsl:value-of - select="' ', - concat($labels-resource/Languages/Language[@xml:lang=$language]/Alert/Number/Decimal/DecimalCondition, - ' ', - $number-of-decimals, - ' ', - $labels-resource/Languages/Language[@xml:lang=$language]/Alert/Number/Decimal/Digit, - if (number($number-of-decimals)>1) then $labels-resource/Languages/Language[@xml:lang=$language]/Plural else '', - ' ', - $labels-resource/Languages/Language[@xml:lang=$language]/Alert/Number/Decimal/End)" - /> - </xsl:when> - </xsl:choose> - </xsl:variable> - <xsl:value-of select="concat($beginning,' ',$minimum, ' ',$labels-resource/Languages/Language[@xml:lang=$language]/And,' ',$maximum, $end)"/> - </xsl:if> - <!-- If it is a 'date', we use a generic sentence as an alert --> - <xsl:if test="$format='YYYY-MM-DD' or upper-case($format)='JJ/MM/AAAA'"> - <xsl:value-of select="$labels-resource/Languages/Language[@xml:lang=$language]/Alert/Date"/> - </xsl:if> - <xsl:if test="$format='YYYY-MM' or upper-case($format)='MM/AAAA'"> - <xsl:value-of select="$labels-resource/Languages/Language[@xml:lang=$language]/Alert/Date-YYYYMM"/> - </xsl:if> + </xsl:when> + <xsl:otherwise/> + </xsl:choose> </xsl:function> <xd:doc> From 5f749a8fab15a828102a5a72d701bb6972bdb41f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bulot=20Fran=C3=A7ois?= <U7ZR1J@ad.insee.intra> Date: Wed, 31 Jul 2019 18:15:13 +0200 Subject: [PATCH 067/439] improve date / duration extremum alerts --- src/main/resources/xslt/outputs/fr/models.xsl | 28 +++++++++++++------ .../transformations/ddi2fr/ddi2fr-fixed.xsl | 18 +++++++++--- 2 files changed, 33 insertions(+), 13 deletions(-) diff --git a/src/main/resources/xslt/outputs/fr/models.xsl b/src/main/resources/xslt/outputs/fr/models.xsl index 7266ccc11..390db4ef2 100644 --- a/src/main/resources/xslt/outputs/fr/models.xsl +++ b/src/main/resources/xslt/outputs/fr/models.xsl @@ -1180,7 +1180,7 @@ <xsl:value-of select="concat(' ',@global-maximum,')')"/> </xsl:for-each> </xsl:if> - <xsl:value-of select="'))'"/> + <xsl:value-of select="')) else (.='''')'"/> </xsl:when> <xsl:otherwise> <xsl:value-of select="'if(string(.) != '''') then ('"/> @@ -1193,7 +1193,7 @@ <xsl:if test="$maximum != ''"> <xsl:value-of select="concat('string(.) <= ''',$maximum,'''')"/> </xsl:if> - <xsl:value-of select="')'"/> + <xsl:value-of select="') else (.='''')'"/> </xsl:otherwise> </xsl:choose> </xsl:attribute> @@ -1266,15 +1266,15 @@ <xsl:attribute name="value"> <xsl:value-of select="'if (. castable as xs:date) then ('"/> <xsl:if test="$minimum != ''"> - <xsl:value-of select="concat('xs:date(.) >= xs:date(''',$minimum,''')')"/> + <xsl:value-of select="concat('. >= xs:date(''',$minimum,''')')"/> </xsl:if> <xsl:if test="$minimum != '' and $maximum != ''"> <xsl:value-of select="' and '"/> </xsl:if> <xsl:if test="$maximum != ''"> - <xsl:value-of select="concat('xs:date(.) <= xs:date(''',$maximum,''')')"/> + <xsl:value-of select="concat('. <= xs:date(''',$maximum,''')')"/> </xsl:if> - <xsl:value-of select="')'"/> + <xsl:value-of select="') else (xs:string(.) != '''')'"/> </xsl:attribute> </xsl:element> </xsl:if> @@ -1285,7 +1285,12 @@ </xsl:if> <xsl:if test="($dateduration-format='YYYY-MM' or upper-case($dateduration-format)='MM/AAAA') and @id='Y'"> <xsl:element name="xf:constraint"> - <xsl:attribute name="value" select="concat('if (string(.)='''') then string(../',$name,'-layout-M)='''' else (.!='''')')"/> + <xsl:attribute name="value" select="concat('if (string(.)='''') then string(../',$name,'-layout-M)='''' else (string(../',$name,'-layout-M)!='''')')"/> + </xsl:element> + </xsl:if> + <xsl:if test="($dateduration-format='YYYY-MM' or upper-case($dateduration-format)='MM/AAAA') and @id='M'"> + <xsl:element name="xf:constraint"> + <xsl:attribute name="value" select="concat('if (string(.)='''') then string(../',$name,'-layout-Y)='''' else (string(../',$name,'-layout-Y)!='''')')"/> </xsl:element> </xsl:if> </xf:bind> @@ -1524,7 +1529,7 @@ </xsl:choose> </label> </xsl:if> - <xsl:if test="$hint != '' and $question-label != ''"> + <xsl:if test="$hint != '' and $question-label != '' and (position() = last() or $current-driver='DurationDomain')"> <hint> <xsl:value-of select="$hint"/> </hint> @@ -1537,7 +1542,12 @@ <xsl:value-of select="concat(' ',$labels-resource/Languages/Language[@xml:lang=$language]/And,' ',@maximum)"/> </alert> </xsl:when> - <xsl:when test="$dateduration-format = 'YYYY-MM-DD' or upper-case($dateduration-format) = 'JJ/MM/AAAA' or $dateduration-format = 'YYYY-MM' or upper-case($dateduration-format) = 'MM/AAAA'"> + <xsl:when test="$dateduration-format = 'YYYY-MM-DD' or upper-case($dateduration-format) = 'JJ/MM/AAAA'"> + <alert> + <xsl:value-of select="enofr:get-alert($source-context, $language)"/> + </alert> + </xsl:when> + <xsl:when test="($dateduration-format = 'YYYY-MM' or upper-case($dateduration-format) = 'MM/AAAA') and position()=last()"> <alert> <xsl:value-of select="enofr:get-alert($source-context, $language)"/> </alert> @@ -2340,7 +2350,7 @@ </xsl:attribute> <xsl:attribute name="xxf:order" select="'label control hint help alert'"/> <xsl:if test="$current-driver = 'DurationDomain'"> - <xsl:attribute name="xxf:maxlength" select="'2'"/> + <xsl:attribute name="xxf:maxlength" select="if (string-length(@minimum) > string-length(@maximum)) then string-length(@minimum) else string-length(@maximum)"/> </xsl:if> <xsl:if test="position() = 1 and ($label != '' or $question-label!= '')"> <xsl:variable name="conditioning-variables" as="xs:string*"> diff --git a/src/main/resources/xslt/transformations/ddi2fr/ddi2fr-fixed.xsl b/src/main/resources/xslt/transformations/ddi2fr/ddi2fr-fixed.xsl index 04bad3bbf..127675cef 100644 --- a/src/main/resources/xslt/transformations/ddi2fr/ddi2fr-fixed.xsl +++ b/src/main/resources/xslt/transformations/ddi2fr/ddi2fr-fixed.xsl @@ -484,25 +484,35 @@ <xsl:when test="$type='date'"> <xsl:value-of select="$labels-resource/Languages/Language[@xml:lang=$language]/Alert/Date"/> <xsl:if test="$minimum != ''"> - <xsl:value-of select="concat(' ',$labels-resource/Languages/Language[@xml:lang=$language]/After,' ',format-date($minimum, '[D] [MNn] [Y]', $language, (), ()))"/> + <xsl:value-of select="concat(' ',$labels-resource/Languages/Language[@xml:lang=$language]/After,' ')"/> + <xsl:value-of select="concat(number(substring($minimum,9,2)),' ')"/> + <xsl:value-of select="$labels-resource/Languages/Language[@xml:lang=$language]/DateTime/Months/*[position()=number(substring($minimum,6,2))]"/> + <xsl:value-of select="concat(' ',substring($minimum,1,4))"/> </xsl:if> <xsl:if test="$minimum != '' and $maximum != ''"> <xsl:value-of select="concat(' ',$labels-resource/Languages/Language[@xml:lang=$language]/And)"/> </xsl:if> <xsl:if test="$maximum != ''"> - <xsl:value-of select="concat(' ',$labels-resource/Languages/Language[@xml:lang=$language]/Before,' ',format-date($maximum, '[D] [MNn] [Y]', $language, (), ()))"/> + <xsl:value-of select="concat(' ',$labels-resource/Languages/Language[@xml:lang=$language]/Before,' ')"/> + <xsl:value-of select="concat(number(substring($maximum,9,2)),' ')"/> + <xsl:value-of select="$labels-resource/Languages/Language[@xml:lang=$language]/DateTime/Months/*[position()=number(substring($maximum,6,2))]"/> + <xsl:value-of select="concat(' ',substring($maximum,1,4))"/> </xsl:if> </xsl:when> <xsl:when test="$type='gYearMonth'"> <xsl:value-of select="$labels-resource/Languages/Language[@xml:lang=$language]/Alert/Date-YYYYMM"/> <xsl:if test="$minimum != ''"> - <xsl:value-of select="concat(' ',$labels-resource/Languages/Language[@xml:lang=$language]/After,' ',$minimum)"/> + <xsl:value-of select="concat(' ',$labels-resource/Languages/Language[@xml:lang=$language]/After,' ')"/> + <xsl:value-of select="$labels-resource/Languages/Language[@xml:lang=$language]/DateTime/Months/*[position()=number(substring($minimum,6,2))]"/> + <xsl:value-of select="concat(' ',substring($minimum,1,4))"/> </xsl:if> <xsl:if test="$minimum != '' and $maximum != ''"> <xsl:value-of select="concat(' ',$labels-resource/Languages/Language[@xml:lang=$language]/And)"/> </xsl:if> <xsl:if test="$maximum != ''"> - <xsl:value-of select="concat(' ',$labels-resource/Languages/Language[@xml:lang=$language]/Before,' ',$maximum)"/> + <xsl:value-of select="concat(' ',$labels-resource/Languages/Language[@xml:lang=$language]/Before,' ')"/> + <xsl:value-of select="$labels-resource/Languages/Language[@xml:lang=$language]/DateTime/Months/*[position()=number(substring($maximum,6,2))]"/> + <xsl:value-of select="concat(' ',substring($maximum,1,4))"/> </xsl:if> </xsl:when> <xsl:when test="$type='gYear'"> From fb14da4da7189425fd3c2d2a494f1e42779d738e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bulot=20Fran=C3=A7ois?= <U7ZR1J@ad.insee.intra> Date: Mon, 5 Aug 2019 09:57:05 +0200 Subject: [PATCH 068/439] correct xf:date constraint --- src/main/resources/xslt/outputs/fr/models.xsl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/xslt/outputs/fr/models.xsl b/src/main/resources/xslt/outputs/fr/models.xsl index 390db4ef2..6ed93fdec 100644 --- a/src/main/resources/xslt/outputs/fr/models.xsl +++ b/src/main/resources/xslt/outputs/fr/models.xsl @@ -1264,7 +1264,7 @@ <xsl:if test="($dateduration-format = 'YYYY-MM-DD' or upper-case($dateduration-format) = 'JJ/MM/AAAA') and ($minimum != '' or $maximum != '')"> <xsl:element name="xf:constraint"> <xsl:attribute name="value"> - <xsl:value-of select="'if (. castable as xs:date) then ('"/> + <xsl:value-of select="'if (string(.) != '''' and . castable as xs:date) then ('"/> <xsl:if test="$minimum != ''"> <xsl:value-of select="concat('. >= xs:date(''',$minimum,''')')"/> </xsl:if> @@ -1274,7 +1274,7 @@ <xsl:if test="$maximum != ''"> <xsl:value-of select="concat('. <= xs:date(''',$maximum,''')')"/> </xsl:if> - <xsl:value-of select="') else (xs:string(.) != '''')'"/> + <xsl:value-of select="') else (string(.) = '''')'"/> </xsl:attribute> </xsl:element> </xsl:if> From 38567f6402dd4b009bb173262a6e64feb176159c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bulot=20Fran=C3=A7ois?= <U7ZR1J@ad.insee.intra> Date: Mon, 5 Aug 2019 17:00:55 +0200 Subject: [PATCH 069/439] improvment of duration controls --- src/main/resources/xslt/outputs/fr/models.xsl | 140 ++++++++++-------- .../transformations/ddi2fr/ddi2fr-fixed.xsl | 77 ++++++++-- 2 files changed, 140 insertions(+), 77 deletions(-) diff --git a/src/main/resources/xslt/outputs/fr/models.xsl b/src/main/resources/xslt/outputs/fr/models.xsl index 6ed93fdec..f41c00148 100644 --- a/src/main/resources/xslt/outputs/fr/models.xsl +++ b/src/main/resources/xslt/outputs/fr/models.xsl @@ -302,6 +302,7 @@ <xsl:for-each select="$layout-list//format"> <xsl:element name="{$name}-layout-{@id}"/> </xsl:for-each> + <xsl:element name="{$name}-dateduration-constraint"/> </xsl:if> <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> <xsl:with-param name="driver" select="." tunnel="yes"/> @@ -1141,64 +1142,6 @@ </xsl:choose> <xsl:value-of select="' ))'"/> </xsl:attribute> - <xsl:if test="$minimum != '' or $maximum != ''"> - <xsl:element name="xf:constraint"> - <xsl:attribute name="value"> - <xsl:choose> - <xsl:when test="$current-driver = 'DurationDomain'"> - <xsl:value-of select="'if (string(.) != '''') then (('"/> - <xsl:if test="$minimum != ''"> - <xsl:for-each select="$layout-list//format"> - <xsl:if test="position() != 1"> - <xsl:value-of select="') or ('"/> - </xsl:if> - <xsl:for-each select="preceding-sibling::format"> - <xsl:value-of select="concat('(',lower-case(@unit),'s-from-duration(.) = ',@global-minimum,') and ')"/> - </xsl:for-each> - <xsl:value-of select="concat('(',lower-case(@unit),'s-from-duration(.) >')"/> - <xsl:if test="not(following-sibling::format)"> - <xsl:value-of select="'='"/> - </xsl:if> - <xsl:value-of select="concat(' ',@global-minimum,')')"/> - </xsl:for-each> - </xsl:if> - <xsl:if test="$minimum != '' and $minimum != ''"> - <xsl:value-of select="')) and (('"/> - </xsl:if> - <xsl:if test="$maximum != ''"> - <xsl:for-each select="$layout-list//format"> - <xsl:if test="position() != 1"> - <xsl:value-of select="') or ('"/> - </xsl:if> - <xsl:for-each select="preceding-sibling::format"> - <xsl:value-of select="concat('(',lower-case(@unit),'s-from-duration(.) = ',@global-maximum,') and ')"/> - </xsl:for-each> - <xsl:value-of select="concat('(',lower-case(@unit),'s-from-duration(.) <')"/> - <xsl:if test="not(following-sibling::format)"> - <xsl:value-of select="'='"/> - </xsl:if> - <xsl:value-of select="concat(' ',@global-maximum,')')"/> - </xsl:for-each> - </xsl:if> - <xsl:value-of select="')) else (.='''')'"/> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="'if(string(.) != '''') then ('"/> - <xsl:if test="$minimum != ''"> - <xsl:value-of select="concat('string(.) >= ''',$minimum,'''')"/> - </xsl:if> - <xsl:if test="$minimum != '' and $maximum != ''"> - <xsl:value-of select="' and '"/> - </xsl:if> - <xsl:if test="$maximum != ''"> - <xsl:value-of select="concat('string(.) <= ''',$maximum,'''')"/> - </xsl:if> - <xsl:value-of select="') else (.='''')'"/> - </xsl:otherwise> - </xsl:choose> - </xsl:attribute> - </xsl:element> - </xsl:if> </xf:bind> </xsl:if> <!-- real element or layout ones --> @@ -1295,6 +1238,68 @@ </xsl:if> </xf:bind> </xsl:for-each> + <xsl:if test="count($layout-list//format) > 1 or $current-driver = 'DurationDomain'"> + <xf:bind id="{$name}-dateduration-constraint-bind" name="{$name}-dateduration-constraint" ref="{$name}-dateduration-constraint"> + <xsl:if test="$minimum != '' or $maximum != '' or $current-driver != 'DurationDomain'"> + <xsl:element name="xf:constraint"> + <xsl:attribute name="value"> + <xsl:choose> + <xsl:when test="$current-driver = 'DurationDomain'"> + <xsl:value-of select="concat('if (string(../',$name,') != '''') then ((')"/> + <xsl:if test="$minimum != ''"> + <xsl:for-each select="$layout-list//format"> + <xsl:if test="position() != 1"> + <xsl:value-of select="') or ('"/> + </xsl:if> + <xsl:for-each select="preceding-sibling::format"> + <xsl:value-of select="concat('(',lower-case(@unit),'s-from-duration(../',$name,') = ',@global-minimum,') and ')"/> + </xsl:for-each> + <xsl:value-of select="concat('(',lower-case(@unit),'s-from-duration(../',$name,') >')"/> + <xsl:if test="not(following-sibling::format)"> + <xsl:value-of select="'='"/> + </xsl:if> + <xsl:value-of select="concat(' ',@global-minimum,')')"/> + </xsl:for-each> + </xsl:if> + <xsl:if test="$minimum != '' and $minimum != ''"> + <xsl:value-of select="')) and (('"/> + </xsl:if> + <xsl:if test="$maximum != ''"> + <xsl:for-each select="$layout-list//format"> + <xsl:if test="position() != 1"> + <xsl:value-of select="') or ('"/> + </xsl:if> + <xsl:for-each select="preceding-sibling::format"> + <xsl:value-of select="concat('(',lower-case(@unit),'s-from-duration(../',$name,') = ',@global-maximum,') and ')"/> + </xsl:for-each> + <xsl:value-of select="concat('(',lower-case(@unit),'s-from-duration(../',$name,') <')"/> + <xsl:if test="not(following-sibling::format)"> + <xsl:value-of select="'='"/> + </xsl:if> + <xsl:value-of select="concat(' ',@global-maximum,')')"/> + </xsl:for-each> + </xsl:if> + <xsl:value-of select="concat(')) else (../',$name,'='''')')"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="concat('if(string(../',$name,') != '''') then (')"/> + <xsl:if test="$minimum != ''"> + <xsl:value-of select="concat('string(../',$name,') >= ''',$minimum,'''')"/> + </xsl:if> + <xsl:if test="$minimum != '' and $maximum != ''"> + <xsl:value-of select="' and '"/> + </xsl:if> + <xsl:if test="$maximum != ''"> + <xsl:value-of select="concat('string(../',$name,') <= ''',$maximum,'''')"/> + </xsl:if> + <xsl:value-of select="concat(') else (../',$name,'='''')')"/> + </xsl:otherwise> + </xsl:choose> + </xsl:attribute> + </xsl:element> + </xsl:if> + </xf:bind> + </xsl:if> <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> <xsl:with-param name="driver" select="." tunnel="yes"/> </xsl:apply-templates> @@ -1547,11 +1552,6 @@ <xsl:value-of select="enofr:get-alert($source-context, $language)"/> </alert> </xsl:when> - <xsl:when test="($dateduration-format = 'YYYY-MM' or upper-case($dateduration-format) = 'MM/AAAA') and position()=last()"> - <alert> - <xsl:value-of select="enofr:get-alert($source-context, $language)"/> - </alert> - </xsl:when> </xsl:choose> <xsl:if test="$current-driver = 'DateTimeDomain' and @unit != ''"> <xsl:variable name="unit-id" select="@id"/> @@ -1566,7 +1566,7 @@ </xsl:choose> </xsl:variable> <xsl:for-each select="xs:integer(number(@minimum)) to xs:integer(number(@maximum))"> - <xsl:sort select="." order="{$number-order}"></xsl:sort> + <xsl:sort select="." order="{$number-order}"/> <xsl:variable name="current-value" select="."/> <item> <label> @@ -1587,6 +1587,13 @@ </xsl:if> </xsl:element> </xsl:for-each> + <xsl:if test="$current-driver='DurationDomain' or $dateduration-format = 'YYYY-MM' or upper-case($dateduration-format) = 'MM/AAAA'"> + <xsl:element name="{$name}-dateduration-constraint"> + <alert> + <xsl:value-of select="enofr:get-alert($source-context, $language)"/> + </alert> + </xsl:element> + </xsl:if> </xsl:template> <xd:doc> @@ -2441,6 +2448,11 @@ </xsl:element> </xsl:if> </xsl:for-each> + <xsl:if test="$current-driver = 'DurationDomain' or count($layout-list//format) > 1"> + <xf:output id="{$name}-dateduration-constraint-control" name="{$name}-dateduration-constraint" bind="{$name}-dateduration-constraint-bind" xxf:order="label control hint help alert"> + <xf:alert ref="$form-resources/{$name}-dateduration-constraint/alert" level="error"/> + </xf:output> + </xsl:if> </xsl:template> <xd:doc> diff --git a/src/main/resources/xslt/transformations/ddi2fr/ddi2fr-fixed.xsl b/src/main/resources/xslt/transformations/ddi2fr/ddi2fr-fixed.xsl index 127675cef..85e428ad1 100644 --- a/src/main/resources/xslt/transformations/ddi2fr/ddi2fr-fixed.xsl +++ b/src/main/resources/xslt/transformations/ddi2fr/ddi2fr-fixed.xsl @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xhtml="http://www.w3.org/1999/xhtml" - xmlns:xs="http://www.w3.org/2001/XMLSchema" + xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl" xmlns:eno="http://xml.insee.fr/apps/eno" xmlns:enoddi="http://xml.insee.fr/apps/eno/ddi" xmlns:enofr="http://xml.insee.fr/apps/eno/form-runner" @@ -83,7 +83,6 @@ </xd:desc> </xd:doc> <xsl:variable name="numeric-example" select="$parameters//NumericExample"/> - <xd:doc> <xd:desc>Loops and dynamic array's ids may be called in many calculs : filters, consistency checks, calculated variables</xd:desc> @@ -141,12 +140,12 @@ <xsl:function name="enofr:get-variable-business-ancestors"> <xsl:param name="context" as="item()"/> <xsl:param name="variable"/> - + <xsl:call-template name="enoddi:get-business-ancestors"> <xsl:with-param name="variable" select="$variable"/> </xsl:call-template> </xsl:function> - + <xd:doc> <xd:desc> <xd:p>This function returns an xforms label for the context on which it is applied.</xd:p> @@ -220,7 +219,7 @@ <xsl:with-param name="language" select="$language"/> </xsl:call-template> </xsl:for-each> - </xsl:element> + </xsl:element> </xsl:variable> <xsl:call-template name="tooltip-in-label"> <xsl:with-param name="label" select="$instruction-label-without-id-tooltips"/> @@ -342,14 +341,14 @@ <xsl:function name="enofr:get-label-conditioning-variables"> <xsl:param name="context" as="item()"/> <xsl:param name="language"/> - + <xsl:variable name="conditioning-variables-with-doubles" as="xs:string*"> <xsl:sequence select="enoddi:get-label-conditioning-variables($context,$language)"/> <xsl:choose> <xsl:when test="name($context)='d:QuestionItem' or name($context)='d:QuestionGrid'"> <xsl:for-each select="enoddi:get-instructions-by-format($context)"> <xsl:sequence select="enoddi:get-label-conditioning-variables(.,$language)"/> - </xsl:for-each> + </xsl:for-each> </xsl:when> <xsl:otherwise> <xsl:for-each select="enoddi:get-instructions-by-format($context,'tooltips')"> @@ -360,7 +359,7 @@ </xsl:variable> <xsl:sequence select="distinct-values($conditioning-variables-with-doubles)"/> </xsl:function> - + <xd:doc> <xd:desc> <xd:p>This function returns an xforms hint for the context on which it is applied.</xd:p> @@ -513,7 +512,7 @@ <xsl:value-of select="concat(' ',$labels-resource/Languages/Language[@xml:lang=$language]/Before,' ')"/> <xsl:value-of select="$labels-resource/Languages/Language[@xml:lang=$language]/DateTime/Months/*[position()=number(substring($maximum,6,2))]"/> <xsl:value-of select="concat(' ',substring($maximum,1,4))"/> - </xsl:if> + </xsl:if> </xsl:when> <xsl:when test="$type='gYear'"> <xsl:value-of select="$labels-resource/Languages/Language[@xml:lang=$language]/Alert/Date-YYYY"/> @@ -532,24 +531,30 @@ <xsl:if test="$minimum!=''"> <xsl:choose> <xsl:when test="$maximum!=''"> - <xsl:value-of select="concat(' ',$labels-resource/Languages/Language[@xml:lang=$language]/Between,' ')"/> + <xsl:value-of select="concat(' ',$labels-resource/Languages/Language[@xml:lang=$language]/Between,' ')"/> </xsl:when> <xsl:otherwise> <xsl:value-of select="concat(' ',$labels-resource/Languages/Language[@xml:lang=$language]/GreaterThan,' ')"/> </xsl:otherwise> </xsl:choose> - <xsl:value-of select="$minimum"/> + <xsl:call-template name="text-from-duration"> + <xsl:with-param name="duration" select="$minimum"/> + <xsl:with-param name="language" select="$language"/> + </xsl:call-template> </xsl:if> <xsl:if test="$maximum!=''"> <xsl:choose> <xsl:when test="$minimum!=''"> - <xsl:value-of select="concat(' ',$labels-resource/Languages/Language[@xml:lang=$language]/And,' ')"/> + <xsl:value-of select="concat($labels-resource/Languages/Language[@xml:lang=$language]/And,' ')"/> </xsl:when> <xsl:otherwise> <xsl:value-of select="concat(' ',$labels-resource/Languages/Language[@xml:lang=$language]/LessThan,' ')"/> </xsl:otherwise> </xsl:choose> - <xsl:value-of select="$maximum"/> + <xsl:call-template name="text-from-duration"> + <xsl:with-param name="duration" select="$maximum"/> + <xsl:with-param name="language" select="$language"/> + </xsl:call-template> </xsl:if> </xsl:when> <xsl:when test="$type='boolean'"/> @@ -560,6 +565,52 @@ </xsl:choose> </xsl:function> + <xd:doc> + <xd:desc>Calculates the text from a duration to show it in an alert message</xd:desc> + </xd:doc> + <xsl:template name="text-from-duration"> + <xsl:param name="duration"/> + <xsl:param name="language"/> + + <xsl:variable name="zero-duration"> + <xsl:analyze-string select="$duration" regex="^P0(.)[^1-9]*$"> + <xsl:matching-substring> + <xsl:value-of select="regex-group(1)"/> + </xsl:matching-substring> + <xsl:non-matching-substring> + <xsl:analyze-string select="$duration" regex="^PT0(.)[^1-9]*$"> + <xsl:matching-substring> + <xsl:value-of select="lower-case(regex-group(1))"/> + </xsl:matching-substring> + </xsl:analyze-string> + </xsl:non-matching-substring> + </xsl:analyze-string> + </xsl:variable> + + <xsl:analyze-string select="$duration" regex="^P(([0-9]+)Y)?(([0-9]+)M)?(([0-9]+)D)?(T(([0-9]+)H)?(([0-9]+)M)?(([0-9]+)S)?)?$"> + <xsl:matching-substring> + <xsl:if test="regex-group(2) != '' and (regex-group(2) != '0' or $zero-duration='Y')"> + <xsl:value-of select="concat(regex-group(2),' ',$labels-resource/Languages/Language[@xml:lang=$language]/Duration/Year,' ')"/> + </xsl:if> + <xsl:if test="regex-group(4) != '' and (regex-group(4) != '0' or $zero-duration='M')"> + <xsl:value-of select="concat(regex-group(4),' ',$labels-resource/Languages/Language[@xml:lang=$language]/Duration/Month,' ')"/> + </xsl:if> + <xsl:if test="regex-group(6) != '' and (regex-group(6) != '0' or $zero-duration='D')"> + <xsl:value-of select="concat(regex-group(6),' ',$labels-resource/Languages/Language[@xml:lang=$language]/Duration/Day,' ')"/> + </xsl:if> + <xsl:if test="regex-group(9) != '' and (regex-group(9) != '0' or $zero-duration='h')"> + <xsl:value-of select="concat(regex-group(9),' ',$labels-resource/Languages/Language[@xml:lang=$language]/Duration/Hour,' ')"/> + </xsl:if> + <xsl:if test="regex-group(11) != '' and (regex-group(11) != '0' or $zero-duration='m')"> + <xsl:value-of select="concat(regex-group(11),' ',$labels-resource/Languages/Language[@xml:lang=$language]/Duration/Minute,' ')"/> + </xsl:if> + <xsl:if test="regex-group(13) != '' and (regex-group(13) != '0' or $zero-duration='s')"> + <xsl:value-of select="concat(regex-group(13),' ',$labels-resource/Languages/Language[@xml:lang=$language]/Duration/Second,' ')"/> + </xsl:if> + </xsl:matching-substring> + </xsl:analyze-string> + </xsl:template> + <xd:doc> <xd:desc> <xd:p>This function retrieves the languages to appear in the generated Xforms.</xd:p> From 7af3c1c00dd2b917fa4bf7dd995b162dd8f423e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bulot=20Fran=C3=A7ois?= <U7ZR1J@ad.insee.intra> Date: Tue, 6 Aug 2019 14:56:32 +0200 Subject: [PATCH 070/439] correct constraint from duration extremum --- src/main/resources/xslt/outputs/fr/models.xsl | 524 ++++++++---------- 1 file changed, 244 insertions(+), 280 deletions(-) diff --git a/src/main/resources/xslt/outputs/fr/models.xsl b/src/main/resources/xslt/outputs/fr/models.xsl index f41c00148..2fdb44b5b 100644 --- a/src/main/resources/xslt/outputs/fr/models.xsl +++ b/src/main/resources/xslt/outputs/fr/models.xsl @@ -1231,11 +1231,6 @@ <xsl:attribute name="value" select="concat('if (string(.)='''') then string(../',$name,'-layout-M)='''' else (string(../',$name,'-layout-M)!='''')')"/> </xsl:element> </xsl:if> - <xsl:if test="($dateduration-format='YYYY-MM' or upper-case($dateduration-format)='MM/AAAA') and @id='M'"> - <xsl:element name="xf:constraint"> - <xsl:attribute name="value" select="concat('if (string(.)='''') then string(../',$name,'-layout-Y)='''' else (string(../',$name,'-layout-Y)!='''')')"/> - </xsl:element> - </xsl:if> </xf:bind> </xsl:for-each> <xsl:if test="count($layout-list//format) > 1 or $current-driver = 'DurationDomain'"> @@ -1552,6 +1547,11 @@ <xsl:value-of select="enofr:get-alert($source-context, $language)"/> </alert> </xsl:when> + <xsl:when test="($dateduration-format = 'YYYY-MM' or upper-case($dateduration-format) = 'MM/AAAA') and @unit='Year'"> + <alert> + <xsl:value-of select="enofr:get-alert($source-context, $language)"/> + </alert> + </xsl:when> </xsl:choose> <xsl:if test="$current-driver = 'DateTimeDomain' and @unit != ''"> <xsl:variable name="unit-id" select="@id"/> @@ -2600,301 +2600,265 @@ <!-- duration --> <xsl:if test="contains($format,'Y') or contains($format,'A')"> <format id="Y" unit="Year" variable="{$variable-name}-layout-Y"> - <xsl:attribute name="minimum"> - <xsl:choose> - <xsl:when test="$minimum != ''"> - <xsl:analyze-string select="$minimum" regex="^P([0-9]+)Y.*$"> - <xsl:matching-substring> - <xsl:value-of select="regex-group(1)"/> - </xsl:matching-substring> - <xsl:non-matching-substring> - <xsl:value-of select="'0'"/> - </xsl:non-matching-substring> - </xsl:analyze-string> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="'0'"/> - </xsl:otherwise> - </xsl:choose> - </xsl:attribute> - <xsl:attribute name="maximum"> - <xsl:choose> - <xsl:when test="$maximum != ''"> - <xsl:analyze-string select="$maximum" regex="^P([0-9]+)Y.*$"> - <xsl:matching-substring> - <xsl:value-of select="regex-group(1)"/> - </xsl:matching-substring> - <xsl:non-matching-substring> - <xsl:value-of select="'99'"/> - </xsl:non-matching-substring> - </xsl:analyze-string> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="'99'"/> - </xsl:otherwise> - </xsl:choose> - </xsl:attribute> - <xsl:if test="$minimum !=''"> - <xsl:attribute name="global-minimum" select="years-from-duration(xs:duration($minimum))"/> - </xsl:if> - <xsl:if test="$maximum !=''"> - <xsl:attribute name="global-maximum" select="years-from-duration(xs:duration($maximum))"/> - </xsl:if> + <xsl:choose> + <xsl:when test="$minimum != ''"> + <xsl:analyze-string select="$minimum" regex="^P([0-9]+)Y.*$"> + <xsl:matching-substring> + <xsl:attribute name="minimum" select="regex-group(1)"/> + <xsl:attribute name="global-minimum" select="regex-group(1)"/> + </xsl:matching-substring> + <xsl:non-matching-substring> + <xsl:attribute name="minimum" select="'0'"/> + <xsl:attribute name="global-minimum" select="'0'"/> + </xsl:non-matching-substring> + </xsl:analyze-string> + </xsl:when> + <xsl:otherwise> + <xsl:attribute name="minimum" select="'0'"/> + </xsl:otherwise> + </xsl:choose> + <xsl:choose> + <xsl:when test="$maximum != ''"> + <xsl:analyze-string select="$maximum" regex="^P([0-9]+)Y.*$"> + <xsl:matching-substring> + <xsl:attribute name="maximum" select="regex-group(1)"/> + <xsl:attribute name="global-maximum" select="regex-group(1)"/> + </xsl:matching-substring> + <xsl:non-matching-substring> + <xsl:attribute name="maximum" select="'99'"/> + <xsl:attribute name="global-maximum" select="'0'"/> + </xsl:non-matching-substring> + </xsl:analyze-string> + </xsl:when> + <xsl:otherwise> + <xsl:attribute name="maximum" select="'99'"/> + </xsl:otherwise> + </xsl:choose> </format> </xsl:if> <xsl:if test="contains($format,'M') and not(contains(substring-before($format,'M'),'T'))"> <format id="M" unit="Month" variable="{$variable-name}-layout-M"> - <xsl:attribute name="minimum"> - <xsl:choose> - <xsl:when test="$minimum != ''"> - <xsl:analyze-string select="$minimum" regex="^P([0-9]+)M.*$"> - <xsl:matching-substring> - <xsl:value-of select="regex-group(1)"/> - </xsl:matching-substring> - <xsl:non-matching-substring> - <xsl:value-of select="'0'"/> - </xsl:non-matching-substring> - </xsl:analyze-string> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="'0'"/> - </xsl:otherwise> - </xsl:choose> - </xsl:attribute> - <xsl:attribute name="maximum"> - <xsl:analyze-string select="$format" regex="^PN+M.*$"> - <xsl:matching-substring> - <xsl:choose> - <xsl:when test="$maximum != ''"> - <xsl:analyze-string select="$maximum" regex="^P([0-9]+)M.*$"> - <xsl:matching-substring> - <xsl:value-of select="regex-group(1)"/> - </xsl:matching-substring> - <xsl:non-matching-substring> - <xsl:message select="concat('format ',$format,' incompatible avec le maximum ',$maximum)"/> - </xsl:non-matching-substring> - </xsl:analyze-string> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="'99'"/> - </xsl:otherwise> - </xsl:choose> - </xsl:matching-substring> - <xsl:non-matching-substring> - <xsl:value-of select="'11'"/> - </xsl:non-matching-substring> - </xsl:analyze-string> - </xsl:attribute> - <xsl:if test="$minimum !=''"> - <xsl:attribute name="global-minimum" select="months-from-duration(xs:duration($minimum))"/> - </xsl:if> - <xsl:if test="$maximum !=''"> - <xsl:attribute name="global-maximum" select="months-from-duration(xs:duration($maximum))"/> - </xsl:if> + <xsl:choose> + <xsl:when test="$minimum != ''"> + <xsl:analyze-string select="$minimum" regex="^P([0-9]+)M.*$"> + <xsl:matching-substring> + <xsl:attribute name="minimum" select="regex-group(1)"/> + <xsl:attribute name="global-minimum" select="regex-group(1)"/> + </xsl:matching-substring> + <xsl:non-matching-substring> + <xsl:attribute name="minimum" select="'0'"/> + <xsl:attribute name="global-minimum" select="months-from-duration(xs:duration($minimum))"/> + </xsl:non-matching-substring> + </xsl:analyze-string> + </xsl:when> + <xsl:otherwise> + <xsl:attribute name="minimum" select="'0'"/> + </xsl:otherwise> + </xsl:choose> + <xsl:analyze-string select="$format" regex="^PN+M.*$"> + <xsl:matching-substring> + <xsl:choose> + <xsl:when test="$maximum != ''"> + <xsl:analyze-string select="$maximum" regex="^P([0-9]+)M.*$"> + <xsl:matching-substring> + <xsl:attribute name="maximum" select="regex-group(1)"/> + <xsl:attribute name="global-maximum" select="regex-group(1)"/> + </xsl:matching-substring> + <xsl:non-matching-substring> + <xsl:message select="concat('format ',$format,' incompatible avec le maximum ',$maximum)"/> + </xsl:non-matching-substring> + </xsl:analyze-string> + </xsl:when> + <xsl:otherwise> + <xsl:attribute name="maximum" select="'99'"/> + </xsl:otherwise> + </xsl:choose> + </xsl:matching-substring> + <xsl:non-matching-substring> + <xsl:attribute name="maximum" select="'11'"/> + <xsl:attribute name="global-maximum" select="months-from-duration(xs:duration($maximum))"/> + </xsl:non-matching-substring> + </xsl:analyze-string> </format> </xsl:if> <xsl:if test="contains($format,'D') or contains($format,'J')"> <format id="D" unit="Day" variable="{$variable-name}-layout-D"> - <xsl:attribute name="minimum"> - <xsl:choose> - <xsl:when test="$minimum != ''"> - <xsl:analyze-string select="$minimum" regex="^P([0-9]+)D.*$"> - <xsl:matching-substring> - <xsl:value-of select="regex-group(1)"/> - </xsl:matching-substring> - <xsl:non-matching-substring> - <xsl:value-of select="'0'"/> - </xsl:non-matching-substring> - </xsl:analyze-string> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="'0'"/> - </xsl:otherwise> - </xsl:choose> - </xsl:attribute> - <xsl:attribute name="maximum"> - <xsl:analyze-string select="$format" regex="^PN+D.*$"> - <xsl:matching-substring> - <xsl:choose> - <xsl:when test="$maximum != ''"> - <xsl:analyze-string select="$maximum" regex="^P([0-9]+)D.*$"> - <xsl:matching-substring> - <xsl:value-of select="regex-group(1)"/> - </xsl:matching-substring> - <xsl:non-matching-substring> - <xsl:message select="concat('format ',$format,' incompatible avec le maximum ',$maximum)"/> - </xsl:non-matching-substring> - </xsl:analyze-string> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="'99'"/> - </xsl:otherwise> - </xsl:choose> - </xsl:matching-substring> - <xsl:non-matching-substring> - <xsl:value-of select="'30'"/> - </xsl:non-matching-substring> - </xsl:analyze-string> - </xsl:attribute> - <xsl:if test="$minimum !=''"> - <xsl:attribute name="global-minimum" select="days-from-duration(xs:duration($minimum))"/> - </xsl:if> - <xsl:if test="$maximum !=''"> - <xsl:attribute name="global-maximum" select="days-from-duration(xs:duration($maximum))"/> - </xsl:if> + <xsl:choose> + <xsl:when test="$minimum != ''"> + <xsl:analyze-string select="$minimum" regex="^P([0-9]+)D.*$"> + <xsl:matching-substring> + <xsl:attribute name="minimum" select="regex-group(1)"/> + <xsl:attribute name="global-minimum" select="regex-group(1)"/> + </xsl:matching-substring> + <xsl:non-matching-substring> + <xsl:attribute name="minimum" select="'0'"/> + <xsl:attribute name="global-minimum" select="days-from-duration(xs:duration($minimum))"/> + </xsl:non-matching-substring> + </xsl:analyze-string> + </xsl:when> + <xsl:otherwise> + <xsl:attribute name="minimum" select="'0'"/> + </xsl:otherwise> + </xsl:choose> + <xsl:analyze-string select="$format" regex="^PN+D.*$"> + <xsl:matching-substring> + <xsl:choose> + <xsl:when test="$maximum != ''"> + <xsl:analyze-string select="$maximum" regex="^P([0-9]+)D.*$"> + <xsl:matching-substring> + <xsl:attribute name="maximum" select="regex-group(1)"/> + <xsl:attribute name="global-maximum" select="regex-group(1)"/> + </xsl:matching-substring> + <xsl:non-matching-substring> + <xsl:message select="concat('format ',$format,' incompatible avec le maximum ',$maximum)"/> + </xsl:non-matching-substring> + </xsl:analyze-string> + </xsl:when> + <xsl:otherwise> + <xsl:attribute name="maximum" select="'99'"/> + </xsl:otherwise> + </xsl:choose> + </xsl:matching-substring> + <xsl:non-matching-substring> + <xsl:attribute name="maximum" select="'30'"/> + <xsl:attribute name="global-maximum" select="days-from-duration(xs:duration($maximum))"/> + </xsl:non-matching-substring> + </xsl:analyze-string> </format> </xsl:if> <xsl:if test="contains($format,'H')"> <format id="H" unit="Hour" variable="{$variable-name}-layout-H"> - <xsl:attribute name="minimum"> - <xsl:choose> - <xsl:when test="$minimum != ''"> - <xsl:analyze-string select="$minimum" regex="^PT([0-9]+)H.*$"> - <xsl:matching-substring> - <xsl:value-of select="regex-group(1)"/> - </xsl:matching-substring> - <xsl:non-matching-substring> - <xsl:value-of select="'0'"/> - </xsl:non-matching-substring> - </xsl:analyze-string> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="'0'"/> - </xsl:otherwise> - </xsl:choose> - </xsl:attribute> - <xsl:attribute name="maximum"> - <xsl:analyze-string select="$format" regex="^PTN+H.*$"> - <xsl:matching-substring> - <xsl:choose> - <xsl:when test="$maximum != ''"> - <xsl:analyze-string select="$maximum" regex="^PT([0-9]+)H.*$"> - <xsl:matching-substring> - <xsl:value-of select="regex-group(1)"/> - </xsl:matching-substring> - <xsl:non-matching-substring> - <xsl:message select="concat('format ',$format,' incompatible avec le maximum ',$maximum)"/> - </xsl:non-matching-substring> - </xsl:analyze-string> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="'99'"/> - </xsl:otherwise> - </xsl:choose> - </xsl:matching-substring> - <xsl:non-matching-substring> - <xsl:value-of select="'23'"/> - </xsl:non-matching-substring> - </xsl:analyze-string> - </xsl:attribute> - <xsl:if test="$minimum !=''"> - <xsl:attribute name="global-minimum" select="hours-from-duration(xs:duration($minimum))"/> - </xsl:if> - <xsl:if test="$maximum !=''"> - <xsl:attribute name="global-maximum" select="hours-from-duration(xs:duration($maximum))"/> - </xsl:if> + <xsl:choose> + <xsl:when test="$minimum != ''"> + <xsl:analyze-string select="$minimum" regex="^PT([0-9]+)H.*$"> + <xsl:matching-substring> + <xsl:attribute name="minimum" select="regex-group(1)"/> + <xsl:attribute name="global-minimum" select="regex-group(1)"/> + </xsl:matching-substring> + <xsl:non-matching-substring> + <xsl:attribute name="minimum" select="'0'"/> + <xsl:attribute name="global-minimum" select="hours-from-duration(xs:duration($minimum))"/> + </xsl:non-matching-substring> + </xsl:analyze-string> + </xsl:when> + <xsl:otherwise> + <xsl:attribute name="minimum" select="'0'"/> + </xsl:otherwise> + </xsl:choose> + <xsl:analyze-string select="$format" regex="^PTN+H.*$"> + <xsl:matching-substring> + <xsl:choose> + <xsl:when test="$maximum != ''"> + <xsl:analyze-string select="$maximum" regex="^PT([0-9]+)H.*$"> + <xsl:matching-substring> + <xsl:attribute name="maximum" select="regex-group(1)"/> + <xsl:attribute name="global-maximum" select="regex-group(1)"/> + </xsl:matching-substring> + <xsl:non-matching-substring> + <xsl:message select="concat('format ',$format,' incompatible avec le maximum ',$maximum)"/> + </xsl:non-matching-substring> + </xsl:analyze-string> + </xsl:when> + <xsl:otherwise> + <xsl:attribute name="maximum" select="'99'"/> + </xsl:otherwise> + </xsl:choose> + </xsl:matching-substring> + <xsl:non-matching-substring> + <xsl:attribute name="maximum" select="'23'"/> + <xsl:attribute name="global-maximum" select="hours-from-duration(xs:duration($maximum))"/> + </xsl:non-matching-substring> + </xsl:analyze-string> </format> </xsl:if> <xsl:if test="contains($format,'T') and contains(substring-after($format,'T'),'M')"> <format id="m" unit="Minute" variable="{$variable-name}-layout-m"> - <xsl:attribute name="minimum"> - <xsl:choose> - <xsl:when test="$minimum != ''"> - <xsl:analyze-string select="$minimum" regex="^PT([0-9]+)M.*$"> - <xsl:matching-substring> - <xsl:value-of select="regex-group(1)"/> - </xsl:matching-substring> - <xsl:non-matching-substring> - <xsl:value-of select="'0'"/> - </xsl:non-matching-substring> - </xsl:analyze-string> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="'0'"/> - </xsl:otherwise> - </xsl:choose> - </xsl:attribute> - <xsl:attribute name="maximum"> - <xsl:analyze-string select="$format" regex="^PTN+M.*$"> - <xsl:matching-substring> - <xsl:choose> - <xsl:when test="$maximum != ''"> - <xsl:analyze-string select="$maximum" regex="^PT([0-9]+)M.*$"> - <xsl:matching-substring> - <xsl:value-of select="regex-group(1)"/> - </xsl:matching-substring> - <xsl:non-matching-substring> - <xsl:message select="concat('format ',$format,' incompatible avec le maximum ',$maximum)"/> - </xsl:non-matching-substring> - </xsl:analyze-string> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="'99'"/> - </xsl:otherwise> - </xsl:choose> - </xsl:matching-substring> - <xsl:non-matching-substring> - <xsl:value-of select="'59'"/> - </xsl:non-matching-substring> - </xsl:analyze-string> - </xsl:attribute> - <xsl:if test="$minimum !=''"> - <xsl:attribute name="global-minimum" select="minutes-from-duration(xs:duration($minimum))"/> - </xsl:if> - <xsl:if test="$maximum !=''"> - <xsl:attribute name="global-maximum" select="minutes-from-duration(xs:duration($maximum))"/> - </xsl:if> + <xsl:choose> + <xsl:when test="$minimum != ''"> + <xsl:analyze-string select="$minimum" regex="^PT([0-9]+)M.*$"> + <xsl:matching-substring> + <xsl:attribute name="minimum" select="regex-group(1)"/> + <xsl:attribute name="global-minimum" select="regex-group(1)"/> + </xsl:matching-substring> + <xsl:non-matching-substring> + <xsl:attribute name="minimum" select="'0'"/> + <xsl:attribute name="global-minimum" select="minutes-from-duration(xs:duration($minimum))"/> + </xsl:non-matching-substring> + </xsl:analyze-string> + </xsl:when> + <xsl:otherwise> + <xsl:attribute name="minimum" select="'0'"/> + </xsl:otherwise> + </xsl:choose> + <xsl:analyze-string select="$format" regex="^PTN+M.*$"> + <xsl:matching-substring> + <xsl:choose> + <xsl:when test="$maximum != ''"> + <xsl:analyze-string select="$maximum" regex="^PT([0-9]+)M.*$"> + <xsl:matching-substring> + <xsl:attribute name="maximum" select="regex-group(1)"/> + <xsl:attribute name="global-maximum" select="regex-group(1)"/> + </xsl:matching-substring> + <xsl:non-matching-substring> + <xsl:message select="concat('format ',$format,' incompatible avec le maximum ',$maximum)"/> + </xsl:non-matching-substring> + </xsl:analyze-string> + </xsl:when> + <xsl:otherwise> + <xsl:attribute name="maximum" select="'99'"/> + </xsl:otherwise> + </xsl:choose> + </xsl:matching-substring> + <xsl:non-matching-substring> + <xsl:attribute name="maximum" select="'59'"/> + <xsl:attribute name="global-maximum" select="minutes-from-duration(xs:duration($maximum))"/> + </xsl:non-matching-substring> + </xsl:analyze-string> </format> </xsl:if> <xsl:if test="contains($format,'S')"> <format id="S" unit="Second" variable="{$variable-name}-layout-S"> - <xsl:attribute name="minimum"> - <xsl:choose> - <xsl:when test="$minimum != ''"> - <xsl:analyze-string select="$minimum" regex="^PT([0-9]+)S$"> - <xsl:matching-substring> - <xsl:value-of select="regex-group(1)"/> - </xsl:matching-substring> - <xsl:non-matching-substring> - <xsl:value-of select="'0'"/> - </xsl:non-matching-substring> - </xsl:analyze-string> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="'0'"/> - </xsl:otherwise> - </xsl:choose> - </xsl:attribute> - <xsl:attribute name="maximum"> - <xsl:analyze-string select="$format" regex="^PTN+S$"> - <xsl:matching-substring> - <xsl:choose> - <xsl:when test="$maximum != ''"> - <xsl:analyze-string select="$maximum" regex="^PT([0-9]+)S$"> - <xsl:matching-substring> - <xsl:value-of select="regex-group(1)"/> - </xsl:matching-substring> - <xsl:non-matching-substring> - <xsl:message select="concat('format ',$format,' incompatible avec le maximum ',$maximum)"/> - </xsl:non-matching-substring> - </xsl:analyze-string> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="'99'"/> - </xsl:otherwise> - </xsl:choose> - </xsl:matching-substring> - <xsl:non-matching-substring> - <xsl:value-of select="'59'"/> - </xsl:non-matching-substring> - </xsl:analyze-string> - </xsl:attribute> - <xsl:if test="$minimum !=''"> - <xsl:attribute name="global-minimum" select="seconds-from-duration(xs:duration($minimum))"/> - </xsl:if> - <xsl:if test="$maximum !=''"> - <xsl:attribute name="global-maximum" select="seconds-from-duration(xs:duration($maximum))"/> - </xsl:if> + <xsl:choose> + <xsl:when test="$minimum != ''"> + <xsl:analyze-string select="$minimum" regex="^PT([0-9]+)S$"> + <xsl:matching-substring> + <xsl:attribute name="minimum" select="regex-group(1)"/> + <xsl:attribute name="global-minimum" select="regex-group(1)"/> + </xsl:matching-substring> + <xsl:non-matching-substring> + <xsl:attribute name="minimum" select="'0'"/> + <xsl:attribute name="global-minimum" select="seconds-from-duration(xs:duration($minimum))"/> + </xsl:non-matching-substring> + </xsl:analyze-string> + </xsl:when> + <xsl:otherwise> + <xsl:attribute name="minimum" select="'0'"/> + </xsl:otherwise> + </xsl:choose> + <xsl:analyze-string select="$format" regex="^PTN+S$"> + <xsl:matching-substring> + <xsl:choose> + <xsl:when test="$maximum != ''"> + <xsl:analyze-string select="$maximum" regex="^PT([0-9]+)S$"> + <xsl:matching-substring> + <xsl:attribute name="maximum" select="regex-group(1)"/> + <xsl:attribute name="global-maximum" select="regex-group(1)"/> + </xsl:matching-substring> + <xsl:non-matching-substring> + <xsl:message select="concat('format ',$format,' incompatible avec le maximum ',$maximum)"/> + </xsl:non-matching-substring> + </xsl:analyze-string> + </xsl:when> + <xsl:otherwise> + <xsl:attribute name="maximum" select="'99'"/> + </xsl:otherwise> + </xsl:choose> + </xsl:matching-substring> + <xsl:non-matching-substring> + <xsl:attribute name="maximum" select="'59'"/> + <xsl:attribute name="global-maximum" select="seconds-from-duration(xs:duration($maximum))"/> + </xsl:non-matching-substring> + </xsl:analyze-string> </format> </xsl:if> </xsl:otherwise> From 4370b3098060f04ade9d9c82d14858cf1eaa7125 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bulot=20Fran=C3=A7ois?= <U7ZR1J@ad.insee.intra> Date: Wed, 21 Aug 2019 09:44:35 +0200 Subject: [PATCH 071/439] Update ddi32toddi33.xsl Adds VariableRepresentation content only for collected variables --- src/main/resources/xslt/util/ddi/ddi32toddi33.xsl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/resources/xslt/util/ddi/ddi32toddi33.xsl b/src/main/resources/xslt/util/ddi/ddi32toddi33.xsl index cb7e7070b..6d7793b66 100644 --- a/src/main/resources/xslt/util/ddi/ddi32toddi33.xsl +++ b/src/main/resources/xslt/util/ddi/ddi32toddi33.xsl @@ -158,8 +158,9 @@ <xd:doc> <xd:desc>Variables without representation : not new with DDI 3.3, but forgotten till now + evolution needed for MeasurementUnit</xd:desc> + <xd:desc>Works only for collected variables</xd:desc> </xd:doc> - <xsl:template match="l32:VariableRepresentation[not(*)]"> + <xsl:template match="l32:VariableRepresentation[not(*) and ../r32:SourceParameterReference]"> <xsl:variable name="QID" select="../r32:QuestionReference/r32:ID"/> <xsl:variable name="QOPID" select="../r32:SourceParameterReference/r32:ID"/> <xsl:variable name="RDOPID" select="//*[not(ends-with(name(),'Reference')) and r32:ID=$QID]/r32:Binding[r32:TargetParameterReference/r32:ID=$QOPID]/r32:SourceParameterReference/r32:ID"/> From 2586bb1abc816da017c244c2a2c9a2e334bd766e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bulot=20Fran=C3=A7ois?= <U7ZR1J@ad.insee.intra> Date: Wed, 21 Aug 2019 09:46:46 +0200 Subject: [PATCH 072/439] Update templates.fods Improve definition of l:Code enoddi:get-label when no code to add before the label --- .../resources/xslt/inputs/ddi/templates.fods | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/resources/xslt/inputs/ddi/templates.fods b/src/main/resources/xslt/inputs/ddi/templates.fods index c1796f959..a51a379a3 100644 --- a/src/main/resources/xslt/inputs/ddi/templates.fods +++ b/src/main/resources/xslt/inputs/ddi/templates.fods @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.spreadsheet"> - <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>P3DT8H40M17S</meta:editing-duration><meta:editing-cycles>399</meta:editing-cycles><meta:generator>LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab8</meta:generator><dc:date>2019-07-30T17:07:27.247000000</dc:date><dc:creator>François Bulot</dc:creator><meta:document-statistic meta:table-count="1" meta:cell-count="475" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> + <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>P3DT8H44M3S</meta:editing-duration><meta:editing-cycles>402</meta:editing-cycles><meta:generator>LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab8</meta:generator><dc:date>2019-08-19T15:46:53.602000000</dc:date><dc:creator>François Bulot</dc:creator><meta:document-statistic meta:table-count="1" meta:cell-count="475" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> <office:settings> <config:config-item-set config:name="ooo:view-settings"> <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item> @@ -14,7 +14,7 @@ <config:config-item-map-named config:name="Tables"> <config:config-item-map-entry config:name="Sheet1"> <config:config-item config:name="CursorPositionX" config:type="int">0</config:config-item> - <config:config-item config:name="CursorPositionY" config:type="int">100</config:config-item> + <config:config-item config:name="CursorPositionY" config:type="int">24</config:config-item> <config:config-item config:name="HorizontalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="VerticalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="HorizontalSplitPosition" config:type="int">0</config:config-item> @@ -23,7 +23,7 @@ <config:config-item config:name="PositionLeft" config:type="int">0</config:config-item> <config:config-item config:name="PositionRight" config:type="int">0</config:config-item> <config:config-item config:name="PositionTop" config:type="int">0</config:config-item> - <config:config-item config:name="PositionBottom" config:type="int">82</config:config-item> + <config:config-item config:name="PositionBottom" config:type="int">7</config:config-item> <config:config-item config:name="ZoomType" config:type="short">0</config:config-item> <config:config-item config:name="ZoomValue" config:type="int">100</config:config-item> <config:config-item config:name="PageViewZoomValue" config:type="int">60</config:config-item> @@ -77,8 +77,8 @@ <config:config-item config:name="IsRasterAxisSynchronized" config:type="boolean">true</config:config-item> <config:config-item config:name="AutoCalculate" config:type="boolean">true</config:config-item> <config:config-item config:name="ApplyUserData" config:type="boolean">true</config:config-item> - <config:config-item config:name="PrinterName" config:type="string">Envoyer à OneNote 16</config:config-item> - <config:config-item config:name="PrinterSetup" config:type="base64Binary">xQT+/0Vudm95ZXIgw6AgT25lTm90ZcKgMTYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAU2VuZCB0byBNaWNyb3NvZnQgT25lTm90ZSAxNiBEcgAWAAEA4gMAAAAAAAAEAAhSAAAEdAAAM1ROVwAAAAAKAEUAbgB2AG8AeQBlAHIAIADgACAATwBuAGUATgBvAHQAZQCgADEANgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBAAG3AD8AgMvAAABAAkAmgs0CGQAAQAPAFgCAgABAFgCAwABAEEANAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAQAAAAIAAAABAAAA/////wAAAAAAAAAAAAAAAAAAAABESU5VIgDAAPwCAACsE9jAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAMAAAABTTVRKAAAAABAAsABTAGUAbgBkACAAdABvACAATQBpAGMAcgBvAHMAbwBmAHQAIABPAG4AZQBOAG8AdABlACAAMQA2ACAARAByAGkAdgBlAHIAAABSRVNETEwAVW5pcmVzRExMAFBhcGVyU2l6ZQBMRVRURVIAT3JpZW50YXRpb24AUE9SVFJBSVQAUmVzb2x1dGlvbgBEUEk2MDAAQ29sb3JNb2RlADI0YnBwAAAAAAAAAAAAAAAAAAAAABIAQ09NUEFUX0RVUExFWF9NT0RFEwBEdXBsZXhNb2RlOjpVbmtub3du</config:config-item> + <config:config-item config:name="PrinterName" config:type="string">\\S20SLINNG\LP0000554-CLR-DR59-SNDI-Secretariat</config:config-item> + <config:config-item config:name="PrinterSetup" config:type="base64Binary">nin+/1xcUzIwU0xJTk5HXExQMDAwMDU1NC1DTFItRFI1OS1TTkRJLVNlY3JldGFyaWF0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAS09OSUNBIE1JTk9MVEEgVW5pdmVyc2FsIFBDTAAAAAAWAAEAuigAAAAAAAAEAAhSAAAEdAAAM1ROVwAAAAAKAFwAXABTADIAMABTAEwASQBOAE4ARwBcAEwAUAAwADAAMAAwADUANQA0AC0AQwBMAFIALQBEAFIANQA5AAAAAAABBAAB3ADUJw+/AAIBAAkAmgs0CGQAAQAHAFgCAgACAFgCAwAAAEEANAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAyCcAAFNQTFgBAAAAAAAAAPwL192wJwAAyCcAAFVQRF9PV04AAAAAAAAAAABQQ0xYTAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAkANAiaCysAKwArACsAADQImgsAAABMIAAArS0AAGUBNAiaCwA0CJoLAEwgAACtLQAAAQBkAAcAAQEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQEBAAABAQBJblRyYXkxAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEBAAABAQEBAAABAQBJblRyYXkyAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIBAAABAQEBAAABAQBJblRyYXkzAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMBAAABAQEBAAABAQBJblRyYXk0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQBAAABAQEBAAABAQBJblRyYXlMQ1QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOgDAAABAQEBAAABAQBJblRyYXlNYW51YWwAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAABAQEBAAABAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAAABAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAAABAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAAABAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAEAAQEBAAEAAQAAAAEAAA4BAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAwAEAAEBAAAAAAQAAAAAAAEAAQAAAAAAAAEBAAAAZAB9AAAEAQEABAEBAAEBAQAB/38AAOkDAQAA6QMBAAABAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEASAD/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAQABAAAAAAABAAAAAQAAAAEAAAABAAEAAQABAQAAAQAAAAEAAQABAQADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAQEAAAAAAQABAAAAAAEAAAEAAQAAAAAAAQAAAAABAAEAAQABAQAAAQAAAAEAAAABAAAAAAEBAAEAAQABAQAAAQAAAAAAAQABBQAAAAAAAAABAAAAAAAAAAEAAQAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQQByAGkAYQBsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAAAgAAAQEAZAABAQBkAAEAAP//AAABAAEAAAAAAAAAAQABAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQAAAAAAAAAAAAAAAAAAAAABAgBYAlgCUAMYAAEEAAAAAAAAAQAAAQAAAAEAAAABAQAAAAABAAABAQABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQABAAEAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEAAABfAgABQXJpYWwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABDb3VyaWVyIE5ldwAAAAAAAAAAAAAAAAAAAAAAAAAAAFRpbWVzIE5ldyBSb21hbgAAAAAAAAAAAAAAAAAAAAAAU3ltYm9sAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABXaW5nZGluZ3MAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQsXFBoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQXJpYWwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABDb3VyaWVyAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFRpbWVzIE5ldyBSb21hbgAAAAAAAAAAAAAAAAAAAAAAU3ltYm9sAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABXaW5nZGluZ3MAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAADpAQAAIwQAAGkFAAB2AgAAqgMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAQAAAAEBAEsBAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANAiaCwCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABzAG8AZgBmAGkAYwBlAC4AYgBpAG4AAAAAAAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAYAAAABAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEACQA0CJoLTCAAAK0tAAD//wAA//8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZAAAAAQAAAAAAAAAAAAAAAAAAAAZYREoAAAAABIAQ09NUEFUX0RVUExFWF9NT0RFFABEdXBsZXhNb2RlOjpMb25nRWRnZQ==</config:config-item> <config:config-item-map-indexed config:name="ForbiddenCharacters"> <config:config-item-map-entry> <config:config-item config:name="Language" config:type="string">zxx</config:config-item> @@ -638,7 +638,7 @@ <text:p><text:sheet-name>???</text:sheet-name><text:s/>(<text:title>???</text:title>)</text:p> </style:region-left> <style:region-right> - <text:p><text:date style:data-style-name="N2" text:date-value="2019-07-30">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="11:10:29.948000000">00:00:00</text:time></text:p> + <text:p><text:date style:data-style-name="N2" text:date-value="2019-08-19">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="15:45:48.171000000">00:00:00</text:time></text:p> </style:region-right> </style:header> <style:header-left style:display="false"/> @@ -1239,7 +1239,7 @@ </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell table:style-name="Default" office:value-type="string" calcext:value-type="string"> - <text:p>l:Code[not(ancestor::d:CodeDomain/@displayCode)]</text:p> + <text:p>l:Code[not(ancestor::d:CodeDomain/@displayCode) and not(ancestor::d:GridDimension[@displayCode='true'])]</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>enoddi:get-label</text:p> @@ -1256,7 +1256,7 @@ </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell table:style-name="Default" office:value-type="string" calcext:value-type="string"> - <text:p>l:Code[ancestor::d:CodeDomain/@displayCode='false']</text:p> + <text:p>l:Code[ancestor::d:CodeDomain/@displayCode='false' and (not(ancestor::d:GridDimension[@displayCode='true']) or descendant::l:Code)]</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>enoddi:get-label</text:p> From cb2b6854019726ccd5395010fe4f8d5ca1cfe469 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bulot=20Fran=C3=A7ois?= <U7ZR1J@ad.insee.intra> Date: Wed, 21 Aug 2019 09:48:38 +0200 Subject: [PATCH 073/439] Update source-fixed.xsl Improve labels with code added --- .../xslt/inputs/ddi/source-fixed.xsl | 103 ++++++++++-------- 1 file changed, 60 insertions(+), 43 deletions(-) diff --git a/src/main/resources/xslt/inputs/ddi/source-fixed.xsl b/src/main/resources/xslt/inputs/ddi/source-fixed.xsl index 7cf11c088..0e7925a53 100644 --- a/src/main/resources/xslt/inputs/ddi/source-fixed.xsl +++ b/src/main/resources/xslt/inputs/ddi/source-fixed.xsl @@ -86,7 +86,7 @@ <xd:p>For a child of an xhtml:p element, it is directly returned.</xd:p> </xd:desc> </xd:doc> - <xsl:template match="*[parent::xhtml:p]" priority="1" mode="lang-choice"> + <xsl:template match="node()[parent::xhtml:p]" priority="1" mode="lang-choice"> <xsl:sequence select="."/> </xsl:template> @@ -99,6 +99,13 @@ <xsl:value-of select="."/> </xsl:template> + <xd:doc> + <xd:desc> + <xd:p>For a text() sibling of a xhtml:p (and generally empty), nothing is returned</xd:p> + </xd:desc> + </xd:doc> + <xsl:template match="text()[parent::*/xhtml:p]" mode="lang-choice" priority="1"/> + <xd:doc> <xd:desc> <xd:p>For those nodes, the language is used to return the right text.</xd:p> @@ -107,6 +114,9 @@ <xsl:template match="node()[r:Content or r:String or xhtml:p]" mode="lang-choice"> <xsl:param name="language" tunnel="yes"/> <xsl:choose> + <xsl:when test="r:Content[@xml:lang=$language and xhtml:p] or r:String[@xml:lang=$language and xhtml:p]"> + <xsl:sequence select="child::node()[@xml:lang=$language]/xhtml:p"/> + </xsl:when> <xsl:when test="r:Content[@xml:lang=$language] or r:String[@xml:lang=$language]"> <xsl:sequence select="child::node()[@xml:lang=$language]/child::node()"/> </xsl:when> @@ -236,7 +246,7 @@ 1) codes which nesting level in codes lists with labels is equal to index+1 2) labels from l:CodeList--> - <xsl:sequence select="d:GridDimension[@rank='2']//(l:Code[count(ancestor::l:CodeList[r:Label])+count(ancestor::l:Code)=$index+number($label-or-no)-1] + <xsl:sequence select="d:GridDimension[@rank='2']//(l:Code[count(ancestor::l:CodeList[r:Label])+count(ancestor::l:Code)=$index+number($label-or-no)-1] | l:CodeList/r:Label[count(ancestor::l:CodeList[r:Label])+count(ancestor::l:Code)=$index+number($label-or-no)])"/> </xsl:template> @@ -307,7 +317,7 @@ <xsl:variable name="parents" select="if (string(count(ancestor::l:CodeList[r:Label] | ancestor::l:Code)) != 'NaN') then count(ancestor::l:CodeList[r:Label] | ancestor::l:Code) else 0"/> <!-- Getting the depth-level of children codes --> <xsl:variable name="children" - select="if (string(max(.//l:Code[not(l:Code)]/count(ancestor::l:CodeList[r:Label] | ancestor::l:Code)) - count(ancestor::l:CodeList[r:Label] | ancestor::l:Code)) !='') + select="if (string(max(.//l:Code[not(l:Code)]/count(ancestor::l:CodeList[r:Label] | ancestor::l:Code)) - count(ancestor::l:CodeList[r:Label] | ancestor::l:Code)) !='') then max(.//l:Code[not(l:Code)]/count(ancestor::l:CodeList[r:Label] | ancestor::l:Code)) - count(ancestor::l:CodeList[r:Label] | ancestor::l:Code) else 0"/> <xsl:value-of select="max(ancestor::d:GridDimension[@rank='1']//l:Code[not(l:Code)]/count(ancestor::l:CodeList[r:Label] | ancestor::l:Code)) @@ -465,7 +475,7 @@ </xd:doc> <xsl:template match="d:DateTimeDomain|d:DateTimeDomainReference" mode="enoddi:get-maximum"> <xsl:variable name="standart-maximum" select="descendant::r:MaximumValue[not(ancestor::r:OutParameter)]"/> - + <xsl:choose> <xsl:when test="$standart-maximum = ''"/> <xsl:when test="$standart-maximum = 'format-date(current-date(),''[Y0001]-[M01]-[D01]'')'"> @@ -482,7 +492,7 @@ </xsl:otherwise> </xsl:choose> </xsl:template> - + <xd:doc> <xd:desc> <xd:p>For a given element, return a set of the Instruction ids which are dependent of the said.</xd:p> @@ -658,13 +668,13 @@ <xd:p>Get the formula to know when a response is hidden or not in a QuestionGrid.</xd:p> </xd:desc> </xd:doc> - + <xsl:template match="d:GridResponseDomainInMixed[d:ResponseAttachmentLocation]" mode="enoddi:get-hideable-command"> - + <xsl:variable name="attachment-domain" select="d:ResponseAttachmentLocation/d:DomainSpecificValue/@attachmentDomain"/> <xsl:variable name="source-response-out-parameter" select="../d:GridResponseDomainInMixed[@attachmentBase=$attachment-domain]//r:OutParameter/r:ID"/> <xsl:variable name="source-response-id" select="../../r:Binding[r:SourceParameterReference/r:ID=$source-response-out-parameter]/r:TargetParameterReference/r:ID"/> - + <xsl:variable name="result"> <xsl:for-each select="d:ResponseAttachmentLocation/d:DomainSpecificValue/r:Value"> <xsl:if test="position()!=1"> @@ -684,7 +694,7 @@ <xsl:template match="*" mode="enoddi:get-deactivatable-ancestors" as="xs:string *"> <xsl:for-each select="ancestor::*[not(d:TypeOfSequence[text()='module'])]"> <xsl:if test="enoddi:get-deactivatable-command(.) != ''"> - <xsl:value-of select="enoddi:get-deactivatable-command(.)"/> + <xsl:value-of select="enoddi:get-deactivatable-command(.)"/> </xsl:if> </xsl:for-each> </xsl:template> @@ -693,7 +703,7 @@ <xd:p>Returns the variables of the conditions of all its deactivatable ancestors.</xd:p> </xd:desc> </xd:doc> - + <xsl:template match="*" mode="enoddi:get-deactivatable-ancestors-variables" as="xs:string *"> <xsl:for-each select="ancestor::*[not(d:TypeOfSequence[text()='module'])]"> <xsl:if test="enoddi:get-deactivatable-command(.) != ''"> @@ -710,7 +720,7 @@ <xsl:template match="*" mode="enoddi:get-hideable-ancestors" as="xs:string *"> <xsl:for-each select="ancestor::*[not(d:TypeOfSequence[text()='module'])]"> <xsl:if test="enoddi:get-hideable-command(.) != ''"> - <xsl:value-of select="enoddi:get-hideable-command(.)"/> + <xsl:value-of select="enoddi:get-hideable-command(.)"/> </xsl:if> </xsl:for-each> </xsl:template> @@ -721,7 +731,7 @@ </xsl:if> </xsl:for-each> </xsl:template> - + <xd:doc> <xd:desc> <xd:p>get-instruction restricted to a format list (if not #all).</xd:p> @@ -801,8 +811,8 @@ and not(d:StructuredMixedGridResponseDomain/d:GridResponseDomainInMixed[not(d:NominalDomain) and not(d:ResponseAttachmentLocation)])] and parent::d:GridResponseDomainInMixed and following-sibling::d:GridAttachment//d:SelectDimension]]" mode="enoddi:get-label" priority="2"> <xsl:variable name="codeCoordinates" select="ancestor::d:NominalDomain/following-sibling::d:GridAttachment//d:SelectDimension" as="node()"/> - <xsl:apply-templates - select="ancestor::d:QuestionGrid/d:GridDimension[@rank='1']//l:Code[position()=number($codeCoordinates/@rangeMinimum)]" + <xsl:apply-templates + select="ancestor::d:QuestionGrid/d:GridDimension[@rank='1']//l:Code[position()=number($codeCoordinates/@rangeMinimum)]" mode="enoddi:get-label"/> </xsl:template> @@ -930,13 +940,13 @@ </xd:desc> </xd:doc> <xsl:template match="d:CodeDomain | d:NominalDomain" mode="enoddi:get-item-label-conditioning-variables"> - + <xsl:variable name="item-label-conditioning-variables-with-doubles" as="xs:string*"> <xsl:for-each select="descendant::l:Category/r:Label/r:Content"> <xsl:call-template name="enoddi:variables-from-label"> <xsl:with-param name="label" select="eno:serialize(.)"/> </xsl:call-template> - </xsl:for-each> + </xsl:for-each> </xsl:variable> <xsl:sequence select="distinct-values($item-label-conditioning-variables-with-doubles)"/> </xsl:template> @@ -959,7 +969,7 @@ select="eno:serialize(ancestor::d:QuestionGrid/d:GridDimension[@rank=$codeCoordinates/@rank] //l:Code[position()=$codeCoordinates/@rangeMinimum] //l:Category/r:Label/r:Content)"/> - </xsl:call-template> + </xsl:call-template> </xsl:variable> <xsl:sequence select="distinct-values($item-label-conditioning-variables-with-doubles)"/> @@ -972,15 +982,15 @@ </xd:desc> </xd:doc> <xsl:template match="*" mode="enoddi:get-variable-type"> - + <xsl:call-template name="enoddi:get-variable-type"> <xsl:with-param name="variable" select="enoddi:get-id(.)"/> </xsl:call-template> </xsl:template> - + <xsl:template name="enoddi:get-variable-type"> <xsl:param name="variable"/> - + <xsl:choose> <!-- collected variable --> <xsl:when test="$root//l:VariableScheme//l:Variable/r:SourceParameterReference/r:ID = $variable"> @@ -1000,9 +1010,9 @@ </xsl:otherwise> </xsl:choose> </xsl:template> - - - + + + <xd:doc> <xd:desc> @@ -1051,12 +1061,12 @@ </xd:desc> </xd:doc> <xsl:template match="*" mode="enoddi:get-business-ancestors"> - + <xsl:call-template name="enoddi:get-business-ancestors"> <xsl:with-param name="variable" select="enoddi:get-id(.)"/> </xsl:call-template> </xsl:template> - + <xsl:template name="enoddi:get-business-ancestors"> <xsl:param name="variable"/> @@ -1143,7 +1153,7 @@ mode="enoddi:get-previous-filter-description"> <xsl:sequence select="ancestor::d:QuestionConstruct/parent::d:ControlConstructReference[not(preceding-sibling::d:ControlConstructReference)]/ancestor::d:IfThenElse[not(d:ExternalAid)]/r:Description"/> </xsl:template> - + <xd:doc> <xd:desc> <xd:p>The label of a Code in a CodeDomain with @displayCode = 'true' is the concatenation of its r:Value and its descendant r:Label.</xd:p> @@ -1153,14 +1163,17 @@ </xd:doc> <xsl:template match="l:Code[(ancestor::d:CodeDomain/@displayCode='true') or (ancestor::d:GridDimension[@displayCode='true'] and not(descendant::l:Code))]" mode="enoddi:get-label"> - <xsl:variable name="xhtml-label" as="node()"> + <xsl:variable name="xhtml-label" as="node()*"> <xsl:apply-templates select="r:CategoryReference/l:Category/r:Label" mode="lang-choice"/> </xsl:variable> - <xsl:apply-templates select="$xhtml-label" mode="modif-title"> - <xsl:with-param name="prefix" select="concat(r:Value,' - ')" tunnel="yes"/> - </xsl:apply-templates> + <xsl:variable name="titled-label" as="node()"> + <xsl:apply-templates select="$xhtml-label" mode="modif-title"> + <xsl:with-param name="prefix" select="concat(r:Value,' - ')" tunnel="yes"/> + </xsl:apply-templates> + </xsl:variable> + <xsl:sequence select="$titled-label"/> </xsl:template> - + <xd:doc> <xd:desc> <xd:p>Only the first child of a xhtml:p must be titled</xd:p> @@ -1173,7 +1186,7 @@ <xsl:apply-templates select="node()[not(position()=1)]"/> </xsl:copy> </xsl:template> - + <xd:doc> <xd:desc> <xd:p>When we match a node starting by xhtml, we only process the first child node with modif-title mode.</xd:p> @@ -1182,12 +1195,9 @@ <xsl:template match="*[starts-with(name(),'xhtml')]" mode="modif-title"> <xsl:param name="prefix" tunnel="yes"/> <xsl:value-of select="$prefix"/> - <xsl:copy> - <xsl:apply-templates select="@*"/> - <xsl:apply-templates select="node()"/> - </xsl:copy> + <xsl:apply-templates select="."/> </xsl:template> - + <xd:doc> <xd:desc> <xd:p>Adding the prefix.</xd:p> @@ -1201,7 +1211,7 @@ <xsl:apply-templates select="node()"/> </xsl:copy> </xsl:template> - + <xd:doc> <xd:desc> <xd:p>Adding the prefix.</xd:p> @@ -1210,14 +1220,21 @@ <xsl:template match="text()" mode="modif-title" priority="1"> <xsl:param name="prefix" tunnel="yes"/> <xsl:choose> - <xsl:when test="preceding-sibling::xhtml:p or following-sibling::xhtml:p"> - <xsl:value-of select="."/> - </xsl:when> + <xsl:when test="preceding-sibling::xhtml:p or following-sibling::xhtml:p"/> <xsl:otherwise> - <xsl:value-of select="concat($prefix,.)"/> + <xsl:value-of select="concat($prefix,.)"/> </xsl:otherwise> </xsl:choose> </xsl:template> + + <xd:doc> + <xd:desc>default template</xd:desc> + </xd:doc> + <xsl:template match="node()|@*"> + <xsl:copy> + <xsl:apply-templates select="node()|@*"/> + </xsl:copy> + </xsl:template> <xd:doc> <xd:desc> @@ -1228,7 +1245,7 @@ <xsl:param name="context" as="item()"/> <xsl:apply-templates select="$context" mode="enoddi:get-previous-statement-item"/> </xsl:function> - + <xsl:template match="*" mode="enoddi:get-previous-statement-item"> <xsl:sequence select="ancestor::d:QuestionConstruct/parent::d:ControlConstructReference/preceding-sibling::d:ControlConstructReference/d:StatementItem[parent::d:ControlConstructReference/following-sibling::d:ControlConstructReference[descendant::d:QuestionConstruct][1]/descendant::d:QuestionConstruct/r:ID=current()/ancestor::d:QuestionConstruct/r:ID]"></xsl:sequence> </xsl:template> From 3b446f5c3699c8700bc82289de50773b6b088c60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bulot=20Fran=C3=A7ois?= <U7ZR1J@ad.insee.intra> Date: Wed, 21 Aug 2019 10:01:42 +0200 Subject: [PATCH 074/439] out files : evolutions with space characters --- src/test/resources/ddi-to-fo/out.fo | 5 ++- src/test/resources/ddi-to-odt/out.odt | 1 - src/test/resources/ddi-to-xform/out.xhtml | 38 +++++++++++------------ 3 files changed, 20 insertions(+), 24 deletions(-) diff --git a/src/test/resources/ddi-to-fo/out.fo b/src/test/resources/ddi-to-fo/out.fo index f39c31ffe..fed426784 100644 --- a/src/test/resources/ddi-to-fo/out.fo +++ b/src/test/resources/ddi-to-fo/out.fo @@ -44,8 +44,7 @@ La position peut être définie par rapport au hautou bas de la zone concernée et gauche ou droite. Dans les zones before/after/start/end, les mesures se font par rapport au 0,0 de la zone concernée. - --> - <fo:simple-page-master master-name="page-even-default" + --><fo:simple-page-master master-name="page-even-default" page-height="297mm" page-width="210mm" reference-orientation="0" @@ -2092,7 +2091,7 @@ font-weight="normal" font-size="10pt" padding="1mm" - text-align="justify">Other country*</fo:block> + text-align="justify">Other country* </fo:block> </fo:table-cell> <fo:table-cell border-color="black" border-style="solid" diff --git a/src/test/resources/ddi-to-odt/out.odt b/src/test/resources/ddi-to-odt/out.odt index 9b1f7d694..ffca40758 100644 --- a/src/test/resources/ddi-to-odt/out.odt +++ b/src/test/resources/ddi-to-odt/out.odt @@ -219,7 +219,6 @@ <text:p text:style-name="Question">➡ 5. When was the first episode of the Simpsons?</text:p> <text:p text:style-name="Comment">For your information, the date of the last broadcast was on øLAST_BROADCASTø</text:p> - <text:p text:style-name="Format">date ( jj/mm/aaaa )</text:p> </text:section> <text:section text:name="Question-j6z06z1e"> diff --git a/src/test/resources/ddi-to-xform/out.xhtml b/src/test/resources/ddi-to-xform/out.xhtml index ffeb91c71..fe2c153df 100644 --- a/src/test/resources/ddi-to-xform/out.xhtml +++ b/src/test/resources/ddi-to-xform/out.xhtml @@ -678,7 +678,7 @@ <label>I - Introduction</label> </j6p0ti5h> <j6p0ti5h-d1> - <label><p><span class="block">We're going to test your knowledge about the simpsons series.</span><span class="block"><b>Welcome in the simspons world!</b></span></p></label> + <label><p><span class="block">We're going to test your knowledge about the simpsons series.</span><span class="block"> <b>Welcome in the simspons world!</b> </span></p></label> </j6p0ti5h-d1> <COMMENT> <label>➡ 1. Before starting, do you have any comments about the Simpsons family?</label> @@ -809,7 +809,7 @@ <label>III - Characters</label> </j6qe0h9q> <j334akov> - <label><p><span class="block question multiple-choice-question">➡ 1. What are the pet names that the Simpsons family had?</span><span class="block hint"><i>Several possible answers</i></span></p></label> + <label><p><span class="block question multiple-choice-question">➡ 1. What are the pet names that the Simpsons family had?</span><span class="block hint"> <i>Several possible answers</i> </span></p></label> </j334akov> <PET1> <item> @@ -836,7 +836,7 @@ </item> </PET4> <d12-SI> - <label><p><b>Now we are going to know if you think that Jay is a gluton.</b></p></label> + <label><p> <b>Now we are going to know if you think that Jay is a gluton.</b> </p></label> </d12-SI> <j6p29i81> <label>➡ 2. Does Jay like the following ice cream flavours?</label> @@ -1160,16 +1160,16 @@ </j4nw0rr6> <j4nw0rr6-j77dav9b-Header-1/> <j4nw0rr6-j77dav9b--1> - <label><p><b><i>Break the windows of the whole city</i></b></p></label> + <label><p> <b> <i>Break the windows of the whole city</i> </b> </p></label> </j4nw0rr6-j77dav9b--1> <j4nw0rr6-j77dav9b-0> - <label><p><b><i>Loose the violin of his daughter playing poker</i></b></p></label> + <label><p> <b> <i>Loose the violin of his daughter playing poker</i> </b> </p></label> </j4nw0rr6-j77dav9b-0> <j4nw0rr6-j77dav9b-1> - <label><p><b><i>Kill Mr Burns</i></b></p></label> + <label><p> <b> <i>Kill Mr Burns</i> </b> </p></label> </j4nw0rr6-j77dav9b-1> <j4nw0rr6-j77dav9b-2> - <label><p><b><i>Leaving a mechanical object to control the nuclear power plant</i></b></p></label> + <label><p> <b> <i>Leaving a mechanical object to control the nuclear power plant</i> </b> </p></label> </j4nw0rr6-j77dav9b-2> <j4nw0rr6-j4nw0rr6-secondDimension-fakeCL-1--1> <label>Clowning</label> @@ -1285,7 +1285,7 @@ <label>France</label> </j6p2lwuj-jbdye1wa-2> <j6p2lwuj-jbdye1wa-3> - <label><p>Other country<span title="Included principalities"> <img src="/img/Help-browser.svg.png"/> </span></p></label> + <label><p>Other country<span title="Included principalities"> <img src="/img/Help-browser.svg.png"/> </span> </p></label> </j6p2lwuj-jbdye1wa-3> <j6p2lwuj-jbdye1wa-4> <label>Other planet</label> @@ -1588,7 +1588,7 @@ <label>I - Introduction</label> </j6p0ti5h> <j6p0ti5h-d1> - <label><p><span class="block">We're going to test your knowledge about the simpsons series.</span><span class="block"><b>Welcome in the simspons world!</b></span></p></label> + <label><p><span class="block">We're going to test your knowledge about the simpsons series.</span><span class="block"> <b>Welcome in the simspons world!</b> </span></p></label> </j6p0ti5h-d1> <COMMENT> <label>➡ 1. Before starting, do you have any comments about the Simpsons family?</label> @@ -1719,7 +1719,7 @@ <label>III - Characters</label> </j6qe0h9q> <j334akov> - <label><p><span class="block question multiple-choice-question">➡ 1. What are the pet names that the Simpsons family had?</span><span class="block hint"><i>Several possible answers</i></span></p></label> + <label><p><span class="block question multiple-choice-question">➡ 1. What are the pet names that the Simpsons family had?</span><span class="block hint"> <i>Several possible answers</i> </span></p></label> </j334akov> <PET1> <item> @@ -1746,7 +1746,7 @@ </item> </PET4> <d12-SI> - <label><p><b>Now we are going to know if you think that Jay is a gluton.</b></p></label> + <label><p> <b>Now we are going to know if you think that Jay is a gluton.</b> </p></label> </d12-SI> <j6p29i81> <label>➡ 2. Does Jay like the following ice cream flavours?</label> @@ -2070,16 +2070,16 @@ </j4nw0rr6> <j4nw0rr6-j77dav9b-Header-1/> <j4nw0rr6-j77dav9b--1> - <label><p><b><i>Break the windows of the whole city</i></b></p></label> + <label> <p> <b> <i>Break the windows of the whole city</i> </b> </p> </label> </j4nw0rr6-j77dav9b--1> <j4nw0rr6-j77dav9b-0> - <label><p><b><i>Loose the violin of his daughter playing poker</i></b></p></label> + <label> <p> <b> <i>Loose the violin of his daughter playing poker</i> </b> </p> </label> </j4nw0rr6-j77dav9b-0> <j4nw0rr6-j77dav9b-1> - <label><p><b><i>Kill Mr Burns</i></b></p></label> + <label> <p> <b> <i>Kill Mr Burns</i> </b> </p> </label> </j4nw0rr6-j77dav9b-1> <j4nw0rr6-j77dav9b-2> - <label><p><b><i>Leaving a mechanical object to control the nuclear power plant</i></b></p></label> + <label> <p> <b> <i>Leaving a mechanical object to control the nuclear power plant</i> </b> </p> </label> </j4nw0rr6-j77dav9b-2> <j4nw0rr6-j4nw0rr6-secondDimension-fakeCL-1--1> <label>Clowning</label> @@ -2195,7 +2195,7 @@ <label>France</label> </j6p2lwuj-jbdye1wa-2> <j6p2lwuj-jbdye1wa-3> - <label><p>Other country<span title="Included principalities"> <img src="/img/Help-browser.svg.png"/> </span></p></label> + <label><p>Other country<span title="Included principalities"> <img src="/img/Help-browser.svg.png"/> </span> </p></label> </j6p2lwuj-jbdye1wa-3> <j6p2lwuj-jbdye1wa-4> <label>Other planet</label> @@ -2568,8 +2568,7 @@ </xf:bind> </xf:bind> </xf:bind> - <!--You can add a resource attribute for the save submission by processing the result with your own xslt.--> - <xf:submission id="save" + <!--You can add a resource attribute for the save submission by processing the result with your own xslt.--><xf:submission id="save" method="post" ref="instance('fr-form-instance')" replace="none" @@ -2581,8 +2580,7 @@ <xf:setvalue ref="xxf:instance('fr-persistence-instance')/data-safe-override">true</xf:setvalue> </xf:action> </xf:submission> - <!--You can add a resource attribute for the submit submission by processing the result with your own xslt.--> - <xf:submission id="submit" + <!--You can add a resource attribute for the submit submission by processing the result with your own xslt.--><xf:submission id="submit" method="post" ref="instance('fr-form-instance')" replace="none" From 64c3ccb7242fda2cf0bfce96b553e497ef789843 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bulot=20Fran=C3=A7ois?= <U7ZR1J@ad.insee.intra> Date: Wed, 21 Aug 2019 10:39:14 +0200 Subject: [PATCH 075/439] Update out.xhtml correct space characters --- src/test/resources/ddi-to-xform/out.xhtml | 32 +++++++++++------------ 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/test/resources/ddi-to-xform/out.xhtml b/src/test/resources/ddi-to-xform/out.xhtml index fe2c153df..ad5389acd 100644 --- a/src/test/resources/ddi-to-xform/out.xhtml +++ b/src/test/resources/ddi-to-xform/out.xhtml @@ -678,7 +678,7 @@ <label>I - Introduction</label> </j6p0ti5h> <j6p0ti5h-d1> - <label><p><span class="block">We're going to test your knowledge about the simpsons series.</span><span class="block"> <b>Welcome in the simspons world!</b> </span></p></label> + <label><p><span class="block">We're going to test your knowledge about the simpsons series.</span><span class="block"><b>Welcome in the simspons world!</b></span></p></label> </j6p0ti5h-d1> <COMMENT> <label>➡ 1. Before starting, do you have any comments about the Simpsons family?</label> @@ -809,7 +809,7 @@ <label>III - Characters</label> </j6qe0h9q> <j334akov> - <label><p><span class="block question multiple-choice-question">➡ 1. What are the pet names that the Simpsons family had?</span><span class="block hint"> <i>Several possible answers</i> </span></p></label> + <label><p><span class="block question multiple-choice-question">➡ 1. What are the pet names that the Simpsons family had?</span><span class="block hint"><i>Several possible answers</i></span></p></label> </j334akov> <PET1> <item> @@ -836,7 +836,7 @@ </item> </PET4> <d12-SI> - <label><p> <b>Now we are going to know if you think that Jay is a gluton.</b> </p></label> + <label><p><b>Now we are going to know if you think that Jay is a gluton.</b></p></label> </d12-SI> <j6p29i81> <label>➡ 2. Does Jay like the following ice cream flavours?</label> @@ -1160,16 +1160,16 @@ </j4nw0rr6> <j4nw0rr6-j77dav9b-Header-1/> <j4nw0rr6-j77dav9b--1> - <label><p> <b> <i>Break the windows of the whole city</i> </b> </p></label> + <label><p><b><i>Break the windows of the whole city</i></b></p></label> </j4nw0rr6-j77dav9b--1> <j4nw0rr6-j77dav9b-0> - <label><p> <b> <i>Loose the violin of his daughter playing poker</i> </b> </p></label> + <label><p><b><i>Loose the violin of his daughter playing poker</i></b></p></label> </j4nw0rr6-j77dav9b-0> <j4nw0rr6-j77dav9b-1> - <label><p> <b> <i>Kill Mr Burns</i> </b> </p></label> + <label><p><b><i>Kill Mr Burns</i></b></p></label> </j4nw0rr6-j77dav9b-1> <j4nw0rr6-j77dav9b-2> - <label><p> <b> <i>Leaving a mechanical object to control the nuclear power plant</i> </b> </p></label> + <label><p><b><i>Leaving a mechanical object to control the nuclear power plant</i></b></p></label> </j4nw0rr6-j77dav9b-2> <j4nw0rr6-j4nw0rr6-secondDimension-fakeCL-1--1> <label>Clowning</label> @@ -1285,7 +1285,7 @@ <label>France</label> </j6p2lwuj-jbdye1wa-2> <j6p2lwuj-jbdye1wa-3> - <label><p>Other country<span title="Included principalities"> <img src="/img/Help-browser.svg.png"/> </span> </p></label> + <label><p>Other country<span title="Included principalities"> <img src="/img/Help-browser.svg.png"/> </span></p></label> </j6p2lwuj-jbdye1wa-3> <j6p2lwuj-jbdye1wa-4> <label>Other planet</label> @@ -1588,7 +1588,7 @@ <label>I - Introduction</label> </j6p0ti5h> <j6p0ti5h-d1> - <label><p><span class="block">We're going to test your knowledge about the simpsons series.</span><span class="block"> <b>Welcome in the simspons world!</b> </span></p></label> + <label><p><span class="block">We're going to test your knowledge about the simpsons series.</span><span class="block"><b>Welcome in the simspons world!</b></span></p></label> </j6p0ti5h-d1> <COMMENT> <label>➡ 1. Before starting, do you have any comments about the Simpsons family?</label> @@ -1719,7 +1719,7 @@ <label>III - Characters</label> </j6qe0h9q> <j334akov> - <label><p><span class="block question multiple-choice-question">➡ 1. What are the pet names that the Simpsons family had?</span><span class="block hint"> <i>Several possible answers</i> </span></p></label> + <label><p><span class="block question multiple-choice-question">➡ 1. What are the pet names that the Simpsons family had?</span><span class="block hint"><i>Several possible answers</i></span></p></label> </j334akov> <PET1> <item> @@ -1746,7 +1746,7 @@ </item> </PET4> <d12-SI> - <label><p> <b>Now we are going to know if you think that Jay is a gluton.</b> </p></label> + <label><p><b>Now we are going to know if you think that Jay is a gluton.</b></p></label> </d12-SI> <j6p29i81> <label>➡ 2. Does Jay like the following ice cream flavours?</label> @@ -2070,16 +2070,16 @@ </j4nw0rr6> <j4nw0rr6-j77dav9b-Header-1/> <j4nw0rr6-j77dav9b--1> - <label> <p> <b> <i>Break the windows of the whole city</i> </b> </p> </label> + <label><p><b><i>Break the windows of the whole city</i></b></p></label> </j4nw0rr6-j77dav9b--1> <j4nw0rr6-j77dav9b-0> - <label> <p> <b> <i>Loose the violin of his daughter playing poker</i> </b> </p> </label> + <label><p><b><i>Loose the violin of his daughter playing poker</i></b></p></label> </j4nw0rr6-j77dav9b-0> <j4nw0rr6-j77dav9b-1> - <label> <p> <b> <i>Kill Mr Burns</i> </b> </p> </label> + <label><p><b><i>Kill Mr Burns</i></b></p></label> </j4nw0rr6-j77dav9b-1> <j4nw0rr6-j77dav9b-2> - <label> <p> <b> <i>Leaving a mechanical object to control the nuclear power plant</i> </b> </p> </label> + <label><p><b><i>Leaving a mechanical object to control the nuclear power plant</i></b></p></label> </j4nw0rr6-j77dav9b-2> <j4nw0rr6-j4nw0rr6-secondDimension-fakeCL-1--1> <label>Clowning</label> @@ -2195,7 +2195,7 @@ <label>France</label> </j6p2lwuj-jbdye1wa-2> <j6p2lwuj-jbdye1wa-3> - <label><p>Other country<span title="Included principalities"> <img src="/img/Help-browser.svg.png"/> </span> </p></label> + <label><p>Other country<span title="Included principalities"> <img src="/img/Help-browser.svg.png"/> </span></p></label> </j6p2lwuj-jbdye1wa-3> <j6p2lwuj-jbdye1wa-4> <label>Other planet</label> From 7107d11310b727ce5e96ee00a91e4ffdeb5db1eb Mon Sep 17 00:00:00 2001 From: BulotF <francois.bulot@insee.fr> Date: Thu, 22 Aug 2019 14:15:44 +0200 Subject: [PATCH 076/439] give id to dynamic array new lines --- src/main/resources/xslt/outputs/fr/models.xsl | 15 ++++++++++++--- src/main/resources/xslt/util/fr/browsing.xsl | 5 +++-- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/main/resources/xslt/outputs/fr/models.xsl b/src/main/resources/xslt/outputs/fr/models.xsl index 2fdb44b5b..9869fd538 100644 --- a/src/main/resources/xslt/outputs/fr/models.xsl +++ b/src/main/resources/xslt/outputs/fr/models.xsl @@ -231,6 +231,7 @@ <xsl:variable name="name" select="enofr:get-name($source-context)"/> <xsl:element name="{$name}-Container"> <xsl:element name="{$name}"> + <xsl:attribute name="id" select="concat($name,'-1')"/> <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> <xsl:with-param name="driver" select="." tunnel="yes"/> </xsl:apply-templates> @@ -252,6 +253,7 @@ <xsl:variable name="name" select="enofr:get-name($source-context)"/> <xsl:element name="{$name}-Container"> <xsl:element name="{$name}"> + <xsl:attribute name="id" select="concat($name,'-1')"/> <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> <xsl:with-param name="driver" select="." tunnel="yes"/> </xsl:apply-templates> @@ -333,6 +335,7 @@ <xsl:param name="source-context" as="item()" tunnel="yes"/> <!-- create element with same name and acts like what is done for the instance part --> <xsl:element name="{enofr:get-name($source-context)}"> + <xsl:attribute name="id"/> <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> <xsl:with-param name="driver" select="eno:append-empty-element('Instance', .)" tunnel="yes"/> </xsl:apply-templates> @@ -2119,9 +2122,15 @@ <xsl:if test="not($max-lines != '') or number($max-lines) > number(enofr:get-minimum-lines($source-context))"> <xf:trigger id="{$loop-name}-addline" bind="{$loop-name}-addline-bind"> <xf:label ref="$form-resources/AddLine/label"/> - <xf:insert ev:event="DOMActivate" context="{$instance-ancestor-label}{$loop-name}-Container" - nodeset="{$instance-ancestor-label}{$loop-name}" position="after" - origin="instance('fr-form-loop-model')/{$loop-name}"/> + <xf:action ev:event="DOMActivate"> + <xf:insert context="{$instance-ancestor-label}{$loop-name}-Container" + nodeset="{$instance-ancestor-label}{$loop-name}" position="after" + origin="instance('fr-form-loop-model')/{$loop-name}"/> + <xf:setvalue ref="{$instance-ancestor-label}{$loop-name}-Count" + value="number({$instance-ancestor-label}{$loop-name}-Count) +1"/> + <xf:setvalue ref="{$instance-ancestor-label}{$loop-name}[last()]/@id" + value="concat('{$loop-name}-',{$instance-ancestor-label}{$loop-name}-Count)"/> + </xf:action> </xf:trigger> </xsl:if> </xsl:template> diff --git a/src/main/resources/xslt/util/fr/browsing.xsl b/src/main/resources/xslt/util/fr/browsing.xsl index 834d2e624..5368848b3 100644 --- a/src/main/resources/xslt/util/fr/browsing.xsl +++ b/src/main/resources/xslt/util/fr/browsing.xsl @@ -470,8 +470,9 @@ <xf:insert context="instance('fr-form-instance')//{$dynamic-array}-Container" nodeset="instance('fr-form-instance')//{$dynamic-array}" position="after" - origin="instance('fr-form-loop-model')/{$dynamic-array}" - /> + origin="instance('fr-form-loop-model')/{$dynamic-array}"/> + <xf:setvalue ref="instance('fr-form-instance')//{$dynamic-array}[last()]/@id" + value="concat('{$dynamic-array}-',count(instance('fr-form-instance')//{$dynamic-array}))"/> </xf:action> </xf:action> <xf:action if="count(instance('fr-form-instance')//{$dynamic-array}) > instance('fr-form-instance')//{$dynamic-array}-Count"> From 816df993f3a35f79d99f426c6ed94f3c0ea78ee8 Mon Sep 17 00:00:00 2001 From: BulotF <francois.bulot@insee.fr> Date: Thu, 22 Aug 2019 14:17:41 +0200 Subject: [PATCH 077/439] Update out.xhtml --- src/test/resources/ddi-to-xform/out.xhtml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/test/resources/ddi-to-xform/out.xhtml b/src/test/resources/ddi-to-xform/out.xhtml index ad5389acd..49eb9261c 100644 --- a/src/test/resources/ddi-to-xform/out.xhtml +++ b/src/test/resources/ddi-to-xform/out.xhtml @@ -159,7 +159,7 @@ <j6qg8rc6-j6qg8rc6-secondDimension-fakeCL-1--1/> <j6qg8rc6-j6qg8rc6-secondDimension-fakeCL-1-0/> <j6qg8rc6-Container> - <j6qg8rc6> + <j6qg8rc6 id="j6qg8rc6-1"> <FAVOURITE_CHARACTERS11/> <FAVOURITE_CHARACTERS21/> <FAVOURITE_CHARACTERS31/> @@ -202,7 +202,7 @@ </xf:instance> <xf:instance id="fr-form-loop-model"> <LoopModels> - <j6qg8rc6> + <j6qg8rc6 id=""> <FAVOURITE_CHARACTERS11/> <FAVOURITE_CHARACTERS21/> <FAVOURITE_CHARACTERS31/> @@ -2600,6 +2600,8 @@ nodeset="instance('fr-form-instance')//j6qg8rc6" position="after" origin="instance('fr-form-loop-model')/j6qg8rc6"/> + <xf:setvalue ref="instance('fr-form-instance')//j6qg8rc6[last()]/@id" + value="concat('j6qg8rc6-',count(instance('fr-form-instance')//j6qg8rc6))"/> </xf:action> </xf:action> <xf:action if="count(instance('fr-form-instance')//j6qg8rc6) > instance('fr-form-instance')//j6qg8rc6-Count"> @@ -4497,11 +4499,16 @@ </xhtml:table> <xf:trigger id="j6qg8rc6-addline" bind="j6qg8rc6-addline-bind"> <xf:label ref="$form-resources/AddLine/label"/> - <xf:insert ev:event="DOMActivate" - context="instance('fr-form-instance')//j6qg8rc6-Container" + <xf:action ev:event="DOMActivate"> + <xf:insert context="instance('fr-form-instance')//j6qg8rc6-Container" nodeset="instance('fr-form-instance')//j6qg8rc6" position="after" origin="instance('fr-form-loop-model')/j6qg8rc6"/> + <xf:setvalue ref="instance('fr-form-instance')//j6qg8rc6-Count" + value="number(instance('fr-form-instance')//j6qg8rc6-Count) +1"/> + <xf:setvalue ref="instance('fr-form-instance')//j6qg8rc6[last()]/@id" + value="concat('j6qg8rc6-',instance('fr-form-instance')//j6qg8rc6-Count)"/> + </xf:action> </xf:trigger> </fr:section> </xf:case> From f8fd83c825ad4c2c6c70c3e20cd21013e249a97e Mon Sep 17 00:00:00 2001 From: BulotF <francois.bulot@insee.fr> Date: Fri, 23 Aug 2019 12:16:57 +0200 Subject: [PATCH 078/439] use @id instead of position() for loops --- src/main/resources/xslt/outputs/fr/models.xsl | 122 +++--------------- src/main/resources/xslt/util/fr/browsing.xsl | 36 +----- 2 files changed, 18 insertions(+), 140 deletions(-) diff --git a/src/main/resources/xslt/outputs/fr/models.xsl b/src/main/resources/xslt/outputs/fr/models.xsl index 9869fd538..0230a1d1f 100644 --- a/src/main/resources/xslt/outputs/fr/models.xsl +++ b/src/main/resources/xslt/outputs/fr/models.xsl @@ -214,7 +214,7 @@ <xsl:template match="SingleResponseQuestion[ancestor::Resource or ancestor::ResourceBind]" mode="model"> <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="language" tunnel="yes"/> - <xsl:param name="instance-ancestor" tunnel="yes"/> + <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> <xsl:with-param name="driver" select="." tunnel="yes"/> <xsl:with-param name="question-label" select="eno:serialize(enofr:get-label($source-context,$language))" tunnel="yes"/> @@ -370,9 +370,6 @@ </xsl:if> <xsl:if test="$relevant != ''"> <xsl:attribute name="relevant"> - <xsl:if test="$instance-ancestor != ''"> - <xsl:value-of select="concat('ancestor::',tokenize($instance-ancestor,' ')[last()],'[')"/> - </xsl:if> <xsl:call-template name="replaceVariablesInFormula"> <xsl:with-param name="formula" select="$relevant"/> <xsl:with-param name="calcul-aim" select="'filter'"/> @@ -386,9 +383,6 @@ </xsl:with-param> <xsl:with-param name="instance-ancestor" select="$instance-ancestor"/> </xsl:call-template> - <xsl:if test="$instance-ancestor != ''"> - <xsl:value-of select="']'"/> - </xsl:if> </xsl:attribute> </xsl:if> <xsl:if test="$variable-calculate != ''"> @@ -411,9 +405,6 @@ <xsl:if test="not($readonly = ('false()', ''))"> <xsl:attribute name="readonly"> <xsl:value-of select="'not('"/> - <xsl:if test="$instance-ancestor != ''"> - <xsl:value-of select="concat('ancestor::',tokenize($instance-ancestor,' ')[last()],'[')"/> - </xsl:if> <xsl:call-template name="replaceVariablesInFormula"> <xsl:with-param name="formula" select="$readonly"/> <xsl:with-param name="calcul-aim" select="'filter'"/> @@ -427,9 +418,6 @@ </xsl:with-param> <xsl:with-param name="instance-ancestor" select="$instance-ancestor"/> </xsl:call-template> - <xsl:if test="$instance-ancestor != ''"> - <xsl:value-of select="']'"/> - </xsl:if> <xsl:value-of select="')'"/> </xsl:attribute> </xsl:if> @@ -440,9 +428,6 @@ <xsl:attribute name="level" select="$alert-level"/> </xsl:if> <xsl:attribute name="value"> - <xsl:if test="$instance-ancestor != ''"> - <xsl:value-of select="concat('ancestor::',tokenize($instance-ancestor,' ')[last()],'[')"/> - </xsl:if> <xsl:if test="self::ConsistencyCheck and enofr:get-readonly-ancestors($source-context) != ''"> <xsl:variable name="initial-readonly-ancestors"> <xsl:for-each select="enofr:get-readonly-ancestors($source-context)"> @@ -476,9 +461,6 @@ </xsl:with-param> <xsl:with-param name="instance-ancestor" select="$instance-ancestor"/> </xsl:call-template> - <xsl:if test="$instance-ancestor != ''"> - <xsl:value-of select="']'"/> - </xsl:if> </xsl:attribute> </xsl:element> </xsl:if> @@ -515,9 +497,6 @@ </xsl:if> <xsl:if test="$relevant != ''"> <xsl:attribute name="relevant"> - <xsl:if test="$instance-ancestor != ''"> - <xsl:value-of select="concat('ancestor::',tokenize($instance-ancestor,' ')[last()],'[')"/> - </xsl:if> <xsl:call-template name="replaceVariablesInFormula"> <xsl:with-param name="formula" select="$relevant"/> <xsl:with-param name="calcul-aim" select="'filter'"/> @@ -531,17 +510,11 @@ </xsl:with-param> <xsl:with-param name="instance-ancestor" select="$instance-ancestor"/> </xsl:call-template> - <xsl:if test="$instance-ancestor != ''"> - <xsl:value-of select="']'"/> - </xsl:if> </xsl:attribute> </xsl:if> <xsl:if test="not($readonly = ('false()', ''))"> <xsl:attribute name="readonly"> <xsl:value-of select="'not('"/> - <xsl:if test="$instance-ancestor != ''"> - <xsl:value-of select="concat('ancestor::',tokenize($instance-ancestor,' ')[last()],'[')"/> - </xsl:if> <xsl:call-template name="replaceVariablesInFormula"> <xsl:with-param name="formula" select="$readonly"/> <xsl:with-param name="calcul-aim" select="'filter'"/> @@ -555,9 +528,6 @@ </xsl:with-param> <xsl:with-param name="instance-ancestor" select="$instance-ancestor"/> </xsl:call-template> - <xsl:if test="$instance-ancestor != ''"> - <xsl:value-of select="']'"/> - </xsl:if> <xsl:value-of select="')'"/> </xsl:attribute> </xsl:if> @@ -603,9 +573,6 @@ </xsl:if> <xsl:if test="$relevant != ''"> <xsl:attribute name="relevant"> - <xsl:if test="$instance-ancestor != ''"> - <xsl:value-of select="concat('ancestor::',tokenize($instance-ancestor,' ')[last()],'[')"/> - </xsl:if> <xsl:call-template name="replaceVariablesInFormula"> <xsl:with-param name="formula" select="$relevant"/> <xsl:with-param name="calcul-aim" select="'filter'"/> @@ -619,17 +586,11 @@ </xsl:with-param> <xsl:with-param name="instance-ancestor" select="$instance-ancestor"/> </xsl:call-template> - <xsl:if test="$instance-ancestor != ''"> - <xsl:value-of select="']'"/> - </xsl:if> </xsl:attribute> </xsl:if> <xsl:if test="not($readonly = ('false()', ''))"> <xsl:attribute name="readonly"> <xsl:value-of select="'not('"/> - <xsl:if test="$instance-ancestor != ''"> - <xsl:value-of select="concat('ancestor::',tokenize($instance-ancestor,' ')[last()],'[')"/> - </xsl:if> <xsl:call-template name="replaceVariablesInFormula"> <xsl:with-param name="formula" select="$readonly"/> <xsl:with-param name="calcul-aim" select="'filter'"/> @@ -643,9 +604,6 @@ </xsl:with-param> <xsl:with-param name="instance-ancestor" select="$instance-ancestor"/> </xsl:call-template> - <xsl:if test="$instance-ancestor != ''"> - <xsl:value-of select="']'"/> - </xsl:if> <xsl:value-of select="')'"/> </xsl:attribute> </xsl:if> @@ -944,9 +902,6 @@ <xf:bind id="{$name}-bind" name="{$name}" ref="{$name}"> <xsl:if test="$relevant != ''"> <xsl:attribute name="relevant"> - <xsl:if test="$instance-ancestor != ''"> - <xsl:value-of select="concat('ancestor::',tokenize($instance-ancestor,' ')[last()],'[')"/> - </xsl:if> <xsl:call-template name="replaceVariablesInFormula"> <xsl:with-param name="formula" select="$relevant"/> <xsl:with-param name="calcul-aim" select="'filter'"/> @@ -960,17 +915,11 @@ </xsl:with-param> <xsl:with-param name="instance-ancestor" select="$instance-ancestor"/> </xsl:call-template> - <xsl:if test="$instance-ancestor != ''"> - <xsl:value-of select="']'"/> - </xsl:if> </xsl:attribute> </xsl:if> <xsl:if test="not($readonly = ('false()', ''))"> <xsl:attribute name="readonly"> <xsl:value-of select="'not('"/> - <xsl:if test="$instance-ancestor != ''"> - <xsl:value-of select="concat('ancestor::',tokenize($instance-ancestor,' ')[last()],'[')"/> - </xsl:if> <xsl:call-template name="replaceVariablesInFormula"> <xsl:with-param name="formula" select="$readonly"/> <xsl:with-param name="calcul-aim" select="'filter'"/> @@ -984,9 +933,6 @@ </xsl:with-param> <xsl:with-param name="instance-ancestor" select="$instance-ancestor"/> </xsl:call-template> - <xsl:if test="$instance-ancestor != ''"> - <xsl:value-of select="']'"/> - </xsl:if> <xsl:value-of select="')'"/> </xsl:attribute> </xsl:if> @@ -1031,7 +977,7 @@ <xsl:variable name="instance-ancestor-label"> <xsl:value-of select="'instance(''fr-form-instance'')//'"/> <xsl:for-each select="tokenize($instance-ancestor,' ')"> - <xsl:value-of select="concat('*[name()=''',.,'''][$',.,'-position]//')"/> + <xsl:value-of select="concat(.,'[@id = current()/ancestor::',.,'/@id]//')"/> </xsl:for-each> </xsl:variable> @@ -1161,9 +1107,6 @@ </xsl:if> <xsl:if test="$relevant != ''"> <xsl:attribute name="relevant"> - <xsl:if test="$instance-ancestor != ''"> - <xsl:value-of select="concat('ancestor::',tokenize($instance-ancestor,' ')[last()],'[')"/> - </xsl:if> <xsl:call-template name="replaceVariablesInFormula"> <xsl:with-param name="formula" select="$relevant"/> <xsl:with-param name="calcul-aim" select="'filter'"/> @@ -1177,17 +1120,11 @@ </xsl:with-param> <xsl:with-param name="instance-ancestor" select="$instance-ancestor"/> </xsl:call-template> - <xsl:if test="$instance-ancestor != ''"> - <xsl:value-of select="']'"/> - </xsl:if> </xsl:attribute> </xsl:if> <xsl:if test="not($readonly = ('false()', ''))"> <xsl:attribute name="readonly"> <xsl:value-of select="'not('"/> - <xsl:if test="$instance-ancestor != ''"> - <xsl:value-of select="concat('ancestor::',tokenize($instance-ancestor,' ')[last()],'[')"/> - </xsl:if> <xsl:call-template name="replaceVariablesInFormula"> <xsl:with-param name="formula" select="$readonly"/> <xsl:with-param name="calcul-aim" select="'filter'"/> @@ -1201,9 +1138,6 @@ </xsl:with-param> <xsl:with-param name="instance-ancestor" select="$instance-ancestor"/> </xsl:call-template> - <xsl:if test="$instance-ancestor != ''"> - <xsl:value-of select="']'"/> - </xsl:if> <xsl:value-of select="')'"/> </xsl:attribute> </xsl:if> @@ -1313,7 +1247,6 @@ <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="language" tunnel="yes"/> <xsl:param name="question-label" tunnel="yes"/> - <xsl:param name="instance-ancestor" tunnel="yes"/> <xsl:variable name="label" select="enofr:get-label($source-context, $language)"/> <xsl:variable name="hint" select="enofr:get-hint($source-context, $language)"/> @@ -1375,7 +1308,6 @@ <xsl:template match="Resource//ConsistencyCheck" mode="model"> <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="language" tunnel="yes"/> - <xsl:param name="instance-ancestor" tunnel="yes"/> <xsl:variable name="alert" select="eno:serialize(enofr:get-label($source-context, $language))"/> @@ -1763,7 +1695,7 @@ <xsl:variable name="instance-ancestor-label"> <xsl:value-of select="'instance(''fr-form-instance'')//'"/> <xsl:for-each select="tokenize($instance-ancestor,' ')"> - <xsl:value-of select="concat('*[name()=''',.,'''][$',.,'-position]//')"/> + <xsl:value-of select="concat(.,'[@id = current()/ancestor::',.,'/@id]//')"/> </xsl:for-each> </xsl:variable> <xsl:variable name="xforms-element"> @@ -2073,7 +2005,7 @@ <xsl:variable name="instance-ancestor-label"> <xsl:value-of select="'instance(''fr-form-instance'')//'"/> <xsl:for-each select="tokenize($instance-ancestor,' ')"> - <xsl:value-of select="concat('*[name()=''',.,'''][$',.,'-position]//')"/> + <xsl:value-of select="concat(.,'[@id = current()/ancestor::',.,'/@id]//')"/> </xsl:for-each> </xsl:variable> @@ -2265,7 +2197,7 @@ <xsl:variable name="instance-ancestor-label"> <xsl:value-of select="'instance(''fr-form-instance'')//'"/> <xsl:for-each select="tokenize($instance-ancestor,' ')"> - <xsl:value-of select="concat('*[name()=''',.,'''][$',.,'-position]//')"/> + <xsl:value-of select="concat(.,'[@id = current()/ancestor::',.,'/@id]//')"/> </xsl:for-each> </xsl:variable> @@ -2297,7 +2229,7 @@ <xsl:variable name="instance-ancestor-label"> <xsl:value-of select="'instance(''fr-form-instance'')//'"/> <xsl:for-each select="tokenize($instance-ancestor,' ')"> - <xsl:value-of select="concat('*[name()=''',.,'''][$',.,'-position]//')"/> + <xsl:value-of select="concat(.,'[@id = current()/ancestor::',.,'/@id]//')"/> </xsl:for-each> </xsl:variable> @@ -2917,7 +2849,7 @@ <xsl:variable name="variable-ancestors" select="enofr:get-variable-business-ancestors($source-context,$conditioning-variable)"/> <xsl:if test="$variable-ancestors != ''"> <xsl:for-each select="tokenize($variable-ancestors,' ')"> - <xsl:value-of select="concat(.,'[$',.,'-position]//')"/> + <xsl:value-of select="concat(.,'[@id = current()/ancestor::',.,'/@id]//')"/> </xsl:for-each> </xsl:if> <xsl:value-of select="enofr:get-variable-business-name($source-context,$conditioning-variable)"/> @@ -2954,38 +2886,14 @@ <xsl:variable name="variable-business-name"> <xsl:variable name="variable-ancestors" select="enofr:get-variable-business-ancestors($source-context,$current-variable)"/> <xsl:variable name="business-name" select="enofr:get-variable-business-name($source-context,$current-variable)"/> - <xsl:choose> - <!-- the calculation or the variable directly depends on the root : the variable is directly called from the root --> - <xsl:when test="not($instance-group) or not($variable-ancestors)"> - <xsl:value-of select="concat('//',$business-name)"/> - </xsl:when> - <!-- the calculation and the variable depend on loops and the calculation is a label --> - <!-- the variable is called with its whole absolute address --> - <xsl:when test="$calcul-aim = 'label'"> - <xsl:value-of select="'instance(''fr-form-instance'')//'"/> - <xsl:for-each select="tokenize($variable-ancestors,' ')"> - <xsl:if test=". = tokenize($instance-ancestor,' ')"> - <xsl:value-of select="concat(.,'[\$',.,'-position]//')"/> - </xsl:if> - </xsl:for-each> - <xsl:value-of select="$business-name"/> - </xsl:when> - <!-- the calculation and the variable depend on loops and the calculation is a calculated variable --> - <!-- the variable is called with "ancestor::" before the last ancestor --> - <xsl:when test="$calcul-aim = 'calculation'"> - <xsl:value-of select="concat('ancestor::',tokenize($variable-ancestors,' ')[last()],'//',$business-name)"/> - </xsl:when> - <!-- the calculation and the variable depend on loops and the calculation is a filter or a check and the variable depends on the calculation's loop --> - <!-- the variable is called as a descendant of the filter or check instance --> - <xsl:when test="$instance-group = tokenize($variable-ancestors,' ')"> - <xsl:value-of select="concat('descendant::',$business-name)"/> - </xsl:when> - <!-- the calculation and the variable depend on loops and the calculation is a filter or a check and the variable does not depend on the calculation's loop --> - <!-- the variable is called as a descendant of the nearest possible ancestor --> - <xsl:otherwise> - <xsl:value-of select="concat('ancestor::*[descendant::',$business-name,'][1]/descendant::',$business-name)"/> - </xsl:otherwise> - </xsl:choose> + + <xsl:value-of select="'instance(''fr-form-instance'')//'"/> + <xsl:for-each select="tokenize($variable-ancestors,' ')"> + <xsl:if test=". = tokenize($instance-ancestor,' ')"> + <xsl:value-of select="concat(.,'[@id = current()/ancestor::',.,'/@id]//')"/> + </xsl:if> + </xsl:for-each> + <xsl:value-of select="$business-name"/> </xsl:variable> <xsl:call-template name="replaceVariablesInFormula"> <xsl:with-param name="formula" select="replace($formula, diff --git a/src/main/resources/xslt/util/fr/browsing.xsl b/src/main/resources/xslt/util/fr/browsing.xsl index 5368848b3..6dda08b76 100644 --- a/src/main/resources/xslt/util/fr/browsing.xsl +++ b/src/main/resources/xslt/util/fr/browsing.xsl @@ -708,15 +708,7 @@ </xsl:apply-templates> </xsl:variable> <xsl:if test="$constraint[text()!='']"> - <xf:constraint> - <xsl:attribute name="value"> - <xsl:value-of select="'instance(''fr-form-instance'')'"/> - <xsl:for-each select="tokenize($loop-ancestors,' ')"> - <xsl:value-of select="concat('//',.,'[$',.,'-position]')"/> - </xsl:for-each> - <xsl:value-of select="concat('[',$constraint,']')"/> - </xsl:attribute> - </xf:constraint> + <xf:constraint value="{$constraint}"/> </xsl:if> </xf:bind> </xsl:template> @@ -740,18 +732,7 @@ <xsl:if test="preceding::xf:constraint[@level=$level and ancestor::xf:bind/@name=$parent-name]"> <xsl:value-of select="' and '"/> </xsl:if> - <xsl:value-of select="'('"/> - <xsl:choose> - <xsl:when test="not($last-ancestor != '')"> - <xsl:value-of select="@value"/> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="substring(substring-after(@value,concat('ancestor::',$last-ancestor)), - 2, - string-length(substring-after(@value,concat('ancestor::',$last-ancestor)))-2)"/> - </xsl:otherwise> - </xsl:choose> - <xsl:value-of select="')'"/> + <xsl:value-of select="concat('(',@value,')')"/> </xsl:if> </xsl:template> @@ -767,18 +748,7 @@ <xsl:if test="preceding::xf:constraint[@level=$level and ancestor::xf:bind/@name=$parent-name]"> <xsl:value-of select="' and '"/> </xsl:if> - <xsl:value-of select="'(not('"/> - <xsl:choose> - <xsl:when test="not($last-ancestor != '')"> - <xsl:value-of select="@relevant"/> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="substring(substring-after(@relevant,concat('ancestor::',$last-ancestor)), - 2, - string-length(substring-after(@relevant,concat('ancestor::',$last-ancestor)))-2)"/> - </xsl:otherwise> - </xsl:choose> - <xsl:value-of select="') or '"/> + <xsl:value-of select="concat('(not(',@relevant,') or ')"/> <xsl:apply-templates select="*" mode="page-check"> <xsl:with-param name="parent-name" select="@name" tunnel="yes"/> </xsl:apply-templates> From 59e0cd2cfb487f333dc13e953107916de05736f2 Mon Sep 17 00:00:00 2001 From: BulotF <francois.bulot@insee.fr> Date: Tue, 27 Aug 2019 15:16:54 +0200 Subject: [PATCH 079/439] Update dereferencing.xsl use Antoine Dreyer's version (with updates) --- .../resources/xslt/util/ddi/dereferencing.xsl | 783 ++++++++++++------ 1 file changed, 515 insertions(+), 268 deletions(-) diff --git a/src/main/resources/xslt/util/ddi/dereferencing.xsl b/src/main/resources/xslt/util/ddi/dereferencing.xsl index aa598bd9c..bf2cee70e 100644 --- a/src/main/resources/xslt/util/ddi/dereferencing.xsl +++ b/src/main/resources/xslt/util/ddi/dereferencing.xsl @@ -1,350 +1,597 @@ <?xml version="1.0" encoding="UTF-8"?> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:xs="http://www.w3.org/2001/XMLSchema" + xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl" xmlns:xhtml="http://www.w3.org/1999/xhtml" - xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl" xmlns:d="ddi:datacollection:3_3" - xmlns:r="ddi:reusable:3_3" xmlns:l="ddi:logicalproduct:3_3" xmlns:g="ddi:group:3_3" - xmlns:s="ddi:studyunit:3_3" xmlns:xs="http://www.w3.org/2001/XMLSchema" version="2.0"> - - <xd:doc scope="stylesheet"> - <xd:desc> - <xd:p>This stylesheet is used to dereference DDI.</xd:p> - </xd:desc> - </xd:doc> + xmlns:a="ddi:archive:3_3" + xmlns:d="ddi:datacollection:3_3" + xmlns:r="ddi:reusable:3_3" + xmlns:l="ddi:logicalproduct:3_3" + xmlns:g="ddi:group:3_3" + xmlns:s="ddi:studyunit:3_3" + xmlns:pogues="http://xml.insee.fr/schema/applis/pogues" + xmlns:pr="ddi:ddiprofile:3_3" + xmlns:c="ddi:conceptualcomponent:3_3" + xmlns:cm="ddi:comparative:3_3" + xmlns:ddi-instance="ddi:instance:3_3" + xmlns:dereferencing="dereferencing" + xmlns="ddi:instance:3_3" + exclude-result-prefixes="xd" + version="2.0"> + <xsl:output method="xml" indent="no" encoding="UTF-8"/> + <xd:doc> <xd:desc> <xd:p>The output folder in which the dereferenced files (one for each main sequence) are generated.</xd:p> </xd:desc> </xd:doc> <xsl:param name="output-folder"/> + + <xsl:param name="do-not-use-key" select="false()"/><!--set to false() if you don't want to use keys and test how much time keys make you save --> + <xsl:param name="fast-and-dangerous-mode" select="false()"/><!--set to false() if you don't know--> + <xsl:param name="build-messages" select="true()"/><!--set to true() if you doubt of the result and false() if you are sure it will succeed --> + <xsl:param name="build-DDI" select="true()"/><!--set to true() if you don't know--> + <xsl:strip-space elements="*"/> - <!-- The output file generated will be xml type --> - <xsl:output method="xml" indent="no" encoding="UTF-8"/> - - <!--<xsl:strip-space elements="*"/>--> - - <xd:doc> + <xd:doc scope="stylesheet"> <xd:desc> - <xd:p>The external-variables are not collected nor calculated.</xd:p> + <xd:p><xd:b>Created on:</xd:b> Aug 8, 2017</xd:p> + <xd:p><xd:b>Author:</xd:b> nirnfv</xd:p> + <xd:p></xd:p> </xd:desc> </xd:doc> - <xsl:variable name="external-variables"> - <ExternalVariables> - <xsl:for-each select="//l:VariableScheme/l:Variable[not(r:QuestionReference or r:SourceParameterReference or descendant::r:ProcessingInstructionReference)]"> - <Variable> - <xsl:attribute name="id" select="r:ID"/> - <xsl:attribute name="variable-name" select="l:VariableName/r:String"/> - </Variable> - </xsl:for-each> - </ExternalVariables> + <xsl:variable name="follow-references"> + <dereferencing:reference-name name="r:CategoryReference"/> + <dereferencing:reference-name name="r:CodeListReference"/> + <dereferencing:reference-name name="r:CodeReference"/> + <dereferencing:reference-name name="d:ControlConstructReference"/> + <dereferencing:reference-name name="d:ThenConstructReference"/> + <dereferencing:reference-name name="d:ElseConstructReference"/> + <dereferencing:reference-name name="d:InterviewerInstructionReference"/> + <dereferencing:reference-name name="r:QuestionReference"/> + <dereferencing:reference-name name="d:QuestionItemReference"/> + <dereferencing:reference-name name="d:QuestionGridReference"/> + <dereferencing:reference-name name="d:DateTimeDomainReference"/> + <dereferencing:reference-name name="r:DateTimeRepresentationReference"/> + <dereferencing:reference-name name="d:NumericDomainReference"/> + <dereferencing:reference-name name="r:NumericRepresentationReference"/> + <dereferencing:reference-name name="r:VariableReference"/> </xsl:variable> - <xd:doc> - <xd:desc> - <xd:p>The calculated variables refer to control construct, not the contrary.</xd:p> - <xd:p>templates sequences, loops and dynamic tables always verify if there are calculated variables</xd:p> - <xd:p>this variable lists the other elements linked to calculated variables</xd:p> - </xd:desc> - </xd:doc> - <xsl:variable name="calculated-variables-sequences" as="node()"> - <Variables> - <xsl:for-each select="//d:GenerationInstruction/d:ControlConstructReference"> - <xsl:if test="not(current()/r:ID = //d:Sequence[d:TypeOfSequence = 'template']/r:ID) - and not(current()/r:ID = //d:Loop/r:ID) - and not(current()/r:ID = //d:QuestionGrid[d:GridDimension/d:Roster]/r:ID)"> - <Variable> - <xsl:value-of select="r:ID"/> - </Variable> - </xsl:if> - </xsl:for-each> - </Variables> + <xsl:variable name="ignore-references"> + <dereferencing:reference-name name="r:QuestionSchemeReference"/> + <dereferencing:reference-name name="r:ControlConstructSchemeReference"/> + <dereferencing:reference-name name="r:InterviewerInstructionSchemeReference"/> + <dereferencing:reference-name name="r:SourceParameterReference"/> + <dereferencing:reference-name name="r:TargetParameterReference"/> + <dereferencing:reference-name name="r:BasedOnReference"/> + <dereferencing:reference-name name="r:ExternalURLReference"/> + <!-- Celle-ci, je doute --> + <dereferencing:reference-name name="r:ProcessingInstructionReference"/> </xsl:variable> - <xd:doc> - <xd:desc> - <xd:p>Root template :</xd:p> - <xd:p>Successively, some group of elements is used to dereference some other group of elements.</xd:p> - </xd:desc> - </xd:doc> - <xsl:template match="/"> - <!-- The references used to dereference at the beginning --> - <xsl:variable name="references-for-codelists"> - <xsl:element name="g:ResourcePackage"> - <xsl:copy-of select="//l:CodeListScheme"/> - <xsl:copy-of select="//l:CategoryScheme"/> - <xsl:copy-of select="//d:InterviewerInstructionScheme"/> - </xsl:element> - </xsl:variable> - <!-- The l:CodeListScheme are dereferenced --> - <xsl:variable name="dereferenced-codelists"> - <xsl:element name="g:ResourcePackage"> - <xsl:apply-templates select="//l:CodeListScheme"> - <xsl:with-param name="references" select="$references-for-codelists" tunnel="yes"/> - </xsl:apply-templates> - </xsl:element> - </xsl:variable> - - <!-- The dereferenced l:CodeListScheme, the d:InterviewerInstructionScheme, the r:ManagedRepresentationScheme and the d:QuestionScheme are used as new references --> - <xsl:variable name="references-for-questions"> - <xsl:copy-of select="//d:QuestionScheme"/> - <xsl:copy-of select="//d:InterviewerInstructionScheme"/> - <xsl:copy-of select="//r:ManagedRepresentationScheme"/> - <xsl:copy-of select="//d:ProcessingInstructionScheme"/> - <xsl:copy-of select="$dereferenced-codelists//l:CodeListScheme"/> - </xsl:variable> - - <!-- The d:QuestionScheme are dereferenced --> - <xsl:variable name="dereferenced-questions"> - <xsl:element name="g:ResourcePackage"> - <xsl:apply-templates select="//d:QuestionScheme"> - <xsl:with-param name="references" select="$references-for-questions" tunnel="yes"/> - </xsl:apply-templates> - </xsl:element> - </xsl:variable> + <xsl:variable name="key-names"> + <xsl:choose> + <xsl:when test="$do-not-use-key"> + <dereferencing:key-name name='_' name1='_' name2='_'/> + </xsl:when> + <xsl:otherwise> + <dereferencing:key-name name='r:CategoryReference-_-Category' name1='r:CategoryReference' name2='Category'/> + <dereferencing:key-name name='r:CodeListReference-_-CodeList' name1='r:CodeListReference' name2='CodeList'/> + <dereferencing:key-name name='r:CodeReference-_-Code' name1='r:CodeReference' name2='Code'/> + <dereferencing:key-name name='d:ControlConstructReference-_-ComputationItem' name1='d:ControlConstructReference' name2='ComputationItem'/> + <dereferencing:key-name name='d:ControlConstructReference-_-IfThenElse' name1='d:ControlConstructReference' name2='IfThenElse'/> + <dereferencing:key-name name='d:ControlConstructReference-_-QuestionConstruct' name1='d:ControlConstructReference' name2='QuestionConstruct'/> + <dereferencing:key-name name='d:ControlConstructReference-_-StatementItem' name1='d:ControlConstructReference' name2='StatementItem'/> + <dereferencing:key-name name='d:ControlConstructReference-_-Sequence' name1='d:ControlConstructReference' name2='Sequence'/> + <dereferencing:key-name name='d:ControlConstructReference-_-Loop' name1='d:ControlConstructReference' name2='Loop'/> + <dereferencing:key-name name='d:ThenConstructReference-_-Sequence' name1='d:ThenConstructReference' name2='Sequence'/> + <dereferencing:key-name name='d:ElseConstructReference-_-Sequence' name1='d:ElseConstructReference' name2='Sequence'/> + <dereferencing:key-name name='d:InterviewerInstructionReference-_-Instruction' name1='d:InterviewerInstructionReference' name2='Instruction'/> + <dereferencing:key-name name='r:QuestionReference-_-QuestionBlock' name1='r:QuestionReference' name2='QuestionBlock'/> + <dereferencing:key-name name='r:QuestionReference-_-QuestionGrid' name1='r:QuestionReference' name2='QuestionGrid'/> + <dereferencing:key-name name='r:QuestionReference-_-QuestionItem' name1='r:QuestionReference' name2='QuestionItem'/> + <dereferencing:key-name name='d:QuestionGridReference-_-QuestionGrid' name1='d:QuestionGridReference' name2='QuestionGrid'/> + <dereferencing:key-name name='d:QuestionItemReference-_-QuestionItem' name1='d:QuestionItemReference' name2='QuestionItem'/> + <dereferencing:key-name name='d:DateTimeDomainReference-_-ManagedDateTimeRepresentation' name1='d:DateTimeDomainReference' name2='ManagedDateTimeRepresentation'/> + <dereferencing:key-name name='r:DateTimeRepresentationReference-_-ManagedDateTimeRepresentation' name1='r:DateTimeRepresentationReference' name2='ManagedDateTimeRepresentation'/> + <dereferencing:key-name name='d:NumericDomainReference-_-ManagedNumericRepresentation' name1='d:NumericDomainReference' name2='ManagedNumericRepresentation'/> + <dereferencing:key-name name='r:NumericRepresentationReference-_-ManagedNumericRepresentation' name1='r:NumericRepresentationReference' name2='ManagedNumericRepresentation'/> + <dereferencing:key-name name='r:VariableReference-_-Variable' name1='r:VariableReference' name2='Variable'/> + <dereferencing:key-name name='r:VariableGroupReference-_-VariableGroup' name1='r:VariableGroupReference' name2='VariableGroup'/> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> - <!-- The dereferenced d:QuestionScheme, the d:InterviewerInstructionScheme, and the ControlConstructScheme are used as new references --> - <xsl:variable name="references-for-template-sequence"> - <xsl:copy-of select="//l:VariableScheme"/> - <xsl:copy-of select="//d:ControlConstructScheme"/> - <xsl:copy-of select="//d:InterviewerInstructionScheme"/> - <xsl:copy-of select="//d:ProcessingInstructionScheme"/> - <xsl:copy-of select="$dereferenced-questions//d:QuestionScheme"/> - </xsl:variable> + <xsl:key name="r:CategoryReference-_-Category" match="/ddi-instance:DDIInstance/g:ResourcePackage/l:CategoryScheme/l:Category" use="r:ID"/> + <xsl:key name="r:CodeListReference-_-CodeList" match="/ddi-instance:DDIInstance/g:ResourcePackage/l:CodeListScheme/l:CodeList" use="r:ID"/> + <xsl:key name="r:CodeReference-_-Code" match="/ddi-instance:DDIInstance/g:ResourcePackage/l:CodeListScheme/l:CodeList/l:Code" use="r:ID"/> + <xsl:key name="d:ControlConstructReference-_-ComputationItem" match="/ddi-instance:DDIInstance/g:ResourcePackage/d:ControlConstructScheme/d:ComputationItem" use="r:ID"/> + <xsl:key name="d:ControlConstructReference-_-IfThenElse" match="/ddi-instance:DDIInstance/g:ResourcePackage/d:ControlConstructScheme/d:IfThenElse" use="r:ID"/> + <xsl:key name="d:ControlConstructReference-_-QuestionConstruct" match="/ddi-instance:DDIInstance/g:ResourcePackage/d:ControlConstructScheme/d:QuestionConstruct" use="r:ID"/> + <xsl:key name="d:ControlConstructReference-_-StatementItem" match="/ddi-instance:DDIInstance/g:ResourcePackage/d:ControlConstructScheme/d:StatementItem" use="r:ID"/> + <xsl:key name="d:ControlConstructReference-_-Sequence" match="/ddi-instance:DDIInstance/g:ResourcePackage/d:ControlConstructScheme/d:Sequence" use="r:ID"/> + <xsl:key name="d:ControlConstructReference-_-Loop" match="/ddi-instance:DDIInstance/g:ResourcePackage/d:ControlConstructScheme/d:Loop" use="r:ID"/> + <xsl:key name="d:ThenConstructReference-_-Sequence" match="/ddi-instance:DDIInstance/g:ResourcePackage/d:ControlConstructScheme/d:Sequence" use="r:ID"/> + <xsl:key name="d:ElseConstructReference-_-Sequence" match="/ddi-instance:DDIInstance/g:ResourcePackage/d:ControlConstructScheme/d:Sequence" use="r:ID"/> + <xsl:key name="d:InterviewerInstructionReference-_-Instruction" match="/ddi-instance:DDIInstance/g:ResourcePackage/d:InterviewerInstructionScheme/d:Instruction" use="r:ID"/> + <xsl:key name="r:QuestionReference-_-QuestionBlock" match="/ddi-instance:DDIInstance/g:ResourcePackage/d:QuestionScheme/d:QuestionBlock" use="r:ID"/> + <xsl:key name="r:QuestionReference-_-QuestionGrid" match="/ddi-instance:DDIInstance/g:ResourcePackage/d:QuestionScheme/d:QuestionGrid" use="r:ID"/> + <xsl:key name="r:QuestionReference-_-QuestionItem" match="/ddi-instance:DDIInstance/g:ResourcePackage/d:QuestionScheme/d:QuestionItem" use="r:ID"/> + <xsl:key name="d:QuestionGridReference-_-QuestionGrid" match="/ddi-instance:DDIInstance/g:ResourcePackage/d:QuestionScheme/d:QuestionGrid" use="r:ID"/> + <xsl:key name="d:QuestionItemReference-_-QuestionItem" match="/ddi-instance:DDIInstance/g:ResourcePackage/d:QuestionScheme/d:QuestionItem" use="r:ID"/> + <xsl:key name="d:DateTimeDomainReference-_-ManagedDateTimeRepresentation" match="/ddi-instance:DDIInstance/g:ResourcePackage/r:ManagedRepresentationScheme/r:ManagedDateTimeRepresentation" use="r:ID"/> + <xsl:key name="r:DateTimeRepresentationReference-_-ManagedDateTimeRepresentation" match="/ddi-instance:DDIInstance/g:ResourcePackage/r:ManagedRepresentationScheme/r:ManagedDateTimeRepresentation" use="r:ID"/> + <xsl:key name="d:NumericDomainReference-_-ManagedNumericRepresentation" match="/ddi-instance:DDIInstance/g:ResourcePackage/r:ManagedRepresentationScheme/r:ManagedNumericRepresentation" use="r:ID"/> + <xsl:key name="r:NumericRepresentationReference-_-ManagedNumericRepresentation" match="/ddi-instance:DDIInstance/g:ResourcePackage/r:ManagedRepresentationScheme/r:ManagedNumericRepresentation" use="r:ID"/> + <xsl:key name="r:VariableReference-_-Variable" match="/ddi-instance:DDIInstance/g:ResourcePackage/l:VariableScheme/l:Variable" use="r:ID"/> + <xsl:key name="r:VariableGroupReference-_-VariableGroup" match="/ddi-instance:DDIInstance/g:ResourcePackage/l:VariableScheme/l:VariableGroup" use="r:ID"/> + <!--when modifying keys : modify key-names variable ; if you do not the program will not work--> + <xsl:key name="external-variable" match="/ddi-instance:DDIInstance/g:ResourcePackage/l:VariableScheme/l:Variable[not(r:QuestionReference or r:SourceParameterReference or descendant::r:ProcessingInstructionReference)]" use="r:ID"/> + <xsl:key name="referenced-variable" match="/ddi-instance:DDIInstance/g:ResourcePackage/l:VariableScheme/l:VariableGroup/r:VariableReference" use="r:ID"/> + <xsl:key name="calculated-variable" match="/ddi-instance:DDIInstance/g:ResourcePackage/d:ProcessingInstructionScheme/d:GenerationInstruction" use="d:ControlConstructReference/r:ID"/> + <xsl:key name="loop-variablegroup" match="/ddi-instance:DDIInstance/g:ResourcePackage/l:VariableScheme/l:VariableGroup[l:TypeOfVariableGroup='Loop']" use="r:BasedOnObject/r:BasedOnReference[1]/r:ID"/> + <xsl:key name="tooltip-with-id" match="/ddi-instance:DDIInstance/g:ResourcePackage/d:InterviewerInstructionScheme/d:Instruction[d:InstructionName/r:String='tooltip' and descendant::*/@id]" use="descendant::*/@id"/> - <!-- The main sequences of the DDI are dereferenced --> - <xsl:variable name="dereferenced-template-sequence"> - <xsl:element name="g:ResourcePackage"> - <xsl:apply-templates - select="//d:ControlConstructScheme/d:Sequence[d:TypeOfSequence/text() = 'template']"> - <xsl:with-param name="references" select="$references-for-template-sequence" tunnel="yes"/> - </xsl:apply-templates> - </xsl:element> - </xsl:variable> + <xsl:variable name="message-label"> + <dereferencing:message type-number="1" message-order="1"> + <dereferencing:label>Unknown Reference tag</dereferencing:label> + <dereferencing:modifyXSLcode>Modify "follow-references" or "ignore references" variable, by adding the unknown reference tag. One or more key is also needed, see other messages.</dereferencing:modifyXSLcode> + </dereferencing:message> + <dereferencing:message type-number="2" message-order="2"> + <dereferencing:label>Missing ID node</dereferencing:label> + <dereferencing:modifyDDIcode>Add non empty ID tag to the tag described in the where section</dereferencing:modifyDDIcode> + </dereferencing:message> + <dereferencing:message type-number="3" message-order="3"> + <dereferencing:label>Non-unique ID found with xsl:key</dereferencing:label> + <dereferencing:modifyDDIcode>Find the incorrect ID and modify it in the DDI code.</dereferencing:modifyDDIcode> + </dereferencing:message> + <dereferencing:message type-number="4" message-order="4"> + <dereferencing:label>ID not found with xsl:key but found with global search</dereferencing:label> + <dereferencing:modifyDDIcode>There is either a problem in the reference node or in the target node (or in both) : the type of object or the reference tag is incorrect in one of the node</dereferencing:modifyDDIcode> + </dereferencing:message> + <dereferencing:message type-number="5" message-order="5"> + <dereferencing:label>xsl:key creation requested</dereferencing:label> + <dereferencing:modifyXSLcode>There is no key for this combination of reference and type of object. + It is therefore necessary to create a xsl:key node with the proposed name, match and use (in value node). + Do not forget to update the key-names variable using name, name1 and name2 in value node : it will not work if you do not do it.</dereferencing:modifyXSLcode> + </dereferencing:message> + <dereferencing:message type-number="6" message-order="6"> + <dereferencing:label>Type mismatch</dereferencing:label> + <dereferencing:modifyDDIcode>The type of object in the reference node and the tag of the target node does node match.</dereferencing:modifyDDIcode> + </dereferencing:message> + <dereferencing:message type-number="7" message-order="7"> + <dereferencing:label>Non-unique ID found with global search</dereferencing:label> + <dereferencing:modifyDDIcode>A key search of the ID was not possible, and a global search of the ID in the document brought more than one match back.</dereferencing:modifyDDIcode> + </dereferencing:message> + <dereferencing:message type-number="8" message-order="8"> + <dereferencing:label>ID not found with xsl:key and global search</dereferencing:label> + <dereferencing:modifyDDIcode>A key search then a global search in the document brought no match back.</dereferencing:modifyDDIcode> + </dereferencing:message> + <dereferencing:message type-number="9" message-order="9"> + <dereferencing:label>ID not found with global search</dereferencing:label> + <dereferencing:modifyDDIcode>A key search of the ID was not possible, and a global search in the document brought no match back.</dereferencing:modifyDDIcode> + </dereferencing:message> + </xsl:variable> - <!-- The root of all identifiers in the survey --> - <xsl:variable name="root"> - <xsl:value-of select="replace(//s:StudyUnit/r:ID/text(), '-SU', '')"/> - </xsl:variable> - <!-- Then each d:Instrument is dereferenced with the previous dereferenced tree used as references --> - <xsl:for-each select="//d:Instrument"> - <xsl:variable name="template-id" select="d:ControlConstructReference/r:ID"/> - <xsl:variable name="variable-groups" select="$dereferenced-template-sequence//*[r:ID=$template-id]//*[name()='d:Loop' or (name()='d:QuestionGrid' and d:GridDimension/d:Roster)]/r:ID"/> - <xsl:variable name="form-name"> - <xsl:choose> - <xsl:when test="d:InstrumentName"> - <xsl:value-of select="d:InstrumentName/r:String"/> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="replace(r:ID/text(), concat($root/text(),'-In-'), '')"/> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:result-document href="{lower-case(concat('file:///',replace($output-folder, '\\' , '/'),'/',$form-name,'.tmp'))}"> - <DDIInstance xmlns="ddi:instance:3_3" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:a="ddi:archive:3_3" - xmlns:eno="http://xml.insee.fr/apps/eno" - xmlns:enoddi33="http://xml.insee.fr/apps/eno/out/ddi33" - xmlns:pogues="http://xml.insee.fr/schema/applis/pogues" - xmlns:pr="ddi:ddiprofile:3_3" - xmlns:c="ddi:conceptualcomponent:3_3" - xmlns:cm="ddi:comparative:3_3"> - <s:StudyUnit> - <xsl:apply-templates select="."> - <xsl:with-param name="references" select="$dereferenced-template-sequence" tunnel="yes"/> - </xsl:apply-templates> - </s:StudyUnit> - <g:ResourcePackage> - <l:VariableScheme> - <xsl:apply-templates select="//l:VariableScheme/l:Variable[not(r:ID=//l:VariableScheme//r:VariableReference/r:ID)] - |//l:VariableScheme/l:VariableGroup[not(r:ID=//l:VariableScheme//r:VariableGroupReference/r:ID) - and r:BasedOnObject/r:BasedOnReference/r:ID = $variable-groups]"> - <xsl:with-param name="references" select="//l:VariableScheme" tunnel="yes"/> - </xsl:apply-templates> - </l:VariableScheme> - </g:ResourcePackage> - </DDIInstance> - </xsl:result-document> - </xsl:for-each> + <xd:doc> + <xd:desc>Root template</xd:desc> + </xd:doc> + <xsl:template match="/"> + <xsl:if test="$build-messages"> + <dereferencing:dereferencing-result-messages> + <xsl:variable name="messages-all"> + <xsl:for-each select="ddi-instance:DDIInstance/s:StudyUnit/d:DataCollection/d:InstrumentScheme/d:Instrument"> + <xsl:apply-templates select="." mode="output-message"/> + </xsl:for-each> + </xsl:variable> + <xsl:for-each select="$message-label/*" > + <xsl:sort select="number(dereferencing:message-order)"/> + <xsl:if test="$messages-all/*[dereferencing:type-number=current()/@type-number]"> + <xsl:copy> + <xsl:copy-of select="./@* | ./node() |text()"/> + <xsl:choose> + <xsl:when test="dereferencing:modifyXSLcode"> + <xsl:for-each-group select="$messages-all/*[./dereferencing:type-number=current()/@type-number]" group-by="./dereferencing:value"> + <xsl:sort select="./dereferencing:value"/> + <dereferencing:value> + <xsl:copy-of select="./dereferencing:value/*"/> + <dereferencing:where-list> + <xsl:for-each-group select="current-group()" group-by="dereferencing:where"> + <xsl:sort select="dereferencing:where"/> + <xsl:copy-of select="./dereferencing:where"/> + </xsl:for-each-group> + </dereferencing:where-list> + </dereferencing:value> + </xsl:for-each-group> + </xsl:when> + <xsl:otherwise> + <xsl:for-each-group select="$messages-all/*[./dereferencing:type-number=current()/@type-number]" group-by="./dereferencing:where"> + <xsl:sort select="./dereferencing:where"/> + <xsl:copy-of select="./*[name() != 'dereferencing:type-number']"/> + </xsl:for-each-group> + </xsl:otherwise> + </xsl:choose> + </xsl:copy> + </xsl:if> + </xsl:for-each> + </dereferencing:dereferencing-result-messages> + </xsl:if> + <xsl:if test="$build-DDI"> + <xsl:for-each select="ddi-instance:DDIInstance/s:StudyUnit/d:DataCollection/d:InstrumentScheme/d:Instrument"> + <xsl:variable name="form-name"> + <xsl:choose> + <xsl:when test="d:InstrumentName"> + <xsl:value-of select="d:InstrumentName/r:String"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="replace(r:ID/text(), concat(replace(//s:StudyUnit/r:ID/text(), '-SU', ''),'-In-'), '')"/> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + <xsl:result-document href="{lower-case(concat('file:///',replace($output-folder, '\\' , '/'),'/',$form-name,'.tmp'))}"> + <DDIInstance xmlns="ddi:instance:3_3" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:a="ddi:archive:3_3" + xmlns:eno="http://xml.insee.fr/apps/eno" + xmlns:enoddi33="http://xml.insee.fr/apps/eno/out/ddi33" + xmlns:pogues="http://xml.insee.fr/schema/applis/pogues" + xmlns:pr="ddi:ddiprofile:3_3" + xmlns:c="ddi:conceptualcomponent:3_3" + xmlns:cm="ddi:comparative:3_3"> + <s:StudyUnit> + <xsl:apply-templates select="." mode="output-DDI"/> + </s:StudyUnit> + <g:ResourcePackage> + <l:VariableScheme> + <xsl:apply-templates select="//l:VariableScheme/l:Variable[not(r:ID=//l:VariableScheme//r:VariableReference/r:ID)] + |//l:VariableScheme/l:VariableGroup[not(r:ID=//l:VariableScheme//r:VariableGroupReference/r:ID)]" mode="output-DDI"> + </xsl:apply-templates> + </l:VariableScheme> + </g:ResourcePackage> + </DDIInstance> + </xsl:result-document> + </xsl:for-each> + </xsl:if> </xsl:template> <xd:doc> - <xd:desc> - <xd:p>Default template for every element and every attribute, simply copying to the - output result.</xd:p> - </xd:desc> + <xd:desc>Default template : identity template.</xd:desc> </xd:doc> - <xsl:template match="node() | @*"> + <xsl:template match="*" mode="output-DDI"> <xsl:copy> - <xsl:apply-templates select="node() | @*"/> + <xsl:copy-of select="@*"/> + <xsl:apply-templates select="* | text() | comment() | processing-instruction()" mode="output-DDI"/> + <xsl:apply-templates select="key('calculated-variable',r:ID)" mode="output-DDI"/> </xsl:copy> </xsl:template> <xd:doc> <xd:desc> - <xd:p>Insert External Variable and Calculated Variable to the root template.</xd:p> + <xd:p>Not to dereference templates.</xd:p> </xd:desc> </xd:doc> - <xsl:template match="d:Sequence[d:TypeOfSequence/text() = 'template']"> - <xsl:param name="references" tunnel="yes"/> - <xsl:variable name="ID" select="r:ID"/> + <xsl:template match="d:GenerationInstruction/d:ControlConstructReference" mode="output-DDI" priority="1"/> - <xsl:variable name="multiple-variables" as="node()"> - <Variables> - <xsl:for-each select="$references//l:VariableGroup/r:VariableReference"> - <Variable> - <xsl:value-of select="r:ID"/> - </Variable> - </xsl:for-each> - </Variables> - </xsl:variable> - - <xsl:copy> - <xsl:apply-templates select="$references//l:VariableScheme - /l:Variable[r:ID=$external-variables//Variable/@id and not(r:ID=$multiple-variables/Variable)]"/> - <xsl:apply-templates select="node() | @*"/> - <xsl:apply-templates select="$references//d:GenerationInstruction[d:ControlConstructReference/r:ID=$ID]"/> - </xsl:copy> + <xsl:template match="l:Variable" mode="output-DDI" priority="1"> + <xsl:copy-of select="."/> </xsl:template> <xd:doc> - <xd:desc> - <xd:p>Insert External Variable and Calculated Variable to loops.</xd:p> - </xd:desc> + <xd:desc>Template for Reference tags</xd:desc> </xd:doc> - <xsl:template match="d:Loop"> - <xsl:param name="references" tunnel="yes"/> - <xsl:variable name="ID" select="r:ID"/> + <xsl:template match="node()[ends-with(name(.), 'Reference')]" mode="output-DDI"> - <xsl:copy> - <xsl:apply-templates select="$references//l:VariableGroup[r:BasedOnObject/r:BasedOnReference/r:ID=$ID] - /r:VariableReference[r:ID=$external-variables//Variable/@id]"/> - <xsl:apply-templates select="node() | @*"/> - <xsl:apply-templates select="$references//d:GenerationInstruction[d:ControlConstructReference/r:ID=$ID]"/> - </xsl:copy> + <xsl:variable name="copy-node-name" select="name(.)"/> + <xsl:choose> + <xsl:when test="count($ignore-references/dereferencing:reference-name[@name=$copy-node-name])!=0 + and not(count($follow-references/dereferencing:reference-name[@name=$copy-node-name])!=0)"> + <xsl:copy> + <xsl:copy-of select="@* | text() | comment() | processing-instruction()"/> + <xsl:apply-templates select="*" mode="output-DDI"/> + </xsl:copy> + </xsl:when> + <xsl:otherwise> + <xsl:copy> + <xsl:copy-of select="@* | text() | comment() | processing-instruction()"/> + <xsl:copy-of select="./r:Agency"/> + <xsl:choose> + <xsl:when test="$fast-and-dangerous-mode"> + <xsl:apply-templates select="key(concat(name(.),'-_-',./r:TypeOfObject),./r:ID)" mode="output-DDI"/> + </xsl:when> + <xsl:when test="count(./r:ID)=0"/> + <xsl:when test="$key-names/dereferencing:key-name[@name1=name(current()) and @name2=current()/r:TypeOfObject]"> + <xsl:variable name="result-key"> + <xsl:copy-of select="key(concat(name(.),'-_-',./r:TypeOfObject),./r:ID)"/> + </xsl:variable> + <xsl:choose> + <xsl:when test="count($result-key/*)=1"> + <xsl:apply-templates select="key(concat(name(.),'-_-',./r:TypeOfObject),./r:ID)" mode="output-DDI"/> + </xsl:when> + <xsl:when test="count($result-key/*)>1"> + <xsl:copy-of select="./r:ID"/> + </xsl:when> + <xsl:otherwise> + <xsl:variable name="current-id" select="./r:ID"/> + <xsl:variable name="current-name" select="name(.)"/> + <xsl:variable name="reference-targets"><xsl:copy-of select="//*[r:ID=$current-id and name(.) != $current-name]"/></xsl:variable> + + <xsl:choose> + <xsl:when test="count($reference-targets/*) = 1"> + <xsl:apply-templates select="//*[r:ID=$current-id and name(.) != $current-name]" mode="output-DDI"/> + </xsl:when> + <xsl:otherwise> + <xsl:copy-of select="$current-id"/> + </xsl:otherwise> + </xsl:choose> + </xsl:otherwise> + </xsl:choose> + </xsl:when> + <xsl:otherwise> + <xsl:variable name="current-id" select="./r:ID"/> + <xsl:variable name="current-name" select="name(.)"/> + <xsl:variable name="reference-targets"><xsl:copy-of select="//*[r:ID=$current-id and name(.) != $current-name]"/></xsl:variable> + + <xsl:choose> + <xsl:when test="count($reference-targets/*) = 1"> + <xsl:apply-templates select="//*[r:ID=$current-id and name(.) != $current-name]" mode="output-DDI"/> + </xsl:when> + <xsl:otherwise> + <xsl:copy-of select="./r:ID"/> + </xsl:otherwise> + </xsl:choose> + </xsl:otherwise> + </xsl:choose> + <xsl:apply-templates select="./*[name() != 'r:ID' and name() != 'r:Agency']" mode="output-DDI"/> + </xsl:copy> + </xsl:otherwise> + </xsl:choose> </xsl:template> <xd:doc> - <xd:desc> - <xd:p>Insert External Variable and Calculated Variable to dynamical tables.</xd:p> - </xd:desc> + <xd:desc>Template for template Sequence</xd:desc> </xd:doc> - <xsl:template match="d:QuestionGrid[d:GridDimension/d:Roster]/d:StructuredMixedGridResponseDomain"> - <xsl:param name="references" tunnel="yes"/> - <xsl:variable name="ID" select="../r:ID"/> - + <xsl:template match="d:Sequence[d:TypeOfSequence/text() = 'template']" mode="output-DDI"> + <xsl:variable name="current-ID" select="r:ID"/> + <xsl:copy> - <xsl:apply-templates select="$references//l:VariableGroup[r:BasedOnObject/r:BasedOnReference/r:ID=$ID] - /r:VariableReference[r:ID=$external-variables//Variable/@id]"/> - <xsl:apply-templates select="node() | @*"/> - <xsl:apply-templates select="$references//d:GenerationInstruction[d:ControlConstructReference/r:ID=$ID]"/> + <xsl:for-each select="//l:VariableScheme/l:Variable"> + <xsl:if test="count(key('external-variable',r:ID))=1 and not(count(key('referenced-variable',r:ID))=1)"> + <xsl:apply-templates select="key('external-variable',r:ID)" mode="output-DDI"/> + </xsl:if> + </xsl:for-each> + <xsl:apply-templates select="*" mode="output-DDI"/> + <xsl:apply-templates select="key('calculated-variable',$current-ID)" mode="output-DDI"/> </xsl:copy> </xsl:template> <xd:doc> - <xd:desc> - <xd:p>Template to insert GenerationInstruction, which reference the element they have to be included in.</xd:p> - </xd:desc> + <xd:desc>Template for Loop</xd:desc> </xd:doc> - <xsl:template match="node()[r:ID=$calculated-variables-sequences/Variable and not(ends-with(name(), 'Reference'))]"> - <xsl:param name="references" tunnel="yes"/> + <xsl:template match="d:Loop" mode="output-DDI"> + <xsl:variable name="current-ID" select="r:ID"/> <xsl:copy> - <xsl:apply-templates select="node() | @*"/> - <xsl:apply-templates select="$references//d:GenerationInstruction[d:ControlConstructReference/r:ID=current()/r:ID]"/> + <xsl:apply-templates select="key('loop-variablegroup',$current-ID)/r:VariableReference/key('external-variable',r:ID)" mode="output-DDI"/> + <xsl:apply-templates select="*" mode="output-DDI"/> + <xsl:apply-templates select="key('calculated-variable',$current-ID)" mode="output-DDI"/> </xsl:copy> </xsl:template> <xd:doc> - <xd:desc> - <xd:p>Calculated variables refer the ControlContructs they belong to, not the contrary.</xd:p> - </xd:desc> + <xd:desc>labels with reference to a tooltip</xd:desc> </xd:doc> - <xsl:template match="d:GenerationInstruction/d:ControlConstructReference"/> + <xsl:template match="*[name()='r:Label' or name()='d:DisplayText' or name()='d:InstructionText' or name()='d:QuestionText'][descendant::xhtml:a]" mode="output-DDI"> + <xsl:variable name="ref" as="xs:string *"> + <xsl:for-each select="descendant::xhtml:a"> + <xsl:value-of select="replace(@href,'#','')"/> + </xsl:for-each> + </xsl:variable> + + <xsl:copy-of select="."/> + <xsl:for-each select="key('tooltip-with-id',$ref)"> + <d:InterviewerInstructionReference> + <xsl:apply-templates select="." mode="output-DDI"/> + </d:InterviewerInstructionReference> + </xsl:for-each> + </xsl:template> <xd:doc> - <xd:desc> - <xd:p>Default template for every element that corresponds to a reference.</xd:p> - </xd:desc> + <xd:desc>Template for dynamic array</xd:desc> </xd:doc> - <xsl:template match="node()[ends-with(name(), 'Reference') and not(parent::r:Binding) and not(name()='r:BasedOnReference')]/r:ID"> - <xsl:param name="references" tunnel="yes"/> - <xsl:variable name="ID" select="."/> - <!-- Copying the element --> - <!-- Making sure we're not copying an element that isn't itself inside another reference (and that would actually not the base element but an already indexed reference) --> - <xsl:apply-templates - select="$references//*[r:ID = $ID and not(ancestor-or-self::node()[ends-with(name(), 'Reference') or starts-with(name(), 'd:Source')])]" - /> + <xsl:template match="d:QuestionGrid[d:GridDimension/d:Roster]/d:StructuredMixedGridResponseDomain" mode="output-DDI"> + <xsl:variable name="loop-ID" select="../r:ID"/> + + <xsl:copy> + <xsl:apply-templates select="key('loop-variablegroup',$loop-ID)/r:VariableReference/key('external-variable',r:ID)" mode="output-DDI"/> + <xsl:apply-templates select="*" mode="output-DDI"/> + <xsl:apply-templates select="key('calculated-variable',$loop-ID)" mode="output-DDI"/> + </xsl:copy> </xsl:template> <xd:doc> - <xd:desc> - <xd:p>Specific template for external variables, for which there is no OutParameter to refer.</xd:p> - </xd:desc> + <xd:desc>Default template : identity template.</xd:desc> </xd:doc> - <xsl:template match="d:ConditionalText/r:SourceParameterReference[r:TypeOfObject='InParameter']/r:ID" priority="2"> - <xsl:copy-of select="."/> + <xsl:template match="*" mode="output-message"> + <xsl:apply-templates select="*" mode="output-message"/> </xsl:template> <xd:doc> - <xd:desc>In VariableScheme, Variable are used only for getters, not drivers and are simply copied</xd:desc> + <xd:desc>Template for Reference tags</xd:desc> </xd:doc> - <xsl:template match="l:Variable"> - <xsl:copy-of select="."/> + <xsl:template match="node()[ends-with(name(.), 'Reference')]" mode="output-message"> + + <xsl:variable name="copy-node-name" select="name(.)"/> + <xsl:choose> + <xsl:when test="count($follow-references/dereferencing:reference-name[@name=$copy-node-name])!=0"> + <xsl:call-template name="xxx-Reference-ID"/> + <xsl:apply-templates select="./*[name() != 'r:ID' and name() != 'r:Agency']" mode="output-message"/> + </xsl:when> + <xsl:when test="count($ignore-references/dereferencing:reference-name[@name=$copy-node-name])!=0"> + <xsl:apply-templates select="*" mode="output-message"/> + </xsl:when> + <xsl:otherwise> + <dereferencing:warning> + <dereferencing:type-number>1</dereferencing:type-number> + <dereferencing:value><xsl:value-of select="$copy-node-name"/></dereferencing:value> + <xsl:call-template name="where-message"/> + </dereferencing:warning> + <xsl:call-template name="xxx-Reference-ID"/> + <xsl:apply-templates select="./*[name() != 'r:ID' and name() != 'r:Agency']" mode="output-message"/> + </xsl:otherwise> + </xsl:choose> </xsl:template> - <!-- + <xd:doc> - <xd:desc> - <xd:p>Instruction are not allowed in Category for DDI 3.3. This template allows to insert tooltips into arrays' labels</xd:p> - </xd:desc> + <xd:desc>Base template for searched References</xd:desc> </xd:doc> - <xsl:template match="xhtml:a"> - <xsl:variable name="ref" select="replace(@href,'#','')"/> - <xsl:variable name="language" select="ancestor::*[@xml:lang][1]/@xml:lang"/> + <xsl:template name="xxx-Reference-ID"> <xsl:choose> - <xsl:when test="//*[@id=$ref - and ancestor-or-self::*[@xml:lang][1]/@xml:lang=$language - and ancestor::d:Instruction/d:InstructionName/r:String[@xml:lang=$language]='tooltip']"> - <xsl:element name="xhtml:span"> - <xsl:attribute name="title"> - <xsl:value-of select="normalize-space(//*[@id=$ref - and ancestor-or-self::*[@xml:lang][1]/@xml:lang=$language - and ancestor::d:Instruction/d:InstructionName/r:String[@xml:lang=$language]='tooltip'])"/> - </xsl:attribute> - <xsl:text> </xsl:text> - <xsl:element name="img"> - <xsl:attribute name="src" select="'/img/Help-browser.svg.png'"/> - </xsl:element> - <xsl:text> </xsl:text> - </xsl:element> + <xsl:when test="$fast-and-dangerous-mode"> + <xsl:apply-templates select="key(concat(name(.),'-_-',./r:TypeOfObject),./r:ID)" mode="output-message"/> </xsl:when> <xsl:otherwise> - <xsl:copy> - <xsl:apply-templates select="node() | @*"/> - </xsl:copy> + <xsl:choose> + <xsl:when test="count(./r:ID)=0"> + <dereferencing:warning> + <dereferencing:type-number>2</dereferencing:type-number> + <xsl:call-template name="where-message"/> + </dereferencing:warning> + </xsl:when> + <xsl:otherwise> + <xsl:choose> + <xsl:when test="$key-names/dereferencing:key-name[@name1=name(current()) and @name2=current()/r:TypeOfObject]"> + <xsl:variable name="result-key"> + <xsl:copy-of select="key(concat(name(.),'-_-',./r:TypeOfObject),./r:ID)"/> + </xsl:variable> + <xsl:choose> + <xsl:when test="count($result-key/*)=1"> + <xsl:apply-templates select="key(concat(name(.),'-_-',./r:TypeOfObject),./r:ID)" mode="output-message"/> + </xsl:when> + <xsl:when test="count($result-key/*)>1"> + <dereferencing:warning> + <dereferencing:type-number>3</dereferencing:type-number> + <xsl:call-template name="where-message"/> + </dereferencing:warning> + </xsl:when> + <xsl:otherwise> + <xsl:call-template name="find-id-without-key"> + <xsl:with-param name="key-existence" select="true()"/> + </xsl:call-template> + </xsl:otherwise> + </xsl:choose> + </xsl:when> + <xsl:otherwise> + <xsl:call-template name="find-id-without-key"> + <xsl:with-param name="key-existence" select="false()"/> + </xsl:call-template> + </xsl:otherwise> + </xsl:choose> + </xsl:otherwise> + </xsl:choose> </xsl:otherwise> </xsl:choose> </xsl:template> ---> - <xsl:template match="*[name()='r:Label' or name()='d:DisplayText' or name()='d:InstructionText' or name()='d:QuestionText'][descendant::xhtml:a]"> - <xsl:variable name="ref" as="xs:string *"> - <xsl:for-each select="descendant::xhtml:a"> - <xsl:value-of select="replace(@href,'#','')"/> - </xsl:for-each> - </xsl:variable> - <xsl:variable name="existing-tooltip" select="following-sibling::d:InterviewerInstructionReference/r:ID | following-sibling::d:InterviewerInstructionReference/d:Instruction/r:ID"/> - <xsl:copy-of select="."/> - - <xsl:for-each select="//d:InterviewerInstructionScheme/d:Instruction[d:InstructionName/r:String='tooltip' and descendant::*/@id=$ref]"> - <xsl:if test="not(r:ID = $existing-tooltip)"> - <d:InterviewerInstructionReference> - <xsl:copy-of select="."/> - </d:InterviewerInstructionReference> - </xsl:if> - </xsl:for-each> + + <xd:doc> + <xd:desc>Template to find an id with a global search.</xd:desc> + <xd:param name="key-existence"/> + </xd:doc> + <xsl:template name="find-id-without-key"> + <xsl:param name="key-existence"/> + + <xsl:variable name="current-id" select="./r:ID"/> + <xsl:variable name="current-name" select="name(.)"/> + <xsl:variable name="current-type" select="./r:TypeOfObject"/> + <xsl:variable name="reference-targets"><xsl:copy-of select="//*[r:ID=$current-id and name(.) != $current-name]"/></xsl:variable> + + <xsl:choose> + <xsl:when test="count($reference-targets/*) = 1"> + <xsl:variable name="reference-targets-parent-name" select="name((//*[r:ID=$current-id and name(.) != $current-name])[1]/..)"/> + <xsl:variable name="reference-targets-name" select="name((//*[r:ID=$current-id and name(.) != $current-name])[1])"/> + <xsl:variable name="reference-targets-local-name" select="local-name((//*[r:ID=$current-id and name(.) != $current-name])[1])"/> + <dereferencing:warning> + <xsl:choose> + <xsl:when test="$key-existence=true()"> + <dereferencing:type-number>4</dereferencing:type-number> + <dereferencing:reference-target-comparison> + <dereferencing:reference><xsl:value-of select="$current-name"/></dereferencing:reference> + <dereferencing:target-scheme><xsl:value-of select="$reference-targets-parent-name"/></dereferencing:target-scheme> + <dereferencing:type-of-object><xsl:value-of select="$current-type"/></dereferencing:type-of-object> + <dereferencing:target-type><xsl:value-of select="$reference-targets-name"/></dereferencing:target-type> + <dereferencing:ID><xsl:value-of select="$current-id"/></dereferencing:ID> + </dereferencing:reference-target-comparison> + <xsl:call-template name="where-message"/> + </xsl:when> + <xsl:when test="$key-existence=false()"> + <xsl:choose> + <xsl:when test="$reference-targets-local-name = $current-type"> + <dereferencing:type-number>5</dereferencing:type-number> + <dereferencing:value> + <dereferencing:name><xsl:value-of select="concat($current-name,'-_-',$current-type)"/></dereferencing:name> + <dereferencing:match><xsl:value-of select="concat('/ddi-instance:DDIInstance/g:ResourcePackage/',$reference-targets-parent-name,'/',$reference-targets-name)"/></dereferencing:match> + <dereferencing:use><xsl:value-of select="'r:ID'"/></dereferencing:use> + <dereferencing:name1><xsl:value-of select="$current-name"/></dereferencing:name1> + <dereferencing:name2><xsl:value-of select="$current-type"/></dereferencing:name2> + </dereferencing:value> + <xsl:call-template name="where-message"/> + </xsl:when> + <xsl:otherwise> + <dereferencing:type-number>6</dereferencing:type-number> + <dereferencing:reference-target-comparison> + <dereferencing:reference><xsl:value-of select="$current-name"/></dereferencing:reference> + <dereferencing:target-scheme><xsl:value-of select="$reference-targets-parent-name"/></dereferencing:target-scheme> + <dereferencing:type-of-object><xsl:value-of select="$current-type"/></dereferencing:type-of-object> + <dereferencing:target-type><xsl:value-of select="$reference-targets-name"/></dereferencing:target-type> + <dereferencing:ID><xsl:value-of select="$current-id"/></dereferencing:ID> + </dereferencing:reference-target-comparison> + <xsl:call-template name="where-message"/> + </xsl:otherwise> + </xsl:choose> + </xsl:when> + <xsl:otherwise/> + </xsl:choose> + </dereferencing:warning> + <xsl:apply-templates select="//*[r:ID=$current-id and name(.) != $current-name]" mode="output-message"/> + </xsl:when> + <xsl:otherwise> + <dereferencing:warning> + <xsl:choose> + <xsl:when test="count($reference-targets/*) > 1"> + <dereferencing:type-number>7</dereferencing:type-number> + <xsl:call-template name="where-message"/> + </xsl:when> + <xsl:when test="$key-existence=true()"> + <dereferencing:type-number>8</dereferencing:type-number> + <xsl:call-template name="where-message"/> + </xsl:when> + <xsl:when test="$key-existence=false()"> + <dereferencing:type-number>9</dereferencing:type-number> + <xsl:call-template name="where-message"/> + </xsl:when> + </xsl:choose> + </dereferencing:warning> + </xsl:otherwise> + </xsl:choose> </xsl:template> + <xd:doc> + <xd:desc>Writing where the message comes from.</xd:desc> + </xd:doc> + <xsl:template name="where-message"> + <dereferencing:where> + <dereferencing:current-id><xsl:value-of select="./r:ID"/></dereferencing:current-id> + <dereferencing:current-name><xsl:value-of select="name(.)"/></dereferencing:current-name> + <dereferencing:current-type><xsl:value-of select="./r:TypeOfObject"/></dereferencing:current-type> + <dereferencing:parent-id><xsl:value-of select="../r:ID"/></dereferencing:parent-id> + <dereferencing:parent-name><xsl:value-of select="name(..)"/></dereferencing:parent-name> + <dereferencing:parent-type><xsl:value-of select="../r:TypeOfObject"/></dereferencing:parent-type> + </dereferencing:where> + </xsl:template> </xsl:stylesheet> + From c3a0fc21145620472e70bc01b8fdb45dfedef4e5 Mon Sep 17 00:00:00 2001 From: BulotF <francois.bulot@insee.fr> Date: Tue, 27 Aug 2019 17:30:45 +0200 Subject: [PATCH 080/439] disjoin loop container and loop occurrence ids --- .../resources/xslt/inputs/ddi/functions.fods | 35 +++-- .../xslt/inputs/ddi/source-fixed.xsl | 19 +++ src/main/resources/xslt/outputs/fr/models.xsl | 55 +++++-- .../transformations/ddi2fr/functions.fods | 30 ++-- src/main/resources/xslt/util/fr/browsing.xsl | 147 ++++++++++-------- 5 files changed, 180 insertions(+), 106 deletions(-) diff --git a/src/main/resources/xslt/inputs/ddi/functions.fods b/src/main/resources/xslt/inputs/ddi/functions.fods index df9eab8bc..848f3adf6 100644 --- a/src/main/resources/xslt/inputs/ddi/functions.fods +++ b/src/main/resources/xslt/inputs/ddi/functions.fods @@ -1,26 +1,26 @@ <?xml version="1.0" encoding="UTF-8"?> <office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.spreadsheet"> - <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>PT22H12M45S</meta:editing-duration><meta:editing-cycles>145</meta:editing-cycles><meta:generator>LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab8</meta:generator><dc:date>2019-07-22T14:08:53.675000000</dc:date><meta:document-statistic meta:table-count="1" meta:cell-count="185" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> + <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>PT22H16M10S</meta:editing-duration><meta:editing-cycles>146</meta:editing-cycles><meta:generator>LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab8</meta:generator><dc:date>2019-08-23T12:44:22.397000000</dc:date><dc:creator>François Bulot</dc:creator><meta:document-statistic meta:table-count="1" meta:cell-count="194" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> <office:settings> <config:config-item-set config:name="ooo:view-settings"> <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item> <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item> <config:config-item config:name="VisibleAreaWidth" config:type="int">44116</config:config-item> - <config:config-item config:name="VisibleAreaHeight" config:type="int">29873</config:config-item> + <config:config-item config:name="VisibleAreaHeight" config:type="int">31679</config:config-item> <config:config-item-map-indexed config:name="Views"> <config:config-item-map-entry> <config:config-item config:name="ViewId" config:type="string">view1</config:config-item> <config:config-item-map-named config:name="Tables"> <config:config-item-map-entry config:name="Sheet1"> - <config:config-item config:name="CursorPositionX" config:type="int">3</config:config-item> - <config:config-item config:name="CursorPositionY" config:type="int">65</config:config-item> + <config:config-item config:name="CursorPositionX" config:type="int">2</config:config-item> + <config:config-item config:name="CursorPositionY" config:type="int">56</config:config-item> <config:config-item config:name="HorizontalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="VerticalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="HorizontalSplitPosition" config:type="int">0</config:config-item> <config:config-item config:name="VerticalSplitPosition" config:type="int">0</config:config-item> <config:config-item config:name="ActiveSplitRange" config:type="short">2</config:config-item> - <config:config-item config:name="PositionLeft" config:type="int">1</config:config-item> + <config:config-item config:name="PositionLeft" config:type="int">0</config:config-item> <config:config-item config:name="PositionRight" config:type="int">0</config:config-item> <config:config-item config:name="PositionTop" config:type="int">0</config:config-item> <config:config-item config:name="PositionBottom" config:type="int">33</config:config-item> @@ -32,7 +32,7 @@ </config:config-item-map-entry> </config:config-item-map-named> <config:config-item config:name="ActiveTable" config:type="string">Sheet1</config:config-item> - <config:config-item config:name="HorizontalScrollbarWidth" config:type="int">1616</config:config-item> + <config:config-item config:name="HorizontalScrollbarWidth" config:type="int">1655</config:config-item> <config:config-item config:name="ZoomType" config:type="short">0</config:config-item> <config:config-item config:name="ZoomValue" config:type="int">100</config:config-item> <config:config-item config:name="PageViewZoomValue" config:type="int">60</config:config-item> @@ -77,8 +77,8 @@ <config:config-item config:name="IsRasterAxisSynchronized" config:type="boolean">true</config:config-item> <config:config-item config:name="AutoCalculate" config:type="boolean">true</config:config-item> <config:config-item config:name="ApplyUserData" config:type="boolean">true</config:config-item> - <config:config-item config:name="PrinterName" config:type="string">Envoyer à OneNote 16</config:config-item> - <config:config-item config:name="PrinterSetup" config:type="base64Binary">xQT+/0Vudm95ZXIgw6AgT25lTm90ZcKgMTYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAU2VuZCB0byBNaWNyb3NvZnQgT25lTm90ZSAxNiBEcgAWAAEA4gMAAAAAAAAEAAhSAAAEdAAAM1ROVwAAAAAKAEUAbgB2AG8AeQBlAHIAIADgACAATwBuAGUATgBvAHQAZQCgADEANgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBAAG3AD8AgMvAAABAAkAmgs0CGQAAQAPAFgCAgABAFgCAwABAEEANAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAQAAAAIAAAABAAAA/////wAAAAAAAAAAAAAAAAAAAABESU5VIgDAAPwCAACsE9jAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAMAAAABTTVRKAAAAABAAsABTAGUAbgBkACAAdABvACAATQBpAGMAcgBvAHMAbwBmAHQAIABPAG4AZQBOAG8AdABlACAAMQA2ACAARAByAGkAdgBlAHIAAABSRVNETEwAVW5pcmVzRExMAFBhcGVyU2l6ZQBMRVRURVIAT3JpZW50YXRpb24AUE9SVFJBSVQAUmVzb2x1dGlvbgBEUEk2MDAAQ29sb3JNb2RlADI0YnBwAAAAAAAAAAAAAAAAAAAAABIAQ09NUEFUX0RVUExFWF9NT0RFEwBEdXBsZXhNb2RlOjpVbmtub3du</config:config-item> + <config:config-item config:name="PrinterName" config:type="string">\\S20SLINNG\LP0000554-CLR-DR59-SNDI-Secretariat</config:config-item> + <config:config-item config:name="PrinterSetup" config:type="base64Binary">nin+/1xcUzIwU0xJTk5HXExQMDAwMDU1NC1DTFItRFI1OS1TTkRJLVNlY3JldGFyaWF0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAS09OSUNBIE1JTk9MVEEgVW5pdmVyc2FsIFBDTAAAAAAWAAEAuigAAAAAAAAEAAhSAAAEdAAAM1ROVwAAAAAKAFwAXABTADIAMABTAEwASQBOAE4ARwBcAEwAUAAwADAAMAAwADUANQA0AC0AQwBMAFIALQBEAFIANQA5AAAAAAABBAAB3ADUJw+/AAIBAAkAmgs0CGQAAQAHAFgCAgACAFgCAwAAAEEANAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAyCcAAFNQTFgBAAAAAAAAAPwL192wJwAAyCcAAFVQRF9PV04AAAAAAAAAAABQQ0xYTAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAkANAiaCysAKwArACsAADQImgsAAABMIAAArS0AAGUBNAiaCwA0CJoLAEwgAACtLQAAAQBkAAcAAQEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQEBAAABAQBJblRyYXkxAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEBAAABAQEBAAABAQBJblRyYXkyAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIBAAABAQEBAAABAQBJblRyYXkzAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMBAAABAQEBAAABAQBJblRyYXk0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQBAAABAQEBAAABAQBJblRyYXlMQ1QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOgDAAABAQEBAAABAQBJblRyYXlNYW51YWwAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAABAQEBAAABAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAAABAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAAABAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAAABAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAEAAQEBAAEAAQAAAAEAAA4BAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAwAEAAEBAAAAAAQAAAAAAAEAAQAAAAAAAAEBAAAAZAB9AAAEAQEABAEBAAEBAQAB/38AAOkDAQAA6QMBAAABAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEASAD/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAQABAAAAAAABAAAAAQAAAAEAAAABAAEAAQABAQAAAQAAAAEAAQABAQADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAQEAAAAAAQABAAAAAAEAAAEAAQAAAAAAAQAAAAABAAEAAQABAQAAAQAAAAEAAAABAAAAAAEBAAEAAQABAQAAAQAAAAAAAQABBQAAAAAAAAABAAAAAAAAAAEAAQAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQQByAGkAYQBsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAAAgAAAQEAZAABAQBkAAEAAP//AAABAAEAAAAAAAAAAQABAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQAAAAAAAAAAAAAAAAAAAAABAgBYAlgCUAMYAAEEAAAAAAAAAQAAAQAAAAEAAAABAQAAAAABAAABAQABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQABAAEAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEAAABfAgABQXJpYWwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABDb3VyaWVyIE5ldwAAAAAAAAAAAAAAAAAAAAAAAAAAAFRpbWVzIE5ldyBSb21hbgAAAAAAAAAAAAAAAAAAAAAAU3ltYm9sAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABXaW5nZGluZ3MAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQsXFBoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQXJpYWwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABDb3VyaWVyAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFRpbWVzIE5ldyBSb21hbgAAAAAAAAAAAAAAAAAAAAAAU3ltYm9sAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABXaW5nZGluZ3MAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAADpAQAAIwQAAGkFAAB2AgAAqgMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAQAAAAEBAEsBAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANAiaCwCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABzAG8AZgBmAGkAYwBlAC4AYgBpAG4AAAAAAAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAYAAAABAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEACQA0CJoLTCAAAK0tAAD//wAA//8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZAAAAAQAAAAAAAAAAAAAAAAAAAAZYREoAAAAABIAQ09NUEFUX0RVUExFWF9NT0RFFABEdXBsZXhNb2RlOjpMb25nRWRnZQ==</config:config-item> <config:config-item-map-indexed config:name="ForbiddenCharacters"> <config:config-item-map-entry> <config:config-item config:name="Language" config:type="string">zxx</config:config-item> @@ -600,7 +600,7 @@ <text:p><text:sheet-name>???</text:sheet-name><text:s/>(<text:title>???</text:title>)</text:p> </style:region-left> <style:region-right> - <text:p><text:date style:data-style-name="N2" text:date-value="2019-07-22">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="10:36:04.208000000">00:00:00</text:time></text:p> + <text:p><text:date style:data-style-name="N2" text:date-value="2019-08-23">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="12:40:56.879000000">00:00:00</text:time></text:p> </style:region-right> </style:header> <style:header-left style:display="false"/> @@ -1333,6 +1333,15 @@ <text:p>Function that returns the business variable from the DDI one</text:p> </table:table-cell> </table:table-row> + <table:table-row table:style-name="ro1"> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p>enoddi:get-container-name</text:p> + </table:table-cell> + <table:table-cell table:number-columns-repeated="2"/> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p>Function that returns the name of the container of a loop or dynamic array</text:p> + </table:table-cell> + </table:table-row> <table:table-row table:style-name="ro1"> <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>enoddi:get-business-ancestors</text:p> @@ -1453,9 +1462,9 @@ <text:p>Function that returns the label of the flowcontrol of a filter</text:p> </table:table-cell> </table:table-row> - <table:table-row table:style-name="ro1"> - <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>enoddi:is-required</text:p> + <table:table-row table:style-name="ro1"> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p>enoddi:is-required</text:p> </table:table-cell> <table:table-cell/> <table:table-cell office:value-type="string" calcext:value-type="string"> @@ -1465,7 +1474,7 @@ <text:p>Function that returns a boolean which define if the response is mandatory.</text:p> </table:table-cell> </table:table-row> - <table:table-row table:style-name="ro1" table:number-rows-repeated="1048507"> + <table:table-row table:style-name="ro1" table:number-rows-repeated="1048506"> <table:table-cell table:number-columns-repeated="4"/> </table:table-row> <table:table-row table:style-name="ro1"> diff --git a/src/main/resources/xslt/inputs/ddi/source-fixed.xsl b/src/main/resources/xslt/inputs/ddi/source-fixed.xsl index 0e7925a53..6c7dbf6cc 100644 --- a/src/main/resources/xslt/inputs/ddi/source-fixed.xsl +++ b/src/main/resources/xslt/inputs/ddi/source-fixed.xsl @@ -1012,7 +1012,26 @@ </xsl:template> + <xd:doc> + <xd:desc> + <xd:p>Defining getter get-business-name.</xd:p> + <xd:p>Function that returns the business variable from the DDI one.</xd:p> + </xd:desc> + </xd:doc> + <xsl:template match="*" mode="enoddi:get-container-name"> + <xsl:variable name="loop-id" select="enoddi:get-id(.)"/> + <xsl:variable name="loop-name" select="$root//l:VariableScheme//l:VariableGroup[r:BasedOnObject/r:BasedOnReference/r:ID= $loop-id]/l:VariableGroupName/r:String"/> + <xsl:variable name="loop-position" select="$root//l:VariableScheme//l:VariableGroup/r:BasedOnObject/r:BasedOnReference[r:ID= $loop-id]/count(preceding-sibling::r:BasedOnReference)+1"/> + <xsl:choose> + <xsl:when test="$loop-position = 1"> + <xsl:value-of select="concat($loop-name,'-Container')"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="concat($loop-name,'-',$loop-position,'-Container')"/> + </xsl:otherwise> + </xsl:choose> + </xsl:template> <xd:doc> <xd:desc> diff --git a/src/main/resources/xslt/outputs/fr/models.xsl b/src/main/resources/xslt/outputs/fr/models.xsl index 0230a1d1f..4d9750936 100644 --- a/src/main/resources/xslt/outputs/fr/models.xsl +++ b/src/main/resources/xslt/outputs/fr/models.xsl @@ -229,7 +229,7 @@ <xsl:template match="Instance//RowLoop" mode="model"> <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:variable name="name" select="enofr:get-name($source-context)"/> - <xsl:element name="{$name}-Container"> + <xsl:element name="{enofr:get-container-name($source-context)}"> <xsl:element name="{$name}"> <xsl:attribute name="id" select="concat($name,'-1')"/> <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> @@ -251,7 +251,7 @@ <xsl:template match="Instance//QuestionLoop" mode="model"> <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:variable name="name" select="enofr:get-name($source-context)"/> - <xsl:element name="{$name}-Container"> + <xsl:element name="{enofr:get-container-name($source-context)}"> <xsl:element name="{$name}"> <xsl:attribute name="id" select="concat($name,'-1')"/> <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> @@ -334,11 +334,13 @@ <xsl:template match="Model//RowLoop | Model//QuestionLoop" mode="model"> <xsl:param name="source-context" as="item()" tunnel="yes"/> <!-- create element with same name and acts like what is done for the instance part --> - <xsl:element name="{enofr:get-name($source-context)}"> - <xsl:attribute name="id"/> - <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> - <xsl:with-param name="driver" select="eno:append-empty-element('Instance', .)" tunnel="yes"/> - </xsl:apply-templates> + <xsl:element name="{enofr:get-container-name($source-context)}"> + <xsl:element name="{enofr:get-name($source-context)}"> + <xsl:attribute name="id"/> + <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> + <xsl:with-param name="driver" select="eno:append-empty-element('Instance', .)" tunnel="yes"/> + </xsl:apply-templates> + </xsl:element> </xsl:element> <!-- keep going down the tree in case there are other loops --> <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> @@ -955,7 +957,9 @@ <xsl:variable name="name" select="enofr:get-name($source-context)"/> <xsl:variable name="business-name" select="enofr:get-business-name($source-context)"/> - <xf:bind id="{$business-name}-Container-bind" name="{$business-name}-Container" nodeset="{$name}-Container/{$name}"> + <xsl:variable name="container" select="enofr:get-container-name($source-context)"/> + + <xf:bind id="{$container}-bind" name="{$container}" nodeset="{$container}/{$name}"> <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> <xsl:with-param name="driver" select="." tunnel="yes"/> <!-- the absolute address of the element in enriched for RowLoop and QuestionLoop, for which several instances are possible --> @@ -974,6 +978,7 @@ <xsl:param name="instance-ancestor" tunnel="yes"/> <xsl:variable name="name" select="enofr:get-name($source-context)"/> <xsl:variable name="business-name" select="enofr:get-business-name($source-context)"/> + <xsl:variable name="container" select="enofr:get-container-name($source-context)"/> <xsl:variable name="instance-ancestor-label"> <xsl:value-of select="'instance(''fr-form-instance'')//'"/> <xsl:for-each select="tokenize($instance-ancestor,' ')"> @@ -991,7 +996,7 @@ </xsl:when> <xsl:when test="number(enofr:get-minimum-lines($source-context)) < number(enofr:get-maximum-lines($source-context))"> <xf:bind id="{$business-name}-addline-bind" ref="{$business-name}-AddLine" - relevant="count({$instance-ancestor-label}{$business-name}) < {enofr:get-maximum-lines($source-context)}"/> + relevant="count({$instance-ancestor-label}{$container}/{$business-name}) < {enofr:get-maximum-lines($source-context)}"/> </xsl:when> <xsl:otherwise/> </xsl:choose> @@ -1322,6 +1327,19 @@ <xsl:with-param name="driver" select="." tunnel="yes"/> </xsl:apply-templates> </xsl:template> + + <xd:doc> + <xd:desc> + <xd:p>Template for Resource for the drivers QuestionLoop and Rowloop.</xd:p> + </xd:desc> + </xd:doc> + <xsl:template match="Resource//QuestionLoop | Resource//RowLoop" mode="model"> + <xsl:param name="source-context" as="item()" tunnel="yes"/> + + <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> + <xsl:with-param name="driver" select="." tunnel="yes"/> + </xsl:apply-templates> + </xsl:template> <xd:doc> <xd:desc> @@ -1996,6 +2014,7 @@ </xsl:variable> <xsl:variable name="table-name" select="enofr:get-name($source-context)"/> <xsl:variable name="loop-name" select="enofr:get-business-name($source-context)"/> + <xsl:variable name="container-name" select="enofr:get-container-name($source-context)"/> <xsl:variable name="css-class" select="enofr:get-css-class($source-context)"/> <xsl:variable name="isLongTable"> <xsl:if test="count(enofr:get-body-lines($source-context))>=$lengthOfLongTable"> @@ -2033,8 +2052,8 @@ </xhtml:thead> <xhtml:tbody> <!-- if the loop is in a loop, instance-ancestor helps choosing the good ancestor loop instance --> - <xf:repeat id="{$loop-name}" nodeset="{$instance-ancestor-label}{$loop-name}"> - <xf:var name="{$loop-name}-position" value="position()"/> + <xf:repeat id="{$container-name}" nodeset="{$instance-ancestor-label}{$container-name}/{$loop-name}"> + <xf:var name="{$container-name}-position" value="position()"/> <!-- the table has a repeated zone that may have more than one line --> <xsl:for-each select="enofr:get-body-lines($source-context)"> <xhtml:tr> @@ -2052,15 +2071,16 @@ <xsl:variable name="max-lines" select="enofr:get-maximum-lines($source-context)"/> <xsl:if test="not($max-lines != '') or number($max-lines) > number(enofr:get-minimum-lines($source-context))"> + <xsl:variable name="container" select="enofr:get-container-name($source-context)"/> <xf:trigger id="{$loop-name}-addline" bind="{$loop-name}-addline-bind"> <xf:label ref="$form-resources/AddLine/label"/> <xf:action ev:event="DOMActivate"> - <xf:insert context="{$instance-ancestor-label}{$loop-name}-Container" - nodeset="{$instance-ancestor-label}{$loop-name}" position="after" - origin="instance('fr-form-loop-model')/{$loop-name}"/> <xf:setvalue ref="{$instance-ancestor-label}{$loop-name}-Count" value="number({$instance-ancestor-label}{$loop-name}-Count) +1"/> - <xf:setvalue ref="{$instance-ancestor-label}{$loop-name}[last()]/@id" + <xf:insert context="{$instance-ancestor-label}{$container}" + nodeset="{$instance-ancestor-label}{$container}/{$loop-name}" position="after" + origin="instance('fr-form-loop-model')/{$container}/{$loop-name}"/> + <xf:setvalue ref="{$instance-ancestor-label}{$container}/{$loop-name}[last()]/@id" value="concat('{$loop-name}-',{$instance-ancestor-label}{$loop-name}-Count)"/> </xf:action> </xf:trigger> @@ -2193,6 +2213,7 @@ <xsl:param name="languages" tunnel="yes"/> <xsl:param name="instance-ancestor" tunnel="yes"/> <xsl:variable name="loop-name" select="enofr:get-name($source-context)"/> + <xsl:variable name="container-name" select="enofr:get-container-name($source-context)"/> <xsl:variable name="business-name" select="enofr:get-business-name($source-context)"/> <xsl:variable name="instance-ancestor-label"> <xsl:value-of select="'instance(''fr-form-instance'')//'"/> @@ -2201,8 +2222,8 @@ </xsl:for-each> </xsl:variable> - <xf:repeat id="{$loop-name}" nodeset="{$instance-ancestor-label}{$loop-name}"> - <xf:var name="{$loop-name}-position" value="position()"/> + <xf:repeat id="{$container-name}" nodeset="{$instance-ancestor-label}{$container-name}/{$loop-name}"> + <xf:var name="{$container-name}-position" value="position()"/> <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> <xsl:with-param name="driver" select="." tunnel="yes"/> <!-- the absolute address of the element in enriched for Loops, for which several instances are possible --> diff --git a/src/main/resources/xslt/transformations/ddi2fr/functions.fods b/src/main/resources/xslt/transformations/ddi2fr/functions.fods index 19a732fa7..c3c3b0aa9 100644 --- a/src/main/resources/xslt/transformations/ddi2fr/functions.fods +++ b/src/main/resources/xslt/transformations/ddi2fr/functions.fods @@ -1,20 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> <office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.spreadsheet"> - <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>PT10H48M10S</meta:editing-duration><meta:editing-cycles>86</meta:editing-cycles><meta:generator>LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab8</meta:generator><dc:date>2019-07-22T16:43:30.878000000</dc:date><dc:creator>François Bulot</dc:creator><meta:document-statistic meta:table-count="1" meta:cell-count="178" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> + <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>PT10H50M11S</meta:editing-duration><meta:editing-cycles>87</meta:editing-cycles><meta:generator>LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab8</meta:generator><dc:date>2019-08-23T12:43:19.194000000</dc:date><dc:creator>François Bulot</dc:creator><meta:document-statistic meta:table-count="1" meta:cell-count="181" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> <office:settings> <config:config-item-set config:name="ooo:view-settings"> <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item> <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item> <config:config-item config:name="VisibleAreaWidth" config:type="int">33709</config:config-item> - <config:config-item config:name="VisibleAreaHeight" config:type="int">29929</config:config-item> + <config:config-item config:name="VisibleAreaHeight" config:type="int">30381</config:config-item> <config:config-item-map-indexed config:name="Views"> <config:config-item-map-entry> <config:config-item config:name="ViewId" config:type="string">view1</config:config-item> <config:config-item-map-named config:name="Tables"> <config:config-item-map-entry config:name="Sheet1"> - <config:config-item config:name="CursorPositionX" config:type="int">3</config:config-item> - <config:config-item config:name="CursorPositionY" config:type="int">7</config:config-item> + <config:config-item config:name="CursorPositionX" config:type="int">2</config:config-item> + <config:config-item config:name="CursorPositionY" config:type="int">43</config:config-item> <config:config-item config:name="HorizontalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="VerticalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="HorizontalSplitPosition" config:type="int">0</config:config-item> @@ -23,7 +23,7 @@ <config:config-item config:name="PositionLeft" config:type="int">0</config:config-item> <config:config-item config:name="PositionRight" config:type="int">0</config:config-item> <config:config-item config:name="PositionTop" config:type="int">0</config:config-item> - <config:config-item config:name="PositionBottom" config:type="int">0</config:config-item> + <config:config-item config:name="PositionBottom" config:type="int">23</config:config-item> <config:config-item config:name="ZoomType" config:type="short">0</config:config-item> <config:config-item config:name="ZoomValue" config:type="int">100</config:config-item> <config:config-item config:name="PageViewZoomValue" config:type="int">60</config:config-item> @@ -77,8 +77,8 @@ <config:config-item config:name="IsRasterAxisSynchronized" config:type="boolean">true</config:config-item> <config:config-item config:name="AutoCalculate" config:type="boolean">true</config:config-item> <config:config-item config:name="ApplyUserData" config:type="boolean">true</config:config-item> - <config:config-item config:name="PrinterName" config:type="string">Envoyer à OneNote 16</config:config-item> - <config:config-item config:name="PrinterSetup" config:type="base64Binary">xQT+/0Vudm95ZXIgw6AgT25lTm90ZcKgMTYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAU2VuZCB0byBNaWNyb3NvZnQgT25lTm90ZSAxNiBEcgAWAAEA4gMAAAAAAAAEAAhSAAAEdAAAM1ROVwAAAAAKAEUAbgB2AG8AeQBlAHIAIADgACAATwBuAGUATgBvAHQAZQCgADEANgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBAAG3AD8AgMvAAABAAkAmgs0CGQAAQAPAFgCAgABAFgCAwABAEEANAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAQAAAAIAAAABAAAA/////wAAAAAAAAAAAAAAAAAAAABESU5VIgDAAPwCAACsE9jAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAMAAAABTTVRKAAAAABAAsABTAGUAbgBkACAAdABvACAATQBpAGMAcgBvAHMAbwBmAHQAIABPAG4AZQBOAG8AdABlACAAMQA2ACAARAByAGkAdgBlAHIAAABSRVNETEwAVW5pcmVzRExMAFBhcGVyU2l6ZQBMRVRURVIAT3JpZW50YXRpb24AUE9SVFJBSVQAUmVzb2x1dGlvbgBEUEk2MDAAQ29sb3JNb2RlADI0YnBwAAAAAAAAAAAAAAAAAAAAABIAQ09NUEFUX0RVUExFWF9NT0RFEwBEdXBsZXhNb2RlOjpVbmtub3du</config:config-item> + <config:config-item config:name="PrinterName" config:type="string">\\S20SLINNG\LP0000554-CLR-DR59-SNDI-Secretariat</config:config-item> + <config:config-item config:name="PrinterSetup" config:type="base64Binary">nin+/1xcUzIwU0xJTk5HXExQMDAwMDU1NC1DTFItRFI1OS1TTkRJLVNlY3JldGFyaWF0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAS09OSUNBIE1JTk9MVEEgVW5pdmVyc2FsIFBDTAAAAAAWAAEAuigAAAAAAAAEAAhSAAAEdAAAM1ROVwAAAAAKAFwAXABTADIAMABTAEwASQBOAE4ARwBcAEwAUAAwADAAMAAwADUANQA0AC0AQwBMAFIALQBEAFIANQA5AAAAAAABBAAB3ADUJw+/AAIBAAkAmgs0CGQAAQAHAFgCAgACAFgCAwAAAEEANAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAyCcAAFNQTFgBAAAAAAAAAPwL192wJwAAyCcAAFVQRF9PV04AAAAAAAAAAABQQ0xYTAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAkANAiaCysAKwArACsAADQImgsAAABMIAAArS0AAGUBNAiaCwA0CJoLAEwgAACtLQAAAQBkAAcAAQEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQEBAAABAQBJblRyYXkxAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEBAAABAQEBAAABAQBJblRyYXkyAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIBAAABAQEBAAABAQBJblRyYXkzAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMBAAABAQEBAAABAQBJblRyYXk0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQBAAABAQEBAAABAQBJblRyYXlMQ1QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOgDAAABAQEBAAABAQBJblRyYXlNYW51YWwAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAABAQEBAAABAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAAABAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAAABAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAAABAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAEAAQEBAAEAAQAAAAEAAA4BAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAwAEAAEBAAAAAAQAAAAAAAEAAQAAAAAAAAEBAAAAZAB9AAAEAQEABAEBAAEBAQAB/38AAOkDAQAA6QMBAAABAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEASAD/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAQABAAAAAAABAAAAAQAAAAEAAAABAAEAAQABAQAAAQAAAAEAAQABAQADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAQEAAAAAAQABAAAAAAEAAAEAAQAAAAAAAQAAAAABAAEAAQABAQAAAQAAAAEAAAABAAAAAAEBAAEAAQABAQAAAQAAAAAAAQABBQAAAAAAAAABAAAAAAAAAAEAAQAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQQByAGkAYQBsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAAAgAAAQEAZAABAQBkAAEAAP//AAABAAEAAAAAAAAAAQABAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQAAAAAAAAAAAAAAAAAAAAABAgBYAlgCUAMYAAEEAAAAAAAAAQAAAQAAAAEAAAABAQAAAAABAAABAQABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQABAAEAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEAAABfAgABQXJpYWwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABDb3VyaWVyIE5ldwAAAAAAAAAAAAAAAAAAAAAAAAAAAFRpbWVzIE5ldyBSb21hbgAAAAAAAAAAAAAAAAAAAAAAU3ltYm9sAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABXaW5nZGluZ3MAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQsXFBoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQXJpYWwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABDb3VyaWVyAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFRpbWVzIE5ldyBSb21hbgAAAAAAAAAAAAAAAAAAAAAAU3ltYm9sAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABXaW5nZGluZ3MAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAADpAQAAIwQAAGkFAAB2AgAAqgMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAQAAAAEBAEsBAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANAiaCwCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABzAG8AZgBmAGkAYwBlAC4AYgBpAG4AAAAAAAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAYAAAABAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEACQA0CJoLTCAAAK0tAAD//wAA//8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZAAAAAQAAAAAAAAAAAAAAAAAAAAZYREoAAAAABIAQ09NUEFUX0RVUExFWF9NT0RFFABEdXBsZXhNb2RlOjpMb25nRWRnZQ==</config:config-item> <config:config-item-map-indexed config:name="ForbiddenCharacters"> <config:config-item-map-entry> <config:config-item config:name="Language" config:type="string">zxx</config:config-item> @@ -598,7 +598,7 @@ <text:p><text:sheet-name>???</text:sheet-name><text:s/>(<text:title>???</text:title>)</text:p> </style:region-left> <style:region-right> - <text:p><text:date style:data-style-name="N2" text:date-value="2019-07-22">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="16:42:45.927000000">00:00:00</text:time></text:p> + <text:p><text:date style:data-style-name="N2" text:date-value="2019-08-23">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="12:41:17.476000000">00:00:00</text:time></text:p> </style:region-right> </style:header> <style:header-left style:display="false"/> @@ -1207,6 +1207,18 @@ <text:p>Linking output function enofr:get-business-name to input function enoddi:get-business-name</text:p> </table:table-cell> </table:table-row> + <table:table-row table:style-name="ro1"> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p>enofr:get-container-name</text:p> + </table:table-cell> + <table:table-cell/> + <table:table-cell table:style-name="ce2" office:value-type="string" calcext:value-type="string"> + <text:p>enoddi:get-container-name</text:p> + </table:table-cell> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p>Linking output function enofr:get-container-name to input function enoddi:get-container-name</text:p> + </table:table-cell> + </table:table-row> <table:table-row table:style-name="ro1"> <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>enofr:get-business-ancestors</text:p> @@ -1394,7 +1406,7 @@ <text:p>Linking output function enofr:get-cell-value-variables to input function enoddi:get-cell-value-variables</text:p> </table:table-cell> </table:table-row> - <table:table-row table:style-name="ro1" table:number-rows-repeated="1048518"> + <table:table-row table:style-name="ro1" table:number-rows-repeated="1048517"> <table:table-cell table:number-columns-repeated="4"/> </table:table-row> <table:table-row table:style-name="ro1"> diff --git a/src/main/resources/xslt/util/fr/browsing.xsl b/src/main/resources/xslt/util/fr/browsing.xsl index 6dda08b76..90cb4ce49 100644 --- a/src/main/resources/xslt/util/fr/browsing.xsl +++ b/src/main/resources/xslt/util/fr/browsing.xsl @@ -154,10 +154,11 @@ </xd:desc> </xd:doc> <xsl:template match="xf:bind[@id='fr-form-instance-binds']/xf:bind[@nodeset]"> + <xsl:variable name="container" select="@name"/> <xsl:variable name="name"> <xsl:choose> <xsl:when test="ends-with(@name,'-Container')"> - <xsl:value-of select="substring-before(@name,'-Container')"/> + <xsl:value-of select="substring-after(@nodeset,'/')"/> </xsl:when> <xsl:otherwise> <xsl:value-of select="@name"/> @@ -167,7 +168,7 @@ <xsl:copy> <xsl:apply-templates select="@*"/> <!-- Each one is relevant only when it needs to be displayed --> - <xsl:attribute name="relevant" select="concat('count(preceding-sibling::*[name()=''',$name,'''])+1=instance(''fr-form-instance'')/Util/CurrentLoopElement[@loop-name=''',$name,''']')"/> + <xsl:attribute name="relevant" select="concat('count(preceding-sibling::*[name()=''',$name,'''])+1=instance(''fr-form-instance'')/Util/CurrentLoopElement[@loop-name=''',$container,''']')"/> <xsl:apply-templates select="node()"/> </xsl:copy> </xsl:template> @@ -377,9 +378,10 @@ <!-- The total number of pages in the repeat : it can evolve when filling questionnaire --> <xsl:variable name="total-group-pages-count"> <xsl:for-each select="//fr:body/xf:repeat"> - <xsl:variable name="group-name" select="@id"/> + <xsl:variable name="container" select="@id"/> + <xsl:variable name="group-name" select="substring-after(@nodeset,concat($container,'/'))"/> <xsl:variable name="group-pages-number" select="count(fr:section)"/> - <xsl:value-of select="concat('+count(instance(''fr-form-instance'')//',$group-name,')*',$group-pages-number)"/> + <xsl:value-of select="concat('+count(instance(''fr-form-instance'')//',$container,'/',$group-name,')*',$group-pages-number)"/> </xsl:for-each> </xsl:variable> <!-- The number of repeats is removed from the number pages because it is counted in the total number of pages instead --> @@ -392,12 +394,14 @@ ') then ''100''')"/> <xsl:for-each select="//fr:body/xf:repeat"> <xsl:variable name="occurrence-position" select="count(//fr:body/xf:repeat/preceding-sibling::fr:section)+1"/> - <xsl:variable name="group-name" select="@id"/> + <xsl:variable name="container" select="@id"/> + <!--<xsl:variable name="group-name" select="substring-after(@nodeset,concat($container,'/'))"/>--> <xsl:variable name="previous-group-pages-count"> - <xsl:for-each select="//fr:body/xf:repeat[following-sibling::xf:repeat/@id=$group-name]"> + <xsl:for-each select="//fr:body/xf:repeat[following-sibling::xf:repeat/@id=$container]"> <xsl:variable name="previous-group-pages-number" select="count(fr:section)"/> - <xsl:variable name="previous-group-name" select="@id"/> - <xsl:value-of select="concat('+(count(instance(''fr-form-instance'')//',$previous-group-name,')*',$previous-group-pages-number,'-1)')"/> + <xsl:variable name="previous-group-container" select="@id"/> + <xsl:variable name="previous-group-name" select="substring-after(@nodeset,concat($previous-group-container,'/'))"/> + <xsl:value-of select="concat('+(count(instance(''fr-form-instance'')//',$previous-group-container,'/',$previous-group-name,')*',$previous-group-pages-number,'-1)')"/> </xsl:for-each> </xsl:variable> <xsl:variable name="group-pages-number" select="count(fr:section)"/> @@ -408,7 +412,7 @@ <xsl:value-of select="concat(' else (if (instance(''fr-form-instance'')/Util/CurrentSection =',$occurrence-position,')')"/> <!-- pages due to sections previous from the repeat + pages due to previous occurrences + pages due to previous sections in the current occurrence --> <xsl:value-of select="concat(' then round((',$occurrence-position,'-2',$previous-group-pages-count)"/> - <xsl:value-of select="concat('+(number(instance(''fr-form-instance'')/Util/CurrentLoopElement[@loop-name=''',$group-name,'''])-1)*',$group-pages-number)"/> + <xsl:value-of select="concat('+(number(instance(''fr-form-instance'')/Util/CurrentLoopElement[@loop-name=''',$container,'''])-1)*',$group-pages-number)"/> <xsl:value-of select="'+count(instance(''fr-form-instance'')/*[name()=instance(''fr-form-instance'')/Util/CurrentSectionName]/preceding-sibling::*))'"/> <xsl:value-of select="concat(' div ',$denominator,'*100)')"/> </xsl:for-each> @@ -463,21 +467,22 @@ <xf:action ev:event="xforms-ready"> <!-- Initialization of dynamic arrays --> <xsl:for-each select="//xf:repeat[xhtml:tr]"> - <xsl:variable name="dynamic-array" select="@id"/> - <xf:action if="not(instance('fr-form-instance')//{$dynamic-array}-Container/*) - or count(instance('fr-form-instance')//{$dynamic-array}) < instance('fr-form-instance')//{$dynamic-array}-Count"> - <xf:action while="count(instance('fr-form-instance')//{$dynamic-array}) < instance('fr-form-instance')//{$dynamic-array}-Count"> - <xf:insert context="instance('fr-form-instance')//{$dynamic-array}-Container" - nodeset="instance('fr-form-instance')//{$dynamic-array}" + <xsl:variable name="container" select="@id"/> + <xsl:variable name="dynamic-array" select="substring-after(@nodeset,concat($container,'/'))"/> + <xf:action if="not(instance('fr-form-instance')//{$container}/*) + or count(instance('fr-form-instance')//{$container}/{$dynamic-array}) < instance('fr-form-instance')//{$dynamic-array}-Count"> + <xf:action while="count(instance('fr-form-instance')//{$container}/{$dynamic-array}) < instance('fr-form-instance')//{$dynamic-array}-Count"> + <xf:insert context="instance('fr-form-instance')//{$container}" + nodeset="instance('fr-form-instance')//{$container}/{$dynamic-array}" position="after" - origin="instance('fr-form-loop-model')/{$dynamic-array}"/> - <xf:setvalue ref="instance('fr-form-instance')//{$dynamic-array}[last()]/@id" - value="concat('{$dynamic-array}-',count(instance('fr-form-instance')//{$dynamic-array}))"/> + origin="instance('fr-form-loop-model')/{$container}/{$dynamic-array}"/> + <xf:setvalue ref="instance('fr-form-instance')//{$container}/{$dynamic-array}[last()]/@id" + value="concat('{$dynamic-array}-',count(instance('fr-form-instance')//{$container}/{$dynamic-array}))"/> </xf:action> </xf:action> - <xf:action if="count(instance('fr-form-instance')//{$dynamic-array}) > instance('fr-form-instance')//{$dynamic-array}-Count"> + <xf:action if="count(instance('fr-form-instance')//{$container}/{$dynamic-array}) > instance('fr-form-instance')//{$dynamic-array}-Count"> <xf:setvalue ref="instance('fr-form-instance')//{$dynamic-array}-Count" - value="count(instance('fr-form-instance')//{$dynamic-array})"/> + value="count(instance('fr-form-instance')//{$container}/{$dynamic-array})"/> </xf:action> </xsl:for-each> <!-- Going back to the page we left --> @@ -503,11 +508,12 @@ <xsl:variable name="section-position"> <xsl:value-of select="count(preceding-sibling::*)+1"/> </xsl:variable> - <xsl:variable name="loop-name" select="@id"/> + <xsl:variable name="container" select="@id"/> + <xsl:variable name="loop-name" select="substring-after(@nodeset,concat($container,'/'))"/> <xf:action if="instance('fr-form-instance')/Util/CurrentSection='{$section-position}'"> <xf:action - iterate="instance('fr-form-instance')//{$loop-name}[count(preceding-sibling::*[name()='{$loop-name}'])+1=instance('fr-form-instance')/Util/CurrentLoopElement[@loop-name='{$loop-name}']] - /*[name()=instance('fr-form-instance')/Util/CurrentSectionName]//*"> + iterate="instance('fr-form-instance')//{$container}/{$loop-name}[count(preceding-sibling::*[name()='{$loop-name}'])+1=instance('fr-form-instance')/Util/CurrentLoopElement[@loop-name='{$container}']] + /*[name()=instance('fr-form-instance')/Util/CurrentSectionName]//*"> <xf:dispatch name="DOMFocusOut"> <xsl:attribute name="target" select="'{concat(context()/name(),''-control'')}'"/> </xf:dispatch> @@ -543,10 +549,11 @@ <xsl:variable name="section-position"> <xsl:value-of select="count(preceding-sibling::*)+1"/> </xsl:variable> - <xsl:variable name="loop-name" select="@id"/> + <xsl:variable name="container" select="@id"/> + <xsl:variable name="loop-name" select="substring-after(@nodeset,concat($container,'/'))"/> <xf:action if="instance('fr-form-instance')/Util/CurrentSection='{$section-position}'"> <xf:action if="instance('fr-form-util')/PageChangeDone='false' - and not(xxf:valid(instance('fr-form-instance')//{$loop-name}[count(preceding-sibling::*[name()='{$loop-name}'])+1 = instance('fr-form-instance')/Util/CurrentLoopElement[@loop-name='{$loop-name}']] + and not(xxf:valid(instance('fr-form-instance')//{$container}/{$loop-name}[count(preceding-sibling::*[name()='{$loop-name}'])+1 = instance('fr-form-instance')/Util/CurrentLoopElement[@loop-name='{$container}']] /*[name()=instance('fr-form-instance')/Util/CurrentSectionName], true(),true()))"> <!-- Displaying the dialog window that correspond to an error according to value of PreviousNext--> @@ -581,10 +588,11 @@ <xsl:variable name="section-position"> <xsl:value-of select="count(preceding-sibling::*)+1"/> </xsl:variable> - <xsl:variable name="loop-name" select="@id"/> + <xsl:variable name="container" select="@id"/> + <xsl:variable name="loop-name" select="substring-after(@nodeset,concat($container,'/'))"/> <xf:action if="instance('fr-form-instance')/Util/CurrentSection='{$section-position}'"> <xf:action if="instance('fr-form-util')/PageChangeDone='false' - and xxf:valid(instance('fr-form-instance')//{$loop-name}[count(preceding-sibling::*[name()='{$loop-name}'])+1 = instance('fr-form-instance')/Util/CurrentLoopElement[@loop-name='{$loop-name}']] + and xxf:valid(instance('fr-form-instance')//{$container}/{$loop-name}[count(preceding-sibling::*[name()='{$loop-name}'])+1 = instance('fr-form-instance')/Util/CurrentLoopElement[@loop-name='{$container}']] /*[name()=instance('fr-form-instance')/Util/CurrentSectionName],true(),true()) and xxf:evaluate-bind-property(concat('page-',instance('fr-form-instance')/Util/CurrentSectionName,'-bind') ,'constraint')=false()"> <!-- Displaying the dialog window that correspond to an warning according to value of PreviousNext--> @@ -611,10 +619,11 @@ <!-- The same for loops of pages --> <xsl:for-each select="//fr:body/xf:repeat"> <xsl:variable name="section-position" select="count(preceding-sibling::*)+1"/> - <xsl:variable name="loop-name" select="@id"/> + <xsl:variable name="container" select="@id"/> + <xsl:variable name="loop-name" select="substring-after(@nodeset,concat($container,'/'))"/> <xf:action if="instance('fr-form-instance')/Util/CurrentSection='{$section-position}'"> <xf:action if="instance('fr-form-util')/PageChangeDone='false' - and xxf:valid(instance('fr-form-instance')//{$loop-name}[count(preceding-sibling::*[name()='{$loop-name}'])+1 = instance('fr-form-instance')/Util/CurrentLoopElement[@loop-name='{$loop-name}']] + and xxf:valid(instance('fr-form-instance')//{$container}/{$loop-name}[count(preceding-sibling::*[name()='{$loop-name}'])+1 = instance('fr-form-instance')/Util/CurrentLoopElement[@loop-name='{$container}']] /*[name()=instance('fr-form-instance')/Util/CurrentSectionName], true(),true()) and not(xxf:evaluate-bind-property(concat('page-',instance('fr-form-instance')/Util/CurrentSectionName,'-bind'),'constraint')=false())"> @@ -679,9 +688,10 @@ </xd:doc> <xsl:template match="*[ends-with(name(),'-Container')]" mode="page-bind"> <xsl:param name="loop-ancestors"/> - <xsl:variable name="loop-name" select="substring-before(name(),'-Container')"/> - <xf:bind id="page-{name()}-bind" name="{name()}" ref="{name()}/{$loop-name}[instance('fr-form-instance')/Util/CurrentLoopElement[@loop-name='{$loop-name}']]"> - <xf:bind id="{$loop-name}-position-bind" name="{$loop-name}-position" value="number(instance('fr-form-instance')/Util/CurrentLoopElement[@loop-name='{$loop-name}'])"/> + <xsl:variable name="container" select="name()"/> + <xsl:variable name="loop-name" select="child::*/name()"/> + <xf:bind id="page-{name()}-bind" name="{name()}" ref="{name()}/{$loop-name}[instance('fr-form-instance')/Util/CurrentLoopElement[@loop-name='{$container}']]"> + <xf:bind id="{$container}-position-bind" name="{$container}-position" value="number(instance('fr-form-instance')/Util/CurrentLoopElement[@loop-name='{$container}'])"/> <xsl:apply-templates select="child::*/child::*[child::*]" mode="page-bind"> <xsl:with-param name="loop-ancestors" select="if ($loop-ancestors='') then $loop-name else concat($loop-ancestors,' ',$loop-name)"/> </xsl:apply-templates> @@ -787,13 +797,15 @@ <xsl:variable name="module-position"> <xsl:value-of select="count(preceding-sibling::*)+1"/> </xsl:variable> + <xsl:variable name="container" select="@id"/> + <xsl:variable name="loop-id" select="substring-after(@nodeset,concat($container,'/'))"/> <!-- if we're on the group and next button was clicked then : if all modules are hidden then 0 else next minimum value --> <xf:action if="instance('fr-form-util')/PreviousNext='1' and number(instance('fr-form-instance')/Util/CurrentSection) = {$module-position}"> - <xf:setvalue ref="instance('fr-form-instance')/Util/CurrentLoopElement[@loop-name='{@id}']" - value="string(if (count(instance('fr-form-instance')//{@id}[(count(preceding-sibling::*[name()='{@id}'])+1) - > instance('fr-form-instance')/Util/CurrentLoopElement[@loop-name='{@id}'] and not(text()='false')]) > 0) - then (count(instance('fr-form-instance')//{@id}[(count(preceding-sibling::*[name()='{@id}'])+1) - > instance('fr-form-instance')/Util/CurrentLoopElement[@loop-name='{@id}'] and not(text()='false')][1]/preceding-sibling::*)+1) + <xf:setvalue ref="instance('fr-form-instance')/Util/CurrentLoopElement[@loop-name='{$container}']" + value="string(if (count(instance('fr-form-instance')//{$container}/{$loop-id}[(count(preceding-sibling::*[name()='{$loop-id}'])+1) + > instance('fr-form-instance')/Util/CurrentLoopElement[@loop-name='{$container}'] and not(text()='false')]) > 0) + then (count(instance('fr-form-instance')//{$container}/{$loop-id}[(count(preceding-sibling::*[name()='{$loop-id}'])+1) + > instance('fr-form-instance')/Util/CurrentLoopElement[@loop-name='{$container}'] and not(text()='false')][1]/preceding-sibling::*)+1) else 0)"/> <xf:action if="instance('fr-form-instance')/Util/CurrentLoopElement[@loop-name='{@id}'] > 0"> <xf:setvalue ref="instance('fr-form-util')/PageChangeDone" value="string('true')"/> @@ -801,10 +813,10 @@ </xf:action> <!-- if we're on the group and previous button was clicked then : if all modules are hidden then 0 else next maximum value --> <xf:action if="instance('fr-form-util')/PreviousNext='-1' and number(instance('fr-form-instance')/Util/CurrentSection) = {$module-position}"> - <xf:setvalue ref="instance('fr-form-instance')/Util/CurrentLoopElement[@loop-name='{@id}']" - value="string(if (count(instance('fr-form-instance')//{@id}[(count(preceding-sibling::*[name()='{@id}'])+1) - < instance('fr-form-instance')/Util/CurrentLoopElement[@loop-name='{@id}'] and not(text()='false')]) > 0) - then (count(instance('fr-form-instance')//{@id}[(count(preceding-sibling::*[name()='{@id}'])+1) < instance('fr-form-instance')/Util/CurrentLoopElement[@loop-name='{@id}'] + <xf:setvalue ref="instance('fr-form-instance')/Util/CurrentLoopElement[@loop-name='{$container}']" + value="string(if (count(instance('fr-form-instance')//{$container}/{$loop-id}[(count(preceding-sibling::*[name()='{$loop-id}'])+1) + < instance('fr-form-instance')/Util/CurrentLoopElement[@loop-name='{$container}'] and not(text()='false')]) > 0) + then (count(instance('fr-form-instance')//{$container}/{$loop-id}[(count(preceding-sibling::*[name()='{$loop-id}'])+1) < instance('fr-form-instance')/Util/CurrentLoopElement[@loop-name='{$container}'] and not(text()='false')][last()]/preceding-sibling::*)+1) else 0)"/> <xf:action if="instance('fr-form-instance')/Util/CurrentLoopElement[@loop-name='{@id}'] > 0"> @@ -813,52 +825,53 @@ </xf:action> <!-- if we're on a previous group and next button was clicked then : if all modules are hidden then 0 else minimum value --> <xf:action if="instance('fr-form-util')/PreviousNext='1' and number(instance('fr-form-instance')/Util/CurrentSection) < {$module-position}"> - <xf:setvalue ref="instance('fr-form-instance')/Util/CurrentLoopElement[@loop-name='{@id}']" - value="string(if (count(instance('fr-form-instance')//{@id}[not(text()='false')]) > 0) - then (count(instance('fr-form-instance')//{@id}[not(text()='false')][1]/preceding-sibling::*[name()='{@id}'])+1) + <xf:setvalue ref="instance('fr-form-instance')/Util/CurrentLoopElement[@loop-name='{$container}']" + value="string(if (count(instance('fr-form-instance')//{$container}/{$loop-id}[not(text()='false')]) > 0) + then (count(instance('fr-form-instance')//{$container}/{$loop-id}[not(text()='false')][1]/preceding-sibling::*[name()='{$loop-id}'])+1) else 0)"/> </xf:action> <!-- if we're on a next group and previous button was clicked then : if all modules are hidden then 0 else maximum value --> <xf:action if="instance('fr-form-util')/PreviousNext='-1' and number(instance('fr-form-instance')/Util/CurrentSection) > {$module-position}"> - <xf:setvalue ref="instance('fr-form-instance')/Util/CurrentLoopElement[@loop-name='{@id}']" - value="string(if (count(instance('fr-form-instance')//{@id}[not(text()='false')]) > 0) - then (count(instance('fr-form-instance')//{@id}[not(text()='false')][last()]/preceding-sibling::*[name()='{@id}'])+1) + <xf:setvalue ref="instance('fr-form-instance')/Util/CurrentLoopElement[@loop-name='{$container}']" + value="string(if (count(instance('fr-form-instance')//{$container}/{$loop-id}[not(text()='false')]) > 0) + then (count(instance('fr-form-instance')//{$container}/{$loop-id}[not(text()='false')][last()]/preceding-sibling::*[name()='{$loop-id}'])+1) else 0)"/> </xf:action> -<!-- Waiting for loop on several pages to be tested - <xf:action if="instance('fr-form-util')/PreviousNext='1' and number(instance('fr-form-instance')/Util/CurrentSection) = {$module-position}"> - <xf:setvalue ref="instance('fr-form-instance')/Util/CurrentLoopElement[@loop-name='{@id}']" - value="string(if (count(instance('fr-form-instance')/{@id}/*[position() - > instance('fr-form-instance')/Util/CurrentLoopElement[@loop-name='{@id}'] and not(text()='false')]) > 0) - then (count(instance('fr-form-instance')/{@id}/*[position() - > instance('fr-form-instance')/Util/CurrentLoopElement[@loop-name='{@id}'] and not(text()='false')][1]/preceding-sibling::*)+1) + <!--Waiting for loop on several pages to be tested--> + <!-- at least needs to add the occurrence of the loop --> + <!-- <xf:action if="instance('fr-form-util')/PreviousNext='1' and number(instance('fr-form-instance')/Util/CurrentSection) = {$module-position}"> + <xf:setvalue ref="instance('fr-form-instance')/Util/CurrentLoopElement[@loop-name='{$container}']" + value="string(if (count(instance('fr-form-instance')//{$container}/{$loop-id}/*[position() + > instance('fr-form-instance')/Util/CurrentLoopElement[@loop-name='{$container}'] and not(text()='false')]) > 0) + then (count(instance('fr-form-instance')//{$container}/{$loop-id}/*[position() + > instance('fr-form-instance')/Util/CurrentLoopElement[@loop-name='{$container}'] and not(text()='false')][1]/preceding-sibling::*)+1) else 0)"/> - <xf:action if="instance('fr-form-instance')/Util/CurrentLoopElement[@loop-name='{@id}'] > 0"> + <xf:action if="instance('fr-form-instance')/Util/CurrentLoopElement[@loop-name='{$container}'] > 0"> <xf:setvalue ref="instance('fr-form-util')/PageChangeDone" value="string('true')"/> </xf:action> </xf:action> <xf:action if="instance('fr-form-util')/PreviousNext='-1' and number(instance('fr-form-instance')/Util/CurrentSection) = {$module-position}"> - <xf:setvalue ref="instance('fr-form-instance')/Util/CurrentLoopElement[@loop-name='{@id}']" - value="string(if (count(instance('fr-form-instance')/{@id}/*[position() - < instance('fr-form-instance')/Util/CurrentLoopElement[@loop-name='{@id}'] and not(text()='false')]) > 0) - then (count(instance('fr-form-instance')/{@id}/*[position() - < instance('fr-form-instance')/Util/CurrentLoopElement[@loop-name='{@id}'] and not(text()='false')][last()]/preceding-sibling::*)+1) + <xf:setvalue ref="instance('fr-form-instance')/Util/CurrentLoopElement[@loop-name='{$container}']" + value="string(if (count(instance('fr-form-instance')//{$container}/{$loop-id}/*[position() + < instance('fr-form-instance')/Util/CurrentLoopElement[@loop-name='{$container}'] and not(text()='false')]) > 0) + then (count(instance('fr-form-instance')/{$container}/{$loop-id}/*[position() + < instance('fr-form-instance')/Util/CurrentLoopElement[@loop-name='{$container}'] and not(text()='false')][last()]/preceding-sibling::*)+1) else 0)"/> - <xf:action if="instance('fr-form-instance')/Util/CurrentLoopElement[@loop-name='{@id}'] > 0"> + <xf:action if="instance('fr-form-instance')/Util/CurrentLoopElement[@loop-name='{$container}'] > 0"> <xf:setvalue ref="instance('fr-form-util')/PageChangeDone" value="string('true')"/> </xf:action> </xf:action> <xf:action if="instance('fr-form-util')/PreviousNext='1' and number(instance('fr-form-instance')/Util/CurrentSection) < {$module-position}"> - <xf:setvalue ref="instance('fr-form-instance')/Util/CurrentLoopElement[@loop-name='{@id}']" - value="string(if (count(instance('fr-form-instance')/{@id}/*[not(text()='false')]) > 0) - then (count(instance('fr-form-instance')/{@id}/*[not(text()='false')][1]/preceding-sibling::*)+1) + <xf:setvalue ref="instance('fr-form-instance')/Util/CurrentLoopElement[@loop-name='{$container}']" + value="string(if (count(instance('fr-form-instance')/{$container}/{$loop-id}/*[not(text()='false')]) > 0) + then (count(instance('fr-form-instance')/{$container}/{$loop-id}/*[not(text()='false')][1]/preceding-sibling::*)+1) else 0)"/> </xf:action> <xf:action if="instance('fr-form-util')/PreviousNext='-1' and number(instance('fr-form-instance')/Util/CurrentSection) > {$module-position}"> - <xf:setvalue ref="instance('fr-form-instance')/Util/CurrentLoopElement[@loop-name='{@id}']" - value="string(if (count(instance('fr-form-instance')/{@id}/*[not(text()='false')]) > 0) - then (count(instance('fr-form-instance')/{@id}/*[not(text()='false')][last()]/preceding-sibling::*)+1) + <xf:setvalue ref="instance('fr-form-instance')/Util/CurrentLoopElement[@loop-name='{$container}']" + value="string(if (count(instance('fr-form-instance')/{$container}/{$loop-id}/*[not(text()='false')]) > 0) + then (count(instance('fr-form-instance')/{$container}/{$loop-id}/*[not(text()='false')][last()]/preceding-sibling::*)+1) else 0)"/> </xf:action> --> From bca4c2ad2457f88b061060fe091b9ff82bab6092 Mon Sep 17 00:00:00 2001 From: BulotF <francois.bulot@insee.fr> Date: Wed, 28 Aug 2019 10:38:44 +0200 Subject: [PATCH 081/439] linked loop containers --- .../resources/xslt/inputs/ddi/functions.fods | 24 +++++++++++---- .../xslt/inputs/ddi/source-fixed.xsl | 29 ++++++++++++++++--- src/main/resources/xslt/outputs/fr/models.xsl | 12 ++++---- .../transformations/ddi2fr/functions.fods | 22 ++++++++++---- src/main/resources/xslt/util/fr/browsing.xsl | 15 ++++++++++ 5 files changed, 82 insertions(+), 20 deletions(-) diff --git a/src/main/resources/xslt/inputs/ddi/functions.fods b/src/main/resources/xslt/inputs/ddi/functions.fods index 848f3adf6..ae839e39a 100644 --- a/src/main/resources/xslt/inputs/ddi/functions.fods +++ b/src/main/resources/xslt/inputs/ddi/functions.fods @@ -1,20 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> <office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.spreadsheet"> - <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>PT22H16M10S</meta:editing-duration><meta:editing-cycles>146</meta:editing-cycles><meta:generator>LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab8</meta:generator><dc:date>2019-08-23T12:44:22.397000000</dc:date><dc:creator>François Bulot</dc:creator><meta:document-statistic meta:table-count="1" meta:cell-count="194" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> + <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>PT22H22M21S</meta:editing-duration><meta:editing-cycles>148</meta:editing-cycles><meta:generator>LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab8</meta:generator><dc:date>2019-08-27T17:42:49.698000000</dc:date><dc:creator>François Bulot</dc:creator><meta:document-statistic meta:table-count="1" meta:cell-count="197" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> <office:settings> <config:config-item-set config:name="ooo:view-settings"> <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item> <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item> <config:config-item config:name="VisibleAreaWidth" config:type="int">44116</config:config-item> - <config:config-item config:name="VisibleAreaHeight" config:type="int">31679</config:config-item> + <config:config-item config:name="VisibleAreaHeight" config:type="int">32131</config:config-item> <config:config-item-map-indexed config:name="Views"> <config:config-item-map-entry> <config:config-item config:name="ViewId" config:type="string">view1</config:config-item> <config:config-item-map-named config:name="Tables"> <config:config-item-map-entry config:name="Sheet1"> - <config:config-item config:name="CursorPositionX" config:type="int">2</config:config-item> - <config:config-item config:name="CursorPositionY" config:type="int">56</config:config-item> + <config:config-item config:name="CursorPositionX" config:type="int">0</config:config-item> + <config:config-item config:name="CursorPositionY" config:type="int">54</config:config-item> <config:config-item config:name="HorizontalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="VerticalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="HorizontalSplitPosition" config:type="int">0</config:config-item> @@ -600,7 +600,7 @@ <text:p><text:sheet-name>???</text:sheet-name><text:s/>(<text:title>???</text:title>)</text:p> </style:region-left> <style:region-right> - <text:p><text:date style:data-style-name="N2" text:date-value="2019-08-23">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="12:40:56.879000000">00:00:00</text:time></text:p> + <text:p><text:date style:data-style-name="N2" text:date-value="2019-08-27">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="17:36:38.264000000">00:00:00</text:time></text:p> </style:region-right> </style:header> <style:header-left style:display="false"/> @@ -1342,6 +1342,18 @@ <text:p>Function that returns the name of the container of a loop or dynamic array</text:p> </table:table-cell> </table:table-row> + <table:table-row table:style-name="ro1"> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p>enoddi:get-linked-containers</text:p> + </table:table-cell> + <table:table-cell/> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p>xs:string*</text:p> + </table:table-cell> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p>Function that returns the list of the containers of a loop element</text:p> + </table:table-cell> + </table:table-row> <table:table-row table:style-name="ro1"> <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>enoddi:get-business-ancestors</text:p> @@ -1474,7 +1486,7 @@ <text:p>Function that returns a boolean which define if the response is mandatory.</text:p> </table:table-cell> </table:table-row> - <table:table-row table:style-name="ro1" table:number-rows-repeated="1048506"> + <table:table-row table:style-name="ro1" table:number-rows-repeated="1048505"> <table:table-cell table:number-columns-repeated="4"/> </table:table-row> <table:table-row table:style-name="ro1"> diff --git a/src/main/resources/xslt/inputs/ddi/source-fixed.xsl b/src/main/resources/xslt/inputs/ddi/source-fixed.xsl index 6c7dbf6cc..e18668b74 100644 --- a/src/main/resources/xslt/inputs/ddi/source-fixed.xsl +++ b/src/main/resources/xslt/inputs/ddi/source-fixed.xsl @@ -1011,11 +1011,10 @@ </xsl:choose> </xsl:template> - <xd:doc> <xd:desc> - <xd:p>Defining getter get-business-name.</xd:p> - <xd:p>Function that returns the business variable from the DDI one.</xd:p> + <xd:p>Defining getter get-container-name.</xd:p> + <xd:p>Function that returns the business name of the container of a loop or a dynamic array.</xd:p> </xd:desc> </xd:doc> <xsl:template match="*" mode="enoddi:get-container-name"> @@ -1033,6 +1032,28 @@ </xsl:choose> </xsl:template> + <xd:doc> + <xd:desc> + <xd:p>Defining getter get-linked-containers.</xd:p> + <xd:p>Function that returns the list of the business name of the different containers of an occurrence of the current loop or dynamic array.</xd:p> + </xd:desc> + </xd:doc> + <xsl:template match="*" mode="enoddi:get-linked-containers"> + <xsl:variable name="loop-id" select="enoddi:get-id(.)"/> + <xsl:variable name="loop-name" select="$root//l:VariableScheme//l:VariableGroup[r:BasedOnObject/r:BasedOnReference/r:ID= $loop-id]/l:VariableGroupName/r:String"/> + <xsl:for-each select="$root//l:VariableScheme//l:VariableGroup/r:BasedOnObject[r:BasedOnReference/r:ID= $loop-id]/r:BasedOnReference"> + <xsl:variable name="loop-position" select="position()"/> + <xsl:choose> + <xsl:when test="$loop-position = 1"> + <xsl:value-of select="concat($loop-name,'-Container')"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="concat($loop-name,'-',$loop-position,'-Container')"/> + </xsl:otherwise> + </xsl:choose> + </xsl:for-each> + </xsl:template> + <xd:doc> <xd:desc> <xd:p>Defining getter get-business-name.</xd:p> @@ -1254,7 +1275,7 @@ <xsl:apply-templates select="node()|@*"/> </xsl:copy> </xsl:template> - + <xd:doc> <xd:desc> <xd:p>Function for retrieving instructions before the label of the question</xd:p> diff --git a/src/main/resources/xslt/outputs/fr/models.xsl b/src/main/resources/xslt/outputs/fr/models.xsl index 4d9750936..288190ac5 100644 --- a/src/main/resources/xslt/outputs/fr/models.xsl +++ b/src/main/resources/xslt/outputs/fr/models.xsl @@ -2077,11 +2077,13 @@ <xf:action ev:event="DOMActivate"> <xf:setvalue ref="{$instance-ancestor-label}{$loop-name}-Count" value="number({$instance-ancestor-label}{$loop-name}-Count) +1"/> - <xf:insert context="{$instance-ancestor-label}{$container}" - nodeset="{$instance-ancestor-label}{$container}/{$loop-name}" position="after" - origin="instance('fr-form-loop-model')/{$container}/{$loop-name}"/> - <xf:setvalue ref="{$instance-ancestor-label}{$container}/{$loop-name}[last()]/@id" - value="concat('{$loop-name}-',{$instance-ancestor-label}{$loop-name}-Count)"/> + <xsl:for-each select="enofr:get-linked-containers($source-context)"> + <xf:insert context="{$instance-ancestor-label}{.}" + nodeset="{$instance-ancestor-label}{.}/{$loop-name}" position="after" + origin="instance('fr-form-loop-model')/{.}/{$loop-name}"/> + <xf:setvalue ref="{$instance-ancestor-label}{.}/{$loop-name}[last()]/@id" + value="concat('{$loop-name}-',{$instance-ancestor-label}{$loop-name}-Count)"/> + </xsl:for-each> </xf:action> </xf:trigger> </xsl:if> diff --git a/src/main/resources/xslt/transformations/ddi2fr/functions.fods b/src/main/resources/xslt/transformations/ddi2fr/functions.fods index c3c3b0aa9..4f053a06f 100644 --- a/src/main/resources/xslt/transformations/ddi2fr/functions.fods +++ b/src/main/resources/xslt/transformations/ddi2fr/functions.fods @@ -1,19 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> <office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.spreadsheet"> - <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>PT10H50M11S</meta:editing-duration><meta:editing-cycles>87</meta:editing-cycles><meta:generator>LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab8</meta:generator><dc:date>2019-08-23T12:43:19.194000000</dc:date><dc:creator>François Bulot</dc:creator><meta:document-statistic meta:table-count="1" meta:cell-count="181" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> + <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>PT10H54M15S</meta:editing-duration><meta:editing-cycles>88</meta:editing-cycles><meta:generator>LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab8</meta:generator><dc:date>2019-08-27T17:42:14.491000000</dc:date><dc:creator>François Bulot</dc:creator><meta:document-statistic meta:table-count="1" meta:cell-count="184" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> <office:settings> <config:config-item-set config:name="ooo:view-settings"> <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item> <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item> <config:config-item config:name="VisibleAreaWidth" config:type="int">33709</config:config-item> - <config:config-item config:name="VisibleAreaHeight" config:type="int">30381</config:config-item> + <config:config-item config:name="VisibleAreaHeight" config:type="int">30832</config:config-item> <config:config-item-map-indexed config:name="Views"> <config:config-item-map-entry> <config:config-item config:name="ViewId" config:type="string">view1</config:config-item> <config:config-item-map-named config:name="Tables"> <config:config-item-map-entry config:name="Sheet1"> - <config:config-item config:name="CursorPositionX" config:type="int">2</config:config-item> + <config:config-item config:name="CursorPositionX" config:type="int">3</config:config-item> <config:config-item config:name="CursorPositionY" config:type="int">43</config:config-item> <config:config-item config:name="HorizontalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="VerticalSplitMode" config:type="short">0</config:config-item> @@ -598,7 +598,7 @@ <text:p><text:sheet-name>???</text:sheet-name><text:s/>(<text:title>???</text:title>)</text:p> </style:region-left> <style:region-right> - <text:p><text:date style:data-style-name="N2" text:date-value="2019-08-23">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="12:41:17.476000000">00:00:00</text:time></text:p> + <text:p><text:date style:data-style-name="N2" text:date-value="2019-08-27">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="17:38:09.868000000">00:00:00</text:time></text:p> </style:region-right> </style:header> <style:header-left style:display="false"/> @@ -1219,6 +1219,18 @@ <text:p>Linking output function enofr:get-container-name to input function enoddi:get-container-name</text:p> </table:table-cell> </table:table-row> + <table:table-row table:style-name="ro1"> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p>enofr:get-linked-containers</text:p> + </table:table-cell> + <table:table-cell/> + <table:table-cell table:style-name="ce2" office:value-type="string" calcext:value-type="string"> + <text:p>enoddi:get-linked-containers</text:p> + </table:table-cell> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p>Linking output function enofr:get-linked-containers to input function enoddi:get-linked-containers</text:p> + </table:table-cell> + </table:table-row> <table:table-row table:style-name="ro1"> <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>enofr:get-business-ancestors</text:p> @@ -1406,7 +1418,7 @@ <text:p>Linking output function enofr:get-cell-value-variables to input function enoddi:get-cell-value-variables</text:p> </table:table-cell> </table:table-row> - <table:table-row table:style-name="ro1" table:number-rows-repeated="1048517"> + <table:table-row table:style-name="ro1" table:number-rows-repeated="1048516"> <table:table-cell table:number-columns-repeated="4"/> </table:table-row> <table:table-row table:style-name="ro1"> diff --git a/src/main/resources/xslt/util/fr/browsing.xsl b/src/main/resources/xslt/util/fr/browsing.xsl index 90cb4ce49..7be7e56ad 100644 --- a/src/main/resources/xslt/util/fr/browsing.xsl +++ b/src/main/resources/xslt/util/fr/browsing.xsl @@ -484,6 +484,21 @@ <xf:setvalue ref="instance('fr-form-instance')//{$dynamic-array}-Count" value="count(instance('fr-form-instance')//{$container}/{$dynamic-array})"/> </xf:action> + <xsl:for-each select="//xf:repeat[substring-after(@nodeset,concat(@id,'/')) = $dynamic-array]"> + <xsl:if test="@id != $container"> + <xf:action if="not(instance('fr-form-instance')//{@id}/*) + or count(instance('fr-form-instance')//{@id}/{$dynamic-array}) < instance('fr-form-instance')//{$dynamic-array}-Count"> + <xf:action while="count(instance('fr-form-instance')//{@id}/{$dynamic-array}) < instance('fr-form-instance')//{$dynamic-array}-Count"> + <xf:insert context="instance('fr-form-instance')//{@id}" + nodeset="instance('fr-form-instance')//{@id}/{$dynamic-array}" + position="after" + origin="instance('fr-form-loop-model')/{@id}/{$dynamic-array}"/> + <xf:setvalue ref="instance('fr-form-instance')//{@id}/{$dynamic-array}[last()]/@id" + value="instance('fr-form-instance')//{$container}/{$dynamic-array}[position() = count(instance('fr-form-instance')//{@id}/{$dynamic-array})]/@id"/> + </xf:action> + </xf:action> + </xsl:if> + </xsl:for-each> </xsl:for-each> <!-- Going back to the page we left --> <xf:toggle case="{$choice}"/> From c2eccdfdcee2eaf6874ccfd2a670b0ddaa4fe4a4 Mon Sep 17 00:00:00 2001 From: BulotF <francois.bulot@insee.fr> Date: Wed, 28 Aug 2019 11:09:15 +0200 Subject: [PATCH 082/439] Update source-fixed.xsl update linked-container id --- src/main/resources/xslt/inputs/ddi/source-fixed.xsl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/xslt/inputs/ddi/source-fixed.xsl b/src/main/resources/xslt/inputs/ddi/source-fixed.xsl index e18668b74..4cf8dc374 100644 --- a/src/main/resources/xslt/inputs/ddi/source-fixed.xsl +++ b/src/main/resources/xslt/inputs/ddi/source-fixed.xsl @@ -1027,7 +1027,7 @@ <xsl:value-of select="concat($loop-name,'-Container')"/> </xsl:when> <xsl:otherwise> - <xsl:value-of select="concat($loop-name,'-',$loop-position,'-Container')"/> + <xsl:value-of select="concat($loop-name,'_',$loop-position,'-Container')"/> </xsl:otherwise> </xsl:choose> </xsl:template> @@ -1048,7 +1048,7 @@ <xsl:value-of select="concat($loop-name,'-Container')"/> </xsl:when> <xsl:otherwise> - <xsl:value-of select="concat($loop-name,'-',$loop-position,'-Container')"/> + <xsl:value-of select="concat($loop-name,'_',$loop-position,'-Container')"/> </xsl:otherwise> </xsl:choose> </xsl:for-each> From b350ba83fd5228f21e23f0366674b584728b1c40 Mon Sep 17 00:00:00 2001 From: BulotF <francois.bulot@insee.fr> Date: Fri, 30 Aug 2019 15:26:12 +0200 Subject: [PATCH 083/439] update drivers xf-input and xf-textarea xf-input becomes TextDomain + NumericDomain xf-textarea becomes TextareaDomain --- src/main/resources/xslt/outputs/js/models.xsl | 207 ++++++++++-------- .../resources/xslt/outputs/odt/models.xsl | 82 ++++--- .../xslt/transformations/ddi2js/drivers.fods | 34 +-- .../xslt/transformations/ddi2odt/drivers.fods | 38 ++-- 4 files changed, 196 insertions(+), 165 deletions(-) diff --git a/src/main/resources/xslt/outputs/js/models.xsl b/src/main/resources/xslt/outputs/js/models.xsl index 708eed4ba..3c14c08c4 100644 --- a/src/main/resources/xslt/outputs/js/models.xsl +++ b/src/main/resources/xslt/outputs/js/models.xsl @@ -393,10 +393,10 @@ <xd:doc> <xd:desc> - <xd:p>Match on xf-input driver.</xd:p> + <xd:p>Match on NumericDomain driver.</xd:p> </xd:desc> </xd:doc> - <xsl:template match="xf-input" mode="model"> + <xsl:template match="NumericDomain" mode="model"> <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="idQuestion" tunnel="yes"/> <xsl:param name="questionName" tunnel="yes"/> @@ -404,21 +404,13 @@ <xsl:param name="languages" tunnel="yes"/> <xsl:param name="declarations" as="node()*" tunnel="yes"/> <xsl:param name="filterCondition" tunnel="yes"/> - <xsl:param name="col-span" tunnel="yes"/> <xsl:param name="row-span" tunnel="yes"/> - <xsl:param name="typeOfAncestor" tunnel="yes"/> <xsl:param name="position" tunnel="yes"/> - <xsl:variable name="mandatory" select="enojs:is-required($source-context)" as="xs:boolean"/> - - <xsl:variable name="componentType-Input" select="'Input'"/> + <xsl:variable name="mandatory" select="enojs:is-required($source-context)" as="xs:boolean"/> <xsl:variable name="componentType-InputNumber" select="'InputNumber'"/> - - <xsl:variable name="typeResponse" select="enojs:get-type($source-context)"/> - <xsl:variable name="lengthResponse" select="enojs:get-length($source-context)"/> - <xsl:variable name="minimumResponse" select="enojs:get-minimum($source-context)"/> <xsl:variable name="maximumResponse" select="enojs:get-maximum($source-context)"/> <xsl:variable name="numberOfDecimals"> @@ -429,85 +421,58 @@ </xsl:choose> </xsl:variable> <xsl:variable name="unit" select="enojs:get-suffix($source-context,$languages[1])"/> - <xsl:variable name="responseName" select="enojs:get-business-name($source-context)"/> - <xsl:if test="$typeResponse!=''"> - - <xsl:choose> - <xsl:when test="$typeResponse='text' and $questionName!='' and $typeOfAncestor!='table'"> - <components xsi:type="{$componentType-Input}" componentType="{$componentType-Input}" id="{$idQuestion}" maxLength="{$lengthResponse}" mandatory="{$mandatory}"> - <label><xsl:value-of select="$labelQuestion"/></label> - <xsl:copy-of select="$declarations"/> - <xsl:call-template name="enojs:addResponseToComponents"> - <xsl:with-param name="responseName" select="$responseName"/> - </xsl:call-template> - <xsl:copy-of select="$filterCondition"/> - </components> - </xsl:when> - - <xsl:when test="$typeResponse='text' and $typeOfAncestor='table'"> - <cells componentType="{$componentType-Input}" id="{enojs:get-name($source-context)}" maxLength="{$lengthResponse}"> - <xsl:if test="$col-span>1"><xsl:attribute name="colspan" select="$col-span"/></xsl:if> - <xsl:if test="$row-span>1"><xsl:attribute name="rowspan" select="$row-span"/></xsl:if> - <xsl:call-template name="enojs:addResponseToComponents"> - <xsl:with-param name="responseName" select="$responseName"/> - </xsl:call-template> - </cells> - </xsl:when> - - <xsl:when test="$typeResponse='number' and $questionName!='' and $typeOfAncestor!='table'"> - <components xsi:type="{$componentType-InputNumber}" componentType="{$componentType-InputNumber}" id="{$idQuestion}" mandatory="{$mandatory}"> - <xsl:if test="$minimumResponse!=''"> - <xsl:attribute name="min"><xsl:value-of select="$minimumResponse"/></xsl:attribute> - </xsl:if> - <xsl:if test="$maximumResponse!=''"> - <xsl:attribute name="max"><xsl:value-of select="$maximumResponse"/></xsl:attribute> - </xsl:if> - <xsl:if test="$numberOfDecimals!=''"> - <xsl:attribute name="decimals"><xsl:value-of select="$numberOfDecimals"/></xsl:attribute> - </xsl:if> - <label><xsl:value-of select="$labelQuestion"/></label> - <xsl:if test="$unit!=''"> - <unit><xsl:value-of select="$unit"/></unit> - </xsl:if> - <xsl:copy-of select="$declarations"></xsl:copy-of> - <xsl:call-template name="enojs:addResponseToComponents"> - <xsl:with-param name="responseName" select="$responseName"/> - </xsl:call-template> - <xsl:copy-of select="$filterCondition"/> - </components> - </xsl:when> - - <xsl:when test="$typeResponse='number' and $typeOfAncestor='table'"> - <cells componentType="{$componentType-InputNumber}" id="{enojs:get-name($source-context)}"> - <xsl:if test="$col-span>1"><xsl:attribute name="colspan" select="$col-span"/></xsl:if> - <xsl:if test="$row-span>1"><xsl:attribute name="rowspan" select="$row-span"/></xsl:if> - <xsl:if test="$minimumResponse!=''"> - <xsl:attribute name="min"><xsl:value-of select="$minimumResponse"/></xsl:attribute> - </xsl:if> - <xsl:if test="$maximumResponse!=''"> - <xsl:attribute name="max"><xsl:value-of select="$maximumResponse"/></xsl:attribute> - </xsl:if> - <xsl:if test="$numberOfDecimals!=''"> - <xsl:attribute name="decimals"><xsl:value-of select="$numberOfDecimals"/></xsl:attribute> - </xsl:if> - <xsl:if test="$unit!=''"> - <unit><xsl:value-of select="$unit"/></unit> - </xsl:if> - <xsl:call-template name="enojs:addResponseToComponents"> - <xsl:with-param name="responseName" select="$responseName"/> - </xsl:call-template> - </cells> - </xsl:when> - - </xsl:choose> - - <xsl:call-template name="enojs:addVariableCollected"> - <xsl:with-param name="responseName" select="$responseName"/> - <xsl:with-param name="responseRef" select="$responseName"/> - </xsl:call-template> - </xsl:if> + <xsl:choose> + <xsl:when test="$questionName!='' and $typeOfAncestor!='table'"> + <components xsi:type="{$componentType-InputNumber}" componentType="{$componentType-InputNumber}" id="{$idQuestion}" mandatory="{$mandatory}"> + <xsl:if test="$minimumResponse!=''"> + <xsl:attribute name="min"><xsl:value-of select="$minimumResponse"/></xsl:attribute> + </xsl:if> + <xsl:if test="$maximumResponse!=''"> + <xsl:attribute name="max"><xsl:value-of select="$maximumResponse"/></xsl:attribute> + </xsl:if> + <xsl:if test="$numberOfDecimals!=''"> + <xsl:attribute name="decimals"><xsl:value-of select="$numberOfDecimals"/></xsl:attribute> + </xsl:if> + <label><xsl:value-of select="$labelQuestion"/></label> + <xsl:if test="$unit!=''"> + <unit><xsl:value-of select="$unit"/></unit> + </xsl:if> + <xsl:copy-of select="$declarations"></xsl:copy-of> + <xsl:call-template name="enojs:addResponseToComponents"> + <xsl:with-param name="responseName" select="$responseName"/> + </xsl:call-template> + <xsl:copy-of select="$filterCondition"/> + </components> + </xsl:when> + <xsl:when test="$typeOfAncestor='table'"> + <cells componentType="{$componentType-InputNumber}" id="{enojs:get-name($source-context)}"> + <xsl:if test="$col-span>1"><xsl:attribute name="colspan" select="$col-span"/></xsl:if> + <xsl:if test="$row-span>1"><xsl:attribute name="rowspan" select="$row-span"/></xsl:if> + <xsl:if test="$minimumResponse!=''"> + <xsl:attribute name="min"><xsl:value-of select="$minimumResponse"/></xsl:attribute> + </xsl:if> + <xsl:if test="$maximumResponse!=''"> + <xsl:attribute name="max"><xsl:value-of select="$maximumResponse"/></xsl:attribute> + </xsl:if> + <xsl:if test="$numberOfDecimals!=''"> + <xsl:attribute name="decimals"><xsl:value-of select="$numberOfDecimals"/></xsl:attribute> + </xsl:if> + <xsl:if test="$unit!=''"> + <unit><xsl:value-of select="$unit"/></unit> + </xsl:if> + <xsl:call-template name="enojs:addResponseToComponents"> + <xsl:with-param name="responseName" select="$responseName"/> + </xsl:call-template> + </cells> + </xsl:when> + </xsl:choose> + + <xsl:call-template name="enojs:addVariableCollected"> + <xsl:with-param name="responseName" select="$responseName"/> + <xsl:with-param name="responseRef" select="$responseName"/> + </xsl:call-template> <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> <xsl:with-param name="driver" select="." tunnel="yes"/> @@ -515,6 +480,68 @@ </xsl:template> + <xd:doc> + <xd:desc> + <xd:p>Match on TextDomain driver.</xd:p> + </xd:desc> + </xd:doc> + <xsl:template match="TextDomain" mode="model"> + <xsl:param name="source-context" as="item()" tunnel="yes"/> + <xsl:param name="idQuestion" tunnel="yes"/> + <xsl:param name="questionName" tunnel="yes"/> + <xsl:param name="labelQuestion" tunnel="yes"/> + <xsl:param name="languages" tunnel="yes"/> + <xsl:param name="declarations" as="node()*" tunnel="yes"/> + <xsl:param name="filterCondition" tunnel="yes"/> + <xsl:param name="col-span" tunnel="yes"/> + <xsl:param name="row-span" tunnel="yes"/> + <xsl:param name="typeOfAncestor" tunnel="yes"/> + <xsl:param name="position" tunnel="yes"/> + + <xsl:variable name="mandatory" select="enojs:is-required($source-context)" as="xs:boolean"/> + <xsl:variable name="componentType-Input" select="'Input'"/> + <xsl:variable name="lengthResponse" select="enojs:get-length($source-context)"/> + + <xsl:variable name="responseName" select="enojs:get-business-name($source-context)"/> + + <xsl:choose> + <xsl:when test="$questionName!='' and $typeOfAncestor!='table'"> + <components xsi:type="{$componentType-Input}" componentType="{$componentType-Input}" id="{$idQuestion}" maxLength="{$lengthResponse}" mandatory="{$mandatory}"> + <label><xsl:value-of select="$labelQuestion"/></label> + <xsl:copy-of select="$declarations"/> + <xsl:call-template name="enojs:addResponseToComponents"> + <xsl:with-param name="responseName" select="$responseName"/> + </xsl:call-template> + <xsl:copy-of select="$filterCondition"/> + </components> + </xsl:when> + <xsl:when test="$typeOfAncestor='table'"> + <cells componentType="{$componentType-Input}" id="{enojs:get-name($source-context)}" maxLength="{$lengthResponse}"> + <xsl:if test="$col-span>1"><xsl:attribute name="colspan" select="$col-span"/></xsl:if> + <xsl:if test="$row-span>1"><xsl:attribute name="rowspan" select="$row-span"/></xsl:if> + <xsl:call-template name="enojs:addResponseToComponents"> + <xsl:with-param name="responseName" select="$responseName"/> + </xsl:call-template> + </cells> + </xsl:when> + </xsl:choose> + + <xsl:call-template name="enojs:addVariableCollected"> + <xsl:with-param name="responseName" select="$responseName"/> + <xsl:with-param name="responseRef" select="$responseName"/> + </xsl:call-template> + + <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> + <xsl:with-param name="driver" select="." tunnel="yes"/> + </xsl:apply-templates> + + </xsl:template> + + <xd:doc> + <xd:desc> + <xd:p>Match on DateTimeDomain driver.</xd:p> + </xd:desc> + </xd:doc> <xsl:template match="DateTimeDomain" mode="model"> <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="idQuestion" tunnel="yes"/> @@ -854,10 +881,10 @@ <xd:doc> <xd:desc> - <xd:p>Match on xf-textarea driver.</xd:p> + <xd:p>Match on TextareaDomain driver.</xd:p> </xd:desc> </xd:doc> - <xsl:template match="xf-textarea" mode="model"> + <xsl:template match="TextareaDomain" mode="model"> <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="languages" tunnel="yes"/> <xsl:param name="idQuestion" tunnel="yes"/> diff --git a/src/main/resources/xslt/outputs/odt/models.xsl b/src/main/resources/xslt/outputs/odt/models.xsl index 166e0dcc8..6381f7f49 100644 --- a/src/main/resources/xslt/outputs/odt/models.xsl +++ b/src/main/resources/xslt/outputs/odt/models.xsl @@ -151,57 +151,65 @@ <xd:doc> <xd:desc> - <xd:p>Match on xf-input driver.</xd:p> + <xd:p>Match on NumericDomain driver.</xd:p> <xd:p>It writes the short name, the label and its response format of a question.</xd:p> </xd:desc> </xd:doc> - <xsl:template match="xf-input" mode="model"> + <xsl:template match="NumericDomain" mode="model"> <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="languages" tunnel="yes"/> - <xsl:variable name="typeResponse" select="enoodt:get-type($source-context)"/> - <xsl:variable name="lengthResponse" select="enoodt:get-length($source-context)"/> <xsl:variable name="numberOfDecimals" select="enoodt:get-number-of-decimals($source-context)"/> <xsl:variable name="minimumResponse" select="enoodt:get-minimum($source-context)"/> <xsl:variable name="maximumResponse" select="enoodt:get-maximum($source-context)"/> - <xsl:if test="$typeResponse!=''"> - <text:p text:style-name="Format"> - <xsl:choose> - <xsl:when test="$typeResponse='text'"> - <xsl:value-of select="concat('Car ',$lengthResponse)"/> - </xsl:when> - <xsl:when test="$typeResponse='number' and fn:string-length($numberOfDecimals)>0"> - <xsl:value-of select="concat('num ',fn:substring-before($minimumResponse,'.'),'..',fn:substring-before($maximumResponse,'.'),' - ',$numberOfDecimals,' chiffre(s) après la virgule')"/> - </xsl:when> - <xsl:when test="$typeResponse='number' and fn:string-length($numberOfDecimals)=0"> - <xsl:value-of select="concat('num ',$minimumResponse,'..',$maximumResponse)"/> - </xsl:when> - </xsl:choose> - </text:p> - - </xsl:if> - + <text:p text:style-name="Format"> + <xsl:choose> + <xsl:when test="fn:string-length($numberOfDecimals)>0"> + <xsl:value-of select="concat('num ',fn:substring-before($minimumResponse,'.'),'..',fn:substring-before($maximumResponse,'.'),' - ',$numberOfDecimals,' chiffre(s) après la virgule')"/> + </xsl:when> + <xsl:when test="fn:string-length($numberOfDecimals)=0"> + <xsl:value-of select="concat('num ',$minimumResponse,'..',$maximumResponse)"/> + </xsl:when> + </xsl:choose> + </text:p> <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> <xsl:with-param name="driver" select="." tunnel="yes"/> </xsl:apply-templates> + </xsl:template> + + <xd:doc> + <xd:desc> + <xd:p>Match on TextDomain driver.</xd:p> + <xd:p>It writes the short name, the label and its response format of a question.</xd:p> + </xd:desc> + </xd:doc> + <xsl:template match="TextDomain" mode="model"> + <xsl:param name="source-context" as="item()" tunnel="yes"/> + <xsl:param name="languages" tunnel="yes"/> + <xsl:variable name="lengthResponse" select="enoodt:get-length($source-context)"/> + + <text:p text:style-name="Format"> + <xsl:value-of select="concat('Car ',$lengthResponse)"/> + </text:p> + <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> + <xsl:with-param name="driver" select="." tunnel="yes"/> + </xsl:apply-templates> </xsl:template> + <xd:doc> <xd:desc> - <xd:p>Match on xf-input driver.</xd:p> + <xd:p>Match on DateTimeDomain driver.</xd:p> <xd:p>It writes the short name, the label and its response format of a question.</xd:p> </xd:desc> </xd:doc> <xsl:template match="DateTimeDomain" mode="model"> <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="languages" tunnel="yes"/> - <xsl:variable name="typeResponse" select="enoodt:get-type($source-context)"/> <xsl:variable name="dateFormat" select="enoodt:get-format($source-context)"/> - <xsl:if test="$typeResponse!=''"> - <text:p text:style-name="Format"> - <xsl:value-of select="concat('date ( ',$dateFormat,' )')"/> - </text:p> - </xsl:if> + <text:p text:style-name="Format"> + <xsl:value-of select="concat('date ( ',$dateFormat,' )')"/> + </text:p> <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> <xsl:with-param name="driver" select="." tunnel="yes"/> @@ -211,28 +219,16 @@ <xd:doc> <xd:desc> - <xd:p>Match on xf-textarea driver.</xd:p> + <xd:p>Match on TextareaDomain driver.</xd:p> <xd:p>It writes the short name, the label and its response format of a question.</xd:p> </xd:desc> </xd:doc> - <xsl:template match="xf-textarea" mode="model"> + <xsl:template match="TextareaDomain" mode="model"> <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="languages" tunnel="yes"/> - <xsl:variable name="typeResponse" select="enoodt:get-type($source-context)"/> - <xsl:variable name="format" select="enoodt:get-format($source-context)"/> <xsl:variable name="lengthResponse" select="enoodt:get-length($source-context)"/> - <xsl:variable name="numberOfDecimals" select="enoodt:get-number-of-decimals($source-context)"/> - <xsl:variable name="minimumResponse" select="enoodt:get-minimum($source-context)"/> - <xsl:variable name="maximumResponse" select="enoodt:get-maximum($source-context)"/> - - <xsl:if test="$typeResponse !=''"> - <text:p text:style-name="Format"> - <xsl:if test="$typeResponse='text'"> - <xsl:value-of select="concat('Car ',$lengthResponse)"/> - </xsl:if> - </text:p> - </xsl:if> + <xsl:value-of select="concat('Car ',$lengthResponse)"/> <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> <xsl:with-param name="driver" select="." tunnel="yes"/> </xsl:apply-templates> diff --git a/src/main/resources/xslt/transformations/ddi2js/drivers.fods b/src/main/resources/xslt/transformations/ddi2js/drivers.fods index 19c5f28ca..2e5fd1eae 100644 --- a/src/main/resources/xslt/transformations/ddi2js/drivers.fods +++ b/src/main/resources/xslt/transformations/ddi2js/drivers.fods @@ -1,20 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> <office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.spreadsheet"> - <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>P5DT2H3M</meta:editing-duration><meta:editing-cycles>228</meta:editing-cycles><meta:generator>LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab8</meta:generator><dc:date>2019-07-23T11:28:11.614000000</dc:date><dc:creator>François Bulot</dc:creator><meta:document-statistic meta:table-count="1" meta:cell-count="129" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> + <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>P5DT2H9M41S</meta:editing-duration><meta:editing-cycles>230</meta:editing-cycles><meta:generator>LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab8</meta:generator><dc:date>2019-08-30T14:49:26.985000000</dc:date><dc:creator>François Bulot</dc:creator><meta:document-statistic meta:table-count="1" meta:cell-count="129" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> <office:settings> <config:config-item-set config:name="ooo:view-settings"> <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item> <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item> <config:config-item config:name="VisibleAreaWidth" config:type="int">51722</config:config-item> - <config:config-item config:name="VisibleAreaHeight" config:type="int">30317</config:config-item> + <config:config-item config:name="VisibleAreaHeight" config:type="int">30769</config:config-item> <config:config-item-map-indexed config:name="Views"> <config:config-item-map-entry> <config:config-item config:name="ViewId" config:type="string">view1</config:config-item> <config:config-item-map-named config:name="Tables"> <config:config-item-map-entry config:name="Sheet1"> <config:config-item config:name="CursorPositionX" config:type="int">0</config:config-item> - <config:config-item config:name="CursorPositionY" config:type="int">48</config:config-item> + <config:config-item config:name="CursorPositionY" config:type="int">34</config:config-item> <config:config-item config:name="HorizontalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="VerticalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="HorizontalSplitPosition" config:type="int">0</config:config-item> @@ -23,7 +23,7 @@ <config:config-item config:name="PositionLeft" config:type="int">0</config:config-item> <config:config-item config:name="PositionRight" config:type="int">0</config:config-item> <config:config-item config:name="PositionTop" config:type="int">0</config:config-item> - <config:config-item config:name="PositionBottom" config:type="int">27</config:config-item> + <config:config-item config:name="PositionBottom" config:type="int">9</config:config-item> <config:config-item config:name="ZoomType" config:type="short">0</config:config-item> <config:config-item config:name="ZoomValue" config:type="int">100</config:config-item> <config:config-item config:name="PageViewZoomValue" config:type="int">60</config:config-item> @@ -77,8 +77,8 @@ <config:config-item config:name="IsRasterAxisSynchronized" config:type="boolean">true</config:config-item> <config:config-item config:name="AutoCalculate" config:type="boolean">true</config:config-item> <config:config-item config:name="ApplyUserData" config:type="boolean">true</config:config-item> - <config:config-item config:name="PrinterName" config:type="string">Envoyer à OneNote 16</config:config-item> - <config:config-item config:name="PrinterSetup" config:type="base64Binary">xQT+/0Vudm95ZXIgw6AgT25lTm90ZcKgMTYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAU2VuZCB0byBNaWNyb3NvZnQgT25lTm90ZSAxNiBEcgAWAAEA4gMAAAAAAAAEAAhSAAAEdAAAM1ROVwAAAAAKAEUAbgB2AG8AeQBlAHIAIADgACAATwBuAGUATgBvAHQAZQCgADEANgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBAAG3AD8AgMvAAABAAkAmgs0CGQAAQAPAFgCAgABAFgCAwABAEEANAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAQAAAAIAAAABAAAA/////wAAAAAAAAAAAAAAAAAAAABESU5VIgDAAPwCAACsE9jAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAMAAAABTTVRKAAAAABAAsABTAGUAbgBkACAAdABvACAATQBpAGMAcgBvAHMAbwBmAHQAIABPAG4AZQBOAG8AdABlACAAMQA2ACAARAByAGkAdgBlAHIAAABSRVNETEwAVW5pcmVzRExMAFBhcGVyU2l6ZQBMRVRURVIAT3JpZW50YXRpb24AUE9SVFJBSVQAUmVzb2x1dGlvbgBEUEk2MDAAQ29sb3JNb2RlADI0YnBwAAAAAAAAAAAAAAAAAAAAABIAQ09NUEFUX0RVUExFWF9NT0RFEwBEdXBsZXhNb2RlOjpVbmtub3du</config:config-item> + <config:config-item config:name="PrinterName" config:type="string">\\S20SLINNG\LP0000554-CLR-DR59-SNDI-Secretariat</config:config-item> + <config:config-item config:name="PrinterSetup" config:type="base64Binary">nin+/1xcUzIwU0xJTk5HXExQMDAwMDU1NC1DTFItRFI1OS1TTkRJLVNlY3JldGFyaWF0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAS09OSUNBIE1JTk9MVEEgVW5pdmVyc2FsIFBDTAAAAAAWAAEAuigAAAAAAAAEAAhSAAAEdAAAM1ROVwAAAAAKAFwAXABTADIAMABTAEwASQBOAE4ARwBcAEwAUAAwADAAMAAwADUANQA0AC0AQwBMAFIALQBEAFIANQA5AAAAAAABBAAB3ADUJw+/AAIBAAkAmgs0CGQAAQAHAFgCAgACAFgCAwAAAEEANAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAyCcAAFNQTFgBAAAAAAAAAPwL192wJwAAyCcAAFVQRF9PV04AAAAAAAAAAABQQ0xYTAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAkANAiaCysAKwArACsAADQImgsAAABMIAAArS0AAGUBNAiaCwA0CJoLAEwgAACtLQAAAQBkAAcAAQEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQEBAAABAQBJblRyYXkxAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEBAAABAQEBAAABAQBJblRyYXkyAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIBAAABAQEBAAABAQBJblRyYXkzAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMBAAABAQEBAAABAQBJblRyYXk0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQBAAABAQEBAAABAQBJblRyYXlMQ1QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOgDAAABAQEBAAABAQBJblRyYXlNYW51YWwAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAABAQEBAAABAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAAABAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAAABAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAAABAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAEAAQEBAAEAAQAAAAEAAA4BAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAwAEAAEBAAAAAAQAAAAAAAEAAQAAAAAAAAEBAAAAZAB9AAAEAQEABAEBAAEBAQAB/38AAOkDAQAA6QMBAAABAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEASAD/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAQABAAAAAAABAAAAAQAAAAEAAAABAAEAAQABAQAAAQAAAAEAAQABAQADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAQEAAAAAAQABAAAAAAEAAAEAAQAAAAAAAQAAAAABAAEAAQABAQAAAQAAAAEAAAABAAAAAAEBAAEAAQABAQAAAQAAAAAAAQABBQAAAAAAAAABAAAAAAAAAAEAAQAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQQByAGkAYQBsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAAAgAAAQEAZAABAQBkAAEAAP//AAABAAEAAAAAAAAAAQABAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQAAAAAAAAAAAAAAAAAAAAABAgBYAlgCUAMYAAEEAAAAAAAAAQAAAQAAAAEAAAABAQAAAAABAAABAQABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQABAAEAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEAAABfAgABQXJpYWwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABDb3VyaWVyIE5ldwAAAAAAAAAAAAAAAAAAAAAAAAAAAFRpbWVzIE5ldyBSb21hbgAAAAAAAAAAAAAAAAAAAAAAU3ltYm9sAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABXaW5nZGluZ3MAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQsXFBoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQXJpYWwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABDb3VyaWVyAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFRpbWVzIE5ldyBSb21hbgAAAAAAAAAAAAAAAAAAAAAAU3ltYm9sAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABXaW5nZGluZ3MAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAADpAQAAIwQAAGkFAAB2AgAAqgMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAQAAAAEBAEsBAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANAiaCwCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABzAG8AZgBmAGkAYwBlAC4AYgBpAG4AAAAAAAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAYAAAABAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEACQA0CJoLTCAAAK0tAAD//wAA//8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZAAAAAQAAAAAAAAAAAAAAAAAAAAZYREoAAAAABIAQ09NUEFUX0RVUExFWF9NT0RFFABEdXBsZXhNb2RlOjpMb25nRWRnZQ==</config:config-item> <config:config-item-map-indexed config:name="ForbiddenCharacters"> <config:config-item-map-entry> <config:config-item config:name="Language" config:type="string">zxx</config:config-item> @@ -588,7 +588,7 @@ <text:p><text:sheet-name>???</text:sheet-name><text:s/>(<text:title>???</text:title>)</text:p> </style:region-left> <style:region-right> - <text:p><text:date style:data-style-name="N2" text:date-value="2019-07-23">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="11:27:51.544000000">00:00:00</text:time></text:p> + <text:p><text:date style:data-style-name="N2" text:date-value="2019-08-30">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="14:42:44.453000000">00:00:00</text:time></text:p> </style:region-right> </style:header> <style:header-left style:display="false"/> @@ -830,10 +830,10 @@ <text:p>d:NumericDomain</text:p> </table:table-cell> <table:table-cell table:style-name="ce2" office:value-type="string" calcext:value-type="string"> - <text:p>xf-input</text:p> + <text:p>NumericDomain</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>The NumericDomain element activates the xf-input driver.</text:p> + <text:p>The NumericDomain element activates the NumericDomain driver.</text:p> </table:table-cell> </table:table-row> <table:table-row table:style-name="ro1"> @@ -841,21 +841,25 @@ <text:p>d:NumericDomainReference</text:p> </table:table-cell> <table:table-cell table:style-name="ce2" office:value-type="string" calcext:value-type="string"> - <text:p>xf-input</text:p> + <text:p>NumericDomain</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>The NumericDomainReference element activates the xf-input driver.</text:p> + <text:p>The NumericDomainReference element activates the NumericDomain driver.</text:p> </table:table-cell> </table:table-row> + <table:table-row table:style-name="ro1"> + <table:table-cell table:style-name="ce2" table:number-columns-repeated="2"/> + <table:table-cell/> + </table:table-row> <table:table-row table:style-name="ro1"> <table:table-cell table:style-name="ce2" office:value-type="string" calcext:value-type="string"> <text:p>d:TextDomain[not(@maxLength) or number(@maxLength)<250]</text:p> </table:table-cell> <table:table-cell table:style-name="ce2" office:value-type="string" calcext:value-type="string"> - <text:p>xf-input</text:p> + <text:p>TextDomain</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>Those TextDomain (250 chars max excluded) activate the xf-input driver.</text:p> + <text:p>Those TextDomain (250 chars max excluded) activate the TextDomain driver.</text:p> </table:table-cell> </table:table-row> <table:table-row table:style-name="ro1"> @@ -867,10 +871,10 @@ <text:p>d:TextDomain[@maxLength and not(number(@maxLength)<250)]</text:p> </table:table-cell> <table:table-cell table:style-name="ce2" office:value-type="string" calcext:value-type="string"> - <text:p>xf-textarea</text:p> + <text:p>TextareaDomain</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>Those TextDomain elements (250 chars min) activate the xf-textarea driver.</text:p> + <text:p>Those TextDomain elements (250 chars min) activate the TextareaDomain driver.</text:p> </table:table-cell> </table:table-row> <table:table-row table:style-name="ro1"> diff --git a/src/main/resources/xslt/transformations/ddi2odt/drivers.fods b/src/main/resources/xslt/transformations/ddi2odt/drivers.fods index 2a527759e..53c4038e7 100644 --- a/src/main/resources/xslt/transformations/ddi2odt/drivers.fods +++ b/src/main/resources/xslt/transformations/ddi2odt/drivers.fods @@ -1,29 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> <office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.spreadsheet"> - <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>P3DT6H26M10S</meta:editing-duration><meta:editing-cycles>221</meta:editing-cycles><meta:generator>LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab8</meta:generator><dc:date>2019-07-23T11:28:37.720000000</dc:date><dc:creator>François Bulot</dc:creator><meta:document-statistic meta:table-count="1" meta:cell-count="129" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> + <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>P3DT6H34M29S</meta:editing-duration><meta:editing-cycles>222</meta:editing-cycles><meta:generator>LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab8</meta:generator><dc:date>2019-08-30T14:51:11.343000000</dc:date><dc:creator>François Bulot</dc:creator><meta:document-statistic meta:table-count="1" meta:cell-count="129" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> <office:settings> <config:config-item-set config:name="ooo:view-settings"> <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item> <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item> <config:config-item config:name="VisibleAreaWidth" config:type="int">60138</config:config-item> - <config:config-item config:name="VisibleAreaHeight" config:type="int">30317</config:config-item> + <config:config-item config:name="VisibleAreaHeight" config:type="int">30769</config:config-item> <config:config-item-map-indexed config:name="Views"> <config:config-item-map-entry> <config:config-item config:name="ViewId" config:type="string">view1</config:config-item> <config:config-item-map-named config:name="Tables"> <config:config-item-map-entry config:name="Sheet1"> - <config:config-item config:name="CursorPositionX" config:type="int">0</config:config-item> - <config:config-item config:name="CursorPositionY" config:type="int">48</config:config-item> + <config:config-item config:name="CursorPositionX" config:type="int">2</config:config-item> + <config:config-item config:name="CursorPositionY" config:type="int">32</config:config-item> <config:config-item config:name="HorizontalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="VerticalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="HorizontalSplitPosition" config:type="int">0</config:config-item> <config:config-item config:name="VerticalSplitPosition" config:type="int">0</config:config-item> <config:config-item config:name="ActiveSplitRange" config:type="short">2</config:config-item> - <config:config-item config:name="PositionLeft" config:type="int">0</config:config-item> + <config:config-item config:name="PositionLeft" config:type="int">1</config:config-item> <config:config-item config:name="PositionRight" config:type="int">0</config:config-item> <config:config-item config:name="PositionTop" config:type="int">0</config:config-item> - <config:config-item config:name="PositionBottom" config:type="int">23</config:config-item> + <config:config-item config:name="PositionBottom" config:type="int">5</config:config-item> <config:config-item config:name="ZoomType" config:type="short">0</config:config-item> <config:config-item config:name="ZoomValue" config:type="int">100</config:config-item> <config:config-item config:name="PageViewZoomValue" config:type="int">60</config:config-item> @@ -77,8 +77,8 @@ <config:config-item config:name="IsRasterAxisSynchronized" config:type="boolean">true</config:config-item> <config:config-item config:name="AutoCalculate" config:type="boolean">true</config:config-item> <config:config-item config:name="ApplyUserData" config:type="boolean">true</config:config-item> - <config:config-item config:name="PrinterName" config:type="string">Envoyer à OneNote 16</config:config-item> - <config:config-item config:name="PrinterSetup" config:type="base64Binary">xQT+/0Vudm95ZXIgw6AgT25lTm90ZcKgMTYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAU2VuZCB0byBNaWNyb3NvZnQgT25lTm90ZSAxNiBEcgAWAAEA4gMAAAAAAAAEAAhSAAAEdAAAM1ROVwAAAAAKAEUAbgB2AG8AeQBlAHIAIADgACAATwBuAGUATgBvAHQAZQCgADEANgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBAAG3AD8AgMvAAABAAkAmgs0CGQAAQAPAFgCAgABAFgCAwABAEEANAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAQAAAAIAAAABAAAA/////wAAAAAAAAAAAAAAAAAAAABESU5VIgDAAPwCAACsE9jAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAMAAAABTTVRKAAAAABAAsABTAGUAbgBkACAAdABvACAATQBpAGMAcgBvAHMAbwBmAHQAIABPAG4AZQBOAG8AdABlACAAMQA2ACAARAByAGkAdgBlAHIAAABSRVNETEwAVW5pcmVzRExMAFBhcGVyU2l6ZQBMRVRURVIAT3JpZW50YXRpb24AUE9SVFJBSVQAUmVzb2x1dGlvbgBEUEk2MDAAQ29sb3JNb2RlADI0YnBwAAAAAAAAAAAAAAAAAAAAABIAQ09NUEFUX0RVUExFWF9NT0RFEwBEdXBsZXhNb2RlOjpVbmtub3du</config:config-item> + <config:config-item config:name="PrinterName" config:type="string">\\S20SLINNG\LP0000554-CLR-DR59-SNDI-Secretariat</config:config-item> + <config:config-item config:name="PrinterSetup" config:type="base64Binary">nin+/1xcUzIwU0xJTk5HXExQMDAwMDU1NC1DTFItRFI1OS1TTkRJLVNlY3JldGFyaWF0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAS09OSUNBIE1JTk9MVEEgVW5pdmVyc2FsIFBDTAAAAAAWAAEAuigAAAAAAAAEAAhSAAAEdAAAM1ROVwAAAAAKAFwAXABTADIAMABTAEwASQBOAE4ARwBcAEwAUAAwADAAMAAwADUANQA0AC0AQwBMAFIALQBEAFIANQA5AAAAAAABBAAB3ADUJw+/AAIBAAkAmgs0CGQAAQAHAFgCAgACAFgCAwAAAEEANAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAyCcAAFNQTFgBAAAAAAAAAPwL192wJwAAyCcAAFVQRF9PV04AAAAAAAAAAABQQ0xYTAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAkANAiaCysAKwArACsAADQImgsAAABMIAAArS0AAGUBNAiaCwA0CJoLAEwgAACtLQAAAQBkAAcAAQEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQEBAAABAQBJblRyYXkxAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEBAAABAQEBAAABAQBJblRyYXkyAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIBAAABAQEBAAABAQBJblRyYXkzAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMBAAABAQEBAAABAQBJblRyYXk0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQBAAABAQEBAAABAQBJblRyYXlMQ1QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOgDAAABAQEBAAABAQBJblRyYXlNYW51YWwAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAABAQEBAAABAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAAABAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAAABAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAAABAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAEAAQEBAAEAAQAAAAEAAA4BAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAwAEAAEBAAAAAAQAAAAAAAEAAQAAAAAAAAEBAAAAZAB9AAAEAQEABAEBAAEBAQAB/38AAOkDAQAA6QMBAAABAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEASAD/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAQABAAAAAAABAAAAAQAAAAEAAAABAAEAAQABAQAAAQAAAAEAAQABAQADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAQEAAAAAAQABAAAAAAEAAAEAAQAAAAAAAQAAAAABAAEAAQABAQAAAQAAAAEAAAABAAAAAAEBAAEAAQABAQAAAQAAAAAAAQABBQAAAAAAAAABAAAAAAAAAAEAAQAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQQByAGkAYQBsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAAAgAAAQEAZAABAQBkAAEAAP//AAABAAEAAAAAAAAAAQABAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQAAAAAAAAAAAAAAAAAAAAABAgBYAlgCUAMYAAEEAAAAAAAAAQAAAQAAAAEAAAABAQAAAAABAAABAQABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQABAAEAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEAAABfAgABQXJpYWwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABDb3VyaWVyIE5ldwAAAAAAAAAAAAAAAAAAAAAAAAAAAFRpbWVzIE5ldyBSb21hbgAAAAAAAAAAAAAAAAAAAAAAU3ltYm9sAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABXaW5nZGluZ3MAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQsXFBoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQXJpYWwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABDb3VyaWVyAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFRpbWVzIE5ldyBSb21hbgAAAAAAAAAAAAAAAAAAAAAAU3ltYm9sAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABXaW5nZGluZ3MAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAADpAQAAIwQAAGkFAAB2AgAAqgMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAQAAAAEBAEsBAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANAiaCwCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABzAG8AZgBmAGkAYwBlAC4AYgBpAG4AAAAAAAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAYAAAABAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEACQA0CJoLTCAAAK0tAAD//wAA//8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZAAAAAQAAAAAAAAAAAAAAAAAAAAZYREoAAAAABIAQ09NUEFUX0RVUExFWF9NT0RFFABEdXBsZXhNb2RlOjpMb25nRWRnZQ==</config:config-item> <config:config-item-map-indexed config:name="ForbiddenCharacters"> <config:config-item-map-entry> <config:config-item config:name="Language" config:type="string">zxx</config:config-item> @@ -588,7 +588,7 @@ <text:p><text:sheet-name>???</text:sheet-name><text:s/>(<text:title>???</text:title>)</text:p> </style:region-left> <style:region-right> - <text:p><text:date style:data-style-name="N2" text:date-value="2019-07-23">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="11:28:32.630000000">00:00:00</text:time></text:p> + <text:p><text:date style:data-style-name="N2" text:date-value="2019-08-30">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="14:42:52.305000000">00:00:00</text:time></text:p> </style:region-right> </style:header> <style:header-left style:display="false"/> @@ -830,10 +830,10 @@ <text:p>d:NumericDomain</text:p> </table:table-cell> <table:table-cell table:style-name="ce2" office:value-type="string" calcext:value-type="string"> - <text:p>xf-input</text:p> + <text:p>NumericDomain</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>The NumericDomain element activates the xf-input driver.</text:p> + <text:p>The NumericDomain element activates the NumericDomain driver.</text:p> </table:table-cell> </table:table-row> <table:table-row table:style-name="ro1"> @@ -841,21 +841,25 @@ <text:p>d:NumericDomainReference</text:p> </table:table-cell> <table:table-cell table:style-name="ce2" office:value-type="string" calcext:value-type="string"> - <text:p>xf-input</text:p> + <text:p>NumericDomain</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>The NumericDomainReference element activates the xf-input driver.</text:p> + <text:p>The NumericDomainReference element activates the NumericDomain driver.</text:p> </table:table-cell> </table:table-row> + <table:table-row table:style-name="ro1"> + <table:table-cell table:style-name="ce2" table:number-columns-repeated="2"/> + <table:table-cell/> + </table:table-row> <table:table-row table:style-name="ro1"> <table:table-cell table:style-name="ce2" office:value-type="string" calcext:value-type="string"> <text:p>d:TextDomain[not(@maxLength) or number(@maxLength)<250]</text:p> </table:table-cell> <table:table-cell table:style-name="ce2" office:value-type="string" calcext:value-type="string"> - <text:p>xf-input</text:p> + <text:p>TextDomain</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>Those TextDomain (250 chars max excluded) activate the xf-input driver.</text:p> + <text:p>Those TextDomain (250 chars max excluded) activate the TextDomain driver.</text:p> </table:table-cell> </table:table-row> <table:table-row table:style-name="ro1"> @@ -867,10 +871,10 @@ <text:p>d:TextDomain[@maxLength and not(number(@maxLength)<250)]</text:p> </table:table-cell> <table:table-cell table:style-name="ce2" office:value-type="string" calcext:value-type="string"> - <text:p>xf-textarea</text:p> + <text:p>TextareaDomain</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>Those TextDomain elements (250 chars min) activate the xf-textarea driver.</text:p> + <text:p>Those TextDomain elements (250 chars min) activate the TextareaDomain driver.</text:p> </table:table-cell> </table:table-row> <table:table-row table:style-name="ro1"> From 861acd7f8774b37a1c36a4961da30be79fa361ef Mon Sep 17 00:00:00 2001 From: BulotF <francois.bulot@insee.fr> Date: Fri, 30 Aug 2019 15:38:29 +0200 Subject: [PATCH 084/439] Update models.xsl --- src/main/resources/xslt/outputs/odt/models.xsl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/resources/xslt/outputs/odt/models.xsl b/src/main/resources/xslt/outputs/odt/models.xsl index 6381f7f49..10921f43d 100644 --- a/src/main/resources/xslt/outputs/odt/models.xsl +++ b/src/main/resources/xslt/outputs/odt/models.xsl @@ -228,7 +228,9 @@ <xsl:param name="languages" tunnel="yes"/> <xsl:variable name="lengthResponse" select="enoodt:get-length($source-context)"/> - <xsl:value-of select="concat('Car ',$lengthResponse)"/> + <text:p text:style-name="Format"> + <xsl:value-of select="concat('Car ',$lengthResponse)"/> + </text:p> <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> <xsl:with-param name="driver" select="." tunnel="yes"/> </xsl:apply-templates> From 873239beb02a6a05470c7380e1b00f269795c2d4 Mon Sep 17 00:00:00 2001 From: BulotF <francois.bulot@insee.fr> Date: Fri, 30 Aug 2019 17:27:32 +0200 Subject: [PATCH 085/439] updates drivers xf-select / xf-select1 into BooleanDomain / CodeDomain --- .../resources/xslt/inputs/ddi/templates.fods | 56 +---- src/main/resources/xslt/outputs/fr/models.xsl | 26 +- src/main/resources/xslt/outputs/js/models.xsl | 224 +++++------------- .../resources/xslt/outputs/odt/models.xsl | 37 +-- .../resources/xslt/outputs/pdf/models.xsl | 5 +- .../xslt/transformations/ddi2fr/drivers.fods | 49 +--- .../xslt/transformations/ddi2js/drivers.fods | 45 +--- .../xslt/transformations/ddi2odt/drivers.fods | 47 +--- .../xslt/transformations/ddi2pdf/drivers.fods | 47 +--- src/test/resources/ddi-to-xform/out.xhtml | 145 ------------ 10 files changed, 145 insertions(+), 536 deletions(-) diff --git a/src/main/resources/xslt/inputs/ddi/templates.fods b/src/main/resources/xslt/inputs/ddi/templates.fods index a51a379a3..ac644f6e9 100644 --- a/src/main/resources/xslt/inputs/ddi/templates.fods +++ b/src/main/resources/xslt/inputs/ddi/templates.fods @@ -1,20 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> <office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.spreadsheet"> - <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>P3DT8H44M3S</meta:editing-duration><meta:editing-cycles>402</meta:editing-cycles><meta:generator>LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab8</meta:generator><dc:date>2019-08-19T15:46:53.602000000</dc:date><dc:creator>François Bulot</dc:creator><meta:document-statistic meta:table-count="1" meta:cell-count="475" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> + <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>P3DT8H47M47S</meta:editing-duration><meta:editing-cycles>404</meta:editing-cycles><meta:generator>LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab8</meta:generator><dc:date>2019-08-30T15:58:20.281000000</dc:date><dc:creator>François Bulot</dc:creator><meta:document-statistic meta:table-count="1" meta:cell-count="467" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> <office:settings> <config:config-item-set config:name="ooo:view-settings"> <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item> <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item> <config:config-item config:name="VisibleAreaWidth" config:type="int">63256</config:config-item> - <config:config-item config:name="VisibleAreaHeight" config:type="int">83650</config:config-item> + <config:config-item config:name="VisibleAreaHeight" config:type="int">82493</config:config-item> <config:config-item-map-indexed config:name="Views"> <config:config-item-map-entry> <config:config-item config:name="ViewId" config:type="string">view1</config:config-item> <config:config-item-map-named config:name="Tables"> <config:config-item-map-entry config:name="Sheet1"> <config:config-item config:name="CursorPositionX" config:type="int">0</config:config-item> - <config:config-item config:name="CursorPositionY" config:type="int">24</config:config-item> + <config:config-item config:name="CursorPositionY" config:type="int">47</config:config-item> <config:config-item config:name="HorizontalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="VerticalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="HorizontalSplitPosition" config:type="int">0</config:config-item> @@ -23,7 +23,7 @@ <config:config-item config:name="PositionLeft" config:type="int">0</config:config-item> <config:config-item config:name="PositionRight" config:type="int">0</config:config-item> <config:config-item config:name="PositionTop" config:type="int">0</config:config-item> - <config:config-item config:name="PositionBottom" config:type="int">7</config:config-item> + <config:config-item config:name="PositionBottom" config:type="int">30</config:config-item> <config:config-item config:name="ZoomType" config:type="short">0</config:config-item> <config:config-item config:name="ZoomValue" config:type="int">100</config:config-item> <config:config-item config:name="PageViewZoomValue" config:type="int">60</config:config-item> @@ -575,10 +575,6 @@ <style:style style:name="ce8" style:family="table-cell" style:parent-style-name="Default"> <style:text-properties style:use-window-font-color="true" style:font-name="Arial" fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/> </style:style> - <style:style style:name="ce9" style:family="table-cell" style:parent-style-name="Default"> - <style:table-cell-properties fo:background-color="transparent"/> - <style:text-properties style:use-window-font-color="true" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:font-name="Arial" fo:font-size="10pt" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="normal" style:text-underline-mode="continuous" style:text-overline-mode="continuous" style:text-line-through-mode="continuous" style:font-name-asian="Tahoma" style:font-size-asian="10pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-name-complex="Tahoma" style:font-size-complex="10pt" style:font-style-complex="normal" style:font-weight-complex="normal" style:text-emphasize="none" style:font-relief="none" style:text-overline-style="none" style:text-overline-color="font-color"/> - </style:style> <style:style style:name="ce10" style:family="table-cell" style:parent-style-name="Default"> <style:text-properties style:font-name="Arial" fo:font-size="10pt" fo:language="en" fo:country="US" style:font-name-asian="Segoe UI" style:font-size-asian="10pt" style:language-asian="en" style:country-asian="US" style:font-size-complex="10pt" style:language-complex="en" style:country-complex="US"/> </style:style> @@ -638,7 +634,7 @@ <text:p><text:sheet-name>???</text:sheet-name><text:s/>(<text:title>???</text:title>)</text:p> </style:region-left> <style:region-right> - <text:p><text:date style:data-style-name="N2" text:date-value="2019-08-19">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="15:45:48.171000000">00:00:00</text:time></text:p> + <text:p><text:date style:data-style-name="N2" text:date-value="2019-08-30">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="15:57:20.688000000">00:00:00</text:time></text:p> </style:region-right> </style:header> <style:header-left style:display="false"/> @@ -1543,62 +1539,32 @@ </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell table:style-name="ce7" office:value-type="string" calcext:value-type="string"> - <text:p>d:CodeDomain[not(ancestor::d:GridDimension) and r:GenericOutputFormat/text()='radio-button']</text:p> + <text:p>d:CodeDomain[not(ancestor::d:GridDimension)]</text:p> </table:table-cell> <table:table-cell table:style-name="ce7" office:value-type="string" calcext:value-type="string"> <text:p>enoddi:get-output-format</text:p> </table:table-cell> <table:table-cell table:style-name="ce7" office:value-type="string" calcext:value-type="string"> - <text:p>'full'</text:p> + <text:p>r:GenericOutputFormat</text:p> </table:table-cell> <table:table-cell table:style-name="ce8"/> <table:table-cell table:style-name="ce8" office:value-type="string" calcext:value-type="string"> - <text:p>Getting the output format for radio in d:CodeDomain item.</text:p> + <text:p>Getting the output format for d:CodeDomain item.</text:p> </table:table-cell> </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell table:style-name="ce7" office:value-type="string" calcext:value-type="string"> - <text:p>d:CodeDomain[not(ancestor::d:GridDimension) and r:GenericOutputFormat/text()='drop-down-list']</text:p> - </table:table-cell> - <table:table-cell table:style-name="ce7" office:value-type="string" calcext:value-type="string"> - <text:p>enoddi:get-output-format</text:p> - </table:table-cell> - <table:table-cell table:style-name="ce7" office:value-type="string" calcext:value-type="string"> - <text:p>'minimal'</text:p> - </table:table-cell> - <table:table-cell table:style-name="ce8"/> - <table:table-cell table:style-name="ce8" office:value-type="string" calcext:value-type="string"> - <text:p>Getting the output format for dropdown in d:CodeDomain item.</text:p> - </table:table-cell> - </table:table-row> - <table:table-row table:style-name="ro2"> - <table:table-cell table:style-name="ce7" office:value-type="string" calcext:value-type="string"> - <text:p>d:CodeDomain[not(ancestor::d:GridDimension) and r:GenericOutputFormat/text()='checkbox']</text:p> - </table:table-cell> - <table:table-cell table:style-name="ce7" office:value-type="string" calcext:value-type="string"> - <text:p>enoddi:get-output-format</text:p> - </table:table-cell> - <table:table-cell table:style-name="ce7" office:value-type="string" calcext:value-type="string"> - <text:p>'full'</text:p> - </table:table-cell> - <table:table-cell table:style-name="ce8"/> - <table:table-cell table:style-name="ce8" office:value-type="string" calcext:value-type="string"> - <text:p>Getting the output format for checkbox in d:CodeDomain item.</text:p> - </table:table-cell> - </table:table-row> - <table:table-row table:style-name="ro2"> - <table:table-cell table:style-name="ce9" office:value-type="string" calcext:value-type="string"> <text:p>d:NominalDomain</text:p> </table:table-cell> <table:table-cell table:style-name="ce7" office:value-type="string" calcext:value-type="string"> <text:p>enoddi:get-output-format</text:p> </table:table-cell> - <table:table-cell table:style-name="ce9" office:value-type="string" calcext:value-type="string"> - <text:p>'full'</text:p> + <table:table-cell table:style-name="ce7" office:value-type="string" calcext:value-type="string"> + <text:p>'checkbox'</text:p> </table:table-cell> <table:table-cell table:style-name="ce8"/> <table:table-cell table:style-name="ce8" office:value-type="string" calcext:value-type="string"> - <text:p>Getting the output format for d:NominalDomain.</text:p> + <text:p>Getting the output format for d:NominalDomain item.</text:p> </table:table-cell> </table:table-row> <table:table-row table:style-name="ro2"> diff --git a/src/main/resources/xslt/outputs/fr/models.xsl b/src/main/resources/xslt/outputs/fr/models.xsl index 2fdb44b5b..3769cec9a 100644 --- a/src/main/resources/xslt/outputs/fr/models.xsl +++ b/src/main/resources/xslt/outputs/fr/models.xsl @@ -1353,7 +1353,7 @@ <xsl:value-of select="eno:serialize($alert)"/> </alert> </xsl:if> - <xsl:if test="self::xf-select1 or self::xf-select"> + <xsl:if test="self::CodeDomain or self::BooleanDomain"> <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> <xsl:with-param name="driver" select="eno:append-empty-element('ResourceItem', .)" tunnel="yes"/> </xsl:apply-templates> @@ -1774,10 +1774,13 @@ <xsl:when test="self::xf-output"> <xsl:value-of select="'xf:output'"/> </xsl:when> - <xsl:when test="self::xf-select"> + <xsl:when test="self::BooleanDomain"> <xsl:value-of select="'xf:select'"/> </xsl:when> - <xsl:when test="self::xf-select1"> + <xsl:when test="self::CodeDomain and $appearance='checkbox'"> + <xsl:value-of select="'xf:select'"/> + </xsl:when> + <xsl:when test="self::CodeDomain"> <xsl:value-of select="'xf:select1'"/> </xsl:when> </xsl:choose> @@ -1788,7 +1791,14 @@ <xsl:attribute name="name" select="$name"/> <xsl:attribute name="bind" select="concat($name, '-bind')"/> <xsl:if test="$appearance != ''"> - <xsl:attribute name="appearance" select="$appearance"/> + <xsl:choose> + <xsl:when test="$appearance = 'drop-down-list'"> + <xsl:attribute name="appearance" select="'minimal'"/> + </xsl:when> + <xsl:otherwise> + <xsl:attribute name="appearance" select="'full'"/> + </xsl:otherwise> + </xsl:choose> </xsl:if> <xsl:if test="$css-class != '' or $question-label!=''"> <xsl:choose> @@ -1856,8 +1866,8 @@ </xsl:if> </xf:alert> </xsl:if> - <xsl:if test="self::xf-select1 or self::xf-select"> - <xsl:if test="$appearance = 'minimal'"> + <xsl:if test="self::CodeDomain or self::BooleanDomain"> + <xsl:if test="$appearance = 'drop-down-list'"> <xf:item> <xf:label/> <xf:value/> @@ -1883,7 +1893,7 @@ <!-- In this select case, if there is still something after a space in the current value, that means that 2 boxes are checked. We replace the value with what was after the space and that corresponds to the value of the last checked box. This unchecks the first box that was checked --> - <xsl:if test="self::xf-select"> + <xsl:if test="self::CodeDomain and $appearance = 'checkbox'"> <xf:action ev:event="xforms-value-changed" if="substring-after({$instance-ancestor-label}{$name},' ') ne ''"> <!-- if the collected variable is in a loop, instance-ancestor helps choosing the good collected variable --> <xf:setvalue ref="{$instance-ancestor-label}{$name}" value="substring-after({$instance-ancestor-label}{$name},' ')"/> @@ -1923,7 +1933,7 @@ <xsl:copy-of select="$suffix" copy-namespaces="no"/> </xsl:element> </xsl:if> - <xsl:if test="self::xf-select1 or self::xf-select"> + <xsl:if test="self::CodeDomain or self::BooleanDomain"> <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> <xsl:with-param name="driver" select="." tunnel="yes"/> </xsl:apply-templates> diff --git a/src/main/resources/xslt/outputs/js/models.xsl b/src/main/resources/xslt/outputs/js/models.xsl index 3c14c08c4..b333a5b5e 100644 --- a/src/main/resources/xslt/outputs/js/models.xsl +++ b/src/main/resources/xslt/outputs/js/models.xsl @@ -410,7 +410,7 @@ <xsl:param name="position" tunnel="yes"/> <xsl:variable name="mandatory" select="enojs:is-required($source-context)" as="xs:boolean"/> - <xsl:variable name="componentType-InputNumber" select="'InputNumber'"/> + <xsl:variable name="componentType" select="'InputNumber'"/> <xsl:variable name="minimumResponse" select="enojs:get-minimum($source-context)"/> <xsl:variable name="maximumResponse" select="enojs:get-maximum($source-context)"/> <xsl:variable name="numberOfDecimals"> @@ -425,7 +425,7 @@ <xsl:choose> <xsl:when test="$questionName!='' and $typeOfAncestor!='table'"> - <components xsi:type="{$componentType-InputNumber}" componentType="{$componentType-InputNumber}" id="{$idQuestion}" mandatory="{$mandatory}"> + <components xsi:type="{$componentType}" componentType="{$componentType}" id="{$idQuestion}" mandatory="{$mandatory}"> <xsl:if test="$minimumResponse!=''"> <xsl:attribute name="min"><xsl:value-of select="$minimumResponse"/></xsl:attribute> </xsl:if> @@ -447,7 +447,7 @@ </components> </xsl:when> <xsl:when test="$typeOfAncestor='table'"> - <cells componentType="{$componentType-InputNumber}" id="{enojs:get-name($source-context)}"> + <cells componentType="{$componentType}" id="{enojs:get-name($source-context)}"> <xsl:if test="$col-span>1"><xsl:attribute name="colspan" select="$col-span"/></xsl:if> <xsl:if test="$row-span>1"><xsl:attribute name="rowspan" select="$row-span"/></xsl:if> <xsl:if test="$minimumResponse!=''"> @@ -499,14 +499,14 @@ <xsl:param name="position" tunnel="yes"/> <xsl:variable name="mandatory" select="enojs:is-required($source-context)" as="xs:boolean"/> - <xsl:variable name="componentType-Input" select="'Input'"/> + <xsl:variable name="componentType" select="'Input'"/> <xsl:variable name="lengthResponse" select="enojs:get-length($source-context)"/> <xsl:variable name="responseName" select="enojs:get-business-name($source-context)"/> <xsl:choose> <xsl:when test="$questionName!='' and $typeOfAncestor!='table'"> - <components xsi:type="{$componentType-Input}" componentType="{$componentType-Input}" id="{$idQuestion}" maxLength="{$lengthResponse}" mandatory="{$mandatory}"> + <components xsi:type="{$componentType}" componentType="{$componentType}" id="{$idQuestion}" maxLength="{$lengthResponse}" mandatory="{$mandatory}"> <label><xsl:value-of select="$labelQuestion"/></label> <xsl:copy-of select="$declarations"/> <xsl:call-template name="enojs:addResponseToComponents"> @@ -516,7 +516,7 @@ </components> </xsl:when> <xsl:when test="$typeOfAncestor='table'"> - <cells componentType="{$componentType-Input}" id="{enojs:get-name($source-context)}" maxLength="{$lengthResponse}"> + <cells componentType="{$componentType}" id="{enojs:get-name($source-context)}" maxLength="{$lengthResponse}"> <xsl:if test="$col-span>1"><xsl:attribute name="colspan" select="$col-span"/></xsl:if> <xsl:if test="$row-span>1"><xsl:attribute name="rowspan" select="$row-span"/></xsl:if> <xsl:call-template name="enojs:addResponseToComponents"> @@ -550,22 +550,19 @@ <xsl:param name="languages" tunnel="yes"/> <xsl:param name="declarations" as="node()*" tunnel="yes"/> <xsl:param name="filterCondition" tunnel="yes"/> - <xsl:param name="col-span" tunnel="yes"/> <xsl:param name="row-span" tunnel="yes"/> - <xsl:param name="typeOfAncestor" tunnel="yes"/> <xsl:param name="position" tunnel="yes"/> <xsl:variable name="mandatory" select="enojs:is-required($source-context)" as="xs:boolean"/> - - <xsl:variable name="componentType-Datepicker" select="'Datepicker'"/> - + <xsl:variable name="componentType" select="'Datepicker'"/> <xsl:variable name="responseName" select="enojs:get-business-name($source-context)"/> <xsl:variable name="dateFormat" select="enojs:get-format($source-context)"/> + <xsl:choose> <xsl:when test="$typeOfAncestor='table'"> - <cells componentType="{$componentType-Datepicker}" id="{enojs:get-name($source-context)}"> + <cells componentType="{$componentType}" id="{enojs:get-name($source-context)}"> <xsl:if test="$col-span>1"><xsl:attribute name="colspan" select="$col-span"/></xsl:if> <xsl:if test="$row-span>1"><xsl:attribute name="rowspan" select="$row-span"/></xsl:if> <dateFormat><xsl:value-of select="$dateFormat"/></dateFormat> @@ -573,23 +570,19 @@ <xsl:with-param name="responseName" select="$responseName"/> </xsl:call-template> </cells> - </xsl:when> <xsl:otherwise> - <components xsi:type="{$componentType-Datepicker}" componentType="{$componentType-Datepicker}" id="{$idQuestion}" mandatory="{$mandatory}"> + <components xsi:type="{$componentType}" componentType="{$componentType}" id="{$idQuestion}" mandatory="{$mandatory}"> <label><xsl:value-of select="$labelQuestion"/></label> <xsl:copy-of select="$declarations"/> <xsl:call-template name="enojs:addResponseToComponents"> - <xsl:with-param name="responseName" select="$responseName"/> - + <xsl:with-param name="responseName" select="$responseName"/> </xsl:call-template> <xsl:copy-of select="$filterCondition"/> <dateFormat><xsl:value-of select="$dateFormat"/></dateFormat> </components> </xsl:otherwise> </xsl:choose> - - <xsl:call-template name="enojs:addVariableCollected"> <xsl:with-param name="responseName" select="$responseName"/> <xsl:with-param name="responseRef" select="$responseName"/> @@ -598,86 +591,34 @@ <xd:doc> <xd:desc> - <xd:p>Match on xf-select driver.</xd:p> + <xd:p>Match on BooleanDomain driver.</xd:p> </xd:desc> </xd:doc> - <xsl:template match="xf-select" mode="model"> + <xsl:template match="BooleanDomain" mode="model"> <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="driver" tunnel="yes"/> <xsl:param name="typeOfAncestor" tunnel="yes"/> <xsl:param name="typeOfQuestion" tunnel="yes"/> <xsl:param name="languages" tunnel="yes"/> <xsl:param name="filterCondition" tunnel="yes"/> - <xsl:param name="col-span" tunnel="yes"/> <xsl:param name="row-span" tunnel="yes"/> - <xsl:param name="idQuestion" tunnel="yes"/> <xsl:param name="questionName" tunnel="yes"/> <xsl:param name="labelQuestion" tunnel="yes"/> <xsl:param name="declarations" as="node()*" tunnel="yes"/> - <xsl:param name="position" tunnel="yes"/> <xsl:variable name="mandatory" select="enojs:is-required($source-context)" as="xs:boolean"/> - - <xsl:variable name="componentType-CheckboxOne" select="'CheckboxOne'"/> - <xsl:variable name="componentType-CheckboxBoolean" select="'CheckboxBoolean'"/> - + <xsl:variable name="componentType" select="'CheckboxBoolean'"/> <xsl:variable name="name" select="enojs:get-codelist-name($source-context)"/> <xsl:variable name="idCodeList" select="enojs:get-codelist-id($source-context)"/> <xsl:variable name="maximumLengthCode" select="enojs:get-code-maximum-length($source-context)"/> <xsl:variable name="typeResponse" select="enojs:get-type($source-context)"/> - <xsl:variable name="responseName" select="enojs:get-business-name($source-context)"/> - <xsl:choose> - <xsl:when test="$maximumLengthCode != '' and $questionName!=''"> - <!-- remove Format in the cell for table 'question multiple-choice-question'--> - <xsl:if test="$typeOfQuestion!='MultipleChoiceQuestion' and $typeOfAncestor!='table'"> - <components xsi:type="{$componentType-CheckboxOne}" componentType="{$componentType-CheckboxOne}" id="{$idQuestion}" mandatory="{$mandatory}"> - <label><xsl:value-of select="$labelQuestion"/></label> - <xsl:copy-of select="$declarations"></xsl:copy-of> - - <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> - <xsl:with-param name="driver" select="." tunnel="yes"/> - <xsl:with-param name="typeResponse" select="$typeResponse" tunnel="yes"/> - <xsl:with-param name="typeOfAncestor" select="'codeLists'" tunnel="yes"/> - </xsl:apply-templates> - - <xsl:call-template name="enojs:addResponseToComponents"> - <xsl:with-param name="responseName" select="$responseName"/> - </xsl:call-template> - <xsl:copy-of select="$filterCondition"/> - </components> - - <xsl:call-template name="enojs:addVariableCollected"> - <xsl:with-param name="responseName" select="$responseName"/> - <xsl:with-param name="responseRef" select="$responseName"/> - </xsl:call-template> - </xsl:if> - - <xsl:if test="$typeOfQuestion!='MultipleChoiceQuestion' and $typeOfAncestor='table'"> - <cells id="{enojs:get-name($source-context)}" componentType="{$componentType-CheckboxOne}"> - <xsl:if test="$col-span>1"><xsl:attribute name="colspan" select="$col-span"/></xsl:if> - <xsl:if test="$row-span>1"><xsl:attribute name="rowspan" select="$row-span"/></xsl:if> - <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> - <xsl:with-param name="driver" select="." tunnel="yes"/> - <xsl:with-param name="typeOfAncestor" select="'codeLists'" tunnel="yes"/> - </xsl:apply-templates> - <xsl:call-template name="enojs:addResponseToComponents"> - <xsl:with-param name="responseName" select="$responseName"/> - </xsl:call-template> - </cells> - - <xsl:call-template name="enojs:addVariableCollected"> - <xsl:with-param name="responseName" select="$responseName"/> - <xsl:with-param name="responseRef" select="$responseName"/> - </xsl:call-template> - </xsl:if> - </xsl:when> - - <xsl:when test="$typeResponse='boolean' and $typeOfQuestion='MultipleChoiceQuestion' and $typeOfAncestor!='table'"> + <xsl:choose> + <xsl:when test="$typeOfQuestion='MultipleChoiceQuestion'"> <responses id="{enojs:get-name($source-context)}"> <!-- call item driver for the label --> <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> @@ -694,12 +635,10 @@ <xsl:with-param name="responseRef" select="$responseName"/> </xsl:call-template> </xsl:when> - - <xsl:when test="$typeResponse='boolean' and $typeOfQuestion='SingleResponseQuestion' and $idQuestion!='' and $typeOfAncestor!='table'"> - <components xsi:type="{$componentType-CheckboxBoolean}" componentType="{$componentType-CheckboxBoolean}" id="{$idQuestion}" mandatory="{$mandatory}"> + <xsl:when test="$typeOfQuestion='SingleResponseQuestion' and $idQuestion!=''"> + <components xsi:type="{$componentType}" componentType="{$componentType}" id="{$idQuestion}" mandatory="{$mandatory}"> <label><xsl:value-of select="$labelQuestion"/></label> <xsl:copy-of select="$declarations"/> - <xsl:call-template name="enojs:addResponseToComponents"> <xsl:with-param name="responseName" select="$responseName"/> <xsl:with-param name="responseType" select="'Boolean'"/> @@ -712,8 +651,8 @@ <xsl:with-param name="responseRef" select="$responseName"/> </xsl:call-template> </xsl:when> - <xsl:when test="$typeResponse='boolean' and $typeOfAncestor='table'"> - <cells id="{enojs:get-name($source-context)}" componentType="{$componentType-CheckboxBoolean}"> + <xsl:when test="$typeOfAncestor='table'"> + <cells id="{enojs:get-name($source-context)}" componentType="{$componentType}"> <xsl:if test="$col-span>1"><xsl:attribute name="colspan" select="$col-span"/></xsl:if> <xsl:if test="$row-span>1"><xsl:attribute name="rowspan" select="$row-span"/></xsl:if> <xsl:call-template name="enojs:addResponseToComponents"> @@ -732,79 +671,58 @@ <xd:doc> <xd:desc> - <xd:p>Match on xf-select1 driver.</xd:p> + <xd:p>Match on CodeDomain driver.</xd:p> </xd:desc> </xd:doc> - <xsl:template match="xf-select1" mode="model"> + <xsl:template match="CodeDomain" mode="model"> <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="driver" tunnel="yes"/> <xsl:param name="typeOfAncestor" tunnel="yes"/> <xsl:param name="languages" tunnel="yes"/> <xsl:param name="filterCondition" tunnel="yes"/> - <xsl:param name="col-span" tunnel="yes"/> <xsl:param name="row-span" tunnel="yes"/> - <xsl:param name="idQuestion" tunnel="yes"/> <xsl:param name="questionName" tunnel="yes"/> <xsl:param name="labelQuestion" tunnel="yes"/> <xsl:param name="declarations" as="node()*" tunnel="yes"/> - <xsl:param name="position" tunnel="yes"/> <xsl:variable name="mandatory" select="enojs:is-required($source-context)" as="xs:boolean"/> - - <xsl:variable name="componentType-Radio" select="'Radio'"/> - <xsl:variable name="componentType-Dropdown" select="'Dropdown'"/> - + <xsl:variable name="typeXf" select="enojs:get-appearance($source-context)"/> + <xsl:variable name="componentType"> + <xsl:choose> + <xsl:when test="$typeXf = 'radio-button'"> + <xsl:value-of select="'Radio'"/> + </xsl:when> + <xsl:when test="$typeXf = 'drop-down-list'"> + <xsl:value-of select="'Dropdown'"/> + </xsl:when> + <xsl:when test="$typeXf = 'checkbox'"> + <xsl:value-of select="'CheckboxOne'"/> + </xsl:when> + </xsl:choose> + </xsl:variable> <xsl:variable name="name" select="enojs:get-codelist-name($source-context)"/> <xsl:variable name="idCodeList" select="enojs:get-codelist-id($source-context)"/> <xsl:variable name="typeResponse" select="enojs:get-type($source-context)"/> <xsl:variable name="lengthResponse" select="enojs:get-length($source-context)"/> <xsl:variable name="maximumLengthCode" select="enojs:get-code-maximum-length($source-context)"/> - <xsl:variable name="typeXf" select="enojs:get-appearance($source-context)"/> - <xsl:variable name="responseName" select="enojs:get-business-name($source-context)"/> - <xsl:if test="$maximumLengthCode != '' and $typeOfAncestor!='question multiple-choice-question' and $questionName!='' and $typeOfAncestor!='table'"> - <xsl:choose> - <xsl:when test="$typeXf='full'"> - <components xsi:type="{$componentType-Radio}" componentType="{$componentType-Radio}" id="{$idQuestion}" mandatory="{$mandatory}"> - <label><xsl:value-of select="$labelQuestion"/></label> - <xsl:copy-of select="$declarations"></xsl:copy-of> - - - <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> - <xsl:with-param name="driver" select="." tunnel="yes"/> - <xsl:with-param name="typeOfAncestor" select="'codeLists'" tunnel="yes"/> - </xsl:apply-templates> - - <xsl:call-template name="enojs:addResponseToComponents"> - <xsl:with-param name="responseName" select="$responseName"/> - - </xsl:call-template> - <xsl:copy-of select="$filterCondition"/> - - </components> - </xsl:when> - <xsl:when test="$typeXf='minimal'"> - <components xsi:type="{$componentType-Dropdown}" componentType="{$componentType-Dropdown}" id="{$idQuestion}" mandatory="{$mandatory}"> - <label><xsl:value-of select="$labelQuestion"/></label> - <xsl:copy-of select="$declarations"></xsl:copy-of> - - <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> - <xsl:with-param name="driver" select="." tunnel="yes"/> - <xsl:with-param name="typeOfAncestor" select="'codeLists'" tunnel="yes"/> - </xsl:apply-templates> - - <xsl:call-template name="enojs:addResponseToComponents"> - <xsl:with-param name="responseName" select="$responseName"/> - - </xsl:call-template> - <xsl:copy-of select="$filterCondition"/> - </components> - </xsl:when> - </xsl:choose> + <xsl:if test="$typeOfAncestor!='question multiple-choice-question' and $questionName!='' and $typeOfAncestor!='table'"> + <components xsi:type="{$componentType}" componentType="{$componentType}" id="{$idQuestion}" mandatory="{$mandatory}"> + <label><xsl:value-of select="$labelQuestion"/></label> + <xsl:copy-of select="$declarations"></xsl:copy-of> + <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> + <xsl:with-param name="driver" select="." tunnel="yes"/> + <xsl:with-param name="typeOfAncestor" select="'codeLists'" tunnel="yes"/> + </xsl:apply-templates> + <xsl:call-template name="enojs:addResponseToComponents"> + <xsl:with-param name="responseName" select="$responseName"/> + </xsl:call-template> + <xsl:copy-of select="$filterCondition"/> + </components> <xsl:call-template name="enojs:addVariableCollected"> <xsl:with-param name="responseName" select="$responseName"/> @@ -812,37 +730,18 @@ </xsl:call-template> </xsl:if> - <xsl:if test="$maximumLengthCode != '' and $typeOfAncestor='table'"> - <xsl:choose> - <xsl:when test="$typeXf='full'"> - <cells id="{enojs:get-name($source-context)}" componentType="{$componentType-Radio}"> - <xsl:if test="$col-span>1"><xsl:attribute name="colspan" select="$col-span"/></xsl:if> - <xsl:if test="$row-span>1"><xsl:attribute name="rowspan" select="$row-span"/></xsl:if> - <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> - <xsl:with-param name="driver" select="." tunnel="yes"/> - <xsl:with-param name="typeOfAncestor" select="'codeLists'" tunnel="yes"/> - </xsl:apply-templates> - <xsl:call-template name="enojs:addResponseToComponents"> - <xsl:with-param name="responseName" select="$responseName"/> - </xsl:call-template> - </cells> - </xsl:when> - <xsl:when test="$typeXf='minimal'"> - <cells id="{enojs:get-name($source-context)}" componentType="{$componentType-Dropdown}"> - <xsl:if test="$col-span>1"><xsl:attribute name="colspan" select="$col-span"/></xsl:if> - <xsl:if test="$row-span>1"><xsl:attribute name="rowspan" select="$row-span"/></xsl:if> - <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> - <xsl:with-param name="driver" select="." tunnel="yes"/> - <xsl:with-param name="typeOfAncestor" select="'codeLists'" tunnel="yes"/> - </xsl:apply-templates> - <xsl:call-template name="enojs:addResponseToComponents"> - <xsl:with-param name="responseName" select="$responseName"/> - </xsl:call-template> - </cells> - - </xsl:when> - </xsl:choose> - + <xsl:if test="$typeOfAncestor='table'"> + <cells id="{enojs:get-name($source-context)}" componentType="{$componentType}"> + <xsl:if test="$col-span>1"><xsl:attribute name="colspan" select="$col-span"/></xsl:if> + <xsl:if test="$row-span>1"><xsl:attribute name="rowspan" select="$row-span"/></xsl:if> + <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> + <xsl:with-param name="driver" select="." tunnel="yes"/> + <xsl:with-param name="typeOfAncestor" select="'codeLists'" tunnel="yes"/> + </xsl:apply-templates> + <xsl:call-template name="enojs:addResponseToComponents"> + <xsl:with-param name="responseName" select="$responseName"/> + </xsl:call-template> + </cells> <xsl:call-template name="enojs:addVariableCollected"> <xsl:with-param name="responseName" select="$responseName"/> <xsl:with-param name="responseRef" select="$responseName"/> @@ -850,7 +749,6 @@ </xsl:if> </xsl:template> - <xd:doc> <xd:desc> <xd:p>Match on the xf-item driver.</xd:p> diff --git a/src/main/resources/xslt/outputs/odt/models.xsl b/src/main/resources/xslt/outputs/odt/models.xsl index 10921f43d..f8097af94 100644 --- a/src/main/resources/xslt/outputs/odt/models.xsl +++ b/src/main/resources/xslt/outputs/odt/models.xsl @@ -238,52 +238,34 @@ <xd:doc> <xd:desc> - <xd:p>Match on xf-select driver.</xd:p> + <xd:p>Match on BooleanDomain driver.</xd:p> <xd:p>It writes the short name, the label and its response format of a question.</xd:p> </xd:desc> </xd:doc> - <xsl:template match="xf-select" mode="model"> + <xsl:template match="BooleanDomain" mode="model"> <xsl:param name="source-context" as="item()" tunnel="yes"/> - <xsl:param name="typeOfAncestor" tunnel="yes"/> - <xsl:param name="languages" tunnel="yes"/> - <xsl:variable name="typeResponse" select="enoodt:get-type($source-context)"/> - <xsl:variable name="maximumLengthCode" select="enoodt:get-code-maximum-length($source-context)"/> - <xsl:variable name="questionName" select="enoodt:get-question-name($source-context,$languages[1])"/> - <xsl:variable name="nameOfVariable" select="enoodt:get-business-name($source-context)"/> + <xsl:param name="typeOfAncestor" tunnel="yes"/> - <xsl:choose> - <xsl:when test="$maximumLengthCode != ''"> - <!-- remove Format in the cell for table 'question multiple-choice-question'--> - <xsl:if test="$typeOfAncestor!='question multiple-choice-question'"> - <text:p text:style-name="Format"> - <xsl:value-of select="concat('Car ',$maximumLengthCode,' - ','liste de modalités')"/> - </text:p> - </xsl:if> - </xsl:when> - <xsl:when test="$typeResponse='boolean' and $typeOfAncestor!=''"> - <text:p text:style-name="Format"><xsl:value-of select="'Booléen'"/></text:p> - </xsl:when> - </xsl:choose> + <xsl:if test="$typeOfAncestor!=''"> + <text:p text:style-name="Format"><xsl:value-of select="'Booléen'"/></text:p> + </xsl:if> <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> <xsl:with-param name="driver" select="." tunnel="yes"/> - <xsl:with-param name="typeResponse" select="$typeResponse" tunnel="yes"/> </xsl:apply-templates> </xsl:template> <xd:doc> <xd:desc> - <xd:p>Match on xf-select1 driver.</xd:p> + <xd:p>Match on CodeDomain driver.</xd:p> <xd:p>It writes the short name, the label and its response format of a question.</xd:p> </xd:desc> </xd:doc> - <xsl:template match="xf-select1" mode="model"> + <xsl:template match="CodeDomain" mode="model"> <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="typeOfAncestor" tunnel="yes"/> <xsl:param name="languages" tunnel="yes"/> - <xsl:variable name="typeResponse" select="enoodt:get-type($source-context)"/> - <xsl:variable name="lengthResponse" select="enoodt:get-length($source-context)"/> <xsl:variable name="maximumLengthCode" select="enoodt:get-code-maximum-length($source-context)"/> <xsl:if test="$typeOfAncestor!='question multiple-choice-question' and $maximumLengthCode != ''"> @@ -481,12 +463,11 @@ <xsl:template match="xf-item" mode="model"> <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="ancestorTable" tunnel="yes"/> - <xsl:param name="typeResponse" tunnel="yes"/> <xsl:param name="languages" tunnel="yes"/> <xsl:variable name="label" select="enoodt:get-label($source-context, $languages[1])"/> <!-- remove item in the cell for table when the response is boolean--> - <xsl:if test="$label !='' and $typeResponse!='boolean'"> + <xsl:if test="$label !='' and not(ancestor::BooleanDomain)"> <text:p text:style-name="CodeItem"> <xsl:value-of select="fn:concat(enoodt:get-value($source-context), ' - ', $label)"/> </text:p> diff --git a/src/main/resources/xslt/outputs/pdf/models.xsl b/src/main/resources/xslt/outputs/pdf/models.xsl index be50abde4..de2026d11 100644 --- a/src/main/resources/xslt/outputs/pdf/models.xsl +++ b/src/main/resources/xslt/outputs/pdf/models.xsl @@ -927,14 +927,13 @@ </xsl:apply-templates> </xsl:template> - <!-- Déclenche tous les xf-select de l'arbre des drivers --> - <xsl:template match="main//xf-select1 | main//xf-select" mode="model"> + <xsl:template match="main//CodeDomain | main//BooleanDomain" mode="model"> <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="no-border" tunnel="yes"/> <xsl:param name="isTable" tunnel="yes"/> <xsl:choose> - <xsl:when test="enopdf:get-appearance($source-context) = 'minimal'"> + <xsl:when test="enopdf:get-appearance($source-context) = 'drop-down-list'"> <xsl:choose> <xsl:when test="$no-border = 'no-border'"> <fo:block-container height="8mm" width="50mm"> diff --git a/src/main/resources/xslt/transformations/ddi2fr/drivers.fods b/src/main/resources/xslt/transformations/ddi2fr/drivers.fods index 89fa4a462..68db53dbf 100644 --- a/src/main/resources/xslt/transformations/ddi2fr/drivers.fods +++ b/src/main/resources/xslt/transformations/ddi2fr/drivers.fods @@ -1,20 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> <office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.spreadsheet"> - <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>P1DT3H50M3S</meta:editing-duration><meta:editing-cycles>178</meta:editing-cycles><meta:generator>LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab8</meta:generator><dc:date>2019-07-23T11:28:26.007000000</dc:date><dc:creator>François Bulot</dc:creator><meta:document-statistic meta:table-count="1" meta:cell-count="129" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> + <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>P1DT3H52M20S</meta:editing-duration><meta:editing-cycles>179</meta:editing-cycles><meta:generator>LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab8</meta:generator><dc:date>2019-08-30T15:48:23.124000000</dc:date><dc:creator>François Bulot</dc:creator><meta:document-statistic meta:table-count="1" meta:cell-count="123" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> <office:settings> <config:config-item-set config:name="ooo:view-settings"> <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item> <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item> <config:config-item config:name="VisibleAreaWidth" config:type="int">50597</config:config-item> - <config:config-item config:name="VisibleAreaHeight" config:type="int">30771</config:config-item> + <config:config-item config:name="VisibleAreaHeight" config:type="int">29867</config:config-item> <config:config-item-map-indexed config:name="Views"> <config:config-item-map-entry> <config:config-item config:name="ViewId" config:type="string">view1</config:config-item> <config:config-item-map-named config:name="Tables"> <config:config-item-map-entry config:name="Sheet1"> <config:config-item config:name="CursorPositionX" config:type="int">0</config:config-item> - <config:config-item config:name="CursorPositionY" config:type="int">49</config:config-item> + <config:config-item config:name="CursorPositionY" config:type="int">38</config:config-item> <config:config-item config:name="HorizontalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="VerticalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="HorizontalSplitPosition" config:type="int">0</config:config-item> @@ -23,7 +23,7 @@ <config:config-item config:name="PositionLeft" config:type="int">0</config:config-item> <config:config-item config:name="PositionRight" config:type="int">0</config:config-item> <config:config-item config:name="PositionTop" config:type="int">0</config:config-item> - <config:config-item config:name="PositionBottom" config:type="int">27</config:config-item> + <config:config-item config:name="PositionBottom" config:type="int">21</config:config-item> <config:config-item config:name="ZoomType" config:type="short">0</config:config-item> <config:config-item config:name="ZoomValue" config:type="int">100</config:config-item> <config:config-item config:name="PageViewZoomValue" config:type="int">60</config:config-item> @@ -77,8 +77,8 @@ <config:config-item config:name="IsRasterAxisSynchronized" config:type="boolean">true</config:config-item> <config:config-item config:name="AutoCalculate" config:type="boolean">true</config:config-item> <config:config-item config:name="ApplyUserData" config:type="boolean">true</config:config-item> - <config:config-item config:name="PrinterName" config:type="string">Envoyer à OneNote 16</config:config-item> - <config:config-item config:name="PrinterSetup" config:type="base64Binary">xQT+/0Vudm95ZXIgw6AgT25lTm90ZcKgMTYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAU2VuZCB0byBNaWNyb3NvZnQgT25lTm90ZSAxNiBEcgAWAAEA4gMAAAAAAAAEAAhSAAAEdAAAM1ROVwAAAAAKAEUAbgB2AG8AeQBlAHIAIADgACAATwBuAGUATgBvAHQAZQCgADEANgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBAAG3AD8AgMvAAABAAkAmgs0CGQAAQAPAFgCAgABAFgCAwABAEEANAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAQAAAAIAAAABAAAA/////wAAAAAAAAAAAAAAAAAAAABESU5VIgDAAPwCAACsE9jAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAMAAAABTTVRKAAAAABAAsABTAGUAbgBkACAAdABvACAATQBpAGMAcgBvAHMAbwBmAHQAIABPAG4AZQBOAG8AdABlACAAMQA2ACAARAByAGkAdgBlAHIAAABSRVNETEwAVW5pcmVzRExMAFBhcGVyU2l6ZQBMRVRURVIAT3JpZW50YXRpb24AUE9SVFJBSVQAUmVzb2x1dGlvbgBEUEk2MDAAQ29sb3JNb2RlADI0YnBwAAAAAAAAAAAAAAAAAAAAABIAQ09NUEFUX0RVUExFWF9NT0RFEwBEdXBsZXhNb2RlOjpVbmtub3du</config:config-item> + <config:config-item config:name="PrinterName" config:type="string">\\S20SLINNG\LP0000554-CLR-DR59-SNDI-Secretariat</config:config-item> + <config:config-item config:name="PrinterSetup" config:type="base64Binary">nin+/1xcUzIwU0xJTk5HXExQMDAwMDU1NC1DTFItRFI1OS1TTkRJLVNlY3JldGFyaWF0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAS09OSUNBIE1JTk9MVEEgVW5pdmVyc2FsIFBDTAAAAAAWAAEAuigAAAAAAAAEAAhSAAAEdAAAM1ROVwAAAAAKAFwAXABTADIAMABTAEwASQBOAE4ARwBcAEwAUAAwADAAMAAwADUANQA0AC0AQwBMAFIALQBEAFIANQA5AAAAAAABBAAB3ADUJw+/AAIBAAkAmgs0CGQAAQAHAFgCAgACAFgCAwAAAEEANAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAyCcAAFNQTFgBAAAAAAAAAPwL192wJwAAyCcAAFVQRF9PV04AAAAAAAAAAABQQ0xYTAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAkANAiaCysAKwArACsAADQImgsAAABMIAAArS0AAGUBNAiaCwA0CJoLAEwgAACtLQAAAQBkAAcAAQEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQEBAAABAQBJblRyYXkxAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEBAAABAQEBAAABAQBJblRyYXkyAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIBAAABAQEBAAABAQBJblRyYXkzAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMBAAABAQEBAAABAQBJblRyYXk0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQBAAABAQEBAAABAQBJblRyYXlMQ1QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOgDAAABAQEBAAABAQBJblRyYXlNYW51YWwAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAABAQEBAAABAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAAABAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAAABAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAAABAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAEAAQEBAAEAAQAAAAEAAA4BAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAwAEAAEBAAAAAAQAAAAAAAEAAQAAAAAAAAEBAAAAZAB9AAAEAQEABAEBAAEBAQAB/38AAOkDAQAA6QMBAAABAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEASAD/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAQABAAAAAAABAAAAAQAAAAEAAAABAAEAAQABAQAAAQAAAAEAAQABAQADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAQEAAAAAAQABAAAAAAEAAAEAAQAAAAAAAQAAAAABAAEAAQABAQAAAQAAAAEAAAABAAAAAAEBAAEAAQABAQAAAQAAAAAAAQABBQAAAAAAAAABAAAAAAAAAAEAAQAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQQByAGkAYQBsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAAAgAAAQEAZAABAQBkAAEAAP//AAABAAEAAAAAAAAAAQABAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQAAAAAAAAAAAAAAAAAAAAABAgBYAlgCUAMYAAEEAAAAAAAAAQAAAQAAAAEAAAABAQAAAAABAAABAQABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQABAAEAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEAAABfAgABQXJpYWwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABDb3VyaWVyIE5ldwAAAAAAAAAAAAAAAAAAAAAAAAAAAFRpbWVzIE5ldyBSb21hbgAAAAAAAAAAAAAAAAAAAAAAU3ltYm9sAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABXaW5nZGluZ3MAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQsXFBoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQXJpYWwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABDb3VyaWVyAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFRpbWVzIE5ldyBSb21hbgAAAAAAAAAAAAAAAAAAAAAAU3ltYm9sAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABXaW5nZGluZ3MAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAADpAQAAIwQAAGkFAAB2AgAAqgMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAQAAAAEBAEsBAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANAiaCwCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABzAG8AZgBmAGkAYwBlAC4AYgBpAG4AAAAAAAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAYAAAABAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEACQA0CJoLTCAAAK0tAAD//wAA//8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZAAAAAQAAAAAAAAAAAAAAAAAAAAZYREoAAAAABIAQ09NUEFUX0RVUExFWF9NT0RFFABEdXBsZXhNb2RlOjpMb25nRWRnZQ==</config:config-item> <config:config-item-map-indexed config:name="ForbiddenCharacters"> <config:config-item-map-entry> <config:config-item config:name="Language" config:type="string">zxx</config:config-item> @@ -538,9 +538,6 @@ <style:style style:name="ce9" style:family="table-cell" style:parent-style-name="Default"> <style:table-cell-properties fo:background-color="transparent"/> </style:style> - <style:style style:name="ce10" style:family="table-cell" style:parent-style-name="Default"> - <style:table-cell-properties fo:background-color="transparent" style:vertical-align="automatic"/> - </style:style> <style:style style:name="ce11" style:family="table-cell" style:parent-style-name="Default"> <style:table-cell-properties fo:background-color="transparent"/> <style:text-properties fo:color="#000000" style:font-name="Arial" fo:font-size="10pt" fo:language="en" fo:country="US" style:font-name-asian="Tahoma" style:font-size-asian="10pt" style:language-asian="en" style:country-asian="US" style:font-name-complex="Tahoma" style:font-size-complex="10pt" style:language-complex="en" style:country-complex="US"/> @@ -591,7 +588,7 @@ <text:p><text:sheet-name>???</text:sheet-name><text:s/>(<text:title>???</text:title>)</text:p> </style:region-left> <style:region-right> - <text:p><text:date style:data-style-name="N2" text:date-value="2019-07-23">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="11:28:21.009000000">00:00:00</text:time></text:p> + <text:p><text:date style:data-style-name="N2" text:date-value="2019-08-30">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="15:46:06.166000000">00:00:00</text:time></text:p> </style:region-right> </style:header> <style:header-left style:display="false"/> @@ -885,49 +882,27 @@ </table:table-row> <table:table-row table:style-name="ro1"> <table:table-cell table:style-name="ce9" office:value-type="string" calcext:value-type="string"> - <text:p>d:CodeDomain[not(ancestor::d:GridDimension) and r:ResponseCardinality[@maximumResponses='1'] and not(r:GenericOutputFormat/text()='checkbox')]</text:p> + <text:p>d:CodeDomain[not(ancestor::d:GridDimension)]</text:p> </table:table-cell> <table:table-cell table:style-name="ce9" office:value-type="string" calcext:value-type="string"> - <text:p>xf-select1</text:p> + <text:p>CodeDomain</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>Those CodeDomain elements (only one response and not of checkbox type) activate the xf-select1 driver.</text:p> + <text:p>Those CodeDomain elements activate the CodeDomaindriver.</text:p> </table:table-cell> </table:table-row> <table:table-row table:style-name="ro1"> <table:table-cell table:number-columns-repeated="3"/> </table:table-row> - <table:table-row table:style-name="ro1"> - <table:table-cell table:style-name="ce9" office:value-type="string" calcext:value-type="string"> - <text:p>d:CodeDomain[not(ancestor::d:GridDimension) and r:ResponseCardinality/@maximumResponses='1' and r:GenericOutputFormat/text()='checkbox']</text:p> - </table:table-cell> - <table:table-cell table:style-name="ce9" office:value-type="string" calcext:value-type="string"> - <text:p>xf-select</text:p> - </table:table-cell> - <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>Those CodeDomain elements (only one response and of checkbox type) activate the xf-select driver. It does seem odd but there is some dynamic behaviour added to prevent checking more than one box.</text:p> - </table:table-cell> - </table:table-row> - <table:table-row table:style-name="ro1"> - <table:table-cell table:style-name="ce10" office:value-type="string" calcext:value-type="string"> - <text:p>d:CodeDomain[not(ancestor::d:GridDimension) and not(r:ResponseCardinality/@maximumResponses='1')]</text:p> - </table:table-cell> - <table:table-cell table:style-name="ce9" office:value-type="string" calcext:value-type="string"> - <text:p>xf-select</text:p> - </table:table-cell> - <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>Those CodeDomain elements (no ResponseCardinality) activate the xf-select driver.</text:p> - </table:table-cell> - </table:table-row> <table:table-row table:style-name="ro1"> <table:table-cell table:style-name="ce9" office:value-type="string" calcext:value-type="string"> <text:p>d:NominalDomain</text:p> </table:table-cell> <table:table-cell table:style-name="ce9" office:value-type="string" calcext:value-type="string"> - <text:p>xf-select</text:p> + <text:p>BooleanDomain</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>The NominalDomain element activates the xf-select driver.</text:p> + <text:p>The NominalDomain element activates the BooleanDomain driver.</text:p> </table:table-cell> </table:table-row> <table:table-row table:style-name="ro1"> diff --git a/src/main/resources/xslt/transformations/ddi2js/drivers.fods b/src/main/resources/xslt/transformations/ddi2js/drivers.fods index 2e5fd1eae..6e0817fca 100644 --- a/src/main/resources/xslt/transformations/ddi2js/drivers.fods +++ b/src/main/resources/xslt/transformations/ddi2js/drivers.fods @@ -1,20 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> <office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.spreadsheet"> - <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>P5DT2H9M41S</meta:editing-duration><meta:editing-cycles>230</meta:editing-cycles><meta:generator>LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab8</meta:generator><dc:date>2019-08-30T14:49:26.985000000</dc:date><dc:creator>François Bulot</dc:creator><meta:document-statistic meta:table-count="1" meta:cell-count="129" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> + <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>P5DT2H10M40S</meta:editing-duration><meta:editing-cycles>231</meta:editing-cycles><meta:generator>LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab8</meta:generator><dc:date>2019-08-30T16:07:39.342000000</dc:date><dc:creator>François Bulot</dc:creator><meta:document-statistic meta:table-count="1" meta:cell-count="123" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> <office:settings> <config:config-item-set config:name="ooo:view-settings"> <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item> <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item> <config:config-item config:name="VisibleAreaWidth" config:type="int">51722</config:config-item> - <config:config-item config:name="VisibleAreaHeight" config:type="int">30769</config:config-item> + <config:config-item config:name="VisibleAreaHeight" config:type="int">29866</config:config-item> <config:config-item-map-indexed config:name="Views"> <config:config-item-map-entry> <config:config-item config:name="ViewId" config:type="string">view1</config:config-item> <config:config-item-map-named config:name="Tables"> <config:config-item-map-entry config:name="Sheet1"> <config:config-item config:name="CursorPositionX" config:type="int">0</config:config-item> - <config:config-item config:name="CursorPositionY" config:type="int">34</config:config-item> + <config:config-item config:name="CursorPositionY" config:type="int">38</config:config-item> <config:config-item config:name="HorizontalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="VerticalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="HorizontalSplitPosition" config:type="int">0</config:config-item> @@ -23,7 +23,7 @@ <config:config-item config:name="PositionLeft" config:type="int">0</config:config-item> <config:config-item config:name="PositionRight" config:type="int">0</config:config-item> <config:config-item config:name="PositionTop" config:type="int">0</config:config-item> - <config:config-item config:name="PositionBottom" config:type="int">9</config:config-item> + <config:config-item config:name="PositionBottom" config:type="int">15</config:config-item> <config:config-item config:name="ZoomType" config:type="short">0</config:config-item> <config:config-item config:name="ZoomValue" config:type="int">100</config:config-item> <config:config-item config:name="PageViewZoomValue" config:type="int">60</config:config-item> @@ -535,9 +535,6 @@ <style:style style:name="ce2" style:family="table-cell" style:parent-style-name="Default"> <style:table-cell-properties fo:background-color="transparent"/> </style:style> - <style:style style:name="ce3" style:family="table-cell" style:parent-style-name="Default"> - <style:table-cell-properties fo:background-color="transparent" style:vertical-align="automatic"/> - </style:style> <style:style style:name="ce4" style:family="table-cell" style:parent-style-name="Default"> <style:table-cell-properties fo:background-color="transparent"/> <style:text-properties fo:color="#000000" style:font-name="Arial" fo:font-size="10pt" fo:language="en" fo:country="US" style:font-name-asian="Tahoma" style:font-size-asian="10pt" style:language-asian="en" style:country-asian="US" style:font-name-complex="Tahoma" style:font-size-complex="10pt" style:language-complex="en" style:country-complex="US"/> @@ -588,7 +585,7 @@ <text:p><text:sheet-name>???</text:sheet-name><text:s/>(<text:title>???</text:title>)</text:p> </style:region-left> <style:region-right> - <text:p><text:date style:data-style-name="N2" text:date-value="2019-08-30">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="14:42:44.453000000">00:00:00</text:time></text:p> + <text:p><text:date style:data-style-name="N2" text:date-value="2019-08-30">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="16:06:40.118000000">00:00:00</text:time></text:p> </style:region-right> </style:header> <style:header-left style:display="false"/> @@ -883,49 +880,27 @@ </table:table-row> <table:table-row table:style-name="ro1"> <table:table-cell table:style-name="ce2" office:value-type="string" calcext:value-type="string"> - <text:p>d:CodeDomain[not(ancestor::d:GridDimension) and r:ResponseCardinality[@maximumResponses='1'] and not(r:GenericOutputFormat/text()='checkbox')]</text:p> + <text:p>d:CodeDomain[not(ancestor::d:GridDimension)]</text:p> </table:table-cell> <table:table-cell table:style-name="ce2" office:value-type="string" calcext:value-type="string"> - <text:p>xf-select1</text:p> + <text:p>CodeDomain</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>Those CodeDomain elements (only one response and not of checkbox type) activate the xf-select1 driver.</text:p> + <text:p>Those CodeDomain elements activate the CodeDomaindriver.</text:p> </table:table-cell> </table:table-row> <table:table-row table:style-name="ro1"> <table:table-cell table:number-columns-repeated="3"/> </table:table-row> - <table:table-row table:style-name="ro1"> - <table:table-cell table:style-name="ce2" office:value-type="string" calcext:value-type="string"> - <text:p>d:CodeDomain[not(ancestor::d:GridDimension) and r:ResponseCardinality/@maximumResponses='1' and r:GenericOutputFormat/text()='checkbox']</text:p> - </table:table-cell> - <table:table-cell table:style-name="ce2" office:value-type="string" calcext:value-type="string"> - <text:p>xf-select</text:p> - </table:table-cell> - <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>Those CodeDomain elements (only one response and of checkbox type) activate the xf-select driver. It does seem odd but there is some dynamic behaviour added to prevent checking more than one box.</text:p> - </table:table-cell> - </table:table-row> - <table:table-row table:style-name="ro1"> - <table:table-cell table:style-name="ce3" office:value-type="string" calcext:value-type="string"> - <text:p>d:CodeDomain[not(ancestor::d:GridDimension) and not(r:ResponseCardinality/@maximumResponses='1')]</text:p> - </table:table-cell> - <table:table-cell table:style-name="ce2" office:value-type="string" calcext:value-type="string"> - <text:p>xf-select</text:p> - </table:table-cell> - <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>Those CodeDomain elements (no ResponseCardinality) activate the xf-select driver.</text:p> - </table:table-cell> - </table:table-row> <table:table-row table:style-name="ro1"> <table:table-cell table:style-name="ce2" office:value-type="string" calcext:value-type="string"> <text:p>d:NominalDomain</text:p> </table:table-cell> <table:table-cell table:style-name="ce2" office:value-type="string" calcext:value-type="string"> - <text:p>xf-select</text:p> + <text:p>BooleanDomain</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>The NominalDomain element activates the xf-select driver.</text:p> + <text:p>The NominalDomain element activates the BooleanDomain driver.</text:p> </table:table-cell> </table:table-row> <table:table-row table:style-name="ro1"> diff --git a/src/main/resources/xslt/transformations/ddi2odt/drivers.fods b/src/main/resources/xslt/transformations/ddi2odt/drivers.fods index 53c4038e7..5c957f99e 100644 --- a/src/main/resources/xslt/transformations/ddi2odt/drivers.fods +++ b/src/main/resources/xslt/transformations/ddi2odt/drivers.fods @@ -1,26 +1,26 @@ <?xml version="1.0" encoding="UTF-8"?> <office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.spreadsheet"> - <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>P3DT6H34M29S</meta:editing-duration><meta:editing-cycles>222</meta:editing-cycles><meta:generator>LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab8</meta:generator><dc:date>2019-08-30T14:51:11.343000000</dc:date><dc:creator>François Bulot</dc:creator><meta:document-statistic meta:table-count="1" meta:cell-count="129" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> + <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>P3DT6H34M40S</meta:editing-duration><meta:editing-cycles>223</meta:editing-cycles><meta:generator>LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab8</meta:generator><dc:date>2019-08-30T16:08:01.586000000</dc:date><dc:creator>François Bulot</dc:creator><meta:document-statistic meta:table-count="1" meta:cell-count="123" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> <office:settings> <config:config-item-set config:name="ooo:view-settings"> <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item> <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item> <config:config-item config:name="VisibleAreaWidth" config:type="int">60138</config:config-item> - <config:config-item config:name="VisibleAreaHeight" config:type="int">30769</config:config-item> + <config:config-item config:name="VisibleAreaHeight" config:type="int">29866</config:config-item> <config:config-item-map-indexed config:name="Views"> <config:config-item-map-entry> <config:config-item config:name="ViewId" config:type="string">view1</config:config-item> <config:config-item-map-named config:name="Tables"> <config:config-item-map-entry config:name="Sheet1"> - <config:config-item config:name="CursorPositionX" config:type="int">2</config:config-item> - <config:config-item config:name="CursorPositionY" config:type="int">32</config:config-item> + <config:config-item config:name="CursorPositionX" config:type="int">0</config:config-item> + <config:config-item config:name="CursorPositionY" config:type="int">38</config:config-item> <config:config-item config:name="HorizontalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="VerticalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="HorizontalSplitPosition" config:type="int">0</config:config-item> <config:config-item config:name="VerticalSplitPosition" config:type="int">0</config:config-item> <config:config-item config:name="ActiveSplitRange" config:type="short">2</config:config-item> - <config:config-item config:name="PositionLeft" config:type="int">1</config:config-item> + <config:config-item config:name="PositionLeft" config:type="int">0</config:config-item> <config:config-item config:name="PositionRight" config:type="int">0</config:config-item> <config:config-item config:name="PositionTop" config:type="int">0</config:config-item> <config:config-item config:name="PositionBottom" config:type="int">5</config:config-item> @@ -535,9 +535,6 @@ <style:style style:name="ce2" style:family="table-cell" style:parent-style-name="Default"> <style:table-cell-properties fo:background-color="transparent"/> </style:style> - <style:style style:name="ce3" style:family="table-cell" style:parent-style-name="Default"> - <style:table-cell-properties fo:background-color="transparent" style:vertical-align="automatic"/> - </style:style> <style:style style:name="ce4" style:family="table-cell" style:parent-style-name="Default"> <style:table-cell-properties fo:background-color="transparent"/> <style:text-properties fo:color="#000000" style:font-name="Arial" fo:font-size="10pt" fo:language="en" fo:country="US" style:font-name-asian="Tahoma" style:font-size-asian="10pt" style:language-asian="en" style:country-asian="US" style:font-name-complex="Tahoma" style:font-size-complex="10pt" style:language-complex="en" style:country-complex="US"/> @@ -588,7 +585,7 @@ <text:p><text:sheet-name>???</text:sheet-name><text:s/>(<text:title>???</text:title>)</text:p> </style:region-left> <style:region-right> - <text:p><text:date style:data-style-name="N2" text:date-value="2019-08-30">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="14:42:52.305000000">00:00:00</text:time></text:p> + <text:p><text:date style:data-style-name="N2" text:date-value="2019-08-30">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="16:07:50.390000000">00:00:00</text:time></text:p> </style:region-right> </style:header> <style:header-left style:display="false"/> @@ -883,49 +880,27 @@ </table:table-row> <table:table-row table:style-name="ro1"> <table:table-cell table:style-name="ce2" office:value-type="string" calcext:value-type="string"> - <text:p>d:CodeDomain[not(ancestor::d:GridDimension) and r:ResponseCardinality[@maximumResponses='1'] and not(r:GenericOutputFormat/text()='checkbox')]</text:p> + <text:p>d:CodeDomain[not(ancestor::d:GridDimension)]</text:p> </table:table-cell> <table:table-cell table:style-name="ce2" office:value-type="string" calcext:value-type="string"> - <text:p>xf-select1</text:p> + <text:p>CodeDomain</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>Those CodeDomain elements (only one response and not of checkbox type) activate the xf-select1 driver.</text:p> + <text:p>Those CodeDomain elements activate the CodeDomaindriver.</text:p> </table:table-cell> </table:table-row> <table:table-row table:style-name="ro1"> <table:table-cell table:number-columns-repeated="3"/> </table:table-row> - <table:table-row table:style-name="ro1"> - <table:table-cell table:style-name="ce2" office:value-type="string" calcext:value-type="string"> - <text:p>d:CodeDomain[not(ancestor::d:GridDimension) and r:ResponseCardinality/@maximumResponses='1' and r:GenericOutputFormat/text()='checkbox']</text:p> - </table:table-cell> - <table:table-cell table:style-name="ce2" office:value-type="string" calcext:value-type="string"> - <text:p>xf-select</text:p> - </table:table-cell> - <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>Those CodeDomain elements (only one response and of checkbox type) activate the xf-select driver. It does seem odd but there is some dynamic behaviour added to prevent checking more than one box.</text:p> - </table:table-cell> - </table:table-row> - <table:table-row table:style-name="ro1"> - <table:table-cell table:style-name="ce3" office:value-type="string" calcext:value-type="string"> - <text:p>d:CodeDomain[not(ancestor::d:GridDimension) and not(r:ResponseCardinality/@maximumResponses='1')]</text:p> - </table:table-cell> - <table:table-cell table:style-name="ce2" office:value-type="string" calcext:value-type="string"> - <text:p>xf-select</text:p> - </table:table-cell> - <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>Those CodeDomain elements (no ResponseCardinality) activate the xf-select driver.</text:p> - </table:table-cell> - </table:table-row> <table:table-row table:style-name="ro1"> <table:table-cell table:style-name="ce2" office:value-type="string" calcext:value-type="string"> <text:p>d:NominalDomain</text:p> </table:table-cell> <table:table-cell table:style-name="ce2" office:value-type="string" calcext:value-type="string"> - <text:p>xf-select</text:p> + <text:p>BooleanDomain</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>The NominalDomain element activates the xf-select driver.</text:p> + <text:p>The NominalDomain element activates the BooleanDomain driver.</text:p> </table:table-cell> </table:table-row> <table:table-row table:style-name="ro1"> diff --git a/src/main/resources/xslt/transformations/ddi2pdf/drivers.fods b/src/main/resources/xslt/transformations/ddi2pdf/drivers.fods index fc8f6638b..29b1dc84a 100644 --- a/src/main/resources/xslt/transformations/ddi2pdf/drivers.fods +++ b/src/main/resources/xslt/transformations/ddi2pdf/drivers.fods @@ -1,20 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> <office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.spreadsheet"> - <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>P2DT2H39M8S</meta:editing-duration><meta:editing-cycles>179</meta:editing-cycles><meta:generator>LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab8</meta:generator><dc:date>2019-07-23T11:17:07.134000000</dc:date><dc:creator>François Bulot</dc:creator><meta:document-statistic meta:table-count="1" meta:cell-count="129" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> + <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>P2DT2H39M19S</meta:editing-duration><meta:editing-cycles>180</meta:editing-cycles><meta:generator>LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab8</meta:generator><dc:date>2019-08-30T16:08:22.277000000</dc:date><dc:creator>François Bulot</dc:creator><meta:document-statistic meta:table-count="1" meta:cell-count="123" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> <office:settings> <config:config-item-set config:name="ooo:view-settings"> <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item> <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item> <config:config-item config:name="VisibleAreaWidth" config:type="int">54828</config:config-item> - <config:config-item config:name="VisibleAreaHeight" config:type="int">31160</config:config-item> + <config:config-item config:name="VisibleAreaHeight" config:type="int">30257</config:config-item> <config:config-item-map-indexed config:name="Views"> <config:config-item-map-entry> <config:config-item config:name="ViewId" config:type="string">view1</config:config-item> <config:config-item-map-named config:name="Tables"> <config:config-item-map-entry config:name="Sheet1"> <config:config-item config:name="CursorPositionX" config:type="int">0</config:config-item> - <config:config-item config:name="CursorPositionY" config:type="int">51</config:config-item> + <config:config-item config:name="CursorPositionY" config:type="int">38</config:config-item> <config:config-item config:name="HorizontalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="VerticalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="HorizontalSplitPosition" config:type="int">0</config:config-item> @@ -77,8 +77,8 @@ <config:config-item config:name="IsRasterAxisSynchronized" config:type="boolean">true</config:config-item> <config:config-item config:name="AutoCalculate" config:type="boolean">true</config:config-item> <config:config-item config:name="ApplyUserData" config:type="boolean">true</config:config-item> - <config:config-item config:name="PrinterName" config:type="string">Envoyer à OneNote 16</config:config-item> - <config:config-item config:name="PrinterSetup" config:type="base64Binary">xQT+/0Vudm95ZXIgw6AgT25lTm90ZcKgMTYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAU2VuZCB0byBNaWNyb3NvZnQgT25lTm90ZSAxNiBEcgAWAAEA4gMAAAAAAAAEAAhSAAAEdAAAM1ROVwAAAAAKAEUAbgB2AG8AeQBlAHIAIADgACAATwBuAGUATgBvAHQAZQCgADEANgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBAAG3AD8AgMvAAABAAkAmgs0CGQAAQAPAFgCAgABAFgCAwABAEEANAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAQAAAAIAAAABAAAA/////wAAAAAAAAAAAAAAAAAAAABESU5VIgDAAPwCAACsE9jAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAMAAAABTTVRKAAAAABAAsABTAGUAbgBkACAAdABvACAATQBpAGMAcgBvAHMAbwBmAHQAIABPAG4AZQBOAG8AdABlACAAMQA2ACAARAByAGkAdgBlAHIAAABSRVNETEwAVW5pcmVzRExMAFBhcGVyU2l6ZQBMRVRURVIAT3JpZW50YXRpb24AUE9SVFJBSVQAUmVzb2x1dGlvbgBEUEk2MDAAQ29sb3JNb2RlADI0YnBwAAAAAAAAAAAAAAAAAAAAABIAQ09NUEFUX0RVUExFWF9NT0RFEwBEdXBsZXhNb2RlOjpVbmtub3du</config:config-item> + <config:config-item config:name="PrinterName" config:type="string">\\S20SLINNG\LP0000554-CLR-DR59-SNDI-Secretariat</config:config-item> + <config:config-item config:name="PrinterSetup" config:type="base64Binary">nin+/1xcUzIwU0xJTk5HXExQMDAwMDU1NC1DTFItRFI1OS1TTkRJLVNlY3JldGFyaWF0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAS09OSUNBIE1JTk9MVEEgVW5pdmVyc2FsIFBDTAAAAAAWAAEAuigAAAAAAAAEAAhSAAAEdAAAM1ROVwAAAAAKAFwAXABTADIAMABTAEwASQBOAE4ARwBcAEwAUAAwADAAMAAwADUANQA0AC0AQwBMAFIALQBEAFIANQA5AAAAAAABBAAB3ADUJw+/AAIBAAkAmgs0CGQAAQAHAFgCAgACAFgCAwAAAEEANAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAyCcAAFNQTFgBAAAAAAAAAPwL192wJwAAyCcAAFVQRF9PV04AAAAAAAAAAABQQ0xYTAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAkANAiaCysAKwArACsAADQImgsAAABMIAAArS0AAGUBNAiaCwA0CJoLAEwgAACtLQAAAQBkAAcAAQEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQEBAAABAQBJblRyYXkxAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEBAAABAQEBAAABAQBJblRyYXkyAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIBAAABAQEBAAABAQBJblRyYXkzAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMBAAABAQEBAAABAQBJblRyYXk0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQBAAABAQEBAAABAQBJblRyYXlMQ1QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOgDAAABAQEBAAABAQBJblRyYXlNYW51YWwAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAABAQEBAAABAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAAABAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAAABAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAAABAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAEAAQEBAAEAAQAAAAEAAA4BAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAwAEAAEBAAAAAAQAAAAAAAEAAQAAAAAAAAEBAAAAZAB9AAAEAQEABAEBAAEBAQAB/38AAOkDAQAA6QMBAAABAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEASAD/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAQABAAAAAAABAAAAAQAAAAEAAAABAAEAAQABAQAAAQAAAAEAAQABAQADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAQEAAAAAAQABAAAAAAEAAAEAAQAAAAAAAQAAAAABAAEAAQABAQAAAQAAAAEAAAABAAAAAAEBAAEAAQABAQAAAQAAAAAAAQABBQAAAAAAAAABAAAAAAAAAAEAAQAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQQByAGkAYQBsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAAAgAAAQEAZAABAQBkAAEAAP//AAABAAEAAAAAAAAAAQABAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQAAAAAAAAAAAAAAAAAAAAABAgBYAlgCUAMYAAEEAAAAAAAAAQAAAQAAAAEAAAABAQAAAAABAAABAQABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQABAAEAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEAAABfAgABQXJpYWwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABDb3VyaWVyIE5ldwAAAAAAAAAAAAAAAAAAAAAAAAAAAFRpbWVzIE5ldyBSb21hbgAAAAAAAAAAAAAAAAAAAAAAU3ltYm9sAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABXaW5nZGluZ3MAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQsXFBoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQXJpYWwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABDb3VyaWVyAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFRpbWVzIE5ldyBSb21hbgAAAAAAAAAAAAAAAAAAAAAAU3ltYm9sAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABXaW5nZGluZ3MAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAADpAQAAIwQAAGkFAAB2AgAAqgMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAQAAAAEBAEsBAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANAiaCwCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABzAG8AZgBmAGkAYwBlAC4AYgBpAG4AAAAAAAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAYAAAABAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEACQA0CJoLTCAAAK0tAAD//wAA//8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZAAAAAQAAAAAAAAAAAAAAAAAAAAZYREoAAAAABIAQ09NUEFUX0RVUExFWF9NT0RFFABEdXBsZXhNb2RlOjpMb25nRWRnZQ==</config:config-item> <config:config-item-map-indexed config:name="ForbiddenCharacters"> <config:config-item-map-entry> <config:config-item config:name="Language" config:type="string">zxx</config:config-item> @@ -542,9 +542,6 @@ <style:style style:name="ce2" style:family="table-cell" style:parent-style-name="Default"> <style:table-cell-properties fo:background-color="transparent"/> </style:style> - <style:style style:name="ce9" style:family="table-cell" style:parent-style-name="Default"> - <style:table-cell-properties fo:background-color="transparent" style:vertical-align="automatic"/> - </style:style> <style:style style:name="ce3" style:family="table-cell" style:parent-style-name="Default"> <style:table-cell-properties fo:background-color="transparent"/> <style:text-properties fo:color="#000000" style:font-name="Arial" fo:font-size="10pt" fo:language="en" fo:country="US" style:font-name-asian="Tahoma" style:font-size-asian="10pt" style:language-asian="en" style:country-asian="US" style:font-name-complex="Tahoma" style:font-size-complex="10pt" style:language-complex="en" style:country-complex="US"/> @@ -599,7 +596,7 @@ <text:p><text:sheet-name>???</text:sheet-name><text:s/>(<text:title>???</text:title>)</text:p> </style:region-left> <style:region-right> - <text:p><text:date style:data-style-name="N2" text:date-value="2019-07-23">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="11:14:41.465000000">00:00:00</text:time></text:p> + <text:p><text:date style:data-style-name="N2" text:date-value="2019-08-30">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="16:08:11.029000000">00:00:00</text:time></text:p> </style:region-right> </style:header> <style:header-left style:display="false"/> @@ -894,49 +891,27 @@ </table:table-row> <table:table-row table:style-name="ro1"> <table:table-cell table:style-name="ce2" office:value-type="string" calcext:value-type="string"> - <text:p>d:CodeDomain[not(ancestor::d:GridDimension) and r:ResponseCardinality[@maximumResponses='1'] and not(r:GenericOutputFormat/text()='checkbox')]</text:p> + <text:p>d:CodeDomain[not(ancestor::d:GridDimension)]</text:p> </table:table-cell> <table:table-cell table:style-name="ce2" office:value-type="string" calcext:value-type="string"> - <text:p>xf-select1</text:p> + <text:p>CodeDomain</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>Those CodeDomain elements (only one response and not of checkbox type) activate the xf-select1 driver.</text:p> + <text:p>Those CodeDomain elements activate the CodeDomaindriver.</text:p> </table:table-cell> </table:table-row> <table:table-row table:style-name="ro1"> <table:table-cell table:number-columns-repeated="3"/> </table:table-row> - <table:table-row table:style-name="ro1"> - <table:table-cell table:style-name="ce2" office:value-type="string" calcext:value-type="string"> - <text:p>d:CodeDomain[not(ancestor::d:GridDimension) and r:ResponseCardinality/@maximumResponses='1' and r:GenericOutputFormat/text()='checkbox']</text:p> - </table:table-cell> - <table:table-cell table:style-name="ce2" office:value-type="string" calcext:value-type="string"> - <text:p>xf-select</text:p> - </table:table-cell> - <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>Those CodeDomain elements (only one response and of checkbox type) activate the xf-select driver. It does seem odd but there is some dynamic behaviour added to prevent checking more than one box.</text:p> - </table:table-cell> - </table:table-row> - <table:table-row table:style-name="ro1"> - <table:table-cell table:style-name="ce9" office:value-type="string" calcext:value-type="string"> - <text:p>d:CodeDomain[not(ancestor::d:GridDimension) and not(r:ResponseCardinality/@maximumResponses='1')]</text:p> - </table:table-cell> - <table:table-cell table:style-name="ce2" office:value-type="string" calcext:value-type="string"> - <text:p>xf-select</text:p> - </table:table-cell> - <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>Those CodeDomain elements (no ResponseCardinality) activate the xf-select driver.</text:p> - </table:table-cell> - </table:table-row> <table:table-row table:style-name="ro1"> <table:table-cell table:style-name="ce2" office:value-type="string" calcext:value-type="string"> <text:p>d:NominalDomain</text:p> </table:table-cell> <table:table-cell table:style-name="ce2" office:value-type="string" calcext:value-type="string"> - <text:p>xf-select</text:p> + <text:p>BooleanDomain</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> - <text:p>The NominalDomain element activates the xf-select driver.</text:p> + <text:p>The NominalDomain element activates the BooleanDomain driver.</text:p> </table:table-cell> </table:table-row> <table:table-row table:style-name="ro1"> diff --git a/src/test/resources/ddi-to-xform/out.xhtml b/src/test/resources/ddi-to-xform/out.xhtml index ad5389acd..8d6c66010 100644 --- a/src/test/resources/ddi-to-xform/out.xhtml +++ b/src/test/resources/ddi-to-xform/out.xhtml @@ -2716,11 +2716,6 @@ <xf:label ref="label"/> <xf:value ref="value"/> </xf:itemset> - <xf:action ev:event="xforms-value-changed" - if="substring-after(instance('fr-form-instance')//READY,' ') ne ''"> - <xf:setvalue ref="instance('fr-form-instance')//READY" - value="substring-after(instance('fr-form-instance')//READY,' ')"/> - </xf:action> <xf:action ev:event="xforms-value-changed" if="not(xxf:evaluate-bind-property('d1e42-THEN-bind','relevant'))" iterate="instance('fr-form-instance')//d1e42-THEN//*[not(descendant::*) and not(ends-with(name(),'-Count'))]"> @@ -2869,11 +2864,6 @@ <xf:label ref="label"/> <xf:value ref="value"/> </xf:itemset> - <xf:action ev:event="xforms-value-changed" - if="substring-after(instance('fr-form-instance')//PET1,' ') ne ''"> - <xf:setvalue ref="instance('fr-form-instance')//PET1" - value="substring-after(instance('fr-form-instance')//PET1,' ')"/> - </xf:action> </xf:select> <xf:select id="PET2-control" name="PET2" @@ -2884,11 +2874,6 @@ <xf:label ref="label"/> <xf:value ref="value"/> </xf:itemset> - <xf:action ev:event="xforms-value-changed" - if="substring-after(instance('fr-form-instance')//PET2,' ') ne ''"> - <xf:setvalue ref="instance('fr-form-instance')//PET2" - value="substring-after(instance('fr-form-instance')//PET2,' ')"/> - </xf:action> </xf:select> <xf:select id="PET3-control" name="PET3" @@ -2899,11 +2884,6 @@ <xf:label ref="label"/> <xf:value ref="value"/> </xf:itemset> - <xf:action ev:event="xforms-value-changed" - if="substring-after(instance('fr-form-instance')//PET3,' ') ne ''"> - <xf:setvalue ref="instance('fr-form-instance')//PET3" - value="substring-after(instance('fr-form-instance')//PET3,' ')"/> - </xf:action> </xf:select> <xf:select id="PET4-control" name="PET4" @@ -2914,11 +2894,6 @@ <xf:label ref="label"/> <xf:value ref="value"/> </xf:itemset> - <xf:action ev:event="xforms-value-changed" - if="substring-after(instance('fr-form-instance')//PET4,' ') ne ''"> - <xf:setvalue ref="instance('fr-form-instance')//PET4" - value="substring-after(instance('fr-form-instance')//PET4,' ')"/> - </xf:action> </xf:select> </xhtml:div> <xf:output id="d12-SI-control" @@ -3821,11 +3796,6 @@ <xf:label ref="label"/> <xf:value ref="value"/> </xf:itemset> - <xf:action ev:event="xforms-value-changed" - if="substring-after(instance('fr-form-instance')//TRAVEL11,' ') ne ''"> - <xf:setvalue ref="instance('fr-form-instance')//TRAVEL11" - value="substring-after(instance('fr-form-instance')//TRAVEL11,' ')"/> - </xf:action> </xf:select> </xhtml:td> <xhtml:td align="center"> @@ -3838,11 +3808,6 @@ <xf:label ref="label"/> <xf:value ref="value"/> </xf:itemset> - <xf:action ev:event="xforms-value-changed" - if="substring-after(instance('fr-form-instance')//TRAVEL12,' ') ne ''"> - <xf:setvalue ref="instance('fr-form-instance')//TRAVEL12" - value="substring-after(instance('fr-form-instance')//TRAVEL12,' ')"/> - </xf:action> </xf:select> </xhtml:td> <xhtml:td align="center"> @@ -3855,11 +3820,6 @@ <xf:label ref="label"/> <xf:value ref="value"/> </xf:itemset> - <xf:action ev:event="xforms-value-changed" - if="substring-after(instance('fr-form-instance')//TRAVEL13,' ') ne ''"> - <xf:setvalue ref="instance('fr-form-instance')//TRAVEL13" - value="substring-after(instance('fr-form-instance')//TRAVEL13,' ')"/> - </xf:action> </xf:select> </xhtml:td> <xhtml:td align="center"> @@ -3872,11 +3832,6 @@ <xf:label ref="label"/> <xf:value ref="value"/> </xf:itemset> - <xf:action ev:event="xforms-value-changed" - if="substring-after(instance('fr-form-instance')//TRAVEL14,' ') ne ''"> - <xf:setvalue ref="instance('fr-form-instance')//TRAVEL14" - value="substring-after(instance('fr-form-instance')//TRAVEL14,' ')"/> - </xf:action> </xf:select> </xhtml:td> <xhtml:td align="center"> @@ -3889,11 +3844,6 @@ <xf:label ref="label"/> <xf:value ref="value"/> </xf:itemset> - <xf:action ev:event="xforms-value-changed" - if="substring-after(instance('fr-form-instance')//TRAVEL15,' ') ne ''"> - <xf:setvalue ref="instance('fr-form-instance')//TRAVEL15" - value="substring-after(instance('fr-form-instance')//TRAVEL15,' ')"/> - </xf:action> </xf:select> </xhtml:td> <xhtml:td align="center"> @@ -3906,11 +3856,6 @@ <xf:label ref="label"/> <xf:value ref="value"/> </xf:itemset> - <xf:action ev:event="xforms-value-changed" - if="substring-after(instance('fr-form-instance')//TRAVEL16,' ') ne ''"> - <xf:setvalue ref="instance('fr-form-instance')//TRAVEL16" - value="substring-after(instance('fr-form-instance')//TRAVEL16,' ')"/> - </xf:action> </xf:select> </xhtml:td> </xhtml:tr> @@ -3933,11 +3878,6 @@ <xf:label ref="label"/> <xf:value ref="value"/> </xf:itemset> - <xf:action ev:event="xforms-value-changed" - if="substring-after(instance('fr-form-instance')//TRAVEL21,' ') ne ''"> - <xf:setvalue ref="instance('fr-form-instance')//TRAVEL21" - value="substring-after(instance('fr-form-instance')//TRAVEL21,' ')"/> - </xf:action> </xf:select> </xhtml:td> <xhtml:td align="center"> @@ -3950,11 +3890,6 @@ <xf:label ref="label"/> <xf:value ref="value"/> </xf:itemset> - <xf:action ev:event="xforms-value-changed" - if="substring-after(instance('fr-form-instance')//TRAVEL22,' ') ne ''"> - <xf:setvalue ref="instance('fr-form-instance')//TRAVEL22" - value="substring-after(instance('fr-form-instance')//TRAVEL22,' ')"/> - </xf:action> </xf:select> </xhtml:td> <xhtml:td align="center"> @@ -3967,11 +3902,6 @@ <xf:label ref="label"/> <xf:value ref="value"/> </xf:itemset> - <xf:action ev:event="xforms-value-changed" - if="substring-after(instance('fr-form-instance')//TRAVEL23,' ') ne ''"> - <xf:setvalue ref="instance('fr-form-instance')//TRAVEL23" - value="substring-after(instance('fr-form-instance')//TRAVEL23,' ')"/> - </xf:action> </xf:select> </xhtml:td> <xhtml:td align="center"> @@ -3984,11 +3914,6 @@ <xf:label ref="label"/> <xf:value ref="value"/> </xf:itemset> - <xf:action ev:event="xforms-value-changed" - if="substring-after(instance('fr-form-instance')//TRAVEL24,' ') ne ''"> - <xf:setvalue ref="instance('fr-form-instance')//TRAVEL24" - value="substring-after(instance('fr-form-instance')//TRAVEL24,' ')"/> - </xf:action> </xf:select> </xhtml:td> <xhtml:td align="center"> @@ -4001,11 +3926,6 @@ <xf:label ref="label"/> <xf:value ref="value"/> </xf:itemset> - <xf:action ev:event="xforms-value-changed" - if="substring-after(instance('fr-form-instance')//TRAVEL25,' ') ne ''"> - <xf:setvalue ref="instance('fr-form-instance')//TRAVEL25" - value="substring-after(instance('fr-form-instance')//TRAVEL25,' ')"/> - </xf:action> </xf:select> </xhtml:td> <xhtml:td align="center"> @@ -4018,11 +3938,6 @@ <xf:label ref="label"/> <xf:value ref="value"/> </xf:itemset> - <xf:action ev:event="xforms-value-changed" - if="substring-after(instance('fr-form-instance')//TRAVEL26,' ') ne ''"> - <xf:setvalue ref="instance('fr-form-instance')//TRAVEL26" - value="substring-after(instance('fr-form-instance')//TRAVEL26,' ')"/> - </xf:action> </xf:select> </xhtml:td> </xhtml:tr> @@ -4045,11 +3960,6 @@ <xf:label ref="label"/> <xf:value ref="value"/> </xf:itemset> - <xf:action ev:event="xforms-value-changed" - if="substring-after(instance('fr-form-instance')//TRAVEL31,' ') ne ''"> - <xf:setvalue ref="instance('fr-form-instance')//TRAVEL31" - value="substring-after(instance('fr-form-instance')//TRAVEL31,' ')"/> - </xf:action> </xf:select> </xhtml:td> <xhtml:td align="center"> @@ -4062,11 +3972,6 @@ <xf:label ref="label"/> <xf:value ref="value"/> </xf:itemset> - <xf:action ev:event="xforms-value-changed" - if="substring-after(instance('fr-form-instance')//TRAVEL32,' ') ne ''"> - <xf:setvalue ref="instance('fr-form-instance')//TRAVEL32" - value="substring-after(instance('fr-form-instance')//TRAVEL32,' ')"/> - </xf:action> </xf:select> </xhtml:td> <xhtml:td align="center"> @@ -4079,11 +3984,6 @@ <xf:label ref="label"/> <xf:value ref="value"/> </xf:itemset> - <xf:action ev:event="xforms-value-changed" - if="substring-after(instance('fr-form-instance')//TRAVEL33,' ') ne ''"> - <xf:setvalue ref="instance('fr-form-instance')//TRAVEL33" - value="substring-after(instance('fr-form-instance')//TRAVEL33,' ')"/> - </xf:action> </xf:select> </xhtml:td> <xhtml:td align="center"> @@ -4096,11 +3996,6 @@ <xf:label ref="label"/> <xf:value ref="value"/> </xf:itemset> - <xf:action ev:event="xforms-value-changed" - if="substring-after(instance('fr-form-instance')//TRAVEL34,' ') ne ''"> - <xf:setvalue ref="instance('fr-form-instance')//TRAVEL34" - value="substring-after(instance('fr-form-instance')//TRAVEL34,' ')"/> - </xf:action> </xf:select> </xhtml:td> <xhtml:td align="center"> @@ -4113,11 +4008,6 @@ <xf:label ref="label"/> <xf:value ref="value"/> </xf:itemset> - <xf:action ev:event="xforms-value-changed" - if="substring-after(instance('fr-form-instance')//TRAVEL35,' ') ne ''"> - <xf:setvalue ref="instance('fr-form-instance')//TRAVEL35" - value="substring-after(instance('fr-form-instance')//TRAVEL35,' ')"/> - </xf:action> </xf:select> </xhtml:td> <xhtml:td align="center"> @@ -4130,11 +4020,6 @@ <xf:label ref="label"/> <xf:value ref="value"/> </xf:itemset> - <xf:action ev:event="xforms-value-changed" - if="substring-after(instance('fr-form-instance')//TRAVEL36,' ') ne ''"> - <xf:setvalue ref="instance('fr-form-instance')//TRAVEL36" - value="substring-after(instance('fr-form-instance')//TRAVEL36,' ')"/> - </xf:action> </xf:select> </xhtml:td> </xhtml:tr> @@ -4157,11 +4042,6 @@ <xf:label ref="label"/> <xf:value ref="value"/> </xf:itemset> - <xf:action ev:event="xforms-value-changed" - if="substring-after(instance('fr-form-instance')//TRAVEL41,' ') ne ''"> - <xf:setvalue ref="instance('fr-form-instance')//TRAVEL41" - value="substring-after(instance('fr-form-instance')//TRAVEL41,' ')"/> - </xf:action> </xf:select> </xhtml:td> <xhtml:td align="center"> @@ -4174,11 +4054,6 @@ <xf:label ref="label"/> <xf:value ref="value"/> </xf:itemset> - <xf:action ev:event="xforms-value-changed" - if="substring-after(instance('fr-form-instance')//TRAVEL42,' ') ne ''"> - <xf:setvalue ref="instance('fr-form-instance')//TRAVEL42" - value="substring-after(instance('fr-form-instance')//TRAVEL42,' ')"/> - </xf:action> </xf:select> </xhtml:td> <xhtml:td align="center"> @@ -4191,11 +4066,6 @@ <xf:label ref="label"/> <xf:value ref="value"/> </xf:itemset> - <xf:action ev:event="xforms-value-changed" - if="substring-after(instance('fr-form-instance')//TRAVEL43,' ') ne ''"> - <xf:setvalue ref="instance('fr-form-instance')//TRAVEL43" - value="substring-after(instance('fr-form-instance')//TRAVEL43,' ')"/> - </xf:action> </xf:select> </xhtml:td> <xhtml:td align="center"> @@ -4208,11 +4078,6 @@ <xf:label ref="label"/> <xf:value ref="value"/> </xf:itemset> - <xf:action ev:event="xforms-value-changed" - if="substring-after(instance('fr-form-instance')//TRAVEL44,' ') ne ''"> - <xf:setvalue ref="instance('fr-form-instance')//TRAVEL44" - value="substring-after(instance('fr-form-instance')//TRAVEL44,' ')"/> - </xf:action> </xf:select> </xhtml:td> <xhtml:td align="center"> @@ -4225,11 +4090,6 @@ <xf:label ref="label"/> <xf:value ref="value"/> </xf:itemset> - <xf:action ev:event="xforms-value-changed" - if="substring-after(instance('fr-form-instance')//TRAVEL45,' ') ne ''"> - <xf:setvalue ref="instance('fr-form-instance')//TRAVEL45" - value="substring-after(instance('fr-form-instance')//TRAVEL45,' ')"/> - </xf:action> </xf:select> </xhtml:td> <xhtml:td align="center"> @@ -4242,11 +4102,6 @@ <xf:label ref="label"/> <xf:value ref="value"/> </xf:itemset> - <xf:action ev:event="xforms-value-changed" - if="substring-after(instance('fr-form-instance')//TRAVEL46,' ') ne ''"> - <xf:setvalue ref="instance('fr-form-instance')//TRAVEL46" - value="substring-after(instance('fr-form-instance')//TRAVEL46,' ')"/> - </xf:action> </xf:select> </xhtml:td> </xhtml:tr> From 677932a4c51f9c547ecbd083957872df211324c7 Mon Sep 17 00:00:00 2001 From: BulotF <francois.bulot@insee.fr> Date: Tue, 3 Sep 2019 12:36:03 +0200 Subject: [PATCH 086/439] enojs : factorize question drivers --- src/main/resources/xslt/outputs/js/models.xsl | 363 +++--------------- .../transformations/ddi2js/ddi2js-fixed.xsl | 149 +++++++ 2 files changed, 195 insertions(+), 317 deletions(-) diff --git a/src/main/resources/xslt/outputs/js/models.xsl b/src/main/resources/xslt/outputs/js/models.xsl index b333a5b5e..8bf7b4cba 100644 --- a/src/main/resources/xslt/outputs/js/models.xsl +++ b/src/main/resources/xslt/outputs/js/models.xsl @@ -41,8 +41,6 @@ </xsl:apply-templates> </xsl:template> - - <xsl:template match="ResponseElement" mode="model"> <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="finding"/> @@ -86,139 +84,78 @@ <xd:doc> <xd:desc> - <xd:p>Match on Module driver.</xd:p> + <xd:p>Match on Module and SubModule drivers.</xd:p> </xd:desc> </xd:doc> - <xsl:template match="Module" mode="model"> + <xsl:template match="Module | SubModule" mode="model"> <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="languages" tunnel="yes"/> + <xsl:variable name="id" select="enojs:get-name($source-context)"/> - <xsl:variable name="label" select="enojs:get-label($source-context, $languages[1])"/> - - <xsl:variable name="componentType-Sequence" select="'Sequence'"/> - - <xsl:variable name="formulaReadOnly" select="enojs:get-readonly-ancestors($source-context)" as="xs:string*"/> - <xsl:variable name="formulaRelevant" select="enojs:get-relevant-ancestors($source-context)" as="xs:string*"/> - <xsl:variable name="variablesReadOnly" select="enojs:get-readonly-ancestors-variables($source-context)" as="xs:string*"/> - <xsl:variable name="variablesRelevant" select="enojs:get-relevant-ancestors-variables($source-context)" as="xs:string*"/> - - <xsl:variable name="declarations" select="enojs:getInstructionForQuestion($source-context,.)" as="node()*" /> - - <xsl:variable name="filterCondition" select="enojs:createLambdaExpression( - ., - $formulaReadOnly, - $formulaRelevant, - $variablesReadOnly, - $variablesRelevant - )"/> + <xsl:variable name="componentType-Sequence"> + <xsl:choose> + <xsl:when test="self::Module"><xsl:value-of select="'Sequence'"/></xsl:when> + <xsl:when test="self::SubModule"><xsl:value-of select="'Subsequence'"/></xsl:when> + </xsl:choose> + </xsl:variable> <components xsi:type="{$componentType-Sequence}" componentType="{$componentType-Sequence}" id="{$id}"> - <label><xsl:value-of select="$label"/></label> - <xsl:copy-of select="$declarations"/> - <xsl:copy-of select="$filterCondition"/> - + <label><xsl:value-of select="enojs:get-label($source-context, $languages[1])"/></label> + <xsl:copy-of select="enojs:getInstructionForQuestion($source-context,.)"/> + <xsl:copy-of select="enojs:get-global-filter($source-context)"/> <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> <xsl:with-param name="driver" select="." tunnel="yes"/> </xsl:apply-templates> </components> </xsl:template> - - <xd:doc> - <xd:desc> - <xd:p>Match on SubModule driver.</xd:p> - </xd:desc> - </xd:doc> - <xsl:template match="SubModule" mode="model"> + + <xsl:template match="SingleResponseQuestion | MultipleQuestion" mode="model"> <xsl:param name="source-context" as="item()" tunnel="yes"/> - <xsl:param name="languages" tunnel="yes"/> - <xsl:variable name="id" select="enojs:get-name($source-context)"/> - <xsl:variable name="label" select="enojs:get-label($source-context, $languages[1])"/> - - <xsl:variable name="componentType-Subsequence" select="'Subsequence'"/> - - <xsl:variable name="formulaReadOnly" select="enojs:get-readonly-ancestors($source-context)" as="xs:string*"/> - <xsl:variable name="formulaRelevant" select="enojs:get-relevant-ancestors($source-context)" as="xs:string*"/> - <xsl:variable name="variablesReadOnly" select="enojs:get-readonly-ancestors-variables($source-context)" as="xs:string*"/> - <xsl:variable name="variablesRelevant" select="enojs:get-relevant-ancestors-variables($source-context)" as="xs:string*"/> - <xsl:variable name="declarations" select="enojs:getInstructionForQuestion($source-context,.)" as="node()*" /> - - <xsl:variable name="filterCondition" select="enojs:createLambdaExpression( - ., - $formulaReadOnly, - $formulaRelevant, - $variablesReadOnly, - $variablesRelevant - )"/> - - <components xsi:type="{$componentType-Subsequence}" componentType="{$componentType-Subsequence}" id="{$id}"> - <label><xsl:value-of select="$label"/></label> - <xsl:copy-of select="$declarations"/> - <xsl:copy-of select="$filterCondition"/> - - <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> - <xsl:with-param name="driver" select="." tunnel="yes"/> - </xsl:apply-templates> - </components> + <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> + <xsl:with-param name="driver" select="." tunnel="yes"/> + <xsl:with-param name="idQuestion" select="enojs:get-name($source-context)" tunnel="yes"/> + <xsl:with-param name="questionName" select="lower-case(enojs:get-question-name($source-context,$languages[1]))" tunnel="yes"/> + <xsl:with-param name="labelQuestion" select="enojs:get-label($source-context, $languages[1])" tunnel="yes"/> + <xsl:with-param name="typeOfQuestion" select="self::*/name()" tunnel="yes"/> + <xsl:with-param name="declarations" select="enojs:getInstructionForQuestion($source-context,.)" as="node()*" tunnel="yes"/> + <xsl:with-param name="filterCondition" select="enojs:get-global-filter($source-context)" tunnel="yes"/> + </xsl:apply-templates> </xsl:template> - <xsl:template match="SingleResponseQuestion" mode="model"> - <xsl:param name="source-context" as="item()" tunnel="yes"/> - <xsl:call-template name="addQuestionArguments"> - <xsl:with-param name="source-context" select="$source-context"/> - <xsl:with-param name="typeOfQuestion" select="'SingleResponseQuestion'"/> - </xsl:call-template> - </xsl:template> - <xsl:template match="MultipleQuestion" mode="model"> - <xsl:param name="source-context" as="item()" tunnel="yes"/> - <xsl:call-template name="addQuestionArguments"> - <xsl:with-param name="source-context" select="$source-context"/> - <xsl:with-param name="typeOfQuestion" select="'MultipleQuestion'"/> - </xsl:call-template> - </xsl:template> <xsl:template match="MultipleChoiceQuestion" mode="model"> <xsl:param name="source-context" as="item()" tunnel="yes"/> - - <xsl:call-template name="addQuestionArguments"> - <xsl:with-param name="source-context" select="$source-context"/> - <xsl:with-param name="typeOfQuestion" select="'MultipleChoiceQuestion'"/> - </xsl:call-template> + + <components xsi:type="CheckboxGroup" componentType="CheckboxGroup" id="{$idQuestion}"> + <label><xsl:value-of select="enojs:get-label($source-context, $languages[1])"/></label> + <xsl:copy-of select="enojs:getInstructionForQuestion($source-context,.)"/> + <xsl:copy-of select="enojs:get-global-filter($source-context)"/> + <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> + <xsl:with-param name="driver" select="." tunnel="yes"/> + <xsl:with-param name="idQuestion" select="enojs:get-name($source-context)" tunnel="yes"/> + <xsl:with-param name="questionName" select="lower-case(enojs:get-question-name($source-context,$languages[1]))" tunnel="yes"/> + <xsl:with-param name="labelQuestion" select="enojs:get-label($source-context, $languages[1])" tunnel="yes"/> + <xsl:with-param name="typeOfQuestion" select="self::*/name()" tunnel="yes"/> + <xsl:with-param name="declarations" select="enojs:getInstructionForQuestion($source-context,.)" as="node()*" tunnel="yes"/> + <xsl:with-param name="filterCondition" select="enojs:get-global-filter($source-context)" tunnel="yes"/> + </xsl:apply-templates> + </components> </xsl:template> <xsl:template match="Table | TableLoop" mode="model"> <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="languages" tunnel="yes"/> - <xsl:variable name="questionName" select="enojs:get-question-name($source-context,$languages[1])"/> + <xsl:variable name="idQuestion" select="enojs:get-name($source-context)"/> - - <xsl:variable name="componentType-Table" select="'Table'"/> - - <xsl:variable name="formulaReadOnly" select="enojs:get-readonly-ancestors($source-context)" as="xs:string*"/> - <xsl:variable name="formulaRelevant" select="enojs:get-relevant-ancestors($source-context)" as="xs:string*"/> - - <xsl:variable name="variablesReadOnly" select="enojs:get-readonly-ancestors-variables($source-context)" as="xs:string*"/> - <xsl:variable name="variablesRelevant" select="enojs:get-relevant-ancestors-variables($source-context)" as="xs:string*"/> - - <xsl:variable name="declarations" select="enojs:getInstructionForQuestion($source-context,.)" as="node()*" /> - <xsl:variable name="labelQuestion" select="enojs:get-label($source-context, $languages[1])"/> - - <xsl:variable name="filterCondition" select="enojs:createLambdaExpression( - ., - $formulaReadOnly, - $formulaRelevant, - $variablesReadOnly, - $variablesRelevant - )"/> - + <xsl:variable name="componentType" select="'Table'"/> <xsl:variable name="mandatory" select="enojs:is-required($source-context)" as="xs:boolean"/> - <xsl:variable name="nbMinimumLines" select="enojs:get-minimum-lines($source-context)"/> <xsl:variable name="nbMaximumLines" select="enojs:get-maximum-lines($source-context)"/> - <components xsi:type="{$componentType-Table}" componentType="{$componentType-Table}" id="{$idQuestion}" positioning="HORIZONTAL" mandatory="{$mandatory}"> - <label><xsl:value-of select="$labelQuestion"/></label> - <xsl:copy-of select="$declarations"/> - <xsl:copy-of select="$filterCondition"/> + <components xsi:type="{$componentType}" componentType="{$componentType}" id="{$idQuestion}" positioning="HORIZONTAL" mandatory="{$mandatory}"> + <label><xsl:value-of select="enojs:get-label($source-context, $languages[1])"/></label> + <xsl:copy-of select="enojs:getInstructionForQuestion($source-context,.)"/> + <xsl:copy-of select="enojs:get-global-filter($source-context)"/> <xsl:for-each select="enojs:get-header-lines($source-context)"> <cells type="header"> @@ -228,7 +165,6 @@ <xsl:with-param name="typeOfAncestor" select="'table'" tunnel="yes"/> </xsl:apply-templates> </cells> - </xsl:for-each> <xsl:for-each select="enojs:get-body-lines($source-context)"> @@ -237,7 +173,7 @@ <xsl:with-param name="ancestorTable" select="'line'" tunnel="yes"/> <xsl:with-param name="typeOfAncestor" select="'table'" tunnel="yes"/> <xsl:with-param name="position" select="position()" tunnel="yes"/> - <xsl:with-param name="questionName" select="$questionName" tunnel="yes"/> + <xsl:with-param name="questionName" select="enojs:get-question-name($source-context,$languages[1])" tunnel="yes"/> </xsl:apply-templates> </cells> </xsl:for-each> @@ -246,7 +182,6 @@ <lines min="{$nbMinimumLines}" max="{$nbMaximumLines}"/> </xsl:if> </components> - </xsl:template> <xd:doc> @@ -337,60 +272,6 @@ </xsl:template> - <xsl:template name="addQuestionArguments"> - <xsl:param name="source-context"/> - <xsl:param name="languages" tunnel="yes"/> - <xsl:param name="typeOfQuestion"/> - - <xsl:variable name="questionName" select="enojs:get-question-name($source-context,$languages[1])"/> - <xsl:variable name="idQuestion" select="enojs:get-name($source-context)"/> - - <xsl:variable name="formulaReadOnly" select="enojs:get-readonly-ancestors($source-context)" as="xs:string*"/> - <xsl:variable name="formulaRelevant" select="enojs:get-relevant-ancestors($source-context)" as="xs:string*"/> - - <xsl:variable name="variablesReadOnly" select="enojs:get-readonly-ancestors-variables($source-context)" as="xs:string*"/> - <xsl:variable name="variablesRelevant" select="enojs:get-relevant-ancestors-variables($source-context)" as="xs:string*"/> - - <xsl:variable name="declarations" select="enojs:getInstructionForQuestion($source-context,.)" as="node()*" /> - <xsl:variable name="labelQuestion" select="enojs:get-label($source-context, $languages[1])"/> - - <xsl:variable name="filterCondition" select="enojs:createLambdaExpression( - ., - $formulaReadOnly, - $formulaRelevant, - $variablesReadOnly, - $variablesRelevant - )"/> - - <xsl:if test="$typeOfQuestion='MultipleChoiceQuestion'"> - <components xsi:type="CheckboxGroup" componentType="CheckboxGroup" id="{$idQuestion}"> - <label><xsl:value-of select="$labelQuestion"/></label> - <xsl:copy-of select="$declarations"/> - <xsl:copy-of select="$filterCondition"/> - <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> - <xsl:with-param name="driver" select="." tunnel="yes"/> - <xsl:with-param name="typeOfQuestion" select="$typeOfQuestion" tunnel="yes"/> - <xsl:with-param name="idQuestion" select="$idQuestion" tunnel="yes"/> - <xsl:with-param name="questionName" select="lower-case($questionName)" tunnel="yes"/> - <xsl:with-param name="labelQuestion" select="$labelQuestion" tunnel="yes"/> - <xsl:with-param name="declarations" select="$declarations" as="node()*" tunnel="yes"/> - <xsl:with-param name="filterCondition" select="$filterCondition" tunnel="yes"/> - </xsl:apply-templates> - </components> - </xsl:if> - <xsl:if test="$idQuestion != '' and $typeOfQuestion!='MultipleChoiceQuestion'"> - <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> - <xsl:with-param name="driver" select="." tunnel="yes"/> - <xsl:with-param name="typeOfQuestion" select="$typeOfQuestion" tunnel="yes"/> - <xsl:with-param name="idQuestion" select="$idQuestion" tunnel="yes"/> - <xsl:with-param name="questionName" select="lower-case($questionName)" tunnel="yes"/> - <xsl:with-param name="labelQuestion" select="$labelQuestion" tunnel="yes"/> - <xsl:with-param name="declarations" select="$declarations" as="node()*" tunnel="yes"/> - <xsl:with-param name="filterCondition" select="$filterCondition" tunnel="yes"/> - </xsl:apply-templates> - </xsl:if> - </xsl:template> - <xd:doc> <xd:desc> <xd:p>Match on NumericDomain driver.</xd:p> @@ -861,7 +742,7 @@ <!-- Default value : COMMENT --> <xsl:otherwise><xsl:value-of select="'COMMENT'"/></xsl:otherwise> </xsl:choose> - </xsl:variable> select="upper-case(enojs:get-format($source-context))" + </xsl:variable> <xsl:variable name="instructionLabel" select="enojs:get-label($source-context, $languages[1])"/> <xsl:variable name="instructionFormatMaj" select="concat(upper-case(substring($instructionFormat,1,1)), substring($instructionFormat,2))" as="xs:string"/> @@ -963,158 +844,6 @@ </response> </xsl:template> - <xsl:function name="enojs:createLambdaExpression"> - <xsl:param name="source-context" as="item()"/> - <xsl:param name="formulaReadOnly" as="xs:string*"/> - <xsl:param name="formulaRelevant" as="xs:string*"/> - <xsl:param name="variablesReadOnly" as="xs:string*"/> - <xsl:param name="variablesRelevant" as="xs:string*"/> - <!-- - <xsl:variable name="formulaReadOnly1" as="xs:string*" select="tokenize('$SUM_EXPENSES$!=2,$genoux$!=5',',')"/> - <xsl:variable name="variablesReadOnly1" select="'SUM_EXPENSES'" as="xs:string*"/> - --> - <xsl:variable name="variableFilterId" as="xs:string*"> - <xsl:for-each select="distinct-values($variablesRelevant)"> - <xsl:sequence select="."/> - </xsl:for-each> - <xsl:for-each select="distinct-values($variablesReadOnly)"> - <xsl:sequence select="."/> - </xsl:for-each> - </xsl:variable> - <xsl:variable name="variableFilterName" as="xs:string*"> - <xsl:for-each select="distinct-values($variablesRelevant)"> - <xsl:sequence select="enojs:get-variable-business-name($source-context,.)"/> - </xsl:for-each> - <xsl:for-each select="distinct-values($variablesReadOnly)"> - <xsl:sequence select="."/> - </xsl:for-each> - </xsl:variable> - <xsl:variable name="variablesId" as="xs:string*"> - <xsl:for-each select="distinct-values($variableFilterId)"> - <xsl:sequence select="."/> - </xsl:for-each> - </xsl:variable> - <xsl:variable name="variablesName"> - <xsl:for-each select="distinct-values($variableFilterName)"> - <xsl:if test="position()!=1"> - <xsl:value-of select="','"/> - </xsl:if> - <xsl:value-of select="."/> - </xsl:for-each> - </xsl:variable> - - <conditionFilter> - <!--Expression VTL : #if(condition)je suis true#{else}je suis false#end--> - <!-- Caution for encodage : # -> # { -> { } -> } --> - <xsl:variable name="if" select="'#if'"/> - <xsl:variable name="else" select="'#{else}'"/> - <xsl:variable name="ifEnd" select="'#end'"/> - <xsl:choose> - <!--<xsl:when test="$variablesName=''"> - <xsl:value-of select="'() => true ? ''normal'' : '''''"/> guillemet autour de normal ? - </xsl:when>--> - <xsl:when test="$formulaRelevant!='' and $formulaReadOnly!=''"> - <xsl:variable name="initial-relevant-ancestors"> - <xsl:for-each select="$formulaRelevant"> - <xsl:value-of select="concat('(',.,')')"/> - <xsl:if test="position()!=last()"> - <xsl:value-of select="' && '"/><!-- "||" = "or"--> - </xsl:if> - </xsl:for-each> - </xsl:variable> - <xsl:variable name="relevant-condition"> - <xsl:call-template name="replaceVariablesInFormula"> - <xsl:with-param name="source-context" select="$source-context" as="item()" tunnel="yes"/> - <xsl:with-param name="formula" select="$initial-relevant-ancestors"/> - <xsl:with-param name="variables" select="$variablesId"/> - </xsl:call-template> - </xsl:variable> - <xsl:variable name="initial-readonly-ancestors"> - <xsl:for-each select="$formulaReadOnly"> - <xsl:value-of select="concat('(',.,')')"/> - <xsl:if test="position()!=last()"> - <xsl:value-of select="' || '"/> - </xsl:if> - </xsl:for-each> - </xsl:variable> - <xsl:variable name="readonly-condition"> - <xsl:call-template name="replaceVariablesInFormula"> - <xsl:with-param name="source-context" select="$source-context" as="item()" tunnel="yes"/> - <xsl:with-param name="formula" select="$initial-readonly-ancestors"/> - <xsl:with-param name="variables" select="$variablesId"/> - </xsl:call-template> - </xsl:variable> - <!-- replace "not -> "!", " and " -> "&&", " or " -> "||", "=" -> "==" --> - <xsl:variable name="returned-relevant-condition" select="replace(replace(replace(replace($relevant-condition,'not','!'),'\sand\s','&&'),'\sor\s',' || '),'\s=\s',' == ')"/> - <xsl:variable name="returned-readonly-condition" select="replace(replace(replace(replace($readonly-condition,'not','!'),'\sand\s','&&'),'\sor\s',' || '),'\s=\s',' == ')"/> - - <!--<xsl:value-of select="concat('(',$variablesName,') =>', $readonly-condition,'toto',$relevant-condition,' ? ''normal'' : ''''')"/>--> - <!-- les trois possibles : caché (hidden) , gris (readOnly), affiché (normal) --> - <!-- si relevant - alors - si readonly, - alors readonly - sinon normal - sinon hidden--> - <xsl:value-of select="concat( - $if,'(',$returned-relevant-condition,')', - $if,'(',$returned-readonly-condition,')readonly', - $else,'normal',$ifEnd,')', - $else,'hidden',$ifEnd - )"/> - </xsl:when> - <xsl:when test="$formulaRelevant!=''"> - <xsl:variable name="initial-relevant-ancestors"> - <xsl:for-each select="$formulaRelevant"> - <xsl:value-of select="concat('(',.,')')"/> - <xsl:if test="position()!=last()"> - <xsl:value-of select="' && '"/> - </xsl:if> - </xsl:for-each> - </xsl:variable> - <xsl:variable name="relevant-condition"> - <xsl:call-template name="replaceVariablesInFormula"> - <xsl:with-param name="source-context" select="$source-context" as="item()" tunnel="yes"/> - <xsl:with-param name="formula" select="$initial-relevant-ancestors"/> - <xsl:with-param name="variables" select="$variablesId"/> - </xsl:call-template> - </xsl:variable> - <xsl:variable name="returned-relevant-condition" select="replace(replace(replace(replace($relevant-condition,'not','!'),'\sand\s',' && '),'\sor\s',' || '),'\s=\s',' == ')"/> - - <xsl:value-of select="concat($if,'(', $returned-relevant-condition,')normal',$else,'hidden',$ifEnd)"/> - - <!-- pas de gris, on affiche (normal) ou pas (hidden) --> - </xsl:when> - <xsl:when test="$formulaReadOnly!=''"> - <xsl:variable name="initial-readonly-ancestors"> - <xsl:for-each select="$formulaReadOnly"> - <xsl:value-of select="concat('(',.,')')"/> - <xsl:if test="position()!=last()"> - <xsl:value-of select="' || '"/> - </xsl:if> - </xsl:for-each> - </xsl:variable> - <xsl:variable name="readonly-condition"> - <xsl:call-template name="replaceVariablesInFormula"> - <xsl:with-param name="source-context" select="$source-context" as="item()" tunnel="yes"/> - <xsl:with-param name="formula" select="$initial-readonly-ancestors"/> - <xsl:with-param name="variables" select="$variablesId"/> - </xsl:call-template> - </xsl:variable> - <xsl:variable name="returned-readonly-condition" select="replace(replace(replace(replace($readonly-condition,'not','!'),'\sand\s',' && '),'\sor\s',' || '),'\s=\s',' == ')"/> - <xsl:value-of select="concat($if,'(',$returned-readonly-condition,')readonly',$else,'normal',$ifEnd)"/> - <!-- on ne cache pas , gris (readOnly) ou affiché (normal)--> - </xsl:when> - - <xsl:otherwise> - <xsl:value-of select="'normal'"/> - </xsl:otherwise> - </xsl:choose> - - </conditionFilter> - </xsl:function> - - <xd:doc> <xd:desc> <xd:p>Template named:replaceVariablesInFormula.</xd:p> diff --git a/src/main/resources/xslt/transformations/ddi2js/ddi2js-fixed.xsl b/src/main/resources/xslt/transformations/ddi2js/ddi2js-fixed.xsl index 5ab43f390..786afcb87 100644 --- a/src/main/resources/xslt/transformations/ddi2js/ddi2js-fixed.xsl +++ b/src/main/resources/xslt/transformations/ddi2js/ddi2js-fixed.xsl @@ -129,4 +129,153 @@ <xsl:sequence select="enoddi:get-instructions-by-format($context,'footnote') | enoddi:get-next-filter-description($context)"/> </xsl:function> + + <xsl:function name="enojs:get-global-filter"> + <xsl:param name="context" as="item()"/> + + <xsl:variable name="formulaReadOnly" select="enoddi:get-readonly-ancestors($context)" as="xs:string*"/> + <xsl:variable name="formulaRelevant" select="enoddi:get-relevant-ancestors($context)" as="xs:string*"/> + <xsl:variable name="variablesReadOnly" select="enoddi:get-readonly-ancestors-variables($context)" as="xs:string*"/> + <xsl:variable name="variablesRelevant" select="enoddi:get-relevant-ancestors-variables($context)" as="xs:string*"/> + + <xsl:variable name="variableFilterId" as="xs:string*"> + <xsl:for-each select="distinct-values($variablesRelevant)"> + <xsl:sequence select="."/> + </xsl:for-each> + <xsl:for-each select="distinct-values($variablesReadOnly)"> + <xsl:sequence select="."/> + </xsl:for-each> + </xsl:variable> + <xsl:variable name="variableFilterName" as="xs:string*"> + <xsl:for-each select="distinct-values($variablesRelevant)"> + <xsl:sequence select="enojs:get-variable-business-name($source-context,.)"/> + </xsl:for-each> + <xsl:for-each select="distinct-values($variablesReadOnly)"> + <xsl:sequence select="."/> + </xsl:for-each> + </xsl:variable> + <xsl:variable name="variablesId" as="xs:string*"> + <xsl:for-each select="distinct-values($variableFilterId)"> + <xsl:sequence select="."/> + </xsl:for-each> + </xsl:variable> + <xsl:variable name="variablesName"> + <xsl:for-each select="distinct-values($variableFilterName)"> + <xsl:if test="position()!=1"> + <xsl:value-of select="','"/> + </xsl:if> + <xsl:value-of select="."/> + </xsl:for-each> + </xsl:variable> + + <conditionFilter> + <!--Expression VTL : #if(condition)je suis true#{else}je suis false#end--> + <!-- Caution for encodage : # -> # { -> { } -> } --> + <xsl:variable name="if" select="'#if'"/> + <xsl:variable name="else" select="'#{else}'"/> + <xsl:variable name="ifEnd" select="'#end'"/> + <xsl:choose> + <!--<xsl:when test="$variablesName=''"> + <xsl:value-of select="'() => true ? ''normal'' : '''''"/> guillemet autour de normal ? + </xsl:when>--> + <xsl:when test="$formulaRelevant!='' and $formulaReadOnly!=''"> + <xsl:variable name="initial-relevant-ancestors"> + <xsl:for-each select="$formulaRelevant"> + <xsl:value-of select="concat('(',.,')')"/> + <xsl:if test="position()!=last()"> + <xsl:value-of select="' && '"/><!-- "||" = "or"--> + </xsl:if> + </xsl:for-each> + </xsl:variable> + <xsl:variable name="relevant-condition"> + <xsl:call-template name="replaceVariablesInFormula"> + <xsl:with-param name="source-context" select="$source-context" as="item()" tunnel="yes"/> + <xsl:with-param name="formula" select="$initial-relevant-ancestors"/> + <xsl:with-param name="variables" select="$variablesId"/> + </xsl:call-template> + </xsl:variable> + <xsl:variable name="initial-readonly-ancestors"> + <xsl:for-each select="$formulaReadOnly"> + <xsl:value-of select="concat('(',.,')')"/> + <xsl:if test="position()!=last()"> + <xsl:value-of select="' || '"/> + </xsl:if> + </xsl:for-each> + </xsl:variable> + <xsl:variable name="readonly-condition"> + <xsl:call-template name="replaceVariablesInFormula"> + <xsl:with-param name="source-context" select="$source-context" as="item()" tunnel="yes"/> + <xsl:with-param name="formula" select="$initial-readonly-ancestors"/> + <xsl:with-param name="variables" select="$variablesId"/> + </xsl:call-template> + </xsl:variable> + <!-- replace "not -> "!", " and " -> "&&", " or " -> "||", "=" -> "==" --> + <xsl:variable name="returned-relevant-condition" select="replace(replace(replace(replace($relevant-condition,'not','!'),'\sand\s','&&'),'\sor\s',' || '),'\s=\s',' == ')"/> + <xsl:variable name="returned-readonly-condition" select="replace(replace(replace(replace($readonly-condition,'not','!'),'\sand\s','&&'),'\sor\s',' || '),'\s=\s',' == ')"/> + + <!--<xsl:value-of select="concat('(',$variablesName,') =>', $readonly-condition,'toto',$relevant-condition,' ? ''normal'' : ''''')"/>--> + <!-- les trois possibles : caché (hidden) , gris (readOnly), affiché (normal) --> + <!-- si relevant + alors + si readonly, + alors readonly + sinon normal + sinon hidden--> + <xsl:value-of select="concat( + $if,'(',$returned-relevant-condition,')', + $if,'(',$returned-readonly-condition,')readonly', + $else,'normal',$ifEnd,')', + $else,'hidden',$ifEnd + )"/> + </xsl:when> + <xsl:when test="$formulaRelevant!=''"> + <xsl:variable name="initial-relevant-ancestors"> + <xsl:for-each select="$formulaRelevant"> + <xsl:value-of select="concat('(',.,')')"/> + <xsl:if test="position()!=last()"> + <xsl:value-of select="' && '"/> + </xsl:if> + </xsl:for-each> + </xsl:variable> + <xsl:variable name="relevant-condition"> + <xsl:call-template name="replaceVariablesInFormula"> + <xsl:with-param name="source-context" select="$source-context" as="item()" tunnel="yes"/> + <xsl:with-param name="formula" select="$initial-relevant-ancestors"/> + <xsl:with-param name="variables" select="$variablesId"/> + </xsl:call-template> + </xsl:variable> + <xsl:variable name="returned-relevant-condition" select="replace(replace(replace(replace($relevant-condition,'not','!'),'\sand\s',' && '),'\sor\s',' || '),'\s=\s',' == ')"/> + + <xsl:value-of select="concat($if,'(', $returned-relevant-condition,')normal',$else,'hidden',$ifEnd)"/> + + <!-- pas de gris, on affiche (normal) ou pas (hidden) --> + </xsl:when> + <xsl:when test="$formulaReadOnly!=''"> + <xsl:variable name="initial-readonly-ancestors"> + <xsl:for-each select="$formulaReadOnly"> + <xsl:value-of select="concat('(',.,')')"/> + <xsl:if test="position()!=last()"> + <xsl:value-of select="' || '"/> + </xsl:if> + </xsl:for-each> + </xsl:variable> + <xsl:variable name="readonly-condition"> + <xsl:call-template name="replaceVariablesInFormula"> + <xsl:with-param name="source-context" select="$source-context" as="item()" tunnel="yes"/> + <xsl:with-param name="formula" select="$initial-readonly-ancestors"/> + <xsl:with-param name="variables" select="$variablesId"/> + </xsl:call-template> + </xsl:variable> + <xsl:variable name="returned-readonly-condition" select="replace(replace(replace(replace($readonly-condition,'not','!'),'\sand\s',' && '),'\sor\s',' || '),'\s=\s',' == ')"/> + <xsl:value-of select="concat($if,'(',$returned-readonly-condition,')readonly',$else,'normal',$ifEnd)"/> + <!-- on ne cache pas , gris (readOnly) ou affiché (normal)--> + </xsl:when> + + <xsl:otherwise> + <xsl:value-of select="'normal'"/> + </xsl:otherwise> + </xsl:choose> + </conditionFilter> + </xsl:function> + </xsl:stylesheet> From cf92f9a18a85fb7ab48e3085d3a2ef85b5e89b55 Mon Sep 17 00:00:00 2001 From: BulotF <francois.bulot@insee.fr> Date: Tue, 3 Sep 2019 13:07:55 +0200 Subject: [PATCH 087/439] question drivers for enojs --- src/main/resources/xslt/outputs/js/models.xsl | 24 +- .../transformations/ddi2js/ddi2js-fixed.xsl | 209 +++++++++--------- 2 files changed, 118 insertions(+), 115 deletions(-) diff --git a/src/main/resources/xslt/outputs/js/models.xsl b/src/main/resources/xslt/outputs/js/models.xsl index 8bf7b4cba..13979b1d7 100644 --- a/src/main/resources/xslt/outputs/js/models.xsl +++ b/src/main/resources/xslt/outputs/js/models.xsl @@ -102,7 +102,7 @@ <components xsi:type="{$componentType-Sequence}" componentType="{$componentType-Sequence}" id="{$id}"> <label><xsl:value-of select="enojs:get-label($source-context, $languages[1])"/></label> <xsl:copy-of select="enojs:getInstructionForQuestion($source-context,.)"/> - <xsl:copy-of select="enojs:get-global-filter($source-context)"/> + <conditionFilter><xsl:value-of select="enojs:get-global-filter($source-context)"/></conditionFilter> <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> <xsl:with-param name="driver" select="." tunnel="yes"/> </xsl:apply-templates> @@ -111,6 +111,7 @@ <xsl:template match="SingleResponseQuestion | MultipleQuestion" mode="model"> <xsl:param name="source-context" as="item()" tunnel="yes"/> + <xsl:param name="languages" tunnel="yes"/> <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> <xsl:with-param name="driver" select="." tunnel="yes"/> @@ -125,14 +126,17 @@ <xsl:template match="MultipleChoiceQuestion" mode="model"> <xsl:param name="source-context" as="item()" tunnel="yes"/> + <xsl:param name="languages" tunnel="yes"/> + + <xsl:variable name="idQuestion" select="enojs:get-name($source-context)"/> <components xsi:type="CheckboxGroup" componentType="CheckboxGroup" id="{$idQuestion}"> <label><xsl:value-of select="enojs:get-label($source-context, $languages[1])"/></label> <xsl:copy-of select="enojs:getInstructionForQuestion($source-context,.)"/> - <xsl:copy-of select="enojs:get-global-filter($source-context)"/> + <conditionFilter><xsl:value-of select="enojs:get-global-filter($source-context)"/></conditionFilter> <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> <xsl:with-param name="driver" select="." tunnel="yes"/> - <xsl:with-param name="idQuestion" select="enojs:get-name($source-context)" tunnel="yes"/> + <xsl:with-param name="idQuestion" select="$idQuestion" tunnel="yes"/> <xsl:with-param name="questionName" select="lower-case(enojs:get-question-name($source-context,$languages[1]))" tunnel="yes"/> <xsl:with-param name="labelQuestion" select="enojs:get-label($source-context, $languages[1])" tunnel="yes"/> <xsl:with-param name="typeOfQuestion" select="self::*/name()" tunnel="yes"/> @@ -155,7 +159,7 @@ <components xsi:type="{$componentType}" componentType="{$componentType}" id="{$idQuestion}" positioning="HORIZONTAL" mandatory="{$mandatory}"> <label><xsl:value-of select="enojs:get-label($source-context, $languages[1])"/></label> <xsl:copy-of select="enojs:getInstructionForQuestion($source-context,.)"/> - <xsl:copy-of select="enojs:get-global-filter($source-context)"/> + <conditionFilter><xsl:value-of select="enojs:get-global-filter($source-context)"/></conditionFilter> <xsl:for-each select="enojs:get-header-lines($source-context)"> <cells type="header"> @@ -324,7 +328,7 @@ <xsl:call-template name="enojs:addResponseToComponents"> <xsl:with-param name="responseName" select="$responseName"/> </xsl:call-template> - <xsl:copy-of select="$filterCondition"/> + <conditionFilter><xsl:value-of select="$filterCondition"/></conditionFilter> </components> </xsl:when> <xsl:when test="$typeOfAncestor='table'"> @@ -393,7 +397,7 @@ <xsl:call-template name="enojs:addResponseToComponents"> <xsl:with-param name="responseName" select="$responseName"/> </xsl:call-template> - <xsl:copy-of select="$filterCondition"/> + <conditionFilter><xsl:value-of select="$filterCondition"/></conditionFilter> </components> </xsl:when> <xsl:when test="$typeOfAncestor='table'"> @@ -459,7 +463,7 @@ <xsl:call-template name="enojs:addResponseToComponents"> <xsl:with-param name="responseName" select="$responseName"/> </xsl:call-template> - <xsl:copy-of select="$filterCondition"/> + <conditionFilter><xsl:value-of select="$filterCondition"/></conditionFilter> <dateFormat><xsl:value-of select="$dateFormat"/></dateFormat> </components> </xsl:otherwise> @@ -524,7 +528,7 @@ <xsl:with-param name="responseName" select="$responseName"/> <xsl:with-param name="responseType" select="'Boolean'"/> </xsl:call-template> - <xsl:copy-of select="$filterCondition"/> + <conditionFilter><xsl:value-of select="$filterCondition"/></conditionFilter> </components> <xsl:call-template name="enojs:addVariableCollected"> @@ -602,7 +606,7 @@ <xsl:call-template name="enojs:addResponseToComponents"> <xsl:with-param name="responseName" select="$responseName"/> </xsl:call-template> - <xsl:copy-of select="$filterCondition"/> + <conditionFilter><xsl:value-of select="$filterCondition"/></conditionFilter> </components> <xsl:call-template name="enojs:addVariableCollected"> @@ -694,7 +698,7 @@ <xsl:call-template name="enojs:addResponseToComponents"> <xsl:with-param name="responseName" select="$responseName"/> </xsl:call-template> - <xsl:copy-of select="$filterCondition"/> + <conditionFilter><xsl:value-of select="$filterCondition"/></conditionFilter> </components> <xsl:call-template name="enojs:addVariableCollected"> diff --git a/src/main/resources/xslt/transformations/ddi2js/ddi2js-fixed.xsl b/src/main/resources/xslt/transformations/ddi2js/ddi2js-fixed.xsl index 786afcb87..d73364174 100644 --- a/src/main/resources/xslt/transformations/ddi2js/ddi2js-fixed.xsl +++ b/src/main/resources/xslt/transformations/ddi2js/ddi2js-fixed.xsl @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl" xmlns:eno="http://xml.insee.fr/apps/eno" xmlns:enoddi="http://xml.insee.fr/apps/eno/ddi" xmlns:enoodt="http://xml.insee.fr/apps/eno/out/odt" @@ -133,10 +134,10 @@ <xsl:function name="enojs:get-global-filter"> <xsl:param name="context" as="item()"/> - <xsl:variable name="formulaReadOnly" select="enoddi:get-readonly-ancestors($context)" as="xs:string*"/> - <xsl:variable name="formulaRelevant" select="enoddi:get-relevant-ancestors($context)" as="xs:string*"/> - <xsl:variable name="variablesReadOnly" select="enoddi:get-readonly-ancestors-variables($context)" as="xs:string*"/> - <xsl:variable name="variablesRelevant" select="enoddi:get-relevant-ancestors-variables($context)" as="xs:string*"/> + <xsl:variable name="formulaReadOnly" select="enoddi:get-deactivatable-ancestors($context)" as="xs:string*"/> + <xsl:variable name="formulaRelevant" select="enoddi:get-hideable-ancestors($context)" as="xs:string*"/> + <xsl:variable name="variablesReadOnly" select="enoddi:get-deactivatable-ancestors-variables($context)" as="xs:string*"/> + <xsl:variable name="variablesRelevant" select="enoddi:get-hideable-ancestors-variables($context)" as="xs:string*"/> <xsl:variable name="variableFilterId" as="xs:string*"> <xsl:for-each select="distinct-values($variablesRelevant)"> @@ -148,7 +149,7 @@ </xsl:variable> <xsl:variable name="variableFilterName" as="xs:string*"> <xsl:for-each select="distinct-values($variablesRelevant)"> - <xsl:sequence select="enojs:get-variable-business-name($source-context,.)"/> + <xsl:sequence select="enojs:get-variable-business-name($context,.)"/> </xsl:for-each> <xsl:for-each select="distinct-values($variablesReadOnly)"> <xsl:sequence select="."/> @@ -168,114 +169,112 @@ </xsl:for-each> </xsl:variable> - <conditionFilter> - <!--Expression VTL : #if(condition)je suis true#{else}je suis false#end--> - <!-- Caution for encodage : # -> # { -> { } -> } --> - <xsl:variable name="if" select="'#if'"/> - <xsl:variable name="else" select="'#{else}'"/> - <xsl:variable name="ifEnd" select="'#end'"/> - <xsl:choose> - <!--<xsl:when test="$variablesName=''"> + <!--Expression VTL : #if(condition)je suis true#{else}je suis false#end--> + <!-- Caution for encodage : # -> # { -> { } -> } --> + <xsl:variable name="if" select="'#if'"/> + <xsl:variable name="else" select="'#{else}'"/> + <xsl:variable name="ifEnd" select="'#end'"/> + <xsl:choose> + <!--<xsl:when test="$variablesName=''"> <xsl:value-of select="'() => true ? ''normal'' : '''''"/> guillemet autour de normal ? </xsl:when>--> - <xsl:when test="$formulaRelevant!='' and $formulaReadOnly!=''"> - <xsl:variable name="initial-relevant-ancestors"> - <xsl:for-each select="$formulaRelevant"> - <xsl:value-of select="concat('(',.,')')"/> - <xsl:if test="position()!=last()"> - <xsl:value-of select="' && '"/><!-- "||" = "or"--> - </xsl:if> - </xsl:for-each> - </xsl:variable> - <xsl:variable name="relevant-condition"> - <xsl:call-template name="replaceVariablesInFormula"> - <xsl:with-param name="source-context" select="$source-context" as="item()" tunnel="yes"/> - <xsl:with-param name="formula" select="$initial-relevant-ancestors"/> - <xsl:with-param name="variables" select="$variablesId"/> - </xsl:call-template> - </xsl:variable> - <xsl:variable name="initial-readonly-ancestors"> - <xsl:for-each select="$formulaReadOnly"> - <xsl:value-of select="concat('(',.,')')"/> - <xsl:if test="position()!=last()"> - <xsl:value-of select="' || '"/> - </xsl:if> - </xsl:for-each> - </xsl:variable> - <xsl:variable name="readonly-condition"> - <xsl:call-template name="replaceVariablesInFormula"> - <xsl:with-param name="source-context" select="$source-context" as="item()" tunnel="yes"/> - <xsl:with-param name="formula" select="$initial-readonly-ancestors"/> - <xsl:with-param name="variables" select="$variablesId"/> - </xsl:call-template> - </xsl:variable> - <!-- replace "not -> "!", " and " -> "&&", " or " -> "||", "=" -> "==" --> - <xsl:variable name="returned-relevant-condition" select="replace(replace(replace(replace($relevant-condition,'not','!'),'\sand\s','&&'),'\sor\s',' || '),'\s=\s',' == ')"/> - <xsl:variable name="returned-readonly-condition" select="replace(replace(replace(replace($readonly-condition,'not','!'),'\sand\s','&&'),'\sor\s',' || '),'\s=\s',' == ')"/> - - <!--<xsl:value-of select="concat('(',$variablesName,') =>', $readonly-condition,'toto',$relevant-condition,' ? ''normal'' : ''''')"/>--> - <!-- les trois possibles : caché (hidden) , gris (readOnly), affiché (normal) --> - <!-- si relevant + <xsl:when test="$formulaRelevant!='' and $formulaReadOnly!=''"> + <xsl:variable name="initial-relevant-ancestors"> + <xsl:for-each select="$formulaRelevant"> + <xsl:value-of select="concat('(',.,')')"/> + <xsl:if test="position()!=last()"> + <xsl:value-of select="' && '"/><!-- "||" = "or"--> + </xsl:if> + </xsl:for-each> + </xsl:variable> + <xsl:variable name="relevant-condition"> + <xsl:call-template name="replaceVariablesInFormula"> + <xsl:with-param name="source-context" select="$context" as="item()" tunnel="yes"/> + <xsl:with-param name="formula" select="$initial-relevant-ancestors"/> + <xsl:with-param name="variables" select="$variablesId"/> + </xsl:call-template> + </xsl:variable> + <xsl:variable name="initial-readonly-ancestors"> + <xsl:for-each select="$formulaReadOnly"> + <xsl:value-of select="concat('(',.,')')"/> + <xsl:if test="position()!=last()"> + <xsl:value-of select="' || '"/> + </xsl:if> + </xsl:for-each> + </xsl:variable> + <xsl:variable name="readonly-condition"> + <xsl:call-template name="replaceVariablesInFormula"> + <xsl:with-param name="source-context" select="$context" as="item()" tunnel="yes"/> + <xsl:with-param name="formula" select="$initial-readonly-ancestors"/> + <xsl:with-param name="variables" select="$variablesId"/> + </xsl:call-template> + </xsl:variable> + <!-- replace "not -> "!", " and " -> "&&", " or " -> "||", "=" -> "==" --> + <xsl:variable name="returned-relevant-condition" select="replace(replace(replace(replace($relevant-condition,'not','!'),'\sand\s','&&'),'\sor\s',' || '),'\s=\s',' == ')"/> + <xsl:variable name="returned-readonly-condition" select="replace(replace(replace(replace($readonly-condition,'not','!'),'\sand\s','&&'),'\sor\s',' || '),'\s=\s',' == ')"/> + + <!--<xsl:value-of select="concat('(',$variablesName,') =>', $readonly-condition,'toto',$relevant-condition,' ? ''normal'' : ''''')"/>--> + <!-- les trois possibles : caché (hidden) , gris (readOnly), affiché (normal) --> + <!-- si relevant alors si readonly, alors readonly sinon normal sinon hidden--> - <xsl:value-of select="concat( - $if,'(',$returned-relevant-condition,')', - $if,'(',$returned-readonly-condition,')readonly', - $else,'normal',$ifEnd,')', - $else,'hidden',$ifEnd - )"/> - </xsl:when> - <xsl:when test="$formulaRelevant!=''"> - <xsl:variable name="initial-relevant-ancestors"> - <xsl:for-each select="$formulaRelevant"> - <xsl:value-of select="concat('(',.,')')"/> - <xsl:if test="position()!=last()"> - <xsl:value-of select="' && '"/> - </xsl:if> - </xsl:for-each> - </xsl:variable> - <xsl:variable name="relevant-condition"> - <xsl:call-template name="replaceVariablesInFormula"> - <xsl:with-param name="source-context" select="$source-context" as="item()" tunnel="yes"/> - <xsl:with-param name="formula" select="$initial-relevant-ancestors"/> - <xsl:with-param name="variables" select="$variablesId"/> - </xsl:call-template> - </xsl:variable> - <xsl:variable name="returned-relevant-condition" select="replace(replace(replace(replace($relevant-condition,'not','!'),'\sand\s',' && '),'\sor\s',' || '),'\s=\s',' == ')"/> - - <xsl:value-of select="concat($if,'(', $returned-relevant-condition,')normal',$else,'hidden',$ifEnd)"/> - - <!-- pas de gris, on affiche (normal) ou pas (hidden) --> - </xsl:when> - <xsl:when test="$formulaReadOnly!=''"> - <xsl:variable name="initial-readonly-ancestors"> - <xsl:for-each select="$formulaReadOnly"> - <xsl:value-of select="concat('(',.,')')"/> - <xsl:if test="position()!=last()"> - <xsl:value-of select="' || '"/> - </xsl:if> - </xsl:for-each> - </xsl:variable> - <xsl:variable name="readonly-condition"> - <xsl:call-template name="replaceVariablesInFormula"> - <xsl:with-param name="source-context" select="$source-context" as="item()" tunnel="yes"/> - <xsl:with-param name="formula" select="$initial-readonly-ancestors"/> - <xsl:with-param name="variables" select="$variablesId"/> - </xsl:call-template> - </xsl:variable> - <xsl:variable name="returned-readonly-condition" select="replace(replace(replace(replace($readonly-condition,'not','!'),'\sand\s',' && '),'\sor\s',' || '),'\s=\s',' == ')"/> - <xsl:value-of select="concat($if,'(',$returned-readonly-condition,')readonly',$else,'normal',$ifEnd)"/> - <!-- on ne cache pas , gris (readOnly) ou affiché (normal)--> - </xsl:when> + <xsl:value-of select="concat( + $if,'(',$returned-relevant-condition,')', + $if,'(',$returned-readonly-condition,')readonly', + $else,'normal',$ifEnd,')', + $else,'hidden',$ifEnd + )"/> + </xsl:when> + <xsl:when test="$formulaRelevant!=''"> + <xsl:variable name="initial-relevant-ancestors"> + <xsl:for-each select="$formulaRelevant"> + <xsl:value-of select="concat('(',.,')')"/> + <xsl:if test="position()!=last()"> + <xsl:value-of select="' && '"/> + </xsl:if> + </xsl:for-each> + </xsl:variable> + <xsl:variable name="relevant-condition"> + <xsl:call-template name="replaceVariablesInFormula"> + <xsl:with-param name="source-context" select="$context" as="item()" tunnel="yes"/> + <xsl:with-param name="formula" select="$initial-relevant-ancestors"/> + <xsl:with-param name="variables" select="$variablesId"/> + </xsl:call-template> + </xsl:variable> + <xsl:variable name="returned-relevant-condition" select="replace(replace(replace(replace($relevant-condition,'not','!'),'\sand\s',' && '),'\sor\s',' || '),'\s=\s',' == ')"/> - <xsl:otherwise> - <xsl:value-of select="'normal'"/> - </xsl:otherwise> - </xsl:choose> - </conditionFilter> + <xsl:value-of select="concat($if,'(', $returned-relevant-condition,')normal',$else,'hidden',$ifEnd)"/> + + <!-- pas de gris, on affiche (normal) ou pas (hidden) --> + </xsl:when> + <xsl:when test="$formulaReadOnly!=''"> + <xsl:variable name="initial-readonly-ancestors"> + <xsl:for-each select="$formulaReadOnly"> + <xsl:value-of select="concat('(',.,')')"/> + <xsl:if test="position()!=last()"> + <xsl:value-of select="' || '"/> + </xsl:if> + </xsl:for-each> + </xsl:variable> + <xsl:variable name="readonly-condition"> + <xsl:call-template name="replaceVariablesInFormula"> + <xsl:with-param name="source-context" select="$context" as="item()" tunnel="yes"/> + <xsl:with-param name="formula" select="$initial-readonly-ancestors"/> + <xsl:with-param name="variables" select="$variablesId"/> + </xsl:call-template> + </xsl:variable> + <xsl:variable name="returned-readonly-condition" select="replace(replace(replace(replace($readonly-condition,'not','!'),'\sand\s',' && '),'\sor\s',' || '),'\s=\s',' == ')"/> + <xsl:value-of select="concat($if,'(',$returned-readonly-condition,')readonly',$else,'normal',$ifEnd)"/> + <!-- on ne cache pas , gris (readOnly) ou affiché (normal)--> + </xsl:when> + + <xsl:otherwise> + <xsl:value-of select="'normal'"/> + </xsl:otherwise> + </xsl:choose> </xsl:function> </xsl:stylesheet> From 7b1072cf805bff546ef6e1b3f36fcc682855473a Mon Sep 17 00:00:00 2001 From: BulotF <francois.bulot@insee.fr> Date: Tue, 3 Sep 2019 16:33:14 +0200 Subject: [PATCH 088/439] factorize response drivers --- src/main/resources/xslt/outputs/js/models.xsl | 658 +++++------------- src/test/resources/ddi-to-js/out.xml | 98 +-- 2 files changed, 238 insertions(+), 518 deletions(-) diff --git a/src/main/resources/xslt/outputs/js/models.xsl b/src/main/resources/xslt/outputs/js/models.xsl index 13979b1d7..60434cae4 100644 --- a/src/main/resources/xslt/outputs/js/models.xsl +++ b/src/main/resources/xslt/outputs/js/models.xsl @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:xs="http://www.w3.org/2001/XMLSchema" - xmlns:fn="http://www.w3.org/2005/xpath-functions" - xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl" - xmlns:eno="http://xml.insee.fr/apps/eno" + xmlns:xs="http://www.w3.org/2001/XMLSchema" + xmlns:fn="http://www.w3.org/2005/xpath-functions" + xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl" + xmlns:eno="http://xml.insee.fr/apps/eno" xmlns:enojs="http://xml.insee.fr/apps/eno/out/js" xmlns="http://xml.insee.fr/schema/applis/lunatic-h" exclude-result-prefixes="xs fn xd eno enojs" version="2.0"> @@ -18,7 +18,6 @@ <xsl:variable name="properties" select="doc($properties-file)"/> - <xd:doc scope="stylesheet"> <xd:desc> <xd:p>An xslt stylesheet who transforms an input into js through generic driver templates.</xd:p> @@ -26,15 +25,10 @@ </xd:desc> </xd:doc> - <xsl:variable name="varName" select="parent"/> - <xd:doc> - <xd:desc> - <xd:p>Forces the traversal of the whole driver tree. Must be present once in the transformation.</xd:p> - </xd:desc> - </xd:doc> - <xsl:template match="*" mode="model" priority="-1"> + <!-- filters must lead to their children --> + <xsl:template match="xf-group" mode="model" priority="-1"> <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> <xsl:with-param name="driver" select="." tunnel="yes"/> @@ -57,10 +51,8 @@ </variables> </xsl:otherwise> </xsl:choose> - </xsl:template> - <xd:doc> <xd:desc> <xd:p>Match on Form driver.</xd:p> @@ -98,7 +90,7 @@ <xsl:when test="self::SubModule"><xsl:value-of select="'Subsequence'"/></xsl:when> </xsl:choose> </xsl:variable> - + <components xsi:type="{$componentType-Sequence}" componentType="{$componentType-Sequence}" id="{$id}"> <label><xsl:value-of select="enojs:get-label($source-context, $languages[1])"/></label> <xsl:copy-of select="enojs:getInstructionForQuestion($source-context,.)"/> @@ -112,7 +104,7 @@ <xsl:template match="SingleResponseQuestion | MultipleQuestion" mode="model"> <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="languages" tunnel="yes"/> - + <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> <xsl:with-param name="driver" select="." tunnel="yes"/> <xsl:with-param name="idQuestion" select="enojs:get-name($source-context)" tunnel="yes"/> @@ -127,7 +119,7 @@ <xsl:template match="MultipleChoiceQuestion" mode="model"> <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="languages" tunnel="yes"/> - + <xsl:variable name="idQuestion" select="enojs:get-name($source-context)"/> <components xsi:type="CheckboxGroup" componentType="CheckboxGroup" id="{$idQuestion}"> @@ -164,9 +156,8 @@ <xsl:for-each select="enojs:get-header-lines($source-context)"> <cells type="header"> <xsl:apply-templates select="enojs:get-header-line($source-context,position())" mode="source"> - <xsl:with-param name="ancestorTable" select="'headerLine'" tunnel="yes"/> + <xsl:with-param name="driver" select="eno:append-empty-element('headerLine', .)" tunnel="yes"/> <xsl:with-param name="idColumn" select="position()" tunnel="yes"/> - <xsl:with-param name="typeOfAncestor" select="'table'" tunnel="yes"/> </xsl:apply-templates> </cells> </xsl:for-each> @@ -174,8 +165,7 @@ <xsl:for-each select="enojs:get-body-lines($source-context)"> <cells type="line"> <xsl:apply-templates select="enojs:get-body-line($source-context,position())" mode="source"> - <xsl:with-param name="ancestorTable" select="'line'" tunnel="yes"/> - <xsl:with-param name="typeOfAncestor" select="'table'" tunnel="yes"/> + <xsl:with-param name="driver" select="eno:append-empty-element('bodyLine', .)" tunnel="yes"/> <xsl:with-param name="position" select="position()" tunnel="yes"/> <xsl:with-param name="questionName" select="enojs:get-question-name($source-context,$languages[1])" tunnel="yes"/> </xsl:apply-templates> @@ -196,7 +186,6 @@ </xd:doc> <xsl:template match="TextCell" mode="model"> <xsl:param name="source-context" as="item()" tunnel="yes"/> - <xsl:param name="ancestorTable" tunnel="yes"/> <xsl:param name="languages" tunnel="yes"/> <xsl:param name="idColumn" tunnel="yes"/> @@ -205,22 +194,19 @@ <xsl:variable name="id" select="enojs:get-name($source-context)"/> - <xsl:if test="$ancestorTable!=''"> - <xsl:variable name="label" select="enojs:get-label($source-context,$languages)"/> - <cells> - <xsl:choose> - <xsl:when test="$ancestorTable='headerLine'"> - <xsl:attribute name="headerCell" select="true()"/> - </xsl:when> - </xsl:choose> - <xsl:if test="$col-span>1"><xsl:attribute name="colspan" select="$col-span"/></xsl:if> - <xsl:if test="$row-span>1"><xsl:attribute name="rowspan" select="$row-span"/></xsl:if> - <xsl:if test="$label!='' and $ancestorTable='line'"> - <value><xsl:value-of select="enojs:get-value($source-context)"/></value> - </xsl:if> - <label><xsl:value-of select="$label"/></label> - </cells> - </xsl:if> + + <xsl:variable name="label" select="enojs:get-label($source-context,$languages)"/> + <cells> + <xsl:if test="ancestor::headerLine"> + <xsl:attribute name="headerCell" select="true()"/> + </xsl:if> + <xsl:if test="$col-span>1"><xsl:attribute name="colspan" select="$col-span"/></xsl:if> + <xsl:if test="$row-span>1"><xsl:attribute name="rowspan" select="$row-span"/></xsl:if> + <xsl:if test="$label!='' and ancestor::bodyLine"> + <value><xsl:value-of select="enojs:get-value($source-context)"/></value> + </xsl:if> + <label><xsl:value-of select="$label"/></label> + </cells> </xsl:template> <xd:doc> @@ -231,17 +217,12 @@ </xd:doc> <xsl:template match="Cell" mode="model"> <xsl:param name="source-context" as="item()" tunnel="yes"/> - <xsl:param name="ancestorTable" tunnel="yes"/> - <xsl:param name="languages" tunnel="yes"/> - <xsl:variable name="col-span" select="number(enojs:get-colspan($source-context))"/> - <xsl:variable name="row-span" select="number(enojs:get-rowspan($source-context))"/> - <xsl:if test="$ancestorTable!=''"> - <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> - <xsl:with-param name="driver" select="." tunnel="yes"/> - <xsl:with-param name="col-span" select="$col-span" tunnel="yes"/> - <xsl:with-param name="row-span" select="$row-span" tunnel="yes"/> - </xsl:apply-templates> - </xsl:if> + + <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> + <xsl:with-param name="driver" select="."/> + <xsl:with-param name="col-span" select="number(enojs:get-colspan($source-context))" tunnel="yes"/> + <xsl:with-param name="row-span" select="number(enojs:get-rowspan($source-context))" tunnel="yes"/> + </xsl:apply-templates> </xsl:template> <xd:doc> @@ -258,30 +239,30 @@ <xsl:variable name="col-span" select="number(enojs:get-colspan($source-context))"/> <xsl:variable name="row-span" select="number(enojs:get-rowspan($source-context))"/> - <xsl:variable name="id" select="enojs:get-name($source-context)"/> - - - <xsl:if test="$ancestorTable!=''"> - <xsl:choose> - <xsl:when test="$ancestorTable='line'"> - <cells headerCell="false"></cells> - </xsl:when> - <xsl:when test="$ancestorTable='headerLine'"> - <cells headerCell="true"> - <label/> - </cells> - </xsl:when> - </xsl:choose> - </xsl:if> + <xsl:choose> + <xsl:when test="ancestor::headerLine"> + <cells headerCell="true"> + <xsl:if test="$col-span>1"><xsl:attribute name="colspan" select="$col-span"/></xsl:if> + <xsl:if test="$row-span>1"><xsl:attribute name="rowspan" select="$row-span"/></xsl:if> + <label/> + </cells> + </xsl:when> + <xsl:otherwise> + <cells headerCell="false"> + <xsl:if test="$col-span>1"><xsl:attribute name="colspan" select="$col-span"/></xsl:if> + <xsl:if test="$row-span>1"><xsl:attribute name="rowspan" select="$row-span"/></xsl:if> + </cells> + </xsl:otherwise> + </xsl:choose> </xsl:template> - + <xd:doc> <xd:desc> - <xd:p>Match on NumericDomain driver.</xd:p> + <xd:p>Match on Response Domains driver in SingleResponseQuestion and MultipleQuestion.</xd:p> </xd:desc> </xd:doc> - <xsl:template match="NumericDomain" mode="model"> + <xsl:template match="*[name(.) =('SingleResponseQuestion','MultipleQuestion')]//*[name(.) =('NumericDomain','TextDomain','TextareaDomain','DateTimeDomain','CodeDomain','BooleanDomain')]" mode="model"> <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="idQuestion" tunnel="yes"/> <xsl:param name="questionName" tunnel="yes"/> @@ -289,13 +270,28 @@ <xsl:param name="languages" tunnel="yes"/> <xsl:param name="declarations" as="node()*" tunnel="yes"/> <xsl:param name="filterCondition" tunnel="yes"/> - <xsl:param name="col-span" tunnel="yes"/> - <xsl:param name="row-span" tunnel="yes"/> - <xsl:param name="typeOfAncestor" tunnel="yes"/> - <xsl:param name="position" tunnel="yes"/> - <xsl:variable name="mandatory" select="enojs:is-required($source-context)" as="xs:boolean"/> - <xsl:variable name="componentType" select="'InputNumber'"/> + <xsl:variable name="responseName" select="enojs:get-business-name($source-context)"/> + <xsl:variable name="responseType"> + <xsl:choose> + <xsl:when test="self::BooleanDomain"><xsl:value-of select="'Boolean'"/></xsl:when> + <xsl:otherwise><xsl:value-of select="'String'"/></xsl:otherwise> + </xsl:choose> + </xsl:variable> + <xsl:variable name="code-appearance" select="enojs:get-appearance($source-context)"/> + <xsl:variable name="componentType"> + <xsl:choose> + <xsl:when test="self::NumericDomain"><xsl:value-of select="'InputNumber'"/></xsl:when> + <xsl:when test="self::TextDomain"><xsl:value-of select="'Input'"/></xsl:when> + <xsl:when test="self::TextareaDomain"><xsl:value-of select="'Textarea'"/></xsl:when> + <xsl:when test="self::DateTimeDomain"><xsl:value-of select="'Datepicker'"/></xsl:when> + <xsl:when test="self::CodeDomain and $code-appearance='radio-button'"><xsl:value-of select="'Radio'"/></xsl:when> + <xsl:when test="self::CodeDomain and $code-appearance='drop-down-list'"><xsl:value-of select="'Dropdown'"/></xsl:when> + <xsl:when test="self::CodeDomain and $code-appearance='checkbox'"><xsl:value-of select="'CheckboxOne'"/></xsl:when> + <xsl:when test="self::BooleanDomain"><xsl:value-of select="'CheckboxBoolean'"/></xsl:when> + </xsl:choose> + </xsl:variable> + <!-- NumericDomain getters --> <xsl:variable name="minimumResponse" select="enojs:get-minimum($source-context)"/> <xsl:variable name="maximumResponse" select="enojs:get-maximum($source-context)"/> <xsl:variable name="numberOfDecimals"> @@ -306,332 +302,143 @@ </xsl:choose> </xsl:variable> <xsl:variable name="unit" select="enojs:get-suffix($source-context,$languages[1])"/> - <xsl:variable name="responseName" select="enojs:get-business-name($source-context)"/> - - <xsl:choose> - <xsl:when test="$questionName!='' and $typeOfAncestor!='table'"> - <components xsi:type="{$componentType}" componentType="{$componentType}" id="{$idQuestion}" mandatory="{$mandatory}"> - <xsl:if test="$minimumResponse!=''"> - <xsl:attribute name="min"><xsl:value-of select="$minimumResponse"/></xsl:attribute> - </xsl:if> - <xsl:if test="$maximumResponse!=''"> - <xsl:attribute name="max"><xsl:value-of select="$maximumResponse"/></xsl:attribute> - </xsl:if> - <xsl:if test="$numberOfDecimals!=''"> - <xsl:attribute name="decimals"><xsl:value-of select="$numberOfDecimals"/></xsl:attribute> - </xsl:if> - <label><xsl:value-of select="$labelQuestion"/></label> - <xsl:if test="$unit!=''"> - <unit><xsl:value-of select="$unit"/></unit> - </xsl:if> - <xsl:copy-of select="$declarations"></xsl:copy-of> - <xsl:call-template name="enojs:addResponseToComponents"> - <xsl:with-param name="responseName" select="$responseName"/> - </xsl:call-template> - <conditionFilter><xsl:value-of select="$filterCondition"/></conditionFilter> - </components> - </xsl:when> - <xsl:when test="$typeOfAncestor='table'"> - <cells componentType="{$componentType}" id="{enojs:get-name($source-context)}"> - <xsl:if test="$col-span>1"><xsl:attribute name="colspan" select="$col-span"/></xsl:if> - <xsl:if test="$row-span>1"><xsl:attribute name="rowspan" select="$row-span"/></xsl:if> - <xsl:if test="$minimumResponse!=''"> - <xsl:attribute name="min"><xsl:value-of select="$minimumResponse"/></xsl:attribute> - </xsl:if> - <xsl:if test="$maximumResponse!=''"> - <xsl:attribute name="max"><xsl:value-of select="$maximumResponse"/></xsl:attribute> - </xsl:if> - <xsl:if test="$numberOfDecimals!=''"> - <xsl:attribute name="decimals"><xsl:value-of select="$numberOfDecimals"/></xsl:attribute> - </xsl:if> - <xsl:if test="$unit!=''"> - <unit><xsl:value-of select="$unit"/></unit> - </xsl:if> - <xsl:call-template name="enojs:addResponseToComponents"> - <xsl:with-param name="responseName" select="$responseName"/> - </xsl:call-template> - </cells> - </xsl:when> - </xsl:choose> - - <xsl:call-template name="enojs:addVariableCollected"> - <xsl:with-param name="responseName" select="$responseName"/> - <xsl:with-param name="responseRef" select="$responseName"/> - </xsl:call-template> - - <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> - <xsl:with-param name="driver" select="." tunnel="yes"/> - </xsl:apply-templates> - - </xsl:template> - - <xd:doc> - <xd:desc> - <xd:p>Match on TextDomain driver.</xd:p> - </xd:desc> - </xd:doc> - <xsl:template match="TextDomain" mode="model"> - <xsl:param name="source-context" as="item()" tunnel="yes"/> - <xsl:param name="idQuestion" tunnel="yes"/> - <xsl:param name="questionName" tunnel="yes"/> - <xsl:param name="labelQuestion" tunnel="yes"/> - <xsl:param name="languages" tunnel="yes"/> - <xsl:param name="declarations" as="node()*" tunnel="yes"/> - <xsl:param name="filterCondition" tunnel="yes"/> - <xsl:param name="col-span" tunnel="yes"/> - <xsl:param name="row-span" tunnel="yes"/> - <xsl:param name="typeOfAncestor" tunnel="yes"/> - <xsl:param name="position" tunnel="yes"/> - - <xsl:variable name="mandatory" select="enojs:is-required($source-context)" as="xs:boolean"/> - <xsl:variable name="componentType" select="'Input'"/> + <!-- TextDomain getters --> <xsl:variable name="lengthResponse" select="enojs:get-length($source-context)"/> + <!-- DateTimeDomain getters --> + <xsl:variable name="dateFormat" select="enojs:get-format($source-context)"/> - <xsl:variable name="responseName" select="enojs:get-business-name($source-context)"/> - - <xsl:choose> - <xsl:when test="$questionName!='' and $typeOfAncestor!='table'"> - <components xsi:type="{$componentType}" componentType="{$componentType}" id="{$idQuestion}" maxLength="{$lengthResponse}" mandatory="{$mandatory}"> - <label><xsl:value-of select="$labelQuestion"/></label> - <xsl:copy-of select="$declarations"/> - <xsl:call-template name="enojs:addResponseToComponents"> - <xsl:with-param name="responseName" select="$responseName"/> - </xsl:call-template> - <conditionFilter><xsl:value-of select="$filterCondition"/></conditionFilter> - </components> - </xsl:when> - <xsl:when test="$typeOfAncestor='table'"> - <cells componentType="{$componentType}" id="{enojs:get-name($source-context)}" maxLength="{$lengthResponse}"> - <xsl:if test="$col-span>1"><xsl:attribute name="colspan" select="$col-span"/></xsl:if> - <xsl:if test="$row-span>1"><xsl:attribute name="rowspan" select="$row-span"/></xsl:if> - <xsl:call-template name="enojs:addResponseToComponents"> - <xsl:with-param name="responseName" select="$responseName"/> - </xsl:call-template> - </cells> - </xsl:when> - </xsl:choose> - + <xsl:if test="$questionName!=''"> + <components xsi:type="{$componentType}" componentType="{$componentType}" id="{$idQuestion}"> + <xsl:if test="$lengthResponse!='' and (self::TextDomain or self::TextareaDomain)"><xsl:attribute name="maxLength" select="$lengthResponse"/></xsl:if> + <xsl:attribute name="mandatory" select="enojs:is-required($source-context)"/> + <xsl:if test="$minimumResponse!=''"><xsl:attribute name="min" select="$minimumResponse"/></xsl:if> + <xsl:if test="$maximumResponse!=''"><xsl:attribute name="max" select="$maximumResponse"/></xsl:if> + <xsl:if test="$numberOfDecimals!=''"><xsl:attribute name="decimals" select="$numberOfDecimals"/></xsl:if> + <label><xsl:value-of select="$labelQuestion"/></label> + <xsl:if test="$unit!=''"> + <unit><xsl:value-of select="$unit"/></unit> + </xsl:if> + <xsl:if test="$dateFormat != ''"> + <dateFormat><xsl:value-of select="$dateFormat"/></dateFormat> + </xsl:if> + <xsl:copy-of select="$declarations"/> + <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> + <xsl:with-param name="driver" select="." tunnel="yes"/> + </xsl:apply-templates> + <xsl:call-template name="enojs:addResponseToComponents"> + <xsl:with-param name="responseName" select="$responseName"/> + <xsl:with-param name="responseType" select="$responseType"/> + </xsl:call-template> + <conditionFilter><xsl:value-of select="$filterCondition"/></conditionFilter> + </components> + </xsl:if> <xsl:call-template name="enojs:addVariableCollected"> <xsl:with-param name="responseName" select="$responseName"/> <xsl:with-param name="responseRef" select="$responseName"/> </xsl:call-template> - - <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> - <xsl:with-param name="driver" select="." tunnel="yes"/> - </xsl:apply-templates> - - </xsl:template> + </xsl:template> <xd:doc> <xd:desc> - <xd:p>Match on DateTimeDomain driver.</xd:p> + <xd:p>Match on Response Domains driver in tables.</xd:p> </xd:desc> - </xd:doc> - <xsl:template match="DateTimeDomain" mode="model"> + </xd:doc> + <xsl:template match="bodyLine//*[name(.) =('NumericDomain','TextDomain','TextareaDomain','DateTimeDomain','CodeDomain','BooleanDomain')]" mode="model"> <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="idQuestion" tunnel="yes"/> - <xsl:param name="questionName" tunnel="yes"/> - <xsl:param name="labelQuestion" tunnel="yes"/> <xsl:param name="languages" tunnel="yes"/> - <xsl:param name="declarations" as="node()*" tunnel="yes"/> - <xsl:param name="filterCondition" tunnel="yes"/> <xsl:param name="col-span" tunnel="yes"/> <xsl:param name="row-span" tunnel="yes"/> - <xsl:param name="typeOfAncestor" tunnel="yes"/> - <xsl:param name="position" tunnel="yes"/> - <xsl:variable name="mandatory" select="enojs:is-required($source-context)" as="xs:boolean"/> - <xsl:variable name="componentType" select="'Datepicker'"/> <xsl:variable name="responseName" select="enojs:get-business-name($source-context)"/> + <xsl:variable name="responseType"> + <xsl:choose> + <xsl:when test="self::BooleanDomain"><xsl:value-of select="'Boolean'"/></xsl:when> + <xsl:otherwise><xsl:value-of select="'String'"/></xsl:otherwise> + </xsl:choose> + </xsl:variable> + <xsl:variable name="code-appearance" select="enojs:get-appearance($source-context)"/> + <xsl:variable name="componentType"> + <xsl:choose> + <xsl:when test="self::NumericDomain"><xsl:value-of select="'InputNumber'"/></xsl:when> + <xsl:when test="self::TextDomain"><xsl:value-of select="'Input'"/></xsl:when> + <xsl:when test="self::TextareaDomain"><xsl:value-of select="'Textarea'"/></xsl:when> + <xsl:when test="self::DateTimeDomain"><xsl:value-of select="'Datepicker'"/></xsl:when> + <xsl:when test="self::CodeDomain and $code-appearance='radio-button'"><xsl:value-of select="'Radio'"/></xsl:when> + <xsl:when test="self::CodeDomain and $code-appearance='drop-down-list'"><xsl:value-of select="'Dropdown'"/></xsl:when> + <xsl:when test="self::CodeDomain and $code-appearance='checkbox'"><xsl:value-of select="'CheckboxOne'"/></xsl:when> + <xsl:when test="self::BooleanDomain"><xsl:value-of select="'CheckboxBoolean'"/></xsl:when> + </xsl:choose> + </xsl:variable> + <!-- NumericDomain getters --> + <xsl:variable name="minimumResponse" select="enojs:get-minimum($source-context)"/> + <xsl:variable name="maximumResponse" select="enojs:get-maximum($source-context)"/> + <xsl:variable name="numberOfDecimals"> + <xsl:variable name="dec" select="enojs:get-number-of-decimals($source-context)"/> + <xsl:choose> + <xsl:when test="$dec!=''"><xsl:value-of select="$dec"/></xsl:when> + <xsl:when test="$dec='' and $minimumResponse!=''">0</xsl:when> + </xsl:choose> + </xsl:variable> + <xsl:variable name="unit" select="enojs:get-suffix($source-context,$languages[1])"/> + <!-- TextDomain getters --> + <xsl:variable name="lengthResponse" select="enojs:get-length($source-context)"/> + <!-- DateTimeDomain getters --> <xsl:variable name="dateFormat" select="enojs:get-format($source-context)"/> + + <cells id="{enojs:get-name($source-context)}" componentType="{$componentType}"> + <xsl:if test="$lengthResponse!='' and (self::TextDomain or self::TextareaDomain)"><xsl:attribute name="maxLength" select="$lengthResponse"/></xsl:if> + <xsl:if test="$col-span > 1"><xsl:attribute name="colspan" select="$col-span"/></xsl:if> + <xsl:if test="$row-span > 1"><xsl:attribute name="rowspan" select="$row-span"/></xsl:if> + <xsl:if test="$minimumResponse!=''"><xsl:attribute name="min" select="$minimumResponse"/></xsl:if> + <xsl:if test="$maximumResponse!=''"><xsl:attribute name="max" select="$maximumResponse"/></xsl:if> + <xsl:if test="$numberOfDecimals!=''"><xsl:attribute name="decimals" select="$numberOfDecimals"/></xsl:if> + <xsl:if test="$unit!=''"> + <unit><xsl:value-of select="$unit"/></unit> + </xsl:if> + <xsl:if test="$dateFormat != ''"> + <dateFormat><xsl:value-of select="$dateFormat"/></dateFormat> + </xsl:if> + <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> + <xsl:with-param name="driver" select="." tunnel="yes"/> + </xsl:apply-templates> + <xsl:call-template name="enojs:addResponseToComponents"> + <xsl:with-param name="responseName" select="$responseName"/> + <xsl:with-param name="responseType" select="$responseType"/> + </xsl:call-template> + </cells> - <xsl:choose> - <xsl:when test="$typeOfAncestor='table'"> - <cells componentType="{$componentType}" id="{enojs:get-name($source-context)}"> - <xsl:if test="$col-span>1"><xsl:attribute name="colspan" select="$col-span"/></xsl:if> - <xsl:if test="$row-span>1"><xsl:attribute name="rowspan" select="$row-span"/></xsl:if> - <dateFormat><xsl:value-of select="$dateFormat"/></dateFormat> - <xsl:call-template name="enojs:addResponseToComponents"> - <xsl:with-param name="responseName" select="$responseName"/> - </xsl:call-template> - </cells> - </xsl:when> - <xsl:otherwise> - <components xsi:type="{$componentType}" componentType="{$componentType}" id="{$idQuestion}" mandatory="{$mandatory}"> - <label><xsl:value-of select="$labelQuestion"/></label> - <xsl:copy-of select="$declarations"/> - <xsl:call-template name="enojs:addResponseToComponents"> - <xsl:with-param name="responseName" select="$responseName"/> - </xsl:call-template> - <conditionFilter><xsl:value-of select="$filterCondition"/></conditionFilter> - <dateFormat><xsl:value-of select="$dateFormat"/></dateFormat> - </components> - </xsl:otherwise> - </xsl:choose> <xsl:call-template name="enojs:addVariableCollected"> <xsl:with-param name="responseName" select="$responseName"/> <xsl:with-param name="responseRef" select="$responseName"/> </xsl:call-template> </xsl:template> - + <xd:doc> <xd:desc> <xd:p>Match on BooleanDomain driver.</xd:p> </xd:desc> </xd:doc> - <xsl:template match="BooleanDomain" mode="model"> - <xsl:param name="source-context" as="item()" tunnel="yes"/> - <xsl:param name="driver" tunnel="yes"/> - <xsl:param name="typeOfAncestor" tunnel="yes"/> - <xsl:param name="typeOfQuestion" tunnel="yes"/> - <xsl:param name="languages" tunnel="yes"/> - <xsl:param name="filterCondition" tunnel="yes"/> - <xsl:param name="col-span" tunnel="yes"/> - <xsl:param name="row-span" tunnel="yes"/> - <xsl:param name="idQuestion" tunnel="yes"/> - <xsl:param name="questionName" tunnel="yes"/> - <xsl:param name="labelQuestion" tunnel="yes"/> - <xsl:param name="declarations" as="node()*" tunnel="yes"/> - <xsl:param name="position" tunnel="yes"/> - - <xsl:variable name="mandatory" select="enojs:is-required($source-context)" as="xs:boolean"/> - <xsl:variable name="componentType" select="'CheckboxBoolean'"/> - <xsl:variable name="name" select="enojs:get-codelist-name($source-context)"/> - <xsl:variable name="idCodeList" select="enojs:get-codelist-id($source-context)"/> - <xsl:variable name="maximumLengthCode" select="enojs:get-code-maximum-length($source-context)"/> - <xsl:variable name="typeResponse" select="enojs:get-type($source-context)"/> - <xsl:variable name="responseName" select="enojs:get-business-name($source-context)"/> - - <xsl:choose> - <xsl:when test="$typeOfQuestion='MultipleChoiceQuestion'"> - <responses id="{enojs:get-name($source-context)}"> - <!-- call item driver for the label --> - <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> - <xsl:with-param name="driver" select="." tunnel="yes"/> - <xsl:with-param name="typeOfAncestor" select="'CheckboxGroup'" tunnel="yes"/> - </xsl:apply-templates> - <xsl:call-template name="enojs:addResponseToComponents"> - <xsl:with-param name="responseName" select="$responseName"/> - <xsl:with-param name="responseType" select="'Boolean'"/> - </xsl:call-template> - </responses> - <xsl:call-template name="enojs:addVariableCollected"> - <xsl:with-param name="responseName" select="$responseName"/> - <xsl:with-param name="responseRef" select="$responseName"/> - </xsl:call-template> - </xsl:when> - <xsl:when test="$typeOfQuestion='SingleResponseQuestion' and $idQuestion!=''"> - <components xsi:type="{$componentType}" componentType="{$componentType}" id="{$idQuestion}" mandatory="{$mandatory}"> - <label><xsl:value-of select="$labelQuestion"/></label> - <xsl:copy-of select="$declarations"/> - <xsl:call-template name="enojs:addResponseToComponents"> - <xsl:with-param name="responseName" select="$responseName"/> - <xsl:with-param name="responseType" select="'Boolean'"/> - </xsl:call-template> - <conditionFilter><xsl:value-of select="$filterCondition"/></conditionFilter> - </components> - - <xsl:call-template name="enojs:addVariableCollected"> - <xsl:with-param name="responseName" select="$responseName"/> - <xsl:with-param name="responseRef" select="$responseName"/> - </xsl:call-template> - </xsl:when> - <xsl:when test="$typeOfAncestor='table'"> - <cells id="{enojs:get-name($source-context)}" componentType="{$componentType}"> - <xsl:if test="$col-span>1"><xsl:attribute name="colspan" select="$col-span"/></xsl:if> - <xsl:if test="$row-span>1"><xsl:attribute name="rowspan" select="$row-span"/></xsl:if> - <xsl:call-template name="enojs:addResponseToComponents"> - <xsl:with-param name="responseName" select="$responseName"/> - <xsl:with-param name="responseType" select="'Boolean'"/> - </xsl:call-template> - </cells> - - <xsl:call-template name="enojs:addVariableCollected"> - <xsl:with-param name="responseName" select="$responseName"/> - <xsl:with-param name="responseRef" select="$responseName"/> - </xsl:call-template> - </xsl:when> - </xsl:choose> - </xsl:template> - - <xd:doc> - <xd:desc> - <xd:p>Match on CodeDomain driver.</xd:p> - </xd:desc> - </xd:doc> - <xsl:template match="CodeDomain" mode="model"> + <xsl:template match="MultipleChoiceQuestion//BooleanDomain" mode="model"> <xsl:param name="source-context" as="item()" tunnel="yes"/> - <xsl:param name="driver" tunnel="yes"/> - <xsl:param name="typeOfAncestor" tunnel="yes"/> <xsl:param name="languages" tunnel="yes"/> - <xsl:param name="filterCondition" tunnel="yes"/> - <xsl:param name="col-span" tunnel="yes"/> - <xsl:param name="row-span" tunnel="yes"/> - <xsl:param name="idQuestion" tunnel="yes"/> - <xsl:param name="questionName" tunnel="yes"/> - <xsl:param name="labelQuestion" tunnel="yes"/> - <xsl:param name="declarations" as="node()*" tunnel="yes"/> - <xsl:param name="position" tunnel="yes"/> - <xsl:variable name="mandatory" select="enojs:is-required($source-context)" as="xs:boolean"/> - <xsl:variable name="typeXf" select="enojs:get-appearance($source-context)"/> - <xsl:variable name="componentType"> - <xsl:choose> - <xsl:when test="$typeXf = 'radio-button'"> - <xsl:value-of select="'Radio'"/> - </xsl:when> - <xsl:when test="$typeXf = 'drop-down-list'"> - <xsl:value-of select="'Dropdown'"/> - </xsl:when> - <xsl:when test="$typeXf = 'checkbox'"> - <xsl:value-of select="'CheckboxOne'"/> - </xsl:when> - </xsl:choose> - </xsl:variable> - <xsl:variable name="name" select="enojs:get-codelist-name($source-context)"/> - <xsl:variable name="idCodeList" select="enojs:get-codelist-id($source-context)"/> - <xsl:variable name="typeResponse" select="enojs:get-type($source-context)"/> - <xsl:variable name="lengthResponse" select="enojs:get-length($source-context)"/> - <xsl:variable name="maximumLengthCode" select="enojs:get-code-maximum-length($source-context)"/> <xsl:variable name="responseName" select="enojs:get-business-name($source-context)"/> - - <xsl:if test="$typeOfAncestor!='question multiple-choice-question' and $questionName!='' and $typeOfAncestor!='table'"> - <components xsi:type="{$componentType}" componentType="{$componentType}" id="{$idQuestion}" mandatory="{$mandatory}"> - <label><xsl:value-of select="$labelQuestion"/></label> - <xsl:copy-of select="$declarations"></xsl:copy-of> - <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> - <xsl:with-param name="driver" select="." tunnel="yes"/> - <xsl:with-param name="typeOfAncestor" select="'codeLists'" tunnel="yes"/> - </xsl:apply-templates> - <xsl:call-template name="enojs:addResponseToComponents"> - <xsl:with-param name="responseName" select="$responseName"/> - </xsl:call-template> - <conditionFilter><xsl:value-of select="$filterCondition"/></conditionFilter> - </components> - - <xsl:call-template name="enojs:addVariableCollected"> - <xsl:with-param name="responseName" select="$responseName"/> - <xsl:with-param name="responseRef" select="$responseName"/> - </xsl:call-template> - </xsl:if> - - <xsl:if test="$typeOfAncestor='table'"> - <cells id="{enojs:get-name($source-context)}" componentType="{$componentType}"> - <xsl:if test="$col-span>1"><xsl:attribute name="colspan" select="$col-span"/></xsl:if> - <xsl:if test="$row-span>1"><xsl:attribute name="rowspan" select="$row-span"/></xsl:if> - <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> - <xsl:with-param name="driver" select="." tunnel="yes"/> - <xsl:with-param name="typeOfAncestor" select="'codeLists'" tunnel="yes"/> - </xsl:apply-templates> - <xsl:call-template name="enojs:addResponseToComponents"> - <xsl:with-param name="responseName" select="$responseName"/> - </xsl:call-template> - </cells> - <xsl:call-template name="enojs:addVariableCollected"> + + <responses id="{enojs:get-name($source-context)}"> + <!-- call item driver for the label --> + <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> + <xsl:with-param name="driver" select="." tunnel="yes"/> + </xsl:apply-templates> + <xsl:call-template name="enojs:addResponseToComponents"> <xsl:with-param name="responseName" select="$responseName"/> - <xsl:with-param name="responseRef" select="$responseName"/> + <xsl:with-param name="responseType" select="'Boolean'"/> </xsl:call-template> - </xsl:if> + </responses> + <xsl:call-template name="enojs:addVariableCollected"> + <xsl:with-param name="responseName" select="$responseName"/> + <xsl:with-param name="responseRef" select="$responseName"/> + </xsl:call-template> </xsl:template> <xd:doc> @@ -639,95 +446,31 @@ <xd:p>Match on the xf-item driver.</xd:p> </xd:desc> </xd:doc> - <xsl:template match="xf-item" mode="model"> + <xsl:template match="CodeDomain//xf-item" mode="model"> <xsl:param name="source-context" as="item()" tunnel="yes"/> - <xsl:param name="ancestorTable" tunnel="yes"/> - <xsl:param name="typeResponse" tunnel="yes"/> <xsl:param name="languages" tunnel="yes"/> - <xsl:param name="typeOfAncestor" tunnel="yes"/> + <xsl:variable name="label" select="enojs:get-label($source-context, $languages[1])"/> - <!-- remove item in the cell for table when the response is boolean--> - <xsl:choose> - <xsl:when test="$label !='' and $typeResponse!='boolean' and $typeOfAncestor='codeLists'"> - <options> - <value><xsl:value-of select="enojs:get-value($source-context)"/></value> - <label><xsl:value-of select="$label"/></label> - </options> - </xsl:when> - <xsl:when test="$label !='' and $typeOfAncestor='CheckboxGroup'"> - <label><xsl:value-of select="$label"/></label> - </xsl:when> - </xsl:choose> + <xsl:if test="$label !=''"> + <options> + <value><xsl:value-of select="enojs:get-value($source-context)"/></value> + <label><xsl:value-of select="$label"/></label> + </options> + </xsl:if> </xsl:template> - - <xd:doc> - <xd:desc> - <xd:p>Match on TextareaDomain driver.</xd:p> - </xd:desc> - </xd:doc> - <xsl:template match="TextareaDomain" mode="model"> + <xsl:template match="BooleanDomain//xf-item" mode="model"> <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="languages" tunnel="yes"/> - <xsl:param name="idQuestion" tunnel="yes"/> - <xsl:param name="questionName" tunnel="yes"/> - <xsl:param name="labelQuestion" tunnel="yes"/> - <xsl:param name="declarations" as="node()*" tunnel="yes"/> - <xsl:param name="filterCondition" tunnel="yes"/> - - <xsl:param name="col-span" tunnel="yes"/> - <xsl:param name="row-span" tunnel="yes"/> - - <xsl:param name="typeOfAncestor" tunnel="yes"/> - <xsl:param name="position" tunnel="yes"/> - - <xsl:variable name="mandatory" select="enojs:is-required($source-context)" as="xs:boolean"/> - <xsl:variable name="componentType-Textarea" select="'Textarea'"/> - - <xsl:variable name="typeResponse" select="enojs:get-type($source-context)"/> - <xsl:variable name="lengthResponse" select="enojs:get-length($source-context)"/> - - <xsl:variable name="responseName" select="enojs:get-business-name($source-context)"/> - - <xsl:if test="$typeResponse !='' and $questionName!='' and $typeOfAncestor!='table'"> - <components xsi:type="{$componentType-Textarea}" componentType="{$componentType-Textarea}" id="{$idQuestion}" maxLength="{$lengthResponse}" mandatory="{$mandatory}"> - <label><xsl:value-of select="$labelQuestion"/></label> - <xsl:copy-of select="$declarations"/> - - <xsl:call-template name="enojs:addResponseToComponents"> - <xsl:with-param name="responseName" select="$responseName"/> - </xsl:call-template> - <conditionFilter><xsl:value-of select="$filterCondition"/></conditionFilter> - </components> - - <xsl:call-template name="enojs:addVariableCollected"> - <xsl:with-param name="responseName" select="$responseName"/> - <xsl:with-param name="responseRef" select="$responseName"/> - </xsl:call-template> - </xsl:if> - - <xsl:if test="$typeResponse !='' and $typeOfAncestor='table'"> - <cells componentType="{$componentType-Textarea}" id="{enojs:get-name($source-context)}" maxLength="{$lengthResponse}"> - <xsl:if test="$col-span>1"><xsl:attribute name="colspan" select="$col-span"/></xsl:if> - <xsl:if test="$row-span>1"><xsl:attribute name="rowspan" select="$row-span"/></xsl:if> - <xsl:copy-of select="$declarations"></xsl:copy-of> - <xsl:call-template name="enojs:addResponseToComponents"> - <xsl:with-param name="responseName" select="$responseName"/> - </xsl:call-template> - </cells> - - <xsl:call-template name="enojs:addVariableCollected"> - <xsl:with-param name="responseName" select="$responseName"/> - <xsl:with-param name="responseRef" select="$responseName"/> - </xsl:call-template> + + <xsl:variable name="label" select="enojs:get-label($source-context, $languages[1])"/> + + <xsl:if test="$label !=''"> + <label><xsl:value-of select="$label"/></label> </xsl:if> - - <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> - <xsl:with-param name="driver" select="." tunnel="yes"/> - </xsl:apply-templates> </xsl:template> - + <xd:doc> <xd:desc> <xd:p>Match on the xf-output driver.</xd:p> @@ -816,33 +559,11 @@ <xsl:param name="responseName"/> <xsl:param name="responseType"/> <xsl:variable name="ResponseTypeEnum" select="'PREVIOUS,COLLECTED,FORCED,EDITED,INPUTED'" as="xs:string"/> - <xsl:variable name="responseContainer"> - <xsl:choose> - <xsl:when test="$responseType!=''"> - <xsl:value-of select="$responseType"/> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="'String'"/> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> <!-- responseType="{$responseType}" --> - <response name="{$responseName}" xsi:type="{concat('ResponseContainer',$responseContainer)}" > + <response name="{$responseName}" xsi:type="ResponseContainer{$responseType}" > <xsl:for-each select="tokenize($ResponseTypeEnum,',')"> <valueState valueType="{.}"> - <xsl:choose> - <xsl:when test="$responseType='Int'"> - <value xsi:nil="true"/> - <!--<value><xsl:value-of select="false()"/></value>--> - </xsl:when> - <xsl:when test="$responseType='Boolean'"> - <value xsi:nil="true"/> - <!--<value><xsl:value-of select="false()"/></value>--> - </xsl:when> - <xsl:otherwise> - <value xsi:nil="true"/> - </xsl:otherwise> - </xsl:choose> + <value xsi:nil="true"/> </valueState> </xsl:for-each> </response> @@ -890,5 +611,4 @@ </variables> </xsl:template> - </xsl:stylesheet> \ No newline at end of file diff --git a/src/test/resources/ddi-to-js/out.xml b/src/test/resources/ddi-to-js/out.xml index cadb23700..be7debb25 100644 --- a/src/test/resources/ddi-to-js/out.xml +++ b/src/test/resources/ddi-to-js/out.xml @@ -120,6 +120,7 @@ id="j334cyqb" mandatory="false"> <label>➡ 5. When was the first episode of the Simpsons?</label> + <dateFormat>jj/mm/aaaa</dateFormat> <declarations declarationType="COMMENT" id="j334cyqb-d11" position="AFTER_QUESTION_TEXT"> @@ -143,7 +144,6 @@ </valueState> </response> <conditionFilter>#if((!( $READY != '1')))normal#{else}hidden#end</conditionFilter> - <dateFormat>jj/mm/aaaa</dateFormat> </components> <components xsi:type="InputNumber" componentType="InputNumber" @@ -988,8 +988,8 @@ <value>A1</value> <label>Ice creams</label> </cells> - <cells componentType="InputNumber" - id="j4nwc63q-QOP-jbgde5yl" + <cells id="j4nwc63q-QOP-jbgde5yl" + componentType="InputNumber" min="0.0" max="100.0" decimals="1"> @@ -1018,8 +1018,8 @@ <value>A2</value> <label>Jasper Beardly</label> </cells> - <cells componentType="InputNumber" - id="j4nwc63q-QOP-jbgd2x2t" + <cells id="j4nwc63q-QOP-jbgd2x2t" + componentType="InputNumber" min="0.0" max="100.0" decimals="1"> @@ -1052,8 +1052,8 @@ <value>B1</value> <label>Bacon</label> </cells> - <cells componentType="InputNumber" - id="j4nwc63q-QOP-jbgdjypz" + <cells id="j4nwc63q-QOP-jbgdjypz" + componentType="InputNumber" min="0.0" max="100.0" decimals="1"> @@ -1082,8 +1082,8 @@ <value>B2</value> <label>Pork chop</label> </cells> - <cells componentType="InputNumber" - id="j4nwc63q-QOP-jbgdcftu" + <cells id="j4nwc63q-QOP-jbgdcftu" + componentType="InputNumber" min="0.0" max="100.0" decimals="1"> @@ -1112,8 +1112,8 @@ <value>B3</value> <label>Chicken</label> </cells> - <cells componentType="InputNumber" - id="j4nwc63q-QOP-jbgdiyfe" + <cells id="j4nwc63q-QOP-jbgdiyfe" + componentType="InputNumber" min="0.0" max="100.0" decimals="1"> @@ -1146,8 +1146,8 @@ <value>C1</value> <label>Powersauce</label> </cells> - <cells componentType="InputNumber" - id="j4nwc63q-QOP-jbgdj1wd" + <cells id="j4nwc63q-QOP-jbgdj1wd" + componentType="InputNumber" min="0.0" max="100.0" decimals="1"> @@ -1176,8 +1176,8 @@ <value>D</value> <label>Other</label> </cells> - <cells componentType="InputNumber" - id="j4nwc63q-QOP-jbgddylk" + <cells id="j4nwc63q-QOP-jbgddylk" + componentType="InputNumber" min="0.0" max="100.0" decimals="1"> @@ -1264,7 +1264,7 @@ </valueState> </response> </cells> - <cells componentType="Textarea" id="j4nw0rr6-QOP-jbgdit3o" maxLength="255"> + <cells id="j4nw0rr6-QOP-jbgdit3o" componentType="Textarea" maxLength="255"> <response name="CLOWNING12" xsi:type="ResponseContainerString"> <valueState valueType="PREVIOUS"> <value xsi:nil="true"/> @@ -1324,7 +1324,7 @@ </valueState> </response> </cells> - <cells componentType="Textarea" id="j4nw0rr6-QOP-jbgd366k" maxLength="255"> + <cells id="j4nw0rr6-QOP-jbgd366k" componentType="Textarea" maxLength="255"> <response name="CLOWNING22" xsi:type="ResponseContainerString"> <valueState valueType="PREVIOUS"> <value xsi:nil="true"/> @@ -1384,7 +1384,7 @@ </valueState> </response> </cells> - <cells componentType="Textarea" id="j4nw0rr6-QOP-jbgdax06" maxLength="255"> + <cells id="j4nw0rr6-QOP-jbgdax06" componentType="Textarea" maxLength="255"> <response name="CLOWNING32" xsi:type="ResponseContainerString"> <valueState valueType="PREVIOUS"> <value xsi:nil="true"/> @@ -1444,7 +1444,7 @@ </valueState> </response> </cells> - <cells componentType="Textarea" id="j4nw0rr6-QOP-jbgdfo1j" maxLength="255"> + <cells id="j4nw0rr6-QOP-jbgdfo1j" componentType="Textarea" maxLength="255"> <response name="CLOWNING42" xsi:type="ResponseContainerString"> <valueState valueType="PREVIOUS"> <value xsi:nil="true"/> @@ -2007,7 +2007,7 @@ </cells> <lines min="1" max="10"/> <cells type="line"> - <cells componentType="Textarea" id="j6qg8rc6-QOP-jbgdl5jb" maxLength="255"> + <cells id="j6qg8rc6-QOP-jbgdl5jb" componentType="Textarea" maxLength="255"> <response name="FAVOURITE_CHARACTERS11" xsi:type="ResponseContainerString"> <valueState valueType="PREVIOUS"> <value xsi:nil="true"/> @@ -2026,8 +2026,8 @@ </valueState> </response> </cells> - <cells componentType="InputNumber" - id="j6qg8rc6-QOP-jbgdfndq" + <cells id="j6qg8rc6-QOP-jbgdfndq" + componentType="InputNumber" min="0" max="120" decimals="0"> @@ -2051,7 +2051,7 @@ </cells> </cells> <cells type="line"> - <cells componentType="Textarea" id="j6qg8rc6-QOP-jbgd8lwo" maxLength="255"> + <cells id="j6qg8rc6-QOP-jbgd8lwo" componentType="Textarea" maxLength="255"> <response name="FAVOURITE_CHARACTERS21" xsi:type="ResponseContainerString"> <valueState valueType="PREVIOUS"> <value xsi:nil="true"/> @@ -2070,8 +2070,8 @@ </valueState> </response> </cells> - <cells componentType="InputNumber" - id="j6qg8rc6-QOP-jbgd7osi" + <cells id="j6qg8rc6-QOP-jbgd7osi" + componentType="InputNumber" min="0" max="120" decimals="0"> @@ -2095,7 +2095,7 @@ </cells> </cells> <cells type="line"> - <cells componentType="Textarea" id="j6qg8rc6-QOP-jbgdbfag" maxLength="255"> + <cells id="j6qg8rc6-QOP-jbgdbfag" componentType="Textarea" maxLength="255"> <response name="FAVOURITE_CHARACTERS31" xsi:type="ResponseContainerString"> <valueState valueType="PREVIOUS"> <value xsi:nil="true"/> @@ -2114,8 +2114,8 @@ </valueState> </response> </cells> - <cells componentType="InputNumber" - id="j6qg8rc6-QOP-jbgd7bnw" + <cells id="j6qg8rc6-QOP-jbgd7bnw" + componentType="InputNumber" min="0" max="120" decimals="0"> @@ -2139,7 +2139,7 @@ </cells> </cells> <cells type="line"> - <cells componentType="Textarea" id="j6qg8rc6-QOP-jbgdlgja" maxLength="255"> + <cells id="j6qg8rc6-QOP-jbgdlgja" componentType="Textarea" maxLength="255"> <response name="FAVOURITE_CHARACTERS41" xsi:type="ResponseContainerString"> <valueState valueType="PREVIOUS"> <value xsi:nil="true"/> @@ -2158,8 +2158,8 @@ </valueState> </response> </cells> - <cells componentType="InputNumber" - id="j6qg8rc6-QOP-jbgd9k71" + <cells id="j6qg8rc6-QOP-jbgd9k71" + componentType="InputNumber" min="0" max="120" decimals="0"> @@ -2183,7 +2183,7 @@ </cells> </cells> <cells type="line"> - <cells componentType="Textarea" id="j6qg8rc6-QOP-jbgd745y" maxLength="255"> + <cells id="j6qg8rc6-QOP-jbgd745y" componentType="Textarea" maxLength="255"> <response name="FAVOURITE_CHARACTERS51" xsi:type="ResponseContainerString"> <valueState valueType="PREVIOUS"> <value xsi:nil="true"/> @@ -2202,8 +2202,8 @@ </valueState> </response> </cells> - <cells componentType="InputNumber" - id="j6qg8rc6-QOP-jbgdimks" + <cells id="j6qg8rc6-QOP-jbgdimks" + componentType="InputNumber" min="0" max="120" decimals="0"> @@ -2227,7 +2227,7 @@ </cells> </cells> <cells type="line"> - <cells componentType="Textarea" id="j6qg8rc6-QOP-jbgdjkts" maxLength="255"> + <cells id="j6qg8rc6-QOP-jbgdjkts" componentType="Textarea" maxLength="255"> <response name="FAVOURITE_CHARACTERS61" xsi:type="ResponseContainerString"> <valueState valueType="PREVIOUS"> <value xsi:nil="true"/> @@ -2246,8 +2246,8 @@ </valueState> </response> </cells> - <cells componentType="InputNumber" - id="j6qg8rc6-QOP-jbgdjquz" + <cells id="j6qg8rc6-QOP-jbgdjquz" + componentType="InputNumber" min="0" max="120" decimals="0"> @@ -2271,7 +2271,7 @@ </cells> </cells> <cells type="line"> - <cells componentType="Textarea" id="j6qg8rc6-QOP-jbgdcax7" maxLength="255"> + <cells id="j6qg8rc6-QOP-jbgdcax7" componentType="Textarea" maxLength="255"> <response name="FAVOURITE_CHARACTERS71" xsi:type="ResponseContainerString"> <valueState valueType="PREVIOUS"> <value xsi:nil="true"/> @@ -2290,8 +2290,8 @@ </valueState> </response> </cells> - <cells componentType="InputNumber" - id="j6qg8rc6-QOP-jbgdd2w3" + <cells id="j6qg8rc6-QOP-jbgdd2w3" + componentType="InputNumber" min="0" max="120" decimals="0"> @@ -2315,7 +2315,7 @@ </cells> </cells> <cells type="line"> - <cells componentType="Textarea" id="j6qg8rc6-QOP-jbgdjye1" maxLength="255"> + <cells id="j6qg8rc6-QOP-jbgdjye1" componentType="Textarea" maxLength="255"> <response name="FAVOURITE_CHARACTERS81" xsi:type="ResponseContainerString"> <valueState valueType="PREVIOUS"> <value xsi:nil="true"/> @@ -2334,8 +2334,8 @@ </valueState> </response> </cells> - <cells componentType="InputNumber" - id="j6qg8rc6-QOP-jbgdkosc" + <cells id="j6qg8rc6-QOP-jbgdkosc" + componentType="InputNumber" min="0" max="120" decimals="0"> @@ -2359,7 +2359,7 @@ </cells> </cells> <cells type="line"> - <cells componentType="Textarea" id="j6qg8rc6-QOP-jbgd5jet" maxLength="255"> + <cells id="j6qg8rc6-QOP-jbgd5jet" componentType="Textarea" maxLength="255"> <response name="FAVOURITE_CHARACTERS91" xsi:type="ResponseContainerString"> <valueState valueType="PREVIOUS"> <value xsi:nil="true"/> @@ -2378,8 +2378,8 @@ </valueState> </response> </cells> - <cells componentType="InputNumber" - id="j6qg8rc6-QOP-jbgdk0x4" + <cells id="j6qg8rc6-QOP-jbgdk0x4" + componentType="InputNumber" min="0" max="120" decimals="0"> @@ -2403,7 +2403,7 @@ </cells> </cells> <cells type="line"> - <cells componentType="Textarea" id="j6qg8rc6-QOP-jbgdjw90" maxLength="255"> + <cells id="j6qg8rc6-QOP-jbgdjw90" componentType="Textarea" maxLength="255"> <response name="FAVOURITE_CHARACTERS101" xsi:type="ResponseContainerString"> <valueState valueType="PREVIOUS"> <value xsi:nil="true"/> @@ -2422,8 +2422,8 @@ </valueState> </response> </cells> - <cells componentType="InputNumber" - id="j6qg8rc6-QOP-jbgd2wgf" + <cells id="j6qg8rc6-QOP-jbgd2wgf" + componentType="InputNumber" min="0" max="120" decimals="0"> From 2bc1d20801d21b92eb69a755f64c043a93aebbf8 Mon Sep 17 00:00:00 2001 From: BulotF <francois.bulot@insee.fr> Date: Wed, 4 Sep 2019 10:04:08 +0200 Subject: [PATCH 089/439] enojs : add code comments --- src/main/resources/xslt/outputs/js/models.xsl | 207 +++++++++--------- .../transformations/ddi2js/ddi2js-fixed.xsl | 8 +- 2 files changed, 111 insertions(+), 104 deletions(-) diff --git a/src/main/resources/xslt/outputs/js/models.xsl b/src/main/resources/xslt/outputs/js/models.xsl index 60434cae4..22b423ed7 100644 --- a/src/main/resources/xslt/outputs/js/models.xsl +++ b/src/main/resources/xslt/outputs/js/models.xsl @@ -8,33 +8,25 @@ xmlns:enojs="http://xml.insee.fr/apps/eno/out/js" xmlns="http://xml.insee.fr/schema/applis/lunatic-h" exclude-result-prefixes="xs fn xd eno enojs" version="2.0"> - + <xsl:param name="properties-file"/> <xsl:param name="parameters-file"/> <xsl:param name="parameters-node" as="node()" required="no"> <empty/> </xsl:param> <xsl:param name="labels-folder"/> - + <xsl:variable name="properties" select="doc($properties-file)"/> - + <xd:doc scope="stylesheet"> <xd:desc> <xd:p>An xslt stylesheet who transforms an input into js through generic driver templates.</xd:p> <xd:p>The real input is mapped with the drivers.</xd:p> </xd:desc> </xd:doc> - + <xsl:variable name="varName" select="parent"/> - - <!-- filters must lead to their children --> - <xsl:template match="xf-group" mode="model" priority="-1"> - <xsl:param name="source-context" as="item()" tunnel="yes"/> - <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> - <xsl:with-param name="driver" select="." tunnel="yes"/> - </xsl:apply-templates> - </xsl:template> - + <xsl:template match="ResponseElement" mode="model"> <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="finding"/> @@ -52,7 +44,7 @@ </xsl:otherwise> </xsl:choose> </xsl:template> - + <xd:doc> <xd:desc> <xd:p>Match on Form driver.</xd:p> @@ -73,7 +65,7 @@ </xsl:apply-templates> </Questionnaire> </xsl:template> - + <xd:doc> <xd:desc> <xd:p>Match on Module and SubModule drivers.</xd:p> @@ -101,6 +93,19 @@ </components> </xsl:template> + <xd:doc> + <xd:desc>filters do not create a component because their condition is borne by each of their descendants</xd:desc> + </xd:doc> + <xsl:template match="xf-group" mode="model" priority="-1"> + <xsl:param name="source-context" as="item()" tunnel="yes"/> + <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> + <xsl:with-param name="driver" select="." tunnel="yes"/> + </xsl:apply-templates> + </xsl:template> + + <xd:doc> + <xd:desc>SingleResponseQuestion driver does not create a component : it is created by its response</xd:desc> + </xd:doc> <xsl:template match="SingleResponseQuestion | MultipleQuestion" mode="model"> <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="languages" tunnel="yes"/> @@ -115,7 +120,10 @@ <xsl:with-param name="filterCondition" select="enojs:get-global-filter($source-context)" tunnel="yes"/> </xsl:apply-templates> </xsl:template> - + + <xd:doc> + <xd:desc>MultipleChoiceQuestion driver creates a CheckboxGroup component</xd:desc> + </xd:doc> <xsl:template match="MultipleChoiceQuestion" mode="model"> <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="languages" tunnel="yes"/> @@ -137,7 +145,10 @@ </xsl:apply-templates> </components> </xsl:template> - + + <xd:doc> + <xd:desc>Table / TableLoop drivers create a Table component</xd:desc> + </xd:doc> <xsl:template match="Table | TableLoop" mode="model"> <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="languages" tunnel="yes"/> @@ -147,12 +158,12 @@ <xsl:variable name="mandatory" select="enojs:is-required($source-context)" as="xs:boolean"/> <xsl:variable name="nbMinimumLines" select="enojs:get-minimum-lines($source-context)"/> <xsl:variable name="nbMaximumLines" select="enojs:get-maximum-lines($source-context)"/> - + <components xsi:type="{$componentType}" componentType="{$componentType}" id="{$idQuestion}" positioning="HORIZONTAL" mandatory="{$mandatory}"> <label><xsl:value-of select="enojs:get-label($source-context, $languages[1])"/></label> <xsl:copy-of select="enojs:getInstructionForQuestion($source-context,.)"/> <conditionFilter><xsl:value-of select="enojs:get-global-filter($source-context)"/></conditionFilter> - + <xsl:for-each select="enojs:get-header-lines($source-context)"> <cells type="header"> <xsl:apply-templates select="enojs:get-header-line($source-context,position())" mode="source"> @@ -161,7 +172,7 @@ </xsl:apply-templates> </cells> </xsl:for-each> - + <xsl:for-each select="enojs:get-body-lines($source-context)"> <cells type="line"> <xsl:apply-templates select="enojs:get-body-line($source-context,position())" mode="source"> @@ -170,32 +181,29 @@ <xsl:with-param name="questionName" select="enojs:get-question-name($source-context,$languages[1])" tunnel="yes"/> </xsl:apply-templates> </cells> - </xsl:for-each> - + </xsl:for-each> + <xsl:if test="$nbMinimumLines!='' and $nbMaximumLines!=''"> <lines min="{$nbMinimumLines}" max="{$nbMaximumLines}"/> </xsl:if> </components> </xsl:template> - + <xd:doc> <xd:desc> - <xd:p>Match on the TextCell driver.</xd:p> - <xd:p>It displays the headers on the top and the left.</xd:p> + <xd:p>TextCell driver displays the header cells, for columns and lines.</xd:p> </xd:desc> </xd:doc> <xsl:template match="TextCell" mode="model"> <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="languages" tunnel="yes"/> <xsl:param name="idColumn" tunnel="yes"/> - + <xsl:variable name="col-span" select="number(enojs:get-colspan($source-context))"/> <xsl:variable name="row-span" select="number(enojs:get-rowspan($source-context))"/> <xsl:variable name="id" select="enojs:get-name($source-context)"/> - - - <xsl:variable name="label" select="enojs:get-label($source-context,$languages)"/> + <cells> <xsl:if test="ancestor::headerLine"> <xsl:attribute name="headerCell" select="true()"/> @@ -208,11 +216,10 @@ <label><xsl:value-of select="$label"/></label> </cells> </xsl:template> - + <xd:doc> <xd:desc> - <xd:p>Match on the Cell driver.</xd:p> - <xd:p>Create a cell and call templates for children to fill the cell.</xd:p> + <xd:p>The Cell driver gives the colspan and the rowspan to the Response, which creates the cell.</xd:p> </xd:desc> </xd:doc> <xsl:template match="Cell" mode="model"> @@ -224,11 +231,10 @@ <xsl:with-param name="row-span" select="number(enojs:get-rowspan($source-context))" tunnel="yes"/> </xsl:apply-templates> </xsl:template> - + <xd:doc> <xd:desc> - <xd:p>Match on the EmptyCell driver.</xd:p> - <xd:p>Create a cell and call templates for children to fill the cell (a priori nothing).</xd:p> + <xd:p>The EmptyCell driver creates an empty cell.</xd:p> </xd:desc> </xd:doc> <xsl:template match="EmptyCell" mode="model"> @@ -236,10 +242,10 @@ <xsl:param name="ancestorTable" tunnel="yes"/> <xsl:param name="languages" tunnel="yes"/> <xsl:param name="idColumn" tunnel="yes"/> - + <xsl:variable name="col-span" select="number(enojs:get-colspan($source-context))"/> <xsl:variable name="row-span" select="number(enojs:get-rowspan($source-context))"/> - + <xsl:choose> <xsl:when test="ancestor::headerLine"> <cells headerCell="true"> @@ -259,7 +265,7 @@ <xd:doc> <xd:desc> - <xd:p>Match on Response Domains driver in SingleResponseQuestion and MultipleQuestion.</xd:p> + <xd:p>The Response drivers in SingleResponseQuestion and MultipleQuestion create a component, which type depends on the Response driver.</xd:p> </xd:desc> </xd:doc> <xsl:template match="*[name(.) =('SingleResponseQuestion','MultipleQuestion')]//*[name(.) =('NumericDomain','TextDomain','TextareaDomain','DateTimeDomain','CodeDomain','BooleanDomain')]" mode="model"> @@ -270,7 +276,7 @@ <xsl:param name="languages" tunnel="yes"/> <xsl:param name="declarations" as="node()*" tunnel="yes"/> <xsl:param name="filterCondition" tunnel="yes"/> - + <xsl:variable name="responseName" select="enojs:get-business-name($source-context)"/> <xsl:variable name="responseType"> <xsl:choose> @@ -306,7 +312,7 @@ <xsl:variable name="lengthResponse" select="enojs:get-length($source-context)"/> <!-- DateTimeDomain getters --> <xsl:variable name="dateFormat" select="enojs:get-format($source-context)"/> - + <xsl:if test="$questionName!=''"> <components xsi:type="{$componentType}" componentType="{$componentType}" id="{$idQuestion}"> <xsl:if test="$lengthResponse!='' and (self::TextDomain or self::TextareaDomain)"><xsl:attribute name="maxLength" select="$lengthResponse"/></xsl:if> @@ -332,15 +338,15 @@ <conditionFilter><xsl:value-of select="$filterCondition"/></conditionFilter> </components> </xsl:if> - <xsl:call-template name="enojs:addVariableCollected"> - <xsl:with-param name="responseName" select="$responseName"/> - <xsl:with-param name="responseRef" select="$responseName"/> - </xsl:call-template> + <variables variableType="COLLECTED"> + <name><xsl:value-of select="$responseName"/></name> + <responseRef><xsl:value-of select="$responseRef"/></responseRef> + </variables> </xsl:template> <xd:doc> <xd:desc> - <xd:p>Match on Response Domains driver in tables.</xd:p> + <xd:p>The Response drivers in the body lines of tables create a cell, which type depends on the Response driver.</xd:p> </xd:desc> </xd:doc> <xsl:template match="bodyLine//*[name(.) =('NumericDomain','TextDomain','TextareaDomain','DateTimeDomain','CodeDomain','BooleanDomain')]" mode="model"> @@ -349,7 +355,7 @@ <xsl:param name="languages" tunnel="yes"/> <xsl:param name="col-span" tunnel="yes"/> <xsl:param name="row-span" tunnel="yes"/> - + <xsl:variable name="responseName" select="enojs:get-business-name($source-context)"/> <xsl:variable name="responseType"> <xsl:choose> @@ -385,7 +391,7 @@ <xsl:variable name="lengthResponse" select="enojs:get-length($source-context)"/> <!-- DateTimeDomain getters --> <xsl:variable name="dateFormat" select="enojs:get-format($source-context)"/> - + <cells id="{enojs:get-name($source-context)}" componentType="{$componentType}"> <xsl:if test="$lengthResponse!='' and (self::TextDomain or self::TextareaDomain)"><xsl:attribute name="maxLength" select="$lengthResponse"/></xsl:if> <xsl:if test="$col-span > 1"><xsl:attribute name="colspan" select="$col-span"/></xsl:if> @@ -407,22 +413,21 @@ <xsl:with-param name="responseType" select="$responseType"/> </xsl:call-template> </cells> - - <xsl:call-template name="enojs:addVariableCollected"> - <xsl:with-param name="responseName" select="$responseName"/> - <xsl:with-param name="responseRef" select="$responseName"/> - </xsl:call-template> + <variables variableType="COLLECTED"> + <name><xsl:value-of select="$responseName"/></name> + <responseRef><xsl:value-of select="$responseRef"/></responseRef> + </variables> </xsl:template> <xd:doc> <xd:desc> - <xd:p>Match on BooleanDomain driver.</xd:p> + <xd:p>The Response of MultipleChoiceQuestion creates a response element of the CheckboxGroup.</xd:p> </xd:desc> </xd:doc> <xsl:template match="MultipleChoiceQuestion//BooleanDomain" mode="model"> <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="languages" tunnel="yes"/> - + <xsl:variable name="responseName" select="enojs:get-business-name($source-context)"/> <responses id="{enojs:get-name($source-context)}"> @@ -435,15 +440,15 @@ <xsl:with-param name="responseType" select="'Boolean'"/> </xsl:call-template> </responses> - <xsl:call-template name="enojs:addVariableCollected"> - <xsl:with-param name="responseName" select="$responseName"/> - <xsl:with-param name="responseRef" select="$responseName"/> - </xsl:call-template> + <variables variableType="COLLECTED"> + <name><xsl:value-of select="$responseName"/></name> + <responseRef><xsl:value-of select="$responseRef"/></responseRef> + </variables> </xsl:template> - + <xd:doc> <xd:desc> - <xd:p>Match on the xf-item driver.</xd:p> + <xd:p>Each value of a CodeDomain response creates an option.</xd:p> </xd:desc> </xd:doc> <xsl:template match="CodeDomain//xf-item" mode="model"> @@ -451,15 +456,20 @@ <xsl:param name="languages" tunnel="yes"/> <xsl:variable name="label" select="enojs:get-label($source-context, $languages[1])"/> - + <xsl:if test="$label !=''"> <options> <value><xsl:value-of select="enojs:get-value($source-context)"/></value> <label><xsl:value-of select="$label"/></label> - </options> + </options> </xsl:if> </xsl:template> - + + <xd:doc> + <xd:desc> + <xd:p>The value of a BooleanDomain gives its label.</xd:p> + </xd:desc> + </xd:doc> <xsl:template match="BooleanDomain//xf-item" mode="model"> <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="languages" tunnel="yes"/> @@ -473,15 +483,14 @@ <xd:doc> <xd:desc> - <xd:p>Match on the xf-output driver.</xd:p> - <xd:p>Adding declarations elements.</xd:p> + <xd:p>The xf-output driver adds declaration elements.</xd:p> </xd:desc> </xd:doc> <xsl:template match="xf-output" mode="model"> <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="languages" tunnel="yes"/> <xsl:param name="positionDeclaration" tunnel="yes"></xsl:param> - + <xsl:variable name="instructionFormat"> <xsl:variable name="format" select="upper-case(enojs:get-format($source-context))"/> <xsl:choose> @@ -493,30 +502,29 @@ <xsl:variable name="instructionLabel" select="enojs:get-label($source-context, $languages[1])"/> <xsl:variable name="instructionFormatMaj" select="concat(upper-case(substring($instructionFormat,1,1)), substring($instructionFormat,2))" as="xs:string"/> - + <xsl:if test="$positionDeclaration!=''"> <declarations declarationType="{$instructionFormat}" id="{enojs:get-name($source-context)}" position="{$positionDeclaration}"> <label><xsl:value-of select="$instructionLabel"/></label> </declarations> </xsl:if> - + <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> <xsl:with-param name="driver" select="." tunnel="yes"/> </xsl:apply-templates> </xsl:template> - + <xd:doc> <xd:desc> - <xd:p>Match on the CalculatedVariable driver.</xd:p> - <xd:p>Its displays the formula of the calculated variable on the elements variables.</xd:p> + <xd:p>The CalculatedVariable driver displays the formula of the calculated variable on the elements variables.</xd:p> </xd:desc> </xd:doc> <xsl:template match="CalculatedVariable" mode="model"> <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="languages" tunnel="yes"/> - + <xsl:variable name="variableCalculation" select="enojs:get-variable-calculation($source-context)"/> - + <xsl:variable name="nameOutVariable" select="enojs:get-business-name($source-context)"/> <xsl:variable name="idVariables" select="tokenize(enojs:get-variable-calculation-variables($source-context),'\s')"/> <variables variableType="CALCULATED"> @@ -527,21 +535,21 @@ <xsl:call-template name="replaceVariablesInFormula"> <xsl:with-param name="formula" select="$variableCalculation"/> <xsl:with-param name="variables" select="$idVariables"/> - </xsl:call-template> + </xsl:call-template> </value> - + <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> <xsl:with-param name="driver" select="." tunnel="yes"/> </xsl:apply-templates> </variables> </xsl:template> - + <xd:doc> <xd:desc> <xd:p>Function named: enojs:printQuestionTitleWithInstruction.</xd:p> <xd:p>It prints the instructions of a question.</xd:p> </xd:desc> - </xd:doc> + </xd:doc> <xsl:function name="enojs:getInstructionForQuestion"> <xsl:param name="context" as="item()"/> <xsl:param name="driver"/> @@ -554,7 +562,13 @@ <xsl:with-param name="positionDeclaration" select="'AFTER_QUESTION_TEXT'" tunnel="yes"/> </xsl:apply-templates> </xsl:function> - + + <xd:doc> + <xd:desc> + <xd:p>Named template: enojs:addResponseToComponents.</xd:p> + <xd:p>It creates the response with its different possible states.</xd:p> + </xd:desc> + </xd:doc> <xsl:template name="enojs:addResponseToComponents"> <xsl:param name="responseName"/> <xsl:param name="responseType"/> @@ -568,47 +582,40 @@ </xsl:for-each> </response> </xsl:template> - + <xd:doc> <xd:desc> - <xd:p>Template named:replaceVariablesInFormula.</xd:p> - <xd:p>It replaces variables in a all formula (control, instruction, filter).</xd:p> + <xd:p>Recursive named template: enojs:replaceVariablesInFormula.</xd:p> + <xd:p>It replaces variables in a all formula (filter, control, personalized text, calculated variable).</xd:p> <xd:p>"number(if (¤idVariable¤='') then '0' else ¤idVariable¤)" -> "variableName"</xd:p> <xd:p>"¤idVariable¤" -> "variableName"</xd:p> </xd:desc> </xd:doc> - <xsl:template name="replaceVariablesInFormula"> + <xsl:template name="enojs:replaceVariablesInFormula"> <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="formula"/> <xsl:param name="variables" as="xs:string*"/> - + <xsl:choose> <xsl:when test="count($variables)=0"> <xsl:value-of select="$formula"/> </xsl:when> <xsl:otherwise> <xsl:variable name="regexA" select="concat('number\(if\s+\(',$conditioning-variable-begin,$variables[1],$conditioning-variable-end,'=''''\)\sthen\s+''0''\s+else\s+',$conditioning-variable-begin,$variables[1],$conditioning-variable-end,'\)')"/> - <xsl:variable name="regexB" select="concat($conditioning-variable-begin,$variables[1],$conditioning-variable-end)"/> - <xsl:variable name="expressionToReplace" select="concat('\$',enojs:get-variable-business-name($source-context,$variables[1]))"/> + <xsl:variable name="regexB" select="concat($conditioning-variable-begin,$variables[1],$conditioning-variable-end)"/> + <xsl:variable name="expressionToReplace" select="concat('\$',enojs:get-variable-business-name($source-context,$variables[1]))"/> <xsl:variable name="newFormula" select="replace(replace($formula, - $regexA,$expressionToReplace), - $regexB,$expressionToReplace)"/> - - <xsl:call-template name="replaceVariablesInFormula"> + $regexA, + $expressionToReplace), + $regexB, + $expressionToReplace)"/> + + <xsl:call-template name="enojs:replaceVariablesInFormula"> <xsl:with-param name="formula" select="$newFormula"/> <xsl:with-param name="variables" select="$variables[position() > 1]"/> </xsl:call-template> </xsl:otherwise> - </xsl:choose> - </xsl:template> - - <xsl:template name="enojs:addVariableCollected"> - <xsl:param name="responseName"/> - <xsl:param name="responseRef"/> - <variables variableType="COLLECTED"> - <name><xsl:value-of select="$responseName"/></name> - <responseRef><xsl:value-of select="$responseRef"/></responseRef> - </variables> + </xsl:choose> </xsl:template> - + </xsl:stylesheet> \ No newline at end of file diff --git a/src/main/resources/xslt/transformations/ddi2js/ddi2js-fixed.xsl b/src/main/resources/xslt/transformations/ddi2js/ddi2js-fixed.xsl index d73364174..1ed6d3bf9 100644 --- a/src/main/resources/xslt/transformations/ddi2js/ddi2js-fixed.xsl +++ b/src/main/resources/xslt/transformations/ddi2js/ddi2js-fixed.xsl @@ -188,7 +188,7 @@ </xsl:for-each> </xsl:variable> <xsl:variable name="relevant-condition"> - <xsl:call-template name="replaceVariablesInFormula"> + <xsl:call-template name="enojs:replaceVariablesInFormula"> <xsl:with-param name="source-context" select="$context" as="item()" tunnel="yes"/> <xsl:with-param name="formula" select="$initial-relevant-ancestors"/> <xsl:with-param name="variables" select="$variablesId"/> @@ -203,7 +203,7 @@ </xsl:for-each> </xsl:variable> <xsl:variable name="readonly-condition"> - <xsl:call-template name="replaceVariablesInFormula"> + <xsl:call-template name="enojs:replaceVariablesInFormula"> <xsl:with-param name="source-context" select="$context" as="item()" tunnel="yes"/> <xsl:with-param name="formula" select="$initial-readonly-ancestors"/> <xsl:with-param name="variables" select="$variablesId"/> @@ -238,7 +238,7 @@ </xsl:for-each> </xsl:variable> <xsl:variable name="relevant-condition"> - <xsl:call-template name="replaceVariablesInFormula"> + <xsl:call-template name="enojs:replaceVariablesInFormula"> <xsl:with-param name="source-context" select="$context" as="item()" tunnel="yes"/> <xsl:with-param name="formula" select="$initial-relevant-ancestors"/> <xsl:with-param name="variables" select="$variablesId"/> @@ -260,7 +260,7 @@ </xsl:for-each> </xsl:variable> <xsl:variable name="readonly-condition"> - <xsl:call-template name="replaceVariablesInFormula"> + <xsl:call-template name="enojs:replaceVariablesInFormula"> <xsl:with-param name="source-context" select="$context" as="item()" tunnel="yes"/> <xsl:with-param name="formula" select="$initial-readonly-ancestors"/> <xsl:with-param name="variables" select="$variablesId"/> From 9e0455f0d51c8ebfd69ed2424a37d88c592d2134 Mon Sep 17 00:00:00 2001 From: BulotF <francois.bulot@insee.fr> Date: Wed, 4 Sep 2019 10:22:46 +0200 Subject: [PATCH 090/439] Update models.xsl --- src/main/resources/xslt/outputs/js/models.xsl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/resources/xslt/outputs/js/models.xsl b/src/main/resources/xslt/outputs/js/models.xsl index 22b423ed7..a8d0ce1d9 100644 --- a/src/main/resources/xslt/outputs/js/models.xsl +++ b/src/main/resources/xslt/outputs/js/models.xsl @@ -340,7 +340,7 @@ </xsl:if> <variables variableType="COLLECTED"> <name><xsl:value-of select="$responseName"/></name> - <responseRef><xsl:value-of select="$responseRef"/></responseRef> + <responseRef><xsl:value-of select="$responseName"/></responseRef> </variables> </xsl:template> @@ -415,7 +415,7 @@ </cells> <variables variableType="COLLECTED"> <name><xsl:value-of select="$responseName"/></name> - <responseRef><xsl:value-of select="$responseRef"/></responseRef> + <responseRef><xsl:value-of select="$responseName"/></responseRef> </variables> </xsl:template> @@ -442,7 +442,7 @@ </responses> <variables variableType="COLLECTED"> <name><xsl:value-of select="$responseName"/></name> - <responseRef><xsl:value-of select="$responseRef"/></responseRef> + <responseRef><xsl:value-of select="$responseName"/></responseRef> </variables> </xsl:template> @@ -532,7 +532,7 @@ <xsl:value-of select="$nameOutVariable"/> </name> <value> - <xsl:call-template name="replaceVariablesInFormula"> + <xsl:call-template name="enojs:replaceVariablesInFormula"> <xsl:with-param name="formula" select="$variableCalculation"/> <xsl:with-param name="variables" select="$idVariables"/> </xsl:call-template> From ab0dd301ffd9be1296061e5a0629771d402e3339 Mon Sep 17 00:00:00 2001 From: CHTAINET Badr <Badr.CHTAINET@akka.eu> Date: Wed, 4 Sep 2019 11:23:05 +0200 Subject: [PATCH 091/439] 189D optimize code --- .../resources/xslt/outputs/ddi/models.xsl | 67 +- src/test/resources/pogues-xml-to-ddi/out.xml | 2548 ++++++++--------- 2 files changed, 1307 insertions(+), 1308 deletions(-) diff --git a/src/main/resources/xslt/outputs/ddi/models.xsl b/src/main/resources/xslt/outputs/ddi/models.xsl index a459b15a7..540102e38 100644 --- a/src/main/resources/xslt/outputs/ddi/models.xsl +++ b/src/main/resources/xslt/outputs/ddi/models.xsl @@ -1057,11 +1057,10 @@ <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="agency" as="xs:string" tunnel="yes"/> </xsl:template> - + <xsl:template match="driver-Binding//Clarification" mode="model" priority="2"> <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="agency" as="xs:string" tunnel="yes"/> - <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> <xsl:with-param name="driver" select="." tunnel="yes"/> </xsl:apply-templates> @@ -1114,42 +1113,42 @@ </xsl:template> <!-- Question with a complementary sub-response for clarification which are linked to each other --> - <xsl:template match="driver-SMRD//ResponseDomain[not(ancestor::Clarification)]" mode="model" priority="1"> - <xsl:param name="source-context" as="item()" tunnel="yes"/> - <xsl:param name="agency" as="xs:string" tunnel="yes"/> - <d:ResponseDomainInMixed attachmentBase="1"> - <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> - <xsl:with-param name="driver" select="." tunnel="yes"/> - </xsl:apply-templates> - </d:ResponseDomainInMixed> - </xsl:template> - + <xsl:template match="driver-SMRD//ResponseDomain[not(ancestor::Clarification)]" mode="model" priority="1"> + <xsl:param name="source-context" as="item()" tunnel="yes"/> + <xsl:param name="agency" as="xs:string" tunnel="yes"/> + <d:ResponseDomainInMixed attachmentBase="1"> + <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> + <xsl:with-param name="driver" select="." tunnel="yes"/> + </xsl:apply-templates> + </d:ResponseDomainInMixed> + </xsl:template> + <!-- Clarification --> - <xsl:template match="driver-SMRD//Clarification" mode="model" priority="1"> - <xsl:param name="source-context" as="item()" tunnel="yes"/> - <xsl:param name="agency" as="xs:string" tunnel="yes"/> - <xsl:param name="idList" as="xs:string" tunnel="yes"/> - <xsl:param name="clarificationVal" as="xs:string" tunnel="yes"/> - <d:ResponseDomainInMixed> - <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> + <xsl:template match="driver-SMRD//Clarification" mode="model" priority="1"> + <xsl:param name="source-context" as="item()" tunnel="yes"/> + <xsl:param name="agency" as="xs:string" tunnel="yes"/> + <xsl:param name="idList" as="xs:string" tunnel="yes"/> + <xsl:param name="clarificationVal" as="xs:string" tunnel="yes"/> + <d:ResponseDomainInMixed> + <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> <xsl:with-param name="driver" select="eno:append-empty-element('driver-ClarificationResponseDomain', .)" tunnel="yes"/> <xsl:with-param name="agency" select="$agency" as="xs:string" tunnel="yes"/> <xsl:with-param name="label" select="enoddi33:get-label($source-context)" as="xs:string" tunnel="yes"/> - </xsl:apply-templates> - <d:AttachmentLocation> - <d:DomainSpecificValue attachmentDomain="1"> + </xsl:apply-templates> + <d:AttachmentLocation> + <d:DomainSpecificValue attachmentDomain="1"> <r:Value><xsl:value-of select="$clarificationVal"/></r:Value> - </d:DomainSpecificValue> - <r:CodeReference> - <r:Agency><xsl:value-of select="$agency"/></r:Agency> + </d:DomainSpecificValue> + <r:CodeReference> + <r:Agency><xsl:value-of select="$agency"/></r:Agency> <r:ID><xsl:value-of select="$idList"/>-<xsl:value-of select="$clarificationVal"/></r:ID> <r:Version><xsl:value-of select="enoddi33:get-version($source-context)"/></r:Version> - <r:TypeOfObject>Code</r:TypeOfObject> - </r:CodeReference> - </d:AttachmentLocation> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </d:AttachmentLocation> </d:ResponseDomainInMixed> - </xsl:template> - + </xsl:template> + <xsl:template match="driver-SMGRD/ResponseDomain" mode="model" priority="3"> <xsl:param name="source-context" as="item()" tunnel="yes"/> <xsl:param name="agency" as="xs:string" tunnel="yes"/> @@ -1189,10 +1188,10 @@ <xsl:with-param name="driver" select="eno:append-empty-element('driver-SMRD', .)" tunnel="yes"/> <xsl:with-param name="idList" select="enoddi33:get-code-list-id($source-context)" tunnel="yes"/> <xsl:with-param name="clarificationVal" select='normalize-space(replace($clarificationExp,"'",""))' tunnel="yes"/> - </xsl:apply-templates> - </d:StructuredMixedResponseDomain> - </xsl:template> - + </xsl:apply-templates> + </d:StructuredMixedResponseDomain> + </xsl:template> + <!-- This template is only matched when call just after driver-ResponseDomain (why it got 3 priority), to check if SMR is needed. --> <xsl:template match="driver-ResponseDomain/QuestionDynamicTable | driver-ResponseDomain/QuestionTable | driver-ResponseDomain/QuestionMultipleChoice" mode="model" priority="3"> <xsl:param name="source-context" as="item()" tunnel="yes"/> diff --git a/src/test/resources/pogues-xml-to-ddi/out.xml b/src/test/resources/pogues-xml-to-ddi/out.xml index 52605f2ac..91c318197 100644 --- a/src/test/resources/pogues-xml-to-ddi/out.xml +++ b/src/test/resources/pogues-xml-to-ddi/out.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?><DDIInstance xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="ddi:instance:3_3" xmlns:g="ddi:group:3_3" xmlns:d="ddi:datacollection:3_3" xmlns:s="ddi:studyunit:3_3" xmlns:r="ddi:reusable:3_3" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:a="ddi:archive:3_3" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:l="ddi:logicalproduct:3_3" xsi:schemaLocation="ddi:instance:3_3 https://www.ddialliance.org/Specification/DDI-Lifecycle/3.3/XMLSchema/instance.xsd" isMaintainable="true"> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-i6vwi0</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Citation> <r:Title> <r:String>Questionnaire SIMPSONS</r:String> @@ -10,18 +10,18 @@ <g:ResourcePackage isMaintainable="true" versionDate="2018-01-25+01:00"> <r:Agency>fr.insee</r:Agency> <r:ID>RessourcePackage-i6vwi0</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <d:InterviewerInstructionScheme> <r:Agency>fr.insee</r:Agency> <r:ID>InterviewerInstructionScheme-i6vwi0</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">A définir</r:Content> </r:Label> <d:Instruction> <r:Agency>fr.insee</r:Agency> <r:ID>d1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <d:InstructionName> <r:String xml:lang="fr-FR">comment</r:String> </d:InstructionName> @@ -34,7 +34,7 @@ <d:Instruction> <r:Agency>fr.insee</r:Agency> <r:ID>d11</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <d:InstructionName> <r:String xml:lang="fr-FR">comment</r:String> </d:InstructionName> @@ -48,7 +48,7 @@ <d:Instruction> <r:Agency>fr.insee</r:Agency> <r:ID>d2</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <d:InstructionName> <r:String xml:lang="fr-FR">comment</r:String> </d:InstructionName> @@ -61,7 +61,7 @@ <d:Instruction> <r:Agency>fr.insee</r:Agency> <r:ID>d3</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <d:InstructionName> <r:String xml:lang="fr-FR">instruction</r:String> </d:InstructionName> @@ -74,7 +74,7 @@ <d:Instruction> <r:Agency>fr.insee</r:Agency> <r:ID>d4</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <d:InstructionName> <r:String xml:lang="fr-FR">instruction</r:String> </d:InstructionName> @@ -87,7 +87,7 @@ <d:Instruction> <r:Agency>fr.insee</r:Agency> <r:ID>d5</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <d:InstructionName> <r:String xml:lang="fr-FR">instruction</r:String> </d:InstructionName> @@ -100,7 +100,7 @@ <d:Instruction> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-II-0</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <d:InstructionName> <r:String xml:lang="fr-FR">warning</r:String> </d:InstructionName> @@ -113,7 +113,7 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-GOP</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> </d:ConditionalText> @@ -122,7 +122,7 @@ <d:Instruction> <r:Agency>fr.insee</r:Agency> <r:ID>d10</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <d:InstructionName> <r:String xml:lang="fr-FR">instruction</r:String> </d:InstructionName> @@ -132,15 +132,15 @@ </d:LiteralText> </d:InstructionText> </d:Instruction> - <d:Instruction><r:Agency>fr.insee</r:Agency><r:ID>FTN-INSTRUCTION-1</r:ID><r:Version>1</r:Version><d:InstructionName><r:String xml:lang="fr-FR">tooltip</r:String></d:InstructionName><d:InstructionText><d:LiteralText><d:Text xml:lang="fr-FR"><xhtml:p id="ftn1">Included principalities</xhtml:p></d:Text></d:LiteralText></d:InstructionText></d:Instruction></d:InterviewerInstructionScheme> + <d:Instruction><r:Agency>fr.insee</r:Agency><r:ID>FTN-INSTRUCTION-1</r:ID><r:Version>1.0</r:Version><d:InstructionName><r:String xml:lang="fr-FR">tooltip</r:String></d:InstructionName><d:InstructionText><d:LiteralText><d:Text xml:lang="fr-FR"><xhtml:p id="ftn1">Included principalities</xhtml:p></d:Text></d:LiteralText></d:InstructionText></d:Instruction></d:InterviewerInstructionScheme> <d:ControlConstructScheme> <r:Agency>fr.insee</r:Agency> <r:ID>ControlConstructScheme-i6vwi0</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <d:Sequence> <r:Agency>fr.insee</r:Agency> <r:ID>Sequence-i6vwi0</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Questionnaire SIMPSONS</r:Content> </r:Label> @@ -148,26 +148,26 @@ <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p0ti5h</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Sequence</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>d1e119</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>IfThenElse</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6z12s2d</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Sequence</r:TypeOfObject> </d:ControlConstructReference> </d:Sequence> <d:Sequence> <r:Agency>fr.insee</r:Agency> <r:ID>j6p0ti5h</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">MODULE1</r:String> </d:ConstructName> @@ -177,33 +177,33 @@ <d:InterviewerInstructionReference> <r:Agency>fr.insee</r:Agency> <r:ID>d1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Instruction</r:TypeOfObject> </d:InterviewerInstructionReference> <d:TypeOfSequence controlledVocabularyID="INSEE-TOS-CL-1">module</d:TypeOfSequence> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p3dkx6-QC</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p0np9q-QC</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>d1e50</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>IfThenElse</r:TypeOfObject> </d:ControlConstructReference> </d:Sequence> <d:Sequence> <r:Agency>fr.insee</r:Agency> <r:ID>j6p0s7o5</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">MODULE11</r:String> </d:ConstructName> @@ -214,32 +214,32 @@ <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j3343qhx-QC</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6q9h8tj-QC</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334cyqb-QC</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6z06z1e-QC</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> </d:Sequence> <d:Sequence> <r:Agency>fr.insee</r:Agency> <r:ID>j3341528</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">MODULE2</r:String> </d:ConstructName> @@ -249,33 +249,33 @@ <d:InterviewerInstructionReference> <r:Agency>fr.insee</r:Agency> <r:ID>d2</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Instruction</r:TypeOfObject> </d:InterviewerInstructionReference> <d:TypeOfSequence controlledVocabularyID="INSEE-TOS-CL-1">module</d:TypeOfSequence> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j3343clt-QC</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qdfhvw-QC</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw5cqz-QC</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> </d:Sequence> <d:Sequence> <r:Agency>fr.insee</r:Agency> <r:ID>j6qe0h9q</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">MODULE3</r:String> </d:ConstructName> @@ -286,38 +286,38 @@ <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-QC</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>d12-SI</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>StatementItem</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-QC</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-QC</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QC</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> </d:Sequence> <d:Sequence> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw88h2</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">MODULE4</r:String> </d:ConstructName> @@ -328,26 +328,26 @@ <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qe237q</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Sequence</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qejudb</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Sequence</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qeh91y</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Sequence</r:TypeOfObject> </d:ControlConstructReference> </d:Sequence> <d:Sequence> <r:Agency>fr.insee</r:Agency> <r:ID>j6qe237q</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">MODULE41</r:String> </d:ConstructName> @@ -358,20 +358,20 @@ <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QC</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>ComputationItem</r:TypeOfObject> </d:ControlConstructReference> </d:Sequence> <d:Sequence> <r:Agency>fr.insee</r:Agency> <r:ID>j6qejudb</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">MODULE42</r:String> </d:ConstructName> @@ -382,14 +382,14 @@ <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QC</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> </d:Sequence> <d:Sequence> <r:Agency>fr.insee</r:Agency> <r:ID>j6qeh91y</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">MODULE43</r:String> </d:ConstructName> @@ -400,14 +400,14 @@ <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QC</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> </d:Sequence> <d:Sequence> <r:Agency>fr.insee</r:Agency> <r:ID>j6qfx9qe</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">MODULE5</r:String> </d:ConstructName> @@ -418,14 +418,14 @@ <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QC</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> </d:Sequence> <d:Sequence> <r:Agency>fr.insee</r:Agency> <r:ID>j6z12s2d</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">MODULE6</r:String> </d:ConstructName> @@ -436,14 +436,14 @@ <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6z0z3us-QC</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> </d:Sequence> <d:IfThenElse> <r:Agency>fr.insee</r:Agency> <r:ID>d1e50</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">A définir</r:Content> </r:Label> @@ -457,7 +457,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>d1e50-IP-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">READY</r:String> </r:ParameterName> @@ -466,13 +466,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p0np9q-QOP-jbgd3set</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>d1e50-IP-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -482,28 +482,28 @@ <d:ThenConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>d1e50-THEN</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Sequence</r:TypeOfObject> </d:ThenConstructReference> </d:IfThenElse> <d:Sequence> <r:Agency>fr.insee</r:Agency> <r:ID>d1e50-THEN</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR"/> </r:Label> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p0s7o5</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Sequence</r:TypeOfObject> </d:ControlConstructReference> </d:Sequence> <d:IfThenElse> <r:Agency>fr.insee</r:Agency> <r:ID>d1e119</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">A définir</r:Content> </r:Label> @@ -517,7 +517,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>d1e119-IP-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">READY</r:String> </r:ParameterName> @@ -526,13 +526,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p0np9q-QOP-jbgd3set</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>d1e119-IP-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -542,298 +542,298 @@ <d:ThenConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>d1e119-THEN</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Sequence</r:TypeOfObject> </d:ThenConstructReference> </d:IfThenElse> <d:Sequence> <r:Agency>fr.insee</r:Agency> <r:ID>d1e119-THEN</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR"/> </r:Label> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j3341528</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Sequence</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qe0h9q</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Sequence</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw88h2</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Sequence</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qfx9qe</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Sequence</r:TypeOfObject> </d:ControlConstructReference> </d:Sequence> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j6p3dkx6-QC</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">COMMENT</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p3dkx6</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j6p0np9q-QC</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">READY</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p0np9q</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j3343qhx-QC</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">PRODUCER</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j3343qhx</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j6q9h8tj-QC</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">SEASON_NUMBER</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6q9h8tj</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j334cyqb-QC</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">DATEFIRST</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334cyqb</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j6z06z1e-QC</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">AUDIENCE_SHARE</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6z06z1e</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j3343clt-QC</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">CITY</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j3343clt</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j6qdfhvw-QC</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">MAYOR</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qdfhvw</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw5cqz-QC</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">STATE</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw5cqz</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-QC</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">PET</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-QC</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">ICE_FLAVOUR</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-QC</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">NUCLEAR_CHARACTER</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QC</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">BIRTH_CHARACTER</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QC</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QC</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">CLOWNING</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QC</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">TRAVEL</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QC</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j6z0z3us-QC</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">SURVEY_COMMENT</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6z0z3us</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:ComputationItem> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">Total of percentages</r:String> </d:ConstructName> @@ -843,7 +843,7 @@ <d:InterviewerInstructionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-II-0</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Instruction</r:TypeOfObject> </d:InterviewerInstructionReference> <d:TypeOfComputationItem controlledVocabularyID="INSEE-TOCI-CL-3">stumblingblock</d:TypeOfComputationItem> @@ -853,7 +853,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES11</r:String> </r:ParameterName> @@ -861,7 +861,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-2</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES21</r:String> </r:ParameterName> @@ -869,7 +869,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-3</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES31</r:String> </r:ParameterName> @@ -877,7 +877,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-4</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES41</r:String> </r:ParameterName> @@ -885,7 +885,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-5</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES51</r:String> </r:ParameterName> @@ -893,7 +893,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-6</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES61</r:String> </r:ParameterName> @@ -901,7 +901,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-7</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES71</r:String> </r:ParameterName> @@ -909,7 +909,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-8</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES81</r:String> </r:ParameterName> @@ -917,7 +917,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-9</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES91</r:String> </r:ParameterName> @@ -925,7 +925,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-10</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES101</r:String> </r:ParameterName> @@ -934,13 +934,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgde5yl</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -948,13 +948,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd2x2t</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-2</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -962,13 +962,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdjypz</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-3</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -976,13 +976,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdcftu</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-4</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -990,13 +990,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdiyfe</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-5</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1004,13 +1004,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdj1wd</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-6</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1018,13 +1018,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgddylk</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-7</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1032,13 +1032,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd3jj6</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-8</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1046,13 +1046,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd4w3k</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-9</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1060,13 +1060,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd4w4k</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-10</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1080,7 +1080,7 @@ <d:StatementItem> <r:Agency>fr.insee</r:Agency> <r:ID>d12-SI</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <d:DisplayText> <d:LiteralText> <d:Text xml:lang="fr-FR"><xhtml:p><xhtml:b>Now we are going to know if you think that Jay is a gluton.</xhtml:b></xhtml:p></d:Text> @@ -1091,21 +1091,21 @@ <d:QuestionScheme> <r:Agency>fr.insee</r:Agency> <r:ID>QuestionScheme-i6vwi0</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">A définir</r:Content> </r:Label> <d:QuestionItem> <r:Agency>fr.insee</r:Agency> <r:ID>j6p3dkx6</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <d:QuestionItemName> <r:String xml:lang="fr-FR">COMMENT</r:String> </d:QuestionItemName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p3dkx6-QOP-jbgdhaht</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">COMMENT</r:String> </r:ParameterName> @@ -1114,13 +1114,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p3dkx6-RDOP-jbgdhaht</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p3dkx6-QOP-jbgdhaht</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1133,7 +1133,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p3dkx6-RDOP-jbgdhaht</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TextRepresentation maxLength="500"/> </r:OutParameter> </d:TextDomain> @@ -1141,14 +1141,14 @@ <d:QuestionItem> <r:Agency>fr.insee</r:Agency> <r:ID>j6p0np9q</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <d:QuestionItemName> <r:String xml:lang="fr-FR">READY</r:String> </d:QuestionItemName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p0np9q-QOP-jbgd3set</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">READY</r:String> </r:ParameterName> @@ -1157,13 +1157,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p0np9q-RDOP-jbgd3set</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p0np9q-QOP-jbgd3set</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1176,14 +1176,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p0np9q-RDOP-jbgd3set</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -1197,7 +1197,7 @@ <r:OtherMaterial> <r:Agency>fr.insee</r:Agency> <r:ID>j6p6my1d</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Description> <r:Content> <xhtml:div class="FlowControl" id="j6p6my1d"> @@ -1214,14 +1214,14 @@ <d:QuestionItem> <r:Agency>fr.insee</r:Agency> <r:ID>j3343qhx</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <d:QuestionItemName> <r:String xml:lang="fr-FR">PRODUCER</r:String> </d:QuestionItemName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j3343qhx-QOP-jbgd90cy</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PRODUCER</r:String> </r:ParameterName> @@ -1230,13 +1230,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j3343qhx-RDOP-jbgd90cy</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j3343qhx-QOP-jbgd90cy</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1249,7 +1249,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j3343qhx-RDOP-jbgd90cy</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TextRepresentation maxLength="30"/> </r:OutParameter> </d:TextDomain> @@ -1257,14 +1257,14 @@ <d:QuestionItem> <r:Agency>fr.insee</r:Agency> <r:ID>j6q9h8tj</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <d:QuestionItemName> <r:String xml:lang="fr-FR">SEASON_NUMBER</r:String> </d:QuestionItemName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6q9h8tj-QOP-jbgdjy8h</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">SEASON_NUMBER</r:String> </r:ParameterName> @@ -1273,13 +1273,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6q9h8tj-RDOP-jbgdjy8h</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6q9h8tj-QOP-jbgdjy8h</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1297,21 +1297,21 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6q9h8tj-RDOP-jbgdjy8h</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> </r:OutParameter> </d:NumericDomain> </d:QuestionItem> <d:QuestionItem> <r:Agency>fr.insee</r:Agency> <r:ID>j334cyqb</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <d:QuestionItemName> <r:String xml:lang="fr-FR">DATEFIRST</r:String> </d:QuestionItemName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j334cyqb-QOP-jbgdih2z</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">DATEFIRST</r:String> </r:ParameterName> @@ -1320,13 +1320,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334cyqb-RDOP-jbgdih2z</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334cyqb-QOP-jbgdih2z</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1338,16 +1338,16 @@ <d:DateTimeDomainReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-MNR-DateTimedate-YYYY-MM-DD</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>ManagedDateTimeRepresentation</r:TypeOfObject> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j334cyqb-RDOP-jbgdih2z</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:DateTimeRepresentationReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-MNR-DateTimedate-YYYY-MM-DD</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>ManagedDateTimeRepresentation</r:TypeOfObject> </r:DateTimeRepresentationReference> </r:OutParameter> @@ -1355,21 +1355,21 @@ <d:InterviewerInstructionReference> <r:Agency>fr.insee</r:Agency> <r:ID>d11</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Instruction</r:TypeOfObject> </d:InterviewerInstructionReference> </d:QuestionItem> <d:QuestionItem> <r:Agency>fr.insee</r:Agency> <r:ID>j6z06z1e</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <d:QuestionItemName> <r:String xml:lang="fr-FR">AUDIENCE_SHARE</r:String> </d:QuestionItemName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6z06z1e-QOP-jbgddnrd</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">AUDIENCE_SHARE</r:String> </r:ParameterName> @@ -1378,13 +1378,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6z06z1e-RDOP-jbgddnrd</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6z06z1e-QOP-jbgddnrd</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1403,21 +1403,21 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6z06z1e-RDOP-jbgddnrd</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> </r:OutParameter> </d:NumericDomain> </d:QuestionItem> <d:QuestionItem> <r:Agency>fr.insee</r:Agency> <r:ID>j3343clt</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <d:QuestionItemName> <r:String xml:lang="fr-FR">CITY</r:String> </d:QuestionItemName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j3343clt-QOP-jbgdjdkn</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">CITY</r:String> </r:ParameterName> @@ -1426,13 +1426,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j3343clt-RDOP-jbgdjdkn</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j3343clt-QOP-jbgdjdkn</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1446,18 +1446,18 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334iumu</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j3343clt-RDOP-jbgdjdkn</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334iumu</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -1467,21 +1467,21 @@ <d:InterviewerInstructionReference> <r:Agency>fr.insee</r:Agency> <r:ID>d3</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Instruction</r:TypeOfObject> </d:InterviewerInstructionReference> </d:QuestionItem> <d:QuestionItem> <r:Agency>fr.insee</r:Agency> <r:ID>j6qdfhvw</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <d:QuestionItemName> <r:String xml:lang="fr-FR">MAYOR</r:String> </d:QuestionItemName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qdfhvw-QOP-jbgd8ghp</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">MAYOR</r:String> </r:ParameterName> @@ -1490,13 +1490,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qdfhvw-RDOP-jbgd8ghp</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qdfhvw-QOP-jbgd8ghp</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1510,18 +1510,18 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qdqoen</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qdfhvw-RDOP-jbgd8ghp</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qdqoen</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -1531,21 +1531,21 @@ <d:InterviewerInstructionReference> <r:Agency>fr.insee</r:Agency> <r:ID>d4</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Instruction</r:TypeOfObject> </d:InterviewerInstructionReference> </d:QuestionItem> <d:QuestionItem> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw5cqz</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <d:QuestionItemName> <r:String xml:lang="fr-FR">STATE</r:String> </d:QuestionItemName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw5cqz-QOP-jbgdkd7v</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">STATE</r:String> </r:ParameterName> @@ -1554,13 +1554,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw5cqz-RDOP-jbgdkd7v</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw5cqz-QOP-jbgdkd7v</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1574,18 +1574,18 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwo00f</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw5cqz-RDOP-jbgdkd7v</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwo00f</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -1596,14 +1596,14 @@ <d:QuestionItem> <r:Agency>fr.insee</r:Agency> <r:ID>j6z0z3us</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <d:QuestionItemName> <r:String xml:lang="fr-FR">SURVEY_COMMENT</r:String> </d:QuestionItemName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6z0z3us-QOP-jbgd6m6e</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">SURVEY_COMMENT</r:String> </r:ParameterName> @@ -1612,13 +1612,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6z0z3us-RDOP-jbgd6m6e</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6z0z3us-QOP-jbgd6m6e</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1631,7 +1631,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6z0z3us-RDOP-jbgd6m6e</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TextRepresentation maxLength="255"/> </r:OutParameter> </d:TextDomain> @@ -1639,14 +1639,14 @@ <d:QuestionGrid> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <d:QuestionGridName> <r:String xml:lang="fr-FR">PET</r:String> </d:QuestionGridName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-QOP-jbgd8qmn</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PET1</r:String> </r:ParameterName> @@ -1654,7 +1654,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-QOP-jbgd60vl</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PET2</r:String> </r:ParameterName> @@ -1662,7 +1662,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-QOP-jbgda2jo</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PET3</r:String> </r:ParameterName> @@ -1670,7 +1670,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-QOP-jbgdfssy</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PET4</r:String> </r:ParameterName> @@ -1679,13 +1679,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-RDOP-jbgd8qmn</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-QOP-jbgd8qmn</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1693,13 +1693,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-RDOP-jbgd60vl</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-QOP-jbgd60vl</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1707,13 +1707,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-RDOP-jbgda2jo</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-QOP-jbgda2jo</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1721,13 +1721,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-RDOP-jbgdfssy</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-QOP-jbgdfssy</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1741,7 +1741,7 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j335cu3c</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </d:CodeDomain> @@ -1752,14 +1752,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-RDOP-jbgd8qmn</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -1780,14 +1780,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-RDOP-jbgd60vl</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -1808,14 +1808,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-RDOP-jbgda2jo</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -1836,14 +1836,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-RDOP-jbgdfssy</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -1863,21 +1863,21 @@ <d:InterviewerInstructionReference> <r:Agency>fr.insee</r:Agency> <r:ID>d5</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Instruction</r:TypeOfObject> </d:InterviewerInstructionReference> </d:QuestionGrid> <d:QuestionGrid> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <d:QuestionGridName> <r:String xml:lang="fr-FR">ICE_FLAVOUR</r:String> </d:QuestionGridName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-QOP-jbgdb3jx</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">ICE_FLAVOUR1</r:String> </r:ParameterName> @@ -1885,7 +1885,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-QOP-jbgdb61k</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">ICE_FLAVOUR2</r:String> </r:ParameterName> @@ -1893,7 +1893,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-QOP-jbgdl3kc</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">ICE_FLAVOUR3</r:String> </r:ParameterName> @@ -1901,7 +1901,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-QOP-jbgdcobo</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">ICE_FLAVOUR4</r:String> </r:ParameterName> @@ -1910,13 +1910,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-RDOP-jbgdb3jx</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-QOP-jbgdb3jx</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1924,13 +1924,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-RDOP-jbgdb61k</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-QOP-jbgdb61k</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1938,13 +1938,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-RDOP-jbgdl3kc</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-QOP-jbgdl3kc</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1952,13 +1952,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-RDOP-jbgdcobo</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-QOP-jbgdcobo</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1972,7 +1972,7 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2mvca</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </d:CodeDomain> @@ -1984,18 +1984,18 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-RDOP-jbgdb3jx</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -2014,18 +2014,18 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-RDOP-jbgdb61k</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -2044,18 +2044,18 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-RDOP-jbgdl3kc</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -2074,18 +2074,18 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-RDOP-jbgdcobo</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -2103,14 +2103,14 @@ <d:QuestionGrid> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <d:QuestionGridName> <r:String xml:lang="fr-FR">NUCLEAR_CHARACTER</r:String> </d:QuestionGridName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-QOP-jbgd6p0k</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">NUCLEAR_CHARACTER1</r:String> </r:ParameterName> @@ -2118,7 +2118,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-QOP-jbgd9ato</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">NUCLEAR_CHARACTER2</r:String> </r:ParameterName> @@ -2126,7 +2126,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-QOP-jbgd3e0p</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">NUCLEAR_CHARACTER3</r:String> </r:ParameterName> @@ -2134,7 +2134,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-QOP-jbgdkxne</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">NUCLEAR_CHARACTER4</r:String> </r:ParameterName> @@ -2143,13 +2143,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-RDOP-jbgd6p0k</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-QOP-jbgd6p0k</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2157,13 +2157,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-RDOP-jbgd9ato</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-QOP-jbgd9ato</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2171,13 +2171,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-RDOP-jbgd3e0p</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-QOP-jbgd3e0p</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2185,13 +2185,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-RDOP-jbgdkxne</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-QOP-jbgdkxne</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2205,7 +2205,7 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qeytgc</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </d:CodeDomain> @@ -2217,18 +2217,18 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-RDOP-jbgd6p0k</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -2247,18 +2247,18 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-RDOP-jbgd9ato</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -2277,18 +2277,18 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-RDOP-jbgd3e0p</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -2307,18 +2307,18 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-RDOP-jbgdkxne</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -2336,14 +2336,14 @@ <d:QuestionGrid> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <d:QuestionGridName> <r:String xml:lang="fr-FR">BIRTH_CHARACTER</r:String> </d:QuestionGridName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QOP-jbgd7fr6</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">BIRTH_CHARACTER1</r:String> </r:ParameterName> @@ -2351,7 +2351,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QOP-jbgd5e9f</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">BIRTH_CHARACTER2</r:String> </r:ParameterName> @@ -2359,7 +2359,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QOP-jbgd912x</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">BIRTH_CHARACTER3</r:String> </r:ParameterName> @@ -2367,7 +2367,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QOP-jbgd6bdy</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">BIRTH_CHARACTER4</r:String> </r:ParameterName> @@ -2375,7 +2375,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QOP-jbgddyry</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">BIRTH_CHARACTER5</r:String> </r:ParameterName> @@ -2384,13 +2384,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-RDOP-jbgd7fr6</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QOP-jbgd7fr6</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2398,13 +2398,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-RDOP-jbgd5e9f</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QOP-jbgd5e9f</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2412,13 +2412,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-RDOP-jbgd912x</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QOP-jbgd912x</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2426,13 +2426,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-RDOP-jbgd6bdy</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QOP-jbgd6bdy</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2440,13 +2440,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-RDOP-jbgddyry</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QOP-jbgddyry</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2460,7 +2460,7 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6z087mq</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </d:CodeDomain> @@ -2472,18 +2472,18 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxricm</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-RDOP-jbgd7fr6</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxricm</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -2502,18 +2502,18 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxricm</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-RDOP-jbgd5e9f</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxricm</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -2532,18 +2532,18 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxricm</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-RDOP-jbgd912x</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxricm</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -2562,18 +2562,18 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxricm</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-RDOP-jbgd6bdy</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxricm</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -2592,18 +2592,18 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxricm</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-RDOP-jbgddyry</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxricm</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -2621,14 +2621,14 @@ <d:QuestionGrid> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <d:QuestionGridName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES</r:String> </d:QuestionGridName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgde5yl</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES11</r:String> </r:ParameterName> @@ -2636,7 +2636,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd2x2t</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES21</r:String> </r:ParameterName> @@ -2644,7 +2644,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdjypz</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES31</r:String> </r:ParameterName> @@ -2652,7 +2652,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdcftu</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES41</r:String> </r:ParameterName> @@ -2660,7 +2660,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdiyfe</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES51</r:String> </r:ParameterName> @@ -2668,7 +2668,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdj1wd</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES61</r:String> </r:ParameterName> @@ -2676,7 +2676,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgddylk</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES71</r:String> </r:ParameterName> @@ -2684,7 +2684,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd3jj6</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES81</r:String> </r:ParameterName> @@ -2692,7 +2692,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd4w3k</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES91</r:String> </r:ParameterName> @@ -2700,7 +2700,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd4w4k</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES101</r:String> </r:ParameterName> @@ -2709,13 +2709,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgde5yl</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgde5yl</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2723,13 +2723,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgd2x2t</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd2x2t</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2737,13 +2737,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgdjypz</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdjypz</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2751,13 +2751,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgdcftu</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdcftu</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2765,13 +2765,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgdiyfe</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdiyfe</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2779,13 +2779,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgdj1wd</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdj1wd</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2793,13 +2793,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgddylk</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgddylk</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2807,13 +2807,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgd3jj6</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd3jj6</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2821,13 +2821,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgd4w3k</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd4w3k</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2835,13 +2835,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgd4w4k</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd4w4k</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2856,7 +2856,7 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwh16i</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </d:CodeDomain> @@ -2866,7 +2866,7 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-secondDimension-fakeCL-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </d:CodeDomain> @@ -2882,7 +2882,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgde5yl</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -2902,7 +2902,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgd2x2t</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -2922,7 +2922,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgdjypz</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -2942,7 +2942,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgdcftu</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -2962,7 +2962,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgdiyfe</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -2982,7 +2982,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgdj1wd</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -3002,7 +3002,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgddylk</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -3022,7 +3022,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgd3jj6</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -3042,7 +3042,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgd4w3k</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -3062,7 +3062,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgd4w4k</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -3077,14 +3077,14 @@ <d:QuestionGrid> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <d:QuestionGridName> <r:String xml:lang="fr-FR">CLOWNING</r:String> </d:QuestionGridName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgd8tyr</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">CLOWNING11</r:String> </r:ParameterName> @@ -3092,7 +3092,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdep36</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">CLOWNING21</r:String> </r:ParameterName> @@ -3100,7 +3100,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdjjgi</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">CLOWNING31</r:String> </r:ParameterName> @@ -3108,7 +3108,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdgh6k</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">CLOWNING41</r:String> </r:ParameterName> @@ -3116,7 +3116,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdit3o</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">CLOWNING12</r:String> </r:ParameterName> @@ -3124,7 +3124,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgd366k</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">CLOWNING22</r:String> </r:ParameterName> @@ -3132,7 +3132,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdax06</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">CLOWNING32</r:String> </r:ParameterName> @@ -3140,7 +3140,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdfo1j</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">CLOWNING42</r:String> </r:ParameterName> @@ -3149,13 +3149,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-RDOP-jbgd8tyr</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgd8tyr</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3163,13 +3163,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-RDOP-jbgdep36</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdep36</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3177,13 +3177,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-RDOP-jbgdjjgi</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdjjgi</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3191,13 +3191,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-RDOP-jbgdgh6k</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdgh6k</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3205,13 +3205,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-RDOP-jbgdit3o</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdit3o</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3219,13 +3219,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-RDOP-jbgd366k</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgd366k</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3233,13 +3233,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-RDOP-jbgdax06</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdax06</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3247,13 +3247,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-RDOP-jbgdfo1j</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdfo1j</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3267,7 +3267,7 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j77dav9b</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </d:CodeDomain> @@ -3277,7 +3277,7 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-secondDimension-fakeCL-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </d:CodeDomain> @@ -3289,18 +3289,18 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdyh6b5</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-RDOP-jbgd8tyr</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdyh6b5</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -3320,18 +3320,18 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdyh6b5</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-RDOP-jbgdep36</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdyh6b5</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -3351,18 +3351,18 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdyh6b5</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-RDOP-jbgdjjgi</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdyh6b5</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -3382,18 +3382,18 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdyh6b5</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-RDOP-jbgdgh6k</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdyh6b5</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -3412,7 +3412,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-RDOP-jbgdit3o</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TextRepresentation maxLength="255"/> </r:OutParameter> </d:TextDomain> @@ -3428,7 +3428,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-RDOP-jbgd366k</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TextRepresentation maxLength="255"/> </r:OutParameter> </d:TextDomain> @@ -3444,7 +3444,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-RDOP-jbgdax06</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TextRepresentation maxLength="255"/> </r:OutParameter> </d:TextDomain> @@ -3460,7 +3460,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-RDOP-jbgdfo1j</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TextRepresentation maxLength="255"/> </r:OutParameter> </d:TextDomain> @@ -3476,14 +3476,14 @@ <d:QuestionGrid> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <d:QuestionGridName> <r:String xml:lang="fr-FR">TRAVEL</r:String> </d:QuestionGridName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd92mb</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL11</r:String> </r:ParameterName> @@ -3491,7 +3491,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdgsat</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL21</r:String> </r:ParameterName> @@ -3499,7 +3499,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdaxk2</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL31</r:String> </r:ParameterName> @@ -3507,7 +3507,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd7myn</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL41</r:String> </r:ParameterName> @@ -3515,7 +3515,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdnxkt</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL12</r:String> </r:ParameterName> @@ -3523,7 +3523,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd3ef5</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL22</r:String> </r:ParameterName> @@ -3531,7 +3531,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd8p1v</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL32</r:String> </r:ParameterName> @@ -3539,7 +3539,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdgm0c</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL42</r:String> </r:ParameterName> @@ -3547,7 +3547,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdcppc</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL13</r:String> </r:ParameterName> @@ -3555,7 +3555,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd4cm6</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL23</r:String> </r:ParameterName> @@ -3563,7 +3563,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdd2lo</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL33</r:String> </r:ParameterName> @@ -3571,7 +3571,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdo0ay</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL43</r:String> </r:ParameterName> @@ -3579,7 +3579,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd4r2a</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL14</r:String> </r:ParameterName> @@ -3587,7 +3587,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdkfpq</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL24</r:String> </r:ParameterName> @@ -3595,7 +3595,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd7u52</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL34</r:String> </r:ParameterName> @@ -3603,7 +3603,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdgfwl</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL44</r:String> </r:ParameterName> @@ -3611,7 +3611,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd9cff</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL15</r:String> </r:ParameterName> @@ -3619,7 +3619,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgddwsp</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL25</r:String> </r:ParameterName> @@ -3627,7 +3627,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdncn8</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL35</r:String> </r:ParameterName> @@ -3635,7 +3635,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdnz6b</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL45</r:String> </r:ParameterName> @@ -3643,7 +3643,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdiva0</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL16</r:String> </r:ParameterName> @@ -3651,7 +3651,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd7dqf</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL26</r:String> </r:ParameterName> @@ -3659,7 +3659,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdnous</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL36</r:String> </r:ParameterName> @@ -3667,7 +3667,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdkfcz</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL46</r:String> </r:ParameterName> @@ -3676,13 +3676,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd92mb</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd92mb</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3690,13 +3690,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdgsat</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdgsat</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3704,13 +3704,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdaxk2</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdaxk2</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3718,13 +3718,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd7myn</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd7myn</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3732,13 +3732,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdnxkt</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdnxkt</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3746,13 +3746,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd3ef5</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd3ef5</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3760,13 +3760,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd8p1v</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd8p1v</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3774,13 +3774,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdgm0c</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdgm0c</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3788,13 +3788,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdcppc</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdcppc</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3802,13 +3802,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd4cm6</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd4cm6</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3816,13 +3816,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdd2lo</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdd2lo</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3830,13 +3830,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdo0ay</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdo0ay</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3844,13 +3844,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd4r2a</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd4r2a</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3858,13 +3858,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdkfpq</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdkfpq</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3872,13 +3872,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd7u52</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd7u52</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3886,13 +3886,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdgfwl</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdgfwl</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3900,13 +3900,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd9cff</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd9cff</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3914,13 +3914,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgddwsp</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgddwsp</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3928,13 +3928,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdncn8</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdncn8</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3942,13 +3942,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdnz6b</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdnz6b</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3956,13 +3956,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdiva0</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdiva0</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3970,13 +3970,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd7dqf</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd7dqf</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3984,13 +3984,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdnous</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdnous</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3998,13 +3998,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdkfcz</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdkfcz</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -4019,7 +4019,7 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2kivg</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </d:CodeDomain> @@ -4029,7 +4029,7 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdye1wa</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </d:CodeDomain> @@ -4040,14 +4040,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd92mb</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4069,14 +4069,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdgsat</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4098,14 +4098,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdaxk2</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4127,14 +4127,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd7myn</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4156,14 +4156,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdnxkt</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4185,14 +4185,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd3ef5</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4214,14 +4214,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd8p1v</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4243,14 +4243,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdgm0c</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4272,14 +4272,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdcppc</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4301,14 +4301,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd4cm6</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4330,14 +4330,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdd2lo</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4359,14 +4359,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdo0ay</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4388,14 +4388,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd4r2a</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4417,14 +4417,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdkfpq</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4446,14 +4446,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd7u52</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4475,14 +4475,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdgfwl</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4504,14 +4504,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd9cff</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4533,14 +4533,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgddwsp</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4562,14 +4562,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdncn8</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4591,14 +4591,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdnz6b</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4620,14 +4620,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdiva0</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4649,14 +4649,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd7dqf</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4678,14 +4678,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdnous</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4707,14 +4707,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdkfcz</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4735,21 +4735,21 @@ <d:InterviewerInstructionReference> <r:Agency>fr.insee</r:Agency> <r:ID>d10</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Instruction</r:TypeOfObject> </d:InterviewerInstructionReference> </d:QuestionGrid> <d:QuestionGrid> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <d:QuestionGridName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS</r:String> </d:QuestionGridName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdl5jb</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS11</r:String> </r:ParameterName> @@ -4757,7 +4757,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd8lwo</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS21</r:String> </r:ParameterName> @@ -4765,7 +4765,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdbfag</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS31</r:String> </r:ParameterName> @@ -4773,7 +4773,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdlgja</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS41</r:String> </r:ParameterName> @@ -4781,7 +4781,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd745y</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS51</r:String> </r:ParameterName> @@ -4789,7 +4789,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdjkts</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS61</r:String> </r:ParameterName> @@ -4797,7 +4797,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdcax7</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS71</r:String> </r:ParameterName> @@ -4805,7 +4805,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdjye1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS81</r:String> </r:ParameterName> @@ -4813,7 +4813,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd5jet</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS91</r:String> </r:ParameterName> @@ -4821,7 +4821,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdjw90</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS101</r:String> </r:ParameterName> @@ -4829,7 +4829,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdfndq</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS12</r:String> </r:ParameterName> @@ -4837,7 +4837,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd7osi</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS22</r:String> </r:ParameterName> @@ -4845,7 +4845,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd7bnw</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS32</r:String> </r:ParameterName> @@ -4853,7 +4853,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd9k71</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS42</r:String> </r:ParameterName> @@ -4861,7 +4861,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdimks</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS52</r:String> </r:ParameterName> @@ -4869,7 +4869,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdjquz</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS62</r:String> </r:ParameterName> @@ -4877,7 +4877,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdd2w3</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS72</r:String> </r:ParameterName> @@ -4885,7 +4885,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdkosc</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS82</r:String> </r:ParameterName> @@ -4893,7 +4893,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdk0x4</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS92</r:String> </r:ParameterName> @@ -4901,7 +4901,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd2wgf</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS102</r:String> </r:ParameterName> @@ -4910,13 +4910,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdl5jb</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdl5jb</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -4924,13 +4924,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgd8lwo</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd8lwo</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -4938,13 +4938,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdbfag</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdbfag</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -4952,13 +4952,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdlgja</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdlgja</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -4966,13 +4966,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgd745y</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd745y</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -4980,13 +4980,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdjkts</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdjkts</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -4994,13 +4994,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdcax7</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdcax7</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -5008,13 +5008,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdjye1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdjye1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -5022,13 +5022,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgd5jet</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd5jet</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -5036,13 +5036,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdjw90</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdjw90</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -5050,13 +5050,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdfndq</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdfndq</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -5064,13 +5064,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgd7osi</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd7osi</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -5078,13 +5078,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgd7bnw</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd7bnw</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -5092,13 +5092,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgd9k71</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd9k71</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -5106,13 +5106,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdimks</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdimks</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -5120,13 +5120,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdjquz</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdjquz</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -5134,13 +5134,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdd2w3</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdd2w3</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -5148,13 +5148,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdkosc</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdkosc</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -5162,13 +5162,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdk0x4</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdk0x4</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -5176,13 +5176,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgd2wgf</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd2wgf</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -5199,7 +5199,7 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-secondDimension-fakeCL-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </d:CodeDomain> @@ -5210,7 +5210,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdl5jb</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TextRepresentation maxLength="255"/> </r:OutParameter> </d:TextDomain> @@ -5226,7 +5226,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgd8lwo</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TextRepresentation maxLength="255"/> </r:OutParameter> </d:TextDomain> @@ -5242,7 +5242,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdbfag</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TextRepresentation maxLength="255"/> </r:OutParameter> </d:TextDomain> @@ -5258,7 +5258,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdlgja</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TextRepresentation maxLength="255"/> </r:OutParameter> </d:TextDomain> @@ -5274,7 +5274,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgd745y</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TextRepresentation maxLength="255"/> </r:OutParameter> </d:TextDomain> @@ -5290,7 +5290,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdjkts</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TextRepresentation maxLength="255"/> </r:OutParameter> </d:TextDomain> @@ -5306,7 +5306,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdcax7</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TextRepresentation maxLength="255"/> </r:OutParameter> </d:TextDomain> @@ -5322,7 +5322,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdjye1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TextRepresentation maxLength="255"/> </r:OutParameter> </d:TextDomain> @@ -5338,7 +5338,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgd5jet</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TextRepresentation maxLength="255"/> </r:OutParameter> </d:TextDomain> @@ -5354,7 +5354,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdjw90</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TextRepresentation maxLength="255"/> </r:OutParameter> </d:TextDomain> @@ -5375,7 +5375,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdfndq</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -5395,7 +5395,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgd7osi</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -5415,7 +5415,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgd7bnw</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -5435,7 +5435,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgd9k71</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -5455,7 +5455,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdimks</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -5475,7 +5475,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdjquz</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -5495,7 +5495,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdd2w3</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -5515,7 +5515,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdkosc</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -5535,7 +5535,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdk0x4</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -5555,7 +5555,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgd2wgf</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -5571,14 +5571,14 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-j334iumu</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">TOWN</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j334iumu-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Springfield</r:Content> </r:Label> @@ -5586,7 +5586,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j334iumu-2</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Shelbyville</r:Content> </r:Label> @@ -5594,7 +5594,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j334iumu-3</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Seinfeld</r:Content> </r:Label> @@ -5603,14 +5603,14 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-j6qdqoen</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">MAYOR </r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6qdqoen-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Constance Harm</r:Content> </r:Label> @@ -5618,7 +5618,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6qdqoen-2</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Timothy Lovejoy</r:Content> </r:Label> @@ -5626,7 +5626,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6qdqoen-3</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Joe Quimby</r:Content> </r:Label> @@ -5634,7 +5634,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6qdqoen-4</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Poochie</r:Content> </r:Label> @@ -5643,14 +5643,14 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-j4nwo00f</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">State</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwo00f-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Washington</r:Content> </r:Label> @@ -5658,7 +5658,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwo00f-2</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Kentucky</r:Content> </r:Label> @@ -5666,7 +5666,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwo00f-3</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Ohio</r:Content> </r:Label> @@ -5674,7 +5674,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwo00f-4</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Maine</r:Content> </r:Label> @@ -5682,7 +5682,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwo00f-5</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">North Dakota</r:Content> </r:Label> @@ -5690,7 +5690,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwo00f-6</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Florida</r:Content> </r:Label> @@ -5698,7 +5698,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwo00f-7</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">North Takoma</r:Content> </r:Label> @@ -5706,7 +5706,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwo00f-8</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">California</r:Content> </r:Label> @@ -5714,7 +5714,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwo00f-9</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Texas</r:Content> </r:Label> @@ -5722,7 +5722,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwo00f-10</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Massachusetts</r:Content> </r:Label> @@ -5730,7 +5730,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwo00f-11</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Nevada</r:Content> </r:Label> @@ -5738,7 +5738,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwo00f-12</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Illinois</r:Content> </r:Label> @@ -5746,7 +5746,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwo00f-13</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Not in any state, you fool!</r:Content> </r:Label> @@ -5755,14 +5755,14 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-j335cu3c</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">ANIMALS</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j335cu3c-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Santa's Little Helper</r:Content> </r:Label> @@ -5770,7 +5770,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j335cu3c-2</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Snowball I</r:Content> </r:Label> @@ -5778,7 +5778,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j335cu3c-3</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Coltrane</r:Content> </r:Label> @@ -5786,7 +5786,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j335cu3c-4</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Mojo the Helper Monkey</r:Content> </r:Label> @@ -5795,14 +5795,14 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-j6p2mvca</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Flavours</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6p2mvca-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Vanilla</r:Content> </r:Label> @@ -5810,7 +5810,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6p2mvca-2</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Strawberry</r:Content> </r:Label> @@ -5818,7 +5818,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6p2mvca-3</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Apple</r:Content> </r:Label> @@ -5826,7 +5826,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6p2mvca-4</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Bacon</r:Content> </r:Label> @@ -5835,14 +5835,14 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-jbdxh138</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">YESNO</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-jbdxh138-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Yes</r:Content> </r:Label> @@ -5850,7 +5850,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-jbdxh138-2</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">No</r:Content> </r:Label> @@ -5859,14 +5859,14 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-j6qeytgc</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">NUCLEAR_CHARACTERS</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6qeytgc-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Charles Montgomery Burns</r:Content> </r:Label> @@ -5874,7 +5874,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6qeytgc-2</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Carl Carlson</r:Content> </r:Label> @@ -5882,7 +5882,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6qeytgc-3</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Otto Mann</r:Content> </r:Label> @@ -5890,7 +5890,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6qeytgc-4</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Carl Carlson</r:Content> </r:Label> @@ -5899,14 +5899,14 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-j6z087mq</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">BIRTH_CHARACTER</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6z087mq-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Selma Bouvier</r:Content> </r:Label> @@ -5914,7 +5914,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6z087mq-2</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Kent Brockman</r:Content> </r:Label> @@ -5922,7 +5922,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6z087mq-3</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Milhouse Van Houten</r:Content> </r:Label> @@ -5930,7 +5930,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6z087mq-4</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Nelson Muntz</r:Content> </r:Label> @@ -5938,7 +5938,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6z087mq-5</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Crazy Cat Lady</r:Content> </r:Label> @@ -5947,14 +5947,14 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-jbdxricm</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">CITY_BIRTH</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-jbdxricm-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Albuquerque</r:Content> </r:Label> @@ -5962,7 +5962,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-jbdxricm-2</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Springfield</r:Content> </r:Label> @@ -5970,7 +5970,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-jbdxricm-3</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Portland</r:Content> </r:Label> @@ -5978,7 +5978,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-jbdxricm-4</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Shelbyville</r:Content> </r:Label> @@ -5986,7 +5986,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-jbdxricm-5</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Dagstuhl</r:Content> </r:Label> @@ -5995,14 +5995,14 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-j4nwh16i</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Products</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwh16i-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Frozen products</r:Content> </r:Label> @@ -6010,7 +6010,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwh16i-2</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Ice creams</r:Content> </r:Label> @@ -6018,7 +6018,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwh16i-3</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Jasper Beardly</r:Content> </r:Label> @@ -6026,7 +6026,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwh16i-4</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Meat</r:Content> </r:Label> @@ -6034,7 +6034,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwh16i-5</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Bacon</r:Content> </r:Label> @@ -6042,7 +6042,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwh16i-6</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Pork chop</r:Content> </r:Label> @@ -6050,7 +6050,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwh16i-7</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Chicken</r:Content> </r:Label> @@ -6058,7 +6058,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwh16i-8</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Compote</r:Content> </r:Label> @@ -6066,7 +6066,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwh16i-9</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Powersauce</r:Content> </r:Label> @@ -6074,7 +6074,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwh16i-10</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Other</r:Content> </r:Label> @@ -6083,14 +6083,14 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-j77dav9b</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Clownings</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j77dav9b-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR"><xhtml:p><xhtml:b><xhtml:i>Break the windows of the whole city</xhtml:i></xhtml:b></xhtml:p></r:Content> </r:Label> @@ -6098,7 +6098,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j77dav9b-2</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR"><xhtml:p><xhtml:b><xhtml:i>Loose the violin of his daughter playing poker</xhtml:i></xhtml:b></xhtml:p></r:Content> </r:Label> @@ -6106,7 +6106,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j77dav9b-3</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR"><xhtml:p><xhtml:b><xhtml:i>Kill Mr Burns</xhtml:i></xhtml:b></xhtml:p></r:Content> </r:Label> @@ -6114,7 +6114,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j77dav9b-4</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR"><xhtml:p><xhtml:b><xhtml:i>Leaving a mechanical object to control the nuclear power plant</xhtml:i></xhtml:b></xhtml:p></r:Content> </r:Label> @@ -6123,14 +6123,14 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-jbdyh6b5</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Clowning_Characters</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-jbdyh6b5-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Jay</r:Content> </r:Label> @@ -6138,7 +6138,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-jbdyh6b5-2</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Bart</r:Content> </r:Label> @@ -6146,7 +6146,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-jbdyh6b5-3</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Krusty the clown</r:Content> </r:Label> @@ -6154,7 +6154,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-jbdyh6b5-4</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Maggie</r:Content> </r:Label> @@ -6163,14 +6163,14 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-j6p2kivg</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Means of transport</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6p2kivg-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Car</r:Content> </r:Label> @@ -6178,7 +6178,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6p2kivg-2</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Bike</r:Content> </r:Label> @@ -6186,7 +6186,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6p2kivg-3</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Skateboard</r:Content> </r:Label> @@ -6194,7 +6194,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6p2kivg-4</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Plane</r:Content> </r:Label> @@ -6203,14 +6203,14 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-jbdye1wa</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Country</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-jbdye1wa-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Brazil</r:Content> </r:Label> @@ -6218,7 +6218,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-jbdye1wa-2</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Canada</r:Content> </r:Label> @@ -6226,7 +6226,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-jbdye1wa-3</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Japan</r:Content> </r:Label> @@ -6234,7 +6234,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-jbdye1wa-4</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">France</r:Content> </r:Label> @@ -6242,7 +6242,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-jbdye1wa-5</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR"><xhtml:p>Other country<xhtml:a href="#ftn1"/></xhtml:p></r:Content> </r:Label> @@ -6250,7 +6250,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-jbdye1wa-6</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Other planet</r:Content> </r:Label> @@ -6259,14 +6259,14 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-j4nwc63q-secondDimension-fakeCL-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">FAKE-CODELIST-j4nwc63q-secondDimension-fakeCL-1</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwc63q-secondDimension-fakeCL-1-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Percentage</r:Content> </r:Label> @@ -6275,14 +6275,14 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-j4nw0rr6-secondDimension-fakeCL-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">FAKE-CODELIST-j4nw0rr6-secondDimension-fakeCL-1</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nw0rr6-secondDimension-fakeCL-1-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Clowning</r:Content> </r:Label> @@ -6290,7 +6290,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nw0rr6-secondDimension-fakeCL-1-2</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Remember?</r:Content> </r:Label> @@ -6299,14 +6299,14 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-j6qg8rc6-secondDimension-fakeCL-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">FAKE-CODELIST-j6qg8rc6-secondDimension-fakeCL-1</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6qg8rc6-secondDimension-fakeCL-1-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Name</r:Content> </r:Label> @@ -6314,7 +6314,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6qg8rc6-secondDimension-fakeCL-1-2</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Age</r:Content> </r:Label> @@ -6323,14 +6323,14 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-i6vwi0</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">A définir</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CA-Booleen-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR"/> </r:Label> @@ -6339,14 +6339,14 @@ <l:CodeListScheme> <r:Agency>fr.insee</r:Agency> <r:ID>SIMPSONS-CLS</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:CodeListSchemeName> <r:String xml:lang="en-IE">SIMPSONS</r:String> </l:CodeListSchemeName> <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>j334iumu</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">TOWN</r:Content> </r:Label> @@ -6357,11 +6357,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j334iumu-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j334iumu-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>00001</r:Value> @@ -6369,11 +6369,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j334iumu-2</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j334iumu-2</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>00002</r:Value> @@ -6381,11 +6381,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j334iumu-3</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j334iumu-3</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>00003</r:Value> @@ -6394,7 +6394,7 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>j6qdqoen</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">MAYOR </r:Content> </r:Label> @@ -6405,11 +6405,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qdqoen-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6qdqoen-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>1</r:Value> @@ -6417,11 +6417,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qdqoen-2</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6qdqoen-2</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>2</r:Value> @@ -6429,11 +6429,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qdqoen-3</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6qdqoen-3</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>3</r:Value> @@ -6441,11 +6441,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qdqoen-4</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6qdqoen-4</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>4</r:Value> @@ -6454,7 +6454,7 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwo00f</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">State</r:Content> </r:Label> @@ -6465,11 +6465,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwo00f-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwo00f-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>1</r:Value> @@ -6477,11 +6477,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwo00f-2</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwo00f-2</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>2</r:Value> @@ -6489,11 +6489,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwo00f-3</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwo00f-3</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>3</r:Value> @@ -6501,11 +6501,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwo00f-4</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwo00f-4</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>4</r:Value> @@ -6513,11 +6513,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwo00f-5</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwo00f-5</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>5</r:Value> @@ -6525,11 +6525,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwo00f-6</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwo00f-6</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>6</r:Value> @@ -6537,11 +6537,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwo00f-7</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwo00f-7</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>7</r:Value> @@ -6549,11 +6549,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwo00f-8</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwo00f-8</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>8</r:Value> @@ -6561,11 +6561,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwo00f-9</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwo00f-9</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>9</r:Value> @@ -6573,11 +6573,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwo00f-10</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwo00f-10</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>10</r:Value> @@ -6585,11 +6585,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwo00f-11</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwo00f-11</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>11</r:Value> @@ -6597,11 +6597,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwo00f-12</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwo00f-12</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>12</r:Value> @@ -6609,11 +6609,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwo00f-13</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwo00f-13</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>13</r:Value> @@ -6622,7 +6622,7 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>j335cu3c</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">ANIMALS</r:Content> </r:Label> @@ -6633,11 +6633,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j335cu3c-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j335cu3c-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>1</r:Value> @@ -6645,11 +6645,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j335cu3c-2</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j335cu3c-2</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>2</r:Value> @@ -6657,11 +6657,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j335cu3c-3</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j335cu3c-3</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>3</r:Value> @@ -6669,11 +6669,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j335cu3c-4</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j335cu3c-4</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>4</r:Value> @@ -6682,7 +6682,7 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2mvca</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Flavours</r:Content> </r:Label> @@ -6693,11 +6693,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2mvca-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6p2mvca-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>1</r:Value> @@ -6705,11 +6705,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2mvca-2</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6p2mvca-2</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>2</r:Value> @@ -6717,11 +6717,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2mvca-3</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6p2mvca-3</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>3</r:Value> @@ -6729,11 +6729,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2mvca-4</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6p2mvca-4</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>4</r:Value> @@ -6742,7 +6742,7 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">YESNO</r:Content> </r:Label> @@ -6753,11 +6753,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-jbdxh138-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>1</r:Value> @@ -6765,11 +6765,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138-2</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-jbdxh138-2</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>0</r:Value> @@ -6778,7 +6778,7 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>j6qeytgc</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">NUCLEAR_CHARACTERS</r:Content> </r:Label> @@ -6789,11 +6789,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qeytgc-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6qeytgc-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>1</r:Value> @@ -6801,11 +6801,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qeytgc-2</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6qeytgc-2</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>2</r:Value> @@ -6813,11 +6813,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qeytgc-3</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6qeytgc-3</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>3</r:Value> @@ -6825,11 +6825,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qeytgc-4</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6qeytgc-4</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>4</r:Value> @@ -6838,7 +6838,7 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>j6z087mq</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">BIRTH_CHARACTER</r:Content> </r:Label> @@ -6849,11 +6849,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j6z087mq-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6z087mq-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>1</r:Value> @@ -6861,11 +6861,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j6z087mq-2</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6z087mq-2</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>2</r:Value> @@ -6873,11 +6873,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j6z087mq-3</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6z087mq-3</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>3</r:Value> @@ -6885,11 +6885,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j6z087mq-4</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6z087mq-4</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>4</r:Value> @@ -6897,11 +6897,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j6z087mq-5</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6z087mq-5</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>5</r:Value> @@ -6910,7 +6910,7 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxricm</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">CITY_BIRTH</r:Content> </r:Label> @@ -6921,11 +6921,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxricm-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-jbdxricm-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>1</r:Value> @@ -6933,11 +6933,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxricm-2</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-jbdxricm-2</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>2</r:Value> @@ -6945,11 +6945,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxricm-3</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-jbdxricm-3</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>3</r:Value> @@ -6957,11 +6957,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxricm-4</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-jbdxricm-4</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>4</r:Value> @@ -6969,11 +6969,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxricm-5</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-jbdxricm-5</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>5</r:Value> @@ -6982,7 +6982,7 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwh16i</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Products</r:Content> </r:Label> @@ -6993,22 +6993,22 @@ <l:Code levelNumber="1" isDiscrete="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwh16i-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwh16i-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>A</r:Value> <l:Code levelNumber="2" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwh16i-2</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwh16i-2</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>A1</r:Value> @@ -7016,11 +7016,11 @@ <l:Code levelNumber="2" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwh16i-3</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwh16i-3</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>A2</r:Value> @@ -7029,22 +7029,22 @@ <l:Code levelNumber="1" isDiscrete="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwh16i-4</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwh16i-4</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>B</r:Value> <l:Code levelNumber="2" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwh16i-5</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwh16i-5</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>B1</r:Value> @@ -7052,11 +7052,11 @@ <l:Code levelNumber="2" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwh16i-6</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwh16i-6</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>B2</r:Value> @@ -7064,11 +7064,11 @@ <l:Code levelNumber="2" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwh16i-7</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwh16i-7</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>B3</r:Value> @@ -7077,22 +7077,22 @@ <l:Code levelNumber="1" isDiscrete="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwh16i-8</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwh16i-8</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>C</r:Value> <l:Code levelNumber="2" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwh16i-9</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwh16i-9</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>C1</r:Value> @@ -7101,11 +7101,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwh16i-10</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwh16i-10</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>D</r:Value> @@ -7114,7 +7114,7 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>j77dav9b</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Clownings</r:Content> </r:Label> @@ -7125,11 +7125,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j77dav9b-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j77dav9b-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>1</r:Value> @@ -7137,11 +7137,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j77dav9b-2</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j77dav9b-2</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>2</r:Value> @@ -7149,11 +7149,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j77dav9b-3</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j77dav9b-3</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>3</r:Value> @@ -7161,11 +7161,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j77dav9b-4</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j77dav9b-4</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>4</r:Value> @@ -7174,7 +7174,7 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>jbdyh6b5</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Clowning_Characters</r:Content> </r:Label> @@ -7185,11 +7185,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>jbdyh6b5-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-jbdyh6b5-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>1</r:Value> @@ -7197,11 +7197,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>jbdyh6b5-2</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-jbdyh6b5-2</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>2</r:Value> @@ -7209,11 +7209,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>jbdyh6b5-3</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-jbdyh6b5-3</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>3</r:Value> @@ -7221,11 +7221,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>jbdyh6b5-4</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-jbdyh6b5-4</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>4</r:Value> @@ -7234,7 +7234,7 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2kivg</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Means of transport</r:Content> </r:Label> @@ -7245,11 +7245,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2kivg-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6p2kivg-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>1</r:Value> @@ -7257,11 +7257,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2kivg-2</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6p2kivg-2</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>2</r:Value> @@ -7269,11 +7269,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2kivg-3</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6p2kivg-3</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>3</r:Value> @@ -7281,11 +7281,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2kivg-4</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6p2kivg-4</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>4</r:Value> @@ -7294,7 +7294,7 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>jbdye1wa</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Country</r:Content> </r:Label> @@ -7305,11 +7305,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>jbdye1wa-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-jbdye1wa-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>1</r:Value> @@ -7317,11 +7317,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>jbdye1wa-2</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-jbdye1wa-2</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>2</r:Value> @@ -7329,11 +7329,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>jbdye1wa-3</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-jbdye1wa-3</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>3</r:Value> @@ -7341,11 +7341,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>jbdye1wa-4</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-jbdye1wa-4</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>4</r:Value> @@ -7353,11 +7353,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>jbdye1wa-5</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-jbdye1wa-5</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>5</r:Value> @@ -7365,11 +7365,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>jbdye1wa-6</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-jbdye1wa-6</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>6</r:Value> @@ -7378,7 +7378,7 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-secondDimension-fakeCL-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">FAKE-CODELIST-j4nwc63q-secondDimension-fakeCL-1</r:Content> </r:Label> @@ -7389,11 +7389,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-secondDimension-fakeCL-1-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwc63q-secondDimension-fakeCL-1-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>1</r:Value> @@ -7402,7 +7402,7 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-secondDimension-fakeCL-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">FAKE-CODELIST-j4nw0rr6-secondDimension-fakeCL-1</r:Content> </r:Label> @@ -7413,11 +7413,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-secondDimension-fakeCL-1-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nw0rr6-secondDimension-fakeCL-1-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>1</r:Value> @@ -7425,11 +7425,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-secondDimension-fakeCL-1-2</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nw0rr6-secondDimension-fakeCL-1-2</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>2</r:Value> @@ -7438,7 +7438,7 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-secondDimension-fakeCL-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">FAKE-CODELIST-j6qg8rc6-secondDimension-fakeCL-1</r:Content> </r:Label> @@ -7449,11 +7449,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-secondDimension-fakeCL-1-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6qg8rc6-secondDimension-fakeCL-1-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>1</r:Value> @@ -7461,11 +7461,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-secondDimension-fakeCL-1-2</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6qg8rc6-secondDimension-fakeCL-1-2</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>2</r:Value> @@ -7474,7 +7474,7 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:CodeListName> <r:String xml:lang="fr-FR">Booleen</r:String> </l:CodeListName> @@ -7485,11 +7485,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CA-Booleen-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>1</r:Value> @@ -7499,14 +7499,14 @@ <l:VariableScheme> <r:Agency>fr.insee</r:Agency> <r:ID>VariableScheme-i6vwi0</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Variable Scheme for the survey</r:Content> </r:Label> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">SUM_EXPENSES</r:String> </l:VariableName> @@ -7516,25 +7516,25 @@ <r:OutParameter> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-VROP</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> </r:OutParameter> <l:VariableRepresentation> <r:ProcessingInstructionReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-GI</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>GenerationInstruction</r:TypeOfObject> <r:Binding> <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-GOP</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-VROP</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -7545,7 +7545,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtex</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">LAST_BROADCAST</r:String> </l:VariableName> @@ -7556,7 +7556,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbcgfvir</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">COMMENT</r:String> </l:VariableName> @@ -7566,13 +7566,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p3dkx6-QOP-jbgdhaht</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p3dkx6</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -7582,7 +7582,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbcgm0ip</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">READY</r:String> </l:VariableName> @@ -7592,13 +7592,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p0np9q-QOP-jbgd3set</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p0np9q</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -7608,7 +7608,7 @@ <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -7619,7 +7619,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbcgf11f</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">PRODUCER</r:String> </l:VariableName> @@ -7629,13 +7629,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j3343qhx-QOP-jbgd90cy</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j3343qhx</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -7645,7 +7645,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbcgcy2x</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">SEASON_NUMBER</r:String> </l:VariableName> @@ -7655,13 +7655,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6q9h8tj-QOP-jbgdjy8h</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6q9h8tj</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -7677,7 +7677,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbcgbg33</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">DATEFIRST</r:String> </l:VariableName> @@ -7687,20 +7687,20 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334cyqb-QOP-jbgdih2z</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334cyqb</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> <r:DateTimeRepresentationReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-MNR-DateTimedate-YYYY-MM-DD</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>ManagedDateTimeRepresentation</r:TypeOfObject> </r:DateTimeRepresentationReference> </l:VariableRepresentation> @@ -7708,7 +7708,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbcgieyw</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">AUDIENCE_SHARE</r:String> </l:VariableName> @@ -7718,13 +7718,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6z06z1e-QOP-jbgddnrd</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6z06z1e</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -7740,7 +7740,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbcgasbh</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">CITY</r:String> </l:VariableName> @@ -7750,13 +7750,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j3343clt-QOP-jbgdjdkn</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j3343clt</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -7764,7 +7764,7 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334iumu</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -7773,7 +7773,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbcg9yr6</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">MAYOR</r:String> </l:VariableName> @@ -7783,13 +7783,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qdfhvw-QOP-jbgd8ghp</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qdfhvw</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -7797,7 +7797,7 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qdqoen</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -7806,7 +7806,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbcgpija</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">STATE</r:String> </l:VariableName> @@ -7816,13 +7816,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw5cqz-QOP-jbgdkd7v</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw5cqz</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -7830,7 +7830,7 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwo00f</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -7839,7 +7839,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxewlq</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">PET1</r:String> </l:VariableName> @@ -7849,13 +7849,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-QOP-jbgd8qmn</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -7865,7 +7865,7 @@ <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -7876,7 +7876,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxjmst</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">PET2</r:String> </l:VariableName> @@ -7886,13 +7886,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-QOP-jbgd60vl</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -7902,7 +7902,7 @@ <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -7913,7 +7913,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxjuay</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">PET3</r:String> </l:VariableName> @@ -7923,13 +7923,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-QOP-jbgda2jo</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -7939,7 +7939,7 @@ <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -7950,7 +7950,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxniuw</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">PET4</r:String> </l:VariableName> @@ -7960,13 +7960,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-QOP-jbgdfssy</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -7976,7 +7976,7 @@ <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -7987,7 +7987,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxtl1d</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">ICE_FLAVOUR1</r:String> </l:VariableName> @@ -7997,13 +7997,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-QOP-jbgdb3jx</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -8011,7 +8011,7 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -8020,7 +8020,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxvai9</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">ICE_FLAVOUR2</r:String> </l:VariableName> @@ -8030,13 +8030,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-QOP-jbgdb61k</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -8044,7 +8044,7 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -8053,7 +8053,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxpltw</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">ICE_FLAVOUR3</r:String> </l:VariableName> @@ -8063,13 +8063,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-QOP-jbgdl3kc</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -8077,7 +8077,7 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -8086,7 +8086,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxzx2x</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">ICE_FLAVOUR4</r:String> </l:VariableName> @@ -8096,13 +8096,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-QOP-jbgdcobo</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -8110,7 +8110,7 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -8119,7 +8119,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdy4nhp</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">NUCLEAR_CHARACTER1</r:String> </l:VariableName> @@ -8129,13 +8129,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-QOP-jbgd6p0k</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -8143,7 +8143,7 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -8152,7 +8152,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxtanu</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">NUCLEAR_CHARACTER2</r:String> </l:VariableName> @@ -8162,13 +8162,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-QOP-jbgd9ato</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -8176,7 +8176,7 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -8185,7 +8185,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdy25if</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">NUCLEAR_CHARACTER3</r:String> </l:VariableName> @@ -8195,13 +8195,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-QOP-jbgd3e0p</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -8209,7 +8209,7 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -8218,7 +8218,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxvta8</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">NUCLEAR_CHARACTER4</r:String> </l:VariableName> @@ -8228,13 +8228,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-QOP-jbgdkxne</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -8242,7 +8242,7 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -8251,7 +8251,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdy3nh7</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">BIRTH_CHARACTER1</r:String> </l:VariableName> @@ -8261,13 +8261,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QOP-jbgd7fr6</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -8275,7 +8275,7 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxricm</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -8284,7 +8284,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdy6lk3</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">BIRTH_CHARACTER2</r:String> </l:VariableName> @@ -8294,13 +8294,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QOP-jbgd5e9f</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -8308,7 +8308,7 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxricm</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -8317,7 +8317,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxsby0</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">BIRTH_CHARACTER3</r:String> </l:VariableName> @@ -8327,13 +8327,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QOP-jbgd912x</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -8341,7 +8341,7 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxricm</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -8350,7 +8350,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdy7sra</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">BIRTH_CHARACTER4</r:String> </l:VariableName> @@ -8360,13 +8360,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QOP-jbgd6bdy</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -8374,7 +8374,7 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxricm</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -8383,7 +8383,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdy2wyl</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">BIRTH_CHARACTER5</r:String> </l:VariableName> @@ -8393,13 +8393,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QOP-jbgddyry</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -8407,7 +8407,7 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxricm</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -8416,7 +8416,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdnfk7</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES11</r:String> </l:VariableName> @@ -8426,13 +8426,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgde5yl</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -8449,7 +8449,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdje4w</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES21</r:String> </l:VariableName> @@ -8459,13 +8459,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd2x2t</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -8482,7 +8482,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdlth7</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES31</r:String> </l:VariableName> @@ -8492,13 +8492,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdjypz</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -8515,7 +8515,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdelbl</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES41</r:String> </l:VariableName> @@ -8525,13 +8525,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdcftu</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -8548,7 +8548,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd95jq</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES51</r:String> </l:VariableName> @@ -8558,13 +8558,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdiyfe</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -8581,7 +8581,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdadd9</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES61</r:String> </l:VariableName> @@ -8591,13 +8591,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdj1wd</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -8614,7 +8614,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdlwzk</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES71</r:String> </l:VariableName> @@ -8624,13 +8624,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgddylk</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -8647,7 +8647,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdfz77</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES81</r:String> </l:VariableName> @@ -8657,13 +8657,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd3jj6</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -8680,7 +8680,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdepx6</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES91</r:String> </l:VariableName> @@ -8690,13 +8690,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd4w3k</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -8713,7 +8713,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdepx7</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES101</r:String> </l:VariableName> @@ -8723,13 +8723,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd4w4k</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -8746,7 +8746,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd9vqv</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">CLOWNING11</r:String> </l:VariableName> @@ -8756,13 +8756,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgd8tyr</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -8770,7 +8770,7 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdyh6b5</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -8779,7 +8779,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgden0i</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">CLOWNING21</r:String> </l:VariableName> @@ -8789,13 +8789,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdep36</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -8803,7 +8803,7 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdyh6b5</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -8812,7 +8812,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdndju</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">CLOWNING31</r:String> </l:VariableName> @@ -8822,13 +8822,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdjjgi</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -8836,7 +8836,7 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdyh6b5</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -8845,7 +8845,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdfwg9</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">CLOWNING41</r:String> </l:VariableName> @@ -8855,13 +8855,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdgh6k</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -8869,7 +8869,7 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdyh6b5</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -8878,7 +8878,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdd3ky</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">CLOWNING12</r:String> </l:VariableName> @@ -8888,13 +8888,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdit3o</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -8904,7 +8904,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdm9lm</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">CLOWNING22</r:String> </l:VariableName> @@ -8914,13 +8914,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgd366k</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -8930,7 +8930,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdcdhv</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">CLOWNING32</r:String> </l:VariableName> @@ -8940,13 +8940,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdax06</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -8956,7 +8956,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdjlit</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">CLOWNING42</r:String> </l:VariableName> @@ -8966,13 +8966,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdfo1j</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -8982,7 +8982,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd1zxu</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL11</r:String> </l:VariableName> @@ -8992,13 +8992,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd92mb</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -9008,7 +9008,7 @@ <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -9019,7 +9019,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd8lfs</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL21</r:String> </l:VariableName> @@ -9029,13 +9029,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdgsat</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -9045,7 +9045,7 @@ <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -9056,7 +9056,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd56qo</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL31</r:String> </l:VariableName> @@ -9066,13 +9066,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdaxk2</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -9082,7 +9082,7 @@ <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -9093,7 +9093,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd4wu8</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL41</r:String> </l:VariableName> @@ -9103,13 +9103,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd7myn</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -9119,7 +9119,7 @@ <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -9130,7 +9130,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdak6h</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL12</r:String> </l:VariableName> @@ -9140,13 +9140,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdnxkt</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -9156,7 +9156,7 @@ <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -9167,7 +9167,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdmsy4</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL22</r:String> </l:VariableName> @@ -9177,13 +9177,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd3ef5</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -9193,7 +9193,7 @@ <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -9204,7 +9204,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd2zlu</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL32</r:String> </l:VariableName> @@ -9214,13 +9214,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd8p1v</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -9230,7 +9230,7 @@ <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -9241,7 +9241,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd6v73</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL42</r:String> </l:VariableName> @@ -9251,13 +9251,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdgm0c</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -9267,7 +9267,7 @@ <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -9278,7 +9278,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdf5fg</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL13</r:String> </l:VariableName> @@ -9288,13 +9288,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdcppc</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -9304,7 +9304,7 @@ <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -9315,7 +9315,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd2xg0</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL23</r:String> </l:VariableName> @@ -9325,13 +9325,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd4cm6</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -9341,7 +9341,7 @@ <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -9352,7 +9352,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdc06l</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL33</r:String> </l:VariableName> @@ -9362,13 +9362,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdd2lo</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -9378,7 +9378,7 @@ <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -9389,7 +9389,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdb8i9</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL43</r:String> </l:VariableName> @@ -9399,13 +9399,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdo0ay</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -9415,7 +9415,7 @@ <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -9426,7 +9426,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdhzve</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL14</r:String> </l:VariableName> @@ -9436,13 +9436,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd4r2a</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -9452,7 +9452,7 @@ <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -9463,7 +9463,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd93ks</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL24</r:String> </l:VariableName> @@ -9473,13 +9473,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdkfpq</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -9489,7 +9489,7 @@ <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -9500,7 +9500,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdfw7h</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL34</r:String> </l:VariableName> @@ -9510,13 +9510,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd7u52</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -9526,7 +9526,7 @@ <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -9537,7 +9537,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdfavn</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL44</r:String> </l:VariableName> @@ -9547,13 +9547,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdgfwl</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -9563,7 +9563,7 @@ <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -9574,7 +9574,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdc199</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL15</r:String> </l:VariableName> @@ -9584,13 +9584,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd9cff</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -9600,7 +9600,7 @@ <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -9611,7 +9611,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdfqph</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL25</r:String> </l:VariableName> @@ -9621,13 +9621,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgddwsp</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -9637,7 +9637,7 @@ <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -9648,7 +9648,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd8r0n</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL35</r:String> </l:VariableName> @@ -9658,13 +9658,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdncn8</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -9674,7 +9674,7 @@ <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -9685,7 +9685,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd3aqk</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL45</r:String> </l:VariableName> @@ -9695,13 +9695,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdnz6b</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -9711,7 +9711,7 @@ <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -9722,7 +9722,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdltql</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL16</r:String> </l:VariableName> @@ -9732,13 +9732,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdiva0</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -9748,7 +9748,7 @@ <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -9759,7 +9759,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd9um3</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL26</r:String> </l:VariableName> @@ -9769,13 +9769,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd7dqf</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -9785,7 +9785,7 @@ <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -9796,7 +9796,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgddj7v</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL36</r:String> </l:VariableName> @@ -9806,13 +9806,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdnous</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -9822,7 +9822,7 @@ <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -9833,7 +9833,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdb4ym</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL46</r:String> </l:VariableName> @@ -9843,13 +9843,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdkfcz</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -9859,7 +9859,7 @@ <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -9870,7 +9870,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd3fkz</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS11</r:String> </l:VariableName> @@ -9880,13 +9880,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdl5jb</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -9896,7 +9896,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdf2md</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS21</r:String> </l:VariableName> @@ -9906,13 +9906,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd8lwo</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -9922,7 +9922,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdfle1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS31</r:String> </l:VariableName> @@ -9932,13 +9932,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdbfag</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -9948,7 +9948,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdix8x</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS41</r:String> </l:VariableName> @@ -9958,13 +9958,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdlgja</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -9974,7 +9974,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd782k</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS51</r:String> </l:VariableName> @@ -9984,13 +9984,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd745y</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -10000,7 +10000,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd68rf</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS61</r:String> </l:VariableName> @@ -10010,13 +10010,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdjkts</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -10026,7 +10026,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdfoj4</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS71</r:String> </l:VariableName> @@ -10036,13 +10036,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdcax7</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -10052,7 +10052,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdb116</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS81</r:String> </l:VariableName> @@ -10062,13 +10062,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdjye1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -10078,7 +10078,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd7w5p</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS91</r:String> </l:VariableName> @@ -10088,13 +10088,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd5jet</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -10104,7 +10104,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd8rj2</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS101</r:String> </l:VariableName> @@ -10114,13 +10114,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdjw90</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -10130,7 +10130,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdidnp</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS12</r:String> </l:VariableName> @@ -10140,13 +10140,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdfndq</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -10162,7 +10162,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd47wz</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS22</r:String> </l:VariableName> @@ -10172,13 +10172,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd7osi</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -10194,7 +10194,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdj2nn</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS32</r:String> </l:VariableName> @@ -10204,13 +10204,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd7bnw</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -10226,7 +10226,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd2ipx</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS42</r:String> </l:VariableName> @@ -10236,13 +10236,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd9k71</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -10258,7 +10258,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd4pe3</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS52</r:String> </l:VariableName> @@ -10268,13 +10268,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdimks</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -10290,7 +10290,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdjgb1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS62</r:String> </l:VariableName> @@ -10300,13 +10300,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdjquz</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -10322,7 +10322,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdb5c1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS72</r:String> </l:VariableName> @@ -10332,13 +10332,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdd2w3</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -10354,7 +10354,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdju9y</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS82</r:String> </l:VariableName> @@ -10364,13 +10364,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdkosc</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -10386,7 +10386,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdatyx</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS92</r:String> </l:VariableName> @@ -10396,13 +10396,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdk0x4</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -10418,7 +10418,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdi1dt</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS102</r:String> </l:VariableName> @@ -10428,13 +10428,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd2wgf</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -10450,7 +10450,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggt4x</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">SURVEY_COMMENT</r:String> </l:VariableName> @@ -10460,13 +10460,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6z0z3us-QOP-jbgd6m6e</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6z0z3us</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -10476,12 +10476,12 @@ <l:VariableGroup> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-gp</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:BasedOnObject> <r:BasedOnReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:BasedOnReference> </r:BasedOnObject> @@ -10492,121 +10492,121 @@ <r:VariableReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd3fkz</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </r:VariableReference> <r:VariableReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdf2md</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </r:VariableReference> <r:VariableReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdfle1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </r:VariableReference> <r:VariableReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdix8x</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </r:VariableReference> <r:VariableReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd782k</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </r:VariableReference> <r:VariableReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd68rf</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </r:VariableReference> <r:VariableReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdfoj4</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </r:VariableReference> <r:VariableReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdb116</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </r:VariableReference> <r:VariableReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd7w5p</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </r:VariableReference> <r:VariableReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd8rj2</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </r:VariableReference> <r:VariableReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdidnp</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </r:VariableReference> <r:VariableReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd47wz</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </r:VariableReference> <r:VariableReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdj2nn</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </r:VariableReference> <r:VariableReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd2ipx</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </r:VariableReference> <r:VariableReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd4pe3</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </r:VariableReference> <r:VariableReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdjgb1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </r:VariableReference> <r:VariableReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdb5c1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </r:VariableReference> <r:VariableReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdju9y</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </r:VariableReference> <r:VariableReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdatyx</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </r:VariableReference> <r:VariableReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdi1dt</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </r:VariableReference> </l:VariableGroup> @@ -10614,7 +10614,7 @@ <d:ProcessingInstructionScheme> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-SIMPSONS-PIS-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <d:ProcessingInstructionSchemeName> <r:String xml:lang="en-IE">SIMPSONS</r:String> </d:ProcessingInstructionSchemeName> @@ -10624,66 +10624,66 @@ <d:GenerationInstruction> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-GI</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <!--<d:SourceQuestion>Not implemented.</d:SourceQuestion>--> <d:SourceVariable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdnfk7</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </d:SourceVariable> <d:SourceVariable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdje4w</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </d:SourceVariable> <d:SourceVariable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdlth7</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </d:SourceVariable> <d:SourceVariable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdelbl</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </d:SourceVariable> <d:SourceVariable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd95jq</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </d:SourceVariable> <d:SourceVariable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdadd9</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </d:SourceVariable> <d:SourceVariable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdlwzk</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </d:SourceVariable> <d:SourceVariable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdfz77</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </d:SourceVariable> <d:SourceVariable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdepx6</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </d:SourceVariable> <d:SourceVariable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdepx7</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </d:SourceVariable> <r:CommandCode> @@ -10692,7 +10692,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES11</r:String> </r:ParameterName> @@ -10700,7 +10700,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-2</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES21</r:String> </r:ParameterName> @@ -10708,7 +10708,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-3</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES31</r:String> </r:ParameterName> @@ -10716,7 +10716,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-4</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES41</r:String> </r:ParameterName> @@ -10724,7 +10724,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-5</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES51</r:String> </r:ParameterName> @@ -10732,7 +10732,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-6</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES61</r:String> </r:ParameterName> @@ -10740,7 +10740,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-7</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES71</r:String> </r:ParameterName> @@ -10748,7 +10748,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-8</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES81</r:String> </r:ParameterName> @@ -10756,7 +10756,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-9</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES91</r:String> </r:ParameterName> @@ -10764,7 +10764,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-10</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES101</r:String> </r:ParameterName> @@ -10772,19 +10772,19 @@ <r:OutParameter> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-GOP</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> </r:OutParameter> <r:Binding> <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgde5yl</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-1</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -10792,13 +10792,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd2x2t</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-2</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -10806,13 +10806,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdjypz</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-3</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -10820,13 +10820,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdcftu</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-4</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -10834,13 +10834,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdiyfe</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-5</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -10848,13 +10848,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdj1wd</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-6</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -10862,13 +10862,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgddylk</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-7</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -10876,13 +10876,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd3jj6</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-8</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -10890,13 +10890,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd4w3k</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-9</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -10904,13 +10904,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd4w4k</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-10</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -10923,7 +10923,7 @@ <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>Sequence-i6vwi0</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Sequence</r:TypeOfObject> </d:ControlConstructReference> </d:GenerationInstruction> @@ -10931,7 +10931,7 @@ <r:ManagedRepresentationScheme> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-SIMPSONS-MRS</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:Label> <r:Content xml:lang="en-IE">Liste de formats numériques et dates de l'enquête</r:Content> @@ -10940,7 +10940,7 @@ <r:ManagedDateTimeRepresentation> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-MNR-DateTimedate-YYYY-MM-DD</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:DateFieldFormat>YYYY-MM-DD</r:DateFieldFormat> <r:DateTypeCode controlledVocabularyID="INSEE-DTC-CV">date</r:DateTypeCode> <r:Range> @@ -10953,38 +10953,38 @@ <s:StudyUnit> <r:Agency>fr.insee</r:Agency> <r:ID>StudyUnit-i6vwi0</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:ExPostEvaluation/> <d:DataCollection> <r:Agency>fr.insee</r:Agency> <r:ID>DataCollection-i6vwi0</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:QuestionSchemeReference> <r:Agency>fr.insee</r:Agency> <r:ID>QuestionScheme-i6vwi0</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>QuestionScheme</r:TypeOfObject> </r:QuestionSchemeReference> <r:ControlConstructSchemeReference> <r:Agency>fr.insee</r:Agency> <r:ID>ControlConstructScheme-i6vwi0</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>ControlConstructScheme</r:TypeOfObject> </r:ControlConstructSchemeReference> <r:InterviewerInstructionSchemeReference> <r:Agency>fr.insee</r:Agency> <r:ID>InterviewerInstructionScheme-i6vwi0</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>InterviewerInstructionScheme</r:TypeOfObject> </r:InterviewerInstructionSchemeReference> <d:InstrumentScheme xml:lang="fr-FR"> <r:Agency>fr.insee</r:Agency> <r:ID>InstrumentScheme-i6vwi0</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <d:Instrument xmlns:pogues="http://xml.insee.fr/schema/applis/pogues" xmlns:pr="ddi:ddiprofile:3_3" xmlns:c="ddi:conceptualcomponent:3_3" xmlns:cm="ddi:comparative:3_3"> <r:Agency>fr.insee</r:Agency> <r:ID>Instrument-i6vwi0</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <d:InstrumentName> <r:String>SIMPSONS</r:String> </d:InstrumentName> @@ -10995,7 +10995,7 @@ <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>Sequence-i6vwi0</r:ID> - <r:Version>1</r:Version> + <r:Version>1.0</r:Version> <r:TypeOfObject>Sequence</r:TypeOfObject> </d:ControlConstructReference> </d:Instrument> From df9d49d6027643795e3f4cda9d2243cb3dbf36e6 Mon Sep 17 00:00:00 2001 From: CHTAINET Badr <Badr.CHTAINET@akka.eu> Date: Wed, 4 Sep 2019 15:17:39 +0200 Subject: [PATCH 092/439] 189D Fix file test out --- .../xslt/inputs/pogues-xml/templates.fods | 122 +- src/test/resources/pogues-xml-to-ddi/out.xml | 2548 ++++++++--------- 2 files changed, 1361 insertions(+), 1309 deletions(-) diff --git a/src/main/resources/xslt/inputs/pogues-xml/templates.fods b/src/main/resources/xslt/inputs/pogues-xml/templates.fods index 65429a1ce..398eebc68 100644 --- a/src/main/resources/xslt/inputs/pogues-xml/templates.fods +++ b/src/main/resources/xslt/inputs/pogues-xml/templates.fods @@ -1,20 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> <office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.spreadsheet"> - <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>P11DT15H8M55S</meta:editing-duration><meta:editing-cycles>479</meta:editing-cycles><meta:generator>LibreOffice/6.1.5.2$Windows_X86_64 LibreOffice_project/90f8dcf33c87b3705e78202e3df5142b201bd805</meta:generator><dc:date>2019-07-24T15:23:04.997000000</dc:date><meta:document-statistic meta:table-count="1" meta:cell-count="351" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> + <office:meta><meta:creation-date>2009-04-16T11:32:48.39</meta:creation-date><meta:editing-duration>P11DT14H9M46S</meta:editing-duration><meta:editing-cycles>481</meta:editing-cycles><meta:generator>LibreOffice/6.1.5.2$Windows_X86_64 LibreOffice_project/90f8dcf33c87b3705e78202e3df5142b201bd805</meta:generator><dc:date>2019-09-04T14:51:31.252000000</dc:date><meta:document-statistic meta:table-count="1" meta:cell-count="362" meta:object-count="0"/><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/></office:meta> <office:settings> <config:config-item-set config:name="ooo:view-settings"> <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item> <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item> - <config:config-item config:name="VisibleAreaWidth" config:type="int">64075</config:config-item> - <config:config-item config:name="VisibleAreaHeight" config:type="int">54257</config:config-item> + <config:config-item config:name="VisibleAreaWidth" config:type="int">53973</config:config-item> + <config:config-item config:name="VisibleAreaHeight" config:type="int">55992</config:config-item> <config:config-item-map-indexed config:name="Views"> <config:config-item-map-entry> <config:config-item config:name="ViewId" config:type="string">view1</config:config-item> <config:config-item-map-named config:name="Tables"> <config:config-item-map-entry config:name="Sheet1"> - <config:config-item config:name="CursorPositionX" config:type="int">1</config:config-item> - <config:config-item config:name="CursorPositionY" config:type="int">14</config:config-item> + <config:config-item config:name="CursorPositionX" config:type="int">0</config:config-item> + <config:config-item config:name="CursorPositionY" config:type="int">16</config:config-item> <config:config-item config:name="HorizontalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="VerticalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="HorizontalSplitPosition" config:type="int">0</config:config-item> @@ -23,7 +23,7 @@ <config:config-item config:name="PositionLeft" config:type="int">0</config:config-item> <config:config-item config:name="PositionRight" config:type="int">0</config:config-item> <config:config-item config:name="PositionTop" config:type="int">0</config:config-item> - <config:config-item config:name="PositionBottom" config:type="int">0</config:config-item> + <config:config-item config:name="PositionBottom" config:type="int">3</config:config-item> <config:config-item config:name="ZoomType" config:type="short">0</config:config-item> <config:config-item config:name="ZoomValue" config:type="int">100</config:config-item> <config:config-item config:name="PageViewZoomValue" config:type="int">60</config:config-item> @@ -32,7 +32,7 @@ </config:config-item-map-entry> </config:config-item-map-named> <config:config-item config:name="ActiveTable" config:type="string">Sheet1</config:config-item> - <config:config-item config:name="HorizontalScrollbarWidth" config:type="int">1840</config:config-item> + <config:config-item config:name="HorizontalScrollbarWidth" config:type="int">1302</config:config-item> <config:config-item config:name="ZoomType" config:type="short">0</config:config-item> <config:config-item config:name="ZoomValue" config:type="int">100</config:config-item> <config:config-item config:name="PageViewZoomValue" config:type="int">60</config:config-item> @@ -516,13 +516,13 @@ </office:styles> <office:automatic-styles> <style:style style:name="co1" style:family="table-column"> - <style:table-column-properties fo:break-before="auto" style:column-width="204.79mm"/> + <style:table-column-properties fo:break-before="auto" style:column-width="121.07mm"/> </style:style> <style:style style:name="co2" style:family="table-column"> - <style:table-column-properties fo:break-before="auto" style:column-width="63.71mm"/> + <style:table-column-properties fo:break-before="auto" style:column-width="73.11mm"/> </style:style> <style:style style:name="co3" style:family="table-column"> - <style:table-column-properties fo:break-before="auto" style:column-width="153.32mm"/> + <style:table-column-properties fo:break-before="auto" style:column-width="126.61mm"/> </style:style> <style:style style:name="co4" style:family="table-column"> <style:table-column-properties fo:break-before="auto" style:column-width="35.93mm"/> @@ -545,8 +545,8 @@ <number:text-style style:name="N100"> <number:text-content/> </number:text-style> - <style:style style:name="ce5" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="N100"/> - <style:style style:name="ce6" style:family="table-cell" style:parent-style-name="Default"> + <style:style style:name="ce1" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="N100"/> + <style:style style:name="ce2" style:family="table-cell" style:parent-style-name="Default"> <style:text-properties style:font-name="Arial" fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/> </style:style> <style:page-layout style:name="pm1"> @@ -598,7 +598,7 @@ <text:p><text:sheet-name>???</text:sheet-name><text:s/>(<text:title>???</text:title>)</text:p> </style:region-left> <style:region-right> - <text:p><text:date style:data-style-name="N2" text:date-value="2019-07-24">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="14:48:46.282000000">00:00:00</text:time></text:p> + <text:p><text:date style:data-style-name="N2" text:date-value="2019-09-04">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="14:45:18.594000000">00:00:00</text:time></text:p> </style:region-right> </style:header> <style:header-left style:display="false"/> @@ -857,12 +857,12 @@ <office:body> <office:spreadsheet> <table:table table:name="Sheet1" table:style-name="ta1" table:print="false"> - <table:table-column table:style-name="co1" table:default-cell-style-name="ce5"/> - <table:table-column table:style-name="co2" table:default-cell-style-name="ce5"/> - <table:table-column table:style-name="co3" table:default-cell-style-name="ce5"/> - <table:table-column table:style-name="co4" table:default-cell-style-name="ce5"/> - <table:table-column table:style-name="co5" table:default-cell-style-name="ce5"/> - <table:table-column table:style-name="co6" table:number-columns-repeated="1019" table:default-cell-style-name="ce5"/> + <table:table-column table:style-name="co1" table:default-cell-style-name="ce1"/> + <table:table-column table:style-name="co2" table:default-cell-style-name="ce1"/> + <table:table-column table:style-name="co3" table:default-cell-style-name="ce1"/> + <table:table-column table:style-name="co4" table:default-cell-style-name="ce1"/> + <table:table-column table:style-name="co5" table:default-cell-style-name="ce1"/> + <table:table-column table:style-name="co6" table:number-columns-repeated="1019" table:default-cell-style-name="ce1"/> <table:table-row table:style-name="ro1"> <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>Xpath</text:p> @@ -1457,6 +1457,22 @@ </table:table-cell> <table:table-cell table:number-columns-repeated="1019"/> </table:table-row> + <table:table-row table:style-name="ro2"> + <table:table-cell table:style-name="Default" office:value-type="string" calcext:value-type="string"> + <text:p>*</text:p> + </table:table-cell> + <table:table-cell table:style-name="Default" office:value-type="string" calcext:value-type="string"> + <text:p>enopogues:get-maximum</text:p> + </table:table-cell> + <table:table-cell table:style-name="Default" office:value-type="string" calcext:value-type="string"> + <text:p>pogues:Maximum</text:p> + </table:table-cell> + <table:table-cell table:style-name="Default"/> + <table:table-cell table:style-name="Default" office:value-type="string" calcext:value-type="string"> + <text:p>Return the maximal value of the data type</text:p> + </table:table-cell> + <table:table-cell table:style-name="Default" table:number-columns-repeated="1019"/> + </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>pogues:Datatype[not(@visualizationHint) and @xsi:type='NumericDatatypeType']</text:p> @@ -1473,6 +1489,22 @@ </table:table-cell> <table:table-cell table:number-columns-repeated="1019"/> </table:table-row> + <table:table-row table:style-name="ro2"> + <table:table-cell table:style-name="Default" office:value-type="string" calcext:value-type="string"> + <text:p>*</text:p> + </table:table-cell> + <table:table-cell table:style-name="Default" office:value-type="string" calcext:value-type="string"> + <text:p>enopogues:get-minimum</text:p> + </table:table-cell> + <table:table-cell table:style-name="Default" office:value-type="string" calcext:value-type="string"> + <text:p>pogues:Minimum</text:p> + </table:table-cell> + <table:table-cell table:style-name="Default"/> + <table:table-cell table:style-name="Default" office:value-type="string" calcext:value-type="string"> + <text:p>Return the minimal value of the data type</text:p> + </table:table-cell> + <table:table-cell table:style-name="Default" table:number-columns-repeated="1019"/> + </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>pogues:Datatype[not(@visualizationHint) and @xsi:type='NumericDatatypeType']</text:p> @@ -1679,7 +1711,7 @@ <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>*</text:p> </table:table-cell> - <table:table-cell table:style-name="ce6" office:value-type="string" calcext:value-type="string"> + <table:table-cell table:style-name="ce2" office:value-type="string" calcext:value-type="string"> <text:p>enopogues:get-questionnaire-id</text:p> </table:table-cell> <table:table-cell table:style-name="Default" office:value-type="string" calcext:value-type="string"> @@ -1877,7 +1909,7 @@ <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>*</text:p> </table:table-cell> - <table:table-cell table:style-name="ce6" office:value-type="string" calcext:value-type="string"> + <table:table-cell table:style-name="ce2" office:value-type="string" calcext:value-type="string"> <text:p>enopogues:get-sequences</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> @@ -1895,7 +1927,7 @@ <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>*</text:p> </table:table-cell> - <table:table-cell table:style-name="ce6" office:value-type="string" calcext:value-type="string"> + <table:table-cell table:style-name="ce2" office:value-type="string" calcext:value-type="string"> <text:p>enopogues:get-survey-name</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> @@ -1907,7 +1939,7 @@ <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>pogues:IfThenElse</text:p> </table:table-cell> - <table:table-cell table:style-name="ce6" office:value-type="string" calcext:value-type="string"> + <table:table-cell table:style-name="ce2" office:value-type="string" calcext:value-type="string"> <text:p>enopogues:get-then-id</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> @@ -1923,7 +1955,7 @@ <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>pogues:Response</text:p> </table:table-cell> - <table:table-cell table:style-name="ce6" office:value-type="string" calcext:value-type="string"> + <table:table-cell table:style-name="ce2" office:value-type="string" calcext:value-type="string"> <text:p>enopogues:get-type</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> @@ -1939,7 +1971,7 @@ <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>pogues:Child[@xsi:type='QuestionType' and @questionType!='TABLE']</text:p> </table:table-cell> - <table:table-cell table:style-name="ce6" office:value-type="string" calcext:value-type="string"> + <table:table-cell table:style-name="ce2" office:value-type="string" calcext:value-type="string"> <text:p>enopogues:get-type</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> @@ -1955,7 +1987,7 @@ <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>pogues:Child[@questionType='TABLE' and not(pogues:ResponseStructure/pogues:Dimension[@dimensionType="PRIMARY" and @dynamic != '0'])]</text:p> </table:table-cell> - <table:table-cell table:style-name="ce6" office:value-type="string" calcext:value-type="string"> + <table:table-cell table:style-name="ce2" office:value-type="string" calcext:value-type="string"> <text:p>enopogues:get-type</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> @@ -1971,7 +2003,7 @@ <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>pogues:Child[@questionType='TABLE' and pogues:ResponseStructure/pogues:Dimension[@dimensionType="PRIMARY" and @dynamic != '0']]</text:p> </table:table-cell> - <table:table-cell table:style-name="ce6" office:value-type="string" calcext:value-type="string"> + <table:table-cell table:style-name="ce2" office:value-type="string" calcext:value-type="string"> <text:p>enopogues:get-type</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> @@ -1983,7 +2015,7 @@ <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>pogues:Control</text:p> </table:table-cell> - <table:table-cell table:style-name="ce6" office:value-type="string" calcext:value-type="string"> + <table:table-cell table:style-name="ce2" office:value-type="string" calcext:value-type="string"> <text:p>enopogues:get-type</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> @@ -1998,7 +2030,7 @@ <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>pogues:Variable</text:p> </table:table-cell> - <table:table-cell table:style-name="ce6" office:value-type="string" calcext:value-type="string"> + <table:table-cell table:style-name="ce2" office:value-type="string" calcext:value-type="string"> <text:p>enopogues:get-type</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> @@ -2010,7 +2042,7 @@ <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>pogues:Response</text:p> </table:table-cell> - <table:table-cell table:style-name="ce6" office:value-type="string" calcext:value-type="string"> + <table:table-cell table:style-name="ce2" office:value-type="string" calcext:value-type="string"> <text:p>enopogues:get-type-name</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> @@ -2057,11 +2089,11 @@ <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>*</text:p> </table:table-cell> - <table:table-cell table:style-name="ce6" office:value-type="string" calcext:value-type="string"> + <table:table-cell table:style-name="ce2" office:value-type="string" calcext:value-type="string"> <text:p>enopogues:get-version</text:p> </table:table-cell> <table:table-cell table:style-name="Default" office:value-type="string" calcext:value-type="string"> - <text:p>'1.0'</text:p> + <text:p>'1'</text:p> </table:table-cell> <table:table-cell/> <table:table-cell office:value-type="string" calcext:value-type="string"> @@ -2073,7 +2105,7 @@ <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>pogues:Response</text:p> </table:table-cell> - <table:table-cell table:style-name="ce6" office:value-type="string" calcext:value-type="string"> + <table:table-cell table:style-name="ce2" office:value-type="string" calcext:value-type="string"> <text:p>enopogues:get-visualization-hint</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> @@ -2226,10 +2258,30 @@ </table:table-cell> <table:table-cell table:number-columns-repeated="1021"/> </table:table-row> - <table:table-row table:style-name="ro2" table:number-rows-repeated="65"> + <table:table-row table:style-name="ro2"> + <table:table-cell table:style-name="Default" office:value-type="string" calcext:value-type="string"> + <text:p>*</text:p> + </table:table-cell> + <table:table-cell table:style-name="Default" office:value-type="string" calcext:value-type="string"> + <text:p>enopogues:get-format</text:p> + </table:table-cell> + <table:table-cell table:style-name="Default" office:value-type="string" calcext:value-type="string"> + <text:p>pogues:Format</text:p> + </table:table-cell> + <table:table-cell table:number-columns-repeated="1021"/> + </table:table-row> + <table:table-row table:style-name="ro2"> + <table:table-cell table:number-columns-repeated="1024"/> + </table:table-row> + <table:table-row table:style-name="ro2"> + <table:table-cell table:number-columns-repeated="2"/> + <table:table-cell table:style-name="Default"/> + <table:table-cell table:number-columns-repeated="1021"/> + </table:table-row> + <table:table-row table:style-name="ro2" table:number-rows-repeated="61"> <table:table-cell table:number-columns-repeated="1024"/> </table:table-row> - <table:table-row table:style-name="ro1" table:number-rows-repeated="1048416"> + <table:table-row table:style-name="ro1" table:number-rows-repeated="1048415"> <table:table-cell table:number-columns-repeated="1024"/> </table:table-row> <table:table-row table:style-name="ro1"> diff --git a/src/test/resources/pogues-xml-to-ddi/out.xml b/src/test/resources/pogues-xml-to-ddi/out.xml index 91c318197..52605f2ac 100644 --- a/src/test/resources/pogues-xml-to-ddi/out.xml +++ b/src/test/resources/pogues-xml-to-ddi/out.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?><DDIInstance xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="ddi:instance:3_3" xmlns:g="ddi:group:3_3" xmlns:d="ddi:datacollection:3_3" xmlns:s="ddi:studyunit:3_3" xmlns:r="ddi:reusable:3_3" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:a="ddi:archive:3_3" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:l="ddi:logicalproduct:3_3" xsi:schemaLocation="ddi:instance:3_3 https://www.ddialliance.org/Specification/DDI-Lifecycle/3.3/XMLSchema/instance.xsd" isMaintainable="true"> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-i6vwi0</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Citation> <r:Title> <r:String>Questionnaire SIMPSONS</r:String> @@ -10,18 +10,18 @@ <g:ResourcePackage isMaintainable="true" versionDate="2018-01-25+01:00"> <r:Agency>fr.insee</r:Agency> <r:ID>RessourcePackage-i6vwi0</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <d:InterviewerInstructionScheme> <r:Agency>fr.insee</r:Agency> <r:ID>InterviewerInstructionScheme-i6vwi0</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">A définir</r:Content> </r:Label> <d:Instruction> <r:Agency>fr.insee</r:Agency> <r:ID>d1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <d:InstructionName> <r:String xml:lang="fr-FR">comment</r:String> </d:InstructionName> @@ -34,7 +34,7 @@ <d:Instruction> <r:Agency>fr.insee</r:Agency> <r:ID>d11</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <d:InstructionName> <r:String xml:lang="fr-FR">comment</r:String> </d:InstructionName> @@ -48,7 +48,7 @@ <d:Instruction> <r:Agency>fr.insee</r:Agency> <r:ID>d2</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <d:InstructionName> <r:String xml:lang="fr-FR">comment</r:String> </d:InstructionName> @@ -61,7 +61,7 @@ <d:Instruction> <r:Agency>fr.insee</r:Agency> <r:ID>d3</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <d:InstructionName> <r:String xml:lang="fr-FR">instruction</r:String> </d:InstructionName> @@ -74,7 +74,7 @@ <d:Instruction> <r:Agency>fr.insee</r:Agency> <r:ID>d4</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <d:InstructionName> <r:String xml:lang="fr-FR">instruction</r:String> </d:InstructionName> @@ -87,7 +87,7 @@ <d:Instruction> <r:Agency>fr.insee</r:Agency> <r:ID>d5</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <d:InstructionName> <r:String xml:lang="fr-FR">instruction</r:String> </d:InstructionName> @@ -100,7 +100,7 @@ <d:Instruction> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-II-0</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <d:InstructionName> <r:String xml:lang="fr-FR">warning</r:String> </d:InstructionName> @@ -113,7 +113,7 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-GOP</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> </d:ConditionalText> @@ -122,7 +122,7 @@ <d:Instruction> <r:Agency>fr.insee</r:Agency> <r:ID>d10</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <d:InstructionName> <r:String xml:lang="fr-FR">instruction</r:String> </d:InstructionName> @@ -132,15 +132,15 @@ </d:LiteralText> </d:InstructionText> </d:Instruction> - <d:Instruction><r:Agency>fr.insee</r:Agency><r:ID>FTN-INSTRUCTION-1</r:ID><r:Version>1.0</r:Version><d:InstructionName><r:String xml:lang="fr-FR">tooltip</r:String></d:InstructionName><d:InstructionText><d:LiteralText><d:Text xml:lang="fr-FR"><xhtml:p id="ftn1">Included principalities</xhtml:p></d:Text></d:LiteralText></d:InstructionText></d:Instruction></d:InterviewerInstructionScheme> + <d:Instruction><r:Agency>fr.insee</r:Agency><r:ID>FTN-INSTRUCTION-1</r:ID><r:Version>1</r:Version><d:InstructionName><r:String xml:lang="fr-FR">tooltip</r:String></d:InstructionName><d:InstructionText><d:LiteralText><d:Text xml:lang="fr-FR"><xhtml:p id="ftn1">Included principalities</xhtml:p></d:Text></d:LiteralText></d:InstructionText></d:Instruction></d:InterviewerInstructionScheme> <d:ControlConstructScheme> <r:Agency>fr.insee</r:Agency> <r:ID>ControlConstructScheme-i6vwi0</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <d:Sequence> <r:Agency>fr.insee</r:Agency> <r:ID>Sequence-i6vwi0</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Questionnaire SIMPSONS</r:Content> </r:Label> @@ -148,26 +148,26 @@ <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p0ti5h</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Sequence</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>d1e119</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>IfThenElse</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6z12s2d</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Sequence</r:TypeOfObject> </d:ControlConstructReference> </d:Sequence> <d:Sequence> <r:Agency>fr.insee</r:Agency> <r:ID>j6p0ti5h</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">MODULE1</r:String> </d:ConstructName> @@ -177,33 +177,33 @@ <d:InterviewerInstructionReference> <r:Agency>fr.insee</r:Agency> <r:ID>d1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Instruction</r:TypeOfObject> </d:InterviewerInstructionReference> <d:TypeOfSequence controlledVocabularyID="INSEE-TOS-CL-1">module</d:TypeOfSequence> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p3dkx6-QC</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p0np9q-QC</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>d1e50</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>IfThenElse</r:TypeOfObject> </d:ControlConstructReference> </d:Sequence> <d:Sequence> <r:Agency>fr.insee</r:Agency> <r:ID>j6p0s7o5</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">MODULE11</r:String> </d:ConstructName> @@ -214,32 +214,32 @@ <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j3343qhx-QC</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6q9h8tj-QC</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334cyqb-QC</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6z06z1e-QC</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> </d:Sequence> <d:Sequence> <r:Agency>fr.insee</r:Agency> <r:ID>j3341528</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">MODULE2</r:String> </d:ConstructName> @@ -249,33 +249,33 @@ <d:InterviewerInstructionReference> <r:Agency>fr.insee</r:Agency> <r:ID>d2</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Instruction</r:TypeOfObject> </d:InterviewerInstructionReference> <d:TypeOfSequence controlledVocabularyID="INSEE-TOS-CL-1">module</d:TypeOfSequence> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j3343clt-QC</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qdfhvw-QC</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw5cqz-QC</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> </d:Sequence> <d:Sequence> <r:Agency>fr.insee</r:Agency> <r:ID>j6qe0h9q</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">MODULE3</r:String> </d:ConstructName> @@ -286,38 +286,38 @@ <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-QC</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>d12-SI</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>StatementItem</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-QC</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-QC</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QC</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> </d:Sequence> <d:Sequence> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw88h2</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">MODULE4</r:String> </d:ConstructName> @@ -328,26 +328,26 @@ <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qe237q</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Sequence</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qejudb</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Sequence</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qeh91y</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Sequence</r:TypeOfObject> </d:ControlConstructReference> </d:Sequence> <d:Sequence> <r:Agency>fr.insee</r:Agency> <r:ID>j6qe237q</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">MODULE41</r:String> </d:ConstructName> @@ -358,20 +358,20 @@ <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QC</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>ComputationItem</r:TypeOfObject> </d:ControlConstructReference> </d:Sequence> <d:Sequence> <r:Agency>fr.insee</r:Agency> <r:ID>j6qejudb</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">MODULE42</r:String> </d:ConstructName> @@ -382,14 +382,14 @@ <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QC</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> </d:Sequence> <d:Sequence> <r:Agency>fr.insee</r:Agency> <r:ID>j6qeh91y</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">MODULE43</r:String> </d:ConstructName> @@ -400,14 +400,14 @@ <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QC</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> </d:Sequence> <d:Sequence> <r:Agency>fr.insee</r:Agency> <r:ID>j6qfx9qe</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">MODULE5</r:String> </d:ConstructName> @@ -418,14 +418,14 @@ <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QC</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> </d:Sequence> <d:Sequence> <r:Agency>fr.insee</r:Agency> <r:ID>j6z12s2d</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">MODULE6</r:String> </d:ConstructName> @@ -436,14 +436,14 @@ <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6z0z3us-QC</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> </d:Sequence> <d:IfThenElse> <r:Agency>fr.insee</r:Agency> <r:ID>d1e50</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">A définir</r:Content> </r:Label> @@ -457,7 +457,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>d1e50-IP-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">READY</r:String> </r:ParameterName> @@ -466,13 +466,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p0np9q-QOP-jbgd3set</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>d1e50-IP-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -482,28 +482,28 @@ <d:ThenConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>d1e50-THEN</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Sequence</r:TypeOfObject> </d:ThenConstructReference> </d:IfThenElse> <d:Sequence> <r:Agency>fr.insee</r:Agency> <r:ID>d1e50-THEN</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR"/> </r:Label> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p0s7o5</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Sequence</r:TypeOfObject> </d:ControlConstructReference> </d:Sequence> <d:IfThenElse> <r:Agency>fr.insee</r:Agency> <r:ID>d1e119</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">A définir</r:Content> </r:Label> @@ -517,7 +517,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>d1e119-IP-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">READY</r:String> </r:ParameterName> @@ -526,13 +526,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p0np9q-QOP-jbgd3set</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>d1e119-IP-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -542,298 +542,298 @@ <d:ThenConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>d1e119-THEN</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Sequence</r:TypeOfObject> </d:ThenConstructReference> </d:IfThenElse> <d:Sequence> <r:Agency>fr.insee</r:Agency> <r:ID>d1e119-THEN</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR"/> </r:Label> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j3341528</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Sequence</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qe0h9q</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Sequence</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw88h2</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Sequence</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qfx9qe</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Sequence</r:TypeOfObject> </d:ControlConstructReference> </d:Sequence> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j6p3dkx6-QC</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">COMMENT</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p3dkx6</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j6p0np9q-QC</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">READY</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p0np9q</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j3343qhx-QC</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">PRODUCER</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j3343qhx</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j6q9h8tj-QC</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">SEASON_NUMBER</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6q9h8tj</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j334cyqb-QC</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">DATEFIRST</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334cyqb</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j6z06z1e-QC</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">AUDIENCE_SHARE</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6z06z1e</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j3343clt-QC</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">CITY</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j3343clt</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j6qdfhvw-QC</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">MAYOR</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qdfhvw</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw5cqz-QC</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">STATE</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw5cqz</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-QC</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">PET</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-QC</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">ICE_FLAVOUR</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-QC</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">NUCLEAR_CHARACTER</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QC</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">BIRTH_CHARACTER</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QC</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QC</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">CLOWNING</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QC</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">TRAVEL</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QC</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j6z0z3us-QC</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">SURVEY_COMMENT</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6z0z3us</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:ComputationItem> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">Total of percentages</r:String> </d:ConstructName> @@ -843,7 +843,7 @@ <d:InterviewerInstructionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-II-0</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Instruction</r:TypeOfObject> </d:InterviewerInstructionReference> <d:TypeOfComputationItem controlledVocabularyID="INSEE-TOCI-CL-3">stumblingblock</d:TypeOfComputationItem> @@ -853,7 +853,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES11</r:String> </r:ParameterName> @@ -861,7 +861,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-2</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES21</r:String> </r:ParameterName> @@ -869,7 +869,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-3</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES31</r:String> </r:ParameterName> @@ -877,7 +877,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-4</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES41</r:String> </r:ParameterName> @@ -885,7 +885,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-5</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES51</r:String> </r:ParameterName> @@ -893,7 +893,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-6</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES61</r:String> </r:ParameterName> @@ -901,7 +901,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-7</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES71</r:String> </r:ParameterName> @@ -909,7 +909,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-8</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES81</r:String> </r:ParameterName> @@ -917,7 +917,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-9</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES91</r:String> </r:ParameterName> @@ -925,7 +925,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-10</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES101</r:String> </r:ParameterName> @@ -934,13 +934,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgde5yl</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -948,13 +948,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd2x2t</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-2</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -962,13 +962,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdjypz</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-3</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -976,13 +976,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdcftu</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-4</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -990,13 +990,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdiyfe</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-5</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1004,13 +1004,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdj1wd</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-6</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1018,13 +1018,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgddylk</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-7</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1032,13 +1032,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd3jj6</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-8</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1046,13 +1046,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd4w3k</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-9</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1060,13 +1060,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd4w4k</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-10</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1080,7 +1080,7 @@ <d:StatementItem> <r:Agency>fr.insee</r:Agency> <r:ID>d12-SI</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <d:DisplayText> <d:LiteralText> <d:Text xml:lang="fr-FR"><xhtml:p><xhtml:b>Now we are going to know if you think that Jay is a gluton.</xhtml:b></xhtml:p></d:Text> @@ -1091,21 +1091,21 @@ <d:QuestionScheme> <r:Agency>fr.insee</r:Agency> <r:ID>QuestionScheme-i6vwi0</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">A définir</r:Content> </r:Label> <d:QuestionItem> <r:Agency>fr.insee</r:Agency> <r:ID>j6p3dkx6</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <d:QuestionItemName> <r:String xml:lang="fr-FR">COMMENT</r:String> </d:QuestionItemName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p3dkx6-QOP-jbgdhaht</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">COMMENT</r:String> </r:ParameterName> @@ -1114,13 +1114,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p3dkx6-RDOP-jbgdhaht</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p3dkx6-QOP-jbgdhaht</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1133,7 +1133,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p3dkx6-RDOP-jbgdhaht</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TextRepresentation maxLength="500"/> </r:OutParameter> </d:TextDomain> @@ -1141,14 +1141,14 @@ <d:QuestionItem> <r:Agency>fr.insee</r:Agency> <r:ID>j6p0np9q</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <d:QuestionItemName> <r:String xml:lang="fr-FR">READY</r:String> </d:QuestionItemName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p0np9q-QOP-jbgd3set</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">READY</r:String> </r:ParameterName> @@ -1157,13 +1157,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p0np9q-RDOP-jbgd3set</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p0np9q-QOP-jbgd3set</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1176,14 +1176,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p0np9q-RDOP-jbgd3set</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -1197,7 +1197,7 @@ <r:OtherMaterial> <r:Agency>fr.insee</r:Agency> <r:ID>j6p6my1d</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Description> <r:Content> <xhtml:div class="FlowControl" id="j6p6my1d"> @@ -1214,14 +1214,14 @@ <d:QuestionItem> <r:Agency>fr.insee</r:Agency> <r:ID>j3343qhx</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <d:QuestionItemName> <r:String xml:lang="fr-FR">PRODUCER</r:String> </d:QuestionItemName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j3343qhx-QOP-jbgd90cy</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PRODUCER</r:String> </r:ParameterName> @@ -1230,13 +1230,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j3343qhx-RDOP-jbgd90cy</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j3343qhx-QOP-jbgd90cy</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1249,7 +1249,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j3343qhx-RDOP-jbgd90cy</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TextRepresentation maxLength="30"/> </r:OutParameter> </d:TextDomain> @@ -1257,14 +1257,14 @@ <d:QuestionItem> <r:Agency>fr.insee</r:Agency> <r:ID>j6q9h8tj</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <d:QuestionItemName> <r:String xml:lang="fr-FR">SEASON_NUMBER</r:String> </d:QuestionItemName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6q9h8tj-QOP-jbgdjy8h</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">SEASON_NUMBER</r:String> </r:ParameterName> @@ -1273,13 +1273,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6q9h8tj-RDOP-jbgdjy8h</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6q9h8tj-QOP-jbgdjy8h</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1297,21 +1297,21 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6q9h8tj-RDOP-jbgdjy8h</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> </d:QuestionItem> <d:QuestionItem> <r:Agency>fr.insee</r:Agency> <r:ID>j334cyqb</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <d:QuestionItemName> <r:String xml:lang="fr-FR">DATEFIRST</r:String> </d:QuestionItemName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j334cyqb-QOP-jbgdih2z</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">DATEFIRST</r:String> </r:ParameterName> @@ -1320,13 +1320,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334cyqb-RDOP-jbgdih2z</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334cyqb-QOP-jbgdih2z</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1338,16 +1338,16 @@ <d:DateTimeDomainReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-MNR-DateTimedate-YYYY-MM-DD</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>ManagedDateTimeRepresentation</r:TypeOfObject> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j334cyqb-RDOP-jbgdih2z</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:DateTimeRepresentationReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-MNR-DateTimedate-YYYY-MM-DD</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>ManagedDateTimeRepresentation</r:TypeOfObject> </r:DateTimeRepresentationReference> </r:OutParameter> @@ -1355,21 +1355,21 @@ <d:InterviewerInstructionReference> <r:Agency>fr.insee</r:Agency> <r:ID>d11</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Instruction</r:TypeOfObject> </d:InterviewerInstructionReference> </d:QuestionItem> <d:QuestionItem> <r:Agency>fr.insee</r:Agency> <r:ID>j6z06z1e</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <d:QuestionItemName> <r:String xml:lang="fr-FR">AUDIENCE_SHARE</r:String> </d:QuestionItemName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6z06z1e-QOP-jbgddnrd</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">AUDIENCE_SHARE</r:String> </r:ParameterName> @@ -1378,13 +1378,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6z06z1e-RDOP-jbgddnrd</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6z06z1e-QOP-jbgddnrd</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1403,21 +1403,21 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6z06z1e-RDOP-jbgddnrd</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> </d:QuestionItem> <d:QuestionItem> <r:Agency>fr.insee</r:Agency> <r:ID>j3343clt</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <d:QuestionItemName> <r:String xml:lang="fr-FR">CITY</r:String> </d:QuestionItemName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j3343clt-QOP-jbgdjdkn</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">CITY</r:String> </r:ParameterName> @@ -1426,13 +1426,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j3343clt-RDOP-jbgdjdkn</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j3343clt-QOP-jbgdjdkn</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1446,18 +1446,18 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334iumu</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j3343clt-RDOP-jbgdjdkn</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334iumu</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -1467,21 +1467,21 @@ <d:InterviewerInstructionReference> <r:Agency>fr.insee</r:Agency> <r:ID>d3</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Instruction</r:TypeOfObject> </d:InterviewerInstructionReference> </d:QuestionItem> <d:QuestionItem> <r:Agency>fr.insee</r:Agency> <r:ID>j6qdfhvw</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <d:QuestionItemName> <r:String xml:lang="fr-FR">MAYOR</r:String> </d:QuestionItemName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qdfhvw-QOP-jbgd8ghp</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">MAYOR</r:String> </r:ParameterName> @@ -1490,13 +1490,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qdfhvw-RDOP-jbgd8ghp</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qdfhvw-QOP-jbgd8ghp</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1510,18 +1510,18 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qdqoen</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qdfhvw-RDOP-jbgd8ghp</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qdqoen</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -1531,21 +1531,21 @@ <d:InterviewerInstructionReference> <r:Agency>fr.insee</r:Agency> <r:ID>d4</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Instruction</r:TypeOfObject> </d:InterviewerInstructionReference> </d:QuestionItem> <d:QuestionItem> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw5cqz</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <d:QuestionItemName> <r:String xml:lang="fr-FR">STATE</r:String> </d:QuestionItemName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw5cqz-QOP-jbgdkd7v</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">STATE</r:String> </r:ParameterName> @@ -1554,13 +1554,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw5cqz-RDOP-jbgdkd7v</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw5cqz-QOP-jbgdkd7v</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1574,18 +1574,18 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwo00f</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw5cqz-RDOP-jbgdkd7v</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwo00f</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -1596,14 +1596,14 @@ <d:QuestionItem> <r:Agency>fr.insee</r:Agency> <r:ID>j6z0z3us</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <d:QuestionItemName> <r:String xml:lang="fr-FR">SURVEY_COMMENT</r:String> </d:QuestionItemName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6z0z3us-QOP-jbgd6m6e</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">SURVEY_COMMENT</r:String> </r:ParameterName> @@ -1612,13 +1612,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6z0z3us-RDOP-jbgd6m6e</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6z0z3us-QOP-jbgd6m6e</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1631,7 +1631,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6z0z3us-RDOP-jbgd6m6e</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TextRepresentation maxLength="255"/> </r:OutParameter> </d:TextDomain> @@ -1639,14 +1639,14 @@ <d:QuestionGrid> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <d:QuestionGridName> <r:String xml:lang="fr-FR">PET</r:String> </d:QuestionGridName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-QOP-jbgd8qmn</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PET1</r:String> </r:ParameterName> @@ -1654,7 +1654,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-QOP-jbgd60vl</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PET2</r:String> </r:ParameterName> @@ -1662,7 +1662,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-QOP-jbgda2jo</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PET3</r:String> </r:ParameterName> @@ -1670,7 +1670,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-QOP-jbgdfssy</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PET4</r:String> </r:ParameterName> @@ -1679,13 +1679,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-RDOP-jbgd8qmn</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-QOP-jbgd8qmn</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1693,13 +1693,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-RDOP-jbgd60vl</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-QOP-jbgd60vl</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1707,13 +1707,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-RDOP-jbgda2jo</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-QOP-jbgda2jo</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1721,13 +1721,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-RDOP-jbgdfssy</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-QOP-jbgdfssy</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1741,7 +1741,7 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j335cu3c</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </d:CodeDomain> @@ -1752,14 +1752,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-RDOP-jbgd8qmn</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -1780,14 +1780,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-RDOP-jbgd60vl</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -1808,14 +1808,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-RDOP-jbgda2jo</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -1836,14 +1836,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-RDOP-jbgdfssy</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -1863,21 +1863,21 @@ <d:InterviewerInstructionReference> <r:Agency>fr.insee</r:Agency> <r:ID>d5</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Instruction</r:TypeOfObject> </d:InterviewerInstructionReference> </d:QuestionGrid> <d:QuestionGrid> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <d:QuestionGridName> <r:String xml:lang="fr-FR">ICE_FLAVOUR</r:String> </d:QuestionGridName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-QOP-jbgdb3jx</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">ICE_FLAVOUR1</r:String> </r:ParameterName> @@ -1885,7 +1885,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-QOP-jbgdb61k</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">ICE_FLAVOUR2</r:String> </r:ParameterName> @@ -1893,7 +1893,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-QOP-jbgdl3kc</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">ICE_FLAVOUR3</r:String> </r:ParameterName> @@ -1901,7 +1901,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-QOP-jbgdcobo</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">ICE_FLAVOUR4</r:String> </r:ParameterName> @@ -1910,13 +1910,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-RDOP-jbgdb3jx</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-QOP-jbgdb3jx</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1924,13 +1924,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-RDOP-jbgdb61k</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-QOP-jbgdb61k</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1938,13 +1938,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-RDOP-jbgdl3kc</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-QOP-jbgdl3kc</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1952,13 +1952,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-RDOP-jbgdcobo</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-QOP-jbgdcobo</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1972,7 +1972,7 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2mvca</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </d:CodeDomain> @@ -1984,18 +1984,18 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-RDOP-jbgdb3jx</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -2014,18 +2014,18 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-RDOP-jbgdb61k</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -2044,18 +2044,18 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-RDOP-jbgdl3kc</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -2074,18 +2074,18 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-RDOP-jbgdcobo</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -2103,14 +2103,14 @@ <d:QuestionGrid> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <d:QuestionGridName> <r:String xml:lang="fr-FR">NUCLEAR_CHARACTER</r:String> </d:QuestionGridName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-QOP-jbgd6p0k</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">NUCLEAR_CHARACTER1</r:String> </r:ParameterName> @@ -2118,7 +2118,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-QOP-jbgd9ato</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">NUCLEAR_CHARACTER2</r:String> </r:ParameterName> @@ -2126,7 +2126,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-QOP-jbgd3e0p</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">NUCLEAR_CHARACTER3</r:String> </r:ParameterName> @@ -2134,7 +2134,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-QOP-jbgdkxne</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">NUCLEAR_CHARACTER4</r:String> </r:ParameterName> @@ -2143,13 +2143,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-RDOP-jbgd6p0k</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-QOP-jbgd6p0k</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2157,13 +2157,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-RDOP-jbgd9ato</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-QOP-jbgd9ato</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2171,13 +2171,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-RDOP-jbgd3e0p</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-QOP-jbgd3e0p</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2185,13 +2185,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-RDOP-jbgdkxne</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-QOP-jbgdkxne</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2205,7 +2205,7 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qeytgc</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </d:CodeDomain> @@ -2217,18 +2217,18 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-RDOP-jbgd6p0k</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -2247,18 +2247,18 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-RDOP-jbgd9ato</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -2277,18 +2277,18 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-RDOP-jbgd3e0p</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -2307,18 +2307,18 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-RDOP-jbgdkxne</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -2336,14 +2336,14 @@ <d:QuestionGrid> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <d:QuestionGridName> <r:String xml:lang="fr-FR">BIRTH_CHARACTER</r:String> </d:QuestionGridName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QOP-jbgd7fr6</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">BIRTH_CHARACTER1</r:String> </r:ParameterName> @@ -2351,7 +2351,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QOP-jbgd5e9f</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">BIRTH_CHARACTER2</r:String> </r:ParameterName> @@ -2359,7 +2359,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QOP-jbgd912x</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">BIRTH_CHARACTER3</r:String> </r:ParameterName> @@ -2367,7 +2367,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QOP-jbgd6bdy</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">BIRTH_CHARACTER4</r:String> </r:ParameterName> @@ -2375,7 +2375,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QOP-jbgddyry</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">BIRTH_CHARACTER5</r:String> </r:ParameterName> @@ -2384,13 +2384,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-RDOP-jbgd7fr6</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QOP-jbgd7fr6</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2398,13 +2398,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-RDOP-jbgd5e9f</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QOP-jbgd5e9f</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2412,13 +2412,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-RDOP-jbgd912x</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QOP-jbgd912x</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2426,13 +2426,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-RDOP-jbgd6bdy</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QOP-jbgd6bdy</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2440,13 +2440,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-RDOP-jbgddyry</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QOP-jbgddyry</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2460,7 +2460,7 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6z087mq</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </d:CodeDomain> @@ -2472,18 +2472,18 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxricm</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-RDOP-jbgd7fr6</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxricm</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -2502,18 +2502,18 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxricm</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-RDOP-jbgd5e9f</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxricm</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -2532,18 +2532,18 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxricm</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-RDOP-jbgd912x</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxricm</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -2562,18 +2562,18 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxricm</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-RDOP-jbgd6bdy</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxricm</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -2592,18 +2592,18 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxricm</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-RDOP-jbgddyry</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxricm</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -2621,14 +2621,14 @@ <d:QuestionGrid> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <d:QuestionGridName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES</r:String> </d:QuestionGridName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgde5yl</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES11</r:String> </r:ParameterName> @@ -2636,7 +2636,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd2x2t</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES21</r:String> </r:ParameterName> @@ -2644,7 +2644,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdjypz</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES31</r:String> </r:ParameterName> @@ -2652,7 +2652,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdcftu</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES41</r:String> </r:ParameterName> @@ -2660,7 +2660,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdiyfe</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES51</r:String> </r:ParameterName> @@ -2668,7 +2668,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdj1wd</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES61</r:String> </r:ParameterName> @@ -2676,7 +2676,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgddylk</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES71</r:String> </r:ParameterName> @@ -2684,7 +2684,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd3jj6</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES81</r:String> </r:ParameterName> @@ -2692,7 +2692,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd4w3k</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES91</r:String> </r:ParameterName> @@ -2700,7 +2700,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd4w4k</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES101</r:String> </r:ParameterName> @@ -2709,13 +2709,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgde5yl</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgde5yl</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2723,13 +2723,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgd2x2t</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd2x2t</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2737,13 +2737,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgdjypz</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdjypz</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2751,13 +2751,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgdcftu</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdcftu</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2765,13 +2765,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgdiyfe</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdiyfe</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2779,13 +2779,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgdj1wd</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdj1wd</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2793,13 +2793,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgddylk</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgddylk</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2807,13 +2807,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgd3jj6</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd3jj6</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2821,13 +2821,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgd4w3k</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd4w3k</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2835,13 +2835,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgd4w4k</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd4w4k</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2856,7 +2856,7 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwh16i</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </d:CodeDomain> @@ -2866,7 +2866,7 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-secondDimension-fakeCL-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </d:CodeDomain> @@ -2882,7 +2882,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgde5yl</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -2902,7 +2902,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgd2x2t</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -2922,7 +2922,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgdjypz</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -2942,7 +2942,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgdcftu</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -2962,7 +2962,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgdiyfe</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -2982,7 +2982,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgdj1wd</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -3002,7 +3002,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgddylk</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -3022,7 +3022,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgd3jj6</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -3042,7 +3042,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgd4w3k</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -3062,7 +3062,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgd4w4k</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -3077,14 +3077,14 @@ <d:QuestionGrid> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <d:QuestionGridName> <r:String xml:lang="fr-FR">CLOWNING</r:String> </d:QuestionGridName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgd8tyr</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">CLOWNING11</r:String> </r:ParameterName> @@ -3092,7 +3092,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdep36</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">CLOWNING21</r:String> </r:ParameterName> @@ -3100,7 +3100,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdjjgi</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">CLOWNING31</r:String> </r:ParameterName> @@ -3108,7 +3108,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdgh6k</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">CLOWNING41</r:String> </r:ParameterName> @@ -3116,7 +3116,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdit3o</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">CLOWNING12</r:String> </r:ParameterName> @@ -3124,7 +3124,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgd366k</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">CLOWNING22</r:String> </r:ParameterName> @@ -3132,7 +3132,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdax06</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">CLOWNING32</r:String> </r:ParameterName> @@ -3140,7 +3140,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdfo1j</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">CLOWNING42</r:String> </r:ParameterName> @@ -3149,13 +3149,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-RDOP-jbgd8tyr</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgd8tyr</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3163,13 +3163,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-RDOP-jbgdep36</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdep36</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3177,13 +3177,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-RDOP-jbgdjjgi</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdjjgi</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3191,13 +3191,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-RDOP-jbgdgh6k</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdgh6k</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3205,13 +3205,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-RDOP-jbgdit3o</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdit3o</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3219,13 +3219,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-RDOP-jbgd366k</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgd366k</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3233,13 +3233,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-RDOP-jbgdax06</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdax06</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3247,13 +3247,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-RDOP-jbgdfo1j</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdfo1j</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3267,7 +3267,7 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j77dav9b</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </d:CodeDomain> @@ -3277,7 +3277,7 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-secondDimension-fakeCL-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </d:CodeDomain> @@ -3289,18 +3289,18 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdyh6b5</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-RDOP-jbgd8tyr</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdyh6b5</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -3320,18 +3320,18 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdyh6b5</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-RDOP-jbgdep36</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdyh6b5</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -3351,18 +3351,18 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdyh6b5</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-RDOP-jbgdjjgi</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdyh6b5</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -3382,18 +3382,18 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdyh6b5</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-RDOP-jbgdgh6k</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdyh6b5</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -3412,7 +3412,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-RDOP-jbgdit3o</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TextRepresentation maxLength="255"/> </r:OutParameter> </d:TextDomain> @@ -3428,7 +3428,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-RDOP-jbgd366k</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TextRepresentation maxLength="255"/> </r:OutParameter> </d:TextDomain> @@ -3444,7 +3444,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-RDOP-jbgdax06</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TextRepresentation maxLength="255"/> </r:OutParameter> </d:TextDomain> @@ -3460,7 +3460,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-RDOP-jbgdfo1j</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TextRepresentation maxLength="255"/> </r:OutParameter> </d:TextDomain> @@ -3476,14 +3476,14 @@ <d:QuestionGrid> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <d:QuestionGridName> <r:String xml:lang="fr-FR">TRAVEL</r:String> </d:QuestionGridName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd92mb</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL11</r:String> </r:ParameterName> @@ -3491,7 +3491,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdgsat</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL21</r:String> </r:ParameterName> @@ -3499,7 +3499,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdaxk2</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL31</r:String> </r:ParameterName> @@ -3507,7 +3507,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd7myn</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL41</r:String> </r:ParameterName> @@ -3515,7 +3515,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdnxkt</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL12</r:String> </r:ParameterName> @@ -3523,7 +3523,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd3ef5</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL22</r:String> </r:ParameterName> @@ -3531,7 +3531,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd8p1v</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL32</r:String> </r:ParameterName> @@ -3539,7 +3539,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdgm0c</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL42</r:String> </r:ParameterName> @@ -3547,7 +3547,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdcppc</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL13</r:String> </r:ParameterName> @@ -3555,7 +3555,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd4cm6</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL23</r:String> </r:ParameterName> @@ -3563,7 +3563,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdd2lo</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL33</r:String> </r:ParameterName> @@ -3571,7 +3571,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdo0ay</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL43</r:String> </r:ParameterName> @@ -3579,7 +3579,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd4r2a</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL14</r:String> </r:ParameterName> @@ -3587,7 +3587,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdkfpq</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL24</r:String> </r:ParameterName> @@ -3595,7 +3595,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd7u52</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL34</r:String> </r:ParameterName> @@ -3603,7 +3603,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdgfwl</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL44</r:String> </r:ParameterName> @@ -3611,7 +3611,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd9cff</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL15</r:String> </r:ParameterName> @@ -3619,7 +3619,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgddwsp</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL25</r:String> </r:ParameterName> @@ -3627,7 +3627,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdncn8</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL35</r:String> </r:ParameterName> @@ -3635,7 +3635,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdnz6b</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL45</r:String> </r:ParameterName> @@ -3643,7 +3643,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdiva0</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL16</r:String> </r:ParameterName> @@ -3651,7 +3651,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd7dqf</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL26</r:String> </r:ParameterName> @@ -3659,7 +3659,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdnous</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL36</r:String> </r:ParameterName> @@ -3667,7 +3667,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdkfcz</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL46</r:String> </r:ParameterName> @@ -3676,13 +3676,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd92mb</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd92mb</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3690,13 +3690,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdgsat</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdgsat</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3704,13 +3704,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdaxk2</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdaxk2</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3718,13 +3718,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd7myn</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd7myn</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3732,13 +3732,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdnxkt</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdnxkt</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3746,13 +3746,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd3ef5</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd3ef5</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3760,13 +3760,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd8p1v</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd8p1v</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3774,13 +3774,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdgm0c</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdgm0c</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3788,13 +3788,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdcppc</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdcppc</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3802,13 +3802,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd4cm6</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd4cm6</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3816,13 +3816,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdd2lo</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdd2lo</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3830,13 +3830,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdo0ay</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdo0ay</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3844,13 +3844,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd4r2a</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd4r2a</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3858,13 +3858,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdkfpq</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdkfpq</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3872,13 +3872,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd7u52</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd7u52</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3886,13 +3886,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdgfwl</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdgfwl</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3900,13 +3900,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd9cff</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd9cff</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3914,13 +3914,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgddwsp</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgddwsp</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3928,13 +3928,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdncn8</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdncn8</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3942,13 +3942,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdnz6b</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdnz6b</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3956,13 +3956,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdiva0</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdiva0</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3970,13 +3970,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd7dqf</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd7dqf</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3984,13 +3984,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdnous</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdnous</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3998,13 +3998,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdkfcz</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdkfcz</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -4019,7 +4019,7 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2kivg</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </d:CodeDomain> @@ -4029,7 +4029,7 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdye1wa</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </d:CodeDomain> @@ -4040,14 +4040,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd92mb</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4069,14 +4069,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdgsat</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4098,14 +4098,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdaxk2</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4127,14 +4127,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd7myn</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4156,14 +4156,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdnxkt</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4185,14 +4185,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd3ef5</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4214,14 +4214,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd8p1v</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4243,14 +4243,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdgm0c</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4272,14 +4272,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdcppc</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4301,14 +4301,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd4cm6</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4330,14 +4330,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdd2lo</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4359,14 +4359,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdo0ay</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4388,14 +4388,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd4r2a</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4417,14 +4417,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdkfpq</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4446,14 +4446,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd7u52</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4475,14 +4475,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdgfwl</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4504,14 +4504,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd9cff</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4533,14 +4533,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgddwsp</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4562,14 +4562,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdncn8</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4591,14 +4591,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdnz6b</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4620,14 +4620,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdiva0</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4649,14 +4649,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd7dqf</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4678,14 +4678,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdnous</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4707,14 +4707,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdkfcz</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4735,21 +4735,21 @@ <d:InterviewerInstructionReference> <r:Agency>fr.insee</r:Agency> <r:ID>d10</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Instruction</r:TypeOfObject> </d:InterviewerInstructionReference> </d:QuestionGrid> <d:QuestionGrid> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <d:QuestionGridName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS</r:String> </d:QuestionGridName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdl5jb</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS11</r:String> </r:ParameterName> @@ -4757,7 +4757,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd8lwo</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS21</r:String> </r:ParameterName> @@ -4765,7 +4765,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdbfag</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS31</r:String> </r:ParameterName> @@ -4773,7 +4773,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdlgja</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS41</r:String> </r:ParameterName> @@ -4781,7 +4781,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd745y</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS51</r:String> </r:ParameterName> @@ -4789,7 +4789,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdjkts</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS61</r:String> </r:ParameterName> @@ -4797,7 +4797,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdcax7</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS71</r:String> </r:ParameterName> @@ -4805,7 +4805,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdjye1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS81</r:String> </r:ParameterName> @@ -4813,7 +4813,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd5jet</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS91</r:String> </r:ParameterName> @@ -4821,7 +4821,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdjw90</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS101</r:String> </r:ParameterName> @@ -4829,7 +4829,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdfndq</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS12</r:String> </r:ParameterName> @@ -4837,7 +4837,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd7osi</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS22</r:String> </r:ParameterName> @@ -4845,7 +4845,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd7bnw</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS32</r:String> </r:ParameterName> @@ -4853,7 +4853,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd9k71</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS42</r:String> </r:ParameterName> @@ -4861,7 +4861,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdimks</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS52</r:String> </r:ParameterName> @@ -4869,7 +4869,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdjquz</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS62</r:String> </r:ParameterName> @@ -4877,7 +4877,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdd2w3</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS72</r:String> </r:ParameterName> @@ -4885,7 +4885,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdkosc</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS82</r:String> </r:ParameterName> @@ -4893,7 +4893,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdk0x4</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS92</r:String> </r:ParameterName> @@ -4901,7 +4901,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd2wgf</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS102</r:String> </r:ParameterName> @@ -4910,13 +4910,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdl5jb</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdl5jb</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -4924,13 +4924,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgd8lwo</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd8lwo</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -4938,13 +4938,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdbfag</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdbfag</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -4952,13 +4952,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdlgja</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdlgja</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -4966,13 +4966,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgd745y</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd745y</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -4980,13 +4980,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdjkts</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdjkts</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -4994,13 +4994,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdcax7</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdcax7</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -5008,13 +5008,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdjye1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdjye1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -5022,13 +5022,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgd5jet</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd5jet</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -5036,13 +5036,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdjw90</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdjw90</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -5050,13 +5050,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdfndq</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdfndq</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -5064,13 +5064,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgd7osi</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd7osi</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -5078,13 +5078,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgd7bnw</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd7bnw</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -5092,13 +5092,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgd9k71</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd9k71</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -5106,13 +5106,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdimks</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdimks</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -5120,13 +5120,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdjquz</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdjquz</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -5134,13 +5134,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdd2w3</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdd2w3</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -5148,13 +5148,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdkosc</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdkosc</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -5162,13 +5162,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdk0x4</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdk0x4</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -5176,13 +5176,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgd2wgf</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd2wgf</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -5199,7 +5199,7 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-secondDimension-fakeCL-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </d:CodeDomain> @@ -5210,7 +5210,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdl5jb</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TextRepresentation maxLength="255"/> </r:OutParameter> </d:TextDomain> @@ -5226,7 +5226,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgd8lwo</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TextRepresentation maxLength="255"/> </r:OutParameter> </d:TextDomain> @@ -5242,7 +5242,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdbfag</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TextRepresentation maxLength="255"/> </r:OutParameter> </d:TextDomain> @@ -5258,7 +5258,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdlgja</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TextRepresentation maxLength="255"/> </r:OutParameter> </d:TextDomain> @@ -5274,7 +5274,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgd745y</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TextRepresentation maxLength="255"/> </r:OutParameter> </d:TextDomain> @@ -5290,7 +5290,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdjkts</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TextRepresentation maxLength="255"/> </r:OutParameter> </d:TextDomain> @@ -5306,7 +5306,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdcax7</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TextRepresentation maxLength="255"/> </r:OutParameter> </d:TextDomain> @@ -5322,7 +5322,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdjye1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TextRepresentation maxLength="255"/> </r:OutParameter> </d:TextDomain> @@ -5338,7 +5338,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgd5jet</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TextRepresentation maxLength="255"/> </r:OutParameter> </d:TextDomain> @@ -5354,7 +5354,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdjw90</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TextRepresentation maxLength="255"/> </r:OutParameter> </d:TextDomain> @@ -5375,7 +5375,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdfndq</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -5395,7 +5395,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgd7osi</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -5415,7 +5415,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgd7bnw</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -5435,7 +5435,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgd9k71</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -5455,7 +5455,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdimks</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -5475,7 +5475,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdjquz</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -5495,7 +5495,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdd2w3</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -5515,7 +5515,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdkosc</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -5535,7 +5535,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdk0x4</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -5555,7 +5555,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgd2wgf</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -5571,14 +5571,14 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-j334iumu</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">TOWN</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j334iumu-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Springfield</r:Content> </r:Label> @@ -5586,7 +5586,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j334iumu-2</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Shelbyville</r:Content> </r:Label> @@ -5594,7 +5594,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j334iumu-3</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Seinfeld</r:Content> </r:Label> @@ -5603,14 +5603,14 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-j6qdqoen</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">MAYOR </r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6qdqoen-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Constance Harm</r:Content> </r:Label> @@ -5618,7 +5618,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6qdqoen-2</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Timothy Lovejoy</r:Content> </r:Label> @@ -5626,7 +5626,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6qdqoen-3</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Joe Quimby</r:Content> </r:Label> @@ -5634,7 +5634,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6qdqoen-4</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Poochie</r:Content> </r:Label> @@ -5643,14 +5643,14 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-j4nwo00f</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">State</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwo00f-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Washington</r:Content> </r:Label> @@ -5658,7 +5658,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwo00f-2</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Kentucky</r:Content> </r:Label> @@ -5666,7 +5666,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwo00f-3</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Ohio</r:Content> </r:Label> @@ -5674,7 +5674,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwo00f-4</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Maine</r:Content> </r:Label> @@ -5682,7 +5682,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwo00f-5</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">North Dakota</r:Content> </r:Label> @@ -5690,7 +5690,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwo00f-6</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Florida</r:Content> </r:Label> @@ -5698,7 +5698,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwo00f-7</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">North Takoma</r:Content> </r:Label> @@ -5706,7 +5706,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwo00f-8</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">California</r:Content> </r:Label> @@ -5714,7 +5714,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwo00f-9</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Texas</r:Content> </r:Label> @@ -5722,7 +5722,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwo00f-10</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Massachusetts</r:Content> </r:Label> @@ -5730,7 +5730,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwo00f-11</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Nevada</r:Content> </r:Label> @@ -5738,7 +5738,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwo00f-12</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Illinois</r:Content> </r:Label> @@ -5746,7 +5746,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwo00f-13</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Not in any state, you fool!</r:Content> </r:Label> @@ -5755,14 +5755,14 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-j335cu3c</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">ANIMALS</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j335cu3c-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Santa's Little Helper</r:Content> </r:Label> @@ -5770,7 +5770,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j335cu3c-2</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Snowball I</r:Content> </r:Label> @@ -5778,7 +5778,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j335cu3c-3</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Coltrane</r:Content> </r:Label> @@ -5786,7 +5786,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j335cu3c-4</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Mojo the Helper Monkey</r:Content> </r:Label> @@ -5795,14 +5795,14 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-j6p2mvca</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Flavours</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6p2mvca-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Vanilla</r:Content> </r:Label> @@ -5810,7 +5810,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6p2mvca-2</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Strawberry</r:Content> </r:Label> @@ -5818,7 +5818,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6p2mvca-3</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Apple</r:Content> </r:Label> @@ -5826,7 +5826,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6p2mvca-4</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Bacon</r:Content> </r:Label> @@ -5835,14 +5835,14 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-jbdxh138</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">YESNO</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-jbdxh138-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Yes</r:Content> </r:Label> @@ -5850,7 +5850,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-jbdxh138-2</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">No</r:Content> </r:Label> @@ -5859,14 +5859,14 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-j6qeytgc</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">NUCLEAR_CHARACTERS</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6qeytgc-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Charles Montgomery Burns</r:Content> </r:Label> @@ -5874,7 +5874,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6qeytgc-2</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Carl Carlson</r:Content> </r:Label> @@ -5882,7 +5882,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6qeytgc-3</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Otto Mann</r:Content> </r:Label> @@ -5890,7 +5890,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6qeytgc-4</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Carl Carlson</r:Content> </r:Label> @@ -5899,14 +5899,14 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-j6z087mq</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">BIRTH_CHARACTER</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6z087mq-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Selma Bouvier</r:Content> </r:Label> @@ -5914,7 +5914,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6z087mq-2</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Kent Brockman</r:Content> </r:Label> @@ -5922,7 +5922,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6z087mq-3</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Milhouse Van Houten</r:Content> </r:Label> @@ -5930,7 +5930,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6z087mq-4</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Nelson Muntz</r:Content> </r:Label> @@ -5938,7 +5938,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6z087mq-5</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Crazy Cat Lady</r:Content> </r:Label> @@ -5947,14 +5947,14 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-jbdxricm</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">CITY_BIRTH</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-jbdxricm-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Albuquerque</r:Content> </r:Label> @@ -5962,7 +5962,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-jbdxricm-2</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Springfield</r:Content> </r:Label> @@ -5970,7 +5970,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-jbdxricm-3</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Portland</r:Content> </r:Label> @@ -5978,7 +5978,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-jbdxricm-4</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Shelbyville</r:Content> </r:Label> @@ -5986,7 +5986,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-jbdxricm-5</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Dagstuhl</r:Content> </r:Label> @@ -5995,14 +5995,14 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-j4nwh16i</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Products</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwh16i-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Frozen products</r:Content> </r:Label> @@ -6010,7 +6010,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwh16i-2</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Ice creams</r:Content> </r:Label> @@ -6018,7 +6018,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwh16i-3</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Jasper Beardly</r:Content> </r:Label> @@ -6026,7 +6026,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwh16i-4</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Meat</r:Content> </r:Label> @@ -6034,7 +6034,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwh16i-5</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Bacon</r:Content> </r:Label> @@ -6042,7 +6042,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwh16i-6</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Pork chop</r:Content> </r:Label> @@ -6050,7 +6050,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwh16i-7</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Chicken</r:Content> </r:Label> @@ -6058,7 +6058,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwh16i-8</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Compote</r:Content> </r:Label> @@ -6066,7 +6066,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwh16i-9</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Powersauce</r:Content> </r:Label> @@ -6074,7 +6074,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwh16i-10</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Other</r:Content> </r:Label> @@ -6083,14 +6083,14 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-j77dav9b</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Clownings</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j77dav9b-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR"><xhtml:p><xhtml:b><xhtml:i>Break the windows of the whole city</xhtml:i></xhtml:b></xhtml:p></r:Content> </r:Label> @@ -6098,7 +6098,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j77dav9b-2</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR"><xhtml:p><xhtml:b><xhtml:i>Loose the violin of his daughter playing poker</xhtml:i></xhtml:b></xhtml:p></r:Content> </r:Label> @@ -6106,7 +6106,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j77dav9b-3</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR"><xhtml:p><xhtml:b><xhtml:i>Kill Mr Burns</xhtml:i></xhtml:b></xhtml:p></r:Content> </r:Label> @@ -6114,7 +6114,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j77dav9b-4</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR"><xhtml:p><xhtml:b><xhtml:i>Leaving a mechanical object to control the nuclear power plant</xhtml:i></xhtml:b></xhtml:p></r:Content> </r:Label> @@ -6123,14 +6123,14 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-jbdyh6b5</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Clowning_Characters</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-jbdyh6b5-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Jay</r:Content> </r:Label> @@ -6138,7 +6138,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-jbdyh6b5-2</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Bart</r:Content> </r:Label> @@ -6146,7 +6146,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-jbdyh6b5-3</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Krusty the clown</r:Content> </r:Label> @@ -6154,7 +6154,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-jbdyh6b5-4</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Maggie</r:Content> </r:Label> @@ -6163,14 +6163,14 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-j6p2kivg</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Means of transport</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6p2kivg-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Car</r:Content> </r:Label> @@ -6178,7 +6178,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6p2kivg-2</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Bike</r:Content> </r:Label> @@ -6186,7 +6186,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6p2kivg-3</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Skateboard</r:Content> </r:Label> @@ -6194,7 +6194,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6p2kivg-4</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Plane</r:Content> </r:Label> @@ -6203,14 +6203,14 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-jbdye1wa</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Country</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-jbdye1wa-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Brazil</r:Content> </r:Label> @@ -6218,7 +6218,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-jbdye1wa-2</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Canada</r:Content> </r:Label> @@ -6226,7 +6226,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-jbdye1wa-3</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Japan</r:Content> </r:Label> @@ -6234,7 +6234,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-jbdye1wa-4</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">France</r:Content> </r:Label> @@ -6242,7 +6242,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-jbdye1wa-5</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR"><xhtml:p>Other country<xhtml:a href="#ftn1"/></xhtml:p></r:Content> </r:Label> @@ -6250,7 +6250,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-jbdye1wa-6</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Other planet</r:Content> </r:Label> @@ -6259,14 +6259,14 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-j4nwc63q-secondDimension-fakeCL-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">FAKE-CODELIST-j4nwc63q-secondDimension-fakeCL-1</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwc63q-secondDimension-fakeCL-1-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Percentage</r:Content> </r:Label> @@ -6275,14 +6275,14 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-j4nw0rr6-secondDimension-fakeCL-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">FAKE-CODELIST-j4nw0rr6-secondDimension-fakeCL-1</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nw0rr6-secondDimension-fakeCL-1-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Clowning</r:Content> </r:Label> @@ -6290,7 +6290,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nw0rr6-secondDimension-fakeCL-1-2</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Remember?</r:Content> </r:Label> @@ -6299,14 +6299,14 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-j6qg8rc6-secondDimension-fakeCL-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">FAKE-CODELIST-j6qg8rc6-secondDimension-fakeCL-1</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6qg8rc6-secondDimension-fakeCL-1-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Name</r:Content> </r:Label> @@ -6314,7 +6314,7 @@ <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6qg8rc6-secondDimension-fakeCL-1-2</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Age</r:Content> </r:Label> @@ -6323,14 +6323,14 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-i6vwi0</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">A définir</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CA-Booleen-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR"/> </r:Label> @@ -6339,14 +6339,14 @@ <l:CodeListScheme> <r:Agency>fr.insee</r:Agency> <r:ID>SIMPSONS-CLS</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:CodeListSchemeName> <r:String xml:lang="en-IE">SIMPSONS</r:String> </l:CodeListSchemeName> <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>j334iumu</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">TOWN</r:Content> </r:Label> @@ -6357,11 +6357,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j334iumu-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j334iumu-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>00001</r:Value> @@ -6369,11 +6369,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j334iumu-2</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j334iumu-2</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>00002</r:Value> @@ -6381,11 +6381,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j334iumu-3</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j334iumu-3</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>00003</r:Value> @@ -6394,7 +6394,7 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>j6qdqoen</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">MAYOR </r:Content> </r:Label> @@ -6405,11 +6405,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qdqoen-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6qdqoen-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>1</r:Value> @@ -6417,11 +6417,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qdqoen-2</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6qdqoen-2</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>2</r:Value> @@ -6429,11 +6429,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qdqoen-3</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6qdqoen-3</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>3</r:Value> @@ -6441,11 +6441,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qdqoen-4</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6qdqoen-4</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>4</r:Value> @@ -6454,7 +6454,7 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwo00f</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">State</r:Content> </r:Label> @@ -6465,11 +6465,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwo00f-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwo00f-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>1</r:Value> @@ -6477,11 +6477,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwo00f-2</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwo00f-2</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>2</r:Value> @@ -6489,11 +6489,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwo00f-3</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwo00f-3</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>3</r:Value> @@ -6501,11 +6501,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwo00f-4</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwo00f-4</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>4</r:Value> @@ -6513,11 +6513,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwo00f-5</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwo00f-5</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>5</r:Value> @@ -6525,11 +6525,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwo00f-6</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwo00f-6</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>6</r:Value> @@ -6537,11 +6537,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwo00f-7</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwo00f-7</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>7</r:Value> @@ -6549,11 +6549,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwo00f-8</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwo00f-8</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>8</r:Value> @@ -6561,11 +6561,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwo00f-9</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwo00f-9</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>9</r:Value> @@ -6573,11 +6573,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwo00f-10</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwo00f-10</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>10</r:Value> @@ -6585,11 +6585,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwo00f-11</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwo00f-11</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>11</r:Value> @@ -6597,11 +6597,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwo00f-12</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwo00f-12</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>12</r:Value> @@ -6609,11 +6609,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwo00f-13</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwo00f-13</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>13</r:Value> @@ -6622,7 +6622,7 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>j335cu3c</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">ANIMALS</r:Content> </r:Label> @@ -6633,11 +6633,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j335cu3c-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j335cu3c-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>1</r:Value> @@ -6645,11 +6645,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j335cu3c-2</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j335cu3c-2</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>2</r:Value> @@ -6657,11 +6657,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j335cu3c-3</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j335cu3c-3</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>3</r:Value> @@ -6669,11 +6669,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j335cu3c-4</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j335cu3c-4</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>4</r:Value> @@ -6682,7 +6682,7 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2mvca</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Flavours</r:Content> </r:Label> @@ -6693,11 +6693,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2mvca-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6p2mvca-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>1</r:Value> @@ -6705,11 +6705,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2mvca-2</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6p2mvca-2</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>2</r:Value> @@ -6717,11 +6717,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2mvca-3</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6p2mvca-3</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>3</r:Value> @@ -6729,11 +6729,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2mvca-4</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6p2mvca-4</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>4</r:Value> @@ -6742,7 +6742,7 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">YESNO</r:Content> </r:Label> @@ -6753,11 +6753,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-jbdxh138-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>1</r:Value> @@ -6765,11 +6765,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138-2</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-jbdxh138-2</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>0</r:Value> @@ -6778,7 +6778,7 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>j6qeytgc</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">NUCLEAR_CHARACTERS</r:Content> </r:Label> @@ -6789,11 +6789,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qeytgc-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6qeytgc-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>1</r:Value> @@ -6801,11 +6801,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qeytgc-2</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6qeytgc-2</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>2</r:Value> @@ -6813,11 +6813,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qeytgc-3</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6qeytgc-3</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>3</r:Value> @@ -6825,11 +6825,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qeytgc-4</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6qeytgc-4</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>4</r:Value> @@ -6838,7 +6838,7 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>j6z087mq</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">BIRTH_CHARACTER</r:Content> </r:Label> @@ -6849,11 +6849,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j6z087mq-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6z087mq-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>1</r:Value> @@ -6861,11 +6861,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j6z087mq-2</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6z087mq-2</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>2</r:Value> @@ -6873,11 +6873,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j6z087mq-3</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6z087mq-3</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>3</r:Value> @@ -6885,11 +6885,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j6z087mq-4</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6z087mq-4</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>4</r:Value> @@ -6897,11 +6897,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j6z087mq-5</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6z087mq-5</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>5</r:Value> @@ -6910,7 +6910,7 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxricm</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">CITY_BIRTH</r:Content> </r:Label> @@ -6921,11 +6921,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxricm-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-jbdxricm-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>1</r:Value> @@ -6933,11 +6933,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxricm-2</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-jbdxricm-2</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>2</r:Value> @@ -6945,11 +6945,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxricm-3</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-jbdxricm-3</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>3</r:Value> @@ -6957,11 +6957,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxricm-4</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-jbdxricm-4</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>4</r:Value> @@ -6969,11 +6969,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxricm-5</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-jbdxricm-5</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>5</r:Value> @@ -6982,7 +6982,7 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwh16i</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Products</r:Content> </r:Label> @@ -6993,22 +6993,22 @@ <l:Code levelNumber="1" isDiscrete="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwh16i-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwh16i-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>A</r:Value> <l:Code levelNumber="2" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwh16i-2</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwh16i-2</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>A1</r:Value> @@ -7016,11 +7016,11 @@ <l:Code levelNumber="2" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwh16i-3</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwh16i-3</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>A2</r:Value> @@ -7029,22 +7029,22 @@ <l:Code levelNumber="1" isDiscrete="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwh16i-4</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwh16i-4</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>B</r:Value> <l:Code levelNumber="2" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwh16i-5</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwh16i-5</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>B1</r:Value> @@ -7052,11 +7052,11 @@ <l:Code levelNumber="2" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwh16i-6</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwh16i-6</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>B2</r:Value> @@ -7064,11 +7064,11 @@ <l:Code levelNumber="2" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwh16i-7</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwh16i-7</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>B3</r:Value> @@ -7077,22 +7077,22 @@ <l:Code levelNumber="1" isDiscrete="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwh16i-8</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwh16i-8</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>C</r:Value> <l:Code levelNumber="2" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwh16i-9</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwh16i-9</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>C1</r:Value> @@ -7101,11 +7101,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwh16i-10</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwh16i-10</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>D</r:Value> @@ -7114,7 +7114,7 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>j77dav9b</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Clownings</r:Content> </r:Label> @@ -7125,11 +7125,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j77dav9b-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j77dav9b-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>1</r:Value> @@ -7137,11 +7137,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j77dav9b-2</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j77dav9b-2</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>2</r:Value> @@ -7149,11 +7149,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j77dav9b-3</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j77dav9b-3</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>3</r:Value> @@ -7161,11 +7161,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j77dav9b-4</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j77dav9b-4</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>4</r:Value> @@ -7174,7 +7174,7 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>jbdyh6b5</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Clowning_Characters</r:Content> </r:Label> @@ -7185,11 +7185,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>jbdyh6b5-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-jbdyh6b5-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>1</r:Value> @@ -7197,11 +7197,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>jbdyh6b5-2</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-jbdyh6b5-2</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>2</r:Value> @@ -7209,11 +7209,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>jbdyh6b5-3</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-jbdyh6b5-3</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>3</r:Value> @@ -7221,11 +7221,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>jbdyh6b5-4</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-jbdyh6b5-4</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>4</r:Value> @@ -7234,7 +7234,7 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2kivg</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Means of transport</r:Content> </r:Label> @@ -7245,11 +7245,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2kivg-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6p2kivg-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>1</r:Value> @@ -7257,11 +7257,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2kivg-2</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6p2kivg-2</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>2</r:Value> @@ -7269,11 +7269,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2kivg-3</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6p2kivg-3</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>3</r:Value> @@ -7281,11 +7281,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2kivg-4</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6p2kivg-4</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>4</r:Value> @@ -7294,7 +7294,7 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>jbdye1wa</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Country</r:Content> </r:Label> @@ -7305,11 +7305,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>jbdye1wa-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-jbdye1wa-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>1</r:Value> @@ -7317,11 +7317,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>jbdye1wa-2</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-jbdye1wa-2</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>2</r:Value> @@ -7329,11 +7329,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>jbdye1wa-3</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-jbdye1wa-3</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>3</r:Value> @@ -7341,11 +7341,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>jbdye1wa-4</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-jbdye1wa-4</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>4</r:Value> @@ -7353,11 +7353,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>jbdye1wa-5</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-jbdye1wa-5</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>5</r:Value> @@ -7365,11 +7365,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>jbdye1wa-6</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-jbdye1wa-6</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>6</r:Value> @@ -7378,7 +7378,7 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-secondDimension-fakeCL-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">FAKE-CODELIST-j4nwc63q-secondDimension-fakeCL-1</r:Content> </r:Label> @@ -7389,11 +7389,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-secondDimension-fakeCL-1-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nwc63q-secondDimension-fakeCL-1-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>1</r:Value> @@ -7402,7 +7402,7 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-secondDimension-fakeCL-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">FAKE-CODELIST-j4nw0rr6-secondDimension-fakeCL-1</r:Content> </r:Label> @@ -7413,11 +7413,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-secondDimension-fakeCL-1-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nw0rr6-secondDimension-fakeCL-1-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>1</r:Value> @@ -7425,11 +7425,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-secondDimension-fakeCL-1-2</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j4nw0rr6-secondDimension-fakeCL-1-2</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>2</r:Value> @@ -7438,7 +7438,7 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-secondDimension-fakeCL-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">FAKE-CODELIST-j6qg8rc6-secondDimension-fakeCL-1</r:Content> </r:Label> @@ -7449,11 +7449,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-secondDimension-fakeCL-1-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6qg8rc6-secondDimension-fakeCL-1-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>1</r:Value> @@ -7461,11 +7461,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-secondDimension-fakeCL-1-2</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>CA-j6qg8rc6-secondDimension-fakeCL-1-2</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>2</r:Value> @@ -7474,7 +7474,7 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:CodeListName> <r:String xml:lang="fr-FR">Booleen</r:String> </l:CodeListName> @@ -7485,11 +7485,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CA-Booleen-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>1</r:Value> @@ -7499,14 +7499,14 @@ <l:VariableScheme> <r:Agency>fr.insee</r:Agency> <r:ID>VariableScheme-i6vwi0</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Variable Scheme for the survey</r:Content> </r:Label> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">SUM_EXPENSES</r:String> </l:VariableName> @@ -7516,25 +7516,25 @@ <r:OutParameter> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-VROP</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> <l:VariableRepresentation> <r:ProcessingInstructionReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-GI</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>GenerationInstruction</r:TypeOfObject> <r:Binding> <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-GOP</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-VROP</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -7545,7 +7545,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtex</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">LAST_BROADCAST</r:String> </l:VariableName> @@ -7556,7 +7556,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbcgfvir</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">COMMENT</r:String> </l:VariableName> @@ -7566,13 +7566,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p3dkx6-QOP-jbgdhaht</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p3dkx6</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -7582,7 +7582,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbcgm0ip</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">READY</r:String> </l:VariableName> @@ -7592,13 +7592,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p0np9q-QOP-jbgd3set</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p0np9q</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -7608,7 +7608,7 @@ <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -7619,7 +7619,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbcgf11f</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">PRODUCER</r:String> </l:VariableName> @@ -7629,13 +7629,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j3343qhx-QOP-jbgd90cy</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j3343qhx</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -7645,7 +7645,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbcgcy2x</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">SEASON_NUMBER</r:String> </l:VariableName> @@ -7655,13 +7655,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6q9h8tj-QOP-jbgdjy8h</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6q9h8tj</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -7677,7 +7677,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbcgbg33</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">DATEFIRST</r:String> </l:VariableName> @@ -7687,20 +7687,20 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334cyqb-QOP-jbgdih2z</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334cyqb</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> <r:DateTimeRepresentationReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-MNR-DateTimedate-YYYY-MM-DD</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>ManagedDateTimeRepresentation</r:TypeOfObject> </r:DateTimeRepresentationReference> </l:VariableRepresentation> @@ -7708,7 +7708,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbcgieyw</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">AUDIENCE_SHARE</r:String> </l:VariableName> @@ -7718,13 +7718,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6z06z1e-QOP-jbgddnrd</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6z06z1e</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -7740,7 +7740,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbcgasbh</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">CITY</r:String> </l:VariableName> @@ -7750,13 +7750,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j3343clt-QOP-jbgdjdkn</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j3343clt</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -7764,7 +7764,7 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334iumu</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -7773,7 +7773,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbcg9yr6</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">MAYOR</r:String> </l:VariableName> @@ -7783,13 +7783,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qdfhvw-QOP-jbgd8ghp</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qdfhvw</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -7797,7 +7797,7 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qdqoen</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -7806,7 +7806,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbcgpija</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">STATE</r:String> </l:VariableName> @@ -7816,13 +7816,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw5cqz-QOP-jbgdkd7v</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw5cqz</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -7830,7 +7830,7 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwo00f</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -7839,7 +7839,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxewlq</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">PET1</r:String> </l:VariableName> @@ -7849,13 +7849,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-QOP-jbgd8qmn</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -7865,7 +7865,7 @@ <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -7876,7 +7876,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxjmst</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">PET2</r:String> </l:VariableName> @@ -7886,13 +7886,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-QOP-jbgd60vl</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -7902,7 +7902,7 @@ <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -7913,7 +7913,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxjuay</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">PET3</r:String> </l:VariableName> @@ -7923,13 +7923,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-QOP-jbgda2jo</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -7939,7 +7939,7 @@ <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -7950,7 +7950,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxniuw</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">PET4</r:String> </l:VariableName> @@ -7960,13 +7960,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-QOP-jbgdfssy</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -7976,7 +7976,7 @@ <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -7987,7 +7987,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxtl1d</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">ICE_FLAVOUR1</r:String> </l:VariableName> @@ -7997,13 +7997,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-QOP-jbgdb3jx</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -8011,7 +8011,7 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -8020,7 +8020,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxvai9</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">ICE_FLAVOUR2</r:String> </l:VariableName> @@ -8030,13 +8030,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-QOP-jbgdb61k</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -8044,7 +8044,7 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -8053,7 +8053,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxpltw</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">ICE_FLAVOUR3</r:String> </l:VariableName> @@ -8063,13 +8063,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-QOP-jbgdl3kc</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -8077,7 +8077,7 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -8086,7 +8086,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxzx2x</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">ICE_FLAVOUR4</r:String> </l:VariableName> @@ -8096,13 +8096,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-QOP-jbgdcobo</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -8110,7 +8110,7 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -8119,7 +8119,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdy4nhp</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">NUCLEAR_CHARACTER1</r:String> </l:VariableName> @@ -8129,13 +8129,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-QOP-jbgd6p0k</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -8143,7 +8143,7 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -8152,7 +8152,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxtanu</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">NUCLEAR_CHARACTER2</r:String> </l:VariableName> @@ -8162,13 +8162,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-QOP-jbgd9ato</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -8176,7 +8176,7 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -8185,7 +8185,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdy25if</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">NUCLEAR_CHARACTER3</r:String> </l:VariableName> @@ -8195,13 +8195,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-QOP-jbgd3e0p</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -8209,7 +8209,7 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -8218,7 +8218,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxvta8</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">NUCLEAR_CHARACTER4</r:String> </l:VariableName> @@ -8228,13 +8228,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-QOP-jbgdkxne</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -8242,7 +8242,7 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -8251,7 +8251,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdy3nh7</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">BIRTH_CHARACTER1</r:String> </l:VariableName> @@ -8261,13 +8261,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QOP-jbgd7fr6</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -8275,7 +8275,7 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxricm</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -8284,7 +8284,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdy6lk3</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">BIRTH_CHARACTER2</r:String> </l:VariableName> @@ -8294,13 +8294,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QOP-jbgd5e9f</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -8308,7 +8308,7 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxricm</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -8317,7 +8317,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxsby0</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">BIRTH_CHARACTER3</r:String> </l:VariableName> @@ -8327,13 +8327,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QOP-jbgd912x</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -8341,7 +8341,7 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxricm</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -8350,7 +8350,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdy7sra</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">BIRTH_CHARACTER4</r:String> </l:VariableName> @@ -8360,13 +8360,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QOP-jbgd6bdy</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -8374,7 +8374,7 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxricm</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -8383,7 +8383,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdy2wyl</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">BIRTH_CHARACTER5</r:String> </l:VariableName> @@ -8393,13 +8393,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QOP-jbgddyry</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -8407,7 +8407,7 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxricm</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -8416,7 +8416,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdnfk7</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES11</r:String> </l:VariableName> @@ -8426,13 +8426,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgde5yl</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -8449,7 +8449,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdje4w</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES21</r:String> </l:VariableName> @@ -8459,13 +8459,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd2x2t</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -8482,7 +8482,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdlth7</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES31</r:String> </l:VariableName> @@ -8492,13 +8492,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdjypz</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -8515,7 +8515,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdelbl</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES41</r:String> </l:VariableName> @@ -8525,13 +8525,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdcftu</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -8548,7 +8548,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd95jq</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES51</r:String> </l:VariableName> @@ -8558,13 +8558,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdiyfe</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -8581,7 +8581,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdadd9</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES61</r:String> </l:VariableName> @@ -8591,13 +8591,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdj1wd</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -8614,7 +8614,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdlwzk</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES71</r:String> </l:VariableName> @@ -8624,13 +8624,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgddylk</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -8647,7 +8647,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdfz77</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES81</r:String> </l:VariableName> @@ -8657,13 +8657,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd3jj6</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -8680,7 +8680,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdepx6</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES91</r:String> </l:VariableName> @@ -8690,13 +8690,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd4w3k</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -8713,7 +8713,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdepx7</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES101</r:String> </l:VariableName> @@ -8723,13 +8723,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd4w4k</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -8746,7 +8746,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd9vqv</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">CLOWNING11</r:String> </l:VariableName> @@ -8756,13 +8756,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgd8tyr</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -8770,7 +8770,7 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdyh6b5</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -8779,7 +8779,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgden0i</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">CLOWNING21</r:String> </l:VariableName> @@ -8789,13 +8789,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdep36</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -8803,7 +8803,7 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdyh6b5</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -8812,7 +8812,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdndju</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">CLOWNING31</r:String> </l:VariableName> @@ -8822,13 +8822,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdjjgi</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -8836,7 +8836,7 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdyh6b5</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -8845,7 +8845,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdfwg9</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">CLOWNING41</r:String> </l:VariableName> @@ -8855,13 +8855,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdgh6k</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -8869,7 +8869,7 @@ <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdyh6b5</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -8878,7 +8878,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdd3ky</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">CLOWNING12</r:String> </l:VariableName> @@ -8888,13 +8888,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdit3o</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -8904,7 +8904,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdm9lm</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">CLOWNING22</r:String> </l:VariableName> @@ -8914,13 +8914,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgd366k</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -8930,7 +8930,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdcdhv</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">CLOWNING32</r:String> </l:VariableName> @@ -8940,13 +8940,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdax06</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -8956,7 +8956,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdjlit</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">CLOWNING42</r:String> </l:VariableName> @@ -8966,13 +8966,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdfo1j</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -8982,7 +8982,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd1zxu</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL11</r:String> </l:VariableName> @@ -8992,13 +8992,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd92mb</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -9008,7 +9008,7 @@ <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -9019,7 +9019,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd8lfs</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL21</r:String> </l:VariableName> @@ -9029,13 +9029,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdgsat</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -9045,7 +9045,7 @@ <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -9056,7 +9056,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd56qo</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL31</r:String> </l:VariableName> @@ -9066,13 +9066,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdaxk2</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -9082,7 +9082,7 @@ <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -9093,7 +9093,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd4wu8</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL41</r:String> </l:VariableName> @@ -9103,13 +9103,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd7myn</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -9119,7 +9119,7 @@ <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -9130,7 +9130,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdak6h</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL12</r:String> </l:VariableName> @@ -9140,13 +9140,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdnxkt</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -9156,7 +9156,7 @@ <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -9167,7 +9167,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdmsy4</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL22</r:String> </l:VariableName> @@ -9177,13 +9177,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd3ef5</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -9193,7 +9193,7 @@ <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -9204,7 +9204,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd2zlu</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL32</r:String> </l:VariableName> @@ -9214,13 +9214,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd8p1v</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -9230,7 +9230,7 @@ <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -9241,7 +9241,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd6v73</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL42</r:String> </l:VariableName> @@ -9251,13 +9251,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdgm0c</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -9267,7 +9267,7 @@ <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -9278,7 +9278,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdf5fg</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL13</r:String> </l:VariableName> @@ -9288,13 +9288,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdcppc</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -9304,7 +9304,7 @@ <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -9315,7 +9315,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd2xg0</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL23</r:String> </l:VariableName> @@ -9325,13 +9325,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd4cm6</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -9341,7 +9341,7 @@ <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -9352,7 +9352,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdc06l</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL33</r:String> </l:VariableName> @@ -9362,13 +9362,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdd2lo</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -9378,7 +9378,7 @@ <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -9389,7 +9389,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdb8i9</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL43</r:String> </l:VariableName> @@ -9399,13 +9399,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdo0ay</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -9415,7 +9415,7 @@ <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -9426,7 +9426,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdhzve</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL14</r:String> </l:VariableName> @@ -9436,13 +9436,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd4r2a</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -9452,7 +9452,7 @@ <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -9463,7 +9463,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd93ks</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL24</r:String> </l:VariableName> @@ -9473,13 +9473,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdkfpq</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -9489,7 +9489,7 @@ <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -9500,7 +9500,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdfw7h</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL34</r:String> </l:VariableName> @@ -9510,13 +9510,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd7u52</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -9526,7 +9526,7 @@ <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -9537,7 +9537,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdfavn</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL44</r:String> </l:VariableName> @@ -9547,13 +9547,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdgfwl</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -9563,7 +9563,7 @@ <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -9574,7 +9574,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdc199</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL15</r:String> </l:VariableName> @@ -9584,13 +9584,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd9cff</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -9600,7 +9600,7 @@ <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -9611,7 +9611,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdfqph</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL25</r:String> </l:VariableName> @@ -9621,13 +9621,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgddwsp</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -9637,7 +9637,7 @@ <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -9648,7 +9648,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd8r0n</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL35</r:String> </l:VariableName> @@ -9658,13 +9658,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdncn8</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -9674,7 +9674,7 @@ <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -9685,7 +9685,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd3aqk</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL45</r:String> </l:VariableName> @@ -9695,13 +9695,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdnz6b</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -9711,7 +9711,7 @@ <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -9722,7 +9722,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdltql</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL16</r:String> </l:VariableName> @@ -9732,13 +9732,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdiva0</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -9748,7 +9748,7 @@ <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -9759,7 +9759,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd9um3</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL26</r:String> </l:VariableName> @@ -9769,13 +9769,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd7dqf</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -9785,7 +9785,7 @@ <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -9796,7 +9796,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgddj7v</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL36</r:String> </l:VariableName> @@ -9806,13 +9806,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdnous</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -9822,7 +9822,7 @@ <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -9833,7 +9833,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdb4ym</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL46</r:String> </l:VariableName> @@ -9843,13 +9843,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdkfcz</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -9859,7 +9859,7 @@ <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -9870,7 +9870,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd3fkz</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS11</r:String> </l:VariableName> @@ -9880,13 +9880,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdl5jb</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -9896,7 +9896,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdf2md</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS21</r:String> </l:VariableName> @@ -9906,13 +9906,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd8lwo</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -9922,7 +9922,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdfle1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS31</r:String> </l:VariableName> @@ -9932,13 +9932,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdbfag</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -9948,7 +9948,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdix8x</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS41</r:String> </l:VariableName> @@ -9958,13 +9958,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdlgja</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -9974,7 +9974,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd782k</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS51</r:String> </l:VariableName> @@ -9984,13 +9984,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd745y</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -10000,7 +10000,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd68rf</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS61</r:String> </l:VariableName> @@ -10010,13 +10010,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdjkts</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -10026,7 +10026,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdfoj4</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS71</r:String> </l:VariableName> @@ -10036,13 +10036,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdcax7</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -10052,7 +10052,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdb116</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS81</r:String> </l:VariableName> @@ -10062,13 +10062,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdjye1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -10078,7 +10078,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd7w5p</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS91</r:String> </l:VariableName> @@ -10088,13 +10088,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd5jet</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -10104,7 +10104,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd8rj2</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS101</r:String> </l:VariableName> @@ -10114,13 +10114,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdjw90</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -10130,7 +10130,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdidnp</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS12</r:String> </l:VariableName> @@ -10140,13 +10140,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdfndq</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -10162,7 +10162,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd47wz</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS22</r:String> </l:VariableName> @@ -10172,13 +10172,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd7osi</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -10194,7 +10194,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdj2nn</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS32</r:String> </l:VariableName> @@ -10204,13 +10204,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd7bnw</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -10226,7 +10226,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd2ipx</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS42</r:String> </l:VariableName> @@ -10236,13 +10236,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd9k71</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -10258,7 +10258,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd4pe3</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS52</r:String> </l:VariableName> @@ -10268,13 +10268,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdimks</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -10290,7 +10290,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdjgb1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS62</r:String> </l:VariableName> @@ -10300,13 +10300,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdjquz</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -10322,7 +10322,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdb5c1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS72</r:String> </l:VariableName> @@ -10332,13 +10332,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdd2w3</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -10354,7 +10354,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdju9y</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS82</r:String> </l:VariableName> @@ -10364,13 +10364,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdkosc</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -10386,7 +10386,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdatyx</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS92</r:String> </l:VariableName> @@ -10396,13 +10396,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdk0x4</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -10418,7 +10418,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdi1dt</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS102</r:String> </l:VariableName> @@ -10428,13 +10428,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd2wgf</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -10450,7 +10450,7 @@ <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggt4x</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">SURVEY_COMMENT</r:String> </l:VariableName> @@ -10460,13 +10460,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6z0z3us-QOP-jbgd6m6e</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6z0z3us</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> <l:VariableRepresentation> @@ -10476,12 +10476,12 @@ <l:VariableGroup> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-gp</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:BasedOnObject> <r:BasedOnReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:BasedOnReference> </r:BasedOnObject> @@ -10492,121 +10492,121 @@ <r:VariableReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd3fkz</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </r:VariableReference> <r:VariableReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdf2md</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </r:VariableReference> <r:VariableReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdfle1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </r:VariableReference> <r:VariableReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdix8x</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </r:VariableReference> <r:VariableReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd782k</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </r:VariableReference> <r:VariableReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd68rf</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </r:VariableReference> <r:VariableReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdfoj4</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </r:VariableReference> <r:VariableReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdb116</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </r:VariableReference> <r:VariableReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd7w5p</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </r:VariableReference> <r:VariableReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd8rj2</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </r:VariableReference> <r:VariableReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdidnp</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </r:VariableReference> <r:VariableReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd47wz</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </r:VariableReference> <r:VariableReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdj2nn</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </r:VariableReference> <r:VariableReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd2ipx</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </r:VariableReference> <r:VariableReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd4pe3</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </r:VariableReference> <r:VariableReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdjgb1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </r:VariableReference> <r:VariableReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdb5c1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </r:VariableReference> <r:VariableReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdju9y</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </r:VariableReference> <r:VariableReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdatyx</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </r:VariableReference> <r:VariableReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdi1dt</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </r:VariableReference> </l:VariableGroup> @@ -10614,7 +10614,7 @@ <d:ProcessingInstructionScheme> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-SIMPSONS-PIS-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <d:ProcessingInstructionSchemeName> <r:String xml:lang="en-IE">SIMPSONS</r:String> </d:ProcessingInstructionSchemeName> @@ -10624,66 +10624,66 @@ <d:GenerationInstruction> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-GI</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <!--<d:SourceQuestion>Not implemented.</d:SourceQuestion>--> <d:SourceVariable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdnfk7</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </d:SourceVariable> <d:SourceVariable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdje4w</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </d:SourceVariable> <d:SourceVariable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdlth7</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </d:SourceVariable> <d:SourceVariable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdelbl</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </d:SourceVariable> <d:SourceVariable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd95jq</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </d:SourceVariable> <d:SourceVariable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdadd9</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </d:SourceVariable> <d:SourceVariable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdlwzk</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </d:SourceVariable> <d:SourceVariable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdfz77</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </d:SourceVariable> <d:SourceVariable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdepx6</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </d:SourceVariable> <d:SourceVariable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdepx7</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </d:SourceVariable> <r:CommandCode> @@ -10692,7 +10692,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES11</r:String> </r:ParameterName> @@ -10700,7 +10700,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-2</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES21</r:String> </r:ParameterName> @@ -10708,7 +10708,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-3</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES31</r:String> </r:ParameterName> @@ -10716,7 +10716,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-4</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES41</r:String> </r:ParameterName> @@ -10724,7 +10724,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-5</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES51</r:String> </r:ParameterName> @@ -10732,7 +10732,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-6</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES61</r:String> </r:ParameterName> @@ -10740,7 +10740,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-7</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES71</r:String> </r:ParameterName> @@ -10748,7 +10748,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-8</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES81</r:String> </r:ParameterName> @@ -10756,7 +10756,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-9</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES91</r:String> </r:ParameterName> @@ -10764,7 +10764,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-10</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES101</r:String> </r:ParameterName> @@ -10772,19 +10772,19 @@ <r:OutParameter> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-GOP</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> <r:Binding> <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgde5yl</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-1</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -10792,13 +10792,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd2x2t</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-2</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -10806,13 +10806,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdjypz</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-3</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -10820,13 +10820,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdcftu</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-4</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -10834,13 +10834,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdiyfe</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-5</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -10848,13 +10848,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdj1wd</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-6</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -10862,13 +10862,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgddylk</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-7</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -10876,13 +10876,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd3jj6</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-8</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -10890,13 +10890,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd4w3k</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-9</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -10904,13 +10904,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd4w4k</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-10</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -10923,7 +10923,7 @@ <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>Sequence-i6vwi0</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Sequence</r:TypeOfObject> </d:ControlConstructReference> </d:GenerationInstruction> @@ -10931,7 +10931,7 @@ <r:ManagedRepresentationScheme> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-SIMPSONS-MRS</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="en-IE">Liste de formats numériques et dates de l'enquête</r:Content> @@ -10940,7 +10940,7 @@ <r:ManagedDateTimeRepresentation> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-MNR-DateTimedate-YYYY-MM-DD</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:DateFieldFormat>YYYY-MM-DD</r:DateFieldFormat> <r:DateTypeCode controlledVocabularyID="INSEE-DTC-CV">date</r:DateTypeCode> <r:Range> @@ -10953,38 +10953,38 @@ <s:StudyUnit> <r:Agency>fr.insee</r:Agency> <r:ID>StudyUnit-i6vwi0</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:ExPostEvaluation/> <d:DataCollection> <r:Agency>fr.insee</r:Agency> <r:ID>DataCollection-i6vwi0</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:QuestionSchemeReference> <r:Agency>fr.insee</r:Agency> <r:ID>QuestionScheme-i6vwi0</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionScheme</r:TypeOfObject> </r:QuestionSchemeReference> <r:ControlConstructSchemeReference> <r:Agency>fr.insee</r:Agency> <r:ID>ControlConstructScheme-i6vwi0</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>ControlConstructScheme</r:TypeOfObject> </r:ControlConstructSchemeReference> <r:InterviewerInstructionSchemeReference> <r:Agency>fr.insee</r:Agency> <r:ID>InterviewerInstructionScheme-i6vwi0</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InterviewerInstructionScheme</r:TypeOfObject> </r:InterviewerInstructionSchemeReference> <d:InstrumentScheme xml:lang="fr-FR"> <r:Agency>fr.insee</r:Agency> <r:ID>InstrumentScheme-i6vwi0</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <d:Instrument xmlns:pogues="http://xml.insee.fr/schema/applis/pogues" xmlns:pr="ddi:ddiprofile:3_3" xmlns:c="ddi:conceptualcomponent:3_3" xmlns:cm="ddi:comparative:3_3"> <r:Agency>fr.insee</r:Agency> <r:ID>Instrument-i6vwi0</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <d:InstrumentName> <r:String>SIMPSONS</r:String> </d:InstrumentName> @@ -10995,7 +10995,7 @@ <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>Sequence-i6vwi0</r:ID> - <r:Version>1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Sequence</r:TypeOfObject> </d:ControlConstructReference> </d:Instrument> From f97e5ae0992b65baaffd354d07a254c1090dc579 Mon Sep 17 00:00:00 2001 From: Laurent Caouissin <laurent.caouissin@insee.fr> Date: Thu, 5 Sep 2019 10:31:45 +0200 Subject: [PATCH 093/439] Eno v2.0.0 : add Constants for new transformation --- src/main/java/fr/insee/eno/Constants.java | 70 +++++++++++++++++------ 1 file changed, 54 insertions(+), 16 deletions(-) diff --git a/src/main/java/fr/insee/eno/Constants.java b/src/main/java/fr/insee/eno/Constants.java index 003028fbf..2cf21061d 100644 --- a/src/main/java/fr/insee/eno/Constants.java +++ b/src/main/java/fr/insee/eno/Constants.java @@ -36,6 +36,7 @@ private Constants() { // ----- Ref public static final String PARAMETERS_XML = "parameters.xml"; + public static final Object METADONNEES = "metadonnees.xml"; // ----- XSL Parameters path public static final String CONFIG_DDI2FR = CONFIG_FOLDER + "/ddi2fr.xml"; @@ -51,6 +52,7 @@ private Constants() { public static final String DDI_DEREFERENCING_XSL = UTIL_FOLDER_PATH + "/ddi/dereferencing.xsl"; public static final String PARAMETERS_FILE = "/" + PARAMETERS_XML; public static final String UTIL_DDI_TITLING_XSL = UTIL_FOLDER_PATH + "/ddi/titling.xsl"; + public static final String UTIL_DDI_MAPPING_XSL = UTIL_FOLDER_PATH + "/ddi/mapping.xsl"; public static final String UTIL_POGUES_XML_SUPP_GOTO_XSL = UTIL_FOLDER_PATH + "/pogues-xml/2suppressionGoto.xsl"; public static final String UTIL_POGUES_XML_MERGE_ITE_XSL = UTIL_FOLDER_PATH + "/pogues-xml/tweak-to-merge-equivalent-ite.xsl"; public static final String UTIL_POGUES_XML_GOTO_ITE_XSL = UTIL_FOLDER_PATH + "/pogues-xml/goto-2-if-then-else.xsl"; @@ -60,8 +62,8 @@ private Constants() { public static final String UTIL_FODS_PREFORMATTING_XSL = UTIL_FOLDER_PATH + "/fods/preformatting.xsl"; public static final String UTIL_XSL_INCORPORATION_XSL = UTIL_FOLDER_PATH + "/xsl/incorporation.xsl"; public static final String UTIL_DDI_DEREFERENCING_XSL = UTIL_FOLDER_PATH + "/ddi/dereferencing.xsl"; - public static final String BROWSING_FR_TEMPLATE_XSL = UTIL_FOLDER_PATH + "/fr/browsing.xsl"; - public static final String BROWSING_JS_TEMPLATE_XSL = UTIL_FOLDER_PATH + "/js/browsing.xsl"; + + // public static final String PROPERTIES_FILE_FR = CONFIG_FOLDER + "/ddi2fr.xml"; // public static final String PROPERTIES_FILE_ODT = CONFIG_FOLDER + "/ddi2odt.xml"; // public static final String PROPERTIES_FILE_PDF = CONFIG_FOLDER + "/ddi2pdf.xml"; @@ -125,19 +127,33 @@ private Constants() { public static final String FODS_2_XML_XSL = TRANSFORMATIONS_FOLDER + "/fods2xml.xsl"; public static final String XML_2_XSL_XSL = TRANSFORMATIONS_FOLDER + "/xml2xsl.xsl"; + // ---------- Post-processing files public static final String OUPUTS_FOLDER = "/xslt/outputs/pdf"; - public static final String OUPUTS_FOLDER_2 = "/xslt/util/pdf"; - public static final String OUPUTS_FOLDER_JS = "/xslt/util/js"; + public static final String POST_PROCESSING_FOLDER_PDF = "/xslt/util/pdf"; + public static final String POST_PROCESSING_FOLDER_JS = "/xslt/util/js"; + public static final String POST_PROCESSING_FOLDER_FR = "/xslt/util/fr"; public static final String TRANSFORMATIONS_CUSTOMIZATION_FO_4PDF = OUPUTS_FOLDER + "/publipostage.xsl"; - public static final String TRANSFORMATIONS_CUSTOMIZATION_FO_4PDF_2 = OUPUTS_FOLDER_2 + "/mailing-vtl.xsl"; - public static final String TRANSFORMATIONS_SPECIF_TREATMENT_FO_4PDF = "/pdf-specific-treatment.xsl"; - public static final String TRANSFORMATIONS_ACCOMPANYING_MAILS_FO_4PDF = OUPUTS_FOLDER_2 + "/accompanying-mails.xsl"; - public static final String TRANSFORMATIONS_COVER_PAGE_FO_4PDF = OUPUTS_FOLDER_2 + "/insert-cover-page.xsl"; - public static final String TRANSFORMATIONS_END_QUESTION_FO_4PDF = OUPUTS_FOLDER_2 + "/insert-end-questions.xsl"; - public static final String TRANSFORMATIONS_EDIT_STRUCTURE_PAGES_FO_4PDF = OUPUTS_FOLDER_2 + "/edit-structure-page.xsl"; - public static final String STATIC_PAGES = OUPUTS_FOLDER_2 +"/static-pages.fo"; - public static final String TRANSFORMATIONS_SORT_COMPONENTS_JS = OUPUTS_FOLDER_JS + "/sort-components.xsl"; - public static final String TRANSFORMATIONS_EXTERNALIZE_VARIABLES_JS = OUPUTS_FOLDER_JS + "/externalize-variables.xsl"; + // ------------ PDF ----------- + public static final String TRANSFORMATIONS_CUSTOMIZATION_FO_4PDF_2 = POST_PROCESSING_FOLDER_PDF + "/mailing-vtl.xsl"; + public static final String TRANSFORMATIONS_SPECIF_TREATMENT_FO_4PDF = POST_PROCESSING_FOLDER_PDF +"/pdf-specific-treatment.xsl"; + public static final String TRANSFORMATIONS_ACCOMPANYING_MAILS_FO_4PDF = POST_PROCESSING_FOLDER_PDF + "/accompanying-mails.xsl"; + public static final String TRANSFORMATIONS_COVER_PAGE_FO_4PDF = POST_PROCESSING_FOLDER_PDF + "/insert-cover-page.xsl"; + public static final String TRANSFORMATIONS_END_QUESTION_FO_4PDF = POST_PROCESSING_FOLDER_PDF + "/insert-end-questions.xsl"; + public static final String TRANSFORMATIONS_EDIT_STRUCTURE_PAGES_FO_4PDF = POST_PROCESSING_FOLDER_PDF + "/edit-structure-page.xsl"; + // ------------ JS ----------- + public static final String TRANSFORMATIONS_SORT_COMPONENTS_JS = POST_PROCESSING_FOLDER_JS + "/sort-components.xsl"; + public static final String TRANSFORMATIONS_EXTERNALIZE_VARIABLES_JS = POST_PROCESSING_FOLDER_JS + "/externalize-variables.xsl"; + // ------------ FR ----------- + public static final String UTIL_FR_BROWSING_XSL = POST_PROCESSING_FOLDER_FR + "/browsing.xsl"; + public static final String UTIL_FR_FIX_ADHERENCE_XSL = POST_PROCESSING_FOLDER_FR + "/coltrane.xsl"; + public static final String UTIL_FR_EDIT_PATRON_XSL = POST_PROCESSING_FOLDER_FR + "/edit-patron.xsl"; + public static final String UTIL_FR_IDENTIFICATION_XSL = POST_PROCESSING_FOLDER_FR + "/identification.xsl"; + public static final String UTIL_FR_INSERT_END_XSL = POST_PROCESSING_FOLDER_FR + "/insert-end.xsl"; + public static final String UTIL_FR_INSERT_GENERIC_QUESTIONS_XSL = POST_PROCESSING_FOLDER_FR + "/insert-generic-questions.xsl"; + public static final String UTIL_FR_INSERT_WELCOME_XSL = POST_PROCESSING_FOLDER_FR + "/insert-welcome.xsl"; + public static final String UTIL_FR_MODELE_COLTRANE_XSL = POST_PROCESSING_FOLDER_FR + "/model-coltrane.xsl"; + public static final String UTIL_FR_SPECIFIC_TREATMENT_XSL = POST_PROCESSING_FOLDER_FR + "/fr-specific-treatment.xsl"; + // ---------- Temporary file system // ----- Folders @@ -160,6 +176,9 @@ public static String sUB_TEMP_FOLDER (String survey){ public static File tEMP_NULL_TMP (String sUB_TEMP_FOLDER){ return getFileOrDirectoryFromPath(sUB_TEMP_FOLDER + "/null.tmp"); } + public static File tEMP_MAPPING_TMP (String sUB_TEMP_FOLDER){ + return getFileOrDirectoryFromPath(sUB_TEMP_FOLDER + "/mapping.xml"); + } public static final File TEMP_PREFORMATE_TMP = getFileOrDirectoryFromPath(TEMP_FOLDER_PATH + "/temp/preformate.tmp"); // public static File tEMP_PREFORMATE_TMP (String sUB_TEMP_FOLDER) { // return getFileOrDirectoryFromPath(sUB_TEMP_FOLDER + "/preformate.tmp"); @@ -284,14 +303,14 @@ public String oLD_TEMP_NULL_TMP2(String sUB_TEMP_FOLDER){ //// Xsl stylesheets used in DDIPreprocessing - + // File Extension public static final String CLEANED_EXTENSION = "-cleaned.tmp"; public static final String MW_EXTENSION = "-mw.tmp"; public static final String FINAL_EXTENSION = "-final.tmp"; public static final String TEMP_EXTENSION = "-temp.xml"; public static final String FINAL_DDI_EXTENSION = "-final.xml"; - + // PDF public static final String ACCOMPANYING_MAILS_FO_EXTENSION = "-accompanying-mails.fo"; public static final String COVER_PAGE_FO_EXTENSION = "-cover-page.fo"; public static final String EDIT_STRUCTURE_FO_EXTENSION = "-edit-structure.fo"; @@ -301,9 +320,23 @@ public String oLD_TEMP_NULL_TMP2(String sUB_TEMP_FOLDER){ public static final String FINAL_PDF_EXTENSION = "-final-out.fo"; //public static final String CUSTOM_FO_EXTENSION = "-out.fo"; public static final String MAILING_FO_EXTENSION = "-mailing-vtl.fo"; + + // JS public static final String SORT_COMPONENTS_JS_EXTENSION = "-sorted.xml"; public static final String FINAL_JS_EXTENSION = "-lunatic.xml"; + // FR + public static final String BROWSING_FR_EXTENSION = "-browsing.xhtml"; + public static final String EDIT_PATRON_FR_EXTENSION = "-edit-patron.xhtml"; + public static final String FIX_ADHERENCE_FR_EXTENSION = "-fix-adherence.xhtml"; + public static final String IDENTIFICATION_FR_EXTENSION = "-identification.xhtml"; + public static final String INSERT_END_FR_EXTENSION = "-insert-end.xhtml"; + public static final String INSERT_WELCOME_FR_EXTENSION = "-insert-welcome.xhtml"; + public static final String INSERT_GENERIC_QUESTIONS_FR_EXTENSION = "-insert-generic-questions.xhtml"; + public static final String MODELE_COLTRANE_FR_EXTENSION = "-modele-coltrane.xhtml"; + public static final String SPECIFIC_TREATMENT_FR_EXTENSION = "-specific-treatment.xhtml"; + // JS + //public static final String TEMP_XFORMS_FOLDER = SUB_TEMP_FOLDER + "/xforms"; public static String tEMP_XFORMS_FOLDER (String sUB_TEMP_FOLDER){ return sUB_TEMP_FOLDER + "/xforms"; @@ -313,7 +346,11 @@ public static String tEMP_ODT_FOLDER(String sUB_TEMP_FOLDER){ return sUB_TEMP_FOLDER + "/odt"; } - //public static final String TEMP_PDF_FOLDER = SUB_TEMP_FOLDER + "/pdf"; + //public static final String TEMP_PDF_FOLDER = SUB_TEMP_FOLDER + "/js"; + public static String tEMP_JS_FOLDER(String sUB_TEMP_FOLDER){ + return sUB_TEMP_FOLDER+ "/js"; + } + public static String tEMP_PDF_FOLDER(String sUB_TEMP_FOLDER){ return sUB_TEMP_FOLDER+ "/pdf"; } @@ -326,6 +363,7 @@ public static String tEMP_POGUES_XML_FOLDER(String sUB_TEMP_FOLDER){ return sUB_TEMP_FOLDER + "/pogues-xml"; } public static final String BASIC_FORM_TMP_FILENAME = "basic-form.tmp"; + From 855107ba14d7be28a5669dd1d150fb75db1aa511 Mon Sep 17 00:00:00 2001 From: Laurent Caouissin <laurent.caouissin@insee.fr> Date: Thu, 5 Sep 2019 10:34:39 +0200 Subject: [PATCH 094/439] Eno v2.0.0 : Create new PostProcessors - java transformation - xsl transformation --- .../postprocessing/ddi/DDIPostprocessor.java | 68 +++ .../fr/FRBrowsingPostprocessor.java | 46 ++ .../fr/FREditPatronPostprocessor.java | 58 +++ .../fr/FRFixAdherencePostprocessor.java | 51 ++ .../fr/FRIdentificationPostprocessor.java | 52 ++ .../fr/FRInsertEndPostprocessor.java | 53 ++ ...FRInsertGenericQuestionsPostprocessor.java | 47 ++ .../fr/FRInsertWelcomePostprocessor.java | 53 ++ .../fr/FRModeleColtranePostprocessor.java | 56 +++ .../fr/FRSpecificTreatmentPostprocessor.java | 51 ++ .../JSExternalizeVariablesPostprocessor.java | 45 ++ .../js/JSSortComponentsPostprocessor.java | 47 ++ .../PDFEditStructurePagesPostprocessor.java | 51 ++ ...FInsertAccompanyingMailsPostprocessor.java | 51 ++ .../pdf/PDFInsertCoverPagePostprocessor.java | 51 ++ .../PDFInsertEndQuestionPostprocessor.java | 51 ++ .../pdf/PDFMailingPostprocessor.java | 40 ++ .../PDFSpecificTreatmentPostprocessor.java | 49 ++ .../pdf/PDFTableColumnPostprocessorFake.java | 32 ++ src/main/resources/xslt/util/ddi/mapping.xsl | 91 ++++ src/main/resources/xslt/util/fr/coltrane.xsl | 281 +++++++++++ .../resources/xslt/util/fr/edit-patron.xsl | 233 +++++++++ .../xslt/util/fr/end/end-business.xsl | 347 +++++++++++++ .../xslt/util/fr/end/end-household.xsl | 199 ++++++++ .../xslt/util/fr/fr-specific-treatment.xsl | 32 ++ .../generic-questions-business.xsl | 194 ++++++++ .../generic-questions-household.xsl | 103 ++++ .../resources/xslt/util/fr/identification.xsl | 190 +++++++ .../resources/xslt/util/fr/insert-end.xsl | 450 +++++++++++++++++ .../xslt/util/fr/insert-generic-questions.xsl | 425 ++++++++++++++++ .../resources/xslt/util/fr/insert-welcome.xsl | 462 ++++++++++++++++++ src/main/resources/xslt/util/fr/jointure.xsl | 35 ++ .../xslt/util/fr/modele-coltrane.xsl | 358 ++++++++++++++ .../xslt/util/fr/patron/patron-business.xsl | 174 +++++++ .../xslt/util/fr/patron/patron-household.xsl | 169 +++++++ .../xslt/util/fr/welcome/welcome-business.xsl | 348 +++++++++++++ .../util/fr/welcome/welcome-household.xsl | 330 +++++++++++++ .../xslt/util/pdf/pdf-specific-treatment.xsl | 32 ++ 38 files changed, 5405 insertions(+) create mode 100644 src/main/java/fr/insee/eno/postprocessing/ddi/DDIPostprocessor.java create mode 100644 src/main/java/fr/insee/eno/postprocessing/fr/FRBrowsingPostprocessor.java create mode 100644 src/main/java/fr/insee/eno/postprocessing/fr/FREditPatronPostprocessor.java create mode 100644 src/main/java/fr/insee/eno/postprocessing/fr/FRFixAdherencePostprocessor.java create mode 100644 src/main/java/fr/insee/eno/postprocessing/fr/FRIdentificationPostprocessor.java create mode 100644 src/main/java/fr/insee/eno/postprocessing/fr/FRInsertEndPostprocessor.java create mode 100644 src/main/java/fr/insee/eno/postprocessing/fr/FRInsertGenericQuestionsPostprocessor.java create mode 100644 src/main/java/fr/insee/eno/postprocessing/fr/FRInsertWelcomePostprocessor.java create mode 100644 src/main/java/fr/insee/eno/postprocessing/fr/FRModeleColtranePostprocessor.java create mode 100644 src/main/java/fr/insee/eno/postprocessing/fr/FRSpecificTreatmentPostprocessor.java create mode 100644 src/main/java/fr/insee/eno/postprocessing/js/JSExternalizeVariablesPostprocessor.java create mode 100644 src/main/java/fr/insee/eno/postprocessing/js/JSSortComponentsPostprocessor.java create mode 100644 src/main/java/fr/insee/eno/postprocessing/pdf/PDFEditStructurePagesPostprocessor.java create mode 100644 src/main/java/fr/insee/eno/postprocessing/pdf/PDFInsertAccompanyingMailsPostprocessor.java create mode 100644 src/main/java/fr/insee/eno/postprocessing/pdf/PDFInsertCoverPagePostprocessor.java create mode 100644 src/main/java/fr/insee/eno/postprocessing/pdf/PDFInsertEndQuestionPostprocessor.java create mode 100644 src/main/java/fr/insee/eno/postprocessing/pdf/PDFMailingPostprocessor.java create mode 100644 src/main/java/fr/insee/eno/postprocessing/pdf/PDFSpecificTreatmentPostprocessor.java create mode 100644 src/main/java/fr/insee/eno/postprocessing/pdf/PDFTableColumnPostprocessorFake.java create mode 100644 src/main/resources/xslt/util/ddi/mapping.xsl create mode 100644 src/main/resources/xslt/util/fr/coltrane.xsl create mode 100644 src/main/resources/xslt/util/fr/edit-patron.xsl create mode 100644 src/main/resources/xslt/util/fr/end/end-business.xsl create mode 100644 src/main/resources/xslt/util/fr/end/end-household.xsl create mode 100644 src/main/resources/xslt/util/fr/fr-specific-treatment.xsl create mode 100644 src/main/resources/xslt/util/fr/generic-questions/generic-questions-business.xsl create mode 100644 src/main/resources/xslt/util/fr/generic-questions/generic-questions-household.xsl create mode 100644 src/main/resources/xslt/util/fr/identification.xsl create mode 100644 src/main/resources/xslt/util/fr/insert-end.xsl create mode 100644 src/main/resources/xslt/util/fr/insert-generic-questions.xsl create mode 100644 src/main/resources/xslt/util/fr/insert-welcome.xsl create mode 100644 src/main/resources/xslt/util/fr/jointure.xsl create mode 100644 src/main/resources/xslt/util/fr/modele-coltrane.xsl create mode 100644 src/main/resources/xslt/util/fr/patron/patron-business.xsl create mode 100644 src/main/resources/xslt/util/fr/patron/patron-household.xsl create mode 100644 src/main/resources/xslt/util/fr/welcome/welcome-business.xsl create mode 100644 src/main/resources/xslt/util/fr/welcome/welcome-household.xsl create mode 100644 src/main/resources/xslt/util/pdf/pdf-specific-treatment.xsl diff --git a/src/main/java/fr/insee/eno/postprocessing/ddi/DDIPostprocessor.java b/src/main/java/fr/insee/eno/postprocessing/ddi/DDIPostprocessor.java new file mode 100644 index 000000000..b43c8cc3c --- /dev/null +++ b/src/main/java/fr/insee/eno/postprocessing/ddi/DDIPostprocessor.java @@ -0,0 +1,68 @@ +package fr.insee.eno.postprocessing.ddi; + +import java.io.File; +import java.io.InputStream; +import java.io.OutputStream; + +import org.apache.commons.io.FileUtils; +import org.apache.commons.io.FilenameUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import fr.insee.eno.Constants; +import fr.insee.eno.postprocessing.Postprocessor; +import fr.insee.eno.transform.xsl.XslTransformation; + +/** + * DDI postprocessor. + */ +public class DDIPostprocessor implements Postprocessor { + + private static final Logger logger = LoggerFactory.getLogger(DDIPostprocessor.class); + + // FIXME Inject ! + private static XslTransformation saxonService = new XslTransformation(); + + @Override + public File process(File input, byte[] parameters, String survey) throws Exception { + logger.info("DDIPostprocessor Target : START"); + String mw2xhtmlOutput = FilenameUtils.removeExtension(input.getPath()) + Constants.MW_EXTENSION; + // ----- mw2xhtml + logger.debug("Markdown to XHTML : -Input : " + input + " -Output : " + mw2xhtmlOutput + " -Stylesheet : " + + Constants.UTIL_DDI_MW2XHTML_XSL + " -Parameters : " + Constants.sUB_TEMP_FOLDER(survey)); + + InputStream isDDI_MW2XHTML_XSL = Constants.getInputStreamFromPath(Constants.UTIL_DDI_MW2XHTML_XSL); + InputStream isInputFile = FileUtils.openInputStream(input); + + OutputStream osTEMP_NULL_TMP = FileUtils.openOutputStream(new File(mw2xhtmlOutput)); + saxonService.transformMw2XHTML(isInputFile, isDDI_MW2XHTML_XSL, osTEMP_NULL_TMP, + Constants.sUB_TEMP_FOLDER_FILE(survey)); + isInputFile.close(); + isDDI_MW2XHTML_XSL.close(); + osTEMP_NULL_TMP.close(); + + // ----- tweak-xhtml-for-ddi + // tweak-xhtml-for-ddi-input = mw2xhtml-output + + String outputTweakXhtmlForDdi = FilenameUtils.removeExtension(input.getPath()) + Constants.FINAL_DDI_EXTENSION; + + logger.debug("Tweak-xhtml-for-ddi : -Input : " + mw2xhtmlOutput + " -Output : " + outputTweakXhtmlForDdi + + " -Stylesheet : " + Constants.UTIL_DDI_TWEAK_XHTML_FOR_DDI_XSL + " -Parameters : " + + (parameters == null ? "Default parameters" : "Provided parameters")); + + InputStream isTweakXhtmlForDdi = FileUtils.openInputStream(new File(mw2xhtmlOutput)); + InputStream isUTIL_DDI_TWEAK_XHTML_FOR_DDI_XSL = Constants + .getInputStreamFromPath(Constants.UTIL_DDI_TWEAK_XHTML_FOR_DDI_XSL); + OutputStream osTweakXhtmlForDdi = FileUtils.openOutputStream(new File(outputTweakXhtmlForDdi)); + saxonService.transformTweakXhtmlForDdi(isTweakXhtmlForDdi, isUTIL_DDI_TWEAK_XHTML_FOR_DDI_XSL, + osTweakXhtmlForDdi, Constants.sUB_TEMP_FOLDER_FILE(survey)); + isTweakXhtmlForDdi.close(); + isUTIL_DDI_TWEAK_XHTML_FOR_DDI_XSL.close(); + osTweakXhtmlForDdi.close(); + + logger.debug("DDIPostprocessor : END"); + return new File(outputTweakXhtmlForDdi); + + } + +} diff --git a/src/main/java/fr/insee/eno/postprocessing/fr/FRBrowsingPostprocessor.java b/src/main/java/fr/insee/eno/postprocessing/fr/FRBrowsingPostprocessor.java new file mode 100644 index 000000000..179c72615 --- /dev/null +++ b/src/main/java/fr/insee/eno/postprocessing/fr/FRBrowsingPostprocessor.java @@ -0,0 +1,46 @@ +package fr.insee.eno.postprocessing.fr; + +import java.io.File; +import java.io.InputStream; +import java.io.OutputStream; + +import org.apache.commons.io.FileUtils; +import org.apache.commons.io.FilenameUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import fr.insee.eno.Constants; +import fr.insee.eno.postprocessing.Postprocessor; +import fr.insee.eno.transform.xsl.XslTransformation; + +public class FRBrowsingPostprocessor implements Postprocessor { + + private static final Logger logger = LoggerFactory.getLogger(FRBrowsingPostprocessor.class); + + // FIXME Inject ! + private static XslTransformation saxonService = new XslTransformation(); + + @Override + public File process(File input, byte[] parameters, String survey) throws Exception { + + File outputForFRFile = new File( + input.getPath().replace(Constants.INSERT_GENERIC_QUESTIONS_FR_EXTENSION, Constants.BROWSING_FR_EXTENSION)); + System.out.println(input.getPath()); + + InputStream FO_XSL = Constants.getInputStreamFromPath(Constants.UTIL_FR_BROWSING_XSL); + + InputStream inputStream = FileUtils.openInputStream(input); + OutputStream outputStream = FileUtils.openOutputStream(outputForFRFile); + + saxonService.transformBrowsingFr(inputStream, outputStream, FO_XSL); + + inputStream.close(); + outputStream.close(); + FO_XSL.close(); + logger.info("End of Browsing post-processing " + input.getAbsolutePath()); + + return outputForFRFile; + } + + +} diff --git a/src/main/java/fr/insee/eno/postprocessing/fr/FREditPatronPostprocessor.java b/src/main/java/fr/insee/eno/postprocessing/fr/FREditPatronPostprocessor.java new file mode 100644 index 000000000..6d40ff0e3 --- /dev/null +++ b/src/main/java/fr/insee/eno/postprocessing/fr/FREditPatronPostprocessor.java @@ -0,0 +1,58 @@ +package fr.insee.eno.postprocessing.fr; + +import java.io.File; +import java.io.InputStream; +import java.io.OutputStream; + +import org.apache.commons.io.FileUtils; +import org.apache.commons.io.FilenameUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import fr.insee.eno.Constants; +import fr.insee.eno.postprocessing.Postprocessor; +import fr.insee.eno.transform.xsl.XslTransformation; + +public class FREditPatronPostprocessor implements Postprocessor { + + private static final Logger logger = LoggerFactory.getLogger(FREditPatronPostprocessor.class); + + // FIXME Inject ! + private static XslTransformation saxonService = new XslTransformation(); + + @Override + public File process(File input, byte[] parameters, String survey) throws Exception { + + File outputForFOFile = new File( + input.getPath().replace(Constants.MODELE_COLTRANE_FR_EXTENSION, Constants.EDIT_PATRON_FR_EXTENSION)); + System.out.println(input.getPath()); + String surveyName = survey; + String formName = getFormName(input); + + String sUB_TEMP_FOLDER = Constants.tEMP_DDI_FOLDER(Constants.sUB_TEMP_FOLDER(survey)); + File mappingFile =Constants.tEMP_MAPPING_TMP(sUB_TEMP_FOLDER); + + InputStream FO_XSL = Constants.getInputStreamFromPath(Constants.UTIL_FR_EDIT_PATRON_XSL); + + InputStream inputStream = FileUtils.openInputStream(input); + OutputStream outputStream = FileUtils.openOutputStream(outputForFOFile); + InputStream mappingStream = FileUtils.openInputStream(mappingFile); + InputStream metadoneesStream = FileUtils.openInputStream(null);//FIXME pettre en argument les metadonnees + + saxonService.transformWithMetadonnee(inputStream, outputStream, FO_XSL, parameters ,metadoneesStream); + + inputStream.close(); + outputStream.close(); + FO_XSL.close(); + mappingStream.close(); + metadoneesStream.close(); + logger.info("End of EditPatron post-processing " + input.getAbsolutePath()); + + return outputForFOFile; + } + + private String getFormName(File input) { + return FilenameUtils.getBaseName(input.getParentFile().getParent()); + } + +} diff --git a/src/main/java/fr/insee/eno/postprocessing/fr/FRFixAdherencePostprocessor.java b/src/main/java/fr/insee/eno/postprocessing/fr/FRFixAdherencePostprocessor.java new file mode 100644 index 000000000..9f20104a0 --- /dev/null +++ b/src/main/java/fr/insee/eno/postprocessing/fr/FRFixAdherencePostprocessor.java @@ -0,0 +1,51 @@ +package fr.insee.eno.postprocessing.fr; + +import java.io.File; +import java.io.InputStream; +import java.io.OutputStream; + +import org.apache.commons.io.FileUtils; +import org.apache.commons.io.FilenameUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import fr.insee.eno.Constants; +import fr.insee.eno.postprocessing.Postprocessor; +import fr.insee.eno.transform.xsl.XslTransformation; + +public class FRFixAdherencePostprocessor implements Postprocessor { + + private static final Logger logger = LoggerFactory.getLogger(FRFixAdherencePostprocessor.class); + + // FIXME Inject ! + private static XslTransformation saxonService = new XslTransformation(); + + @Override + public File process(File input, byte[] parameters, String survey) throws Exception { + + File outputForFOFile = new File( + input.getPath().replace(Constants.SPECIFIC_TREATMENT_FR_EXTENSION, Constants.FIX_ADHERENCE_FR_EXTENSION)); + System.out.println(input.getPath()); + String surveyName = survey; + String formName = getFormName(input); + + InputStream FR_XSL = Constants.getInputStreamFromPath(Constants.UTIL_FR_FIX_ADHERENCE_XSL); + + InputStream inputStream = FileUtils.openInputStream(input); + OutputStream outputStream = FileUtils.openOutputStream(outputForFOFile); + + saxonService.transformSimple(inputStream, outputStream, FR_XSL); + + inputStream.close(); + outputStream.close(); + FR_XSL.close(); + logger.info("End of specific treatment post-processing " + input.getAbsolutePath()); + + return outputForFOFile; + } + + private String getFormName(File input) { + return FilenameUtils.getBaseName(input.getParentFile().getParent()); + } + +} diff --git a/src/main/java/fr/insee/eno/postprocessing/fr/FRIdentificationPostprocessor.java b/src/main/java/fr/insee/eno/postprocessing/fr/FRIdentificationPostprocessor.java new file mode 100644 index 000000000..9120530c9 --- /dev/null +++ b/src/main/java/fr/insee/eno/postprocessing/fr/FRIdentificationPostprocessor.java @@ -0,0 +1,52 @@ +package fr.insee.eno.postprocessing.fr; + +import java.io.File; +import java.io.InputStream; +import java.io.OutputStream; + +import org.apache.commons.io.FileUtils; +import org.apache.commons.io.FilenameUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import fr.insee.eno.Constants; +import fr.insee.eno.postprocessing.Postprocessor; +import fr.insee.eno.transform.xsl.XslTransformation; + +public class FRIdentificationPostprocessor implements Postprocessor { + + private static final Logger logger = LoggerFactory.getLogger(FRIdentificationPostprocessor.class); + + // FIXME Inject ! + private static XslTransformation saxonService = new XslTransformation(); + + @Override + public File process(File input, byte[] parameters, String survey) throws Exception { + + File outputForFOFile = new File( + input.getPath().replace(Constants.EDIT_PATRON_FR_EXTENSION, Constants.IDENTIFICATION_FR_EXTENSION)); + System.out.println(input.getPath()); + String surveyName = survey; + String formName = getFormName(input); + + InputStream FO_XSL = Constants.getInputStreamFromPath(Constants.IDENTIFICATION_FR_EXTENSION); + + InputStream inputStream = FileUtils.openInputStream(input); + OutputStream outputStream = FileUtils.openOutputStream(outputForFOFile); + + //FIXME changer identification pour la rendre paramétrable en fonction de studyUnit + saxonService.transformSimple(inputStream, outputStream, FO_XSL); + + inputStream.close(); + outputStream.close(); + FO_XSL.close(); + logger.info("End of identification post-processing " + input.getAbsolutePath()); + + return outputForFOFile; + } + + private String getFormName(File input) { + return FilenameUtils.getBaseName(input.getParentFile().getParent()); + } + +} diff --git a/src/main/java/fr/insee/eno/postprocessing/fr/FRInsertEndPostprocessor.java b/src/main/java/fr/insee/eno/postprocessing/fr/FRInsertEndPostprocessor.java new file mode 100644 index 000000000..718654542 --- /dev/null +++ b/src/main/java/fr/insee/eno/postprocessing/fr/FRInsertEndPostprocessor.java @@ -0,0 +1,53 @@ +package fr.insee.eno.postprocessing.fr; + +import java.io.File; +import java.io.InputStream; +import java.io.OutputStream; + +import org.apache.commons.io.FileUtils; +import org.apache.commons.io.FilenameUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import fr.insee.eno.Constants; +import fr.insee.eno.postprocessing.Postprocessor; +import fr.insee.eno.transform.xsl.XslTransformation; + +public class FRInsertEndPostprocessor implements Postprocessor { + + private static final Logger logger = LoggerFactory.getLogger(FRInsertEndPostprocessor.class); + + // FIXME Inject ! + private static XslTransformation saxonService = new XslTransformation(); + + @Override + public File process(File input, byte[] parameters, String survey) throws Exception { + + File outputForFOFile = new File( + input.getPath().replace(Constants.INSERT_WELCOME_FR_EXTENSION, Constants.INSERT_END_FR_EXTENSION)); + System.out.println(input.getPath()); + String surveyName = survey; + String formName = getFormName(input); + + InputStream FO_XSL = Constants.getInputStreamFromPath(Constants.UTIL_FR_INSERT_END_XSL); + + InputStream inputStream = FileUtils.openInputStream(input); + OutputStream outputStream = FileUtils.openOutputStream(outputForFOFile); + InputStream metadoneesStream = FileUtils.openInputStream(null);//FIXME pettre en argument les metadonnees + + saxonService.transformWithMetadonnee(inputStream, outputStream, FO_XSL, parameters ,metadoneesStream); + + inputStream.close(); + outputStream.close(); + FO_XSL.close(); + metadoneesStream.close(); + logger.info("End of insert welcome post-processing " + input.getAbsolutePath()); + + return outputForFOFile; + } + + private String getFormName(File input) { + return FilenameUtils.getBaseName(input.getParentFile().getParent()); + } + +} diff --git a/src/main/java/fr/insee/eno/postprocessing/fr/FRInsertGenericQuestionsPostprocessor.java b/src/main/java/fr/insee/eno/postprocessing/fr/FRInsertGenericQuestionsPostprocessor.java new file mode 100644 index 000000000..d539af4c2 --- /dev/null +++ b/src/main/java/fr/insee/eno/postprocessing/fr/FRInsertGenericQuestionsPostprocessor.java @@ -0,0 +1,47 @@ +package fr.insee.eno.postprocessing.fr; + +import java.io.File; +import java.io.InputStream; +import java.io.OutputStream; + +import org.apache.commons.io.FileUtils; +import org.apache.commons.io.FilenameUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import fr.insee.eno.Constants; +import fr.insee.eno.postprocessing.Postprocessor; +import fr.insee.eno.transform.xsl.XslTransformation; + +public class FRInsertGenericQuestionsPostprocessor implements Postprocessor { + + private static final Logger logger = LoggerFactory.getLogger(FRInsertGenericQuestionsPostprocessor.class); + + // FIXME Inject ! + private static XslTransformation saxonService = new XslTransformation(); + + @Override + public File process(File input, byte[] parameters, String surveyName) throws Exception { + + String sUB_TEMP_FOLDER = Constants.sUB_TEMP_FOLDER(surveyName); + String outputBasicFormPath = Constants.tEMP_XFORMS_FOLDER(sUB_TEMP_FOLDER) + "/form"+Constants.INSERT_GENERIC_QUESTIONS_FR_EXTENSION; + logger.debug("Output folder for basic-form : " + outputBasicFormPath); + + + File outputForFRFile = new File(outputBasicFormPath); + + InputStream inputStream = FileUtils.openInputStream(input); + OutputStream outputStream = FileUtils.openOutputStream(outputForFRFile); + + InputStream FR_XSL = Constants.getInputStreamFromPath(Constants.UTIL_FR_INSERT_GENERIC_QUESTIONS_XSL); + + saxonService.transformFRToFRSimplePost(inputStream,outputStream, FR_XSL,parameters); + inputStream.close(); + outputStream.close(); + FR_XSL.close(); + logger.info("End of Insert-generic-questions post-processing."); + + return outputForFRFile; + } + +} diff --git a/src/main/java/fr/insee/eno/postprocessing/fr/FRInsertWelcomePostprocessor.java b/src/main/java/fr/insee/eno/postprocessing/fr/FRInsertWelcomePostprocessor.java new file mode 100644 index 000000000..4d2493272 --- /dev/null +++ b/src/main/java/fr/insee/eno/postprocessing/fr/FRInsertWelcomePostprocessor.java @@ -0,0 +1,53 @@ +package fr.insee.eno.postprocessing.fr; + +import java.io.File; +import java.io.InputStream; +import java.io.OutputStream; + +import org.apache.commons.io.FileUtils; +import org.apache.commons.io.FilenameUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import fr.insee.eno.Constants; +import fr.insee.eno.postprocessing.Postprocessor; +import fr.insee.eno.transform.xsl.XslTransformation; + +public class FRInsertWelcomePostprocessor implements Postprocessor { + + private static final Logger logger = LoggerFactory.getLogger(FRInsertWelcomePostprocessor.class); + + // FIXME Inject ! + private static XslTransformation saxonService = new XslTransformation(); + + @Override + public File process(File input, byte[] parameters, String survey) throws Exception { + + File outputForFOFile = new File( + input.getPath().replace(Constants.IDENTIFICATION_FR_EXTENSION, Constants.INSERT_WELCOME_FR_EXTENSION)); + System.out.println(input.getPath()); + String surveyName = survey; + String formName = getFormName(input); + + InputStream FO_XSL = Constants.getInputStreamFromPath(Constants.UTIL_FR_INSERT_WELCOME_XSL); + + InputStream inputStream = FileUtils.openInputStream(input); + OutputStream outputStream = FileUtils.openOutputStream(outputForFOFile); + InputStream metadoneesStream = FileUtils.openInputStream(null);//FIXME pettre en argument les metadonnees + + saxonService.transformWithMetadonnee(inputStream, outputStream, FO_XSL, parameters ,metadoneesStream); + + inputStream.close(); + outputStream.close(); + FO_XSL.close(); + metadoneesStream.close(); + logger.info("End of insert welcome post-processing " + input.getAbsolutePath()); + + return outputForFOFile; + } + + private String getFormName(File input) { + return FilenameUtils.getBaseName(input.getParentFile().getParent()); + } + +} diff --git a/src/main/java/fr/insee/eno/postprocessing/fr/FRModeleColtranePostprocessor.java b/src/main/java/fr/insee/eno/postprocessing/fr/FRModeleColtranePostprocessor.java new file mode 100644 index 000000000..31a2b5879 --- /dev/null +++ b/src/main/java/fr/insee/eno/postprocessing/fr/FRModeleColtranePostprocessor.java @@ -0,0 +1,56 @@ +package fr.insee.eno.postprocessing.fr; + +import java.io.File; +import java.io.InputStream; +import java.io.OutputStream; + +import org.apache.commons.io.FileUtils; +import org.apache.commons.io.FilenameUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import fr.insee.eno.Constants; +import fr.insee.eno.postprocessing.Postprocessor; +import fr.insee.eno.transform.xsl.XslTransformation; + +public class FRModeleColtranePostprocessor implements Postprocessor { + + private static final Logger logger = LoggerFactory.getLogger(FRModeleColtranePostprocessor.class); + + // FIXME Inject ! + private static XslTransformation saxonService = new XslTransformation(); + + @Override + public File process(File input, byte[] parameters, String survey) throws Exception { + + File outputForFOFile = new File( + input.getPath().replace(Constants.BROWSING_FR_EXTENSION, Constants.MODELE_COLTRANE_FR_EXTENSION)); + System.out.println(input.getPath()); + String surveyName = survey; + String formName = getFormName(input); + + String sUB_TEMP_FOLDER = Constants.tEMP_DDI_FOLDER(Constants.sUB_TEMP_FOLDER(survey)); + File mappingFile =Constants.tEMP_MAPPING_TMP(sUB_TEMP_FOLDER); + + InputStream FO_XSL = Constants.getInputStreamFromPath(Constants.UTIL_FR_MODELE_COLTRANE_XSL); + + InputStream inputStream = FileUtils.openInputStream(input); + OutputStream outputStream = FileUtils.openOutputStream(outputForFOFile); + InputStream mappingStream = FileUtils.openInputStream(mappingFile); + + saxonService.transformModelColtraneFr(inputStream, outputStream, FO_XSL, mappingStream); + + inputStream.close(); + outputStream.close(); + FO_XSL.close(); + mappingStream.close(); + logger.info("End of EditStructurePages post-processing " + input.getAbsolutePath()); + + return outputForFOFile; + } + + private String getFormName(File input) { + return FilenameUtils.getBaseName(input.getParentFile().getParent()); + } + +} diff --git a/src/main/java/fr/insee/eno/postprocessing/fr/FRSpecificTreatmentPostprocessor.java b/src/main/java/fr/insee/eno/postprocessing/fr/FRSpecificTreatmentPostprocessor.java new file mode 100644 index 000000000..94d4f0bd0 --- /dev/null +++ b/src/main/java/fr/insee/eno/postprocessing/fr/FRSpecificTreatmentPostprocessor.java @@ -0,0 +1,51 @@ +package fr.insee.eno.postprocessing.fr; + +import java.io.File; +import java.io.InputStream; +import java.io.OutputStream; + +import org.apache.commons.io.FileUtils; +import org.apache.commons.io.FilenameUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import fr.insee.eno.Constants; +import fr.insee.eno.postprocessing.Postprocessor; +import fr.insee.eno.transform.xsl.XslTransformation; + +public class FRSpecificTreatmentPostprocessor implements Postprocessor { + + private static final Logger logger = LoggerFactory.getLogger(FRSpecificTreatmentPostprocessor.class); + + // FIXME Inject ! + private static XslTransformation saxonService = new XslTransformation(); + + @Override + public File process(File input, byte[] parameters, String survey) throws Exception { + + File outputForFOFile = new File( + input.getPath().replace(Constants.INSERT_END_FR_EXTENSION, Constants.SPECIFIC_TREATMENT_FR_EXTENSION)); + System.out.println(input.getPath()); + String surveyName = survey; + String formName = getFormName(input); + + //FIXME ajouter la verrue en parametre, si elle est nulle faire ça : + InputStream VERRUE_XSL = Constants.getInputStreamFromPath(Constants.UTIL_FR_SPECIFIC_TREATMENT_XSL); + InputStream inputStream = FileUtils.openInputStream(input); + OutputStream outputStream = FileUtils.openOutputStream(outputForFOFile); + + saxonService.transformSimple(inputStream, outputStream, VERRUE_XSL); + + inputStream.close(); + outputStream.close(); + VERRUE_XSL.close(); + logger.info("End of specific treatment post-processing " + input.getAbsolutePath()); + + return outputForFOFile; + } + + private String getFormName(File input) { + return FilenameUtils.getBaseName(input.getParentFile().getParent()); + } + +} diff --git a/src/main/java/fr/insee/eno/postprocessing/js/JSExternalizeVariablesPostprocessor.java b/src/main/java/fr/insee/eno/postprocessing/js/JSExternalizeVariablesPostprocessor.java new file mode 100644 index 000000000..22eb202f8 --- /dev/null +++ b/src/main/java/fr/insee/eno/postprocessing/js/JSExternalizeVariablesPostprocessor.java @@ -0,0 +1,45 @@ +package fr.insee.eno.postprocessing.js; + +import java.io.File; +import java.io.InputStream; +import java.io.OutputStream; + +import org.apache.commons.io.FileUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import fr.insee.eno.Constants; +import fr.insee.eno.postprocessing.Postprocessor; +import fr.insee.eno.transform.xsl.XslTransformation; + +/** + * Customization of JS postprocessor. + */ +public class JSExternalizeVariablesPostprocessor implements Postprocessor { + + private static final Logger logger = LoggerFactory.getLogger(JSExternalizeVariablesPostprocessor.class); + + // FIXME Inject ! + private static XslTransformation saxonService = new XslTransformation(); + + @Override + public File process(File input, byte[] parameters, String surveyName) throws Exception { + + File outputCustomFOFile = new File( + input.getPath().replace(Constants.SORT_COMPONENTS_JS_EXTENSION, Constants.FINAL_JS_EXTENSION)); + + InputStream JS_XSL = Constants.getInputStreamFromPath(Constants.TRANSFORMATIONS_EXTERNALIZE_VARIABLES_JS); + + InputStream inputStream = FileUtils.openInputStream(input); + OutputStream outputStream = FileUtils.openOutputStream(outputCustomFOFile); + + saxonService.transformJSToJSPost(inputStream,outputStream, JS_XSL); + inputStream.close(); + outputStream.close(); + JS_XSL.close(); + logger.info("End JS externalize codeLists post-processing"); + + return outputCustomFOFile; + } + +} diff --git a/src/main/java/fr/insee/eno/postprocessing/js/JSSortComponentsPostprocessor.java b/src/main/java/fr/insee/eno/postprocessing/js/JSSortComponentsPostprocessor.java new file mode 100644 index 000000000..e5b86686f --- /dev/null +++ b/src/main/java/fr/insee/eno/postprocessing/js/JSSortComponentsPostprocessor.java @@ -0,0 +1,47 @@ +package fr.insee.eno.postprocessing.js; + +import java.io.File; +import java.io.InputStream; +import java.io.OutputStream; + +import org.apache.commons.io.FileUtils; +import org.apache.commons.io.FilenameUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import fr.insee.eno.Constants; +import fr.insee.eno.postprocessing.Postprocessor; +import fr.insee.eno.transform.xsl.XslTransformation; + +/** + * Customization of JS postprocessor. + */ +public class JSSortComponentsPostprocessor implements Postprocessor { + + private static final Logger logger = LoggerFactory.getLogger(JSSortComponentsPostprocessor.class); + + // FIXME Inject ! + private static XslTransformation saxonService = new XslTransformation(); + + @Override + public File process(File input, byte[] parameters, String surveyName) throws Exception { + + File outputCustomFOFile = new File( + FilenameUtils.removeExtension(input.getPath()) + Constants.SORT_COMPONENTS_JS_EXTENSION); + InputStream JS_XSL = Constants.getInputStreamFromPath(Constants.TRANSFORMATIONS_SORT_COMPONENTS_JS); + + + InputStream inputStream = FileUtils.openInputStream(input); + OutputStream outputStream = FileUtils.openOutputStream(outputCustomFOFile); + + saxonService.transformJSToJSPost(inputStream,outputStream, JS_XSL); + + inputStream.close(); + outputStream.close(); + JS_XSL.close(); + logger.info("End JS sort component post-processing"); + + return outputCustomFOFile; + } + +} diff --git a/src/main/java/fr/insee/eno/postprocessing/pdf/PDFEditStructurePagesPostprocessor.java b/src/main/java/fr/insee/eno/postprocessing/pdf/PDFEditStructurePagesPostprocessor.java new file mode 100644 index 000000000..53998dd97 --- /dev/null +++ b/src/main/java/fr/insee/eno/postprocessing/pdf/PDFEditStructurePagesPostprocessor.java @@ -0,0 +1,51 @@ +package fr.insee.eno.postprocessing.pdf; + +import java.io.File; +import java.io.InputStream; +import java.io.OutputStream; + +import org.apache.commons.io.FileUtils; +import org.apache.commons.io.FilenameUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import fr.insee.eno.Constants; +import fr.insee.eno.postprocessing.Postprocessor; +import fr.insee.eno.transform.xsl.XslTransformation; + +public class PDFEditStructurePagesPostprocessor implements Postprocessor { + + private static final Logger logger = LoggerFactory.getLogger(PDFEditStructurePagesPostprocessor.class); + + // FIXME Inject ! + private static XslTransformation saxonService = new XslTransformation(); + + @Override + public File process(File input, byte[] parameters, String survey) throws Exception { + + File outputForFOFile = new File( + input.getPath().replace(Constants.END_QUESTION_FO_EXTENSION, Constants.EDIT_STRUCTURE_FO_EXTENSION)); + System.out.println(input.getPath()); + String surveyName = survey; + String formName = getFormName(input); + + InputStream FO_XSL = Constants.getInputStreamFromPath(Constants.TRANSFORMATIONS_EDIT_STRUCTURE_PAGES_FO_4PDF); + + InputStream inputStream = FileUtils.openInputStream(input); + OutputStream outputStream = FileUtils.openOutputStream(outputForFOFile); + + saxonService.transformFOToStep4FO(inputStream, outputStream, FO_XSL, surveyName, formName, parameters); + + inputStream.close(); + outputStream.close(); + FO_XSL.close(); + logger.info("End of EditStructurePages post-processing " + input.getAbsolutePath()); + + return outputForFOFile; + } + + private String getFormName(File input) { + return FilenameUtils.getBaseName(input.getParentFile().getParent()); + } + +} diff --git a/src/main/java/fr/insee/eno/postprocessing/pdf/PDFInsertAccompanyingMailsPostprocessor.java b/src/main/java/fr/insee/eno/postprocessing/pdf/PDFInsertAccompanyingMailsPostprocessor.java new file mode 100644 index 000000000..8af21a67c --- /dev/null +++ b/src/main/java/fr/insee/eno/postprocessing/pdf/PDFInsertAccompanyingMailsPostprocessor.java @@ -0,0 +1,51 @@ +package fr.insee.eno.postprocessing.pdf; + +import java.io.File; +import java.io.InputStream; +import java.io.OutputStream; + +import org.apache.commons.io.FileUtils; +import org.apache.commons.io.FilenameUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import fr.insee.eno.Constants; +import fr.insee.eno.postprocessing.Postprocessor; +import fr.insee.eno.transform.xsl.XslTransformation; + +public class PDFInsertAccompanyingMailsPostprocessor implements Postprocessor { + + private static final Logger logger = LoggerFactory.getLogger(PDFInsertAccompanyingMailsPostprocessor.class); + + // FIXME Inject ! + private static XslTransformation saxonService = new XslTransformation(); + + @Override + public File process(File input, byte[] parameters, String survey) throws Exception { + + File outputForFOFile = new File( + input.getPath().replace(Constants.COVER_PAGE_FO_EXTENSION, Constants.FINAL_PDF_EXTENSION)); + System.out.println(input.getPath()); + String surveyName = survey; + String formName = getFormName(input); + + InputStream FO_XSL = Constants.getInputStreamFromPath(Constants.TRANSFORMATIONS_ACCOMPANYING_MAILS_FO_4PDF); + + InputStream inputStream = FileUtils.openInputStream(input); + OutputStream outputStream = FileUtils.openOutputStream(outputForFOFile); + + saxonService.transformFOToStep4FO(inputStream, outputStream, FO_XSL, surveyName, formName, parameters); + + inputStream.close(); + outputStream.close(); + FO_XSL.close(); + logger.info("End of InsertAccompanyingMails post-processing " + input.getAbsolutePath()); + + return outputForFOFile; + } + + private String getFormName(File input) { + return FilenameUtils.getBaseName(input.getParentFile().getParent()); + } + +} diff --git a/src/main/java/fr/insee/eno/postprocessing/pdf/PDFInsertCoverPagePostprocessor.java b/src/main/java/fr/insee/eno/postprocessing/pdf/PDFInsertCoverPagePostprocessor.java new file mode 100644 index 000000000..587e36903 --- /dev/null +++ b/src/main/java/fr/insee/eno/postprocessing/pdf/PDFInsertCoverPagePostprocessor.java @@ -0,0 +1,51 @@ +package fr.insee.eno.postprocessing.pdf; + +import java.io.File; +import java.io.InputStream; +import java.io.OutputStream; + +import org.apache.commons.io.FileUtils; +import org.apache.commons.io.FilenameUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import fr.insee.eno.Constants; +import fr.insee.eno.postprocessing.Postprocessor; +import fr.insee.eno.transform.xsl.XslTransformation; + +public class PDFInsertCoverPagePostprocessor implements Postprocessor { + + private static final Logger logger = LoggerFactory.getLogger(PDFInsertCoverPagePostprocessor.class); + + // FIXME Inject ! + private static XslTransformation saxonService = new XslTransformation(); + + @Override + public File process(File input, byte[] parameters, String survey) throws Exception { + + File outputForFOFile = new File( + input.getPath().replace(Constants.SPECIFIC_TREAT_PDF_EXTENSION, Constants.COVER_PAGE_FO_EXTENSION)); + System.out.println(input.getPath()); + String surveyName = survey; + String formName = getFormName(input); + + InputStream FO_XSL = Constants.getInputStreamFromPath(Constants.TRANSFORMATIONS_COVER_PAGE_FO_4PDF); + + InputStream inputStream = FileUtils.openInputStream(input); + OutputStream outputStream = FileUtils.openOutputStream(outputForFOFile); + + saxonService.transformFOToStep4FO(inputStream, outputStream, FO_XSL, surveyName, formName, parameters); + + inputStream.close(); + outputStream.close(); + FO_XSL.close(); + logger.info("End of InsertCoverPage post-processing " + input.getAbsolutePath()); + + return outputForFOFile; + } + + private String getFormName(File input) { + return FilenameUtils.getBaseName(input.getParentFile().getParent()); + } + +} diff --git a/src/main/java/fr/insee/eno/postprocessing/pdf/PDFInsertEndQuestionPostprocessor.java b/src/main/java/fr/insee/eno/postprocessing/pdf/PDFInsertEndQuestionPostprocessor.java new file mode 100644 index 000000000..d7c630c5f --- /dev/null +++ b/src/main/java/fr/insee/eno/postprocessing/pdf/PDFInsertEndQuestionPostprocessor.java @@ -0,0 +1,51 @@ +package fr.insee.eno.postprocessing.pdf; + +import java.io.File; +import java.io.InputStream; +import java.io.OutputStream; + +import org.apache.commons.io.FileUtils; +import org.apache.commons.io.FilenameUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import fr.insee.eno.Constants; +import fr.insee.eno.postprocessing.Postprocessor; +import fr.insee.eno.transform.xsl.XslTransformation; + +public class PDFInsertEndQuestionPostprocessor implements Postprocessor { + + private static final Logger logger = LoggerFactory.getLogger(PDFInsertEndQuestionPostprocessor.class); + + // FIXME Inject ! + private static XslTransformation saxonService = new XslTransformation(); + + @Override + public File process(File input, byte[] parameters, String survey) throws Exception { + + File outputForFOFile = new File( + input.getPath().replace(Constants.TABLE_COL_SIZE_PDF_EXTENSION, Constants.END_QUESTION_FO_EXTENSION)); + System.out.println(input.getPath()); + String surveyName = survey; + String formName = getFormName(input); + + InputStream FO_XSL = Constants.getInputStreamFromPath(Constants.TRANSFORMATIONS_END_QUESTION_FO_4PDF); + + InputStream inputStream = FileUtils.openInputStream(input); + OutputStream outputStream = FileUtils.openOutputStream(outputForFOFile); + + saxonService.transformFOToStep4FO(inputStream, outputStream, FO_XSL, surveyName, formName, parameters); + + inputStream.close(); + outputStream.close(); + FO_XSL.close(); + logger.info("End of InsertEndQuestion post-processing " + input.getAbsolutePath()); + + return outputForFOFile; + } + + private String getFormName(File input) { + return FilenameUtils.getBaseName(input.getParentFile().getParent()); + } + +} diff --git a/src/main/java/fr/insee/eno/postprocessing/pdf/PDFMailingPostprocessor.java b/src/main/java/fr/insee/eno/postprocessing/pdf/PDFMailingPostprocessor.java new file mode 100644 index 000000000..627fbb9d1 --- /dev/null +++ b/src/main/java/fr/insee/eno/postprocessing/pdf/PDFMailingPostprocessor.java @@ -0,0 +1,40 @@ +package fr.insee.eno.postprocessing.pdf; + +import java.io.File; +import java.io.InputStream; + +import org.apache.commons.io.FileUtils; +import org.apache.commons.io.FilenameUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import fr.insee.eno.Constants; +import fr.insee.eno.postprocessing.Postprocessor; +import fr.insee.eno.transform.xsl.XslTransformation; + +/** + * Customization of FO postprocessor. + */ +public class PDFMailingPostprocessor implements Postprocessor { + + private static final Logger logger = LoggerFactory.getLogger(PDFMailingPostprocessor.class); + + // FIXME Inject ! + private static XslTransformation saxonService = new XslTransformation(); + + @Override + public File process(File input, byte[] parameters, String surveyName) throws Exception { + + File outputForFOFile = new File( + FilenameUtils.removeExtension(input.getPath()) + Constants.MAILING_FO_EXTENSION); + InputStream FO_XSL = Constants.getInputStreamFromPath(Constants.TRANSFORMATIONS_CUSTOMIZATION_FO_4PDF_2); + + saxonService.transformFOToStep1FO(FileUtils.openInputStream(input), + FileUtils.openOutputStream(outputForFOFile), FO_XSL); + FO_XSL.close(); + logger.info("End of Mailing post-processing : "); + + return outputForFOFile; + } + +} diff --git a/src/main/java/fr/insee/eno/postprocessing/pdf/PDFSpecificTreatmentPostprocessor.java b/src/main/java/fr/insee/eno/postprocessing/pdf/PDFSpecificTreatmentPostprocessor.java new file mode 100644 index 000000000..766a255c4 --- /dev/null +++ b/src/main/java/fr/insee/eno/postprocessing/pdf/PDFSpecificTreatmentPostprocessor.java @@ -0,0 +1,49 @@ +package fr.insee.eno.postprocessing.pdf; + +import java.io.File; +import java.io.InputStream; +import java.io.OutputStream; + +import org.apache.commons.io.FileUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import fr.insee.eno.Constants; +import fr.insee.eno.postprocessing.Postprocessor; +import fr.insee.eno.transform.xsl.XslTransformation; + +public class PDFSpecificTreatmentPostprocessor implements Postprocessor { + + private static final Logger logger = LoggerFactory.getLogger(PDFSpecificTreatmentPostprocessor.class); + + // FIXME Inject ! + private static XslTransformation saxonService = new XslTransformation(); + + @Override + public File process(File input, byte[] parameters, String survey) throws Exception { + + File outputForFOFile = new File( + input.getPath().replace(Constants.EDIT_STRUCTURE_FO_EXTENSION, Constants.SPECIFIC_TREAT_PDF_EXTENSION)); + + String sUB_TEMP_FOLDER = Constants.sUB_TEMP_FOLDER(survey); + + InputStream FO_XSL = Constants + .getInputStreamFromPath(sUB_TEMP_FOLDER + Constants.TRANSFORMATIONS_SPECIF_TREATMENT_FO_4PDF); + + //FIXME ajouter la verrue en parametre, si elle est nulle faire ça : + if (FO_XSL == null) { + FO_XSL = Constants.getInputStreamFromPath(Constants.TRANSFORMATIONS_SPECIF_TREATMENT_FO_4PDF); + } + + InputStream inputStream = FileUtils.openInputStream(input); + OutputStream outputStream = FileUtils.openOutputStream(outputForFOFile); + saxonService.transformFOToStep2FO(inputStream, outputStream, FO_XSL); + inputStream.close(); + outputStream.close(); + FO_XSL.close(); + logger.info("End of SpecificTreatment post-processing " + input.getAbsolutePath()); + + return outputForFOFile; + } + +} diff --git a/src/main/java/fr/insee/eno/postprocessing/pdf/PDFTableColumnPostprocessorFake.java b/src/main/java/fr/insee/eno/postprocessing/pdf/PDFTableColumnPostprocessorFake.java new file mode 100644 index 000000000..64dd97b99 --- /dev/null +++ b/src/main/java/fr/insee/eno/postprocessing/pdf/PDFTableColumnPostprocessorFake.java @@ -0,0 +1,32 @@ +package fr.insee.eno.postprocessing.pdf; + +import java.io.File; + +import org.apache.commons.io.FileUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import fr.insee.eno.Constants; +import fr.insee.eno.postprocessing.Postprocessor; + +/** + * PDF postprocessor. + */ +public class PDFTableColumnPostprocessorFake implements Postprocessor { + + private static final Logger logger = LoggerFactory.getLogger(PDFTableColumnPostprocessorFake.class); + + @Override + public File process(File input, byte[] parameters, String survey) throws Exception { + + File outputForFOFile = new File(input.getPath().replace(Constants.MAILING_FO_EXTENSION, + Constants.TABLE_COL_SIZE_PDF_EXTENSION)); + + FileUtils.copyFile(input, outputForFOFile); + + logger.debug("End of TableColumn post-processing (Fake)"); + return outputForFOFile; + + } + +} diff --git a/src/main/resources/xslt/util/ddi/mapping.xsl b/src/main/resources/xslt/util/ddi/mapping.xsl new file mode 100644 index 000000000..ed491ff72 --- /dev/null +++ b/src/main/resources/xslt/util/ddi/mapping.xsl @@ -0,0 +1,91 @@ +<?xml version="1.0" encoding='utf-8'?> +<xsl:transform version="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:d="ddi:datacollection:3_2" + xmlns:r="ddi:reusable:3_2" xmlns:l="ddi:logicalproduct:3_2" xmlns:g="ddi:group:3_2" + xmlns:s="ddi:studyunit:3_2" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xs="http://www.w3.org/2001/XMLSchema"> + <xsl:output method="xml" indent="yes" encoding="UTF-8" /> + <xsl:strip-space elements="*"/> + + <!-- En paramètre le fichier de paramétrage qui contient l'information du besoin des variables Coltrane standards --> + <xsl:param name="parameters-file"/> + <xsl:param name="parameters-node" as="node()" required="no"> + <empty/> + </xsl:param> + + <xsl:variable name="parameters"> + <xsl:choose> + <xsl:when test="$parameters-node/*"> + <xsl:copy-of select="$parameters-node"/> + </xsl:when> + <xsl:otherwise> + <xsl:copy-of select="doc($parameters-file)"/> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + + <xsl:variable name="studyUnit" select="$parameters//StudyUnit"/> + + <xsl:variable name="begin-questions-identification" as="xs:boolean" + select="$parameters//fr-parameters/BeginQuestion/Identification"/> + <xsl:variable name="end-response-time-question" as="xs:boolean" + select="$parameters//fr-parameters/EndQuestion/ResponseTimeQuestion"/> + <xsl:variable name="end-comment-question" as="xs:boolean" + select="$parameters//fr-parameters/EndQuestion/CommentQuestion"/> + + <xd:doc xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl"> + <xd:desc> + <xd:p>Template de racine, on applique les templates de tous les enfants</xd:p> + </xd:desc> + </xd:doc> + <xsl:template match="/"> + <mapping> + <xsl:if test="$begin-questions-identification"> + <Variable name="COMMENT_UE" type="Collected"/> + </xsl:if> + <xsl:apply-templates select="//l:VariableScheme"/> + <xsl:if test="$end-response-time-question"> + <Variable name="HEURE_REMPL" type="Collected"/> + <Variable name="MIN_REMPL" type="Collected"/>* + </xsl:if> + <xsl:if test="$end-comment-question"> + <Variable name="COMMENT_QE" type="Collected"/> + </xsl:if> + </mapping> + </xsl:template> + + <xsl:template match="*"> + <xsl:apply-templates select="node()"/> + </xsl:template> + + <xsl:template match="text()"/> + + <xd:doc xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl"> + <xd:desc> + <xd:p>On fait le mapping identifiant VariableScheme / identifiant QuestionScheme</xd:p> + </xd:desc> + </xd:doc> + <xsl:template match="l:Variable"> + <Variable name="{l:VariableName/r:String/text()}"> + <xsl:attribute name="type"> + <xsl:choose> + <xsl:when test="r:SourceParameterReference and r:QuestionReference"> + <xsl:value-of select="'Collected'"/> + </xsl:when> + <xsl:when test="descendant::r:ProcessingInstructionReference"> + <xsl:value-of select="'Calculated'"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="'External'"/> + </xsl:otherwise> + </xsl:choose> + </xsl:attribute> + </Variable> + </xsl:template> + + <xsl:template match="l:VariableGroup"> + <Group name="{l:VariableGroupName/r:String/text()}" type="l:TypeOfVariableGroup"> + <xsl:apply-templates select="node()"/> + </Group> + </xsl:template> + +</xsl:transform> diff --git a/src/main/resources/xslt/util/fr/coltrane.xsl b/src/main/resources/xslt/util/fr/coltrane.xsl new file mode 100644 index 000000000..70f333484 --- /dev/null +++ b/src/main/resources/xslt/util/fr/coltrane.xsl @@ -0,0 +1,281 @@ +<?xml version="1.0" encoding="UTF-8"?> +<xsl:transform version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:xf="http://www.w3.org/2002/xforms" xmlns:xhtml="http://www.w3.org/1999/xhtml" + xmlns:fr="http://orbeon.org/oxf/xml/form-runner" xmlns:xxf="http://orbeon.org/oxf/xml/xforms" + xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:xs="http://www.w3.org/2001/XMLSchema" + xmlns:boom="boom" exclude-result-prefixes="#all"> + + <xsl:output method="xml" indent="yes" encoding="UTF-8"/> + + <xsl:template match="/"> + <xsl:apply-templates select="*"/> + </xsl:template> + + <xsl:template match="node()"> + <xsl:copy> + <xsl:apply-templates select="node() | @*"/> + </xsl:copy> + </xsl:template> + + <!-- On dégage les commentaires éventuellement inscrits dans le core du formulaire --> + <xsl:template match="comment()[following-sibling::xf:submission]" priority="2"/> + + + + <!--***********************************************Instance de perso, adhérences dans les services eXist***********************************************--> + + <!-- On remplace la partie util de l'instance de perso et les binds associés --> + <xsl:template match="Util[ancestor::xf:instance[@id='fr-form-instance']]"> + <stromae> + <util> + <sectionCourante>1</sectionCourante> + <nomSectionCourante/> + <xsl:apply-templates select="CurrentLoopElement"/> + <expedie>non</expedie> + <extrait>non</extrait> + <dateHeure/> + </util> + <xsl:copy-of select="../perso"/> + </stromae> + </xsl:template> + + <xsl:template match="perso[ancestor::xf:instance[@id='fr-form-instance']]"/> + + <xsl:template match="xf:bind[@id='current-section-name-bind']"> + <xf:bind id="nomSectionCourante-bind" name="nomSectionCourante" + ref="stromae/util/nomSectionCourante"> + <xsl:attribute name="calculate" + select="replace(replace(@calculate,'CurrentSection','sectionCourante'),'/Util/','/stromae/util/')" + /> + </xf:bind> + </xsl:template> + + <!-- La priorité est à -1 en attendant de supprimer le template de remplacement de chaîne plus bas, pour se contenter de remplacer les chaînes de la fonction modifications-perso --> + <xsl:template + match="@*[contains(.,('/Util/')) + or contains(.,('CurrentSectionName')) + or contains(.,('CurrentSection')) + or contains(.,('Send')) + or contains(.,('DateTime'))]" + priority="-1"> + <xsl:attribute name="{name()}" select="boom:modifications-perso(.)"/> + </xsl:template> + + <!-- Fonction de chaîne de remplacement des éléments contenus dans stromae/util --> + <xsl:function name="boom:modifications-perso"> + <xsl:param name="input"/> + <xsl:value-of + select="replace(replace(replace(replace(replace($input, + '/Util/','/stromae/util/'), + 'CurrentSectionName','nomSectionCourante'), + 'CurrentSection','sectionCourante'), + + 'Send','expedie'), + 'DateTime','dateHeure')" + /> + <!--'Send=''false''','expedie=''non'''),--> + </xsl:function> + + <!-- Templates spéciaux, ces attributs ne doivent pas être modifiés, ils correspondent à l'élément Send de l'instance util et non à l'élément Send de l'instance de personnalisation --> + <xsl:template match="@ref[parent::xf:bind[@id='send-bind']]" priority="2"> + <xsl:copy/> + </xsl:template> + <xsl:template match="@ref[parent::xf:label/parent::xf:trigger[@bind='send-bind']]" priority="2"> + <xsl:copy/> + </xsl:template> + + + <!-- Pour certains éléments, on doit aussi remplacer la chaîne false en non (valeur liée l'élément expedie) mais on ne doit pas faire systématiquement ce remplacement, + la chaîne false étant souvent utilisée par ailleurs --> + <xsl:template match="@*" mode="special_translation"> + <xsl:attribute name="{name()}"> + <xsl:variable name="modifie"> + <xsl:value-of select="replace(.,'false','non')"/> + </xsl:variable> + <xsl:value-of select="boom:modifications($modifie)"/> + </xsl:attribute> + </xsl:template> + + <!-- Et on modifie les mentions suivantes de false à non --> + <xsl:template match="@relevant[parent::xf:bind[@id='send-bind' or @id='validation-bind' or @id='confirmation-bind']]" priority="2"> + <xsl:apply-templates select="." mode="special_translation"/> + </xsl:template> + <xsl:template + match="@value[parent::xf:setvalue[parent::xf:action[@ev:event='xforms-submit-error']]]" + priority="2"> + <xsl:apply-templates select="." mode="special_translation"/> + </xsl:template> + <xsl:template match="@if[parent::xxf:show[parent::xf:action[@ev:event='xforms-ready']]]" + priority="2"> + <xsl:apply-templates select="." mode="special_translation"/> + </xsl:template> + + <!--***********************************************Instance de perso, adhérences dans les services eXist***********************************************--> + + + + <!--*****************************Instance de perso, adhérence dans les instances perso déjà en base et dans une css Orbeon*****************************--> + + <!-- On remplace les '-Header-' en '-entete-'. Utilisé dans une css côté Orbeon. --> + <xsl:template + match="*[ancestor::xf:instance[@id='fr-form-instance' or @id='fr-form-loop-model'] and contains(name(),'-Header-')]"> + <xsl:element name="{replace(name(),'\-Header\-','-entete-')}"> + <xsl:apply-templates select="node() | @*"/> + </xsl:element> + </xsl:template> + <xsl:template match="xf:bind[contains(@id,'-Header-')]"> + <xsl:element name="xf:bind"> + <xsl:attribute name="id" select="replace(@id,'\-Header\-','-entete-')"/> + <xsl:attribute name="name" select="replace(@name,'\-Header\-','-entete-')"/> + <xsl:attribute name="ref" select="replace(@ref,'\-Header\-','-entete-')"/> + </xsl:element> + </xsl:template> + <xsl:template match="@*[contains(.,'-Header-')]"> + <xsl:attribute name="{name()}" select="replace(.,'\-Header\-','-entete-')"/> + </xsl:template> + <xsl:template + match="*[ancestor::xf:instance[@id='fr-form-resources'] and contains(name(),'-Header-')]"> + <xsl:element name="{replace(name(),'\-Header\-','-entete-')}"> + <xsl:apply-templates select="node() | @*"/> + </xsl:element> + </xsl:template> + + + <!-- <xsl:template match="@origin[contains(.,'fr-form-loop-model')]" priority="2"> + <xsl:attribute name="origin" + select="replace(.,'fr-form-loop-model','fr-form-modeles')" + /> + </xsl:template>--> + + <xsl:template match="Validation[ancestor::xf:instance[@id='fr-form-instance' or @id='fr-form-util']]"> + <VALIDATION/> + </xsl:template> + <xsl:template match="@*[contains(.,'validation')]"> + <xsl:attribute name="{name()}" select="replace(.,'validation','VALIDATION')"/> + </xsl:template> + <xsl:template match="@*[contains(.,'Validation')]"> + <xsl:attribute name="{name()}" select="replace(.,'Validation','VALIDATION')"/> + </xsl:template> + <xsl:template match="Validation[ancestor::xf:instance[@id='fr-form-resources']]"> + <VALIDATION> + <label>VALIDATION</label> + </VALIDATION> + </xsl:template> + + + <xsl:template match="Confirmation[ancestor::xf:instance[@id='fr-form-instance' or @id='fr-form-util']]"> + <CONFIRMATION/> + </xsl:template> + <xsl:template match="@*[contains(.,'confirmation') and not(contains(.,'confirmationOui')) and not(contains(.,'confirmationNon'))]"> + <xsl:attribute name="{name()}" select="replace(.,'confirmation','CONFIRMATION')"/> + </xsl:template> + <xsl:template match="@*[contains(.,'Confirmation')]"> + <xsl:attribute name="{name()}" select="replace(.,'Confirmation','CONFIRMATION')"/> + </xsl:template> + <xsl:template match="Confirmation[ancestor::xf:instance[@id='fr-form-resources']]"> + <CONFIRMATION> + <label>CONFIRMATION</label> + </CONFIRMATION> + </xsl:template> + + + <xsl:template match="End[ancestor::xf:instance[@id='fr-form-instance' or @id='fr-form-util']]"> + <FIN/> + </xsl:template> + <!-- Il faut être précis dans les libellés modifiés pour éviter de créer descFINant par exemple --> + <xsl:template match="@name[.='end']"> + <xsl:attribute name="name">FIN</xsl:attribute> + </xsl:template> + <xsl:template match="@ref[.='End']"> + <xsl:attribute name="ref">FIN</xsl:attribute> + </xsl:template> + <xsl:template match="@*[contains(.,'end-') and not(contains(.,'send-'))]"> + <xsl:attribute name="{name()}" select="replace(.,'end-','FIN-')"/> + </xsl:template> + <xsl:template match="@*[contains(.,'/End/')]"> + <xsl:attribute name="{name()}" select="replace(.,'/End/','/FIN/')"/> + </xsl:template> + + <xsl:template match="End[ancestor::xf:instance[@id='fr-form-resources']]"> + <FIN> + <label>FIN</label> + </FIN> + </xsl:template> + + <!--*****************************Instance de perso, adhérence dans les instances perso déjà en base et dans une css Orbeon*****************************--> + + + + <!--***********************************************************Pas d'adhérences, remplaçable***********************************************************--> + <!-- Une action qu'on peut réintégrer et appeler lors de l'envoi --> + <xsl:template match="xf:action[@ev:event='submit-form']"/> + + <!--<xsl:template match="xf:instance[@id='fr-form-loop-model']"> + <xf:instance id="fr-form-modeles"> + <xsl:apply-templates select="*"/> + </xf:instance> + </xsl:template> + + <xsl:template match="LoopModels[parent::xf:instance[@id='fr-form-loop-model']]"> + <modeles> + <xsl:apply-templates select="*"/> + </modeles> + </xsl:template>--> + + <!--***********************************************************Pas d'adhérences, remplaçable***********************************************************--> + + <!--********************************Adhérences dans les css (pas les classes, c'est au dessus) ou dans les xslt Orbeon********************************--> + + <!-- Pour l'ensemble des attributs, on procède à certaines modifications de chaînes --> + <xsl:template match="@*"> + <xsl:attribute name="{name()}" select="boom:modifications(.)"/> + <!--<xsl:attribute name="{name()}" select="."/>--> + </xsl:template> + + <!-- Voici une liste de chaînes à remplacer dans les attributs (adhérences dans Orbeon) --> + <xsl:function name="boom:modifications"> + <xsl:param name="input"/> + <xsl:variable name="modifie"> + <xsl:value-of + select="replace(replace(replace(replace(replace(replace( + $input,'PageChangeDone','changementPageEffectue') + ,'page-change-done','ChangementPageEffectif') + ,'page-change','ChangementPage') + ,'section-body','corpsSection') + ,'save','enregistrer') + ,'^submit$','expedier')" + /> + </xsl:variable> + <!-- A la fin, on remplace encore d'autres chaînes --> + <xsl:value-of select="boom:modifications-perso($modifie)"/> + </xsl:function> + + <!-- Cet élément doit être renommé, il y a une adhérence dans readonly.xsl --> + <xsl:template match="PageChangeDone[ancestor::xf:instance[@id='fr-form-util']]"> + <changementPageEffectue/> + </xsl:template> + + <!-- Cet attribut doit être renommé, l'identifiant HTML correspondant est utilisé dans les css Orbeon --> + <!-- <xsl:template match="@id[.='progress-percent' and parent::xf:output]" priority="2"> + <xsl:attribute name="id" select="'pourcentageAvancement'"/> + </xsl:template>--> + + <!-- ATTENTION : si on supprime ces différences et qu'on se cale sur ce qui est fait côté OpenSource (il faut modifier fin.xsl), le HTML généré n'est plus exactement le même pour le texte correspondant --> + <!-- Il ne s'agit donc pas simplement de traduire la classe css côté Orbeon, il faut aussi modifier à la marge le sélecteur pour qu'elle s'applique sur les nouveaux et les anciens questionnaires --> + <xsl:template match="@*[contains(.,'confirmation-message')]" priority="2"> + <xsl:attribute name="{name()}" + select="replace(.,'confirmation\-message','messageConfirmation')"/> + </xsl:template> + <xsl:template match="ConfirmationMessage[ancestor::xf:instance[@id='fr-form-util']]"> + <messageConfirmation/> + </xsl:template> + <xsl:template match="xf:bind[@id='confirmation-message-bind']"> + <xf:bind id="messageConfirmation-bind" ref="messageConfirmation" name="messageConfirmation" + calculate="concat('Votre questionnaire a bien été expédié le ',instance('fr-form-instance')/stromae/util/dateHeure)" + /> + </xsl:template> + <!-- ATTENTION --> + + <!--********************************Adhérences dans les css (pas les classes, c'est au dessus) ou dans les xslt Orbeon********************************--> + +</xsl:transform> diff --git a/src/main/resources/xslt/util/fr/edit-patron.xsl b/src/main/resources/xslt/util/fr/edit-patron.xsl new file mode 100644 index 000000000..6b4d3f1e1 --- /dev/null +++ b/src/main/resources/xslt/util/fr/edit-patron.xsl @@ -0,0 +1,233 @@ +<?xml version="1.0" encoding="UTF-8"?> +<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:xf="http://www.w3.org/2002/xforms" xmlns:xhtml="http://www.w3.org/1999/xhtml" + xmlns:fr="http://orbeon.org/oxf/xml/form-runner" xmlns:xxf="http://orbeon.org/oxf/xml/xforms" + xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:xs="http://www.w3.org/2001/XMLSchema"> + + <xsl:output method="xml" encoding="utf-8"/> + <!-- Transformation pour ajouter la page d'accueil des différents questionnaires --> + + <!-- La campagne --> + <xsl:param name="campagne" as="xs:string"/> + + <!-- Le modèle --> + <xsl:variable name="modele" select="//xf:instance[@id='fr-form-instance']/form/@modele"/> + + <xsl:param name="properties-file"/> + <xsl:param name="parameters-file"/> + <xsl:param name="parameters-node" as="node()" required="no"> + <empty/> + </xsl:param> + + <!-- En paramètre le fichier de paramétrage qui contient les informations provenant de Pilotage --> + <xsl:param name="metadonnees-file"/> + <xsl:param name="metadonnee-node" as="node()" required="no"> + <empty/> + </xsl:param> + + <xsl:variable name="metadonnee"> + <xsl:choose> + <xsl:when test="$metadonnee-node/*"> + <xsl:copy-of select="$metadonnee-node"/> + </xsl:when> + <xsl:otherwise> + <xsl:copy-of select="doc($metadonnees-file)"/> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + + <xsl:variable name="business" select="'business'"/> + <xsl:variable name="household" select="'household'"/> + + <xsl:variable name="properties" select="doc($properties-file)"/> + <xsl:variable name="parameters"> + <xsl:choose> + <xsl:when test="$parameters-node/*"> + <xsl:copy-of select="$parameters-node"/> + </xsl:when> + <xsl:otherwise> + <xsl:copy-of select="doc($parameters-file)"/> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + + <xsl:variable name="campagne-value"> + <xsl:choose> + <xsl:when test="$campagne!=''"> + <xsl:value-of select="$campagne"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="$parameters//Campagne"/> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + + <xsl:variable name="studyUnit"> + <xsl:choose> + <xsl:when test="$parameters//StudyUnit != ''"> + <xsl:value-of select="$parameters//StudyUnit"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="$properties//StudyUnit"/> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + + + + <xsl:variable name="LibelleEnquete" select="$metadonnee/metadonnees/LibelleEnquete"/> + <!-- <xsl:variable name="LibelleSource" select="$parametres/InformationsCollecte/Source/LibelleLong"/> + <xsl:variable name="AnneeCampagne" + select="$parametres/InformationsCollecte/Campagne/AnneeReference"/> + <xsl:variable name="PeriodeCampagne" + select="$parametres/InformationsCollecte/Campagne/PeriodeReference"/> + <xsl:variable name="FrequenceEnquete" + select="$parametres/InformationsCollecte/Source/Frequence/Libelle"/> +--> <!-- La liste des fréquences qui font afficher la période, séparées par des virgules --> + <xsl:variable name="frequences" + select="('mensuelle','trimestrielle','bimestrielle','semestrielle')" as="xs:string *"/> + <xsl:variable name="URLNotice" select="$metadonnee/InformationsCollecte/Enquete/URLNotice"/> + <xsl:variable name="URLSpecimen" select="$metadonnee/InformationsCollecte/Enquete/URLSpecimen"/> + <xsl:variable name="URLDiffusion" select="$metadonnee/InformationsCollecte/Enquete/URLDiffusion"/> + + <xsl:template match="/"> + <xsl:apply-templates select="xhtml:html"/> + </xsl:template> + + <xd:doc xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl"> + <xd:desc> + <xd:p>Template de base pour tous les éléments et tous les attributs, on recopie + simplement en sortie</xd:p> + </xd:desc> + </xd:doc> + <xsl:template match="node() | @*"> + <xsl:copy> + <xsl:apply-templates select="node() | @*"/> + </xsl:copy> + </xsl:template> + + <xsl:template match="xhtml:head"> + <xsl:if test="$studyUnit=$household"> + <xsl:copy> + <xsl:apply-templates select="*[not(name()='xf:model')]"/> + <xsl:apply-templates select="xf:model"/> + </xsl:copy> + </xsl:if> + </xsl:template> + + <!-- On intègre la zone données-pilotage --> + <xsl:template match="xf:bind[@id='fr-form-instance-binds']"> + <xsl:copy> + <xsl:apply-templates select="node() | @*"/> + </xsl:copy> + <!-- Une instance pour éventuellement accueilir les données de Pilotage --> + <xf:instance id="donnees-pilotage"> + <InformationsQuestionnaire> + <xsl:if test="$studyUnit=$business"> + <UniteEnquetee> + <BarreFixe/> + <LabelUniteEnquetee/> + </UniteEnquetee> + </xsl:if> + </InformationsQuestionnaire> + </xf:instance> + <!-- Et le bind correspondant --> + <xf:bind id="donnees-pilotage-binds" ref="instance('donnees-pilotage')"> + <xsl:if test="$studyUnit=$business"> + <xf:bind id="UniteEnquetee-bind" ref="UniteEnquetee"> + <xf:bind id="BarreFixe-bind" ref="BarreFixe"/> + <xf:bind id="LabelUniteEnquetee-bind" ref="LabelUniteEnquetee"/> + </xf:bind> + </xsl:if> + </xf:bind> + </xsl:template> + + <!-- Et on rajoute un label pour l'élément qui affiche les infos de l'unité enquêtée --> + <xsl:template match="resource[ancestor::xf:instance[@id='fr-form-resources']]"> + <xsl:copy> + <xsl:apply-templates select="node() | @*"/> + <xsl:if test="$studyUnit=$business"> + <BarreFixe> + <label>Votre </label> + </BarreFixe> + </xsl:if> + </xsl:copy> + </xsl:template> + + <!-- On rajoute cet élément dans cette div --> + <xsl:template match="xhtml:div[parent::fr:body]"> + <xsl:copy> + <xsl:apply-templates select="@*"/> + <xsl:if test="$studyUnit=$business"> + <xf:output id="BarreFixe-control" bind="BarreFixe-bind"> + <xf:label ref="$form-resources/BarreFixe/label" mediatype="text/html"/> + </xf:output> + </xsl:if> + <xsl:apply-templates select="node()"/> + </xsl:copy> + </xsl:template> + + <!-- On modifie le titre du formulaire --> + <xsl:template + match="xhtml:title | title[parent::metadata[parent::xf:instance[@id='fr-form-metadata']]]"> + <xsl:copy> + <xsl:value-of select="$LibelleEnquete"/> + </xsl:copy> + </xsl:template> + + <!-- On insère la balise perso après la balise util de stromae --> + <xsl:template match="Util[ancestor::xf:instance[@id='fr-form-instance']]"> + <xsl:copy> + <xsl:apply-templates select="node() | @*"/> + </xsl:copy> + <perso/> + </xsl:template> + + <!-- On surcharge la ressource d'enregistrement pour les deux submissions utilisée dans eno-core--> + <xsl:template match="xf:submission[@id='save' or @id='submit']"> + <xsl:copy> + <xsl:apply-templates select="@*"/> + <xsl:variable name="resource"> + <xsl:value-of + select="concat('{xxf:property(''server-exist-orbeon'')}/restxq/{xxf:property(''enregistrer-service'')}/',$campagne-value,'/',$modele,'/{xxf:get-request-parameter(''unite-enquete'')}?ongletproof=oui')" + /> + </xsl:variable> + <xsl:attribute name="resource" select="$resource"/> + <xsl:apply-templates select="node()"/> + </xsl:copy> + </xsl:template> + + <!-- On rajoute une submission pour envoyer un PDF en base juste avant le xforms-ready --> + <xsl:template + match="xf:action[@ev:event='xforms-ready' and following-sibling::*[position()=1 and name()='xf:action' and @ev:event='page-change']]"> + <xf:submission id="expedierPdf" method="post" replace="none"> + <xsl:variable name="resource"> + <xsl:value-of + select="concat('/expedier/',$campagne-value,'/{xxf:get-request-parameter(''unite-enquete'')}?modele=',$modele)" + /> + </xsl:variable> + <xsl:attribute name="resource" select="$resource"/> + </xf:submission> + <xsl:copy> + <xsl:apply-templates select="node() | @*"/> + </xsl:copy> + </xsl:template> + + <!-- On inscrit ces infos dans la partie perso-formulaire. Elles seront réorganisées dans orbeon --> + <xsl:template match="fr:body/xf:switch[@id='section-body']"> + <xhtml:div class="perso-formulaire"> + <xsl:if test="$URLNotice/text()"> + <xhtml:a href="{$URLNotice}" id="URLNotice"/> + </xsl:if> + <xsl:if test="$URLSpecimen/text()"> + <xhtml:a href="{$URLSpecimen}" id="URLSpecimen"/> + </xsl:if> + <xsl:if test="$URLDiffusion/text()"> + <xhtml:a href="{$URLDiffusion}" id="URLDiffusion"/> + </xsl:if> + </xhtml:div> + <xsl:copy> + <xsl:apply-templates select="node() | @*"/> + </xsl:copy> + </xsl:template> +</xsl:stylesheet> \ No newline at end of file diff --git a/src/main/resources/xslt/util/fr/end/end-business.xsl b/src/main/resources/xslt/util/fr/end/end-business.xsl new file mode 100644 index 000000000..57f530b75 --- /dev/null +++ b/src/main/resources/xslt/util/fr/end/end-business.xsl @@ -0,0 +1,347 @@ +<?xml version="1.0" encoding='utf-8'?> +<xsl:transform version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:xf="http://www.w3.org/2002/xforms" xmlns:xhtml="http://www.w3.org/1999/xhtml" + xmlns:fr="http://orbeon.org/oxf/xml/form-runner" xmlns:xxf="http://orbeon.org/oxf/xml/xforms" + xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:xs="http://www.w3.org/2001/XMLSchema"> + + <xsl:output method="xml" encoding="utf-8"/> + <!-- Transformation pour ajouter la page d'accueil des différents questionnaires --> + + <!-- La campagne --> + <xsl:param name="campagne" as="xs:string"/> + <!-- Le modèle --> + <xsl:param name="modele" as="xs:string"/> + + <!-- Fichier de propriétés eno --> + <xsl:param name="fichier-proprietes"/> + + <!-- En paramètre le fichier de paramétrage qui contient les informations provenant de Pilotage --> + <xsl:param name="fichier-parametrage"/> + + <!-- En paramètre le fichier de paramétrage qui contient les informations provenant de Pilotage --> + <xsl:param name="parameters-file"/> + + <xsl:variable name="proprietes" select="doc($fichier-proprietes)"/> + + <xsl:variable name="parametres" select="doc($fichier-parametrage)"/> + + <xsl:variable name="parameter-file-content" select="doc($parameters-file)"/> + + <xsl:variable name="deblocage-questionnaire" select="$parameter-file-content//Deblocage/text()='oui'" as="xs:boolean"/> + + <!-- On récupère ces informations, si le modèle de données change, on pourra simplement modifier cette partie --> + <xsl:variable name="ArticleServiceProducteur" + select="if($parametres/InformationsCollecte/ServiceProducteur/Article/text()='l''') + then($parametres/InformationsCollecte/ServiceProducteur/Article) + else (concat($parametres/InformationsCollecte/ServiceProducteur/Article/text(),' '))"/> + <xsl:variable name="LibelleServiceProducteur" + select="concat($ArticleServiceProducteur,$parametres/InformationsCollecte/ServiceProducteur/Libelle)"/> + + <xsl:template match="/"> + <xsl:apply-templates select="xhtml:html"/> + </xsl:template> + + <xd:doc xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl"> + <xd:desc> + <xd:p>Template de base pour tous les éléments et tous les attributs, on recopie + simplement en sortie</xd:p> + </xd:desc> + </xd:doc> + <xsl:template match="node() | @*"> + <xsl:copy> + <xsl:apply-templates select="node() | @*"/> + </xsl:copy> + </xsl:template> + + <!-- La page de fin générique est remplacée par 3 pages --> + <!-- Côté instance --> + <xsl:template match="End[parent::form[parent::xf:instance[@id='fr-form-instance']]]"> + <Validation/> + <Confirmation/> + <xsl:copy/> + </xsl:template> + + <!-- On rajoute la balise extrait dans Util --> + <xsl:template match="Send[parent::Util/parent::form[parent::xf:instance[@id='fr-form-instance']]]"> + <xsl:copy> + <xsl:apply-templates select="node() | @*"/> + </xsl:copy> + <extrait>non</extrait> + </xsl:template> + + + <!-- Côté bind --> + <xsl:template match="xf:bind[@name='end' and ancestor::xf:bind[@id='fr-form-instance-binds']]"> + <xf:bind id="validation-bind" name="validation" ref="Validation" + relevant="instance('fr-form-instance')/Util/Send='false'"/> + <xf:bind id="confirmation-bind" name="confirmation" ref="Confirmation" + relevant="instance('fr-form-instance')/Util/Send='false'"/> + <xsl:copy> + <xsl:apply-templates select="@*"/> + </xsl:copy> + </xsl:template> + + <!-- Côté ressources --> + <xsl:template match="End[ancestor::xf:instance[@id='fr-form-resources']]"> + <Validation> + <label>VALIDATION</label> + </Validation> + <Confirmation> + <label>CONFIRMATION</label> + </Confirmation> + <xsl:copy> + <xsl:apply-templates select="node() | @*"/> + </xsl:copy> + </xsl:template> + <xsl:template match="GenericEndText[ancestor::xf:instance[@id='fr-form-resources']]"/> + + <!-- Côté pages dans l'instance util --> + <xsl:template match="End[ancestor::xf:instance[@id='fr-form-util']]"> + <Validation/> + <Confirmation/> + <xsl:copy/> + </xsl:template> + + <!-- Et dans le html --> + <xsl:template match="xf:case[fr:section[@name='end']]"> + <xsl:variable name="index"> + <xsl:value-of select="number(@id)"/> + </xsl:variable> + <xsl:variable name="link"> + <xsl:value-of select="'{concat(xxf:property(''url-orbeon''),xxf:property(''lien-deconnexion''))}'"/> + </xsl:variable> + + <xf:case id="{$index}"> + <fr:section id="validation-control" bind="validation-bind" name="validation"> + <xf:label ref="$form-resources/Validation/label"/> + <xhtml:div class="center"> + <xhtml:div class="frame"> + <xhtml:p> + <xhtml:b>Vous êtes arrivé à la fin du questionnaire.</xhtml:b> + </xhtml:p> + <xsl:choose> + <xsl:when test="$deblocage-questionnaire"> + <xhtml:p> + <xhtml:b>Si vous avez terminé de renseigner </xhtml:b>votre questionnaire, vous pouvez : + </xhtml:p> + <xhtml:p class="indentation-with-bullet"> + <xhtml:b> transmettre à nos services </xhtml:b>vos réponses en cliquant ci-dessous sur le bouton : + </xhtml:p> + </xsl:when> + <xsl:otherwise> + <xhtml:p class="indentation-with-bullet"><xhtml:b>Si vous avez terminé de renseigner </xhtml:b>votre questionnaire, + pour le transmettre à nos services, merci de cliquer ci-dessous sur le bouton : "Envoyer".</xhtml:p> + <xhtml:p class="simple-identation"> + <xhtml:b>Une fois le questionnaire envoyé :</xhtml:b> + </xhtml:p> + <xhtml:p class="double-indentation">- vous ne pourrez <xhtml:b>plus modifier vos réponses</xhtml:b> ;</xhtml:p> + <xhtml:p class="double-indentation">- vous pourrez télécharger le <xhtml:b>récapitulatif de vos réponses au format pdf</xhtml:b>.</xhtml:p> + </xsl:otherwise> + </xsl:choose> + <xhtml:div class="center-body"> + <xf:trigger id="send" bind="send-bind"> + <xf:label ref="$form-resources/Send/label"/> + <xf:action ev:event="DOMActivate"> + <xf:setvalue ref="instance('fr-form-util')/cliquable" + value="string('non')"/> + <xf:setvalue ref="instance('fr-form-util')/PreviousNext" + value="1"/> + <xf:dispatch name="page-change-done" + targetid="fr-form-model"/> + </xf:action> + </xf:trigger> + </xhtml:div> + <xsl:choose> + <xsl:when test="$deblocage-questionnaire"> + <xhtml:p class="simple-identation">Une fois transmis il vous sera possible d'expédier à nouveau celui-ci si une modification des réponses vous semble nécessaire.</xhtml:p> + <xhtml:p class="simple-identation">Attention : si vous rouvrez un questionnaire après nous l’avoir transmis, que ce soit pour le modifier ou simplement + le consulter, veillez à nous le transmettre à nouveau (bouton "Envoyer" ci-dessus).</xhtml:p> + <xhtml:p class="indentation-with-bullet"> + <xhtml:b> ne pas transmettre le questionnaire et revenir dès à présent </xhtml:b>sur vos réponses en cliquant sur le bouton :  + "Retour" en bas à droite ou revenir plus tard sur vos réponses en cliquant sur le lien : "Fermer le questionnaire" et en vous authentifiant à nouveau. + </xhtml:p> + <xhtml:p class="simple-identation"> + <xsl:text>Dans ce cas-là, vos données seront enregistrées mais</xsl:text> <xhtml:b><xsl:text>le questionnaire ne sera pas envoyé à</xsl:text> <xsl:value-of select="$LibelleServiceProducteur"/>.</xhtml:b> + </xhtml:p> + </xsl:when> + <xsl:otherwise> + <xhtml:p class="indentation-with-bullet"> + <xhtml:b>Si vous souhaitez y apporter des modifications</xhtml:b>, vous pouvez :</xhtml:p> + <xhtml:p class="double-indentation">- revenir dessus dès à présent en cliquant sur le bouton "Retour" ;</xhtml:p> + <xhtml:p class="double-indentation">- ou plus tard en cliquant sur le bouton "Fermer le questionnaire" et en vous authentifiant à nouveau.</xhtml:p> + <xhtml:p class="double-indentation"><xsl:text>Dans les deux cas, vos données seront enregistrées mais</xsl:text> <xhtml:b><xsl:text>le questionnaire ne sera pas + envoyé à </xsl:text><xsl:value-of select="$LibelleServiceProducteur"/></xhtml:b>.</xhtml:p> + </xsl:otherwise> + </xsl:choose> + <xhtml:p class="center-body"> + <xhtml:a href="{$link}">Fermer le questionnaire</xhtml:a> + </xhtml:p> + </xhtml:div> + </xhtml:div> + </fr:section> + </xf:case> + <xf:case id="{$index+1}"> + <fr:section id="confirmation-control" bind="confirmation-bind" name="confirmation"> + <xf:label ref="$form-resources/Confirmation/label"/> + <xhtml:div class="center center-body"> + <xhtml:div class="frame"> + <xhtml:p> + <xhtml:b>CONFIRMER VOTRE ENVOI</xhtml:b> + </xhtml:p> + <xsl:choose> + <xsl:when test="$deblocage-questionnaire"> + <xhtml:p>Il vous sera possible d'expédier à nouveau celui-ci si une modification des réponses vous semble nécessaire.</xhtml:p> + </xsl:when> + <xsl:otherwise> + <xhtml:p>Votre réponse est définitive et vous souhaitez l'envoyer.</xhtml:p> + </xsl:otherwise> + </xsl:choose> + <xf:trigger bind="confirmationOui-bind"> + <xf:label>Je confirme l'envoi</xf:label> + <xf:action ev:event="DOMActivate"> + <xf:setvalue ref="instance('fr-form-instance')/Util/Send" + value="string('oui')"/> + <xf:setvalue + ref="instance('fr-form-instance')/Util/DateTime" + value="fn:format-dateTime(fn:current-dateTime(),'[D01]-[M01]-[Y0001] à [H01]:[m01]')"/> + <xf:setvalue + ref="instance('fr-form-instance')/Util/CurrentSection" + value="string(number(instance('fr-form-instance')/Util/CurrentSection)+1)"/> + <xf:send submission="submit"/> + <xf:send submission="expedierPdf"/> + </xf:action> + </xf:trigger> + <xf:trigger bind="confirmationNon-bind"> + <xf:label>Ne pas envoyer</xf:label> + <xf:action ev:event="DOMActivate"> + <xf:setvalue ref="instance('fr-form-util')/cliquable" + value="string('oui')"/> + <xf:setvalue ref="instance('fr-form-util')/PreviousNext" + value="-1"/> + <xf:dispatch name="page-change-done" targetid="fr-form-model" + /> + </xf:action> + </xf:trigger> + </xhtml:div> + </xhtml:div> + </fr:section> + </xf:case> + <xf:case id="{$index+2}"> + <fr:section id="end-control" bind="end-bind" name="end"> + <xf:label ref="$form-resources/End/label"/> + <xhtml:div class="center center-body"> + <xhtml:div class="frame"> + <xf:output id="confirmation-message" bind="confirmation-message-bind" + class="confirmation-message" xxf:order="label control hint help alert"/> + <xsl:if test="$deblocage-questionnaire"> + <xf:trigger bind="debloquer-bind" appearance="minimal" class="lienDeblocage"> + <xf:label><xhtml:p>Souhaitez-vous retourner sur votre questionnaire et compléter votre réponse ?</xhtml:p></xf:label> + <xf:action ev:event="DOMActivate"> + <xf:setvalue ref="instance('fr-form-instance')/Util/Send" value="string('non')"/> + <xf:setvalue ref="instance('fr-form-instance')/Util/extrait" value="string('non')"/> + <xsl:for-each select="//xf:instance[@id='fr-form-instance']/form/Util/CurrentLoopElement"> + <xsl:element name="xf:setvalue"> + <xsl:attribute name="ref" select="concat('instance(''fr-form-instance'')/Util/CurrentLoopElement[@loop-name=''',@loop-name,''']')"/> + <xsl:attribute name="value" select="'0'"/> + </xsl:element> + </xsl:for-each> + <xf:setvalue ref="instance('fr-form-util')/cliquable" value="string('oui')"/> + <xf:setvalue ref="instance('fr-form-instance')/Util/CurrentSection" value="1"/> + <xf:toggle case="{string('{instance(''fr-form-instance'')/Util/CurrentSection}')}"/> + <xf:send submission="enregistrer-deblocage"/> + </xf:action> + </xf:trigger> + </xsl:if> + <xhtml:p> + <xhtml:a href="recapitulatifPdf">Télécharger le récapitulatif de vos + réponses au format PDF</xhtml:a>. <xhtml:img + src="{concat('/',$proprietes//images/dossier,'/',$proprietes//images/pdf)}" + /> + </xhtml:p> + <xhtml:p> + <xhtml:b>La Statistique publique vous remercie de votre collaboration à + cette enquête.</xhtml:b> + </xhtml:p> + </xhtml:div> + </xhtml:div> + </fr:section> + </xf:case> + </xsl:template> + + <!-- On rajoute certains éléments liés à la navigation pour ces dernières pages --> + <xsl:template match="Util[parent::xf:instance[@id='fr-form-util']]"> + <xsl:copy> + <xsl:apply-templates select="node() | @*"/> + <confirmationNon/> + <confirmationOui/> + <cliquable/> + <xsl:if test="$deblocage-questionnaire"> + <debloquer/> + </xsl:if> + </xsl:copy> + </xsl:template> + + <!-- Et les binds correspondants --> + <xsl:template match="xf:bind[@id='fr-form-util-binds']"> + <xsl:copy> + <xsl:apply-templates select="node() | @*"/> + <xf:bind id="confirmationNon-bind" ref="confirmationNon"/> + <xf:bind id="confirmationOui-bind" ref="confirmationOui"/> + <xsl:if test="$deblocage-questionnaire"> + <xf:bind id="debloquer-bind" ref="debloquer"/> + </xsl:if> + </xsl:copy> + </xsl:template> + + <!-- On modifie le bind du bouton Envoyer pour éviter qu'on puisse cliquer deux fois de suite --> + <xsl:template match="xf:bind[@id='send-bind']"> + <xsl:copy> + <xsl:apply-templates select="@*"/> + <xsl:attribute name="readonly"> + <xsl:value-of select="'instance(''fr-form-util'')/cliquable=''non'''"/> + </xsl:attribute> + </xsl:copy> + </xsl:template> + + <!-- La submission expedier est modifiée suite à l'enchaînement des pages de fin --> + <!-- Si problème --> + <xsl:template match="xf:action[@ev:event='xforms-submit-error' and parent::xf:submission[@id='submit']]"> + <xsl:copy> + <xsl:apply-templates select="@*"/> + <!-- On diminue l'index de 1 --> + <xf:setvalue ref="instance('fr-form-instance')/Util/CurrentSection" + value="string(number(instance('fr-form-instance')/Util/CurrentSection)-1)"/> + <xsl:apply-templates select="node()"/> + </xsl:copy> + </xsl:template> + <!-- Si la submission est réussie --> + <xsl:template match="xf:action[@ev:event='xforms-submit-done' and parent::xf:submission[@id='submit']]"> + <xsl:copy> + <xsl:apply-templates select="@*"/> + <!-- On change de page --> + <xsl:variable name="choix"> + <xsl:value-of select="'{instance(''fr-form-instance'')/Util/CurrentSection}'"/> + </xsl:variable> + <xf:toggle case="{$choix}"/> + <xf:setfocus control="page-top-control"/> + <xsl:apply-templates select="node()"/> + </xsl:copy> + </xsl:template> + + <!-- la méthode d'enregistrement forcée corrige la méthode classique à la marge --> + + <xsl:template match="xf:submission[@id='save']"> + <xsl:copy> + <xsl:apply-templates select="node() | @*"/> + </xsl:copy> + <xsl:if test="$deblocage-questionnaire"> + <xsl:copy> + <xsl:attribute name="id" select="'enregistrer-deblocage'"/> + <xsl:apply-templates select="@method | @ref | @replace | @relevant"/> + <xsl:attribute name="resource" select="substring-before(@resource,'?')"/> + <xsl:apply-templates select="node()"/> + </xsl:copy> + </xsl:if> + </xsl:template> + +</xsl:transform> diff --git a/src/main/resources/xslt/util/fr/end/end-household.xsl b/src/main/resources/xslt/util/fr/end/end-household.xsl new file mode 100644 index 000000000..dcacf1c00 --- /dev/null +++ b/src/main/resources/xslt/util/fr/end/end-household.xsl @@ -0,0 +1,199 @@ +<?xml version="1.0" encoding='utf-8'?> +<xsl:transform version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:xf="http://www.w3.org/2002/xforms" xmlns:xhtml="http://www.w3.org/1999/xhtml" + xmlns:fr="http://orbeon.org/oxf/xml/form-runner" xmlns:xxf="http://orbeon.org/oxf/xml/xforms" + xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:xs="http://www.w3.org/2001/XMLSchema"> + + <xsl:output method="xml" encoding="utf-8"/> + <!-- Transformation pour ajouter la page d'accueil des différents questionnaires --> + + <!-- La campagne --> + <xsl:param name="campagne" as="xs:string"/> + <!-- Le modèle --> + <xsl:param name="modele" as="xs:string"/> + + <!-- Fichier de propriétés eno --> + <xsl:param name="fichier-proprietes"/> + + <!-- En paramètre le fichier de paramétrage qui contient les informations provenant de Pilotage --> + <xsl:param name="fichier-parametrage"/> + + <!-- En paramètre le fichier de paramétrage qui contient les informations provenant de Pilotage --> + <xsl:param name="parameters-file"/> + + <xsl:variable name="proprietes" select="doc($fichier-proprietes)"/> + + <xsl:variable name="parametres" select="doc($fichier-parametrage)"/> + + <xsl:variable name="parameter-file-content" select="doc($parameters-file)"/> + + <!-- On récupère ces informations, si le modèle de données change, on pourra simplement modifier cette partie --> + + <xsl:template match="/"> + <xsl:apply-templates select="xhtml:html"/> + </xsl:template> + + <xd:doc xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl"> + <xd:desc> + <xd:p>Template de base pour tous les éléments et tous les attributs, on recopie + simplement en sortie</xd:p> + </xd:desc> + </xd:doc> + <xsl:template match="node() | @*"> + <xsl:copy> + <xsl:apply-templates select="node() | @*"/> + </xsl:copy> + </xsl:template> + + <!-- La page de fin générique est remplacée par 3 pages --> + <!-- Côté instance --> + <xsl:template match="End[parent::form[parent::xf:instance[@id='fr-form-instance']]]"> + <Validation/> + <xsl:copy/> + </xsl:template> + + <!-- On rajoute la balise extrait dans Util --> + <xsl:template match="Send[parent::Util/parent::form[parent::xf:instance[@id='fr-form-instance']]]"> + <xsl:copy> + <xsl:apply-templates select="node() | @*"/> + </xsl:copy> + <extrait>non</extrait> + </xsl:template> + + + <!-- Côté bind --> + <xsl:template match="xf:bind[@name='end' and ancestor::xf:bind[@id='fr-form-instance-binds']]"> + <xf:bind id="validation-bind" name="validation" ref="Validation" + relevant="instance('fr-form-instance')/Util/Send='false'"/> + <xsl:copy> + <xsl:apply-templates select="@*"/> + </xsl:copy> + </xsl:template> + + <!-- Côté ressources --> + <xsl:template match="End[ancestor::xf:instance[@id='fr-form-resources']]"> + <Validation> + <label>VALIDATION</label> + </Validation> + <xsl:copy> + <xsl:apply-templates select="node() | @*"/> + </xsl:copy> + </xsl:template> + <xsl:template match="GenericEndText[ancestor::xf:instance[@id='fr-form-resources']]"/> + + <!-- Côté pages dans l'instance util --> + <xsl:template match="End[ancestor::xf:instance[@id='fr-form-util']]"> + <Validation/> + <xsl:copy/> + </xsl:template> + + <!-- Et dans le html --> + <xsl:template match="xf:case[fr:section[@name='end']]"> + <xsl:variable name="index"> + <xsl:value-of select="number(@id)"/> + </xsl:variable> + <xsl:variable name="link"> + <xsl:value-of select="'{concat(xxf:property(''url-orbeon''),xxf:property(''lien-deconnexion''))}'"/> + </xsl:variable> + + <xf:case id="{$index}"> + <fr:section id="validation-control" bind="validation-bind" name="validation"> + <xf:label ref="$form-resources/Validation/label"/> + <xhtml:div class="center"> + <xhtml:div class="frame"> + <xhtml:p> + <xhtml:b>Vous êtes arrivé à la fin du questionnaire.</xhtml:b> + </xhtml:p> + <xhtml:p>Merci de <xhtml:b>cliquer</xhtml:b> sur le bouton "<xhtml:b>Envoyer</xhtml:b>" pour le transmettre à l'Insee.</xhtml:p> + <xhtml:p>Après envoi, vous ne pourrez <xhtml:b>plus modifier vos réponses</xhtml:b>  en ligne.</xhtml:p> + <xhtml:p>Pour toute modification,  <xhtml:b>cliquer</xhtml:b> sur le bouton "<xhtml:b>Retour</xhtml:b>".</xhtml:p> + <xhtml:div class="center-body"> + <xf:trigger id="send" bind="send-bind"> + <xf:label ref="$form-resources/Send/label"/> + <xf:action ev:event="DOMActivate"> + <xf:setvalue ref="instance('fr-form-util')/cliquable" value="string('non')"/> + <xf:setvalue ref="instance('fr-form-util')/PreviousNext" value="1"/> + <xf:setvalue ref="instance('fr-form-instance')/Util/Send" value="string('oui')"/> + <xf:setvalue + ref="instance('fr-form-instance')/Util/DateTime" + value="fn:format-dateTime(fn:current-dateTime(),'[D01]-[M01]-[Y0001] à [H01]:[m01]')"/> + <xf:setvalue + ref="instance('fr-form-instance')/Util/CurrentSection" + value="string(number(instance('fr-form-instance')/Util/CurrentSection)+1)"/> + <xf:send submission="submit"/> + <xf:send submission="expedierPdf"/> + </xf:action> + </xf:trigger> + </xhtml:div> + </xhtml:div> + </xhtml:div> + </fr:section> + </xf:case> + <xf:case id="{$index+1}"> + <fr:section id="end-control" bind="end-bind" name="end"> + <xf:label ref="$form-resources/End/label"/> + <xhtml:div class="center center-body"> + <xhtml:div class="frame"> + <xf:output id="confirmation-message" bind="confirmation-message-bind" + class="confirmation-message" xxf:order="label control hint help alert"/> + <xhtml:p> + <xhtml:b>L'Insee vous remercie de votre collaboration à cette enquête.</xhtml:b> + </xhtml:p> + <xhtml:p> + <xhtml:a href="recapitulatifPdf">Télécharger la preuve de votre participation à l'enquête </xhtml:a>. <xhtml:img + src="/img/pdf.png" + /> + </xhtml:p> + <xhtml:p> + Pour quitter l’enquête, <xhtml:b>cliquer</xhtml:b> sur le bouton "<xhtml:b>Déconnexion</xhtml:b>" + </xhtml:p> + </xhtml:div> + </xhtml:div> + </fr:section> + </xf:case> + </xsl:template> + + <!-- On rajoute certains éléments liés à la navigation pour ces dernières pages --> + <xsl:template match="Util[parent::xf:instance[@id='fr-form-util']]"> + <xsl:copy> + <xsl:apply-templates select="node() | @*"/> + <cliquable/> + </xsl:copy> + </xsl:template> + + <!-- On modifie le bind du bouton Envoyer pour éviter qu'on puisse cliquer deux fois de suite --> + <xsl:template match="xf:bind[@id='send-bind']"> + <xsl:copy> + <xsl:apply-templates select="@*"/> + <xsl:attribute name="readonly"> + <xsl:value-of select="'instance(''fr-form-util'')/cliquable=''non'''"/> + </xsl:attribute> + </xsl:copy> + </xsl:template> + + <!-- La submission expedier est modifiée suite à l'enchaînement des pages de fin --> + <!-- Si problème --> + <xsl:template match="xf:action[@ev:event='xforms-submit-error' and parent::xf:submission[@id='submit']]"> + <xsl:copy> + <xsl:apply-templates select="@*"/> + <!-- On diminue l'index de 1 --> + <xf:setvalue ref="instance('fr-form-instance')/Util/CurrentSection" + value="string(number(instance('fr-form-instance')/Util/CurrentSection)-1)"/> + <xsl:apply-templates select="node()"/> + </xsl:copy> + </xsl:template> + <!-- Si la submission est réussie --> + <xsl:template match="xf:action[@ev:event='xforms-submit-done' and parent::xf:submission[@id='submit']]"> + <xsl:copy> + <xsl:apply-templates select="@*"/> + <!-- On change de page --> + <xsl:variable name="choix"> + <xsl:value-of select="'{instance(''fr-form-instance'')/Util/CurrentSection}'"/> + </xsl:variable> + <xf:toggle case="{$choix}"/> + <xf:setfocus control="page-top-control"/> + <xsl:apply-templates select="node()"/> + </xsl:copy> + </xsl:template> + +</xsl:transform> diff --git a/src/main/resources/xslt/util/fr/fr-specific-treatment.xsl b/src/main/resources/xslt/util/fr/fr-specific-treatment.xsl new file mode 100644 index 000000000..31359a036 --- /dev/null +++ b/src/main/resources/xslt/util/fr/fr-specific-treatment.xsl @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:xs="http://www.w3.org/2001/XMLSchema" + xmlns:fo="http://www.w3.org/1999/XSL/Format" + exclude-result-prefixes="xs" + version="2.0"> + + <xsl:output method="xml" indent="yes" encoding="UTF-8"/> + <xsl:strip-space elements="*"/> + + <xd:doc xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl"> + <xd:desc> + <xd:p>Template de racine, on applique les templates de tous les enfants</xd:p> + </xd:desc> + </xd:doc> + <xsl:template match="/"> + <xsl:apply-templates select="*"/> + </xsl:template> + + <xd:doc xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl"> + <xd:desc> + <xd:p>Template de base pour tous les éléments et tous les attributs, on recopie + simplement en sortie</xd:p> + </xd:desc> + </xd:doc> + <xsl:template match="node() | @*"> + <xsl:copy> + <xsl:apply-templates select="node() | @*"/> + </xsl:copy> + </xsl:template> + +</xsl:stylesheet> \ No newline at end of file diff --git a/src/main/resources/xslt/util/fr/generic-questions/generic-questions-business.xsl b/src/main/resources/xslt/util/fr/generic-questions/generic-questions-business.xsl new file mode 100644 index 000000000..f64177340 --- /dev/null +++ b/src/main/resources/xslt/util/fr/generic-questions/generic-questions-business.xsl @@ -0,0 +1,194 @@ +<?xml version="1.0" encoding='utf-8'?> +<xsl:transform version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:xf="http://www.w3.org/2002/xforms" xmlns:xhtml="http://www.w3.org/1999/xhtml" + xmlns:fr="http://orbeon.org/oxf/xml/form-runner" xmlns:xxf="http://orbeon.org/oxf/xml/xforms" + xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:xs="http://www.w3.org/2001/XMLSchema"> + + <xsl:output method="xml" encoding="utf-8"/> + <!-- Transformation pour ajouter le module d'identification --> + + <!-- En paramètre le fichier de paramétrage qui contient l'information du besoin des variables Coltrane standards --> + <xsl:param name="parameters-file"/> + + <!--<xsl:variable name="type-repondant-coltrane" select="doc($parameters-file)//ColtraneQuestions/TypeRepondantLabel"/>--> + <xsl:variable name="begin-questions" as="xs:boolean" + select="if (doc($parameters-file)//ColtraneQuestions/*[name()='TypeRepondantLabel' or name()='Debut']) then true() else false()"/> + <xsl:variable name="end-questions" as="xs:boolean" + select="if (doc($parameters-file)//ColtraneQuestions/*[name()='TypeRepondantLabel' or name()='Fin']) then true() else false()"/> + + <xsl:template match="/"> + <xsl:apply-templates select="xhtml:html"/> + </xsl:template> + + <xd:doc xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl"> + <xd:desc> + <xd:p>Template de base pour tous les éléments et tous les attributs, on recopie + simplement en sortie</xd:p> + </xd:desc> + </xd:doc> + <xsl:template match="node() | @*"> + <xsl:copy> + <xsl:apply-templates select="node() | @*"/> + </xsl:copy> + </xsl:template> + + <!-- On rajoute des éléments à l'instance principale --> + <xsl:template match="xf:instance[@id='fr-form-instance']/form"> + <xsl:copy> + <xsl:if test="$begin-questions"> + <INSEE-COLTRANE-QUEST-DEBUT> + <INSEE-COLTRANE-SEQ-0-1/> + <COMMENT_UE/> + </INSEE-COLTRANE-QUEST-DEBUT> + </xsl:if> + <xsl:apply-templates select="node()"/> + <xsl:if test="$end-questions"> + <INSEE-COLTRANE-TEMPS> + <INSEE-COLTRANE-TEMPS-QI-1/> + <HEURE_REMPL/> + <MIN_REMPL/> + <COMMENT_QE/> + </INSEE-COLTRANE-TEMPS> + </xsl:if> + </xsl:copy> + </xsl:template> + + <!-- On rajoute des éléments aux binds correspondants --> + <!-- On rajoute des éléments à l'instance principale --> + <xsl:template match="xf:bind[@id='fr-form-instance-binds']"> + + <xsl:copy> + <xsl:apply-templates select="@*"/> + <xsl:if test="$begin-questions"> + <xf:bind id="INSEE-COLTRANE-QUEST-DEBUT-bind" name="INSEE-COLTRANE-QUEST-DEBUT" ref="INSEE-COLTRANE-QUEST-DEBUT"> + <xf:bind id="INSEE-COLTRANE-SEQ-0-1-bind" name="INSEE-COLTRANE-SEQ-0-1" ref="INSEE-COLTRANE-SEQ-0-1"/> + <xf:bind id="COMMENT_UE-bind" name="COMMENT_UE" ref="COMMENT_UE"/> + </xf:bind> + </xsl:if> + <xsl:apply-templates select="node()"/> + <xsl:if test="$end-questions"> + <xf:bind id="INSEE-COLTRANE-TEMPS-bind" name="INSEE-COLTRANE-TEMPS" ref="INSEE-COLTRANE-TEMPS"> + <xf:bind id="INSEE-COLTRANE-TEMPS-QI-1-bind" name="INSEE-COLTRANE-TEMPS-QI-1" ref="INSEE-COLTRANE-TEMPS-QI-1"/> + <xf:bind id="HEURE_REMPL-bind" name="HEURE_REMPL" ref="HEURE_REMPL"> + <xf:constraint value="matches(.,'^[0-9]?[0-9]$') or .=''"/> + </xf:bind> + <xf:bind id="MIN_REMPL-bind" name="MIN_REMPL" ref="MIN_REMPL"> + <xf:constraint value="matches(.,'^[0-5]?[0-9]$') or .=''"/> + </xf:bind> + <xf:bind id="COMMENT_QE-bind" name="COMMENT_QE" ref="COMMENT_QE"/> + </xf:bind> + </xsl:if> + </xsl:copy> + </xsl:template> + + <!-- On rajoute des éléments aux ressources --> + <xsl:template match="xf:instance[@id='fr-form-resources']/resources/resource[@xml:lang='fr']"> + <xsl:copy> + <xsl:apply-templates select="@*"/> + <xsl:if test="$begin-questions"> + <INSEE-COLTRANE-QUEST-DEBUT> + <label>Identification</label> + </INSEE-COLTRANE-QUEST-DEBUT> + <INSEE-COLTRANE-SEQ-0-1> + <label> + <xsl:value-of select="'Identification de votre øLabelUniteEnqueteeø'"/> + </label> + </INSEE-COLTRANE-SEQ-0-1> + <COMMENT_UE> + <label> + <xsl:value-of select="'➡ Remarque, commentaire sur un changement concernant votre øLabelUniteEnqueteeø :'"/> + </label> + </COMMENT_UE> + </xsl:if> + <xsl:apply-templates select="node()"/> + <xsl:if test="$end-questions"> + <INSEE-COLTRANE-TEMPS> + <label>Temps de réponse et commentaires</label> + </INSEE-COLTRANE-TEMPS> + <INSEE-COLTRANE-TEMPS-QI-1> + <label><p>➡ Combien de temps avez-vous mis en tout pour répondre à cette enquête + (recherche des données + remplissage du questionnaire) ?</p></label> + </INSEE-COLTRANE-TEMPS-QI-1> + <HEURE_REMPL> + <alert>Le nombre d'heures doit être compris entre 0 et 99.</alert> + </HEURE_REMPL> + <MIN_REMPL> + <alert>Le nombre de minutes doit être compris entre 0 et 59.</alert> + </MIN_REMPL> + <COMMENT_QE> + <label>➡ Commentaires et remarques éventuelles concernant l’enquête :</label> + </COMMENT_QE> + </xsl:if> + </xsl:copy> + </xsl:template> + + <!-- On rajoute des éléments au niveau de la liste des pages s'il y a une page supplémentaire --> + <xsl:template match="xf:instance[@id='fr-form-util']/Util/Pages/Beginning"> + <xsl:copy> + <xsl:apply-templates select="node() | @*"/> + </xsl:copy> + <xsl:if test="$begin-questions"> + <INSEE-COLTRANE-QUEST-DEBUT/> + </xsl:if> + </xsl:template> + + <xsl:template match="xf:instance[@id='fr-form-util']/Util/Pages/End"> + <xsl:if test="$end-questions"> + <INSEE-COLTRANE-TEMPS/> + </xsl:if> + <xsl:copy> + <xsl:apply-templates select="node() | @*"/> + </xsl:copy> + </xsl:template> + + <!-- Au niveau du body --> + + <xsl:template match="fr:view/fr:body"> + <xsl:copy> + <xsl:apply-templates select="@*"/> + <xsl:if test="$begin-questions"> + <fr:section id="INSEE-COLTRANE-QUEST-DEBUT-control" bind="INSEE-COLTRANE-QUEST-DEBUT-bind" name="INSEE-COLTRANE-QUEST-DEBUT"> + <xf:label ref="$form-resources/INSEE-COLTRANE-QUEST-DEBUT/label"/> + <xhtml:div class="submodule"> + <xhtml:h3> + <xf:output id="INSEE-COLTRANE-SEQ-0-1-control" bind="INSEE-COLTRANE-SEQ-0-1-bind"> + <xf:label ref="$form-resources/INSEE-COLTRANE-SEQ-0-1/label" class="submodule" mediatype="text/html"/> + </xf:output> + </xhtml:h3> + <xf:textarea id="COMMENT_UE-control" name="COMMENT_UE" bind="COMMENT_UE-bind" + class="question text text2000" xxf:order="label control" xxf:maxlength="2000"> + <xf:label ref="$form-resources/COMMENT_UE/label"/> + </xf:textarea> + </xhtml:div> + </fr:section> + </xsl:if> + <xsl:apply-templates select="node()"/> + <xsl:if test="$end-questions"> + <fr:section id="INSEE-COLTRANE-TEMPS-control" bind="INSEE-COLTRANE-TEMPS-bind" name="INSEE-COLTRANE-TEMPS"> + <xf:label ref="$form-resources/INSEE-COLTRANE-TEMPS/label"/> + <xhtml:div class="question"> + <xf:output id="INSEE-COLTRANE-TEMPS-QI-1-control" name="INSEE-COLTRANE-TEMPS-QI-1" bind="INSEE-COLTRANE-TEMPS-QI-1-bind" + class="question" xxf:order="label control"> + <xf:label ref="$form-resources/INSEE-COLTRANE-TEMPS-QI-1/label" mediatype="text/html"/> + </xf:output> + <xf:input id="HEURE_REMPL-control" name="HEURE_REMPL" bind="HEURE_REMPL-bind" + class="duree" xxf:order="control alert" xxf:maxlength="2"> + <xf:alert ref="$form-resources/HEURE_REMPL/alert"/> + </xf:input> + <xhtml:span class="suffixe">heures</xhtml:span> + <xf:input id="MIN_REMPL-control" name="MIN_REMPL" bind="MIN_REMPL-bind" + class="duree" xxf:order="control alert" xxf:maxlength="2"> + <xf:alert ref="$form-resources/MIN_REMPL/alert"/> + </xf:input> + <xhtml:span class="suffixe">minutes</xhtml:span> + </xhtml:div> + <xf:textarea id="COMMENT_QE-control" name="COMMENT_QE" bind="COMMENT_QE-bind" + class="question text text2000" xxf:order="label control" xxf:maxlength="2000"> + <xf:label ref="$form-resources/COMMENT_QE/label"/> + </xf:textarea> + </fr:section> + </xsl:if> + </xsl:copy> + </xsl:template> + +</xsl:transform> diff --git a/src/main/resources/xslt/util/fr/generic-questions/generic-questions-household.xsl b/src/main/resources/xslt/util/fr/generic-questions/generic-questions-household.xsl new file mode 100644 index 000000000..e66ee0d64 --- /dev/null +++ b/src/main/resources/xslt/util/fr/generic-questions/generic-questions-household.xsl @@ -0,0 +1,103 @@ +<?xml version="1.0" encoding='utf-8'?> +<xsl:transform version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:xf="http://www.w3.org/2002/xforms" xmlns:xhtml="http://www.w3.org/1999/xhtml" + xmlns:fr="http://orbeon.org/oxf/xml/form-runner" xmlns:xxf="http://orbeon.org/oxf/xml/xforms" + xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:xs="http://www.w3.org/2001/XMLSchema"> + + <xsl:output method="xml" encoding="utf-8"/> + <!-- Add generic comment question at the end of questionnaire --> + + <xsl:template match="/"> + <xsl:apply-templates select="xhtml:html"/> + </xsl:template> + + <xd:doc xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl"> + <xd:desc> + <xd:p>Generic template for all elements : copy all the elements or attributes, one by one</xd:p> + </xd:desc> + </xd:doc> + <xsl:template match="node() | @*"> + <xsl:copy> + <xsl:apply-templates select="node() | @*"/> + </xsl:copy> + </xsl:template> + + <xd:doc xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl"> + <xd:desc> + <xd:p>Add elements to the main instance</xd:p> + </xd:desc> + </xd:doc> + <xsl:template match="xf:instance[@id='fr-form-instance']/form"> + <xsl:copy> + <xsl:apply-templates select="node()"/> + <INSEE-HOUSEHOLD-COMMENT> + <COMMENT_QE/> + </INSEE-HOUSEHOLD-COMMENT> + </xsl:copy> + </xsl:template> + + <xd:doc xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl"> + <xd:desc> + <xd:p>Add elements to the corresponding bind</xd:p> + </xd:desc> + </xd:doc> + <xsl:template match="xf:bind[@id='fr-form-instance-binds']"> + <xsl:copy> + <xsl:apply-templates select="@*"/> + <xsl:apply-templates select="node()"/> + <xf:bind id="INSEE-HOUSEHOLD-COMMENT-bind" name="INSEE-HOUSEHOLD-COMMENT" ref="INSEE-HOUSEHOLD-COMMENT"> + <xf:bind id="COMMENT_QE-bind" name="COMMENT_QE" ref="COMMENT_QE"/> + </xf:bind> + </xsl:copy> + </xsl:template> + + <xd:doc xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl"> + <xd:desc> + <xd:p>Add elements to french resources</xd:p> + </xd:desc> + </xd:doc> + <xsl:template match="xf:instance[@id='fr-form-resources']/resources/resource[@xml:lang='fr']"> + <xsl:copy> + <xsl:apply-templates select="@*"/> + <xsl:apply-templates select="node()"/> + <INSEE-HOUSEHOLD-COMMENT> + <label>Commentaires</label> + </INSEE-HOUSEHOLD-COMMENT> + <COMMENT_QE> + <label>➡ Commentaires et remarques éventuelles concernant l’enquête :</label> + </COMMENT_QE> + </xsl:copy> + </xsl:template> + + <xd:doc xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl"> + <xd:desc> + <xd:p>Add the new page</xd:p> + </xd:desc> + </xd:doc> + <xsl:template match="xf:instance[@id='fr-form-util']/Util/Pages/End"> + <INSEE-HOUSEHOLD-COMMENT/> + <xsl:copy> + <xsl:apply-templates select="node() | @*"/> + </xsl:copy> + </xsl:template> + + <xd:doc xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl"> + <xd:desc> + <xd:p>Add elements into the body</xd:p> + </xd:desc> + </xd:doc> + <xsl:template match="fr:view/fr:body"> + <xsl:copy> + <xsl:apply-templates select="@*"/> + <xsl:apply-templates select="node()"/> + <fr:section id="INSEE-HOUSEHOLD-COMMENT-control" bind="INSEE-HOUSEHOLD-COMMENT-bind" name="INSEE-HOUSEHOLD-COMMENT"> + <xf:label ref="$form-resources/INSEE-HOUSEHOLD-COMMENT/label"/> + <xf:textarea id="COMMENT_QE-control" name="COMMENT_QE" bind="COMMENT_QE-bind" + class="question text text2000" xxf:order="label control" xxf:maxlength="2000"> + <xf:label ref="$form-resources/COMMENT_QE/label"/> + </xf:textarea> + </fr:section> + </xsl:copy> + </xsl:template> + +</xsl:transform> diff --git a/src/main/resources/xslt/util/fr/identification.xsl b/src/main/resources/xslt/util/fr/identification.xsl new file mode 100644 index 000000000..f45ce1557 --- /dev/null +++ b/src/main/resources/xslt/util/fr/identification.xsl @@ -0,0 +1,190 @@ +<?xml version="1.0" encoding='utf-8'?> +<xsl:transform version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:xf="http://www.w3.org/2002/xforms" xmlns:xhtml="http://www.w3.org/1999/xhtml" + xmlns:fr="http://orbeon.org/oxf/xml/form-runner" xmlns:xxf="http://orbeon.org/oxf/xml/xforms" + xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:xs="http://www.w3.org/2001/XMLSchema"> + + <xsl:output method="xml" encoding="utf-8"/> + <!-- Transformation pour ajouter le module d'identification --> + + <!-- On détermine quelle est la page d'identification --> + <xsl:variable name="nomPageId"> + <xsl:value-of select="//xf:instance[@id='fr-form-instance']/form/Beginning/following-sibling::*[name()!='Groupe' and name()!='Variable'][1]/name()"/> + </xsl:variable> + + <!-- Lorsque les éléments d'identification sont mis à la fin du premier module, leurs labels sont mis juste avant le 2° module --> + <xsl:variable name="nomPageSuivanteId"> + <xsl:value-of select="//xf:instance[@id='fr-form-instance']/form/*[name()=$nomPageId]/following-sibling::*[name()!='Groupe' and name()!='Variable'][1]/name()"/> + </xsl:variable> +<!-- + <xsl:variable name="nbParagraphesPageId"> + <xsl:value-of select="count(//fr:section[@name=$nomPageId]//xhtml:div[@class='submodule'])"/> + </xsl:variable> +--> + <xsl:template match="/"> + <xsl:apply-templates select="xhtml:html"/> + </xsl:template> + + <xd:doc xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl"> + <xd:desc> + <xd:p>Template de base pour tous les éléments et tous les attributs, on recopie + simplement en sortie</xd:p> + </xd:desc> + </xd:doc> + <xsl:template match="node() | @*"> + <xsl:copy> + <xsl:apply-templates select="node() | @*"/> + </xsl:copy> + </xsl:template> + + <!-- On rajoute des éléments à l'instance principale --> + <xsl:template + match="*[parent::form[parent::xf:instance[@id='fr-form-instance']] and name()=$nomPageId]"> + <xsl:copy> + <xsl:apply-templates select="node() | @*"/> + <Identification/> + <Identification-1/> + <Identification-2/> + <Identification-3/> + </xsl:copy> + </xsl:template> + + <!-- On rajoute des éléments aux binds correspondants --> + <!-- On rajoute des éléments à l'instance principale --> + <xsl:template + match="xf:bind[@name=$nomPageId and ancestor::xf:bind[@id='fr-form-instance-binds']]"> + <xsl:copy> + <xsl:apply-templates select="node() | @*"/> + <xf:bind id="Identification-bind" name="Identification" ref="Identification"/> + <xf:bind id="Identification-1-bind" name="Identification-1" ref="Identification-1"/> + <xf:bind id="Identification-2-bind" name="Identification-2" ref="Identification-2"/> + <xf:bind id="Identification-3-bind" name="Identification-3" ref="Identification-3"/> + </xsl:copy> + </xsl:template> + + <!-- On rajoute des éléments à l'instance des données de pilotage --> + <xsl:template match="xf:instance[@id='donnees-pilotage']/InformationsQuestionnaire"> + <xsl:copy> + <xsl:apply-templates select="node()[name() !='UniteEnquetee'] | @*"/> + <Contact> + <Nom/> + <Mel/> + <Telephone/> + <Adresse> + <ComplementAdresse/> + <MentionSpeciale/> + <LibellePays/> + <InformationsVoie/> + <Ville/> + </Adresse> + </Contact> + <xsl:apply-templates select="UniteEnquetee"/> + </xsl:copy> + </xsl:template> + + <!-- On rajoute des éléments aux binds correspondants --> + <xsl:template match="xf:bind[@id='donnees-pilotage-binds']"> + <xsl:copy> + <xsl:apply-templates select="node()[@id !='UniteEnquetee-bind'] | @*"/> + <xf:bind id="Contact-bind" ref="Contact"> + <xf:bind id="Nom-bind" ref="Nom"/> + <xf:bind id="Mel-bind" ref="Mel"/> + <xf:bind id="Telephone-bind" ref="Telephone"/> + <xf:bind id="Adresse-bind" ref="Adresse"> + <xf:bind id="ComplementAdresse-bind" ref="ComplementAdresse"/> + <xf:bind id="MentionSpeciale-bind" ref="MentionSpeciale"/> + <xf:bind id="LibellePays-bind" ref="LibellePays"/> + <xf:bind id="InformationsVoie-bind" ref="InformationsVoie"/> + <xf:bind id="Ville-bind" ref="Ville"/> + </xf:bind> + </xf:bind> + <xsl:apply-templates select="xf:bind[@id ='UniteEnquetee-bind']"/> + </xsl:copy> + </xsl:template> + + <!-- On rajoute des éléments aux ressources --> + <xsl:template match="xf:instance[@id='fr-form-resources']/resources/resource/*[name()=$nomPageSuivanteId]"> + <Identification> + <label>Identification de la personne</label> + <!--<label><xsl:value-of select="$nbParagraphesPageId+1"/>. Identification de la personne</label>--> + </Identification> + <Identification-1> + <label>Afin de bénéficier pleinement des services proposés + dans le cadre de la réponse en ligne aux enquêtes de la statistique publique, + nous vous invitons à vérifier que les coordonnées du contact répondant à + l'enquête, rappelées ci-dessous, sont bien à jour. L'adresse de messagerie est + en particulier nécessaire en cas de réinitialisation en ligne du mot de passe.</label> + </Identification-1> + <Identification-2> + <label><b>Vos informations personnelles : </b></label> + </Identification-2> + <Identification-3> + <label><b>Vos coordonnées postales : </b></label> + </Identification-3> + <Nom> + <label>Nom :</label> + </Nom> + <Mel> + <label>Mél :</label> + </Mel> + <Telephone> + <label>Téléphone :</label> + </Telephone> + <xsl:copy> + <xsl:apply-templates select="node() | @*"/> + </xsl:copy> + </xsl:template> + + <!-- Au niveau du body --> + <xsl:template match="fr:section[@name=$nomPageId]"> + <xsl:copy> + <xsl:apply-templates select="node() | @*"/> + <xhtml:div class="submodule"> + <xhtml:h3> + <xf:output id="Identification-control" bind="Identification-bind"> + <xf:label ref="$form-resources/Identification/label" class="submodule" mediatype="text/html"/> + </xf:output> + </xhtml:h3> + <xhtml:div class="framePerso"> + <xf:output id="Identification-1-control" bind="Identification-1-bind"> + <xf:label ref="$form-resources/Identification-1/label" class="submodule" mediatype="text/html"/> + </xf:output> + </xhtml:div> + <xhtml:div class="framePerso"> + <xf:output id="Identification-2-control" bind="Identification-2-bind"> + <xf:label ref="$form-resources/Identification-2/label" class="submodule" mediatype="text/html"/> + </xf:output> + <xf:output id="Nom-control" bind="Nom-bind"> + <xf:label ref="$form-resources/Nom/label" mediatype="text/html"/> + </xf:output> + <xf:output id="Mel-control" bind="Mel-bind"> + <xf:label ref="$form-resources/Mel/label" mediatype="text/html"/> + </xf:output> + <xf:output id="Telephone-control" bind="Telephone-bind"> + <xf:label ref="$form-resources/Telephone/label" mediatype="text/html"/> + </xf:output> + </xhtml:div> + <xhtml:div class="framePerso"> + <xf:output id="Identification-3-control" bind="Identification-3-bind"> + <xf:label ref="$form-resources/Identification-3/label" class="submodule" mediatype="text/html"/> + </xf:output> + <xf:output id="ComplementAdresse-control" bind="ComplementAdresse-bind"/> + <xf:output id="InformationsVoie-control" bind="InformationsVoie-bind"/> + <xf:output id="MentionSpeciale-control" bind="MentionSpeciale-bind"/> + <xf:output id="Ville-control" bind="Ville-bind"/> + <xf:output id="LibellePays-control" bind="LibellePays-bind"/> + </xhtml:div> + <xhtml:div class="framePerso"> + <!-- Dépend de l'environnement, configuré dans orbeon --> + <xsl:variable name="lien" + select="string('{concat(xxf:property(''url-portail''),xxf:property(''mon-compte''))}')"/> + <xhtml:p> + <xhtml:b>Pour renseigner ou mettre à jour vos coordonnées</xhtml:b>, cliquez + sur ce lien : <xhtml:a href="{$lien}" target="_blank">Mon + compte</xhtml:a>.</xhtml:p> + </xhtml:div> + </xhtml:div> + </xsl:copy> + </xsl:template> + +</xsl:transform> diff --git a/src/main/resources/xslt/util/fr/insert-end.xsl b/src/main/resources/xslt/util/fr/insert-end.xsl new file mode 100644 index 000000000..a5f80e7ec --- /dev/null +++ b/src/main/resources/xslt/util/fr/insert-end.xsl @@ -0,0 +1,450 @@ +<?xml version="1.0" encoding="UTF-8"?> +<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:xf="http://www.w3.org/2002/xforms" xmlns:xhtml="http://www.w3.org/1999/xhtml" + xmlns:fr="http://orbeon.org/oxf/xml/form-runner" xmlns:xxf="http://orbeon.org/oxf/xml/xforms" + xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:xs="http://www.w3.org/2001/XMLSchema"> + + <xsl:param name="properties-file"/> + <xsl:param name="parameters-file"/> + <xsl:param name="parameters-node" as="node()" required="no"> + <empty/> + </xsl:param> + + <xsl:variable name="business" select="'business'"/> + <xsl:variable name="household" select="'household'"/> + + <xsl:variable name="properties" select="doc($properties-file)"/> + <xsl:variable name="parameters"> + <xsl:choose> + <xsl:when test="$parameters-node/*"> + <xsl:copy-of select="$parameters-node"/> + </xsl:when> + <xsl:otherwise> + <xsl:copy-of select="doc($parameters-file)"/> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + + <xsl:variable name="studyUnit"> + <xsl:choose> + <xsl:when test="$parameters//StudyUnit != ''"> + <xsl:value-of select="$parameters//StudyUnit"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="$properties//StudyUnit"/> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + <xsl:variable name="deblocage-questionnaire" select="$parameters//Deblocage" as="xs:boolean"/> + <!-- metadonnees : donnees-pilotage --> + <xsl:param name="metadonnees-file"/> + <xsl:param name="metadonnee-node" as="node()" required="no"> + <empty/> + </xsl:param> + + <xsl:variable name="metadonnee"> + <xsl:choose> + <xsl:when test="$metadonnee-node/*"> + <xsl:copy-of select="$metadonnee-node"/> + </xsl:when> + <xsl:otherwise> + <xsl:copy-of select="doc($metadonnees-file)"/> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + + + + <!-- On récupère ces informations, si le modèle de données change, on pourra simplement modifier cette partie --> + <xsl:variable name="ArticleServiceProducteur" + select="if($metadonnee/InformationsCollecte/ServiceProducteur/Article/text()='l''') + then($metadonnee/InformationsCollecte/ServiceProducteur/Article) + else (concat($metadonnee/InformationsCollecte/ServiceProducteur/Article/text(),' '))"/> + <xsl:variable name="LibelleServiceProducteur" + select="concat($ArticleServiceProducteur,$metadonnee/InformationsCollecte/ServiceProducteur/Libelle)"/> + + <xsl:template match="/"> + <xsl:apply-templates select="xhtml:html"/> + </xsl:template> + + <xd:doc xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl"> + <xd:desc> + <xd:p>Template de base pour tous les éléments et tous les attributs, on recopie + simplement en sortie</xd:p> + </xd:desc> + </xd:doc> + <xsl:template match="node() | @*"> + <xsl:copy> + <xsl:apply-templates select="node() | @*"/> + </xsl:copy> + </xsl:template> + + <!-- La page de fin générique est remplacée par 3 pages --> + <!-- Côté instance --> + <xsl:template match="End[parent::form[parent::xf:instance[@id='fr-form-instance']]]"> + <Validation/> + <xsl:if test="$studyUnit=$business"> + <Confirmation/> + </xsl:if> + <xsl:copy/> + </xsl:template> + + <!-- On rajoute la balise extrait dans Util --> + <xsl:template match="Send[parent::Util/parent::form[parent::xf:instance[@id='fr-form-instance']]]"> + <xsl:copy> + <xsl:apply-templates select="node() | @*"/> + </xsl:copy> + <extrait>non</extrait> + </xsl:template> + + <!-- Côté bind --> + <xsl:template match="xf:bind[@name='end' and ancestor::xf:bind[@id='fr-form-instance-binds']]"> + <xf:bind id="validation-bind" name="validation" ref="Validation" + relevant="instance('fr-form-instance')/Util/Send='false'"/> + <xsl:if test="$studyUnit=$business"> + <xf:bind id="confirmation-bind" name="confirmation" ref="Confirmation" + relevant="instance('fr-form-instance')/Util/Send='false'"/> + </xsl:if> + <xsl:copy> + <xsl:apply-templates select="@*"/> + </xsl:copy> + </xsl:template> + + <!-- Côté ressources --> + <xsl:template match="End[ancestor::xf:instance[@id='fr-form-resources']]"> + <Validation> + <label>VALIDATION</label> + </Validation> + <xsl:if test="$studyUnit=$business"> + <Confirmation> + <label>CONFIRMATION</label> + </Confirmation> + </xsl:if> + <xsl:copy> + <xsl:apply-templates select="node() | @*"/> + </xsl:copy> + </xsl:template> + <xsl:template match="GenericEndText[ancestor::xf:instance[@id='fr-form-resources']]"/> + + <!-- Côté pages dans l'instance util --> + <xsl:template match="End[ancestor::xf:instance[@id='fr-form-util']]"> + <Validation/> + <xsl:if test="$studyUnit=$business"> + <Confirmation/> + </xsl:if> + <xsl:copy/> + </xsl:template> + + <!-- Et dans le html --> + <xsl:template match="xf:case[fr:section[@name='end']]"> + <xsl:variable name="index"> + <xsl:value-of select="number(@id)"/> + </xsl:variable> + <xsl:variable name="link"> + <xsl:value-of select="'{concat(xxf:property(''url-orbeon''),xxf:property(''lien-deconnexion''))}'"/> + </xsl:variable> + + <xf:case id="{$index}"> + <xsl:if test="$studyUnit=$business"> + <fr:section id="validation-control" bind="validation-bind" name="validation"> + <xf:label ref="$form-resources/Validation/label"/> + <xhtml:div class="center"> + <xhtml:div class="frame"> + <xhtml:p> + <xhtml:b>Vous êtes arrivé à la fin du questionnaire.</xhtml:b> + </xhtml:p> + <xsl:choose> + <xsl:when test="$deblocage-questionnaire"> + <xhtml:p> + <xhtml:b>Si vous avez terminé de renseigner </xhtml:b>votre questionnaire, vous pouvez : + </xhtml:p> + <xhtml:p class="indentation-with-bullet"> + <xhtml:b> transmettre à nos services </xhtml:b>vos réponses en cliquant ci-dessous sur le bouton : + </xhtml:p> + </xsl:when> + <xsl:otherwise> + <xhtml:p class="indentation-with-bullet"><xhtml:b>Si vous avez terminé de renseigner </xhtml:b>votre questionnaire, + pour le transmettre à nos services, merci de cliquer ci-dessous sur le bouton : "Envoyer".</xhtml:p> + <xhtml:p class="simple-identation"> + <xhtml:b>Une fois le questionnaire envoyé :</xhtml:b> + </xhtml:p> + <xhtml:p class="double-indentation">- vous ne pourrez <xhtml:b>plus modifier vos réponses</xhtml:b> ;</xhtml:p> + <xhtml:p class="double-indentation">- vous pourrez télécharger le <xhtml:b>récapitulatif de vos réponses au format pdf</xhtml:b>.</xhtml:p> + </xsl:otherwise> + </xsl:choose> + <xhtml:div class="center-body"> + <xf:trigger id="send" bind="send-bind"> + <xf:label ref="$form-resources/Send/label"/> + <xf:action ev:event="DOMActivate"> + <xf:setvalue ref="instance('fr-form-util')/cliquable" + value="string('non')"/> + <xf:setvalue ref="instance('fr-form-util')/PreviousNext" + value="1"/> + <xf:dispatch name="page-change-done" + targetid="fr-form-model"/> + </xf:action> + </xf:trigger> + </xhtml:div> + <xsl:choose> + <xsl:when test="$deblocage-questionnaire"> + <xhtml:p class="simple-identation">Une fois transmis il vous sera possible d'expédier à nouveau celui-ci si une modification des réponses vous semble nécessaire.</xhtml:p> + <xhtml:p class="simple-identation">Attention : si vous rouvrez un questionnaire après nous l’avoir transmis, que ce soit pour le modifier ou simplement + le consulter, veillez à nous le transmettre à nouveau (bouton "Envoyer" ci-dessus).</xhtml:p> + <xhtml:p class="indentation-with-bullet"> + <xhtml:b> ne pas transmettre le questionnaire et revenir dès à présent </xhtml:b>sur vos réponses en cliquant sur le bouton :  + "Retour" en bas à droite ou revenir plus tard sur vos réponses en cliquant sur le lien : "Fermer le questionnaire" et en vous authentifiant à nouveau. + </xhtml:p> + <xhtml:p class="simple-identation"> + <xsl:text>Dans ce cas-là, vos données seront enregistrées mais</xsl:text> <xhtml:b><xsl:text>le questionnaire ne sera pas envoyé à</xsl:text> <xsl:value-of select="$LibelleServiceProducteur"/>.</xhtml:b> + </xhtml:p> + </xsl:when> + <xsl:otherwise> + <xhtml:p class="indentation-with-bullet"> + <xhtml:b>Si vous souhaitez y apporter des modifications</xhtml:b>, vous pouvez :</xhtml:p> + <xhtml:p class="double-indentation">- revenir dessus dès à présent en cliquant sur le bouton "Retour" ;</xhtml:p> + <xhtml:p class="double-indentation">- ou plus tard en cliquant sur le bouton "Fermer le questionnaire" et en vous authentifiant à nouveau.</xhtml:p> + <xhtml:p class="double-indentation"><xsl:text>Dans les deux cas, vos données seront enregistrées mais</xsl:text> <xhtml:b><xsl:text>le questionnaire ne sera pas + envoyé à </xsl:text><xsl:value-of select="$LibelleServiceProducteur"/></xhtml:b>.</xhtml:p> + </xsl:otherwise> + </xsl:choose> + <xhtml:p class="center-body"> + <xhtml:a href="{$link}">Fermer le questionnaire</xhtml:a> + </xhtml:p> + </xhtml:div> + </xhtml:div> + </fr:section> + </xsl:if> + <xsl:if test="$studyUnit=$household"> + <fr:section id="validation-control" bind="validation-bind" name="validation"> + <xf:label ref="$form-resources/Validation/label"/> + <xhtml:div class="center"> + <xhtml:div class="frame"> + <xhtml:p> + <xhtml:b>Vous êtes arrivé à la fin du questionnaire.</xhtml:b> + </xhtml:p> + <xhtml:p>Merci de <xhtml:b>cliquer</xhtml:b> sur le bouton "<xhtml:b>Envoyer</xhtml:b>" pour le transmettre à l'Insee.</xhtml:p> + <xhtml:p>Après envoi, vous ne pourrez <xhtml:b>plus modifier vos réponses</xhtml:b>  en ligne.</xhtml:p> + <xhtml:p>Pour toute modification,  <xhtml:b>cliquer</xhtml:b> sur le bouton "<xhtml:b>Retour</xhtml:b>".</xhtml:p> + <xhtml:div class="center-body"> + <xf:trigger id="send" bind="send-bind"> + <xf:label ref="$form-resources/Send/label"/> + <xf:action ev:event="DOMActivate"> + <xf:setvalue ref="instance('fr-form-util')/cliquable" value="string('non')"/> + <xf:setvalue ref="instance('fr-form-util')/PreviousNext" value="1"/> + <xf:setvalue ref="instance('fr-form-instance')/Util/Send" value="string('oui')"/> + <xf:setvalue + ref="instance('fr-form-instance')/Util/DateTime" + value="fn:format-dateTime(fn:current-dateTime(),'[D01]-[M01]-[Y0001] à [H01]:[m01]')"/> + <xf:setvalue + ref="instance('fr-form-instance')/Util/CurrentSection" + value="string(number(instance('fr-form-instance')/Util/CurrentSection)+1)"/> + <xf:send submission="submit"/> + <xf:send submission="expedierPdf"/> + </xf:action> + </xf:trigger> + </xhtml:div> + </xhtml:div> + </xhtml:div> + </fr:section> + </xsl:if> + </xf:case> + + <xf:case id="{$index+1}"> + <xsl:if test="$studyUnit=$business"> + <fr:section id="confirmation-control" bind="confirmation-bind" name="confirmation"> + <xf:label ref="$form-resources/Confirmation/label"/> + <xhtml:div class="center center-body"> + <xhtml:div class="frame"> + <xhtml:p> + <xhtml:b>CONFIRMER VOTRE ENVOI</xhtml:b> + </xhtml:p> + <xsl:choose> + <xsl:when test="$deblocage-questionnaire"> + <xhtml:p>Il vous sera possible d'expédier à nouveau celui-ci si une modification des réponses vous semble nécessaire.</xhtml:p> + </xsl:when> + <xsl:otherwise> + <xhtml:p>Votre réponse est définitive et vous souhaitez l'envoyer.</xhtml:p> + </xsl:otherwise> + </xsl:choose> + <xf:trigger bind="confirmationOui-bind"> + <xf:label>Je confirme l'envoi</xf:label> + <xf:action ev:event="DOMActivate"> + <xf:setvalue ref="instance('fr-form-instance')/Util/Send" + value="string('oui')"/> + <xf:setvalue + ref="instance('fr-form-instance')/Util/DateTime" + value="fn:format-dateTime(fn:current-dateTime(),'[D01]-[M01]-[Y0001] à [H01]:[m01]')"/> + <xf:setvalue + ref="instance('fr-form-instance')/Util/CurrentSection" + value="string(number(instance('fr-form-instance')/Util/CurrentSection)+1)"/> + <xf:send submission="submit"/> + <xf:send submission="expedierPdf"/> + </xf:action> + </xf:trigger> + <xf:trigger bind="confirmationNon-bind"> + <xf:label>Ne pas envoyer</xf:label> + <xf:action ev:event="DOMActivate"> + <xf:setvalue ref="instance('fr-form-util')/cliquable" + value="string('oui')"/> + <xf:setvalue ref="instance('fr-form-util')/PreviousNext" + value="-1"/> + <xf:dispatch name="page-change-done" targetid="fr-form-model" + /> + </xf:action> + </xf:trigger> + </xhtml:div> + </xhtml:div> + </fr:section> + </xsl:if> + <xsl:if test="$studyUnit=$household"> + <fr:section id="end-control" bind="end-bind" name="end"> + <xf:label ref="$form-resources/End/label"/> + <xhtml:div class="center center-body"> + <xhtml:div class="frame"> + <xf:output id="confirmation-message" bind="confirmation-message-bind" + class="confirmation-message" xxf:order="label control hint help alert"/> + <xhtml:p> + <xhtml:b>L'Insee vous remercie de votre collaboration à cette enquête.</xhtml:b> + </xhtml:p> + <xhtml:p> + <xhtml:a href="recapitulatifPdf">Télécharger la preuve de votre participation à l'enquête </xhtml:a>. <xhtml:img + src="/img/pdf.png" + /> + </xhtml:p> + <xhtml:p> + Pour quitter l’enquête, <xhtml:b>cliquer</xhtml:b> sur le bouton "<xhtml:b>Déconnexion</xhtml:b>" + </xhtml:p> + </xhtml:div> + </xhtml:div> + </fr:section> + </xsl:if> + </xf:case> + + <xf:case id="{$index+2}"> + <xsl:if test="$studyUnit=$business"> + <fr:section id="end-control" bind="end-bind" name="end"> + <xf:label ref="$form-resources/End/label"/> + <xhtml:div class="center center-body"> + <xhtml:div class="frame"> + <xf:output id="confirmation-message" bind="confirmation-message-bind" + class="confirmation-message" xxf:order="label control hint help alert"/> + <xsl:if test="$deblocage-questionnaire"> + <xf:trigger bind="debloquer-bind" appearance="minimal" class="lienDeblocage"> + <xf:label><xhtml:p>Souhaitez-vous retourner sur votre questionnaire et compléter votre réponse ?</xhtml:p></xf:label> + <xf:action ev:event="DOMActivate"> + <xf:setvalue ref="instance('fr-form-instance')/Util/Send" value="string('non')"/> + <xf:setvalue ref="instance('fr-form-instance')/Util/extrait" value="string('non')"/> + <xsl:for-each select="//xf:instance[@id='fr-form-instance']/form/Util/CurrentLoopElement"> + <xsl:element name="xf:setvalue"> + <xsl:attribute name="ref" select="concat('instance(''fr-form-instance'')/Util/CurrentLoopElement[@loop-name=''',@loop-name,''']')"/> + <xsl:attribute name="value" select="'0'"/> + </xsl:element> + </xsl:for-each> + <xf:setvalue ref="instance('fr-form-util')/cliquable" value="string('oui')"/> + <xf:setvalue ref="instance('fr-form-instance')/Util/CurrentSection" value="1"/> + <xf:toggle case="{string('{instance(''fr-form-instance'')/Util/CurrentSection}')}"/> + <xf:send submission="enregistrer-deblocage"/> + </xf:action> + </xf:trigger> + </xsl:if> + <xhtml:p> + <xhtml:a href="recapitulatifPdf">Télécharger le récapitulatif de vos + réponses au format PDF</xhtml:a>. <xhtml:img + src="{concat('/',$properties//images/dossier,'/',$properties//images/pdf)}" + /> + </xhtml:p> + <xhtml:p> + <xhtml:b>La Statistique publique vous remercie de votre collaboration à + cette enquête.</xhtml:b> + </xhtml:p> + </xhtml:div> + </xhtml:div> + </fr:section> + </xsl:if> + </xf:case> + </xsl:template> + + <!-- On rajoute certains éléments liés à la navigation pour ces dernières pages --> + <xsl:template match="Util[parent::xf:instance[@id='fr-form-util']]"> + <xsl:copy> + <xsl:apply-templates select="node() | @*"/> + <xsl:if test="$studyUnit=$business"> + <confirmationNon/> + <confirmationOui/> + </xsl:if> + <cliquable/> + <xsl:if test="$studyUnit=$business and $deblocage-questionnaire"> + <debloquer/> + </xsl:if> + </xsl:copy> + </xsl:template> + + <!-- Et les binds correspondants --> + <xsl:template match="xf:bind[@id='fr-form-util-binds']"> + <xsl:if test="$studyUnit=$business"> + <xsl:copy> + <xsl:apply-templates select="node() | @*"/> + <xf:bind id="confirmationNon-bind" ref="confirmationNon"/> + <xf:bind id="confirmationOui-bind" ref="confirmationOui"/> + <xsl:if test="$deblocage-questionnaire"> + <xf:bind id="debloquer-bind" ref="debloquer"/> + </xsl:if> + </xsl:copy> + </xsl:if> + </xsl:template> + + <!-- On modifie le bind du bouton Envoyer pour éviter qu'on puisse cliquer deux fois de suite --> + <xsl:template match="xf:bind[@id='send-bind']"> + <xsl:copy> + <xsl:apply-templates select="@*"/> + <xsl:attribute name="readonly"> + <xsl:value-of select="'instance(''fr-form-util'')/cliquable=''non'''"/> + </xsl:attribute> + </xsl:copy> + </xsl:template> + + <!-- La submission expedier est modifiée suite à l'enchaînement des pages de fin --> + <!-- Si problème --> + <xsl:template match="xf:action[@ev:event='xforms-submit-error' and parent::xf:submission[@id='submit']]"> + <xsl:copy> + <xsl:apply-templates select="@*"/> + <!-- On diminue l'index de 1 --> + <xf:setvalue ref="instance('fr-form-instance')/Util/CurrentSection" + value="string(number(instance('fr-form-instance')/Util/CurrentSection)-1)"/> + <xsl:apply-templates select="node()"/> + </xsl:copy> + </xsl:template> + <!-- Si la submission est réussie --> + <xsl:template match="xf:action[@ev:event='xforms-submit-done' and parent::xf:submission[@id='submit']]"> + <xsl:copy> + <xsl:apply-templates select="@*"/> + <!-- On change de page --> + <xsl:variable name="choix"> + <xsl:value-of select="'{instance(''fr-form-instance'')/Util/CurrentSection}'"/> + </xsl:variable> + <xf:toggle case="{$choix}"/> + <xf:setfocus control="page-top-control"/> + <xsl:apply-templates select="node()"/> + </xsl:copy> + </xsl:template> + + <!-- la méthode d'enregistrement forcée corrige la méthode classique à la marge --> + + <xsl:template match="xf:submission[@id='save']"> + <xsl:if test="$studyUnit=$business"> + <xsl:copy> + <xsl:apply-templates select="node() | @*"/> + </xsl:copy> + <xsl:if test="$deblocage-questionnaire"> + <xsl:copy> + <xsl:attribute name="id" select="'enregistrer-deblocage'"/> + <xsl:apply-templates select="@method | @ref | @replace | @relevant"/> + <xsl:attribute name="resource" select="substring-before(@resource,'?')"/> + <xsl:apply-templates select="node()"/> + </xsl:copy> + </xsl:if> + </xsl:if> + </xsl:template> + + +</xsl:stylesheet> \ No newline at end of file diff --git a/src/main/resources/xslt/util/fr/insert-generic-questions.xsl b/src/main/resources/xslt/util/fr/insert-generic-questions.xsl new file mode 100644 index 000000000..543495add --- /dev/null +++ b/src/main/resources/xslt/util/fr/insert-generic-questions.xsl @@ -0,0 +1,425 @@ +<?xml version="1.0" encoding="UTF-8"?> +<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:xf="http://www.w3.org/2002/xforms" xmlns:xhtml="http://www.w3.org/1999/xhtml" + xmlns:fr="http://orbeon.org/oxf/xml/form-runner" xmlns:xxf="http://orbeon.org/oxf/xml/xforms" + xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:xs="http://www.w3.org/2001/XMLSchema"> + + <xsl:output method="xml" indent="yes" encoding="UTF-8"/> + + <xsl:param name="properties-file"/> + <xsl:param name="parameters-file"/> + <xsl:param name="parameters-node" as="node()" required="no"> + <empty/> + </xsl:param> + + <xsl:variable name="business" select="'business'"/> + <xsl:variable name="household" select="'household'"/> + + <xsl:variable name="properties" select="doc($properties-file)"/> + <xsl:variable name="parameters"> + <xsl:choose> + <xsl:when test="$parameters-node/*"> + <xsl:copy-of select="$parameters-node"/> + </xsl:when> + <xsl:otherwise> + <xsl:copy-of select="doc($parameters-file)"/> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + + <xsl:variable name="studyUnit"> + <xsl:choose> + <xsl:when test="$parameters//StudyUnit != ''"> + <xsl:value-of select="$parameters//StudyUnit"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="$properties//StudyUnit"/> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + + <xsl:variable name="begin-questions-identification" as="xs:boolean" + select="$parameters//fr-parameters/BeginQuestion/Identification"/> + <xsl:variable name="end-response-time-question" as="xs:boolean"> + <xsl:choose> + <xsl:when test="$parameters//fr-parameters/EndQuestion/ResponseTimeQuestion != ''"> + <xsl:value-of select="$parameters//fr-parameters/EndQuestion/ResponseTimeQuestion"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="$properties//fr-parameters/EndQuestion/ResponseTimeQuestion"/> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + <xsl:variable name="end-comment-question" as="xs:boolean"> + <xsl:choose> + <xsl:when test="$parameters//fr-parameters/EndQuestion/CommentQuestion != ''"> + <xsl:value-of select="$parameters//fr-parameters/EndQuestion/CommentQuestion"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="$properties//fr-parameters/EndQuestion/CommentQuestion"/> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + + <xsl:template match="/"> + <xsl:apply-templates select="xhtml:html"/> + </xsl:template> + + <xd:doc xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl"> + <xd:desc> + <xd:p>Template de base pour tous les éléments et tous les attributs, on recopie + simplement en sortie</xd:p> + </xd:desc> + </xd:doc> + <xsl:template match="node() | @*"> + <xsl:copy> + <xsl:apply-templates select="node() | @*"/> + </xsl:copy> + </xsl:template> + + <xd:doc xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl"> + <xd:desc> + <xd:p>Add elements to the main instance</xd:p> + </xd:desc> + </xd:doc> + <xsl:template match="xf:instance[@id='fr-form-instance']/form"> + <xsl:choose> + <xsl:when test="$studyUnit=$business"> + <xsl:copy> + <xsl:if test="$begin-questions-identification"> + <INSEE-BUSINESS-QUEST-DEBUT> + <INSEE-BUSINESS-SEQ-0-1/> + <COMMENT_UE/> + </INSEE-BUSINESS-QUEST-DEBUT> + </xsl:if> + <xsl:apply-templates select="node()"/> + <xsl:if test="$end-response-time-question or $end-comment-question"> + <INSEE-BUSINESS-TEMPS> + <xsl:if test="$end-response-time-question"> + <INSEE-BUSINESS-TEMPS-QI-1/> + <HEURE_REMPL/> + <MIN_REMPL/> + </xsl:if> + <xsl:if test="$end-comment-question"> + <COMMENT_QE/> + </xsl:if> + </INSEE-BUSINESS-TEMPS> + </xsl:if> + </xsl:copy> + </xsl:when> + <xsl:when test="$studyUnit=$household"> + <xsl:copy> + <xsl:apply-templates select="node()"/> + <xsl:if test="$end-response-time-question or $end-comment-question"> + <INSEE-HOUSEHOLD-TEMPS> + <xsl:if test="$end-response-time-question"> + <INSEE-HOUSEHOLD-TEMPS-QI-1/> + <HEURE_REMPL/> + <MIN_REMPL/> + </xsl:if> + <xsl:if test="$end-comment-question"> + <COMMENT_QE/> + </xsl:if> + </INSEE-HOUSEHOLD-TEMPS> + </xsl:if> + </xsl:copy> + </xsl:when> + </xsl:choose> + </xsl:template> + + <xd:doc xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl"> + <xd:desc> + <xd:p>Add elements to the corresponding bind</xd:p> + </xd:desc> + </xd:doc> + <xsl:template match="xf:bind[@id='fr-form-instance-binds']"> + <xsl:choose> + <xsl:when test="$studyUnit=$business"> + <xsl:copy> + <xsl:apply-templates select="@*"/> + <xsl:if test="$begin-questions-identification"> + <xf:bind id="INSEE-BUSINESS-QUEST-DEBUT-bind" name="INSEE-BUSINESS-QUEST-DEBUT" ref="INSEE-BUSINESS-QUEST-DEBUT"> + <xf:bind id="INSEE-BUSINESS-SEQ-0-1-bind" name="INSEE-BUSINESS-SEQ-0-1" ref="INSEE-BUSINESS-SEQ-0-1"/> + <xf:bind id="COMMENT_UE-bind" name="COMMENT_UE" ref="COMMENT_UE"/> + </xf:bind> + </xsl:if> + <xsl:apply-templates select="node()"/> + <xsl:if test="$end-response-time-question or $end-comment-question"> + <xf:bind id="INSEE-BUSINESS-TEMPS-bind" name="INSEE-BUSINESS-TEMPS" ref="INSEE-BUSINESS-TEMPS"> + <xsl:if test="$end-response-time-question"> + <xf:bind id="INSEE-BUSINESS-TEMPS-QI-1-bind" name="INSEE-BUSINESS-TEMPS-QI-1" ref="INSEE-BUSINESS-TEMPS-QI-1"/> + <xf:bind id="HEURE_REMPL-bind" name="HEURE_REMPL" ref="HEURE_REMPL"> + <xf:constraint value="matches(.,'^[0-9]?[0-9]$') or .=''"/> + </xf:bind> + <xf:bind id="MIN_REMPL-bind" name="MIN_REMPL" ref="MIN_REMPL"> + <xf:constraint value="matches(.,'^[0-5]?[0-9]$') or .=''"/> + </xf:bind> + </xsl:if> + <xsl:if test="$end-comment-question"> + <xf:bind id="COMMENT_QE-bind" name="COMMENT_QE" ref="COMMENT_QE"/> + </xsl:if> + </xf:bind> + </xsl:if> + </xsl:copy> + </xsl:when> + <xsl:when test="$studyUnit=$household"> + <xsl:copy> + <xsl:apply-templates select="@*"/> + <xsl:apply-templates select="node()"/> + <xsl:if test="$end-response-time-question or $end-comment-question"> + <xf:bind id="INSEE-HOUSEHOLD-TEMPS-bind" name="INSEE-HOUSEHOLD-TEMPS" ref="INSEE-HOUSEHOLD-TEMPS"> + <xsl:if test="$end-response-time-question"> + <xf:bind id="INSEE-HOUSEHOLD-TEMPS-QI-1-bind" name="INSEE-HOUSEHOLD-TEMPS-QI-1" ref="INSEE-HOUSEHOLD-TEMPS-QI-1"/> + <xf:bind id="HEURE_REMPL-bind" name="HEURE_REMPL" ref="HEURE_REMPL"> + <xf:constraint value="matches(.,'^[0-9]?[0-9]$') or .=''"/> + </xf:bind> + <xf:bind id="MIN_REMPL-bind" name="MIN_REMPL" ref="MIN_REMPL"> + <xf:constraint value="matches(.,'^[0-5]?[0-9]$') or .=''"/> + </xf:bind> + </xsl:if> + <xsl:if test="$end-comment-question"> + <xf:bind id="COMMENT_QE-bind" name="COMMENT_QE" ref="COMMENT_QE"/> + </xsl:if> + </xf:bind> + </xsl:if> + + </xsl:copy> + </xsl:when> + </xsl:choose> + + </xsl:template> + + <xd:doc xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl"> + <xd:desc> + <xd:p>Add elements to french resources</xd:p> + </xd:desc> + </xd:doc> + <xsl:template match="xf:instance[@id='fr-form-resources']/resources/resource[@xml:lang='fr']"> + <xsl:choose> + <xsl:when test="$studyUnit=$business"> + <xsl:copy> + <xsl:apply-templates select="@*"/> + <xsl:if test="$begin-questions-identification"> + <INSEE-BUSINESS-QUEST-DEBUT> + <label>Identification</label> + </INSEE-BUSINESS-QUEST-DEBUT> + <INSEE-BUSINESS-SEQ-0-1> + <label> + <xsl:value-of select="'Identification de votre øLabelUniteEnqueteeø'"/> + </label> + </INSEE-BUSINESS-SEQ-0-1> + <COMMENT_UE> + <label> + <xsl:value-of select="'➡ Remarque, commentaire sur un changement concernant votre øLabelUniteEnqueteeø :'"/> + </label> + </COMMENT_UE> + </xsl:if> + <xsl:apply-templates select="node()"/> + <xsl:if test="$end-response-time-question or $end-comment-question"> + <INSEE-BUSINESS-TEMPS> + <label> + <xsl:choose> + <xsl:when test="$end-response-time-question and $end-comment-question"> + <xsl:value-of select="'Temps de réponse et commentaires'"/> + </xsl:when> + <xsl:when test="$end-response-time-question"> + <xsl:value-of select="'Temps de réponse'"/> + </xsl:when> + <xsl:when test="$end-comment-question"> + <xsl:value-of select="'Commentaires'"/> + </xsl:when> + </xsl:choose> + </label> + </INSEE-BUSINESS-TEMPS> + <xsl:if test="$end-response-time-question"> + <INSEE-BUSINESS-TEMPS-QI-1> + <label><p>➡ Combien de temps avez-vous mis en tout pour répondre à cette enquête + (recherche des données + remplissage du questionnaire) ?</p></label> + </INSEE-BUSINESS-TEMPS-QI-1> + <HEURE_REMPL> + <alert>Le nombre d'heures doit être compris entre 0 et 99.</alert> + </HEURE_REMPL> + <MIN_REMPL> + <alert>Le nombre de minutes doit être compris entre 0 et 59.</alert> + </MIN_REMPL> + </xsl:if> + <xsl:if test="$end-comment-question"> + <COMMENT_QE> + <label>➡ Commentaires et remarques éventuelles concernant l’enquête :</label> + </COMMENT_QE> + </xsl:if> + </xsl:if> + </xsl:copy> + </xsl:when> + <xsl:when test="$studyUnit=$household"> + <xsl:copy> + <xsl:apply-templates select="@*"/> + <xsl:apply-templates select="node()"/> + <xsl:if test="$end-response-time-question or $end-comment-question"> + <INSEE-HOUSEHOLD-TEMPS> + <label> + <xsl:choose> + <xsl:when test="$end-response-time-question and $end-comment-question"> + <xsl:value-of select="'Temps de réponse et commentaires'"/> + </xsl:when> + <xsl:when test="$end-response-time-question"> + <xsl:value-of select="'Temps de réponse'"/> + </xsl:when> + <xsl:when test="$end-comment-question"> + <xsl:value-of select="'Commentaires'"/> + </xsl:when> + </xsl:choose> + </label> + </INSEE-HOUSEHOLD-TEMPS> + <xsl:if test="$end-response-time-question"> + <INSEE-HOUSEHOLD-TEMPS-QI-1> + <label><p>➡ Combien de temps avez-vous mis en tout pour répondre à cette enquête + (recherche des données + remplissage du questionnaire) ?</p></label> + </INSEE-HOUSEHOLD-TEMPS-QI-1> + <HEURE_REMPL> + <alert>Le nombre d'heures doit être compris entre 0 et 99.</alert> + </HEURE_REMPL> + <MIN_REMPL> + <alert>Le nombre de minutes doit être compris entre 0 et 59.</alert> + </MIN_REMPL> + </xsl:if> + <xsl:if test="$end-comment-question"> + <COMMENT_QE> + <label>➡ Commentaires et remarques éventuelles concernant l’enquête :</label> + </COMMENT_QE> + </xsl:if> + </xsl:if> + </xsl:copy> + </xsl:when> + </xsl:choose> + </xsl:template> + + <xd:doc xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl"> + <xd:desc> + <xd:p>Add the new page</xd:p> + </xd:desc> + </xd:doc> + <xsl:template match="xf:instance[@id='fr-form-util']/Util/Pages/Beginning"> + <xsl:copy> + <xsl:apply-templates select="node() | @*"/> + </xsl:copy> + <xsl:if test="$studyUnit=$business and $begin-questions-identification"> + <INSEE-BUSINESS-QUEST-DEBUT/> + </xsl:if> + </xsl:template> + <xsl:template match="xf:instance[@id='fr-form-util']/Util/Pages/End"> + <xsl:choose> + <xsl:when test="$studyUnit=$business"> + <xsl:if test="$end-response-time-question or $end-comment-question"> + <INSEE-BUSINESS-TEMPS/> + </xsl:if> + </xsl:when> + <xsl:when test="$studyUnit=$household"> + <xsl:if test="$end-response-time-question or $end-comment-question"> + <INSEE-HOUSEHOLD-TEMPS/> + </xsl:if> + </xsl:when> + </xsl:choose> + <xsl:copy> + <xsl:apply-templates select="node() | @*"/> + </xsl:copy> + </xsl:template> + + <xd:doc xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl"> + <xd:desc> + <xd:p>Add elements into the body</xd:p> + </xd:desc> + </xd:doc> + <xsl:template match="fr:view/fr:body"> + <xsl:choose> + <xsl:when test="$studyUnit=$business"> + <xsl:copy> + <xsl:apply-templates select="@*"/> + <xsl:if test="$begin-questions-identification"> + <fr:section id="INSEE-COLTRANE-QUEST-DEBUT-control" bind="INSEE-COLTRANE-QUEST-DEBUT-bind" name="INSEE-COLTRANE-QUEST-DEBUT"> + <xf:label ref="$form-resources/INSEE-COLTRANE-QUEST-DEBUT/label"/> + <xhtml:div class="submodule"> + <xhtml:h3> + <xf:output id="INSEE-COLTRANE-SEQ-0-1-control" bind="INSEE-COLTRANE-SEQ-0-1-bind"> + <xf:label ref="$form-resources/INSEE-COLTRANE-SEQ-0-1/label" class="submodule" mediatype="text/html"/> + </xf:output> + </xhtml:h3> + <xf:textarea id="COMMENT_UE-control" name="COMMENT_UE" bind="COMMENT_UE-bind" + class="question text text2000" xxf:order="label control" xxf:maxlength="2000"> + <xf:label ref="$form-resources/COMMENT_UE/label"/> + </xf:textarea> + </xhtml:div> + </fr:section> + </xsl:if> + <xsl:apply-templates select="node()"/> + <xsl:if test="$end-response-time-question or $end-comment-question"> + <fr:section id="INSEE-BUSINESS-TEMPS-control" bind="INSEE-BUSINESS-TEMPS-bind" name="INSEE-BUSINESS-TEMPS"> + <xf:label ref="$form-resources/INSEE-BUSINESS-TEMPS/label"/> + <xsl:if test="$end-response-time-question"> + <xhtml:div class="question"> + <xf:output id="INSEE-BUSINESS-TEMPS-QI-1-control" name="INSEE-BUSINESS-TEMPS-QI-1" bind="INSEE-BUSINESS-TEMPS-QI-1-bind" + class="question" xxf:order="label control"> + <xf:label ref="$form-resources/INSEE-BUSINESS-TEMPS-QI-1/label" mediatype="text/html"/> + </xf:output> + <xf:input id="HEURE_REMPL-control" name="HEURE_REMPL" bind="HEURE_REMPL-bind" + class="duree" xxf:order="control alert" xxf:maxlength="2"> + <xf:alert ref="$form-resources/HEURE_REMPL/alert"/> + </xf:input> + <xhtml:span class="suffixe">heures</xhtml:span> + <xf:input id="MIN_REMPL-control" name="MIN_REMPL" bind="MIN_REMPL-bind" + class="duree" xxf:order="control alert" xxf:maxlength="2"> + <xf:alert ref="$form-resources/MIN_REMPL/alert"/> + </xf:input> + <xhtml:span class="suffixe">minutes</xhtml:span> + </xhtml:div> + </xsl:if> + <xsl:if test="$end-comment-question"> + <xf:textarea id="COMMENT_QE-control" name="COMMENT_QE" bind="COMMENT_QE-bind" + class="question text text2000" xxf:order="label control" xxf:maxlength="2000"> + <xf:label ref="$form-resources/COMMENT_QE/label"/> + </xf:textarea> + </xsl:if> + </fr:section> + </xsl:if> + </xsl:copy> + </xsl:when> + <xsl:when test="$studyUnit=$household"> + <xsl:copy> + <xsl:apply-templates select="@*"/> + <xsl:apply-templates select="node()"/> + <xsl:if test="$end-response-time-question or $end-comment-question"> + <fr:section id="INSEE-HOUSEHOLD-TEMPS-control" bind="INSEE-HOUSEHOLD-TEMPS-bind" name="INSEE-HOUSEHOLD-TEMPS"> + <xf:label ref="$form-resources/INSEE-HOUSEHOLD-TEMPS/label"/> + <xsl:if test="$end-response-time-question"> + <xhtml:div class="question"> + <xf:output id="INSEE-HOUSEHOLD-TEMPS-QI-1-control" name="INSEE-HOUSEHOLD-TEMPS-QI-1" bind="INSEE-HOUSEHOLD-TEMPS-QI-1-bind" + class="question" xxf:order="label control"> + <xf:label ref="$form-resources/INSEE-HOUSEHOLD-TEMPS-QI-1/label" mediatype="text/html"/> + </xf:output> + <xf:input id="HEURE_REMPL-control" name="HEURE_REMPL" bind="HEURE_REMPL-bind" + class="duree" xxf:order="control alert" xxf:maxlength="2"> + <xf:alert ref="$form-resources/HEURE_REMPL/alert"/> + </xf:input> + <xhtml:span class="suffixe">heures</xhtml:span> + <xf:input id="MIN_REMPL-control" name="MIN_REMPL" bind="MIN_REMPL-bind" + class="duree" xxf:order="control alert" xxf:maxlength="2"> + <xf:alert ref="$form-resources/MIN_REMPL/alert"/> + </xf:input> + <xhtml:span class="suffixe">minutes</xhtml:span> + </xhtml:div> + </xsl:if> + <xsl:if test="$end-comment-question"> + <xf:textarea id="COMMENT_QE-control" name="COMMENT_QE" bind="COMMENT_QE-bind" + class="question text text2000" xxf:order="label control" xxf:maxlength="2000"> + <xf:label ref="$form-resources/COMMENT_QE/label"/> + </xf:textarea> + </xsl:if> + </fr:section> + </xsl:if> + </xsl:copy> + </xsl:when> + </xsl:choose> + + </xsl:template> + +</xsl:stylesheet> \ No newline at end of file diff --git a/src/main/resources/xslt/util/fr/insert-welcome.xsl b/src/main/resources/xslt/util/fr/insert-welcome.xsl new file mode 100644 index 000000000..0567ac288 --- /dev/null +++ b/src/main/resources/xslt/util/fr/insert-welcome.xsl @@ -0,0 +1,462 @@ +<?xml version="1.0" encoding="UTF-8"?> +<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:xf="http://www.w3.org/2002/xforms" xmlns:xhtml="http://www.w3.org/1999/xhtml" + xmlns:fr="http://orbeon.org/oxf/xml/form-runner" xmlns:xxf="http://orbeon.org/oxf/xml/xforms" + xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:xs="http://www.w3.org/2001/XMLSchema"> + + <!-- Fichier de propriétés eno --> + <xsl:param name="properties-file"/> + <!-- Fichier de paramétrage eno --> + <xsl:param name="parameters-file"/> + <xsl:param name="parameters-node" as="node()" required="no"> + <empty/> + </xsl:param> + + <!-- Les informations provenant de Pilotage --> + <xsl:param name="metadonnees-file"/> + <xsl:param name="metadonnee-node" as="node()" required="no"> + <empty/> + </xsl:param> + + <xsl:variable name="metadonnee"> + <xsl:choose> + <xsl:when test="$metadonnee-node/*"> + <xsl:copy-of select="$metadonnee-node"/> + </xsl:when> + <xsl:otherwise> + <xsl:copy-of select="doc($metadonnees-file)"/> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + + <xsl:variable name="business" select="'business'"/> + <xsl:variable name="household" select="'household'"/> + + <xsl:variable name="properties" select="doc($properties-file)"/> + <xsl:variable name="parameters"> + <xsl:choose> + <xsl:when test="$parameters-node/*"> + <xsl:copy-of select="$parameters-node"/> + </xsl:when> + <xsl:otherwise> + <xsl:copy-of select="doc($parameters-file)"/> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + + <xsl:variable name="studyUnit"> + <xsl:choose> + <xsl:when test="$parameters//StudyUnit != ''"> + <xsl:value-of select="$parameters//StudyUnit"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="$properties//StudyUnit"/> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + + <!-- On récupère ces informations, si le modèle de données change, on pourra simplement modifier cette partie --> + <xsl:variable name="Identifiant" select="$metadonnee/metadonnees/Identifiant"/> + <xsl:variable name="LibelleCourtEnquete" select="$metadonnee/metadonnees/LibelleCourtEnquete"/> + <xsl:variable name="LibelleCourtEnqueteMillesime" select="$metadonnee/metadonnees/LibelleCourtEnqueteMillesime"/> + <xsl:variable name="Frequence" select="$metadonnee/metadonnees/Frequence"/> + <xsl:variable name="AnneeReference" select="$metadonnee/metadonnees/AnneeReference"/> + <xsl:variable name="Idvague" select="$metadonnee/metadonnees/Idvague"/> + <xsl:variable name="DateOuverture" select="$metadonnee/metadonnees/DateOuverture"/> + <xsl:variable name="DateFermeture" select="$metadonnee/metadonnees/DateFermeture"/> + <xsl:variable name="BddVille" select="$metadonnee/metadonnees/BddVille"/> + <xsl:variable name="BddDateOuverture" select="$metadonnee/metadonnees/BddDateOuverture"/> + <xsl:variable name="BddArticleServiceProducteur" select="$metadonnee/metadonnees/BddArticleServiceProducteur"/> + <xsl:variable name="BddNomServiceProducteur" select="$metadonnee/metadonnees/BddNomServiceProducteur"/> + <xsl:variable name="BddNomServiceProducteurCourt" select="$metadonnee/metadonnees/BddNomServiceProducteurCourt"/> + <xsl:variable name="BddObjectifsLongs" select="$metadonnee/metadonnees/BddObjectifsLongs"/> + <xsl:variable name="BddCaractereObligatoire" select="$metadonnee/metadonnees/BddCaractereObligatoire"/> + <xsl:variable name="BddTypeUniteEnquetees" select="$metadonnee/metadonnees/BddTypeUniteEnquetees"/> + <xsl:variable name="BddTempsPassation" select="$metadonnee/metadonnees/BddTempsPassation"/> + <xsl:variable name="BddAdresseInternetEnquete" select="$metadonnee/metadonnees/BddAdresseInternetEnquete"/> + <xsl:variable name="BddURLRenseignement" select="$metadonnee/metadonnees/BddURLRenseignement"/> + <xsl:variable name="BddURLDiffusion" select="$metadonnee/metadonnees/BddURLDiffusion"/> + <xsl:variable name="BddServiceCollecteurSignataireFonction" select="$metadonnee/metadonnees/BddServiceCollecteurSignataireFonction"/> + <xsl:variable name="BddServiceCollecteurSignataireNom" select="$metadonnee/metadonnees/BddServiceCollecteurSignataireNom"/> + <xsl:variable name="BddServiceCollecteurSignataireSexe" select="$metadonnee/metadonnees/BddServiceCollecteurSignataireSexe"/> + <xsl:variable name="BddNumeroVisa" select="$metadonnee/metadonnees/BddNumeroVisa"/> + <xsl:variable name="BddMinistereTutelle" select="$metadonnee/metadonnees/BddMinistereTutelle"/> + <xsl:variable name="BddAnneeCollecte" select="$metadonnee/metadonnees/BddAnneeCollecte"/> + <xsl:variable name="BddParutionJO" select="$metadonnee/metadonnees/BddParutionJO"/> + <xsl:variable name="BddDateParutionJO" select="$metadonnee/metadonnees/BddDateParutionJO"/> + <xsl:variable name="BddNomServiceRecours" select="$metadonnee/metadonnees/BddNomServiceRecours"/> + <xsl:variable name="BddStatutEnquete" select="$metadonnee/metadonnees/BddStatutEnquete"/> + <xsl:variable name="BddMetropole" select="$metadonnee/metadonnees/BddMetropole"/> + <xsl:variable name="BddTypeUniteEnquetee" select="$metadonnee/metadonnees/BddTypeUniteEnquetee"/> + <xsl:variable name="BddRapprochementDonnees" select="$metadonnee/metadonnees/BddRapprochementDonnees"/> + <xsl:variable name="LibelleEnquete" select="$metadonnee/metadonnees/LibelleEnquete"/> + <xsl:variable name="ObjectifsEnquete" select="normalize-space($metadonnee/metadonnees/ObjectifsCourts)"/> + <xsl:variable name="SimplificationEntreprises" select="$metadonnee/metadonnees/SimplificationEntreprises"/> + <!-- Valeur pour laquelle on affiche le fait que l'enquête a un caractère obligatoire --> + <xsl:variable name="CaractereObligatoireEnqueteReference" select="string('OUI')"/> + <xsl:variable name="SimplificationEntreprisesReference" select="string('OUI')"/> + + <xsl:template match="/"> + <xsl:apply-templates select="xhtml:html"/> + </xsl:template> + + <xd:doc xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl"> + <xd:desc> + <xd:p>Template de base pour tous les éléments et tous les attributs, on recopie + simplement en sortie</xd:p> + </xd:desc> + </xd:doc> + <xsl:template match="node() | @*"> + <xsl:copy> + <xsl:apply-templates select="node() | @*"/> + </xsl:copy> + </xsl:template> + + <!-- On remplace la page de début générique par une page d'accueil coltrane --> + <xsl:template match="Beginning[parent::form[parent::xf:instance[@id='fr-form-instance']]]"> + <xsl:if test="$studyUnit=$household"> + <Variable idVariable="QuiRepond1"/> + <Variable idVariable="QuiRepond2"/> + <Variable idVariable="QuiRepond3"/> + </xsl:if> + <ACCUEIL> + <ACCUEIL-1/> + <ACCUEIL-2/> + <ACCUEIL-3/> + <ACCUEIL-4/> + <ACCUEIL-5/> + <ACCUEIL-6/> + <ACCUEIL-7/> + </ACCUEIL> + </xsl:template> + + <!-- Le bind correspondant --> + <xsl:template match="xf:bind[@name='beginning']"> + <xf:bind id="ACCUEIL-bind" name="ACCUEIL" ref="ACCUEIL"> + <xf:bind id="ACCUEIL-1-bind" name="ACCUEIL-1" ref="ACCUEIL-1"/> + <xf:bind id="ACCUEIL-2-bind" name="ACCUEIL-2" ref="ACCUEIL-2"/> + <xf:bind id="ACCUEIL-3-bind" name="ACCUEIL-3" ref="ACCUEIL-3"/> + <xf:bind id="ACCUEIL-4-bind" name="ACCUEIL-4" ref="ACCUEIL-4"/> + <xf:bind id="ACCUEIL-5-bind" name="ACCUEIL-5" ref="ACCUEIL-5"/> + <xf:bind id="ACCUEIL-6-bind" name="ACCUEIL-6" ref="ACCUEIL-6"/> + <xf:bind id="ACCUEIL-7-bind" name="ACCUEIL-7" ref="ACCUEIL-7" relevant="if (instance('fr-form-util')/cadreLegal/text()!='') then (true()) else (false())"/> + </xf:bind> + </xsl:template> + + <!-- Les ressources correspondantes --> + <xsl:template match="Beginning[ancestor::xf:instance[@id='fr-form-resources']]"> + <ACCUEIL> + <label>ACCUEIL</label> + </ACCUEIL> + <ACCUEIL-1> + <label> + <xsl:text><p>Bienvenue sur le questionnaire de réponse à l'enquête <b></xsl:text> + <xsl:value-of select="$LibelleEnquete"/> + <xsl:text></b></xsl:text> + <xsl:text><span title="</xsl:text> + <xsl:value-of select="$ObjectifsEnquete"/> + <xsl:text>"> <img src="/img/Help-browser.svg.png"/> </span></xsl:text> + <xsl:text></p></xsl:text> + </label> + </ACCUEIL-1> + <ACCUEIL-2> + <label> + <xsl:if test="$studyUnit=$household"> + <xsl:text><div class="frame"><p><b>Qui doit répondre à ce questionnaire ?</b></p></xsl:text> + <xsl:text><p>¤QuiRepond1¤</p></xsl:text> + <xsl:text><p>¤QuiRepond2¤</p></xsl:text> + <xsl:text><p>¤QuiRepond3¤</p></xsl:text> + <xsl:text></div></xsl:text> + </xsl:if> + <xsl:if test="$studyUnit=$business"> + <xsl:text><div class="frame"><p>Cette enquête</xsl:text> + <xsl:if test="$BddCaractereObligatoire=$CaractereObligatoireEnqueteReference"> + <xsl:text>, + à <b><span style="text-decoration:underline">caractère + obligatoire</span></b>,</xsl:text> + </xsl:if> + <xsl:text> est reconnue d'<b></xsl:text> + <xsl:value-of select="$BddStatutEnquete"/> + <xsl:text></b>.</p><p>Merci de répondre avant le : + <b>øDATE_RETOUR_SOUHAITEEø</b></p></div></xsl:text> + </xsl:if> + </label> + </ACCUEIL-2> + <ACCUEIL-3> + <label><p> </p></label> + </ACCUEIL-3> + <ACCUEIL-4> + <label><p><b>Informations pratiques pour le + remplissage</b></p></label> + </ACCUEIL-4> + <ACCUEIL-5> + <label> + <xsl:if test="$studyUnit=$household"> + <xsl:text><div class="frameAvertissement"><p><b>Pensez à enregistrer + régulièrement votre questionnaire.</b> Au bout de 30 minutes sans + activité, pour des raisons de sécurité, vous serez en effet automatiquement + déconnecté. Les données saisies depuis la dernière sauvegarde seront perdues.</p><p><b>Veuillez + utiliser les boutons <button class="btn txt" type="button" style="cursor: default;" tabIndex="-1">Retour </button> et <button class="btn txt" type="button" style="cursor: default;" tabIndex="-1">Enregistrer et continuer </button> pour naviguer dans le + questionnaire</b> et non pas les boutons "Précédent" et "Suivant" de votre + navigateur.</p><p>Pour visualiser le contenu des info-bulles, il faut survoler le + symbole <span title="Les symboles similaires contiennent une aide sur la question ou ses mots-clefs"> <img src="/img/Help-browser.svg.png"/> </span></p></div> + </xsl:text> + </xsl:if> + <xsl:if test="$studyUnit=$business"> + <xsl:text><div class="frameAvertissement"><p><b>Pensez à enregistrer + régulièrement votre questionnaire.</b> Au bout de 30 minutes sans + activité, pour des raisons de sécurité, vous serez en effet automatiquement + déconnecté. La sauvegarde des données vous incombant, les données saisies depuis + la dernière sauvegarde seront perdues.</p> + <p>Lorsque vous quitterez ce questionnaire, privilégiez la fermeture par le bouton <b>Déconnexion</b> afin d'éviter d'éventuels problèmes de navigation ultérieurs.</p> + <p><b>Veuillez utiliser les boutons <button class="btn txt" type="button" style="cursor: default;" tabIndex="-1">Retour </button> et <button class="btn txt" type="button" style="cursor: default;" tabIndex="-1">Enregistrer et continuer </button> pour naviguer dans le + questionnaire</b> et non pas les boutons "Précédent" et "Suivant" de votre + navigateur.</p><p> + </xsl:text> + </xsl:if> + </label> + </ACCUEIL-5> + <ACCUEIL-6> + <label><p> </p></label> + </ACCUEIL-6> + <ACCUEIL-7> + <label> + <xsl:if test="$studyUnit=$household"> + <xsl:text><div class="frame"><p>Vu l'avis favorable du Conseil national de + l'information statistique, cette enquête</xsl:text> + <xsl:choose> + <xsl:when + test="$BddCaractereObligatoire=$CaractereObligatoireEnqueteReference"> + <xsl:text>, reconnue d’intérêt général et de qualité statistique, est obligatoire</xsl:text> + </xsl:when> + <xsl:otherwise> + <xsl:text> est reconnue d’intérêt général et de qualité statistique sans avoir de caractère obligatoire</xsl:text> + </xsl:otherwise> + </xsl:choose> + <xsl:text>, en application de la <a href="</xsl:text> + <xsl:value-of select="$properties//lois/statistique"/> + <xsl:text>" target="_blank">loi n° 51-711 du 7 juin 1951</a> sur l’obligation, la coordination et le secret en matière de statistiques.</xsl:text> + + <xsl:text></p><p>Visa n°</xsl:text> + <xsl:value-of select="$BddNumeroVisa"/> + <xsl:text> </xsl:text> + <xsl:for-each select="$BddMinistereTutelle"> + <xsl:text>du </xsl:text> + <xsl:value-of select="."/> + <xsl:text>, </xsl:text> + </xsl:for-each> + <xsl:text>valable pour l'année </xsl:text> + <xsl:value-of select="$BddAnneeCollecte"/> + <xsl:choose> + <xsl:when test="$BddParutionJO = 'oui'"> + <xsl:text> - Arrêté en date du </xsl:text> + <xsl:value-of select="$BddDateParutionJO"/> + </xsl:when> + <xsl:otherwise> + <xsl:text> - Arrêté en cours de parution</xsl:text> + </xsl:otherwise> + </xsl:choose> + <xsl:text>.</p><p>Les réponses à ce questionnaire sont protégées par le secret statistique et destinées à </xsl:text> + <xsl:value-of select="$BddNomServiceProducteurCourt"/> + <xsl:text>. Le <a href="</xsl:text> + <xsl:value-of select="$properties//lois/rgpd"/> + <xsl:text>" target="_blank">règlement général 2016/679 du 27 avril 2016 sur la protection des données (RGPD)</a> ainsi </xsl:text> + <xsl:text>que la <a href="</xsl:text> + <xsl:value-of select="$properties//lois/informatique"/> + <xsl:text>" target="_blank">loi n° 78-17 du 6 janvier 1978 relative à l'informatique, aux fichiers et aux libertés</a>, s'appliquent à la présente enquête. </xsl:text> + <xsl:text>Les droits des personnes, rappelés dans la lettre-avis, peuvent être exercés auprès de </xsl:text> + <xsl:value-of select="$BddNomServiceRecours"/> + <xsl:text>.</p></div></xsl:text> + </xsl:if> + <xsl:if test="$studyUnit=$business"> + <xsl:text><div class="frame"><p>Vu l'avis favorable du Conseil national de + l'information statistique, cette enquête</xsl:text> + <xsl:choose> + <xsl:when + test="$BddCaractereObligatoire=$CaractereObligatoireEnqueteReference"> + <xsl:text>, reconnue d'<b></xsl:text> + <xsl:value-of select="$BddStatutEnquete"/> + <!--<xsl:text>, est + obligatoire.</b></xsl:text>--> + <xsl:text>, est + obligatoire, </b>en application de la <a + href="</xsl:text> + <xsl:value-of select="$properties//lois/statistique"/> + <xsl:text>" target="_blank">loi n° 51-711 du 7 juin 1951 modifiée</a> sur l’obligation, la coordination et le secret en matière de statistiques.</xsl:text> + </xsl:when> + <xsl:otherwise> + <xsl:text> est reconnue d'<b></xsl:text> + <xsl:value-of select="$BddStatutEnquete"/> + <!-- <xsl:text></b> sans avoir de caractère obligatoire.</xsl:text>--> + <xsl:text></b> sans avoir de caractère obligatoire, en application de la <a + href="</xsl:text> + <xsl:value-of select="$properties//lois/statistique"/> + <xsl:text>" target="_blank">loi n° 51-711 du 7 juin 1951 modifiée</a> sur l’obligation, la coordination et le secret en matière de statistiques.</xsl:text> + </xsl:otherwise> + </xsl:choose> + <xsl:if test="$SimplificationEntreprises=$SimplificationEntreprisesReference"> + <xsl:text> Elle entre dans le champ de la circulaire n° 2015-11 du 5 novembre 2015, qui s’inscrit + dans le cadre des mesures de simplification pour les entreprises.</xsl:text> + </xsl:if> + <xsl:text></p><p>Visa n°</xsl:text> + <xsl:value-of select="$BddNumeroVisa"/> + <xsl:text> </xsl:text> + <xsl:for-each select="$BddMinistereTutelle"> + <xsl:text>du </xsl:text> + <xsl:value-of select="."/> + <xsl:text>, </xsl:text> + </xsl:for-each> + <xsl:text>valable pour l'année </xsl:text> + <xsl:value-of select="$BddAnneeCollecte"/> + <xsl:text>.</p><p>Les réponses à ce questionnaire sont protégées par le secret statistique et destinées à </xsl:text> + <xsl:value-of select="$BddNomServiceProducteurCourt"/> + <xsl:text>.</p></xsl:text> + + <xsl:text><p>Le <a href="</xsl:text> + <xsl:value-of select="$properties//lois/rgpd"/> + <xsl:text>" target="_blank">règlement général 2016/679 du 27 avril 2016</a> sur la protection des données (RGPD)</xsl:text> + <xsl:text> ainsi que la <a href="</xsl:text> + <xsl:value-of select="$properties//lois/informatique"/> + <xsl:text>" target="_blank">loi n°78-17 du 6 janvier 1978 modifiée</a> relative à l'informatique, aux fichiers et aux libertés s'appliquent à la présente enquête pour les données à caractère personnel. Ces droits, rappelés dans la lettre-avis, peuvent être exercés auprès de </xsl:text> + <xsl:value-of select="$BddNomServiceProducteurCourt"/> + <xsl:text>.</p></xsl:text> + <xsl:text>.</div></xsl:text> + </xsl:if> + + </label> + </ACCUEIL-7> + </xsl:template> + + <xsl:template match="GenericBeginningText[ancestor::xf:instance[@id='fr-form-resources']]"/> + + <!-- On remplace la page dans l'instance qui sert à gérer le questionnaire --> + <xsl:template match="Beginning[ancestor::xf:instance[@id='fr-form-util']]"> + <ACCUEIL/> + </xsl:template> + + <!-- On place le corps html ici --> + <xsl:template match="fr:section[@name='beginning']"> + <fr:section id="ACCUEIL-control" bind="ACCUEIL-bind" name="ACCUEIL"> + <xf:label ref="$form-resources/ACCUEIL/label"/> + <xf:output id="ACCUEIL-1-control" name="ACCUEIL-1" bind="ACCUEIL-1-bind" + xxf:order="label control hint help alert" class="icone-help"> + <xf:label ref="$form-resources/ACCUEIL-1/label" mediatype="text/html"/> + <xf:help ref="$form-resources/ACCUEIL-1/help" mediatype="text/html"/> + </xf:output> + <xf:output id="ACCUEIL-2-control" name="ACCUEIL-2" bind="ACCUEIL-2-bind" + xxf:order="label control hint help alert"> + <xsl:if test="$studyUnit=$household"> + <xf:label ref="replace(replace(replace($form-resources/ACCUEIL-2/label,'¤QuiRepond1¤',instance('fr-form-instance')//Variable[@idVariable='QuiRepond1']),'¤QuiRepond2¤',instance('fr-form-instance')//Variable[@idVariable='QuiRepond2']),'¤QuiRepond3¤',instance('fr-form-instance')//Variable[@idVariable='QuiRepond3'])" mediatype="text/html"/> + </xsl:if> + <xsl:if test="$studyUnit=$business"> + <xf:label ref="$form-resources/ACCUEIL-2/label" mediatype="text/html"/> + </xsl:if> + </xf:output> + <xf:output id="ACCUEIL-3-control" name="ACCUEIL-3" bind="ACCUEIL-3-bind" + xxf:order="label control hint help alert"> + <xf:label ref="$form-resources/ACCUEIL-3/label" mediatype="text/html"/> + </xf:output> + <xf:output id="ACCUEIL-4-control" name="ACCUEIL-4" bind="ACCUEIL-4-bind" + xxf:order="label control hint help alert"> + <xf:label ref="$form-resources/ACCUEIL-4/label" mediatype="text/html"/> + </xf:output> + <xf:output id="ACCUEIL-5-control" name="ACCUEIL-5" bind="ACCUEIL-5-bind" + xxf:order="label control hint help alert"> + <xf:label ref="$form-resources/ACCUEIL-5/label" mediatype="text/html"/> + </xf:output> + <xf:output id="ACCUEIL-6-control" name="ACCUEIL-6" bind="ACCUEIL-6-bind" + xxf:order="label control hint help alert"> + <xf:label ref="$form-resources/ACCUEIL-6/label" mediatype="text/html"/> + </xf:output> + <xf:trigger id="cadreLegal" appearance="minimal"> + <xf:label> + <xf:output + value="concat(if (instance('fr-form-util')/cadreLegal/text()!='') then ('-') else ('+'),' Connaître le cadre légal de l''enquête ?')" + /> + </xf:label> + <xf:setvalue ev:event="DOMActivate" ref="instance('fr-form-util')/cadreLegal" + value="if (instance('fr-form-util')/cadreLegal/text()!='') then ('') else ('affiche')" + /> + </xf:trigger> + <xf:output id="ACCUEIL-7-control" name="ACCUEIL-7" bind="ACCUEIL-7-bind" + xxf:order="label control hint help alert"> + <xf:label ref="$form-resources/ACCUEIL-7/label" mediatype="text/html"/> + </xf:output> + </fr:section> + </xsl:template> + + <!-- On fait apparaître/disparaître le cadre legal de la page d'accueil à l'aide d'un lien --> + <xsl:template match="xf:instance [@id='fr-form-util']/Util"> + <xsl:copy> + <cadreLegal/> + <xsl:apply-templates select="node() | @*"/> + </xsl:copy> + </xsl:template> + + <xsl:template match="xf:bind[@id='current-section-name-bind']/@calculate | xf:action[@ev:event='page-change']/xf:action/@if"> + <xsl:attribute name="{name()}"> + <xsl:for-each select="tokenize(., '''')"> + <xsl:if test="position()>1"> + <xsl:value-of select="''''"/> + </xsl:if> + <xsl:choose> + <xsl:when test="string(number(.))!='NaN'"> + <xsl:value-of select="number(.)+1"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="."/> + </xsl:otherwise> + </xsl:choose> + </xsl:for-each> + </xsl:attribute> + </xsl:template> + + <xsl:template match="xf:bind[@id='progress-percent-bind']"> + <xsl:copy> + <xsl:apply-templates select="@*"/> + <xsl:attribute name="calculate"> + <xsl:choose> + <xsl:when test="contains(@calculate,'<')"> + <xsl:variable name="old-loop-number" + select="substring-before(substring-after(@calculate,'<'),')')"/> + <xsl:variable name="new-loop-number" select="number($old-loop-number)+1"/> + <xsl:value-of + select="replace(replace(replace(@calculate, + concat('number\(instance\(''fr-form-instance''\)/Util/CurrentSection\) <',$old-loop-number), + concat('number(instance(''fr-form-instance'')/Util/CurrentSection) <',$new-loop-number)), + concat('instance\(''fr-form-instance''\)/Util/CurrentSection =',$old-loop-number), + concat('instance(''fr-form-instance'')/Util/CurrentSection =',$new-loop-number)), + concat('round\(\(',$old-loop-number,'-2'), + concat('round((',$new-loop-number,'-2'))" + /> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="@calculate"/> + </xsl:otherwise> + </xsl:choose> + </xsl:attribute> + <xsl:apply-templates select="node()"/> + </xsl:copy> + </xsl:template> + + <xsl:template match="xf:action[@ev:event='page-change-done']/xf:action/@if"> + <xsl:attribute name="if"> + <xsl:for-each select="tokenize(.,' ')"> + <xsl:if test="position()>1"> + <xsl:value-of select="' '"/> + </xsl:if> + <xsl:choose> + <xsl:when test="string(number(.))!='NaN'"> + <xsl:value-of select="number(.)+1"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="."/> + </xsl:otherwise> + </xsl:choose> + </xsl:for-each> + </xsl:attribute> + </xsl:template> + + + +</xsl:stylesheet> \ No newline at end of file diff --git a/src/main/resources/xslt/util/fr/jointure.xsl b/src/main/resources/xslt/util/fr/jointure.xsl new file mode 100644 index 000000000..b13237611 --- /dev/null +++ b/src/main/resources/xslt/util/fr/jointure.xsl @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding='utf-8'?> +<xsl:transform version="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:xhtml="http://www.w3.org/1999/xhtml" + xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> + <xsl:param name="dossier"/> + + <xsl:output method="xml" indent="yes" encoding="UTF-8"/> + <xsl:strip-space elements="*"/> + + <xd:doc xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl"> + <xd:desc> + <xd:p>Template de racine</xd:p> + </xd:desc> + </xd:doc> + <xsl:template match="/"> + <xsl:message><xsl:value-of select="$dossier"/></xsl:message> + <total> + <xsl:for-each select="collection(concat('file:///', replace($dossier, '\\' , '/'), '?select=form.xhtml;recurse=yes'))/xhtml:html"> + <xsl:copy-of select="."/> + </xsl:for-each> + </total> + </xsl:template> + + <xd:doc xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl"> + <xd:desc> + <xd:p>Template de base pour tous les éléments et tous les attributs, on recopie simplement en sortie</xd:p> + </xd:desc> + </xd:doc> + <xsl:template match="node() | @*"> + <xsl:copy> + <xsl:apply-templates select="node() | @*"/> + </xsl:copy> + </xsl:template> + +</xsl:transform> diff --git a/src/main/resources/xslt/util/fr/modele-coltrane.xsl b/src/main/resources/xslt/util/fr/modele-coltrane.xsl new file mode 100644 index 000000000..938c3537d --- /dev/null +++ b/src/main/resources/xslt/util/fr/modele-coltrane.xsl @@ -0,0 +1,358 @@ +<?xml version="1.0" encoding='utf-8'?> +<xsl:transform version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:xf="http://www.w3.org/2002/xforms" xmlns:xhtml="http://www.w3.org/1999/xhtml" + xmlns:fr="http://orbeon.org/oxf/xml/form-runner" xmlns:xxf="http://orbeon.org/oxf/xml/xforms" + xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:xs="http://www.w3.org/2001/XMLSchema"> + + <xsl:output method="xml" encoding="utf-8"/> + + <!-- On passe l'instance, et par conséquence d'autres éléments du form au modèle Coltrane --> + + <!-- Fichier de mapping --> + <xsl:param name="fichier-mapping"/> + <xsl:param name="fichier-mapping-node" as="node()" required="no"/> + + <xsl:variable name="list"> + <xsl:choose> + <xsl:when test="$fichier-mapping-node/*"> + <mapping> + <xsl:for-each select="$fichier-mapping-node//mapping/*"> + <xsl:sort select="string-length(@name)" order="descending"/> + <xsl:sort select="name()" order="ascending"/> + <xsl:copy-of select="."/> + </xsl:for-each> + </mapping> + </xsl:when> + <xsl:otherwise> + <mapping> + <xsl:for-each select="doc($fichier-mapping)//mapping/*"> + <xsl:sort select="string-length(@name)" order="descending"/> + <xsl:sort select="name()" order="ascending"/> + <xsl:copy-of select="."/> + </xsl:for-each> + </mapping> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + + <xsl:variable name="list-length" select="count($list/*)"/> + + <xsl:template match="/"> + <xsl:copy> + <xsl:apply-templates select="*"/> + </xsl:copy> + </xsl:template> + + <xd:doc xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl"> + <xd:desc> + <xd:p>Template de base pour tous les éléments et tous les attributs, on recopie + simplement en sortie</xd:p> + </xd:desc> + </xd:doc> + <xsl:template match="node() | @*"> + <xsl:copy> + <xsl:apply-templates select="node() | @*"/> + </xsl:copy> + </xsl:template> + + <xsl:template match="xf:instance[@id='fr-form-instance' or @id='fr-form-loop-model']//*"> + <xsl:choose> + <xsl:when test="name() = $list//Variable/@name"> + <Variable idVariable="{name()}"/> + </xsl:when> + <xsl:when test="name() = $list//Group/@name and (parent::LoopModels or parent::*[ends-with(name(),'Container')])"> + <Groupe typeGroupe="{name()}"> + <xsl:apply-templates select="node() | @*"/> + </Groupe> + </xsl:when> + <xsl:when test="ends-with(name(),'-Container') and substring-before(name(),'-Container') = $list//Group/@name"> + <Groupe idGroupe="{substring-before(name(),'-Container')}"> + <xsl:apply-templates select="node() | @*"/> + </Groupe> + </xsl:when> + <xsl:otherwise> + <xsl:copy> + <xsl:apply-templates select="node() | @*"/> + </xsl:copy> + </xsl:otherwise> + </xsl:choose> + </xsl:template> + + <xsl:template match="*/@nodeset | */@relevant | */@readonly | */@calculate | xf:action/@if | xf:action/@iterate | xf:action/@while | xf:setvalue/@* | xf:constraint/@value | xf:insert/@*"> + <xsl:attribute name="{name()}"> + <xsl:call-template name="replace-element"> + <xsl:with-param name="position" as="xs:integer" select="1"/> + <xsl:with-param name="text" select="."/> + </xsl:call-template> + </xsl:attribute> + </xsl:template> + + <xsl:template match="xf:label/@ref | xf:alert/@ref"> + <xsl:attribute name="{name()}"> + <xsl:choose> + <xsl:when test="starts-with(.,'replace')"> + <xsl:value-of select="concat(substring-before(.,','),',')"/> + <xsl:call-template name="replace-element"> + <xsl:with-param name="position" as="xs:integer" select="1"/> + <xsl:with-param name="text" select="substring-after(.,',')"/> + </xsl:call-template> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="."/> + </xsl:otherwise> + </xsl:choose> + </xsl:attribute> + </xsl:template> + + <xsl:template match="xf:bind[@id='pages-bind']/xf:bind[contains(@id,'-Container')]/@ref" priority="2"> + <xsl:attribute name="ref"> + <xsl:call-template name="replace-element"> + <xsl:with-param name="position" as="xs:integer" select="1"/> + <xsl:with-param name="text" select="."/> + </xsl:call-template> + </xsl:attribute> + </xsl:template> + + <xsl:template match="xf:bind/@ref"> + <xsl:attribute name="ref"> + <xsl:choose> + <xsl:when test=". = $list//Variable/@name"> + <xsl:value-of select="concat('Variable[@idVariable=''',.,''']')"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="."/> + </xsl:otherwise> + </xsl:choose> + </xsl:attribute> + </xsl:template> + + <xsl:template name="replace-element"> + <xsl:param name="position" as="xs:integer"/> + <xsl:param name="text"/> + + <xsl:choose> + <xsl:when test="$list//*[$position]/name()='Variable'"> + <xsl:variable name="current-variable" select="$list//*[$position]/@name"/> + <xsl:choose> + <xsl:when test="contains($text,$current-variable)"> + <xsl:choose> + <xsl:when test="contains($text,concat($current-variable,'-layout-'))"> + <xsl:for-each select="tokenize($text,concat($current-variable,'-layout-'))"> + <xsl:if test="not(position()=1)"> + <xsl:value-of select="concat($current-variable,'-layout-')"/> + </xsl:if> + <xsl:call-template name="replace-element"> + <xsl:with-param name="position" select="$position"/> + <xsl:with-param name="text" select="current()"/> + </xsl:call-template> + </xsl:for-each> + </xsl:when> + <xsl:when test="contains($text,concat('descendant::',$current-variable))"> + <xsl:for-each select="tokenize($text,concat('descendant::',$current-variable))"> + <xsl:if test="not(position()=1)"> + <xsl:value-of select="concat('descendant::Variable[@idVariable=''',$current-variable,''']')"/> + </xsl:if> + <xsl:call-template name="replace-element"> + <xsl:with-param name="position" select="$position"/> + <xsl:with-param name="text" select="current()"/> + </xsl:call-template> + </xsl:for-each> + </xsl:when> + <xsl:when test="contains($text,concat('/',$current-variable))"> + <xsl:for-each select="tokenize($text,concat('/',$current-variable))"> + <xsl:if test="not(position()=1)"> + <xsl:value-of select="concat('/Variable[@idVariable=''',$current-variable,''']')"/> + </xsl:if> + <xsl:call-template name="replace-element"> + <xsl:with-param name="position" select="$position"/> + <xsl:with-param name="text" select="current()"/> + </xsl:call-template> + </xsl:for-each> + </xsl:when> + <xsl:otherwise> + <xsl:for-each select="tokenize($text,$current-variable)"> + <xsl:if test="not(position()=1)"> + <xsl:value-of select="$current-variable"/> + </xsl:if> + <xsl:call-template name="replace-element"> + <xsl:with-param name="position" select="$position +1"/> + <xsl:with-param name="text" select="current()"/> + </xsl:call-template> + </xsl:for-each> + </xsl:otherwise> + </xsl:choose> + </xsl:when> + <xsl:otherwise> + <xsl:call-template name="replace-element"> + <xsl:with-param name="position" select="$position +1"/> + <xsl:with-param name="text" select="$text"/> + </xsl:call-template> + </xsl:otherwise> + </xsl:choose> + </xsl:when> + <xsl:when test="$list//*[$position]/name()='Group'"> + <xsl:variable name="current-group" select="$list//*[$position]/@name"/> + <xsl:choose> + <xsl:when test="contains($text,$current-group)"> + <xsl:choose> + <xsl:when test="contains($text,concat($current-group,'-Container/',$current-group))"> + <xsl:for-each select="tokenize($text,concat($current-group,'-Container/',$current-group))"> + <xsl:if test="not(position()=1)"> + <xsl:value-of select="concat('Groupe[@idGroupe=''',$current-group,''']/Groupe[@typeGroupe=''',$current-group,''']')"/> + </xsl:if> + <xsl:call-template name="replace-element"> + <xsl:with-param name="position" select="$position"/> + <xsl:with-param name="text" select="current()"/> + </xsl:call-template> + </xsl:for-each> + </xsl:when> + <xsl:when test="contains($text,concat('//',$current-group,'[$',$current-group,'-position]'))"> + <xsl:for-each select="tokenize($text,concat('//',$current-group,'\[\$',$current-group,'-position\]'))"> + <xsl:if test="not(position()=1)"> + <xsl:value-of select="concat('//Groupe[@typeGroupe=''',$current-group,'''][$',$current-group,'-position]')"/> + </xsl:if> + <xsl:call-template name="replace-element"> + <xsl:with-param name="position" select="$position"/> + <xsl:with-param name="text" select="current()"/> + </xsl:call-template> + </xsl:for-each> + </xsl:when> + <xsl:when test="contains($text,concat('*[name()=''',$current-group,''''))"> + <xsl:for-each select="tokenize($text,concat('\*\[name\(\)=''',$current-group,''''))"> + <xsl:if test="not(position()=1)"> + <xsl:value-of select="concat('Groupe[@typeGroupe=''',$current-group,'''')"/> + </xsl:if> + <xsl:call-template name="replace-element"> + <xsl:with-param name="position" select="$position"/> + <xsl:with-param name="text" select="current()"/> + </xsl:call-template> + </xsl:for-each> + </xsl:when> + <xsl:when test="contains($text,concat('/',$current-group,'-Container'))"> + <xsl:for-each select="tokenize($text,concat('/',$current-group,'-Container'))"> + <xsl:if test="not(position()=1)"> + <xsl:value-of select="concat('/Groupe[@idGroupe=''',$current-group,''']')"/> + </xsl:if> + <xsl:call-template name="replace-element"> + <xsl:with-param name="position" select="$position"/> + <xsl:with-param name="text" select="current()"/> + </xsl:call-template> + </xsl:for-each> + </xsl:when> + <xsl:when test="contains($text,concat('$',$current-group,'-position'))"> + <xsl:for-each select="tokenize($text,concat('\$',$current-group,'-position'))"> + <xsl:if test="not(position()=1)"> + <xsl:value-of select="concat('$',$current-group,'-position')"/> + </xsl:if> + <xsl:call-template name="replace-element"> + <xsl:with-param name="position" select="$position"/> + <xsl:with-param name="text" select="current()"/> + </xsl:call-template> + </xsl:for-each> + </xsl:when> + <xsl:when test="contains($text,concat($current-group,'-position'))"> + <xsl:for-each select="tokenize($text,concat($current-group,'-position'))"> + <xsl:if test="not(position()=1)"> + <xsl:value-of select="concat($current-group,'-position')"/> + </xsl:if> + <xsl:call-template name="replace-element"> + <xsl:with-param name="position" select="$position"/> + <xsl:with-param name="text" select="current()"/> + </xsl:call-template> + </xsl:for-each> + </xsl:when> + <xsl:when test="contains($text,concat($current-group,'-AddLine'))"> + <xsl:for-each select="tokenize($text,concat($current-group,'-AddLine'))"> + <xsl:if test="not(position()=1)"> + <xsl:value-of select="concat($current-group,'-AddLine')"/> + </xsl:if> + <xsl:call-template name="replace-element"> + <xsl:with-param name="position" select="$position"/> + <xsl:with-param name="text" select="current()"/> + </xsl:call-template> + </xsl:for-each> + </xsl:when> + <xsl:when test="contains($text,concat($current-group,'-Count'))"> + <xsl:for-each select="tokenize($text,concat($current-group,'-Count'))"> + <xsl:if test="not(position()=1)"> + <xsl:value-of select="concat($current-group,'-Count')"/> + </xsl:if> + <xsl:call-template name="replace-element"> + <xsl:with-param name="position" select="$position"/> + <xsl:with-param name="text" select="current()"/> + </xsl:call-template> + </xsl:for-each> + </xsl:when> + <xsl:when test="contains($text,concat('CurrentLoopElement[@loop-name=''',$current-group,''']'))"> + <xsl:for-each select="tokenize($text,concat('CurrentLoopElement\[@loop-name=''',$current-group,'''\]'))"> + <xsl:if test="not(position()=1)"> + <xsl:value-of select="concat('CurrentLoopElement[@loop-name=''',$current-group,''']')"/> + </xsl:if> + <xsl:call-template name="replace-element"> + <xsl:with-param name="position" select="$position"/> + <xsl:with-param name="text" select="current()"/> + </xsl:call-template> + </xsl:for-each> + </xsl:when> + <xsl:when test="contains($text,concat('descendant::',$current-group))"> + <xsl:for-each select="tokenize($text,concat('descendant::',$current-group))"> + <xsl:if test="not(position()=1)"> + <xsl:value-of select="concat('descendant::Groupe[@typeGroupe=''',$current-group,''']')"/> + </xsl:if> + <xsl:call-template name="replace-element"> + <xsl:with-param name="position" select="$position"/> + <xsl:with-param name="text" select="current()"/> + </xsl:call-template> + </xsl:for-each> + </xsl:when> + <xsl:when test="contains($text,concat('ancestor::',$current-group))"> + <xsl:for-each select="tokenize($text,concat('ancestor::',$current-group))"> + <xsl:if test="not(position()=1)"> + <xsl:value-of select="concat('ancestor::Groupe[@typeGroupe=''',$current-group,''']')"/> + </xsl:if> + <xsl:call-template name="replace-element"> + <xsl:with-param name="position" select="$position"/> + <xsl:with-param name="text" select="current()"/> + </xsl:call-template> + </xsl:for-each> + </xsl:when> + <xsl:when test="contains($text,concat('/',$current-group))"> + <xsl:for-each select="tokenize($text,concat('/',$current-group))"> + <xsl:if test="not(position()=1)"> + <xsl:value-of select="concat('/Groupe[@typeGroupe=''',$current-group,''']')"/> + </xsl:if> + <xsl:call-template name="replace-element"> + <xsl:with-param name="position" select="$position"/> + <xsl:with-param name="text" select="current()"/> + </xsl:call-template> + </xsl:for-each> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="'toto'"/> + <xsl:for-each select="tokenize($text,$current-group)"> + <xsl:if test="not(position()=1)"> + <xsl:value-of select="concat('toto',$current-group,'toto')"/> + </xsl:if> + <xsl:call-template name="replace-element"> + <xsl:with-param name="position" select="$position"/> + <xsl:with-param name="text" select="current()"/> + </xsl:call-template> + </xsl:for-each> + </xsl:otherwise> + </xsl:choose> + </xsl:when> + <xsl:otherwise> + <xsl:call-template name="replace-element"> + <xsl:with-param name="position" select="$position +1"/> + <xsl:with-param name="text" select="$text"/> + </xsl:call-template> + </xsl:otherwise> + </xsl:choose> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="$text"/> + </xsl:otherwise> + </xsl:choose> + </xsl:template> + +</xsl:transform> diff --git a/src/main/resources/xslt/util/fr/patron/patron-business.xsl b/src/main/resources/xslt/util/fr/patron/patron-business.xsl new file mode 100644 index 000000000..28be1c9a0 --- /dev/null +++ b/src/main/resources/xslt/util/fr/patron/patron-business.xsl @@ -0,0 +1,174 @@ +<?xml version="1.0" encoding='utf-8'?> +<xsl:transform version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:xf="http://www.w3.org/2002/xforms" xmlns:xhtml="http://www.w3.org/1999/xhtml" + xmlns:fr="http://orbeon.org/oxf/xml/form-runner" xmlns:xxf="http://orbeon.org/oxf/xml/xforms" + xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:xs="http://www.w3.org/2001/XMLSchema"> + + <xsl:output method="xml" encoding="utf-8"/> + <!-- Transformation pour ajouter la page d'accueil des différents questionnaires --> + + <!-- La campagne --> + <xsl:param name="campagne" as="xs:string"/> + <!-- Le modèle --> + <xsl:param name="modele" as="xs:string"/> + + <!-- Fichier de propriétés eno --> + <xsl:param name="fichier-proprietes"/> + <xsl:variable name="proprietes" select="doc($fichier-proprietes)"/> + + <!-- En paramètre le fichier de paramétrage qui contient les informations provenant de Pilotage --> + <xsl:param name="fichier-parametrage"/> + <xsl:variable name="parametres" select="doc($fichier-parametrage)"/> + + + <!-- On récupère ces informations, si le modèle de données change, on pourra simplement modifier cette partie --> + <xsl:variable name="LibelleEnquete" select="$parametres/InformationsCollecte/Campagne/Libelle"/> +<!-- <xsl:variable name="LibelleSource" select="$parametres/InformationsCollecte/Source/LibelleLong"/> + <xsl:variable name="AnneeCampagne" + select="$parametres/InformationsCollecte/Campagne/AnneeReference"/> + <xsl:variable name="PeriodeCampagne" + select="$parametres/InformationsCollecte/Campagne/PeriodeReference"/> + <xsl:variable name="FrequenceEnquete" + select="$parametres/InformationsCollecte/Source/Frequence/Libelle"/> +--> <!-- La liste des fréquences qui font afficher la période, séparées par des virgules --> + <xsl:variable name="frequences" + select="('mensuelle','trimestrielle','bimestrielle','semestrielle')" as="xs:string *"/> + <xsl:variable name="URLNotice" select="$parametres/InformationsCollecte/Enquete/URLNotice"/> + <xsl:variable name="URLSpecimen" select="$parametres/InformationsCollecte/Enquete/URLSpecimen"/> + <xsl:variable name="URLDiffusion" select="$parametres/InformationsCollecte/Enquete/URLDiffusion"/> + + + <xsl:template match="/"> + <xsl:apply-templates select="xhtml:html"/> + </xsl:template> + + <xd:doc xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl"> + <xd:desc> + <xd:p>Template de base pour tous les éléments et tous les attributs, on recopie + simplement en sortie</xd:p> + </xd:desc> + </xd:doc> + <xsl:template match="node() | @*"> + <xsl:copy> + <xsl:apply-templates select="node() | @*"/> + </xsl:copy> + </xsl:template> + + <!-- On intègre la zone données-pilotage --> + + <xsl:template match="xf:bind[@id='fr-form-instance-binds']"> + <xsl:copy> + <xsl:apply-templates select="node() | @*"/> + </xsl:copy> + <!-- Une instance pour éventuellement accueilir les données de Pilotage --> + <xf:instance id="donnees-pilotage"> + <InformationsQuestionnaire> + <UniteEnquetee> + <BarreFixe/> + <LabelUniteEnquetee/> + </UniteEnquetee> + </InformationsQuestionnaire> + </xf:instance> + + <!-- Et le bind correspondant --> + <xf:bind id="donnees-pilotage-binds" ref="instance('donnees-pilotage')"> + <xf:bind id="UniteEnquetee-bind" ref="UniteEnquetee"> + <xf:bind id="BarreFixe-bind" ref="BarreFixe"/> + <xf:bind id="LabelUniteEnquetee-bind" ref="LabelUniteEnquetee"/> + </xf:bind> + </xf:bind> + </xsl:template> + + <!-- Et on rajoute un label pour l'élément qui affiche les infos de l'unité enquêtée --> + <xsl:template match="resource[ancestor::xf:instance[@id='fr-form-resources']]"> + <xsl:copy> + <xsl:apply-templates select="node() | @*"/> + <BarreFixe> + <label>Votre </label> + </BarreFixe> + </xsl:copy> + </xsl:template> + + <!-- On rajoute cet élément dans cette div --> + <xsl:template match="xhtml:div[parent::fr:body]"> + <xsl:copy> + <xsl:apply-templates select="@*"/> + <xf:output id="BarreFixe-control" bind="BarreFixe-bind"> + <xf:label ref="$form-resources/BarreFixe/label" mediatype="text/html"/> + </xf:output> + <xsl:apply-templates select="node()"/> + </xsl:copy> + </xsl:template> + + <!-- On modifie le titre du formulaire --> + <xsl:template + match="xhtml:title | title[parent::metadata[parent::xf:instance[@id='fr-form-metadata']]]"> + <xsl:copy> + <xsl:value-of select="$LibelleEnquete"/> + <!--<xsl:value-of select="$LibelleSource"/> + <xsl:if test="$FrequenceEnquete=$frequences"> + <xsl:text> </xsl:text> + <xsl:value-of select="$PeriodeCampagne"/> + </xsl:if> + <xsl:text> </xsl:text> + <xsl:value-of select="$AnneeCampagne"/>--> + </xsl:copy> + </xsl:template> + + <!-- On insère la balise perso après la balise util de stromae --> + <xsl:template match="Util[ancestor::xf:instance[@id='fr-form-instance']]"> + <xsl:copy> + <xsl:apply-templates select="node() | @*"/> + </xsl:copy> + <perso/> + </xsl:template> + + <!-- On surcharge la ressource d'enregistrement pour les deux submissions utilisée dans eno-core--> + <xsl:template match="xf:submission[@id='save' or @id='submit']"> + <xsl:copy> + <xsl:apply-templates select="@*"/> + <xsl:variable name="resource"> + <xsl:value-of + select="concat('{xxf:property(''server-exist-orbeon'')}/restxq/{xxf:property(''enregistrer-service'')}/',$campagne,'/',$modele,'/{xxf:get-request-parameter(''unite-enquete'')}?ongletproof=oui')" + /> + </xsl:variable> + <xsl:attribute name="resource" select="$resource"/> + <xsl:apply-templates select="node()"/> + </xsl:copy> + </xsl:template> + + <!-- On rajoute une submission pour envoyer un PDF en base juste avant le xforms-ready --> + <xsl:template + match="xf:action[@ev:event='xforms-ready' and following-sibling::*[position()=1 and name()='xf:action' and @ev:event='page-change']]"> + <xf:submission id="expedierPdf" method="post" replace="none"> + <xsl:variable name="resource"> + <xsl:value-of + select="concat('/expedier/',$campagne,'/{xxf:get-request-parameter(''unite-enquete'')}?modele=',$modele)" + /> + </xsl:variable> + <xsl:attribute name="resource" select="$resource"/> + </xf:submission> + <xsl:copy> + <xsl:apply-templates select="node() | @*"/> + </xsl:copy> + </xsl:template> + + <!-- On inscrit ces infos dans la partie perso-formulaire. Elles seront réorganisées dans orbeon --> + <xsl:template match="fr:body/xf:switch[@id='section-body']"> + <xhtml:div class="perso-formulaire"> + <xsl:if test="$URLNotice/text()"> + <xhtml:a href="{$URLNotice}" id="URLNotice"/> + </xsl:if> + <xsl:if test="$URLSpecimen/text()"> + <xhtml:a href="{$URLSpecimen}" id="URLSpecimen"/> + </xsl:if> + <xsl:if test="$URLDiffusion/text()"> + <xhtml:a href="{$URLDiffusion}" id="URLDiffusion"/> + </xsl:if> + </xhtml:div> + <xsl:copy> + <xsl:apply-templates select="node() | @*"/> + </xsl:copy> + </xsl:template> + +</xsl:transform> diff --git a/src/main/resources/xslt/util/fr/patron/patron-household.xsl b/src/main/resources/xslt/util/fr/patron/patron-household.xsl new file mode 100644 index 000000000..de6ae7f38 --- /dev/null +++ b/src/main/resources/xslt/util/fr/patron/patron-household.xsl @@ -0,0 +1,169 @@ +<?xml version="1.0" encoding='utf-8'?> +<xsl:transform version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:xf="http://www.w3.org/2002/xforms" xmlns:xhtml="http://www.w3.org/1999/xhtml" + xmlns:fr="http://orbeon.org/oxf/xml/form-runner" xmlns:xxf="http://orbeon.org/oxf/xml/xforms" + xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:xs="http://www.w3.org/2001/XMLSchema"> + + <xsl:output method="xml" encoding="utf-8"/> + <!-- Transformation pour ajouter la page d'accueil des différents questionnaires --> + + <!-- La campagne --> + <xsl:param name="campagne" as="xs:string"/> + <!-- Le modèle --> + <xsl:param name="modele" as="xs:string"/> + + <!-- Fichier de propriétés eno --> + <xsl:param name="fichier-proprietes"/> + <xsl:variable name="proprietes" select="doc($fichier-proprietes)"/> + + <!-- En paramètre le fichier de paramétrage qui contient les informations provenant de Pilotage --> + <xsl:param name="fichier-parametrage"/> + <xsl:variable name="parametres" select="doc($fichier-parametrage)"/> + + + <!-- On récupère ces informations, si le modèle de données change, on pourra simplement modifier cette partie --> + <xsl:variable name="LibelleEnquete" select="$parametres/metadonnees/LibelleEnquete"/> + <!-- <xsl:variable name="LibelleSource" select="$parametres/InformationsCollecte/Source/LibelleLong"/> + <xsl:variable name="AnneeCampagne" + select="$parametres/InformationsCollecte/Campagne/AnneeReference"/> + <xsl:variable name="PeriodeCampagne" + select="$parametres/InformationsCollecte/Campagne/PeriodeReference"/> + <xsl:variable name="FrequenceEnquete" + select="$parametres/InformationsCollecte/Source/Frequence/Libelle"/> +--> <!-- La liste des fréquences qui font afficher la période, séparées par des virgules --> + <xsl:variable name="frequences" + select="('mensuelle','trimestrielle','bimestrielle','semestrielle')" as="xs:string *"/> + <xsl:variable name="URLNotice" select="$parametres/InformationsCollecte/Enquete/URLNotice"/> + <xsl:variable name="URLSpecimen" select="$parametres/InformationsCollecte/Enquete/URLSpecimen"/> + <xsl:variable name="URLDiffusion" select="$parametres/InformationsCollecte/Enquete/URLDiffusion"/> + + + <xsl:template match="/"> + <xsl:apply-templates select="xhtml:html"/> + </xsl:template> + + <xd:doc xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl"> + <xd:desc> + <xd:p>Template de base pour tous les éléments et tous les attributs, on recopie + simplement en sortie</xd:p> + </xd:desc> + </xd:doc> + <xsl:template match="node() | @*"> + <xsl:copy> + <xsl:apply-templates select="node() | @*"/> + </xsl:copy> + </xsl:template> + + <!-- On rajoute les css spécifiques à Coltrane --> + <xsl:template match="xhtml:head"> + <xsl:copy> + <xsl:apply-templates select="*[not(name()='xf:model')]"/> + <xsl:apply-templates select="xf:model"/> + </xsl:copy> + </xsl:template> + + <!-- On intègre la zone données-pilotage --> + + <xsl:template match="xf:bind[@id='fr-form-instance-binds']"> + <xsl:copy> + <xsl:apply-templates select="node() | @*"/> + </xsl:copy> + <!-- Une instance pour éventuellement accueilir les données de Pilotage --> + <xf:instance id="donnees-pilotage"> + <InformationsQuestionnaire> + <!--<UniteEnquetee> + <BarreFixe/> + <LabelUniteEnquetee/> + </UniteEnquetee>--> + </InformationsQuestionnaire> + </xf:instance> + + <!-- Et le bind correspondant --> + <xf:bind id="donnees-pilotage-binds" ref="instance('donnees-pilotage')"> + <!--<xf:bind id="UniteEnquetee-bind" ref="UniteEnquetee"> + <xf:bind id="BarreFixe-bind" ref="BarreFixe"/> + <xf:bind id="LabelUniteEnquetee-bind" ref="LabelUniteEnquetee"/> + </xf:bind>--> + </xf:bind> + </xsl:template> + + <!-- Et on rajoute un label pour l'élément qui affiche les infos de l'unité enquêtée --> + <xsl:template match="resource[ancestor::xf:instance[@id='fr-form-resources']]"> + <xsl:copy> + <xsl:apply-templates select="node() | @*"/> + </xsl:copy> + </xsl:template> + + <!-- On rajoute cet élément dans cette div --> + <xsl:template match="xhtml:div[parent::fr:body]"> + <xsl:copy> + <xsl:apply-templates select="@*"/> + <xsl:apply-templates select="node()"/> + </xsl:copy> + </xsl:template> + + <!-- On modifie le titre du formulaire --> + <xsl:template + match="xhtml:title | title[parent::metadata[parent::xf:instance[@id='fr-form-metadata']]]"> + <xsl:copy> + <xsl:value-of select="$LibelleEnquete"/> + </xsl:copy> + </xsl:template> + + <!-- On insère la balise perso après la balise util de stromae --> + <xsl:template match="Util[ancestor::xf:instance[@id='fr-form-instance']]"> + <xsl:copy> + <xsl:apply-templates select="node() | @*"/> + </xsl:copy> + <perso/> + </xsl:template> + + <!-- On surcharge la ressource d'enregistrement pour les deux submissions utilisée dans eno-core--> + <xsl:template match="xf:submission[@id='save' or @id='submit']"> + <xsl:copy> + <xsl:apply-templates select="@*"/> + <xsl:variable name="resource"> + <xsl:value-of + select="concat('{xxf:property(''server-exist-orbeon'')}/restxq/{xxf:property(''enregistrer-service'')}/',$campagne,'/',$modele,'/{xxf:get-request-parameter(''unite-enquete'')}?ongletproof=oui')" + /> + </xsl:variable> + <xsl:attribute name="resource" select="$resource"/> + <xsl:apply-templates select="node()"/> + </xsl:copy> + </xsl:template> + + <!-- On rajoute une submission pour envoyer un PDF en base juste avant le xforms-ready --> + <xsl:template + match="xf:action[@ev:event='xforms-ready' and following-sibling::*[position()=1 and name()='xf:action' and @ev:event='page-change']]"> + <xf:submission id="expedierPdf" method="post" replace="none"> + <xsl:variable name="resource"> + <xsl:value-of + select="concat('/expedier/',$campagne,'/{xxf:get-request-parameter(''unite-enquete'')}?modele=',$modele)" + /> + </xsl:variable> + <xsl:attribute name="resource" select="$resource"/> + </xf:submission> + <xsl:copy> + <xsl:apply-templates select="node() | @*"/> + </xsl:copy> + </xsl:template> + + <!-- On inscrit ces infos dans la partie perso-formulaire. Elles seront réorganisées dans orbeon --> + <xsl:template match="fr:body/xf:switch[@id='section-body']"> + <xhtml:div class="perso-formulaire"> + <xsl:if test="$URLNotice/text()"> + <xhtml:a href="{$URLNotice}" id="URLNotice"/> + </xsl:if> + <xsl:if test="$URLSpecimen/text()"> + <xhtml:a href="{$URLSpecimen}" id="URLSpecimen"/> + </xsl:if> + <xsl:if test="$URLDiffusion/text()"> + <xhtml:a href="{$URLDiffusion}" id="URLDiffusion"/> + </xsl:if> + </xhtml:div> + <xsl:copy> + <xsl:apply-templates select="node() | @*"/> + </xsl:copy> + </xsl:template> + +</xsl:transform> diff --git a/src/main/resources/xslt/util/fr/welcome/welcome-business.xsl b/src/main/resources/xslt/util/fr/welcome/welcome-business.xsl new file mode 100644 index 000000000..603f39489 --- /dev/null +++ b/src/main/resources/xslt/util/fr/welcome/welcome-business.xsl @@ -0,0 +1,348 @@ +<?xml version="1.0" encoding='utf-8'?> +<xsl:transform version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:xf="http://www.w3.org/2002/xforms" xmlns:xhtml="http://www.w3.org/1999/xhtml" + xmlns:fr="http://orbeon.org/oxf/xml/form-runner" xmlns:xxf="http://orbeon.org/oxf/xml/xforms" + xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:xs="http://www.w3.org/2001/XMLSchema"> + + <xsl:output method="xml" encoding="utf-8"/> + <!-- Transformation pour ajouter la page d'accueil des différents questionnaires --> + + <!-- En paramètre le fichier de paramétrage qui contient les informations provenant de Pilotage --> + <xsl:param name="fichier-parametrage"/> + <xsl:variable name="parametres" select="doc($fichier-parametrage)"/> + + <!-- Fichier de propriétés eno --> + <xsl:param name="fichier-proprietes"/> + <xsl:variable name="proprietes" select="doc($fichier-proprietes)"/> + + <!-- On récupère ces informations, si le modèle de données change, on pourra simplement modifier cette partie --> + <xsl:variable name="LibelleEnquete" select="$parametres/InformationsCollecte/Campagne/Libelle"/> +<!-- <xsl:variable name="LibelleSource" select="$parametres/InformationsCollecte/Source/LibelleLong"/> + <xsl:variable name="AnneeCampagne" + select="$parametres/InformationsCollecte/Campagne/AnneeReference"/> + <xsl:variable name="PeriodeCampagne" + select="$parametres/InformationsCollecte/Campagne/PeriodeReference"/>--> + <xsl:variable name="ArticleServiceProducteur" + select="if($parametres/InformationsCollecte/ServiceProducteur/Article/text()='l''') + then($parametres/InformationsCollecte/ServiceProducteur/Article) + else (concat($parametres/InformationsCollecte/ServiceProducteur/Article/text(),' '))"/> + <xsl:variable name="LibelleServiceProducteur" + select="concat($ArticleServiceProducteur,$parametres/InformationsCollecte/ServiceProducteur/Libelle)"/> + <xsl:variable name="MinistereTutellesServiceProducteur" + select="$parametres/InformationsCollecte/ServiceProducteur/MinistereTutelle[text()]"/> + <xsl:variable name="AnneeCollecte" + select="$parametres/InformationsCollecte/Enquete/AnneeCollecte"/> + <xsl:variable name="FrequenceEnquete" + select="$parametres/InformationsCollecte/Source/Frequence/Libelle"/> + <!-- La liste des fréquences qui font afficher la période, séparées par des virgules --> + <xsl:variable name="frequences" + select="('mensuelle','trimestrielle','bimestrielle','semestrielle')" as="xs:string *"/> + <xsl:variable name="ObjectifsEnquete" + select="normalize-space($parametres/InformationsCollecte/Enquete/ObjectifsCourts)"/> + <xsl:variable name="CaractereObligatoireEnquete" + select="upper-case($parametres/InformationsCollecte/Enquete/CaractereObligatoire)"/> + <!-- Valeur pour laquelle on affiche le fait que l'enquête a un caractère obligatoire --> + <xsl:variable name="CaractereObligatoireEnqueteReference" select="string('OUI')"/> + <xsl:variable name="SimplificationEntreprises" + select="upper-case($parametres/InformationsCollecte/Enquete/SimplificationEntreprises)"/> + <!-- Valeur pour laquelle on affiche le fait que l'enquête a un caractère obligatoire --> + <xsl:variable name="SimplificationEntreprisesReference" select="string('OUI')"/> + + <xsl:variable name="StatutEnquete" + select="$parametres/InformationsCollecte/Enquete/StatutEnquete"/> + <xsl:variable name="NumeroVisa" select="$parametres/InformationsCollecte/Enquete/NumeroVisa"/> + + <xsl:variable name="espace" select="string(' ')"/> + + <xsl:template match="/"> + <xsl:apply-templates select="xhtml:html"/> + </xsl:template> + + <xd:doc xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl"> + <xd:desc> + <xd:p>Template de base pour tous les éléments et tous les attributs, on recopie + simplement en sortie</xd:p> + </xd:desc> + </xd:doc> + <xsl:template match="node() | @*"> + <xsl:copy> + <xsl:apply-templates select="node() | @*"/> + </xsl:copy> + </xsl:template> + + <!-- On remplace la page de début générique par une page d'accueil coltrane --> + <xsl:template match="Beginning[parent::form[parent::xf:instance[@id='fr-form-instance']]]"> + <ACCUEIL> + <ACCUEIL-1/> + <ACCUEIL-2/> + <ACCUEIL-3/> + <ACCUEIL-4/> + <ACCUEIL-5/> + <ACCUEIL-6/> + <ACCUEIL-7/> + </ACCUEIL> + </xsl:template> + + <!-- Le bind correspondant --> + <xsl:template match="xf:bind[@name='beginning']"> + <xf:bind id="ACCUEIL-bind" name="ACCUEIL" ref="ACCUEIL"> + <xf:bind id="ACCUEIL-1-bind" name="ACCUEIL-1" ref="ACCUEIL-1"/> + <xf:bind id="ACCUEIL-2-bind" name="ACCUEIL-2" ref="ACCUEIL-2"/> + <xf:bind id="ACCUEIL-3-bind" name="ACCUEIL-3" ref="ACCUEIL-3"/> + <xf:bind id="ACCUEIL-4-bind" name="ACCUEIL-4" ref="ACCUEIL-4"/> + <xf:bind id="ACCUEIL-5-bind" name="ACCUEIL-5" ref="ACCUEIL-5"/> + <xf:bind id="ACCUEIL-6-bind" name="ACCUEIL-6" ref="ACCUEIL-6"/> + <xf:bind id="ACCUEIL-7-bind" name="ACCUEIL-7" ref="ACCUEIL-7" + relevant="if (instance('fr-form-util')/cadreLegal/text()!='') then (true()) else (false())" + /> + </xf:bind> + </xsl:template> + + <!-- Les ressources correspondantes --> + <xsl:template match="Beginning[ancestor::xf:instance[@id='fr-form-resources']]"> + <ACCUEIL> + <label>ACCUEIL</label> + </ACCUEIL> + <ACCUEIL-1> + <label> + <xsl:text><p>Bienvenue sur le questionnaire de réponse à l'enquête <b></xsl:text> + <xsl:value-of select="$LibelleEnquete"/> + <xsl:text></b></xsl:text> + <xsl:text><span title="</xsl:text> + <xsl:value-of select="$ObjectifsEnquete"/> + <xsl:text>"> <img src="/img/Help-browser.svg.png"/> </span></xsl:text> + <xsl:text></p></xsl:text> + </label> + </ACCUEIL-1> + <ACCUEIL-2> + <label> + <xsl:text><div class="frame"><p>Cette enquête</xsl:text> + <xsl:if test="$CaractereObligatoireEnquete=$CaractereObligatoireEnqueteReference"> + <xsl:text>, + à <b><span style="text-decoration:underline">caractère + obligatoire</span></b>,</xsl:text> + </xsl:if> + <xsl:text> est reconnue d'<b></xsl:text> + <xsl:value-of select="$StatutEnquete"/> + <xsl:text></b>.</p><p>Merci de répondre avant le : + <b>øDATE_RETOUR_SOUHAITEEø</b></p></div></xsl:text> + </label> + </ACCUEIL-2> + <ACCUEIL-3> + <label><p> </p></label> + </ACCUEIL-3> + <ACCUEIL-4> + <label><p><b>Informations pratiques pour le + remplissage</b></p></label> + </ACCUEIL-4> + <ACCUEIL-5> + <label> + <xsl:text><div class="frameAvertissement"><p><b>Pensez à enregistrer + régulièrement votre questionnaire.</b> Au bout de 30 minutes sans + activité, pour des raisons de sécurité, vous serez en effet automatiquement + déconnecté. La sauvegarde des données vous incombant, les données saisies depuis + la dernière sauvegarde seront perdues.</p> + <p>Lorsque vous quitterez ce questionnaire, privilégiez la fermeture par le bouton <b>Déconnexion</b> afin d'éviter d'éventuels problèmes de navigation ultérieurs.</p> + <p><b>Veuillez utiliser les boutons <img src="</xsl:text> + <xsl:value-of + select="concat('/',$proprietes//images/dossier,'/',$proprietes//images/precedent)"/> + <xsl:text>"/> et <img + src="</xsl:text> + <xsl:value-of + select="concat('/',$proprietes//images/dossier,'/',$proprietes//images/suivant)"/> + <xsl:text>"/> pour naviguer dans le + questionnaire</b> et non pas les boutons "Précédent" et "Suivant" de votre + navigateur.</p></div> + </xsl:text> + </label> + </ACCUEIL-5> + <ACCUEIL-6> + <label><p> </p></label> + </ACCUEIL-6> + <ACCUEIL-7> + <label> + <xsl:text><div class="frame"><p>Vu l'avis favorable du Conseil national de + l'information statistique, cette enquête</xsl:text> + <xsl:choose> + <xsl:when + test="$CaractereObligatoireEnquete=$CaractereObligatoireEnqueteReference"> + <xsl:text>, reconnue d'<b></xsl:text> + <xsl:value-of select="$StatutEnquete"/> + <!--<xsl:text>, est + obligatoire.</b></xsl:text>--> + <xsl:text>, est + obligatoire, </b>en application de la <a + href="</xsl:text> + <xsl:value-of select="$proprietes//lois/statistique"/> + <xsl:text>" target="_blank">loi n° 51-711 du 7 juin 1951 modifiée</a> sur l’obligation, la coordination et le secret en matière de statistiques.</xsl:text> + </xsl:when> + <xsl:otherwise> + <xsl:text> est reconnue d'<b></xsl:text> + <xsl:value-of select="$StatutEnquete"/> + <!-- <xsl:text></b> sans avoir de caractère obligatoire.</xsl:text>--> + <xsl:text></b> sans avoir de caractère obligatoire, en application de la <a + href="</xsl:text> + <xsl:value-of select="$proprietes//lois/statistique"/> + <xsl:text>" target="_blank">loi n° 51-711 du 7 juin 1951 modifiée</a> sur l’obligation, la coordination et le secret en matière de statistiques.</xsl:text> + </xsl:otherwise> + </xsl:choose> + <xsl:if test="$SimplificationEntreprises=$SimplificationEntreprisesReference"> + <xsl:text> Elle entre dans le champ de la circulaire n° 2015-11 du 5 novembre 2015, qui s’inscrit + dans le cadre des mesures de simplification pour les entreprises.</xsl:text> + </xsl:if> + <xsl:text></p><p>Visa n°</xsl:text> + <xsl:value-of select="$NumeroVisa"/> + <xsl:text> </xsl:text> + <xsl:for-each select="$MinistereTutellesServiceProducteur"> + <xsl:text>du Ministre </xsl:text> + <xsl:value-of select="."/> + <xsl:text>, </xsl:text> + </xsl:for-each> + <xsl:text>valable pour l'année </xsl:text> + <xsl:value-of select="$AnneeCollecte"/> + <xsl:text>.</p><p>Les réponses à ce questionnaire sont protégées par le secret statistique et destinées à </xsl:text> + <xsl:value-of select="$LibelleServiceProducteur"/> + <xsl:text>.</p></xsl:text> + + <xsl:text><p>Le <a href="</xsl:text> + <xsl:value-of select="$proprietes//lois/rgpd"/> + <xsl:text>" target="_blank">règlement général 2016/679 du 27 avril 2016</a> sur la protection des données (RGPD)</xsl:text> + <xsl:text> ainsi que la <a href="</xsl:text> + <xsl:value-of select="$proprietes//lois/informatique"/> + <xsl:text>" target="_blank">loi n°78-17 du 6 janvier 1978 modifiée</a> relative à l'informatique, aux fichiers et aux libertés s'appliquent à la présente enquête pour les données à caractère personnel. Ces droits, rappelés dans la lettre-avis, peuvent être exercés auprès de </xsl:text> + <xsl:value-of select="$LibelleServiceProducteur"/> + <xsl:text>.</p></xsl:text> + <xsl:text>.</div></xsl:text> + </label> + </ACCUEIL-7> + </xsl:template> + + <xsl:template match="GenericBeginningText[ancestor::xf:instance[@id='fr-form-resources']]"/> + + + + <!-- On remplace la page dans l'instance qui sert à gérer le questionnaire --> + <xsl:template match="Beginning[ancestor::xf:instance[@id='fr-form-util']]"> + <ACCUEIL/> + </xsl:template> + + <!-- On place le corps html ici --> + <xsl:template match="fr:section[@name='beginning']"> + <fr:section id="ACCUEIL-control" bind="ACCUEIL-bind" name="ACCUEIL"> + <xf:label ref="$form-resources/ACCUEIL/label"/> + <xf:output id="ACCUEIL-1-control" name="ACCUEIL-1" bind="ACCUEIL-1-bind" + xxf:order="label help control hint alert" class="icone-help"> + <xf:label ref="$form-resources/ACCUEIL-1/label" mediatype="text/html"/> + <xf:help ref="$form-resources/ACCUEIL-1/help" mediatype="text/html"/> + </xf:output> + <xf:output id="ACCUEIL-2-control" name="ACCUEIL-2" bind="ACCUEIL-2-bind" + xxf:order="label control hint help alert"> + <xf:label ref="$form-resources/ACCUEIL-2/label" mediatype="text/html"/> + </xf:output> + <xf:output id="ACCUEIL-3-control" name="ACCUEIL-3" bind="ACCUEIL-3-bind" + xxf:order="label control hint help alert"> + <xf:label ref="$form-resources/ACCUEIL-3/label" mediatype="text/html"/> + </xf:output> + <xf:output id="ACCUEIL-4-control" name="ACCUEIL-4" bind="ACCUEIL-4-bind" + xxf:order="label control hint help alert"> + <xf:label ref="$form-resources/ACCUEIL-4/label" mediatype="text/html"/> + </xf:output> + <xf:output id="ACCUEIL-5-control" name="ACCUEIL-5" bind="ACCUEIL-5-bind" + xxf:order="label control hint help alert"> + <xf:label ref="$form-resources/ACCUEIL-5/label" mediatype="text/html"/> + </xf:output> + <xf:output id="ACCUEIL-6-control" name="ACCUEIL-6" bind="ACCUEIL-6-bind" + xxf:order="label control hint help alert"> + <xf:label ref="$form-resources/ACCUEIL-6/label" mediatype="text/html"/> + </xf:output> + <xf:trigger id="cadreLegal" appearance="minimal"> + <xf:label> + <xf:output + value="concat(if (instance('fr-form-util')/cadreLegal/text()!='') then ('-') else ('+'),' Connaître le cadre légal de l''enquête ?')" + /> + </xf:label> + <xf:setvalue ev:event="DOMActivate" ref="instance('fr-form-util')/cadreLegal" + value="if (instance('fr-form-util')/cadreLegal/text()!='') then ('') else ('affiche')" + /> + </xf:trigger> + <xf:output id="ACCUEIL-7-control" name="ACCUEIL-7" bind="ACCUEIL-7-bind" + xxf:order="label control hint help alert"> + <xf:label ref="$form-resources/ACCUEIL-7/label" mediatype="text/html"/> + </xf:output> + </fr:section> + </xsl:template> + + <!-- On fait apparaître/disparaître le cadre legal de la page d'accueil à l'aide d'un lien --> + <xsl:template match="xf:instance [@id='fr-form-util']/Util"> + <xsl:copy> + <cadreLegal/> + <xsl:apply-templates select="node() | @*"/> + </xsl:copy> + </xsl:template> + <xsl:template + match="xf:bind[@id='current-section-name-bind']/@calculate + | xf:action[@ev:event='page-change']/xf:action/@if"> + <xsl:attribute name="{name()}"> + <xsl:for-each select="tokenize(., '''')"> + <xsl:if test="position()>1"> + <xsl:value-of select="''''"/> + </xsl:if> + <xsl:choose> + <xsl:when test="string(number(.))!='NaN'"> + <xsl:value-of select="number(.)+1"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="."/> + </xsl:otherwise> + </xsl:choose> + </xsl:for-each> + </xsl:attribute> + </xsl:template> + + <xsl:template match="xf:bind[@id='progress-percent-bind']"> + <xsl:copy> + <xsl:apply-templates select="@*"/> + <xsl:attribute name="calculate"> + <xsl:choose> + <xsl:when test="contains(@calculate,'<')"> + <xsl:variable name="old-loop-number" + select="substring-before(substring-after(@calculate,'<'),')')"/> + <xsl:variable name="new-loop-number" select="number($old-loop-number)+1"/> + <xsl:value-of + select="replace(replace(replace(@calculate, + concat('number\(instance\(''fr-form-instance''\)/Util/CurrentSection\) <',$old-loop-number), + concat('number(instance(''fr-form-instance'')/Util/CurrentSection) <',$new-loop-number)), + concat('instance\(''fr-form-instance''\)/Util/CurrentSection =',$old-loop-number), + concat('instance(''fr-form-instance'')/Util/CurrentSection =',$new-loop-number)), + concat('round\(\(',$old-loop-number,'-2'), + concat('round((',$new-loop-number,'-2'))" + /> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="@calculate"/> + </xsl:otherwise> + </xsl:choose> + </xsl:attribute> + <xsl:apply-templates select="node()"/> + </xsl:copy> + </xsl:template> + + <xsl:template match="xf:action[@ev:event='page-change-done']/xf:action/@if"> + <xsl:attribute name="if"> + <xsl:for-each select="tokenize(.,' ')"> + <xsl:if test="position()>1"> + <xsl:value-of select="' '"/> + </xsl:if> + <xsl:choose> + <xsl:when test="string(number(.))!='NaN'"> + <xsl:value-of select="number(.)+1"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="."/> + </xsl:otherwise> + </xsl:choose> + </xsl:for-each> + </xsl:attribute> + </xsl:template> + +</xsl:transform> diff --git a/src/main/resources/xslt/util/fr/welcome/welcome-household.xsl b/src/main/resources/xslt/util/fr/welcome/welcome-household.xsl new file mode 100644 index 000000000..67e0db631 --- /dev/null +++ b/src/main/resources/xslt/util/fr/welcome/welcome-household.xsl @@ -0,0 +1,330 @@ +<?xml version="1.0" encoding='utf-8'?> +<xsl:transform version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:xf="http://www.w3.org/2002/xforms" xmlns:xhtml="http://www.w3.org/1999/xhtml" + xmlns:fr="http://orbeon.org/oxf/xml/form-runner" xmlns:xxf="http://orbeon.org/oxf/xml/xforms" + xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:xs="http://www.w3.org/2001/XMLSchema"> + + <xsl:output method="xml" encoding="utf-8"/> + <!-- Transformation pour ajouter la page d'accueil des différents questionnaires --> + + <!-- En paramètre le fichier de paramétrage qui contient les informations provenant de Pilotage --> + <xsl:param name="fichier-parametrage"/> + <xsl:variable name="parametres" select="doc($fichier-parametrage)"/> + + <!-- Fichier de propriétés eno --> + <xsl:param name="fichier-proprietes"/> + <xsl:variable name="proprietes" select="doc($fichier-proprietes)"/> + + <!-- On récupère ces informations, si le modèle de données change, on pourra simplement modifier cette partie --> + <xsl:variable name="Identifiant" select="$parametres/metadonnees/Identifiant"/> + <xsl:variable name="LibelleCourtEnquete" select="$parametres/metadonnees/LibelleCourtEnquete"/> + <xsl:variable name="LibelleCourtEnqueteMillesime" select="$parametres/metadonnees/LibelleCourtEnqueteMillesime"/> + <xsl:variable name="Frequence" select="$parametres/metadonnees/Frequence"/> + <xsl:variable name="AnneeReference" select="$parametres/metadonnees/AnneeReference"/> + <xsl:variable name="Idvague" select="$parametres/metadonnees/Idvague"/> + <xsl:variable name="DateOuverture" select="$parametres/metadonnees/DateOuverture"/> + <xsl:variable name="DateFermeture" select="$parametres/metadonnees/DateFermeture"/> + <xsl:variable name="BddVille" select="$parametres/metadonnees/BddVille"/> + <xsl:variable name="BddDateOuverture" select="$parametres/metadonnees/BddDateOuverture"/> + <xsl:variable name="BddArticleServiceProducteur" select="$parametres/metadonnees/BddArticleServiceProducteur"/> + <xsl:variable name="BddNomServiceProducteur" select="$parametres/metadonnees/BddNomServiceProducteur"/> + <xsl:variable name="BddNomServiceProducteurCourt" select="$parametres/metadonnees/BddNomServiceProducteurCourt"/> + <xsl:variable name="BddObjectifsLongs" select="$parametres/metadonnees/BddObjectifsLongs"/> + <xsl:variable name="BddCaractereObligatoire" select="$parametres/metadonnees/BddCaractereObligatoire"/> + <xsl:variable name="BddTypeUniteEnquetees" select="$parametres/metadonnees/BddTypeUniteEnquetees"/> + <xsl:variable name="BddTempsPassation" select="$parametres/metadonnees/BddTempsPassation"/> + <xsl:variable name="BddAdresseInternetEnquete" select="$parametres/metadonnees/BddAdresseInternetEnquete"/> + <xsl:variable name="BddURLRenseignement" select="$parametres/metadonnees/BddURLRenseignement"/> + <xsl:variable name="BddURLDiffusion" select="$parametres/metadonnees/BddURLDiffusion"/> + <xsl:variable name="BddServiceCollecteurSignataireFonction" select="$parametres/metadonnees/BddServiceCollecteurSignataireFonction"/> + <xsl:variable name="BddServiceCollecteurSignataireNom" select="$parametres/metadonnees/BddServiceCollecteurSignataireNom"/> + <xsl:variable name="BddServiceCollecteurSignataireSexe" select="$parametres/metadonnees/BddServiceCollecteurSignataireSexe"/> + <xsl:variable name="BddNumeroVisa" select="$parametres/metadonnees/BddNumeroVisa"/> + <xsl:variable name="BddMinistereTutelle" select="$parametres/metadonnees/BddMinistereTutelle"/> + <xsl:variable name="BddAnneeCollecte" select="$parametres/metadonnees/BddAnneeCollecte"/> + <xsl:variable name="BddParutionJO" select="$parametres/metadonnees/BddParutionJO"/> + <xsl:variable name="BddDateParutionJO" select="$parametres/metadonnees/BddDateParutionJO"/> + <xsl:variable name="BddNomServiceRecours" select="$parametres/metadonnees/BddNomServiceRecours"/> + <xsl:variable name="BddStatutEnquete" select="$parametres/metadonnees/BddStatutEnquete"/> + <xsl:variable name="BddMetropole" select="$parametres/metadonnees/BddMetropole"/> + <xsl:variable name="BddTypeUniteEnquetee" select="$parametres/metadonnees/BddTypeUniteEnquetee"/> + <xsl:variable name="BddRapprochementDonnees" select="$parametres/metadonnees/BddRapprochementDonnees"/> + <xsl:variable name="LibelleEnquete" select="$parametres/metadonnees/LibelleEnquete"/> + <xsl:variable name="ObjectifsEnquete" select="normalize-space($parametres/metadonnees/ObjectifsCourts)"/> + <!-- Valeur pour laquelle on affiche le fait que l'enquête a un caractère obligatoire --> + <xsl:variable name="CaractereObligatoireEnqueteReference" select="string('OUI')"/> + + <xsl:variable name="espace" select="string(' ')"/> + + <xsl:template match="/"> + <xsl:apply-templates select="xhtml:html"/> + </xsl:template> + + <xd:doc xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl"> + <xd:desc> + <xd:p>Template de base pour tous les éléments et tous les attributs, on recopie + simplement en sortie</xd:p> + </xd:desc> + </xd:doc> + <xsl:template match="node() | @*"> + <xsl:copy> + <xsl:apply-templates select="node() | @*"/> + </xsl:copy> + </xsl:template> + + <!-- On remplace la page de début générique par une page d'accueil coltrane --> + <xsl:template match="Beginning[parent::form[parent::xf:instance[@id='fr-form-instance']]]"> + <Variable idVariable="QuiRepond1"/> + <Variable idVariable="QuiRepond2"/> + <Variable idVariable="QuiRepond3"/> + <ACCUEIL> + <ACCUEIL-1/> + <ACCUEIL-2/> + <ACCUEIL-3/> + <ACCUEIL-4/> + <ACCUEIL-5/> + <ACCUEIL-6/> + <ACCUEIL-7/> + </ACCUEIL> + </xsl:template> + + <!-- Le bind correspondant --> + <xsl:template match="xf:bind[@name='beginning']"> + <xf:bind id="ACCUEIL-bind" name="ACCUEIL" ref="ACCUEIL"> + <xf:bind id="ACCUEIL-1-bind" name="ACCUEIL-1" ref="ACCUEIL-1"/> + <xf:bind id="ACCUEIL-2-bind" name="ACCUEIL-2" ref="ACCUEIL-2"/> + <xf:bind id="ACCUEIL-3-bind" name="ACCUEIL-3" ref="ACCUEIL-3"/> + <xf:bind id="ACCUEIL-4-bind" name="ACCUEIL-4" ref="ACCUEIL-4"/> + <xf:bind id="ACCUEIL-5-bind" name="ACCUEIL-5" ref="ACCUEIL-5"/> + <xf:bind id="ACCUEIL-6-bind" name="ACCUEIL-6" ref="ACCUEIL-6"/> + <xf:bind id="ACCUEIL-7-bind" name="ACCUEIL-7" ref="ACCUEIL-7" relevant="if (instance('fr-form-util')/cadreLegal/text()!='') then (true()) else (false())"/> + </xf:bind> + </xsl:template> + + <!-- Les ressources correspondantes --> + <xsl:template match="Beginning[ancestor::xf:instance[@id='fr-form-resources']]"> + <ACCUEIL> + <label>ACCUEIL</label> + </ACCUEIL> + <ACCUEIL-1> + <label> + <xsl:text><p>Bienvenue sur le questionnaire de réponse à l'enquête <b></xsl:text> + <xsl:value-of select="$LibelleEnquete"/> + <xsl:text></b></xsl:text> + <xsl:text><span title="</xsl:text> + <xsl:value-of select="$ObjectifsEnquete"/> + <xsl:text>"> <img src="/img/Help-browser.svg.png"/> </span></xsl:text> + <xsl:text></p></xsl:text> + </label> + </ACCUEIL-1> + <ACCUEIL-2> + <label> + <xsl:text><div class="frame"><p><b>Qui doit répondre à ce questionnaire ?</b></p></xsl:text> + <xsl:text><p>¤QuiRepond1¤</p></xsl:text> + <xsl:text><p>¤QuiRepond2¤</p></xsl:text> + <xsl:text><p>¤QuiRepond3¤</p></xsl:text> + <xsl:text></div></xsl:text> + </label> + </ACCUEIL-2> + <ACCUEIL-3> + <label><p> </p></label> + </ACCUEIL-3> + <ACCUEIL-4> + <label><p><b>Informations pratiques pour le + remplissage</b></p></label> + </ACCUEIL-4> + <ACCUEIL-5> + <label> + <xsl:text><div class="frameAvertissement"><p><b>Pensez à enregistrer + régulièrement votre questionnaire.</b> Au bout de 30 minutes sans + activité, pour des raisons de sécurité, vous serez en effet automatiquement + déconnecté. Les données saisies depuis la dernière sauvegarde seront perdues.</p><p><b>Veuillez + utiliser les boutons <button class="btn txt" type="button" style="cursor: default;" tabIndex="-1">Retour </button> et <button class="btn txt" type="button" style="cursor: default;" tabIndex="-1">Enregistrer et continuer </button> pour naviguer dans le + questionnaire</b> et non pas les boutons "Précédent" et "Suivant" de votre + navigateur.</p><p>Pour visualiser le contenu des info-bulles, il faut survoler le + symbole <span title="Les symboles similaires contiennent une aide sur la question ou ses mots-clefs"> <img src="/img/Help-browser.svg.png"/> </span></p></div> + </xsl:text> + </label> + </ACCUEIL-5> + <ACCUEIL-6> + <label><p> </p></label> + </ACCUEIL-6> + <ACCUEIL-7> + <label> + <xsl:text><div class="frame"><p>Vu l'avis favorable du Conseil national de + l'information statistique, cette enquête</xsl:text> + <xsl:choose> + <xsl:when + test="$BddCaractereObligatoire=$CaractereObligatoireEnqueteReference"> + <xsl:text>, reconnue d’intérêt général et de qualité statistique, est obligatoire</xsl:text> + </xsl:when> + <xsl:otherwise> + <xsl:text> est reconnue d’intérêt général et de qualité statistique sans avoir de caractère obligatoire</xsl:text> + </xsl:otherwise> + </xsl:choose> + <xsl:text>, en application de la <a href="</xsl:text> + <xsl:value-of select="$proprietes//lois/statistique"/> + <xsl:text>" target="_blank">loi n° 51-711 du 7 juin 1951</a> sur l’obligation, la coordination et le secret en matière de statistiques.</xsl:text> + + <xsl:text></p><p>Visa n°</xsl:text> + <xsl:value-of select="$BddNumeroVisa"/> + <xsl:text> </xsl:text> + <xsl:for-each select="$BddMinistereTutelle"> + <xsl:text>du </xsl:text> + <xsl:value-of select="."/> + <xsl:text>, </xsl:text> + </xsl:for-each> + <xsl:text>valable pour l'année </xsl:text> + <xsl:value-of select="$BddAnneeCollecte"/> + <xsl:choose> + <xsl:when test="$BddParutionJO = 'oui'"> + <xsl:text> - Arrêté en date du </xsl:text> + <xsl:value-of select="$BddDateParutionJO"/> + </xsl:when> + <xsl:otherwise> + <xsl:text> - Arrêté en cours de parution</xsl:text> + </xsl:otherwise> + </xsl:choose> + <xsl:text>.</p><p>Les réponses à ce questionnaire sont protégées par le secret statistique et destinées à </xsl:text> + <xsl:value-of select="$BddNomServiceProducteurCourt"/> + <xsl:text>. Le <a href="</xsl:text> + <xsl:value-of select="$proprietes//lois/rgpd"/> + <xsl:text>" target="_blank">règlement général 2016/679 du 27 avril 2016 sur la protection des données (RGPD)</a> ainsi </xsl:text> + <xsl:text>que la <a href="</xsl:text> + <xsl:value-of select="$proprietes//lois/informatique"/> + <xsl:text>" target="_blank">loi n° 78-17 du 6 janvier 1978 relative à l'informatique, aux fichiers et aux libertés</a>, s'appliquent à la présente enquête. </xsl:text> + <xsl:text>Les droits des personnes, rappelés dans la lettre-avis, peuvent être exercés auprès de </xsl:text> + <xsl:value-of select="$BddNomServiceRecours"/> + <xsl:text>.</p></div></xsl:text> + </label> + </ACCUEIL-7> + </xsl:template> + + <xsl:template match="GenericBeginningText[ancestor::xf:instance[@id='fr-form-resources']]"/> + + + + <!-- On remplace la page dans l'instance qui sert à gérer le questionnaire --> + <xsl:template match="Beginning[ancestor::xf:instance[@id='fr-form-util']]"> + <ACCUEIL/> + </xsl:template> + + <!-- On place le corps html ici --> + <xsl:template match="fr:section[@name='beginning']"> + <fr:section id="ACCUEIL-control" bind="ACCUEIL-bind" name="ACCUEIL"> + <xf:label ref="$form-resources/ACCUEIL/label"/> + <xf:output id="ACCUEIL-1-control" name="ACCUEIL-1" bind="ACCUEIL-1-bind" + xxf:order="label control hint help alert" class="icone-help"> + <xf:label ref="$form-resources/ACCUEIL-1/label" mediatype="text/html"/> + <xf:help ref="$form-resources/ACCUEIL-1/help" mediatype="text/html"/> + </xf:output> + <xf:output id="ACCUEIL-2-control" name="ACCUEIL-2" bind="ACCUEIL-2-bind" + xxf:order="label control hint help alert"> + <xf:label ref="replace(replace(replace($form-resources/ACCUEIL-2/label,'¤QuiRepond1¤',instance('fr-form-instance')//Variable[@idVariable='QuiRepond1']),'¤QuiRepond2¤',instance('fr-form-instance')//Variable[@idVariable='QuiRepond2']),'¤QuiRepond3¤',instance('fr-form-instance')//Variable[@idVariable='QuiRepond3'])" mediatype="text/html"/> + </xf:output> + <xf:output id="ACCUEIL-3-control" name="ACCUEIL-3" bind="ACCUEIL-3-bind" + xxf:order="label control hint help alert"> + <xf:label ref="$form-resources/ACCUEIL-3/label" mediatype="text/html"/> + </xf:output> + <xf:output id="ACCUEIL-4-control" name="ACCUEIL-4" bind="ACCUEIL-4-bind" + xxf:order="label control hint help alert"> + <xf:label ref="$form-resources/ACCUEIL-4/label" mediatype="text/html"/> + </xf:output> + <xf:output id="ACCUEIL-5-control" name="ACCUEIL-5" bind="ACCUEIL-5-bind" + xxf:order="label control hint help alert"> + <xf:label ref="$form-resources/ACCUEIL-5/label" mediatype="text/html"/> + </xf:output> + <xf:output id="ACCUEIL-6-control" name="ACCUEIL-6" bind="ACCUEIL-6-bind" + xxf:order="label control hint help alert"> + <xf:label ref="$form-resources/ACCUEIL-6/label" mediatype="text/html"/> + </xf:output> + <xf:trigger id="cadreLegal" appearance="minimal"> + <xf:label> + <xf:output + value="concat(if (instance('fr-form-util')/cadreLegal/text()!='') then ('-') else ('+'),' Connaître le cadre légal de l''enquête ?')" + /> + </xf:label> + <xf:setvalue ev:event="DOMActivate" ref="instance('fr-form-util')/cadreLegal" + value="if (instance('fr-form-util')/cadreLegal/text()!='') then ('') else ('affiche')" + /> + </xf:trigger> + <xf:output id="ACCUEIL-7-control" name="ACCUEIL-7" bind="ACCUEIL-7-bind" + xxf:order="label control hint help alert"> + <xf:label ref="$form-resources/ACCUEIL-7/label" mediatype="text/html"/> + </xf:output> + </fr:section> + </xsl:template> + + <!-- On fait apparaître/disparaître le cadre legal de la page d'accueil à l'aide d'un lien --> + <xsl:template match="xf:instance [@id='fr-form-util']/Util"> + <xsl:copy> + <cadreLegal/> + <xsl:apply-templates select="node() | @*"/> + </xsl:copy> + </xsl:template> + + <xsl:template match="xf:bind[@id='current-section-name-bind']/@calculate | xf:action[@ev:event='page-change']/xf:action/@if"> + <xsl:attribute name="{name()}"> + <xsl:for-each select="tokenize(., '''')"> + <xsl:if test="position()>1"> + <xsl:value-of select="''''"/> + </xsl:if> + <xsl:choose> + <xsl:when test="string(number(.))!='NaN'"> + <xsl:value-of select="number(.)+1"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="."/> + </xsl:otherwise> + </xsl:choose> + </xsl:for-each> + </xsl:attribute> + </xsl:template> + + <xsl:template match="xf:bind[@id='progress-percent-bind']"> + <xsl:copy> + <xsl:apply-templates select="@*"/> + <xsl:attribute name="calculate"> + <xsl:choose> + <xsl:when test="contains(@calculate,'<')"> + <xsl:variable name="old-loop-number" + select="substring-before(substring-after(@calculate,'<'),')')"/> + <xsl:variable name="new-loop-number" select="number($old-loop-number)+1"/> + <xsl:value-of + select="replace(replace(replace(@calculate, + concat('number\(instance\(''fr-form-instance''\)/Util/CurrentSection\) <',$old-loop-number), + concat('number(instance(''fr-form-instance'')/Util/CurrentSection) <',$new-loop-number)), + concat('instance\(''fr-form-instance''\)/Util/CurrentSection =',$old-loop-number), + concat('instance(''fr-form-instance'')/Util/CurrentSection =',$new-loop-number)), + concat('round\(\(',$old-loop-number,'-2'), + concat('round((',$new-loop-number,'-2'))" + /> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="@calculate"/> + </xsl:otherwise> + </xsl:choose> + </xsl:attribute> + <xsl:apply-templates select="node()"/> + </xsl:copy> + </xsl:template> + + <xsl:template match="xf:action[@ev:event='page-change-done']/xf:action/@if"> + <xsl:attribute name="if"> + <xsl:for-each select="tokenize(.,' ')"> + <xsl:if test="position()>1"> + <xsl:value-of select="' '"/> + </xsl:if> + <xsl:choose> + <xsl:when test="string(number(.))!='NaN'"> + <xsl:value-of select="number(.)+1"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="."/> + </xsl:otherwise> + </xsl:choose> + </xsl:for-each> + </xsl:attribute> + </xsl:template> + +</xsl:transform> diff --git a/src/main/resources/xslt/util/pdf/pdf-specific-treatment.xsl b/src/main/resources/xslt/util/pdf/pdf-specific-treatment.xsl new file mode 100644 index 000000000..31359a036 --- /dev/null +++ b/src/main/resources/xslt/util/pdf/pdf-specific-treatment.xsl @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:xs="http://www.w3.org/2001/XMLSchema" + xmlns:fo="http://www.w3.org/1999/XSL/Format" + exclude-result-prefixes="xs" + version="2.0"> + + <xsl:output method="xml" indent="yes" encoding="UTF-8"/> + <xsl:strip-space elements="*"/> + + <xd:doc xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl"> + <xd:desc> + <xd:p>Template de racine, on applique les templates de tous les enfants</xd:p> + </xd:desc> + </xd:doc> + <xsl:template match="/"> + <xsl:apply-templates select="*"/> + </xsl:template> + + <xd:doc xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl"> + <xd:desc> + <xd:p>Template de base pour tous les éléments et tous les attributs, on recopie + simplement en sortie</xd:p> + </xd:desc> + </xd:doc> + <xsl:template match="node() | @*"> + <xsl:copy> + <xsl:apply-templates select="node() | @*"/> + </xsl:copy> + </xsl:template> + +</xsl:stylesheet> \ No newline at end of file From a0bcc9c8b9a18f5672c4b1e2f8c5ea75807c7e6c Mon Sep 17 00:00:00 2001 From: Laurent Caouissin <laurent.caouissin@insee.fr> Date: Thu, 5 Sep 2019 10:46:36 +0200 Subject: [PATCH 095/439] Eno v2.0.0 : Create PipeLineGenerator - Interface - Implementation --- .../eno/params/PipeLineGeneratorImpl.java | 198 ++++++++++++++++++ .../insee/eno/params/PipelineGenerator.java | 28 +++ 2 files changed, 226 insertions(+) create mode 100644 src/main/java/fr/insee/eno/params/PipeLineGeneratorImpl.java create mode 100644 src/main/java/fr/insee/eno/params/PipelineGenerator.java diff --git a/src/main/java/fr/insee/eno/params/PipeLineGeneratorImpl.java b/src/main/java/fr/insee/eno/params/PipeLineGeneratorImpl.java new file mode 100644 index 000000000..18dddc308 --- /dev/null +++ b/src/main/java/fr/insee/eno/params/PipeLineGeneratorImpl.java @@ -0,0 +1,198 @@ +package fr.insee.eno.params; + +import java.util.ArrayList; +import java.util.List; + +import fr.insee.eno.GenerationService; +import fr.insee.eno.generation.DDI2FRGenerator; +import fr.insee.eno.generation.DDI2JSGenerator; +import fr.insee.eno.generation.DDI2ODTGenerator; +import fr.insee.eno.generation.DDI2PDFGenerator; +import fr.insee.eno.generation.Generator; +import fr.insee.eno.generation.PoguesXML2DDIGenerator; +import fr.insee.eno.parameters.InFormat; +import fr.insee.eno.parameters.OutFormat; +import fr.insee.eno.parameters.Pipeline; +import fr.insee.eno.parameters.PostProcessing; +import fr.insee.eno.parameters.PreProcessing; +import fr.insee.eno.postprocessing.NoopPostprocessor; +import fr.insee.eno.postprocessing.Postprocessor; +import fr.insee.eno.postprocessing.ddi.DDIPostprocessor; +import fr.insee.eno.postprocessing.fr.FRBrowsingPostprocessor; +import fr.insee.eno.postprocessing.fr.FRFixAdherencePostprocessor; +import fr.insee.eno.postprocessing.fr.FRIdentificationPostprocessor; +import fr.insee.eno.postprocessing.fr.FRInsertEndPostprocessor; +import fr.insee.eno.postprocessing.fr.FRInsertGenericQuestionsPostprocessor; +import fr.insee.eno.postprocessing.fr.FRInsertWelcomePostprocessor; +import fr.insee.eno.postprocessing.fr.FRModeleColtranePostprocessor; +import fr.insee.eno.postprocessing.fr.FRSpecificTreatmentPostprocessor; +import fr.insee.eno.postprocessing.js.JSExternalizeVariablesPostprocessor; +import fr.insee.eno.postprocessing.js.JSSortComponentsPostprocessor; +import fr.insee.eno.postprocessing.pdf.PDFEditStructurePagesPostprocessor; +import fr.insee.eno.postprocessing.pdf.PDFInsertAccompanyingMailsPostprocessor; +import fr.insee.eno.postprocessing.pdf.PDFInsertCoverPagePostprocessor; +import fr.insee.eno.postprocessing.pdf.PDFInsertEndQuestionPostprocessor; +import fr.insee.eno.postprocessing.pdf.PDFMailingPostprocessor; +import fr.insee.eno.postprocessing.pdf.PDFSpecificTreatmentPostprocessor; +import fr.insee.eno.postprocessing.pdf.PDFTableColumnPostprocessorFake; +import fr.insee.eno.preprocessing.Preprocessor; + +public class PipeLineGeneratorImpl implements PipelineGenerator { + + @Override + public GenerationService setPipeLine(Pipeline pipeline) { + + Preprocessor[] preprocessors = setPreProcessors(pipeline.getPreProcessing()); + Generator generator = setGenerator(pipeline.getInFormat(), pipeline.getOutFormat()); + Postprocessor[] postprocessors = setPostProcessors(pipeline.getPostProcessing()); + + return new GenerationService(preprocessors, generator, postprocessors); + } + + @Override + public Postprocessor[] setPostProcessors(List<PostProcessing> postProcessings) { + List<Postprocessor> postprocessors = new ArrayList<Postprocessor>(); + for(PostProcessing postProcessing : postProcessings) { + postprocessors.add(getPostPorcessor(postProcessing)); + } + return postprocessors.toArray(new Postprocessor[postprocessors.size()]); + } + + @Override + public Preprocessor[] setPreProcessors(List<PreProcessing> preProcessings) { + List<Preprocessor> preprocessors = new ArrayList<Preprocessor>(); + for(PreProcessing preProcessing : preProcessings) { + preprocessors.add(getPrePorcessor(preProcessing)); + } + return preprocessors.toArray(new Preprocessor[preprocessors.size()]); + } + + + + + + @Override + public Generator setGenerator(InFormat inFormat, OutFormat outFormat) { + Generator generator=null; + + switch (inFormat) { + case DDI: + switch (outFormat) { + case DDI: + break; + case FR: + generator = new DDI2FRGenerator(); + break; + case JS: + generator = new DDI2JSGenerator(); + break; + case ODT: + generator = new DDI2ODTGenerator(); + break; + case PDF: + generator = new DDI2PDFGenerator(); + break; + case POGUES_XML: + break; + } + break; + case POGUES_XML: + switch (outFormat) { + case DDI: + generator = new PoguesXML2DDIGenerator(); + break; + } + } + return generator; + } + + @Override + public Postprocessor getPostPorcessor(PostProcessing postProcessing) { + Postprocessor postprocessor = null; + switch (postProcessing) { + case DDI_MARKDOWN_TO_XHTML: + postprocessor = new DDIPostprocessor(); + break; + case FR_BROWSING: + postprocessor = new FRBrowsingPostprocessor(); + break; + case FR_EDIT_PATRON: + postprocessor = new FRBrowsingPostprocessor(); + break; + case FR_FIX_ADHERENCE: + postprocessor = new FRFixAdherencePostprocessor(); + break; + case FR_IDENTIFICATION: + postprocessor = new FRIdentificationPostprocessor(); + break; + case FR_INSERT_END: + postprocessor = new FRInsertEndPostprocessor(); + break; + case FR_INSERT_GENERIC_QUESTIONS: + postprocessor = new FRInsertGenericQuestionsPostprocessor(); + break; + case FR_INSERT_WELCOME: + postprocessor = new FRInsertWelcomePostprocessor(); + break; + case FR_MODELE_COLTRANE: + postprocessor = new FRModeleColtranePostprocessor(); + break; + case FR_SPECIFIC_TREATMENT: + postprocessor = new FRSpecificTreatmentPostprocessor(); + break; + case PDF_EDIT_STRUCTURE_PAGES: + postprocessor = new PDFEditStructurePagesPostprocessor(); + break; + case PDF_INSERT_ACCOMPANYING_MAILS: + postprocessor = new PDFInsertAccompanyingMailsPostprocessor(); + break; + case PDF_INSERT_COVER_PAGE: + postprocessor = new PDFInsertCoverPagePostprocessor(); + break; + case PDF_INSERT_END_QUESTION: + postprocessor = new PDFInsertEndQuestionPostprocessor(); + break; + case PDF_MAILING: + postprocessor = new PDFMailingPostprocessor(); + break; + case PDF_SPECIFIC_TREATMENT: + postprocessor = new PDFSpecificTreatmentPostprocessor(); + break; + case PDF_TABLE_COLUMN: + postprocessor = new PDFTableColumnPostprocessorFake(); + break; + case JS_EXTERNALIZE_VARIABLES: + postprocessor = new JSExternalizeVariablesPostprocessor(); + break; + case JS_SORT_COMPONENTS: + postprocessor = new JSSortComponentsPostprocessor(); + break; + case JS_SPECIFIC_TREATMENT: + postprocessor = new NoopPostprocessor(); + break; + } + return postprocessor; + } + + @Override + public Preprocessor getPrePorcessor(PreProcessing preProcessing) { + Preprocessor preprocessor = null; + switch (preProcessing) { + case DDI_DEREFERENCING: + break; + case DDI_CLEANING: + break; + case DDI_TITLING: + break; + case POGUES_XML_GOTO_2_ITE: + break; + case POGUES_XML_SUPPRESSION_GOTO: + break; + case POGUES_XML_TWEAK_TO_MERGE_EQUIVALENT_ITE: + break; + } + return preprocessor; + } + + +} diff --git a/src/main/java/fr/insee/eno/params/PipelineGenerator.java b/src/main/java/fr/insee/eno/params/PipelineGenerator.java new file mode 100644 index 000000000..aec100e94 --- /dev/null +++ b/src/main/java/fr/insee/eno/params/PipelineGenerator.java @@ -0,0 +1,28 @@ +package fr.insee.eno.params; + +import java.util.List; + +import fr.insee.eno.GenerationService; +import fr.insee.eno.generation.Generator; +import fr.insee.eno.parameters.InFormat; +import fr.insee.eno.parameters.OutFormat; +import fr.insee.eno.parameters.Pipeline; +import fr.insee.eno.parameters.PostProcessing; +import fr.insee.eno.parameters.PreProcessing; +import fr.insee.eno.postprocessing.Postprocessor; +import fr.insee.eno.preprocessing.Preprocessor; + +public interface PipelineGenerator { + + public GenerationService setPipeLine(Pipeline pipeline); + + public Postprocessor[] setPostProcessors(List<PostProcessing> postProcessings); + + public Preprocessor[] setPreProcessors(List<PreProcessing> preProcessings); + + public Generator setGenerator(InFormat inFormat, OutFormat outFormat); + + public Postprocessor getPostPorcessor(PostProcessing postProcessing); + public Preprocessor getPrePorcessor(PreProcessing preProcessing); + +} From 0419eb451344694368d23e31cf5f308c884d2891 Mon Sep 17 00:00:00 2001 From: Laurent Caouissin <laurent.caouissin@insee.fr> Date: Thu, 5 Sep 2019 10:47:20 +0200 Subject: [PATCH 096/439] Eno v2.0.0 : Create Module to Valorize Parameters - Interface - Implementation --- .../eno/params/ValorizatorParameters.java | 13 ++++++++++++ .../eno/params/ValorizatorParametersImpl.java | 21 +++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 src/main/java/fr/insee/eno/params/ValorizatorParameters.java create mode 100644 src/main/java/fr/insee/eno/params/ValorizatorParametersImpl.java diff --git a/src/main/java/fr/insee/eno/params/ValorizatorParameters.java b/src/main/java/fr/insee/eno/params/ValorizatorParameters.java new file mode 100644 index 000000000..8fba81621 --- /dev/null +++ b/src/main/java/fr/insee/eno/params/ValorizatorParameters.java @@ -0,0 +1,13 @@ +package fr.insee.eno.params; + +import java.io.InputStream; + +import fr.insee.eno.parameters.ENOParameters; + +public interface ValorizatorParameters { + + String setParameters(ENOParameters enoParameters); + + InputStream setparameters(ENOParameters enoParameters); + +} diff --git a/src/main/java/fr/insee/eno/params/ValorizatorParametersImpl.java b/src/main/java/fr/insee/eno/params/ValorizatorParametersImpl.java new file mode 100644 index 000000000..3980e78f3 --- /dev/null +++ b/src/main/java/fr/insee/eno/params/ValorizatorParametersImpl.java @@ -0,0 +1,21 @@ +package fr.insee.eno.params; + +import java.io.InputStream; + +import fr.insee.eno.parameters.ENOParameters; + +public class ValorizatorParametersImpl implements ValorizatorParameters { + + @Override + public String setParameters(ENOParameters enoParameters) { + // TODO Auto-generated method stub + return null; + } + + @Override + public InputStream setparameters(ENOParameters enoParameters) { + // TODO Auto-generated method stub + return null; + } + +} From 07cc1f4829dbc78a75d6734f296e614577a081d3 Mon Sep 17 00:00:00 2001 From: Laurent Caouissin <laurent.caouissin@insee.fr> Date: Thu, 5 Sep 2019 10:49:36 +0200 Subject: [PATCH 097/439] Eno v2.0.0 : update deprecated java class --- src/main/java/fr/insee/eno/postprocessing/DDIPostprocessor.java | 1 + .../eno/postprocessing/JSExternalizeVariablesPostprocessor.java | 1 + .../insee/eno/postprocessing/JSSortComponentsPostprocessor.java | 1 + .../eno/postprocessing/PDFEditStructurePagesPostprocessor.java | 1 + .../postprocessing/PDFInsertAccompanyingMailsPostprocessor.java | 1 + .../eno/postprocessing/PDFInsertCoverPagePostprocessor.java | 1 + .../eno/postprocessing/PDFInsertEndQuestionPostprocessor.java | 1 + .../fr/insee/eno/postprocessing/PDFMailingPostprocessor.java | 1 + .../eno/postprocessing/PDFSpecificTreatmentPostprocessor.java | 1 + .../eno/postprocessing/PDFTableColumnPostprocessorFake.java | 1 + 10 files changed, 10 insertions(+) diff --git a/src/main/java/fr/insee/eno/postprocessing/DDIPostprocessor.java b/src/main/java/fr/insee/eno/postprocessing/DDIPostprocessor.java index b69c7f8a7..60f554508 100644 --- a/src/main/java/fr/insee/eno/postprocessing/DDIPostprocessor.java +++ b/src/main/java/fr/insee/eno/postprocessing/DDIPostprocessor.java @@ -15,6 +15,7 @@ /** * DDI postprocessor. */ +@Deprecated public class DDIPostprocessor implements Postprocessor { private static final Logger logger = LoggerFactory.getLogger(DDIPostprocessor.class); diff --git a/src/main/java/fr/insee/eno/postprocessing/JSExternalizeVariablesPostprocessor.java b/src/main/java/fr/insee/eno/postprocessing/JSExternalizeVariablesPostprocessor.java index ab3322d74..c2d1e238d 100644 --- a/src/main/java/fr/insee/eno/postprocessing/JSExternalizeVariablesPostprocessor.java +++ b/src/main/java/fr/insee/eno/postprocessing/JSExternalizeVariablesPostprocessor.java @@ -14,6 +14,7 @@ /** * Customization of JS postprocessor. */ +@Deprecated public class JSExternalizeVariablesPostprocessor implements Postprocessor { private static final Logger logger = LoggerFactory.getLogger(JSExternalizeVariablesPostprocessor.class); diff --git a/src/main/java/fr/insee/eno/postprocessing/JSSortComponentsPostprocessor.java b/src/main/java/fr/insee/eno/postprocessing/JSSortComponentsPostprocessor.java index 89204651e..eb0104cb9 100644 --- a/src/main/java/fr/insee/eno/postprocessing/JSSortComponentsPostprocessor.java +++ b/src/main/java/fr/insee/eno/postprocessing/JSSortComponentsPostprocessor.java @@ -15,6 +15,7 @@ /** * Customization of JS postprocessor. */ +@Deprecated public class JSSortComponentsPostprocessor implements Postprocessor { private static final Logger logger = LoggerFactory.getLogger(JSSortComponentsPostprocessor.class); diff --git a/src/main/java/fr/insee/eno/postprocessing/PDFEditStructurePagesPostprocessor.java b/src/main/java/fr/insee/eno/postprocessing/PDFEditStructurePagesPostprocessor.java index 2ee9ad683..f3504f16e 100644 --- a/src/main/java/fr/insee/eno/postprocessing/PDFEditStructurePagesPostprocessor.java +++ b/src/main/java/fr/insee/eno/postprocessing/PDFEditStructurePagesPostprocessor.java @@ -12,6 +12,7 @@ import fr.insee.eno.Constants; import fr.insee.eno.transform.xsl.XslTransformation; +@Deprecated public class PDFEditStructurePagesPostprocessor implements Postprocessor { private static final Logger logger = LoggerFactory.getLogger(PDFEditStructurePagesPostprocessor.class); diff --git a/src/main/java/fr/insee/eno/postprocessing/PDFInsertAccompanyingMailsPostprocessor.java b/src/main/java/fr/insee/eno/postprocessing/PDFInsertAccompanyingMailsPostprocessor.java index fdb5f22af..cf9d730b3 100644 --- a/src/main/java/fr/insee/eno/postprocessing/PDFInsertAccompanyingMailsPostprocessor.java +++ b/src/main/java/fr/insee/eno/postprocessing/PDFInsertAccompanyingMailsPostprocessor.java @@ -12,6 +12,7 @@ import fr.insee.eno.Constants; import fr.insee.eno.transform.xsl.XslTransformation; +@Deprecated public class PDFInsertAccompanyingMailsPostprocessor implements Postprocessor { private static final Logger logger = LoggerFactory.getLogger(PDFInsertAccompanyingMailsPostprocessor.class); diff --git a/src/main/java/fr/insee/eno/postprocessing/PDFInsertCoverPagePostprocessor.java b/src/main/java/fr/insee/eno/postprocessing/PDFInsertCoverPagePostprocessor.java index 1927b6890..aca31bcac 100644 --- a/src/main/java/fr/insee/eno/postprocessing/PDFInsertCoverPagePostprocessor.java +++ b/src/main/java/fr/insee/eno/postprocessing/PDFInsertCoverPagePostprocessor.java @@ -12,6 +12,7 @@ import fr.insee.eno.Constants; import fr.insee.eno.transform.xsl.XslTransformation; +@Deprecated public class PDFInsertCoverPagePostprocessor implements Postprocessor { private static final Logger logger = LoggerFactory.getLogger(PDFInsertCoverPagePostprocessor.class); diff --git a/src/main/java/fr/insee/eno/postprocessing/PDFInsertEndQuestionPostprocessor.java b/src/main/java/fr/insee/eno/postprocessing/PDFInsertEndQuestionPostprocessor.java index bcbf5509e..5468c9ff6 100644 --- a/src/main/java/fr/insee/eno/postprocessing/PDFInsertEndQuestionPostprocessor.java +++ b/src/main/java/fr/insee/eno/postprocessing/PDFInsertEndQuestionPostprocessor.java @@ -12,6 +12,7 @@ import fr.insee.eno.Constants; import fr.insee.eno.transform.xsl.XslTransformation; +@Deprecated public class PDFInsertEndQuestionPostprocessor implements Postprocessor { private static final Logger logger = LoggerFactory.getLogger(PDFInsertEndQuestionPostprocessor.class); diff --git a/src/main/java/fr/insee/eno/postprocessing/PDFMailingPostprocessor.java b/src/main/java/fr/insee/eno/postprocessing/PDFMailingPostprocessor.java index 55948b036..f9abaa2b5 100644 --- a/src/main/java/fr/insee/eno/postprocessing/PDFMailingPostprocessor.java +++ b/src/main/java/fr/insee/eno/postprocessing/PDFMailingPostprocessor.java @@ -14,6 +14,7 @@ /** * Customization of FO postprocessor. */ +@Deprecated public class PDFMailingPostprocessor implements Postprocessor { private static final Logger logger = LoggerFactory.getLogger(PDFMailingPostprocessor.class); diff --git a/src/main/java/fr/insee/eno/postprocessing/PDFSpecificTreatmentPostprocessor.java b/src/main/java/fr/insee/eno/postprocessing/PDFSpecificTreatmentPostprocessor.java index 9418296f6..6e8902f87 100644 --- a/src/main/java/fr/insee/eno/postprocessing/PDFSpecificTreatmentPostprocessor.java +++ b/src/main/java/fr/insee/eno/postprocessing/PDFSpecificTreatmentPostprocessor.java @@ -11,6 +11,7 @@ import fr.insee.eno.Constants; import fr.insee.eno.transform.xsl.XslTransformation; +@Deprecated public class PDFSpecificTreatmentPostprocessor implements Postprocessor { private static final Logger logger = LoggerFactory.getLogger(PDFSpecificTreatmentPostprocessor.class); diff --git a/src/main/java/fr/insee/eno/postprocessing/PDFTableColumnPostprocessorFake.java b/src/main/java/fr/insee/eno/postprocessing/PDFTableColumnPostprocessorFake.java index b10557433..8d6241693 100644 --- a/src/main/java/fr/insee/eno/postprocessing/PDFTableColumnPostprocessorFake.java +++ b/src/main/java/fr/insee/eno/postprocessing/PDFTableColumnPostprocessorFake.java @@ -12,6 +12,7 @@ /** * PDF postprocessor. */ +@Deprecated public class PDFTableColumnPostprocessorFake implements Postprocessor { private static final Logger logger = LoggerFactory.getLogger(PDFTableColumnPostprocessorFake.class); From 3bda81536a9876666701ff9606669f0c25b86ce9 Mon Sep 17 00:00:00 2001 From: Laurent Caouissin <laurent.caouissin@insee.fr> Date: Thu, 5 Sep 2019 10:51:55 +0200 Subject: [PATCH 098/439] Eno v2.0.0 : add new PreProcessor in java - new (split some PreProcessor) - old : deprecated --- .../DDICleaningPreprocessor.java | 100 ++++++++++++++++++ .../DDIDereferencingPreprocessor.java | 100 ++++++++++++++++++ .../preprocessing/DDIMappingPreprocessor.java | 50 +++++++++ .../preprocessing/DDITitlingPreprocessor.java | 100 ++++++++++++++++++ .../preprocessing/PoguesXMLPreprocessor.java | 1 - 5 files changed, 350 insertions(+), 1 deletion(-) create mode 100644 src/main/java/fr/insee/eno/preprocessing/DDICleaningPreprocessor.java create mode 100644 src/main/java/fr/insee/eno/preprocessing/DDIDereferencingPreprocessor.java create mode 100644 src/main/java/fr/insee/eno/preprocessing/DDIMappingPreprocessor.java create mode 100644 src/main/java/fr/insee/eno/preprocessing/DDITitlingPreprocessor.java diff --git a/src/main/java/fr/insee/eno/preprocessing/DDICleaningPreprocessor.java b/src/main/java/fr/insee/eno/preprocessing/DDICleaningPreprocessor.java new file mode 100644 index 000000000..29e3a14a1 --- /dev/null +++ b/src/main/java/fr/insee/eno/preprocessing/DDICleaningPreprocessor.java @@ -0,0 +1,100 @@ +package fr.insee.eno.preprocessing; + +import java.io.File; +import java.io.FilenameFilter; +import java.io.InputStream; +import java.io.OutputStream; + +import org.apache.commons.io.FileUtils; +import org.apache.commons.io.FilenameUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import fr.insee.eno.Constants; +import fr.insee.eno.transform.xsl.XslTransformation; + +/** + * A DDI specific preprocessor. + */ +public class DDICleaningPreprocessor implements Preprocessor { + + private static final Logger logger = LoggerFactory.getLogger(DDICleaningPreprocessor.class); + + // FIXME Inject ! + private static XslTransformation saxonService = new XslTransformation(); + + @Override + public File process(File inputFile, byte[] parametersFile, String survey, String in2out) throws Exception { + logger.info("DDIPreprocessing Target : START"); + + String sUB_TEMP_FOLDER = Constants.sUB_TEMP_FOLDER(survey); + // ----- Dereferencing + logger.debug("Dereferencing : -Input : " + inputFile + " -Output : " + Constants.tEMP_NULL_TMP(sUB_TEMP_FOLDER) + + " -Stylesheet : " + Constants.UTIL_DDI_DEREFERENCING_XSL + " -Parameters : " + sUB_TEMP_FOLDER); + + InputStream isDDI_DEREFERENCING_XSL = Constants.getInputStreamFromPath(Constants.DDI_DEREFERENCING_XSL); + InputStream isInputFile = FileUtils.openInputStream(inputFile); + OutputStream osTEMP_NULL_TMP = FileUtils.openOutputStream(Constants.tEMP_NULL_TMP(sUB_TEMP_FOLDER)); + saxonService.transformDereferencing(isInputFile, isDDI_DEREFERENCING_XSL, osTEMP_NULL_TMP, + Constants.sUB_TEMP_FOLDER_FILE(survey)); // FIXME 4th param + // should be a + // parameters file + // (?!!?). + isInputFile.close(); + isDDI_DEREFERENCING_XSL.close(); + osTEMP_NULL_TMP.close(); + // ----- Cleaning + logger.debug("Cleaning target"); + File f = Constants.sUB_TEMP_FOLDER_FILE(survey); + File[] matchCleaningInput = f.listFiles(new FilenameFilter() { + + @Override + public boolean accept(File dir, String name) { + return !name.startsWith("null"); + } + }); + String cleaningInput = null; + String cleaningOutput = null; + + logger.debug("Searching matching files in : " + sUB_TEMP_FOLDER); + for (File file : matchCleaningInput) { + cleaningInput = file.getAbsolutePath(); + logger.debug("Found : " + cleaningInput); + } + + cleaningOutput = FilenameUtils.removeExtension(cleaningInput) + Constants.CLEANED_EXTENSION; + logger.debug("Cleaned output file to be created : " + cleaningOutput); + logger.debug("Cleaning : -Input : " + cleaningInput + " -Output : " + cleaningOutput + " -Stylesheet : " + + Constants.UTIL_DDI_CLEANING_XSL); + InputStream isCleaningIn = FileUtils.openInputStream(new File(cleaningInput)); + OutputStream osCleaning = FileUtils.openOutputStream(new File(cleaningOutput)); + InputStream isUTIL_DDI_CLEANING_XSL = Constants.getInputStreamFromPath(Constants.UTIL_DDI_CLEANING_XSL); + + saxonService.transformCleaning(isCleaningIn, isUTIL_DDI_CLEANING_XSL, osCleaning, in2out); + + isCleaningIn.close(); + isUTIL_DDI_CLEANING_XSL.close(); + osCleaning.close(); + // ----- Titling + // titlinginput = cleaningoutput + + String outputTitling = null; + + outputTitling = FilenameUtils.removeExtension(cleaningInput) + Constants.FINAL_EXTENSION; + + logger.debug("Titling : -Input : " + cleaningOutput + " -Output : " + outputTitling + " -Stylesheet : " + + Constants.UTIL_DDI_TITLING_XSL + " -Parameters : " + + (parametersFile == null ? "Default parameters" : "Provided parameters")); + + InputStream isCleaningTitling = FileUtils.openInputStream(new File(cleaningOutput)); + InputStream isUTIL_DDI_TITLING_XSL = Constants.getInputStreamFromPath(Constants.UTIL_DDI_TITLING_XSL); + OutputStream osTitling = FileUtils.openOutputStream(new File(outputTitling)); + saxonService.transformTitling(isCleaningTitling, isUTIL_DDI_TITLING_XSL, osTitling, parametersFile); + isCleaningTitling.close(); + isUTIL_DDI_TITLING_XSL.close(); + osTitling.close(); + logger.debug("DDIPreprocessing : END"); + return new File(outputTitling); + } + +} diff --git a/src/main/java/fr/insee/eno/preprocessing/DDIDereferencingPreprocessor.java b/src/main/java/fr/insee/eno/preprocessing/DDIDereferencingPreprocessor.java new file mode 100644 index 000000000..84d45fb04 --- /dev/null +++ b/src/main/java/fr/insee/eno/preprocessing/DDIDereferencingPreprocessor.java @@ -0,0 +1,100 @@ +package fr.insee.eno.preprocessing; + +import java.io.File; +import java.io.FilenameFilter; +import java.io.InputStream; +import java.io.OutputStream; + +import org.apache.commons.io.FileUtils; +import org.apache.commons.io.FilenameUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import fr.insee.eno.Constants; +import fr.insee.eno.transform.xsl.XslTransformation; + +/** + * A DDI specific preprocessor. + */ +public class DDIDereferencingPreprocessor implements Preprocessor { + + private static final Logger logger = LoggerFactory.getLogger(DDIDereferencingPreprocessor.class); + + // FIXME Inject ! + private static XslTransformation saxonService = new XslTransformation(); + + @Override + public File process(File inputFile, byte[] parametersFile, String survey, String in2out) throws Exception { + logger.info("DDIPreprocessing Target : START"); + + String sUB_TEMP_FOLDER = Constants.sUB_TEMP_FOLDER(survey); + // ----- Dereferencing + logger.debug("Dereferencing : -Input : " + inputFile + " -Output : " + Constants.tEMP_NULL_TMP(sUB_TEMP_FOLDER) + + " -Stylesheet : " + Constants.UTIL_DDI_DEREFERENCING_XSL + " -Parameters : " + sUB_TEMP_FOLDER); + + InputStream isDDI_DEREFERENCING_XSL = Constants.getInputStreamFromPath(Constants.DDI_DEREFERENCING_XSL); + InputStream isInputFile = FileUtils.openInputStream(inputFile); + OutputStream osTEMP_NULL_TMP = FileUtils.openOutputStream(Constants.tEMP_NULL_TMP(sUB_TEMP_FOLDER)); + saxonService.transformDereferencing(isInputFile, isDDI_DEREFERENCING_XSL, osTEMP_NULL_TMP, + Constants.sUB_TEMP_FOLDER_FILE(survey)); // FIXME 4th param + // should be a + // parameters file + // (?!!?). + isInputFile.close(); + isDDI_DEREFERENCING_XSL.close(); + osTEMP_NULL_TMP.close(); + // ----- Cleaning + logger.debug("Cleaning target"); + File f = Constants.sUB_TEMP_FOLDER_FILE(survey); + File[] matchCleaningInput = f.listFiles(new FilenameFilter() { + + @Override + public boolean accept(File dir, String name) { + return !name.startsWith("null"); + } + }); + String cleaningInput = null; + String cleaningOutput = null; + + logger.debug("Searching matching files in : " + sUB_TEMP_FOLDER); + for (File file : matchCleaningInput) { + cleaningInput = file.getAbsolutePath(); + logger.debug("Found : " + cleaningInput); + } + + cleaningOutput = FilenameUtils.removeExtension(cleaningInput) + Constants.CLEANED_EXTENSION; + logger.debug("Cleaned output file to be created : " + cleaningOutput); + logger.debug("Cleaning : -Input : " + cleaningInput + " -Output : " + cleaningOutput + " -Stylesheet : " + + Constants.UTIL_DDI_CLEANING_XSL); + InputStream isCleaningIn = FileUtils.openInputStream(new File(cleaningInput)); + OutputStream osCleaning = FileUtils.openOutputStream(new File(cleaningOutput)); + InputStream isUTIL_DDI_CLEANING_XSL = Constants.getInputStreamFromPath(Constants.UTIL_DDI_CLEANING_XSL); + + saxonService.transformCleaning(isCleaningIn, isUTIL_DDI_CLEANING_XSL, osCleaning, in2out); + + isCleaningIn.close(); + isUTIL_DDI_CLEANING_XSL.close(); + osCleaning.close(); + // ----- Titling + // titlinginput = cleaningoutput + + String outputTitling = null; + + outputTitling = FilenameUtils.removeExtension(cleaningInput) + Constants.FINAL_EXTENSION; + + logger.debug("Titling : -Input : " + cleaningOutput + " -Output : " + outputTitling + " -Stylesheet : " + + Constants.UTIL_DDI_TITLING_XSL + " -Parameters : " + + (parametersFile == null ? "Default parameters" : "Provided parameters")); + + InputStream isCleaningTitling = FileUtils.openInputStream(new File(cleaningOutput)); + InputStream isUTIL_DDI_TITLING_XSL = Constants.getInputStreamFromPath(Constants.UTIL_DDI_TITLING_XSL); + OutputStream osTitling = FileUtils.openOutputStream(new File(outputTitling)); + saxonService.transformTitling(isCleaningTitling, isUTIL_DDI_TITLING_XSL, osTitling, parametersFile); + isCleaningTitling.close(); + isUTIL_DDI_TITLING_XSL.close(); + osTitling.close(); + logger.debug("DDIPreprocessing : END"); + return new File(outputTitling); + } + +} diff --git a/src/main/java/fr/insee/eno/preprocessing/DDIMappingPreprocessor.java b/src/main/java/fr/insee/eno/preprocessing/DDIMappingPreprocessor.java new file mode 100644 index 000000000..93c54f0c5 --- /dev/null +++ b/src/main/java/fr/insee/eno/preprocessing/DDIMappingPreprocessor.java @@ -0,0 +1,50 @@ +package fr.insee.eno.preprocessing; + +import java.io.File; +import java.io.FilenameFilter; +import java.io.InputStream; +import java.io.OutputStream; + +import org.apache.commons.io.FileUtils; +import org.apache.commons.io.FilenameUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import fr.insee.eno.Constants; +import fr.insee.eno.transform.xsl.XslTransformation; + +/** + * A DDI specific preprocessor. + */ +public class DDIMappingPreprocessor implements Preprocessor { + + private static final Logger logger = LoggerFactory.getLogger(DDIMappingPreprocessor.class); + + // FIXME Inject ! + private static XslTransformation saxonService = new XslTransformation(); + + @Override + public File process(File inputFile, byte[] parametersFile, String survey, String in2out) throws Exception { + logger.info("DDIPreprocessing Target : START"); + + String sUB_TEMP_FOLDER = Constants.tEMP_DDI_FOLDER(Constants.sUB_TEMP_FOLDER(survey)); + + File mappingFile =Constants.tEMP_MAPPING_TMP(sUB_TEMP_FOLDER); + // ----- Dereferencing + logger.debug("Mapping : -Input : " + inputFile + " -Output : " + mappingFile + + " -Stylesheet : " + Constants.UTIL_DDI_DEREFERENCING_XSL + " -Parameters : " + sUB_TEMP_FOLDER); + + InputStream isDDI_MAPPING_XSL = Constants.getInputStreamFromPath(Constants.UTIL_DDI_MAPPING_XSL); + InputStream isInputFile = FileUtils.openInputStream(inputFile); + OutputStream osTEMP_MAPPING_TMP = FileUtils.openOutputStream(mappingFile); + saxonService.transformMapping(isInputFile, isDDI_MAPPING_XSL, osTEMP_MAPPING_TMP,parametersFile); + + isInputFile.close(); + isDDI_MAPPING_XSL.close(); + osTEMP_MAPPING_TMP.close(); + + return mappingFile; + + } + +} diff --git a/src/main/java/fr/insee/eno/preprocessing/DDITitlingPreprocessor.java b/src/main/java/fr/insee/eno/preprocessing/DDITitlingPreprocessor.java new file mode 100644 index 000000000..8ab76c6b1 --- /dev/null +++ b/src/main/java/fr/insee/eno/preprocessing/DDITitlingPreprocessor.java @@ -0,0 +1,100 @@ +package fr.insee.eno.preprocessing; + +import java.io.File; +import java.io.FilenameFilter; +import java.io.InputStream; +import java.io.OutputStream; + +import org.apache.commons.io.FileUtils; +import org.apache.commons.io.FilenameUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import fr.insee.eno.Constants; +import fr.insee.eno.transform.xsl.XslTransformation; + +/** + * A DDI specific preprocessor. + */ +public class DDITitlingPreprocessor implements Preprocessor { + + private static final Logger logger = LoggerFactory.getLogger(DDITitlingPreprocessor.class); + + // FIXME Inject ! + private static XslTransformation saxonService = new XslTransformation(); + + @Override + public File process(File inputFile, byte[] parametersFile, String survey, String in2out) throws Exception { + logger.info("DDIPreprocessing Target : START"); + + String sUB_TEMP_FOLDER = Constants.sUB_TEMP_FOLDER(survey); + // ----- Dereferencing + logger.debug("Dereferencing : -Input : " + inputFile + " -Output : " + Constants.tEMP_NULL_TMP(sUB_TEMP_FOLDER) + + " -Stylesheet : " + Constants.UTIL_DDI_DEREFERENCING_XSL + " -Parameters : " + sUB_TEMP_FOLDER); + + InputStream isDDI_DEREFERENCING_XSL = Constants.getInputStreamFromPath(Constants.DDI_DEREFERENCING_XSL); + InputStream isInputFile = FileUtils.openInputStream(inputFile); + OutputStream osTEMP_NULL_TMP = FileUtils.openOutputStream(Constants.tEMP_NULL_TMP(sUB_TEMP_FOLDER)); + saxonService.transformDereferencing(isInputFile, isDDI_DEREFERENCING_XSL, osTEMP_NULL_TMP, + Constants.sUB_TEMP_FOLDER_FILE(survey)); // FIXME 4th param + // should be a + // parameters file + // (?!!?). + isInputFile.close(); + isDDI_DEREFERENCING_XSL.close(); + osTEMP_NULL_TMP.close(); + // ----- Cleaning + logger.debug("Cleaning target"); + File f = Constants.sUB_TEMP_FOLDER_FILE(survey); + File[] matchCleaningInput = f.listFiles(new FilenameFilter() { + + @Override + public boolean accept(File dir, String name) { + return !name.startsWith("null"); + } + }); + String cleaningInput = null; + String cleaningOutput = null; + + logger.debug("Searching matching files in : " + sUB_TEMP_FOLDER); + for (File file : matchCleaningInput) { + cleaningInput = file.getAbsolutePath(); + logger.debug("Found : " + cleaningInput); + } + + cleaningOutput = FilenameUtils.removeExtension(cleaningInput) + Constants.CLEANED_EXTENSION; + logger.debug("Cleaned output file to be created : " + cleaningOutput); + logger.debug("Cleaning : -Input : " + cleaningInput + " -Output : " + cleaningOutput + " -Stylesheet : " + + Constants.UTIL_DDI_CLEANING_XSL); + InputStream isCleaningIn = FileUtils.openInputStream(new File(cleaningInput)); + OutputStream osCleaning = FileUtils.openOutputStream(new File(cleaningOutput)); + InputStream isUTIL_DDI_CLEANING_XSL = Constants.getInputStreamFromPath(Constants.UTIL_DDI_CLEANING_XSL); + + saxonService.transformCleaning(isCleaningIn, isUTIL_DDI_CLEANING_XSL, osCleaning, in2out); + + isCleaningIn.close(); + isUTIL_DDI_CLEANING_XSL.close(); + osCleaning.close(); + // ----- Titling + // titlinginput = cleaningoutput + + String outputTitling = null; + + outputTitling = FilenameUtils.removeExtension(cleaningInput) + Constants.FINAL_EXTENSION; + + logger.debug("Titling : -Input : " + cleaningOutput + " -Output : " + outputTitling + " -Stylesheet : " + + Constants.UTIL_DDI_TITLING_XSL + " -Parameters : " + + (parametersFile == null ? "Default parameters" : "Provided parameters")); + + InputStream isCleaningTitling = FileUtils.openInputStream(new File(cleaningOutput)); + InputStream isUTIL_DDI_TITLING_XSL = Constants.getInputStreamFromPath(Constants.UTIL_DDI_TITLING_XSL); + OutputStream osTitling = FileUtils.openOutputStream(new File(outputTitling)); + saxonService.transformTitling(isCleaningTitling, isUTIL_DDI_TITLING_XSL, osTitling, parametersFile); + isCleaningTitling.close(); + isUTIL_DDI_TITLING_XSL.close(); + osTitling.close(); + logger.debug("DDIPreprocessing : END"); + return new File(outputTitling); + } + +} diff --git a/src/main/java/fr/insee/eno/preprocessing/PoguesXMLPreprocessor.java b/src/main/java/fr/insee/eno/preprocessing/PoguesXMLPreprocessor.java index 591261564..5d085bded 100644 --- a/src/main/java/fr/insee/eno/preprocessing/PoguesXMLPreprocessor.java +++ b/src/main/java/fr/insee/eno/preprocessing/PoguesXMLPreprocessor.java @@ -17,7 +17,6 @@ * See PoguesXMLPreprocessorGoToTreatment for new implementation * A PoguesXML specific preprocessor. */ -@Deprecated public class PoguesXMLPreprocessor implements Preprocessor { private static final Logger logger = LoggerFactory.getLogger(PoguesXMLPreprocessor.class); From 9a317ba2f28dfafdeac10fb5f4adc09ce1ee4538 Mon Sep 17 00:00:00 2001 From: Laurent Caouissin <laurent.caouissin@insee.fr> Date: Thu, 5 Sep 2019 10:52:31 +0200 Subject: [PATCH 099/439] Eno v2.0.0 : add new Module to validate params --- .../eno/validation/ValidationBoolean.java | 21 +++ .../fr/insee/eno/validation/Validator.java | 11 ++ .../insee/eno/validation/ValidatorImpl.java | 137 ++++++++++++++++++ 3 files changed, 169 insertions(+) create mode 100644 src/main/java/fr/insee/eno/validation/ValidationBoolean.java create mode 100644 src/main/java/fr/insee/eno/validation/Validator.java create mode 100644 src/main/java/fr/insee/eno/validation/ValidatorImpl.java diff --git a/src/main/java/fr/insee/eno/validation/ValidationBoolean.java b/src/main/java/fr/insee/eno/validation/ValidationBoolean.java new file mode 100644 index 000000000..7ee2deb08 --- /dev/null +++ b/src/main/java/fr/insee/eno/validation/ValidationBoolean.java @@ -0,0 +1,21 @@ +package fr.insee.eno.validation; + +public class ValidationBoolean { + + private String message; + private boolean valid; + + public String getMessage() { + return message; + } + public void setMessage(String message) { + this.message = message; + } + public boolean isValid() { + return valid; + } + public void setValid(boolean valid) { + this.valid = valid; + } + +} diff --git a/src/main/java/fr/insee/eno/validation/Validator.java b/src/main/java/fr/insee/eno/validation/Validator.java new file mode 100644 index 000000000..144ae3af8 --- /dev/null +++ b/src/main/java/fr/insee/eno/validation/Validator.java @@ -0,0 +1,11 @@ +package fr.insee.eno.validation; + +import fr.insee.eno.parameters.ENOParameters; + +public interface Validator { + + boolean validate(byte[] parameters); + + boolean validate(ENOParameters parametersType); + +} diff --git a/src/main/java/fr/insee/eno/validation/ValidatorImpl.java b/src/main/java/fr/insee/eno/validation/ValidatorImpl.java new file mode 100644 index 000000000..4b31615f9 --- /dev/null +++ b/src/main/java/fr/insee/eno/validation/ValidatorImpl.java @@ -0,0 +1,137 @@ +package fr.insee.eno.validation; + +import java.util.Arrays; +import java.util.List; + +import fr.insee.eno.parameters.ENOParameters; +import fr.insee.eno.parameters.InFormat; +import fr.insee.eno.parameters.OutFormat; +import fr.insee.eno.parameters.Pipeline; +import fr.insee.eno.parameters.PostProcessing; +import fr.insee.eno.parameters.PreProcessing; +public class ValidatorImpl implements Validator { + + public static final List<PreProcessing> PRE_PROCESSING_DDI = Arrays.asList( + PreProcessing.DDI_DEREFERENCING, + PreProcessing.DDI_CLEANING, + PreProcessing.DDI_TITLING); + + public static final List<PreProcessing> PRE_PROCESSING_POGUES_XML_WITH_GOTO = Arrays.asList( + PreProcessing.POGUES_XML_GOTO_2_ITE); + + public static final List<PreProcessing> PRE_PROCESSING_POGUES_XML_WITHOUT_GOTO = Arrays.asList( + PreProcessing.POGUES_XML_SUPPRESSION_GOTO, + PreProcessing.POGUES_XML_TWEAK_TO_MERGE_EQUIVALENT_ITE); + + public static final List<PostProcessing> POST_PROCESSING_DDI = Arrays.asList( + PostProcessing.DDI_MARKDOWN_TO_XHTML); + + public static final List<PostProcessing> POST_PROCESSING_JS = Arrays.asList( + PostProcessing.JS_SORT_COMPONENTS, + PostProcessing.JS_EXTERNALIZE_VARIABLES); + + public static final List<PostProcessing> POST_PROCESSING_PDF = Arrays.asList( + PostProcessing.PDF_MAILING, + PostProcessing.PDF_TABLE_COLUMN, + PostProcessing.PDF_INSERT_END_QUESTION, + PostProcessing.PDF_EDIT_STRUCTURE_PAGES, + PostProcessing.PDF_INSERT_COVER_PAGE, + PostProcessing.PDF_INSERT_ACCOMPANYING_MAILS); + + public static final List<PostProcessing> POST_PROCESSING_FR = Arrays.asList( + PostProcessing.FR_INSERT_GENERIC_QUESTIONS, + PostProcessing.FR_BROWSING, + PostProcessing.FR_MODELE_COLTRANE, + PostProcessing.FR_EDIT_PATRON, + PostProcessing.FR_IDENTIFICATION, + PostProcessing.FR_INSERT_WELCOME, + PostProcessing.FR_INSERT_END, + PostProcessing.FR_FIX_ADHERENCE); + + @Override + public boolean validate(byte[] parameters) { + // TODO Auto-generated method stub + return false; + } + + @Override + public boolean validate(ENOParameters parametersType) { + Pipeline pipeline = parametersType.getPipeline(); + boolean isValid = + validateIn2Out(pipeline.getInFormat(), pipeline.getOutFormat()) + && validatePostProcessings(pipeline); + return false; + } + + public boolean validateIn2Out(InFormat inFormat, OutFormat outFormat) { + boolean isValid; + + switch (inFormat) { + case DDI: + isValid = !outFormat.equals(OutFormat.DDI); + break; + case POGUES_XML: + isValid = !outFormat.equals(OutFormat.POGUES_XML); + break; + default: + isValid=false; + break; + } + return isValid; + } + + public boolean validatePreProcessings(InFormat inFormat, List<PreProcessing> preProcessings) { + boolean isValid; + switch (inFormat) { + case DDI: + isValid = + preProcessings.containsAll(PRE_PROCESSING_DDI) + && preProcessings.size()==PRE_PROCESSING_DDI.size(); + break; + case POGUES_XML: + isValid = + (preProcessings.containsAll(PRE_PROCESSING_POGUES_XML_WITH_GOTO) && preProcessings.size()==PRE_PROCESSING_POGUES_XML_WITH_GOTO.size()) + || + (preProcessings.containsAll(PRE_PROCESSING_POGUES_XML_WITHOUT_GOTO) && preProcessings.size()==PRE_PROCESSING_POGUES_XML_WITHOUT_GOTO.size()); + break; + default: + isValid=false; + break; + } + return isValid; + } + + public boolean validatePostProcessings(Pipeline pipeline) { + boolean isValid; + + OutFormat outFormat = pipeline.getOutFormat(); + List<PostProcessing> postProcessings = pipeline.getPostProcessing(); + boolean specificTreatment = false; + switch (outFormat) { + case DDI: + isValid = postProcessings.containsAll(POST_PROCESSING_DDI) && postProcessings.size()==POST_PROCESSING_DDI.size(); + break; + case FR: + isValid = postProcessings.containsAll(POST_PROCESSING_FR) && postProcessings.size()==POST_PROCESSING_FR.size(); + break; + case PDF: + isValid = postProcessings.containsAll(POST_PROCESSING_PDF) && postProcessings.size()==POST_PROCESSING_PDF.size(); + break; + case JS: + isValid = postProcessings.containsAll(POST_PROCESSING_JS) && postProcessings.size()==POST_PROCESSING_JS.size(); + break; + case ODT: + isValid = postProcessings.isEmpty(); + break; + case POGUES_XML: + isValid = postProcessings.isEmpty(); + break; + } + return false; + } + + public boolean validateParams() { + return false; + } + +} From 0d96728f0e6ea25db676fbca2a9f974a1c3c00d8 Mon Sep 17 00:00:00 2001 From: Laurent Caouissin <laurent.caouissin@insee.fr> Date: Thu, 5 Sep 2019 10:53:34 +0200 Subject: [PATCH 100/439] Eno v2.0.0 : Create default parameters xml file --- src/main/resources/params/parameters_full.xml | 108 ++++++++++++++++++ 1 file changed, 108 insertions(+) create mode 100644 src/main/resources/params/parameters_full.xml diff --git a/src/main/resources/params/parameters_full.xml b/src/main/resources/params/parameters_full.xml new file mode 100644 index 000000000..8dd265f88 --- /dev/null +++ b/src/main/resources/params/parameters_full.xml @@ -0,0 +1,108 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Parameters> + <Title> + <!-- no-number ; template ; module ; submodule ; unnumbered-filter --> + <Browsing>module</Browsing> + <Sequence> + <!-- niveau template utile car permet de définir la hiérarchie des séquences, alors même qu'il n'est pas numéroté --> + <Level name="template"/> + <Level name="module"> + <!-- toujours affiché --> + <PreSeq/> + <!-- Y ; N --> + <NumParent>N</NumParent> + <!-- Affiché seulement si un numéro est affiché pour le parent --> + <PostNumParentSeq/> + <!-- 1 ; A ; a ; I ; i --> + <StyleNumSeq>I</StyleNumSeq> + <!-- Affiché seulement si un numéro est affiché pour la séquence --> + <PostNumSeq> - </PostNumSeq> + </Level> + <!-- pas de numérotation au niveau submodule = pas d'élément --> + <Level name="submodule"/> + </Sequence> + <Question> + <Level name="module"> + <!-- toujours affiché --> + <PreQuest>➡ </PreQuest> + <!-- Y ; N --> + <NumParent>N</NumParent> + <!-- Affiché seulement si un numéro est affiché pour le parent --> + <PostNumParentQuest/> + <!-- 1 ; A ; a ; I ; i --> + <StyleNumQuest>1</StyleNumQuest> + <!-- Affiché seulement si un numéro est affiché pour la question --> + <PostNumQuest>. </PostNumQuest> + </Level> + <!-- La présentation des questions de niveau module et submodule doit être précisée si les deux sont présents ; elle peut être distincte --> + <Level name="submodule"> + <PreQuest>➡ </PreQuest> + <NumParent>N</NumParent> + <PostNumParentQuest/> + <StyleNumQuest>1</StyleNumQuest> + <PostNumQuest>. </PostNumQuest> + </Level> + </Question> + + + + fr + + + Yes + + + default + + + 7 + + + + + + + + oui + + + + + 0 + + + + + + 12 + + + + + 14 + +
+ + + + manual + + + + module + + + + ouvertureCOL + + + + true + true + + + From e8932ecde0a460d23288e35f035310a54a5ec8d5 Mon Sep 17 00:00:00 2001 From: Laurent Caouissin Date: Thu, 5 Sep 2019 10:55:41 +0200 Subject: [PATCH 101/439] Eno v2.0.0 : add model-questionnaire in outputs --- src/main/resources/xslt/outputs/fr/models.xsl | 5 ++++- src/main/resources/xslt/outputs/js/models.xsl | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/resources/xslt/outputs/fr/models.xsl b/src/main/resources/xslt/outputs/fr/models.xsl index d77284b26..801a930ff 100644 --- a/src/main/resources/xslt/outputs/fr/models.xsl +++ b/src/main/resources/xslt/outputs/fr/models.xsl @@ -5,10 +5,13 @@ xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:xxf="http://orbeon.org/oxf/xml/xforms" xmlns:fr="http://orbeon.org/oxf/xml/form-runner" xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl" xmlns:eno="http://xml.insee.fr/apps/eno" xmlns:enofr="http://xml.insee.fr/apps/eno/form-runner" + xmlns:d="ddi:datacollection:3_2" xmlns:r="ddi:reusable:3_2" exclude-result-prefixes="xd eno enofr" version="2.0"> + + An xslt stylesheet who transforms an input into Xforms (Orbeon Form-Runner) through generic driver templates. @@ -60,7 +63,7 @@ -
+ diff --git a/src/main/resources/xslt/outputs/js/models.xsl b/src/main/resources/xslt/outputs/js/models.xsl index 708eed4ba..4c373ada1 100644 --- a/src/main/resources/xslt/outputs/js/models.xsl +++ b/src/main/resources/xslt/outputs/js/models.xsl @@ -6,6 +6,7 @@ xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl" xmlns:eno="http://xml.insee.fr/apps/eno" xmlns:enojs="http://xml.insee.fr/apps/eno/out/js" + xmlns:d="ddi:datacollection:3_2" xmlns:r="ddi:reusable:3_2" xmlns="http://xml.insee.fr/schema/applis/lunatic-h" exclude-result-prefixes="xs fn xd eno enojs" version="2.0"> @@ -26,6 +27,7 @@ + @@ -74,7 +76,7 @@ - + From 50e2eee6f486cfdf24f0d5c7e88ca0bf742201ad Mon Sep 17 00:00:00 2001 From: Laurent Caouissin Date: Thu, 5 Sep 2019 10:56:30 +0200 Subject: [PATCH 102/439] Eno v2.0.0 : Updata reading paramters in pdf transformation --- .../resources/xslt/outputs/pdf/models.xsl | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main/resources/xslt/outputs/pdf/models.xsl b/src/main/resources/xslt/outputs/pdf/models.xsl index d614574cf..f051410a2 100644 --- a/src/main/resources/xslt/outputs/pdf/models.xsl +++ b/src/main/resources/xslt/outputs/pdf/models.xsl @@ -41,18 +41,18 @@ - - + + - + - - + + @@ -61,8 +61,8 @@ - - + + @@ -71,18 +71,18 @@ - - + + - + - - + + From 54924b4a15d08b110b6ddb02cbfc5a1771323154 Mon Sep 17 00:00:00 2001 From: Laurent Caouissin Date: Thu, 5 Sep 2019 11:12:21 +0200 Subject: [PATCH 103/439] Eno v2.0.0 : creat schema xsd to validate structure of parameter xml file --- .../params/schemas/ENOParameters.xsd | 59 +++++++++ .../resources/params/schemas/Pipeline.xsd | 91 ++++++++++++++ .../schemas/generation/DDI2FRGeneration.xsd | 23 ++++ .../schemas/generation/DDI2JSGeneration.xsd | 12 ++ .../schemas/generation/DDI2ODTGeneration.xsd | 12 ++ .../schemas/generation/DDI2PDFGeneration.xsd | 113 ++++++++++++++++++ .../params/schemas/generation/Generation.xsd | 24 ++++ .../generation/PoguesXML2DDIGeneration.xsd | 2 + .../params/schemas/jaxb/jaxb.properties | 1 + .../preprocessing/DDIPreprocessing.xsd | 81 +++++++++++++ 10 files changed, 418 insertions(+) create mode 100644 src/main/resources/params/schemas/ENOParameters.xsd create mode 100644 src/main/resources/params/schemas/Pipeline.xsd create mode 100644 src/main/resources/params/schemas/generation/DDI2FRGeneration.xsd create mode 100644 src/main/resources/params/schemas/generation/DDI2JSGeneration.xsd create mode 100644 src/main/resources/params/schemas/generation/DDI2ODTGeneration.xsd create mode 100644 src/main/resources/params/schemas/generation/DDI2PDFGeneration.xsd create mode 100644 src/main/resources/params/schemas/generation/Generation.xsd create mode 100644 src/main/resources/params/schemas/generation/PoguesXML2DDIGeneration.xsd create mode 100644 src/main/resources/params/schemas/jaxb/jaxb.properties create mode 100644 src/main/resources/params/schemas/preprocessing/DDIPreprocessing.xsd diff --git a/src/main/resources/params/schemas/ENOParameters.xsd b/src/main/resources/params/schemas/ENOParameters.xsd new file mode 100644 index 000000000..bb27bd677 --- /dev/null +++ b/src/main/resources/params/schemas/ENOParameters.xsd @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/params/schemas/Pipeline.xsd b/src/main/resources/params/schemas/Pipeline.xsd new file mode 100644 index 000000000..ad7f64613 --- /dev/null +++ b/src/main/resources/params/schemas/Pipeline.xsd @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/params/schemas/generation/DDI2FRGeneration.xsd b/src/main/resources/params/schemas/generation/DDI2FRGeneration.xsd new file mode 100644 index 000000000..610b12939 --- /dev/null +++ b/src/main/resources/params/schemas/generation/DDI2FRGeneration.xsd @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/params/schemas/generation/DDI2JSGeneration.xsd b/src/main/resources/params/schemas/generation/DDI2JSGeneration.xsd new file mode 100644 index 000000000..dd9a62667 --- /dev/null +++ b/src/main/resources/params/schemas/generation/DDI2JSGeneration.xsd @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/src/main/resources/params/schemas/generation/DDI2ODTGeneration.xsd b/src/main/resources/params/schemas/generation/DDI2ODTGeneration.xsd new file mode 100644 index 000000000..2dde71e4f --- /dev/null +++ b/src/main/resources/params/schemas/generation/DDI2ODTGeneration.xsd @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/src/main/resources/params/schemas/generation/DDI2PDFGeneration.xsd b/src/main/resources/params/schemas/generation/DDI2PDFGeneration.xsd new file mode 100644 index 000000000..738594ab5 --- /dev/null +++ b/src/main/resources/params/schemas/generation/DDI2PDFGeneration.xsd @@ -0,0 +1,113 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/params/schemas/generation/Generation.xsd b/src/main/resources/params/schemas/generation/Generation.xsd new file mode 100644 index 000000000..3f6dfcb34 --- /dev/null +++ b/src/main/resources/params/schemas/generation/Generation.xsd @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/params/schemas/generation/PoguesXML2DDIGeneration.xsd b/src/main/resources/params/schemas/generation/PoguesXML2DDIGeneration.xsd new file mode 100644 index 000000000..d03088e82 --- /dev/null +++ b/src/main/resources/params/schemas/generation/PoguesXML2DDIGeneration.xsd @@ -0,0 +1,2 @@ + + diff --git a/src/main/resources/params/schemas/jaxb/jaxb.properties b/src/main/resources/params/schemas/jaxb/jaxb.properties new file mode 100644 index 000000000..5837a4c25 --- /dev/null +++ b/src/main/resources/params/schemas/jaxb/jaxb.properties @@ -0,0 +1 @@ +javax.xml.bind.context.factory=org.eclipse.persistence.jaxb.JAXBContextFactory \ No newline at end of file diff --git a/src/main/resources/params/schemas/preprocessing/DDIPreprocessing.xsd b/src/main/resources/params/schemas/preprocessing/DDIPreprocessing.xsd new file mode 100644 index 000000000..e9661bec1 --- /dev/null +++ b/src/main/resources/params/schemas/preprocessing/DDIPreprocessing.xsd @@ -0,0 +1,81 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 8b27a2a4ae8d0b1fa69b6a19c4b0adf5bcc92a33 Mon Sep 17 00:00:00 2001 From: Laurent Caouissin Date: Thu, 5 Sep 2019 11:13:06 +0200 Subject: [PATCH 104/439] Eno v2.0.0 : Delete useless file --- src/main/resources/pdf-specific-treatment.xsl | 32 ------------------- 1 file changed, 32 deletions(-) delete mode 100644 src/main/resources/pdf-specific-treatment.xsl diff --git a/src/main/resources/pdf-specific-treatment.xsl b/src/main/resources/pdf-specific-treatment.xsl deleted file mode 100644 index 31359a036..000000000 --- a/src/main/resources/pdf-specific-treatment.xsl +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - Template de racine, on applique les templates de tous les enfants - - - - - - - - - Template de base pour tous les éléments et tous les attributs, on recopie - simplement en sortie - - - - - - - - - \ No newline at end of file From 4290c72f95a9ee116734df64ecb2e101baa9dbeb Mon Sep 17 00:00:00 2001 From: Laurent Caouissin Date: Thu, 5 Sep 2019 11:16:11 +0200 Subject: [PATCH 105/439] Eno v2.0.0 : add new parameters - new params for java - add new xsl transformations in java - update Generation Service - update ddi2fr generator (update constant) --- .../java/fr/insee/eno/GenerationService.java | 20 +++- .../insee/eno/generation/DDI2FRGenerator.java | 2 +- .../eno/transform/xsl/XslParameters.java | 6 + .../eno/transform/xsl/XslTransformation.java | 105 ++++++++++++++++++ 4 files changed, 128 insertions(+), 5 deletions(-) diff --git a/src/main/java/fr/insee/eno/GenerationService.java b/src/main/java/fr/insee/eno/GenerationService.java index 4ab05da92..5195f33f5 100644 --- a/src/main/java/fr/insee/eno/GenerationService.java +++ b/src/main/java/fr/insee/eno/GenerationService.java @@ -12,6 +12,7 @@ import fr.insee.eno.generation.Generator; import fr.insee.eno.postprocessing.Postprocessor; +import fr.insee.eno.preprocessing.DDIMappingPreprocessor; import fr.insee.eno.preprocessing.Preprocessor; import fr.insee.eno.utils.FolderCleaner; @@ -68,12 +69,23 @@ public File generateQuestionnaire(File inputFile, String surveyName) throws Exce String tempFolder = System.getProperty("java.io.tmpdir") + "/" + surveyName; logger.debug("Temp folder: " + tempFolder); cleanTempFolder(surveyName); - - File preprocessResultFileName = this.preprocessors[0].process(inputFile, parameters, surveyName, - generator.in2out()); + File preprocessResultFileName = null; + + if(this.preprocessors[0].getClass()==DDIMappingPreprocessor.class) { + this.preprocessors[0].process(inputFile, parameters, surveyName,generator.in2out()); + preprocessResultFileName = inputFile; + } + else { + preprocessResultFileName = this.preprocessors[0].process(inputFile, parameters, surveyName,generator.in2out()); + } for (int i = 1; i < preprocessors.length; i++) { - preprocessResultFileName = this.preprocessors[0].process(preprocessResultFileName, parameters, surveyName, + if(this.preprocessors[i].getClass()==DDIMappingPreprocessor.class) { + this.preprocessors[i].process(inputFile, parameters, surveyName,generator.in2out()); + } + else{ + preprocessResultFileName = this.preprocessors[i].process(preprocessResultFileName, parameters, surveyName, generator.in2out()); + } } File generatedForm = this.generator.generate(preprocessResultFileName, parameters, surveyName); diff --git a/src/main/java/fr/insee/eno/generation/DDI2FRGenerator.java b/src/main/java/fr/insee/eno/generation/DDI2FRGenerator.java index 55501dc31..6f853caaf 100644 --- a/src/main/java/fr/insee/eno/generation/DDI2FRGenerator.java +++ b/src/main/java/fr/insee/eno/generation/DDI2FRGenerator.java @@ -53,7 +53,7 @@ public File generate(File finalInput, byte[] parameters, String surveyName) thro InputStream isOutputBasicFormPath = FileUtils.openInputStream(new File(outputBasicFormPath)); OutputStream osOutputForm = FileUtils.openOutputStream(new File(outputForm)); - InputStream isBROWSING_TEMPLATE_XSL = Constants.getInputStreamFromPath(Constants.BROWSING_FR_TEMPLATE_XSL); + InputStream isBROWSING_TEMPLATE_XSL = Constants.getInputStreamFromPath(Constants.UTIL_FR_BROWSING_XSL); saxonService.transformBrowsingDDI2FR(isOutputBasicFormPath, osOutputForm, isBROWSING_TEMPLATE_XSL, Constants.LABEL_FOLDER); isOutputBasicFormPath.close(); diff --git a/src/main/java/fr/insee/eno/transform/xsl/XslParameters.java b/src/main/java/fr/insee/eno/transform/xsl/XslParameters.java index 1ba1839ce..4fb5ebfb4 100644 --- a/src/main/java/fr/insee/eno/transform/xsl/XslParameters.java +++ b/src/main/java/fr/insee/eno/transform/xsl/XslParameters.java @@ -18,10 +18,16 @@ private XslParameters() { public static final String IN2OUT_PARAMETERS_NODE = "parameters-node"; public static final String IN2OUT_PROPERTIES_FILE = "properties-file"; public static final String IN2OUT_PROPERTIES_NODE = "properties-node"; + public static final String IN2OUT_METADONNEE_FILE = "metadonnee-file"; + public static final String IN2OUT_METADONNEE_NODE = "metadonnee-node"; public static final String CLEANED_EXTENSION = "-cleaned"; public static final String TITLED_EXTENSION = "-final"; public static final String DDI2PDF_STATIC_PAGES = "static-pages"; public static final String IN2OUT_LABELS_FOLDER = "labels-folder"; public static final String IN2OUT_SURVEY_NAME = "survey-name"; public static final String IN2OUT_FORM_NAME = "form-name"; + public static final String IN2OUT_MAPPING_FILE_NODE = "fichier-mapping-node"; + public static final String IN2OUT_CAMPAGNE = "campagne"; + public static final String IN2OUT_MODELE = "model"; + } diff --git a/src/main/java/fr/insee/eno/transform/xsl/XslTransformation.java b/src/main/java/fr/insee/eno/transform/xsl/XslTransformation.java index f9fcade90..ab7a679f1 100644 --- a/src/main/java/fr/insee/eno/transform/xsl/XslTransformation.java +++ b/src/main/java/fr/insee/eno/transform/xsl/XslTransformation.java @@ -206,6 +206,26 @@ public void transformDereferencing(InputStream input, InputStream xslSheet, Outp transformer.setParameter(XslParameters.DEREFERENCING_OUTPUT_FOLDER, outputFolderParameter); xslTransform(transformer, input, output); } + + public void transformMapping(InputStream input, InputStream xslSheet, OutputStream output, + byte[] parameters) throws Exception { + InputStream parametersIS = null; + logger.debug("Using the Mapping transformer"); + TransformerFactory tFactory = new net.sf.saxon.TransformerFactoryImpl(); + + Transformer transformer = tFactory.newTransformer(new StreamSource(xslSheet)); + transformer.setErrorListener(new EnoErrorListener()); + transformer.setParameter(XslParameters.IN2OUT_PARAMETERS_FILE, Constants.PARAMETERS); + if (parameters != null) { + parametersIS = new ByteArrayInputStream(parameters); + Source source = new StreamSource(parametersIS); + transformer.setParameter(XslParameters.IN2OUT_PARAMETERS_NODE, source); + } + xslTransform(transformer, input, output); + if (parameters != null) { + parametersIS.close(); + } + } /** * Titling Transformer initialization with its parameters @@ -382,6 +402,91 @@ public void transformFOToStep4FO(InputStream inputFile, OutputStream outputFile, } } + /* POST transformations */ + // FR + + public void transformBrowsingFr(InputStream inputFile, OutputStream outputFile, InputStream xslSheet) throws Exception { + logger.info("Post-processing browing for FR transformation."); + TransformerFactory tFactory = new net.sf.saxon.TransformerFactoryImpl(); + tFactory.setURIResolver(new ClasspathURIResolver()); + Transformer transformer = tFactory.newTransformer(new StreamSource(xslSheet)); + transformer.setErrorListener(new EnoErrorListener()); + transformer.setParameter(XslParameters.IN2OUT_LABELS_FOLDER, Constants.LABELS_FOLDER); + logger.debug(String.format("Transformer parameter is: %s", + transformer.getParameter(XslParameters.IN2OUT_LABELS_FOLDER))); + xslTransform(transformer, inputFile, outputFile); + } + + public void transformModelColtraneFr(InputStream inputFile, OutputStream outputFile, InputStream xslSheet, InputStream mappingFile) throws Exception { + logger.info("Post-processing for FR transformation with mapping.xml file."); + TransformerFactory tFactory = new net.sf.saxon.TransformerFactoryImpl(); + tFactory.setURIResolver(new ClasspathURIResolver()); + Transformer transformer = tFactory.newTransformer(new StreamSource(xslSheet)); + transformer.setErrorListener(new EnoErrorListener()); + if (mappingFile != null) { + Source source = new StreamSource(mappingFile); + transformer.setParameter(XslParameters.IN2OUT_MAPPING_FILE_NODE, source); + } + logger.debug(String.format("Transformer parameter is: %s", + transformer.getParameter(XslParameters.IN2OUT_MAPPING_FILE_NODE))); + xslTransform(transformer, inputFile, outputFile); + + + } + + public void transformWithMetadonnee(InputStream inputFile, OutputStream outputFile, InputStream xslSheet, byte[] parameters, InputStream metadonnees) + throws Exception { + InputStream parametersIS = null; + logger.info("Post-processing for FR transformation with parameter file and metadonnee file"); + TransformerFactory tFactory = new net.sf.saxon.TransformerFactoryImpl(); + tFactory.setURIResolver(new ClasspathURIResolver()); + Transformer transformer = tFactory.newTransformer(new StreamSource(xslSheet)); + transformer.setParameter(XslParameters.IN2OUT_PROPERTIES_FILE, Constants.CONFIG_DDI2FR); + transformer.setParameter(XslParameters.IN2OUT_PARAMETERS_FILE, Constants.PARAMETERS); + transformer.setParameter(XslParameters.IN2OUT_METADONNEE_FILE, Constants.METADONNEES); + if (metadonnees != null) { + Source source = new StreamSource(metadonnees); + transformer.setParameter(XslParameters.IN2OUT_METADONNEE_NODE, source); + } + if (parameters != null) { + parametersIS = new ByteArrayInputStream(parameters); + Source source = new StreamSource(parametersIS); + transformer.setParameter(XslParameters.IN2OUT_PARAMETERS_NODE, source); + } + transformer.setErrorListener(new EnoErrorListener()); + xslTransform(transformer, inputFile, outputFile); + } + + public void transformFRToFRSimplePost(InputStream inputFile, OutputStream outputFile, InputStream xslSheet, byte[] parameters) + throws Exception { + InputStream parametersIS = null; + logger.info("Post-processing for FR transformation with parameter file"); + TransformerFactory tFactory = new net.sf.saxon.TransformerFactoryImpl(); + tFactory.setURIResolver(new ClasspathURIResolver()); + Transformer transformer = tFactory.newTransformer(new StreamSource(xslSheet)); + transformer.setParameter(XslParameters.IN2OUT_PROPERTIES_FILE, Constants.CONFIG_DDI2FR); + transformer.setParameter(XslParameters.IN2OUT_PARAMETERS_FILE, Constants.PARAMETERS); + if (parameters != null) { + parametersIS = new ByteArrayInputStream(parameters); + Source source = new StreamSource(parametersIS); + transformer.setParameter(XslParameters.IN2OUT_PARAMETERS_NODE, source); + } + transformer.setErrorListener(new EnoErrorListener()); + xslTransform(transformer, inputFile, outputFile); + } + + public void transformSimple(InputStream inputFile, OutputStream outputFile, InputStream xslSheet) + throws Exception { + logger.info("Simple post-processing for FR transformation"); + TransformerFactory tFactory = new net.sf.saxon.TransformerFactoryImpl(); + tFactory.setURIResolver(new ClasspathURIResolver()); + Transformer transformer = tFactory.newTransformer(new StreamSource(xslSheet)); + transformer.setErrorListener(new EnoErrorListener()); + xslTransform(transformer, inputFile, outputFile); + } + + // JS + public void transformJSToJSPost(InputStream inputFile, OutputStream outputFile, InputStream xslSheet) throws Exception { logger.info("Post-processing for JS transformation"); From 36d7db30be1a0dfaa4a4a08afdf0d3259c7dcd6a Mon Sep 17 00:00:00 2001 From: Laurent Caouissin Date: Thu, 5 Sep 2019 11:17:45 +0200 Subject: [PATCH 106/439] Eno v2.0.0 : update pom.xml - add jaxb dependency - add generation xml <-> java in phase 'generate-sources' --- pom.xml | 87 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 85 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index cf1ad16e7..d1a9db919 100644 --- a/pom.xml +++ b/pom.xml @@ -1,9 +1,10 @@ - 4.0.0 fr.insee.eno eno-core - 1.1.0 + 2.0.0 jar Eno – Questionnaire generator @@ -119,6 +120,17 @@ 2.11.0 test + + + org.eclipse.persistence + org.eclipse.persistence.moxy + 2.6.0 + + + org.eclipse.persistence + eclipselink + 2.6.0 + @@ -216,6 +228,74 @@ true + + org.codehaus.mojo + jaxb2-maven-plugin + 2.1 + + + xjc-schema + generate-sources + + xjc + + + fr.insee.eno.parameters + UTF-8 + + src/main/resources/params/schemas/ENOParameters.xsd + + + + + + + maven-resources-plugin + 2.7 + + UTF-8 + + + + copy-resources + process-resources + + copy-resources + + + target/generated-sources/jaxb/fr/eno/parameters + + + src/main/resources/jaxb + + jaxb.properties + + + + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + 1.7 + + + add-source + generate-sources + + add-source + + + + ${project.build.directory}/generated-sources/jaxb + + + + + @@ -234,6 +314,9 @@ Benoit Werquin + + Laurent Caouissin + From 27c2eeffaff86c12f10ecc9f5a96f6ae54103d60 Mon Sep 17 00:00:00 2001 From: Laurent Caouissin Date: Thu, 5 Sep 2019 11:42:16 +0200 Subject: [PATCH 107/439] Eno v2.0.0 : create metadonnees default file --- src/main/resources/metadonnees.xml | 38 ++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 src/main/resources/metadonnees.xml diff --git a/src/main/resources/metadonnees.xml b/src/main/resources/metadonnees.xml new file mode 100644 index 000000000..b4c5824c6 --- /dev/null +++ b/src/main/resources/metadonnees.xml @@ -0,0 +1,38 @@ + + + TESTE + TESTE + TESTE2018 + Pluriannuelle + 2018 + 01 + 6/05/2022 + 31/05/2022 + Paris + 6/05/2022 + L’ + [Surchargeable] - Institut national de la statistique et des études économiques (Insee) + l’Insee + auprès d'individus. Vous pouvez surcharger les objectifs longs de l'enquête. + OUI + de salariés de l’État, travaillant pour des ministères ou des établissements publics nationaux, quel que soit leur statut + une vingtaine de minutes - [Surchargeable] - + https://www.insee.fr + de l’Insee + www.insee/xxx.fr + Le directeur - [Surchargeable] + Mr Dupont - [Surchargeable] + M + 2019XXXXXX + Ministre de l’économie et des finances + 2022 + oui + 25 juillet 2019 - [Surchargeable] - + Insee Grand Est – établissement de Nancy – PENM – 15 rue du Général Hulot – CS 54229 – 54042 Nancy cedex - [Surchargeable] - + vous + non + de 33 000 personnes - [Surchargeable] - + oui + Enquête de test - [Surchargeable] - + L’enquête auprès des individus a pour objectif de recueillir des informations. - [Surchargeable] - + From d9425964b51fb68e917dcf3474299886128c8ed2 Mon Sep 17 00:00:00 2001 From: Laurent Caouissin Date: Thu, 5 Sep 2019 14:21:28 +0200 Subject: [PATCH 108/439] Update pom.xml --- pom.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pom.xml b/pom.xml index d1a9db919..ed3be6b3a 100644 --- a/pom.xml +++ b/pom.xml @@ -249,6 +249,18 @@ + + org.apache.maven.plugins + maven-surefire-plugin + 2.22.0 + + UTF-8 + UTF-8 + UTF-8 + -Dfile.encoding=UTF-8 + -Djavax.xml.bind.context.factory=org.eclipse.persistence.jaxb.JAXBContextFactory + + maven-resources-plugin 2.7 From fa028293cba33dcc7c71d78b8c7c0c658df13d3f Mon Sep 17 00:00:00 2001 From: Laurent Caouissin Date: Thu, 5 Sep 2019 14:33:08 +0200 Subject: [PATCH 109/439] Update pom.xml --- pom.xml | 160 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 80 insertions(+), 80 deletions(-) diff --git a/pom.xml b/pom.xml index ed3be6b3a..6b14b93ec 100644 --- a/pom.xml +++ b/pom.xml @@ -147,6 +147,86 @@ ${compiler.target} + + org.codehaus.mojo + jaxb2-maven-plugin + 2.1 + + + xjc-schema + generate-sources + + xjc + + + fr.insee.eno.parameters + UTF-8 + + src/main/resources/params/schemas/ENOParameters.xsd + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.22.0 + + UTF-8 + UTF-8 + UTF-8 + -Dfile.encoding=UTF-8 + -Djavax.xml.bind.context.factory=org.eclipse.persistence.jaxb.JAXBContextFactory + + + + maven-resources-plugin + 2.7 + + UTF-8 + + + + copy-resources + process-resources + + copy-resources + + + target/generated-sources/jaxb/fr/eno/parameters + + + src/main/resources/jaxb + + jaxb.properties + + + + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + 1.7 + + + add-source + generate-sources + + add-source + + + + ${project.build.directory}/generated-sources/jaxb + + + + + org.codehaus.mojo exec-maven-plugin @@ -228,86 +308,6 @@ true - - org.codehaus.mojo - jaxb2-maven-plugin - 2.1 - - - xjc-schema - generate-sources - - xjc - - - fr.insee.eno.parameters - UTF-8 - - src/main/resources/params/schemas/ENOParameters.xsd - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.22.0 - - UTF-8 - UTF-8 - UTF-8 - -Dfile.encoding=UTF-8 - -Djavax.xml.bind.context.factory=org.eclipse.persistence.jaxb.JAXBContextFactory - - - - maven-resources-plugin - 2.7 - - UTF-8 - - - - copy-resources - process-resources - - copy-resources - - - target/generated-sources/jaxb/fr/eno/parameters - - - src/main/resources/jaxb - - jaxb.properties - - - - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 1.7 - - - add-source - generate-sources - - add-source - - - - ${project.build.directory}/generated-sources/jaxb - - - - - From 68837518c70597ca87979870a6f5404f9cf4d459 Mon Sep 17 00:00:00 2001 From: Laurent Caouissin Date: Thu, 5 Sep 2019 16:27:40 +0200 Subject: [PATCH 110/439] Eno v2.0.0 : Change Y / N by boolean --- src/main/resources/xslt/util/ddi/titling.xsl | 4 ++-- src/test/resources/examples/parameters.xml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/resources/xslt/util/ddi/titling.xsl b/src/main/resources/xslt/util/ddi/titling.xsl index b3574cd16..45a3af257 100644 --- a/src/main/resources/xslt/util/ddi/titling.xsl +++ b/src/main/resources/xslt/util/ddi/titling.xsl @@ -207,7 +207,7 @@ select="$style/Title/Question/Level[@name=$question-seq-level]"/> - + - + diff --git a/src/test/resources/examples/parameters.xml b/src/test/resources/examples/parameters.xml index 77e204cf7..9873cff68 100644 --- a/src/test/resources/examples/parameters.xml +++ b/src/test/resources/examples/parameters.xml @@ -27,7 +27,7 @@ - N + false I - @@ -37,14 +37,14 @@ ➡ - N + false 1 . ➡ - N + false 1 . From 9f9507ea7aba59cd5ef54cc2bb5dbd853b938ea7 Mon Sep 17 00:00:00 2001 From: Laurent Caouissin Date: Mon, 9 Sep 2019 13:48:21 +0200 Subject: [PATCH 111/439] Create parameters-default --- Eno.xpr | 4 + questionnaires/simpsons/parameters.xml | 27 +- src/main/resources/parameters-default.xml | 133 ++++++++ src/main/resources/parameters.xml | 6 +- .../schemas/generation/DDI2FRGeneration.xsd | 14 +- .../schemas/generation/DDI2PDFGeneration.xsd | 10 +- src/main/resources/xslt/outputs/fr/models.xsl | 2 +- src/main/resources/xslt/outputs/js/models.xsl | 2 +- .../transformations/ddi2fr/ddi2fr-fixed.xsl | 287 +++++++++--------- src/test/resources/ddi-to-xform/out.xhtml | 2 +- 10 files changed, 309 insertions(+), 178 deletions(-) create mode 100644 src/main/resources/parameters-default.xml diff --git a/Eno.xpr b/Eno.xpr index 1532e02ab..622801516 100644 --- a/Eno.xpr +++ b/Eno.xpr @@ -9,6 +9,10 @@ enable.project.master.files.support true + + key.xslt.option.pane.group + true + diff --git a/questionnaires/simpsons/parameters.xml b/questionnaires/simpsons/parameters.xml index f5ce07621..dfbd60f64 100644 --- a/questionnaires/simpsons/parameters.xml +++ b/questionnaires/simpsons/parameters.xml @@ -18,31 +18,36 @@ household - <Browsing>module</Browsing> + <Browsing>template</Browsing> <Sequence> - <Level name="template"/> <Level name="module"> - <PreSeq/> - <NumParent>N</NumParent> - <PostNumParentSeq/> + <PreSeq></PreSeq> + <NumParent>false</NumParent> + <PostNumParentSeq></PostNumParentSeq> + <StyleNumSeq>I</StyleNumSeq> + <PostNumSeq> - </PostNumSeq> + </Level> + <Level name="submodule"> + <PreSeq></PreSeq>/> + <NumParent>false</NumParent> + <PostNumParentSeq></PostNumParentSeq> <StyleNumSeq>I</StyleNumSeq> <PostNumSeq> - </PostNumSeq> </Level> - <Level name="submodule"/> </Sequence> <Question> <Level name="module"> <PreQuest>➡ </PreQuest> - <NumParent>N</NumParent> - <PostNumParentQuest/> + <NumParent>false</NumParent> + <PostNumParentQuest></PostNumParentQuest> <StyleNumQuest>1</StyleNumQuest> <PostNumQuest>. </PostNumQuest> </Level> <Level name="submodule"> <PreQuest>➡ </PreQuest> - <NumParent>N</NumParent> - <PostNumParentQuest/> - <StyleNumQuest>1</StyleNumQuest> + <NumParent>false</NumParent> + <PostNumParentQuest></PostNumParentQuest> + <StyleNumQuest>a</StyleNumQuest> <PostNumQuest>. </PostNumQuest> </Level> </Question> diff --git a/src/main/resources/parameters-default.xml b/src/main/resources/parameters-default.xml new file mode 100644 index 000000000..106e55bd1 --- /dev/null +++ b/src/main/resources/parameters-default.xml @@ -0,0 +1,133 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ENOParameters> + <Pipeline></Pipeline> + <Parameters> + <Title> + <!-- no-number ; template ; module ; submodule ; unnumbered-filter --> + <Browsing>module</Browsing> + <Sequence> + <!-- niveau template utile car permet de définir la hiérarchie des séquences, alors même qu'il n'est pas numéroté --> + <Level name="template"/> + <Level name="module"> + <!-- toujours affiché --> + <PreSeq/> + <!-- true ; false --> + <NumParent>false</NumParent> + <!-- Affiché seulement si un numéro est affiché pour le parent --> + <PostNumParentSeq/> + <!-- 1 ; A ; a ; I ; i --> + <StyleNumSeq>I</StyleNumSeq> + <!-- Affiché seulement si un numéro est affiché pour la séquence --> + <PostNumSeq> - </PostNumSeq> + </Level> + <!-- pas de numérotation au niveau submodule = pas d'élément --> + <Level name="submodule"/> + </Sequence> + <Question> + <!-- Question niveau module --> + <Level name="module"> + <!-- toujours affiché --> + <PreQuest>➡ </PreQuest> + <!-- true ; false --> + <NumParent>false</NumParent> + <!-- Affiché seulement si un numéro est affiché pour le parent --> + <PostNumParentQuest/> + <!-- 1 ; A ; a ; I ; i --> + <StyleNumQuest>1</StyleNumQuest> + <!-- Affiché seulement si un numéro est affiché pour la question --> + <PostNumQuest>. </PostNumQuest> + </Level> + <!-- La présentation des questions de niveau module et submodule doit être précisée si les deux sont présents ; elle peut être distincte --> + <!-- Question niveau sous-module --> + <Level name="submodule"> + <PreQuest>➡ </PreQuest> + <NumParent>false</NumParent> + <PostNumParentQuest/> + <StyleNumQuest>1</StyleNumQuest> + <PostNumQuest>. </PostNumQuest> + </Level> + </Question> + + + + fr + + + default + + test + + + + false + + + false + true + + false + false + + 7 + + + + + + false + + + false + true + + + 0 + 1 + + + + 12 + + + + + + 14 + +
+ + manual + + + module + + + ouvertureCOL + + + + + + false + + + false + true + + + + + + false + + + false + true + + + + diff --git a/src/main/resources/parameters.xml b/src/main/resources/parameters.xml index 2d9cc37eb..7218d53a1 100644 --- a/src/main/resources/parameters.xml +++ b/src/main/resources/parameters.xml @@ -33,7 +33,7 @@ - N + false I - @@ -43,14 +43,14 @@ ➡ - N + false 1 . ➡ - N + false 1 . diff --git a/src/main/resources/params/schemas/generation/DDI2FRGeneration.xsd b/src/main/resources/params/schemas/generation/DDI2FRGeneration.xsd index 610b12939..b35e477d1 100644 --- a/src/main/resources/params/schemas/generation/DDI2FRGeneration.xsd +++ b/src/main/resources/params/schemas/generation/DDI2FRGeneration.xsd @@ -7,17 +7,17 @@ - + + - - - - - - + + + + + diff --git a/src/main/resources/params/schemas/generation/DDI2PDFGeneration.xsd b/src/main/resources/params/schemas/generation/DDI2PDFGeneration.xsd index 738594ab5..b8a2151ff 100644 --- a/src/main/resources/params/schemas/generation/DDI2PDFGeneration.xsd +++ b/src/main/resources/params/schemas/generation/DDI2PDFGeneration.xsd @@ -38,30 +38,32 @@ - + - + - + - + + + diff --git a/src/main/resources/xslt/outputs/fr/models.xsl b/src/main/resources/xslt/outputs/fr/models.xsl index 801a930ff..fe89594c0 100644 --- a/src/main/resources/xslt/outputs/fr/models.xsl +++ b/src/main/resources/xslt/outputs/fr/models.xsl @@ -6,7 +6,7 @@ xmlns:fr="http://orbeon.org/oxf/xml/form-runner" xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl" xmlns:eno="http://xml.insee.fr/apps/eno" xmlns:enofr="http://xml.insee.fr/apps/eno/form-runner" xmlns:d="ddi:datacollection:3_2" xmlns:r="ddi:reusable:3_2" - exclude-result-prefixes="xd eno enofr" version="2.0"> + exclude-result-prefixes="xd eno enofr d r" version="2.0"> diff --git a/src/main/resources/xslt/outputs/js/models.xsl b/src/main/resources/xslt/outputs/js/models.xsl index 4c373ada1..a0ab4d462 100644 --- a/src/main/resources/xslt/outputs/js/models.xsl +++ b/src/main/resources/xslt/outputs/js/models.xsl @@ -8,7 +8,7 @@ xmlns:enojs="http://xml.insee.fr/apps/eno/out/js" xmlns:d="ddi:datacollection:3_2" xmlns:r="ddi:reusable:3_2" xmlns="http://xml.insee.fr/schema/applis/lunatic-h" - exclude-result-prefixes="xs fn xd eno enojs" version="2.0"> + exclude-result-prefixes="xs fn xd eno enojs d r" version="2.0"> diff --git a/src/main/resources/xslt/transformations/ddi2fr/ddi2fr-fixed.xsl b/src/main/resources/xslt/transformations/ddi2fr/ddi2fr-fixed.xsl index d7f8dde97..f9cb225fd 100644 --- a/src/main/resources/xslt/transformations/ddi2fr/ddi2fr-fixed.xsl +++ b/src/main/resources/xslt/transformations/ddi2fr/ddi2fr-fixed.xsl @@ -1,17 +1,10 @@ - - + + - - - + + + @@ -20,7 +13,7 @@ - + @@ -29,9 +22,9 @@ The parameter file used by the stylesheet. - + - + @@ -42,10 +35,10 @@ - + - + @@ -55,7 +48,7 @@ The folder containing label resources in different languages. - + @@ -64,9 +57,7 @@ - + @@ -74,16 +65,16 @@ Characters used to surround variables in conditioned text. - - + + Boolean to hide numeric example. - - + + Loops and dynamic array's ids may be called in many calculs : filters, consistency checks, calculated variables @@ -92,10 +83,10 @@ - + - - + + @@ -108,45 +99,44 @@ - + For business variables, their name is their business name ; for other objects, their name is their id - - + + - + - + - - + + - + - - - + + + - + - + This function returns an xforms label for the context on which it is applied. @@ -155,21 +145,21 @@ - - + + - - - - + + + + - + - + @@ -179,136 +169,136 @@ - - + + - + - + - - + + - - - + + + - - + + - + - + - + - - + + - + - - - + + + - + - - + + - + - - - + + + - - + + - + - + - + - +   - +   - - - + + + - + - - + + - - + + - - - + + + - + - + @@ -317,20 +307,20 @@ - + - - + + - + - + @@ -340,27 +330,27 @@ enofr:get-label-conditioning-variables - - - + + + - + - - + + - + - + - + This function returns an xforms hint for the context on which it is applied. @@ -368,53 +358,52 @@ - - + + - + - + - + - - + + - + - + - + + $number-format))" /> - + - + - + @@ -426,48 +415,47 @@ - - + + - + - + - + - + - + - + - + - + - + $labels-resource/Languages/Language[@xml:lang=$language]/Alert/Number/Decimal/End)" /> - + - + - + @@ -500,15 +487,15 @@ - + - + - + @@ -520,14 +507,14 @@ - + - + - + - + \ No newline at end of file diff --git a/src/test/resources/ddi-to-xform/out.xhtml b/src/test/resources/ddi-to-xform/out.xhtml index ffeb91c71..2badabc5f 100644 --- a/src/test/resources/ddi-to-xform/out.xhtml +++ b/src/test/resources/ddi-to-xform/out.xhtml @@ -13,7 +13,7 @@ xxf:expose-xpath-types="true" xxf:noscript-support="true"> - + From f4a43dfd4702e033ae3a6d57691459f6675b8fef Mon Sep 17 00:00:00 2001 From: CHTAINET Badr Date: Mon, 9 Sep 2019 16:07:04 +0200 Subject: [PATCH 112/439] 189D Fix ID Clarification AttachmentLocation --- .../xslt/inputs/pogues-xml/functions.fods | 22 ++++++++++++---- .../xslt/inputs/pogues-xml/source-fixed.xsl | 10 ++++++- .../resources/xslt/outputs/ddi/models.xsl | 5 ++-- .../pogues-xml2ddi/functions.fods | 26 ++++++++++++++----- 4 files changed, 49 insertions(+), 14 deletions(-) diff --git a/src/main/resources/xslt/inputs/pogues-xml/functions.fods b/src/main/resources/xslt/inputs/pogues-xml/functions.fods index 48267e7c8..e1a3db71b 100644 --- a/src/main/resources/xslt/inputs/pogues-xml/functions.fods +++ b/src/main/resources/xslt/inputs/pogues-xml/functions.fods @@ -1,20 +1,20 @@ - 2009-04-16T11:32:48.39P5DT7H2M7S185LibreOffice/6.1.5.2$Windows_X86_64 LibreOffice_project/90f8dcf33c87b3705e78202e3df5142b201bd8052019-06-21T17:41:46.188000000 + 2009-04-16T11:32:48.39P5DT7H2M21S186LibreOffice/6.1.5.2$Windows_X86_64 LibreOffice_project/90f8dcf33c87b3705e78202e3df5142b201bd8052019-09-09T15:34:15.890000000 0 0 44116 - 29867 + 30319 view1 3 - 65 + 66 0 0 0 @@ -607,7 +607,7 @@ ???(???) - 00/00/0000, 00:00:00 + 00/00/0000, 00:00:00 @@ -1254,7 +1254,19 @@ Return Format - + + + enopogues:get-clarified-code + + + idList,otherValue + + + + Return id of Other Choice question in the list + + + diff --git a/src/main/resources/xslt/inputs/pogues-xml/source-fixed.xsl b/src/main/resources/xslt/inputs/pogues-xml/source-fixed.xsl index d0ccd9e18..b8479d04f 100644 --- a/src/main/resources/xslt/inputs/pogues-xml/source-fixed.xsl +++ b/src/main/resources/xslt/inputs/pogues-xml/source-fixed.xsl @@ -313,6 +313,14 @@ Multi Variables references in ConditionnalText (coming from FailMessage) are not supported. - + + + + + + + + + diff --git a/src/main/resources/xslt/outputs/ddi/models.xsl b/src/main/resources/xslt/outputs/ddi/models.xsl index 540102e38..07daba78e 100644 --- a/src/main/resources/xslt/outputs/ddi/models.xsl +++ b/src/main/resources/xslt/outputs/ddi/models.xsl @@ -1141,7 +1141,7 @@ - - + Code @@ -1183,11 +1183,12 @@ + - + diff --git a/src/main/resources/xslt/transformations/pogues-xml2ddi/functions.fods b/src/main/resources/xslt/transformations/pogues-xml2ddi/functions.fods index e22598294..a2527075b 100644 --- a/src/main/resources/xslt/transformations/pogues-xml2ddi/functions.fods +++ b/src/main/resources/xslt/transformations/pogues-xml2ddi/functions.fods @@ -1,20 +1,20 @@ - 2009-04-16T11:32:48.39P6DT6H45M5S148LibreOffice/6.1.5.2$Windows_X86_64 LibreOffice_project/90f8dcf33c87b3705e78202e3df5142b201bd8052019-07-19T10:51:08.691000000 + 2009-04-16T11:32:48.39P6DT6H45M19S149LibreOffice/6.1.5.2$Windows_X86_64 LibreOffice_project/90f8dcf33c87b3705e78202e3df5142b201bd8052019-09-09T15:37:52.418000000 0 0 31587 - 30578 + 31030 view1 0 - 1 + 59 0 0 0 @@ -23,7 +23,7 @@ 0 0 0 - 25 + 43 0 100 60 @@ -32,7 +32,7 @@ Sheet1 - 1286 + 1302 0 100 60 @@ -581,7 +581,7 @@ ???(???) - 00/00/0000, 00:00:00 + 00/00/0000, 00:00:00 @@ -1338,6 +1338,20 @@ Return format + + + enoddi33:get-clarified-code + + + idList,otherValue + + + enopogues:get-clarified-code + + + Return id of Other Choice question in the list + + From a46a0876f63875aef6822821bc615fc1ec70c4a2 Mon Sep 17 00:00:00 2001 From: CHTAINET Badr Date: Mon, 9 Sep 2019 17:18:59 +0200 Subject: [PATCH 113/439] 189D Optimize code --- src/main/resources/xslt/outputs/ddi/models.xsl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/xslt/outputs/ddi/models.xsl b/src/main/resources/xslt/outputs/ddi/models.xsl index 07daba78e..d65178ed1 100644 --- a/src/main/resources/xslt/outputs/ddi/models.xsl +++ b/src/main/resources/xslt/outputs/ddi/models.xsl @@ -1182,8 +1182,8 @@ - - + + From d202b5afa680817a670087caed98c65291ff54e5 Mon Sep 17 00:00:00 2001 From: CHTAINET Badr Date: Tue, 21 May 2019 12:07:01 +0200 Subject: [PATCH 114/439] 189D-BO Add Clarification element to pogues-xml2ddi --- .../resources/xslt/outputs/ddi/models.xsl | 72 +++++++++++++++++-- .../pogues-xml2ddi/drivers.fods | 38 ++++++---- 2 files changed, 93 insertions(+), 17 deletions(-) diff --git a/src/main/resources/xslt/outputs/ddi/models.xsl b/src/main/resources/xslt/outputs/ddi/models.xsl index cbcf05f97..afb0b9513 100644 --- a/src/main/resources/xslt/outputs/ddi/models.xsl +++ b/src/main/resources/xslt/outputs/ddi/models.xsl @@ -1075,7 +1075,7 @@ - + @@ -1104,6 +1104,68 @@ + + + + + + + + + + + ----- ValueOfExpression : + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 6!!!!!!!!!!!!!!!!!!!!!!! + + + + + + Code + + + + @@ -1127,7 +1189,7 @@ - + @@ -1144,7 +1206,7 @@ - + - + + - - - - - - - ----- ValueOfExpression : - - + - - - - - - - - - - - - - - - - - + + + - + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - 6!!!!!!!!!!!!!!!!!!!!!!! + - + - Code + - + @@ -1189,13 +1179,23 @@ - + + + + + + + + + + + @@ -1301,6 +1301,13 @@ + + + + + + + @@ -1377,7 +1384,7 @@ - + @@ -1681,7 +1688,7 @@ - + From fbfbd23d3492ed89ae781958ee2b91b6964ed19c Mon Sep 17 00:00:00 2001 From: CHTAINET Badr Date: Thu, 25 Jul 2019 10:25:26 +0200 Subject: [PATCH 116/439] 189D generate the value of clarification question --- .../xslt/inputs/pogues-xml/templates.fods | 46 +++++++++---------- .../resources/xslt/outputs/ddi/models.xsl | 21 +++++---- .../pogues-xml2ddi/drivers.fods | 8 ++-- .../xslt/util/pogues-xml/2suppressionGoto.xsl | 2 +- .../util/pogues-xml/goto-2-if-then-else.xsl | 2 +- 5 files changed, 42 insertions(+), 37 deletions(-) diff --git a/src/main/resources/xslt/inputs/pogues-xml/templates.fods b/src/main/resources/xslt/inputs/pogues-xml/templates.fods index fda693389..65429a1ce 100644 --- a/src/main/resources/xslt/inputs/pogues-xml/templates.fods +++ b/src/main/resources/xslt/inputs/pogues-xml/templates.fods @@ -1,7 +1,7 @@ - 2009-04-16T11:32:48.39P11DT13H57M12S464LibreOffice/6.1.5.2$Windows_X86_64 LibreOffice_project/90f8dcf33c87b3705e78202e3df5142b201bd8052019-07-22T15:17:49.937000000 + 2009-04-16T11:32:48.39P11DT15H8M55S479LibreOffice/6.1.5.2$Windows_X86_64 LibreOffice_project/90f8dcf33c87b3705e78202e3df5142b201bd8052019-07-24T15:23:04.997000000 0 @@ -13,8 +13,8 @@ view1 - 0 - 92 + 1 + 14 0 0 0 @@ -23,7 +23,7 @@ 0 0 0 - 72 + 0 0 100 60 @@ -545,10 +545,6 @@ - - - - @@ -602,7 +598,7 @@ ???(???) - 00/00/0000, 00:00:00 + 00/00/0000, 00:00:00 @@ -980,18 +976,6 @@ - - - *[ancestor-or-self::pogues:ClarificationQuestion] - - - enopogues:get-code-list-id - - - enopogues:get-id(preceding::pogues:CodeListReference) - - - * @@ -1085,6 +1069,22 @@ + + + *[pogues:FlowControl[@flowControlType="CLARIFICATION"]] + + + enopogues:get-expression + + + pogues:FlowControl/pogues:Expression + + + + Expression is the default element for expressions in Pogues for clarification question + + + * @@ -1232,8 +1232,8 @@ - - pogues:FlowControl + + pogues:FlowControl[not(@flowControlType)] enopogues:get-if-true diff --git a/src/main/resources/xslt/outputs/ddi/models.xsl b/src/main/resources/xslt/outputs/ddi/models.xsl index d947ac927..d547a87b0 100644 --- a/src/main/resources/xslt/outputs/ddi/models.xsl +++ b/src/main/resources/xslt/outputs/ddi/models.xsl @@ -1058,7 +1058,7 @@ - + @@ -1113,7 +1113,7 @@ - + @@ -1128,12 +1128,14 @@ + + - + - + @@ -1144,12 +1146,12 @@ - + - - - + - + Code @@ -1189,9 +1191,12 @@ + + + @@ -1301,7 +1306,7 @@ - + diff --git a/src/main/resources/xslt/transformations/pogues-xml2ddi/drivers.fods b/src/main/resources/xslt/transformations/pogues-xml2ddi/drivers.fods index 91e06151f..092020147 100644 --- a/src/main/resources/xslt/transformations/pogues-xml2ddi/drivers.fods +++ b/src/main/resources/xslt/transformations/pogues-xml2ddi/drivers.fods @@ -1,7 +1,7 @@ - 2009-04-16T11:32:48.39P6DT3H23M44S192LibreOffice/6.1.5.2$Windows_X86_64 LibreOffice_project/90f8dcf33c87b3705e78202e3df5142b201bd8052019-07-23T15:37:17.627000000 + 2009-04-16T11:32:48.39P6DT3H24M1S194LibreOffice/6.1.5.2$Windows_X86_64 LibreOffice_project/90f8dcf33c87b3705e78202e3df5142b201bd8052019-07-23T16:18:16.111000000 0 @@ -14,7 +14,7 @@ 0 - 34 + 24 0 0 0 @@ -302,7 +302,7 @@ ???(???) - 00/00/0000, 00:00:00 + 00/00/0000, 00:00:00 @@ -503,7 +503,7 @@ - pogues:FlowControl + pogues:FlowControl[not(@flowControlType)] FlowControl diff --git a/src/main/resources/xslt/util/pogues-xml/2suppressionGoto.xsl b/src/main/resources/xslt/util/pogues-xml/2suppressionGoto.xsl index 73eabd091..135caeb8c 100644 --- a/src/main/resources/xslt/util/pogues-xml/2suppressionGoto.xsl +++ b/src/main/resources/xslt/util/pogues-xml/2suppressionGoto.xsl @@ -53,7 +53,7 @@ - + diff --git a/src/main/resources/xslt/util/pogues-xml/goto-2-if-then-else.xsl b/src/main/resources/xslt/util/pogues-xml/goto-2-if-then-else.xsl index f889cdbef..860648ce5 100644 --- a/src/main/resources/xslt/util/pogues-xml/goto-2-if-then-else.xsl +++ b/src/main/resources/xslt/util/pogues-xml/goto-2-if-then-else.xsl @@ -105,7 +105,7 @@ - + From 6439197339c68d726eee48c72fbdfca6993367da Mon Sep 17 00:00:00 2001 From: CHTAINET Badr Date: Thu, 25 Jul 2019 18:27:43 +0200 Subject: [PATCH 117/439] 189D Fix file generation --- .../resources/xslt/outputs/ddi/models.xsl | 54 +++++++++++++------ 1 file changed, 38 insertions(+), 16 deletions(-) diff --git a/src/main/resources/xslt/outputs/ddi/models.xsl b/src/main/resources/xslt/outputs/ddi/models.xsl index d547a87b0..fb8a3a796 100644 --- a/src/main/resources/xslt/outputs/ddi/models.xsl +++ b/src/main/resources/xslt/outputs/ddi/models.xsl @@ -1131,19 +1131,11 @@ - - - - - - - - - - - - - + + + + + @@ -1306,12 +1298,17 @@ - + + + - - + + + + + @@ -1417,6 +1414,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + From 38eb978ed5f6c8846fdb339a03db86bfb1dc9d7b Mon Sep 17 00:00:00 2001 From: CHTAINET Badr Date: Fri, 26 Jul 2019 16:29:55 +0200 Subject: [PATCH 118/439] 189D Fix Out-param for clarification --- .../resources/xslt/outputs/ddi/models.xsl | 36 +++++++++++-------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/src/main/resources/xslt/outputs/ddi/models.xsl b/src/main/resources/xslt/outputs/ddi/models.xsl index fb8a3a796..a459b15a7 100644 --- a/src/main/resources/xslt/outputs/ddi/models.xsl +++ b/src/main/resources/xslt/outputs/ddi/models.xsl @@ -1297,19 +1297,6 @@ - - - - - - - - - - - - - @@ -1328,7 +1315,28 @@ - + + + + + + + + + + + + + + + + + + + + + + From b66b2b8b82278f0c317678ed206f61f73cf061fe Mon Sep 17 00:00:00 2001 From: CHTAINET Badr Date: Thu, 1 Aug 2019 12:03:04 +0200 Subject: [PATCH 119/439] 189B Add clarification for Boolean QCM --- .../xslt/inputs/pogues-xml/functions.fods | 23 +++++++--- .../xslt/inputs/pogues-xml/templates.fods | 46 +++++++++---------- .../resources/xslt/outputs/ddi/models.xsl | 37 ++++++++++++--- .../pogues-xml2ddi/functions.fods | 24 +++++++--- 4 files changed, 87 insertions(+), 43 deletions(-) diff --git a/src/main/resources/xslt/inputs/pogues-xml/functions.fods b/src/main/resources/xslt/inputs/pogues-xml/functions.fods index 48267e7c8..d34184764 100644 --- a/src/main/resources/xslt/inputs/pogues-xml/functions.fods +++ b/src/main/resources/xslt/inputs/pogues-xml/functions.fods @@ -1,20 +1,20 @@ - 2009-04-16T11:32:48.39P5DT7H2M7S185LibreOffice/6.1.5.2$Windows_X86_64 LibreOffice_project/90f8dcf33c87b3705e78202e3df5142b201bd8052019-06-21T17:41:46.188000000 + 2009-04-16T11:32:48.39P5DT7H2M49S186LibreOffice/6.1.5.2$Windows_X86_64 LibreOffice_project/90f8dcf33c87b3705e78202e3df5142b201bd8052019-07-30T15:16:08.548000000 0 0 44116 - 29867 + 30319 view1 - 3 - 65 + 0 + 67 0 0 0 @@ -32,7 +32,7 @@ Sheet1 - 1302 + 1286 0 100 60 @@ -607,7 +607,7 @@ ???(???) - 00/00/0000, 00:00:00 + 00/00/0000, 00:00:00 @@ -1254,7 +1254,16 @@ Return Format - + + + enopogues:get-clarification-expression + + + + Return the expression of clarification element. + + + diff --git a/src/main/resources/xslt/inputs/pogues-xml/templates.fods b/src/main/resources/xslt/inputs/pogues-xml/templates.fods index 65429a1ce..f2f328244 100644 --- a/src/main/resources/xslt/inputs/pogues-xml/templates.fods +++ b/src/main/resources/xslt/inputs/pogues-xml/templates.fods @@ -1,7 +1,7 @@ - 2009-04-16T11:32:48.39P11DT15H8M55S479LibreOffice/6.1.5.2$Windows_X86_64 LibreOffice_project/90f8dcf33c87b3705e78202e3df5142b201bd8052019-07-24T15:23:04.997000000 + 2009-04-16T11:32:48.39P11DT15H55M37S493LibreOffice/6.1.5.2$Windows_X86_64 LibreOffice_project/90f8dcf33c87b3705e78202e3df5142b201bd8052019-08-01T11:57:59.436000000 0 @@ -13,7 +13,7 @@ view1 - 1 + 0 14 0 0 @@ -23,7 +23,7 @@ 0 0 0 - 0 + 81 0 100 60 @@ -32,7 +32,7 @@ Sheet1 - 1840 + 1286 0 100 60 @@ -598,7 +598,7 @@ ???(???) - 00/00/0000, 00:00:00 + 00/00/0000, 00:00:00 @@ -1069,22 +1069,6 @@ - - - *[pogues:FlowControl[@flowControlType="CLARIFICATION"]] - - - enopogues:get-expression - - - pogues:FlowControl/pogues:Expression - - - - Expression is the default element for expressions in Pogues for clarification question - - - * @@ -2226,10 +2210,26 @@ - + + + *[pogues:FlowControl[@flowControlType='CLARIFICATION']] + + + enopogues:get-clarification-expression + + + pogues:FlowControl[@flowControlType='CLARIFICATION']/pogues:Expression + + + + Expression is the default element for expressions in Pogues for clarification question + + + + - + diff --git a/src/main/resources/xslt/outputs/ddi/models.xsl b/src/main/resources/xslt/outputs/ddi/models.xsl index a459b15a7..f55c868f6 100644 --- a/src/main/resources/xslt/outputs/ddi/models.xsl +++ b/src/main/resources/xslt/outputs/ddi/models.xsl @@ -1172,6 +1172,30 @@ + + + + + + + + + + + + + + + + + INSEE-COMMUN-CL-Booleen- + + Code + + + + + @@ -1183,7 +1207,7 @@ - + @@ -1196,13 +1220,16 @@ + + + - + @@ -1429,11 +1456,7 @@ - - - - - + diff --git a/src/main/resources/xslt/transformations/pogues-xml2ddi/functions.fods b/src/main/resources/xslt/transformations/pogues-xml2ddi/functions.fods index e22598294..a9cca6eb6 100644 --- a/src/main/resources/xslt/transformations/pogues-xml2ddi/functions.fods +++ b/src/main/resources/xslt/transformations/pogues-xml2ddi/functions.fods @@ -1,20 +1,20 @@ - 2009-04-16T11:32:48.39P6DT6H45M5S148LibreOffice/6.1.5.2$Windows_X86_64 LibreOffice_project/90f8dcf33c87b3705e78202e3df5142b201bd8052019-07-19T10:51:08.691000000 + 2009-04-16T11:32:48.39P6DT6H46M16S149LibreOffice/6.1.5.2$Windows_X86_64 LibreOffice_project/90f8dcf33c87b3705e78202e3df5142b201bd8052019-07-30T15:15:08.433000000 0 0 31587 - 30578 + 31030 view1 - 0 - 1 + 2 + 59 0 0 0 @@ -23,7 +23,7 @@ 0 0 0 - 25 + 40 0 100 60 @@ -581,7 +581,7 @@ ???(???) - 00/00/0000, 00:00:00 + 00/00/0000, 00:00:00 @@ -1338,6 +1338,18 @@ Return format + + + enoddi33:get-clarification-expression + + + + enopogues:get-clarification-expression + + + Return the expression of clarification element. + + From 1790192816519e89de6fcf82b34f4906b884528c Mon Sep 17 00:00:00 2001 From: CHTAINET Badr Date: Fri, 2 Aug 2019 10:55:47 +0200 Subject: [PATCH 120/439] 189B Add AttachmentBase --- .../xslt/inputs/pogues-xml/functions.fods | 17 +++++++--- .../xslt/inputs/pogues-xml/templates.fods | 32 ++++++++++++++----- .../resources/xslt/outputs/ddi/models.xsl | 9 +++++- .../pogues-xml2ddi/functions.fods | 26 +++++++++++---- 4 files changed, 64 insertions(+), 20 deletions(-) diff --git a/src/main/resources/xslt/inputs/pogues-xml/functions.fods b/src/main/resources/xslt/inputs/pogues-xml/functions.fods index d34184764..6db0b3f26 100644 --- a/src/main/resources/xslt/inputs/pogues-xml/functions.fods +++ b/src/main/resources/xslt/inputs/pogues-xml/functions.fods @@ -1,13 +1,13 @@ - 2009-04-16T11:32:48.39P5DT7H2M49S186LibreOffice/6.1.5.2$Windows_X86_64 LibreOffice_project/90f8dcf33c87b3705e78202e3df5142b201bd8052019-07-30T15:16:08.548000000 + 2009-04-16T11:32:48.39P5DT7H3M15S188LibreOffice/6.1.5.2$Windows_X86_64 LibreOffice_project/90f8dcf33c87b3705e78202e3df5142b201bd8052019-08-01T12:19:10.564000000 0 0 44116 - 30319 + 30771 view1 @@ -607,7 +607,7 @@ ???(???) - 00/00/0000, 00:00:00 + 00/00/0000, 00:00:00 @@ -1263,7 +1263,16 @@ Return the expression of clarification element. - + + + enopogues:get-clarification-responseid + + + + Return id of response inside clarification + + + diff --git a/src/main/resources/xslt/inputs/pogues-xml/templates.fods b/src/main/resources/xslt/inputs/pogues-xml/templates.fods index f2f328244..196a8945d 100644 --- a/src/main/resources/xslt/inputs/pogues-xml/templates.fods +++ b/src/main/resources/xslt/inputs/pogues-xml/templates.fods @@ -1,29 +1,29 @@ - 2009-04-16T11:32:48.39P11DT15H55M37S493LibreOffice/6.1.5.2$Windows_X86_64 LibreOffice_project/90f8dcf33c87b3705e78202e3df5142b201bd8052019-08-01T11:57:59.436000000 + 2009-04-16T11:32:48.39P11DT17H55M18S507LibreOffice/6.1.5.2$Windows_X86_64 LibreOffice_project/90f8dcf33c87b3705e78202e3df5142b201bd8052019-08-01T14:29:51.657000000 0 0 64075 - 54257 + 54835 view1 - 0 - 14 + 2 + 94 0 0 0 0 2 - 0 + 1 0 0 - 81 + 90 0 100 60 @@ -598,7 +598,7 @@ ???(???) - 00/00/0000, 00:00:00 + 00/00/0000, 00:00:00 @@ -2226,7 +2226,23 @@ - + + + *[pogues:ClarificationQuestion] + + + enopogues:get-clarification-responseid + + + pogues:ClarificationQuestion/pogues:Response/@id + + + + Return id of response inside clarification + + + + diff --git a/src/main/resources/xslt/outputs/ddi/models.xsl b/src/main/resources/xslt/outputs/ddi/models.xsl index f55c868f6..4bb5c7186 100644 --- a/src/main/resources/xslt/outputs/ddi/models.xsl +++ b/src/main/resources/xslt/outputs/ddi/models.xsl @@ -1153,11 +1153,16 @@ + - + + + + + @@ -1222,10 +1227,12 @@ + + diff --git a/src/main/resources/xslt/transformations/pogues-xml2ddi/functions.fods b/src/main/resources/xslt/transformations/pogues-xml2ddi/functions.fods index a9cca6eb6..21e8e58e8 100644 --- a/src/main/resources/xslt/transformations/pogues-xml2ddi/functions.fods +++ b/src/main/resources/xslt/transformations/pogues-xml2ddi/functions.fods @@ -1,26 +1,26 @@ - 2009-04-16T11:32:48.39P6DT6H46M16S149LibreOffice/6.1.5.2$Windows_X86_64 LibreOffice_project/90f8dcf33c87b3705e78202e3df5142b201bd8052019-07-30T15:15:08.433000000 + 2009-04-16T11:32:48.39P6DT6H48M47S153LibreOffice/6.1.5.2$Windows_X86_64 LibreOffice_project/90f8dcf33c87b3705e78202e3df5142b201bd8052019-08-01T12:18:36.593000000 0 0 - 31587 - 31030 + 31963 + 31481 view1 2 - 59 + 60 0 0 0 0 2 - 0 + 1 0 0 40 @@ -515,7 +515,7 @@ - + @@ -581,7 +581,7 @@ ???(???) - 00/00/0000, 00:00:00 + 00/00/0000, 00:00:00 @@ -1350,6 +1350,18 @@ Return the expression of clarification element. + + + enoddi33:get-clarification-responseid + + + + enopogues:get-clarification-responseid + + + Return id of reponse inside clarification + + From 40132e87c038acba650c00905450013d58e4af6b Mon Sep 17 00:00:00 2001 From: CHTAINET Badr Date: Mon, 26 Aug 2019 16:27:52 +0200 Subject: [PATCH 121/439] 189B Add clarification for list based response --- .../xslt/inputs/pogues-xml/templates.fods | 28 +++++++++++++------ .../resources/xslt/outputs/ddi/models.xsl | 7 ++++- 2 files changed, 26 insertions(+), 9 deletions(-) diff --git a/src/main/resources/xslt/inputs/pogues-xml/templates.fods b/src/main/resources/xslt/inputs/pogues-xml/templates.fods index 196a8945d..489cb7bf3 100644 --- a/src/main/resources/xslt/inputs/pogues-xml/templates.fods +++ b/src/main/resources/xslt/inputs/pogues-xml/templates.fods @@ -1,29 +1,29 @@ - 2009-04-16T11:32:48.39P11DT17H55M18S507LibreOffice/6.1.5.2$Windows_X86_64 LibreOffice_project/90f8dcf33c87b3705e78202e3df5142b201bd8052019-08-01T14:29:51.657000000 + 2009-04-16T11:32:48.39P11DT17H56M33S509LibreOffice/6.1.5.2$Windows_X86_64 LibreOffice_project/90f8dcf33c87b3705e78202e3df5142b201bd8052019-08-26T14:42:30.924000000 0 0 64075 - 54835 + 55414 view1 - 2 - 94 + 0 + 9 0 0 0 0 2 - 1 + 0 0 0 - 90 + 0 0 100 60 @@ -598,7 +598,7 @@ ???(???) - 00/00/0000, 00:00:00 + 00/00/0000, 00:00:00 @@ -964,6 +964,18 @@ + + + *[pogues:Response] + + + enopogues:get-code-list-id + + + descendant-or-self::pogues:CodeListReference[parent::pogues:Response][1] + + + * @@ -2245,7 +2257,7 @@ - + diff --git a/src/main/resources/xslt/outputs/ddi/models.xsl b/src/main/resources/xslt/outputs/ddi/models.xsl index 4bb5c7186..393f7496d 100644 --- a/src/main/resources/xslt/outputs/ddi/models.xsl +++ b/src/main/resources/xslt/outputs/ddi/models.xsl @@ -1180,6 +1180,7 @@ + @@ -1193,7 +1194,10 @@ - INSEE-COMMUN-CL-Booleen- + + - + INSEE-COMMUN-CL-Booleen- + Code @@ -1231,6 +1235,7 @@ + From 6bf233f2b5c4831ba92b3be443cebaf6e3272f40 Mon Sep 17 00:00:00 2001 From: CHTAINET Badr Date: Wed, 4 Sep 2019 10:21:45 +0200 Subject: [PATCH 122/439] 189B optimize for clarification list based --- .../resources/xslt/outputs/ddi/models.xsl | 6 +- src/test/resources/pogues-xml-to-ddi/out.xml | 2548 ++++++++--------- 2 files changed, 1279 insertions(+), 1275 deletions(-) diff --git a/src/main/resources/xslt/outputs/ddi/models.xsl b/src/main/resources/xslt/outputs/ddi/models.xsl index 393f7496d..56ede7662 100644 --- a/src/main/resources/xslt/outputs/ddi/models.xsl +++ b/src/main/resources/xslt/outputs/ddi/models.xsl @@ -1468,7 +1468,11 @@ - + + + + + diff --git a/src/test/resources/pogues-xml-to-ddi/out.xml b/src/test/resources/pogues-xml-to-ddi/out.xml index 52605f2ac..91c318197 100644 --- a/src/test/resources/pogues-xml-to-ddi/out.xml +++ b/src/test/resources/pogues-xml-to-ddi/out.xml @@ -1,7 +1,7 @@ fr.insee INSEE-i6vwi0 - 1 + 1.0 Questionnaire SIMPSONS @@ -10,18 +10,18 @@ fr.insee RessourcePackage-i6vwi0 - 1 + 1.0 fr.insee InterviewerInstructionScheme-i6vwi0 - 1 + 1.0 A définir fr.insee d1 - 1 + 1.0 comment @@ -34,7 +34,7 @@ fr.insee d11 - 1 + 1.0 comment @@ -48,7 +48,7 @@ fr.insee d2 - 1 + 1.0 comment @@ -61,7 +61,7 @@ fr.insee d3 - 1 + 1.0 instruction @@ -74,7 +74,7 @@ fr.insee d4 - 1 + 1.0 instruction @@ -87,7 +87,7 @@ fr.insee d5 - 1 + 1.0 instruction @@ -100,7 +100,7 @@ fr.insee j4nwc63q-CI-0-II-0 - 1 + 1.0 warning @@ -113,7 +113,7 @@ fr.insee jbcggtca-GOP - 1 + 1.0 OutParameter @@ -122,7 +122,7 @@ fr.insee d10 - 1 + 1.0 instruction @@ -132,15 +132,15 @@ - fr.inseeFTN-INSTRUCTION-11tooltipIncluded principalities + fr.inseeFTN-INSTRUCTION-11.0tooltipIncluded principalities fr.insee ControlConstructScheme-i6vwi0 - 1 + 1.0 fr.insee Sequence-i6vwi0 - 1 + 1.0 Questionnaire SIMPSONS @@ -148,26 +148,26 @@ fr.insee j6p0ti5h - 1 + 1.0 Sequence fr.insee d1e119 - 1 + 1.0 IfThenElse fr.insee j6z12s2d - 1 + 1.0 Sequence fr.insee j6p0ti5h - 1 + 1.0 MODULE1 @@ -177,33 +177,33 @@ fr.insee d1 - 1 + 1.0 Instruction module fr.insee j6p3dkx6-QC - 1 + 1.0 QuestionConstruct fr.insee j6p0np9q-QC - 1 + 1.0 QuestionConstruct fr.insee d1e50 - 1 + 1.0 IfThenElse fr.insee j6p0s7o5 - 1 + 1.0 MODULE11 @@ -214,32 +214,32 @@ fr.insee j3343qhx-QC - 1 + 1.0 QuestionConstruct fr.insee j6q9h8tj-QC - 1 + 1.0 QuestionConstruct fr.insee j334cyqb-QC - 1 + 1.0 QuestionConstruct fr.insee j6z06z1e-QC - 1 + 1.0 QuestionConstruct fr.insee j3341528 - 1 + 1.0 MODULE2 @@ -249,33 +249,33 @@ fr.insee d2 - 1 + 1.0 Instruction module fr.insee j3343clt-QC - 1 + 1.0 QuestionConstruct fr.insee j6qdfhvw-QC - 1 + 1.0 QuestionConstruct fr.insee j4nw5cqz-QC - 1 + 1.0 QuestionConstruct fr.insee j6qe0h9q - 1 + 1.0 MODULE3 @@ -286,38 +286,38 @@ fr.insee j334akov-QC - 1 + 1.0 QuestionConstruct fr.insee d12-SI - 1 + 1.0 StatementItem fr.insee j6p29i81-QC - 1 + 1.0 QuestionConstruct fr.insee j6qefnga-QC - 1 + 1.0 QuestionConstruct fr.insee j6yzoc6g-QC - 1 + 1.0 QuestionConstruct fr.insee j4nw88h2 - 1 + 1.0 MODULE4 @@ -328,26 +328,26 @@ fr.insee j6qe237q - 1 + 1.0 Sequence fr.insee j6qejudb - 1 + 1.0 Sequence fr.insee j6qeh91y - 1 + 1.0 Sequence fr.insee j6qe237q - 1 + 1.0 MODULE41 @@ -358,20 +358,20 @@ fr.insee j4nwc63q-QC - 1 + 1.0 QuestionConstruct fr.insee j4nwc63q-CI-0 - 1 + 1.0 ComputationItem fr.insee j6qejudb - 1 + 1.0 MODULE42 @@ -382,14 +382,14 @@ fr.insee j4nw0rr6-QC - 1 + 1.0 QuestionConstruct fr.insee j6qeh91y - 1 + 1.0 MODULE43 @@ -400,14 +400,14 @@ fr.insee j6p2lwuj-QC - 1 + 1.0 QuestionConstruct fr.insee j6qfx9qe - 1 + 1.0 MODULE5 @@ -418,14 +418,14 @@ fr.insee j6qg8rc6-QC - 1 + 1.0 QuestionConstruct fr.insee j6z12s2d - 1 + 1.0 MODULE6 @@ -436,14 +436,14 @@ fr.insee j6z0z3us-QC - 1 + 1.0 QuestionConstruct fr.insee d1e50 - 1 + 1.0 A définir @@ -457,7 +457,7 @@ fr.insee d1e50-IP-1 - 1 + 1.0 READY @@ -466,13 +466,13 @@ fr.insee j6p0np9q-QOP-jbgd3set - 1 + 1.0 OutParameter fr.insee d1e50-IP-1 - 1 + 1.0 InParameter @@ -482,28 +482,28 @@ fr.insee d1e50-THEN - 1 + 1.0 Sequence fr.insee d1e50-THEN - 1 + 1.0 fr.insee j6p0s7o5 - 1 + 1.0 Sequence fr.insee d1e119 - 1 + 1.0 A définir @@ -517,7 +517,7 @@ fr.insee d1e119-IP-1 - 1 + 1.0 READY @@ -526,13 +526,13 @@ fr.insee j6p0np9q-QOP-jbgd3set - 1 + 1.0 OutParameter fr.insee d1e119-IP-1 - 1 + 1.0 InParameter @@ -542,298 +542,298 @@ fr.insee d1e119-THEN - 1 + 1.0 Sequence fr.insee d1e119-THEN - 1 + 1.0 fr.insee j3341528 - 1 + 1.0 Sequence fr.insee j6qe0h9q - 1 + 1.0 Sequence fr.insee j4nw88h2 - 1 + 1.0 Sequence fr.insee j6qfx9qe - 1 + 1.0 Sequence fr.insee j6p3dkx6-QC - 1 + 1.0 COMMENT fr.insee j6p3dkx6 - 1 + 1.0 QuestionItem fr.insee j6p0np9q-QC - 1 + 1.0 READY fr.insee j6p0np9q - 1 + 1.0 QuestionItem fr.insee j3343qhx-QC - 1 + 1.0 PRODUCER fr.insee j3343qhx - 1 + 1.0 QuestionItem fr.insee j6q9h8tj-QC - 1 + 1.0 SEASON_NUMBER fr.insee j6q9h8tj - 1 + 1.0 QuestionItem fr.insee j334cyqb-QC - 1 + 1.0 DATEFIRST fr.insee j334cyqb - 1 + 1.0 QuestionItem fr.insee j6z06z1e-QC - 1 + 1.0 AUDIENCE_SHARE fr.insee j6z06z1e - 1 + 1.0 QuestionItem fr.insee j3343clt-QC - 1 + 1.0 CITY fr.insee j3343clt - 1 + 1.0 QuestionItem fr.insee j6qdfhvw-QC - 1 + 1.0 MAYOR fr.insee j6qdfhvw - 1 + 1.0 QuestionItem fr.insee j4nw5cqz-QC - 1 + 1.0 STATE fr.insee j4nw5cqz - 1 + 1.0 QuestionItem fr.insee j334akov-QC - 1 + 1.0 PET fr.insee j334akov - 1 + 1.0 QuestionGrid fr.insee j6p29i81-QC - 1 + 1.0 ICE_FLAVOUR fr.insee j6p29i81 - 1 + 1.0 QuestionGrid fr.insee j6qefnga-QC - 1 + 1.0 NUCLEAR_CHARACTER fr.insee j6qefnga - 1 + 1.0 QuestionGrid fr.insee j6yzoc6g-QC - 1 + 1.0 BIRTH_CHARACTER fr.insee j6yzoc6g - 1 + 1.0 QuestionGrid fr.insee j4nwc63q-QC - 1 + 1.0 PERCENTAGE_EXPENSES fr.insee j4nwc63q - 1 + 1.0 QuestionGrid fr.insee j4nw0rr6-QC - 1 + 1.0 CLOWNING fr.insee j4nw0rr6 - 1 + 1.0 QuestionGrid fr.insee j6p2lwuj-QC - 1 + 1.0 TRAVEL fr.insee j6p2lwuj - 1 + 1.0 QuestionGrid fr.insee j6qg8rc6-QC - 1 + 1.0 FAVOURITE_CHARACTERS fr.insee j6qg8rc6 - 1 + 1.0 QuestionGrid fr.insee j6z0z3us-QC - 1 + 1.0 SURVEY_COMMENT fr.insee j6z0z3us - 1 + 1.0 QuestionItem fr.insee j4nwc63q-CI-0 - 1 + 1.0 Total of percentages @@ -843,7 +843,7 @@ fr.insee j4nwc63q-CI-0-II-0 - 1 + 1.0 Instruction stumblingblock @@ -853,7 +853,7 @@ fr.insee j4nwc63q-CI-0-IP-1 - 1 + 1.0 PERCENTAGE_EXPENSES11 @@ -861,7 +861,7 @@ fr.insee j4nwc63q-CI-0-IP-2 - 1 + 1.0 PERCENTAGE_EXPENSES21 @@ -869,7 +869,7 @@ fr.insee j4nwc63q-CI-0-IP-3 - 1 + 1.0 PERCENTAGE_EXPENSES31 @@ -877,7 +877,7 @@ fr.insee j4nwc63q-CI-0-IP-4 - 1 + 1.0 PERCENTAGE_EXPENSES41 @@ -885,7 +885,7 @@ fr.insee j4nwc63q-CI-0-IP-5 - 1 + 1.0 PERCENTAGE_EXPENSES51 @@ -893,7 +893,7 @@ fr.insee j4nwc63q-CI-0-IP-6 - 1 + 1.0 PERCENTAGE_EXPENSES61 @@ -901,7 +901,7 @@ fr.insee j4nwc63q-CI-0-IP-7 - 1 + 1.0 PERCENTAGE_EXPENSES71 @@ -909,7 +909,7 @@ fr.insee j4nwc63q-CI-0-IP-8 - 1 + 1.0 PERCENTAGE_EXPENSES81 @@ -917,7 +917,7 @@ fr.insee j4nwc63q-CI-0-IP-9 - 1 + 1.0 PERCENTAGE_EXPENSES91 @@ -925,7 +925,7 @@ fr.insee j4nwc63q-CI-0-IP-10 - 1 + 1.0 PERCENTAGE_EXPENSES101 @@ -934,13 +934,13 @@ fr.insee j4nwc63q-QOP-jbgde5yl - 1 + 1.0 OutParameter fr.insee j4nwc63q-CI-0-IP-1 - 1 + 1.0 InParameter @@ -948,13 +948,13 @@ fr.insee j4nwc63q-QOP-jbgd2x2t - 1 + 1.0 OutParameter fr.insee j4nwc63q-CI-0-IP-2 - 1 + 1.0 InParameter @@ -962,13 +962,13 @@ fr.insee j4nwc63q-QOP-jbgdjypz - 1 + 1.0 OutParameter fr.insee j4nwc63q-CI-0-IP-3 - 1 + 1.0 InParameter @@ -976,13 +976,13 @@ fr.insee j4nwc63q-QOP-jbgdcftu - 1 + 1.0 OutParameter fr.insee j4nwc63q-CI-0-IP-4 - 1 + 1.0 InParameter @@ -990,13 +990,13 @@ fr.insee j4nwc63q-QOP-jbgdiyfe - 1 + 1.0 OutParameter fr.insee j4nwc63q-CI-0-IP-5 - 1 + 1.0 InParameter @@ -1004,13 +1004,13 @@ fr.insee j4nwc63q-QOP-jbgdj1wd - 1 + 1.0 OutParameter fr.insee j4nwc63q-CI-0-IP-6 - 1 + 1.0 InParameter @@ -1018,13 +1018,13 @@ fr.insee j4nwc63q-QOP-jbgddylk - 1 + 1.0 OutParameter fr.insee j4nwc63q-CI-0-IP-7 - 1 + 1.0 InParameter @@ -1032,13 +1032,13 @@ fr.insee j4nwc63q-QOP-jbgd3jj6 - 1 + 1.0 OutParameter fr.insee j4nwc63q-CI-0-IP-8 - 1 + 1.0 InParameter @@ -1046,13 +1046,13 @@ fr.insee j4nwc63q-QOP-jbgd4w3k - 1 + 1.0 OutParameter fr.insee j4nwc63q-CI-0-IP-9 - 1 + 1.0 InParameter @@ -1060,13 +1060,13 @@ fr.insee j4nwc63q-QOP-jbgd4w4k - 1 + 1.0 OutParameter fr.insee j4nwc63q-CI-0-IP-10 - 1 + 1.0 InParameter @@ -1080,7 +1080,7 @@ fr.insee d12-SI - 1 + 1.0 Now we are going to know if you think that Jay is a gluton. @@ -1091,21 +1091,21 @@ fr.insee QuestionScheme-i6vwi0 - 1 + 1.0 A définir fr.insee j6p3dkx6 - 1 + 1.0 COMMENT fr.insee j6p3dkx6-QOP-jbgdhaht - 1 + 1.0 COMMENT @@ -1114,13 +1114,13 @@ fr.insee j6p3dkx6-RDOP-jbgdhaht - 1 + 1.0 OutParameter fr.insee j6p3dkx6-QOP-jbgdhaht - 1 + 1.0 OutParameter @@ -1133,7 +1133,7 @@ fr.insee j6p3dkx6-RDOP-jbgdhaht - 1 + 1.0 @@ -1141,14 +1141,14 @@ fr.insee j6p0np9q - 1 + 1.0 READY fr.insee j6p0np9q-QOP-jbgd3set - 1 + 1.0 READY @@ -1157,13 +1157,13 @@ fr.insee j6p0np9q-RDOP-jbgd3set - 1 + 1.0 OutParameter fr.insee j6p0np9q-QOP-jbgd3set - 1 + 1.0 OutParameter @@ -1176,14 +1176,14 @@ fr.insee j6p0np9q-RDOP-jbgd3set - 1 + 1.0 fr.insee INSEE-COMMUN-CL-Booleen-1 - 1 + 1.0 Code @@ -1197,7 +1197,7 @@ fr.insee j6p6my1d - 1 + 1.0 @@ -1214,14 +1214,14 @@ fr.insee j3343qhx - 1 + 1.0 PRODUCER fr.insee j3343qhx-QOP-jbgd90cy - 1 + 1.0 PRODUCER @@ -1230,13 +1230,13 @@ fr.insee j3343qhx-RDOP-jbgd90cy - 1 + 1.0 OutParameter fr.insee j3343qhx-QOP-jbgd90cy - 1 + 1.0 OutParameter @@ -1249,7 +1249,7 @@ fr.insee j3343qhx-RDOP-jbgd90cy - 1 + 1.0 @@ -1257,14 +1257,14 @@ fr.insee j6q9h8tj - 1 + 1.0 SEASON_NUMBER fr.insee j6q9h8tj-QOP-jbgdjy8h - 1 + 1.0 SEASON_NUMBER @@ -1273,13 +1273,13 @@ fr.insee j6q9h8tj-RDOP-jbgdjy8h - 1 + 1.0 OutParameter fr.insee j6q9h8tj-QOP-jbgdjy8h - 1 + 1.0 OutParameter @@ -1297,21 +1297,21 @@ fr.insee j6q9h8tj-RDOP-jbgdjy8h - 1 + 1.0 fr.insee j334cyqb - 1 + 1.0 DATEFIRST fr.insee j334cyqb-QOP-jbgdih2z - 1 + 1.0 DATEFIRST @@ -1320,13 +1320,13 @@ fr.insee j334cyqb-RDOP-jbgdih2z - 1 + 1.0 OutParameter fr.insee j334cyqb-QOP-jbgdih2z - 1 + 1.0 OutParameter @@ -1338,16 +1338,16 @@ fr.insee INSEE-COMMUN-MNR-DateTimedate-YYYY-MM-DD - 1 + 1.0 ManagedDateTimeRepresentation fr.insee j334cyqb-RDOP-jbgdih2z - 1 + 1.0 fr.insee INSEE-COMMUN-MNR-DateTimedate-YYYY-MM-DD - 1 + 1.0 ManagedDateTimeRepresentation @@ -1355,21 +1355,21 @@ fr.insee d11 - 1 + 1.0 Instruction fr.insee j6z06z1e - 1 + 1.0 AUDIENCE_SHARE fr.insee j6z06z1e-QOP-jbgddnrd - 1 + 1.0 AUDIENCE_SHARE @@ -1378,13 +1378,13 @@ fr.insee j6z06z1e-RDOP-jbgddnrd - 1 + 1.0 OutParameter fr.insee j6z06z1e-QOP-jbgddnrd - 1 + 1.0 OutParameter @@ -1403,21 +1403,21 @@ fr.insee j6z06z1e-RDOP-jbgddnrd - 1 + 1.0 fr.insee j3343clt - 1 + 1.0 CITY fr.insee j3343clt-QOP-jbgdjdkn - 1 + 1.0 CITY @@ -1426,13 +1426,13 @@ fr.insee j3343clt-RDOP-jbgdjdkn - 1 + 1.0 OutParameter fr.insee j3343clt-QOP-jbgdjdkn - 1 + 1.0 OutParameter @@ -1446,18 +1446,18 @@ fr.insee j334iumu - 1 + 1.0 CodeList fr.insee j3343clt-RDOP-jbgdjdkn - 1 + 1.0 fr.insee j334iumu - 1 + 1.0 CodeList @@ -1467,21 +1467,21 @@ fr.insee d3 - 1 + 1.0 Instruction fr.insee j6qdfhvw - 1 + 1.0 MAYOR fr.insee j6qdfhvw-QOP-jbgd8ghp - 1 + 1.0 MAYOR @@ -1490,13 +1490,13 @@ fr.insee j6qdfhvw-RDOP-jbgd8ghp - 1 + 1.0 OutParameter fr.insee j6qdfhvw-QOP-jbgd8ghp - 1 + 1.0 OutParameter @@ -1510,18 +1510,18 @@ fr.insee j6qdqoen - 1 + 1.0 CodeList fr.insee j6qdfhvw-RDOP-jbgd8ghp - 1 + 1.0 fr.insee j6qdqoen - 1 + 1.0 CodeList @@ -1531,21 +1531,21 @@ fr.insee d4 - 1 + 1.0 Instruction fr.insee j4nw5cqz - 1 + 1.0 STATE fr.insee j4nw5cqz-QOP-jbgdkd7v - 1 + 1.0 STATE @@ -1554,13 +1554,13 @@ fr.insee j4nw5cqz-RDOP-jbgdkd7v - 1 + 1.0 OutParameter fr.insee j4nw5cqz-QOP-jbgdkd7v - 1 + 1.0 OutParameter @@ -1574,18 +1574,18 @@ fr.insee j4nwo00f - 1 + 1.0 CodeList fr.insee j4nw5cqz-RDOP-jbgdkd7v - 1 + 1.0 fr.insee j4nwo00f - 1 + 1.0 CodeList @@ -1596,14 +1596,14 @@ fr.insee j6z0z3us - 1 + 1.0 SURVEY_COMMENT fr.insee j6z0z3us-QOP-jbgd6m6e - 1 + 1.0 SURVEY_COMMENT @@ -1612,13 +1612,13 @@ fr.insee j6z0z3us-RDOP-jbgd6m6e - 1 + 1.0 OutParameter fr.insee j6z0z3us-QOP-jbgd6m6e - 1 + 1.0 OutParameter @@ -1631,7 +1631,7 @@ fr.insee j6z0z3us-RDOP-jbgd6m6e - 1 + 1.0 @@ -1639,14 +1639,14 @@ fr.insee j334akov - 1 + 1.0 PET fr.insee j334akov-QOP-jbgd8qmn - 1 + 1.0 PET1 @@ -1654,7 +1654,7 @@ fr.insee j334akov-QOP-jbgd60vl - 1 + 1.0 PET2 @@ -1662,7 +1662,7 @@ fr.insee j334akov-QOP-jbgda2jo - 1 + 1.0 PET3 @@ -1670,7 +1670,7 @@ fr.insee j334akov-QOP-jbgdfssy - 1 + 1.0 PET4 @@ -1679,13 +1679,13 @@ fr.insee j334akov-RDOP-jbgd8qmn - 1 + 1.0 OutParameter fr.insee j334akov-QOP-jbgd8qmn - 1 + 1.0 OutParameter @@ -1693,13 +1693,13 @@ fr.insee j334akov-RDOP-jbgd60vl - 1 + 1.0 OutParameter fr.insee j334akov-QOP-jbgd60vl - 1 + 1.0 OutParameter @@ -1707,13 +1707,13 @@ fr.insee j334akov-RDOP-jbgda2jo - 1 + 1.0 OutParameter fr.insee j334akov-QOP-jbgda2jo - 1 + 1.0 OutParameter @@ -1721,13 +1721,13 @@ fr.insee j334akov-RDOP-jbgdfssy - 1 + 1.0 OutParameter fr.insee j334akov-QOP-jbgdfssy - 1 + 1.0 OutParameter @@ -1741,7 +1741,7 @@ fr.insee j335cu3c - 1 + 1.0 CodeList @@ -1752,14 +1752,14 @@ fr.insee j334akov-RDOP-jbgd8qmn - 1 + 1.0 fr.insee INSEE-COMMUN-CL-Booleen-1 - 1 + 1.0 Code @@ -1780,14 +1780,14 @@ fr.insee j334akov-RDOP-jbgd60vl - 1 + 1.0 fr.insee INSEE-COMMUN-CL-Booleen-1 - 1 + 1.0 Code @@ -1808,14 +1808,14 @@ fr.insee j334akov-RDOP-jbgda2jo - 1 + 1.0 fr.insee INSEE-COMMUN-CL-Booleen-1 - 1 + 1.0 Code @@ -1836,14 +1836,14 @@ fr.insee j334akov-RDOP-jbgdfssy - 1 + 1.0 fr.insee INSEE-COMMUN-CL-Booleen-1 - 1 + 1.0 Code @@ -1863,21 +1863,21 @@ fr.insee d5 - 1 + 1.0 Instruction fr.insee j6p29i81 - 1 + 1.0 ICE_FLAVOUR fr.insee j6p29i81-QOP-jbgdb3jx - 1 + 1.0 ICE_FLAVOUR1 @@ -1885,7 +1885,7 @@ fr.insee j6p29i81-QOP-jbgdb61k - 1 + 1.0 ICE_FLAVOUR2 @@ -1893,7 +1893,7 @@ fr.insee j6p29i81-QOP-jbgdl3kc - 1 + 1.0 ICE_FLAVOUR3 @@ -1901,7 +1901,7 @@ fr.insee j6p29i81-QOP-jbgdcobo - 1 + 1.0 ICE_FLAVOUR4 @@ -1910,13 +1910,13 @@ fr.insee j6p29i81-RDOP-jbgdb3jx - 1 + 1.0 OutParameter fr.insee j6p29i81-QOP-jbgdb3jx - 1 + 1.0 OutParameter @@ -1924,13 +1924,13 @@ fr.insee j6p29i81-RDOP-jbgdb61k - 1 + 1.0 OutParameter fr.insee j6p29i81-QOP-jbgdb61k - 1 + 1.0 OutParameter @@ -1938,13 +1938,13 @@ fr.insee j6p29i81-RDOP-jbgdl3kc - 1 + 1.0 OutParameter fr.insee j6p29i81-QOP-jbgdl3kc - 1 + 1.0 OutParameter @@ -1952,13 +1952,13 @@ fr.insee j6p29i81-RDOP-jbgdcobo - 1 + 1.0 OutParameter fr.insee j6p29i81-QOP-jbgdcobo - 1 + 1.0 OutParameter @@ -1972,7 +1972,7 @@ fr.insee j6p2mvca - 1 + 1.0 CodeList @@ -1984,18 +1984,18 @@ fr.insee jbdxh138 - 1 + 1.0 CodeList fr.insee j6p29i81-RDOP-jbgdb3jx - 1 + 1.0 fr.insee jbdxh138 - 1 + 1.0 CodeList @@ -2014,18 +2014,18 @@ fr.insee jbdxh138 - 1 + 1.0 CodeList fr.insee j6p29i81-RDOP-jbgdb61k - 1 + 1.0 fr.insee jbdxh138 - 1 + 1.0 CodeList @@ -2044,18 +2044,18 @@ fr.insee jbdxh138 - 1 + 1.0 CodeList fr.insee j6p29i81-RDOP-jbgdl3kc - 1 + 1.0 fr.insee jbdxh138 - 1 + 1.0 CodeList @@ -2074,18 +2074,18 @@ fr.insee jbdxh138 - 1 + 1.0 CodeList fr.insee j6p29i81-RDOP-jbgdcobo - 1 + 1.0 fr.insee jbdxh138 - 1 + 1.0 CodeList @@ -2103,14 +2103,14 @@ fr.insee j6qefnga - 1 + 1.0 NUCLEAR_CHARACTER fr.insee j6qefnga-QOP-jbgd6p0k - 1 + 1.0 NUCLEAR_CHARACTER1 @@ -2118,7 +2118,7 @@ fr.insee j6qefnga-QOP-jbgd9ato - 1 + 1.0 NUCLEAR_CHARACTER2 @@ -2126,7 +2126,7 @@ fr.insee j6qefnga-QOP-jbgd3e0p - 1 + 1.0 NUCLEAR_CHARACTER3 @@ -2134,7 +2134,7 @@ fr.insee j6qefnga-QOP-jbgdkxne - 1 + 1.0 NUCLEAR_CHARACTER4 @@ -2143,13 +2143,13 @@ fr.insee j6qefnga-RDOP-jbgd6p0k - 1 + 1.0 OutParameter fr.insee j6qefnga-QOP-jbgd6p0k - 1 + 1.0 OutParameter @@ -2157,13 +2157,13 @@ fr.insee j6qefnga-RDOP-jbgd9ato - 1 + 1.0 OutParameter fr.insee j6qefnga-QOP-jbgd9ato - 1 + 1.0 OutParameter @@ -2171,13 +2171,13 @@ fr.insee j6qefnga-RDOP-jbgd3e0p - 1 + 1.0 OutParameter fr.insee j6qefnga-QOP-jbgd3e0p - 1 + 1.0 OutParameter @@ -2185,13 +2185,13 @@ fr.insee j6qefnga-RDOP-jbgdkxne - 1 + 1.0 OutParameter fr.insee j6qefnga-QOP-jbgdkxne - 1 + 1.0 OutParameter @@ -2205,7 +2205,7 @@ fr.insee j6qeytgc - 1 + 1.0 CodeList @@ -2217,18 +2217,18 @@ fr.insee jbdxh138 - 1 + 1.0 CodeList fr.insee j6qefnga-RDOP-jbgd6p0k - 1 + 1.0 fr.insee jbdxh138 - 1 + 1.0 CodeList @@ -2247,18 +2247,18 @@ fr.insee jbdxh138 - 1 + 1.0 CodeList fr.insee j6qefnga-RDOP-jbgd9ato - 1 + 1.0 fr.insee jbdxh138 - 1 + 1.0 CodeList @@ -2277,18 +2277,18 @@ fr.insee jbdxh138 - 1 + 1.0 CodeList fr.insee j6qefnga-RDOP-jbgd3e0p - 1 + 1.0 fr.insee jbdxh138 - 1 + 1.0 CodeList @@ -2307,18 +2307,18 @@ fr.insee jbdxh138 - 1 + 1.0 CodeList fr.insee j6qefnga-RDOP-jbgdkxne - 1 + 1.0 fr.insee jbdxh138 - 1 + 1.0 CodeList @@ -2336,14 +2336,14 @@ fr.insee j6yzoc6g - 1 + 1.0 BIRTH_CHARACTER fr.insee j6yzoc6g-QOP-jbgd7fr6 - 1 + 1.0 BIRTH_CHARACTER1 @@ -2351,7 +2351,7 @@ fr.insee j6yzoc6g-QOP-jbgd5e9f - 1 + 1.0 BIRTH_CHARACTER2 @@ -2359,7 +2359,7 @@ fr.insee j6yzoc6g-QOP-jbgd912x - 1 + 1.0 BIRTH_CHARACTER3 @@ -2367,7 +2367,7 @@ fr.insee j6yzoc6g-QOP-jbgd6bdy - 1 + 1.0 BIRTH_CHARACTER4 @@ -2375,7 +2375,7 @@ fr.insee j6yzoc6g-QOP-jbgddyry - 1 + 1.0 BIRTH_CHARACTER5 @@ -2384,13 +2384,13 @@ fr.insee j6yzoc6g-RDOP-jbgd7fr6 - 1 + 1.0 OutParameter fr.insee j6yzoc6g-QOP-jbgd7fr6 - 1 + 1.0 OutParameter @@ -2398,13 +2398,13 @@ fr.insee j6yzoc6g-RDOP-jbgd5e9f - 1 + 1.0 OutParameter fr.insee j6yzoc6g-QOP-jbgd5e9f - 1 + 1.0 OutParameter @@ -2412,13 +2412,13 @@ fr.insee j6yzoc6g-RDOP-jbgd912x - 1 + 1.0 OutParameter fr.insee j6yzoc6g-QOP-jbgd912x - 1 + 1.0 OutParameter @@ -2426,13 +2426,13 @@ fr.insee j6yzoc6g-RDOP-jbgd6bdy - 1 + 1.0 OutParameter fr.insee j6yzoc6g-QOP-jbgd6bdy - 1 + 1.0 OutParameter @@ -2440,13 +2440,13 @@ fr.insee j6yzoc6g-RDOP-jbgddyry - 1 + 1.0 OutParameter fr.insee j6yzoc6g-QOP-jbgddyry - 1 + 1.0 OutParameter @@ -2460,7 +2460,7 @@ fr.insee j6z087mq - 1 + 1.0 CodeList @@ -2472,18 +2472,18 @@ fr.insee jbdxricm - 1 + 1.0 CodeList fr.insee j6yzoc6g-RDOP-jbgd7fr6 - 1 + 1.0 fr.insee jbdxricm - 1 + 1.0 CodeList @@ -2502,18 +2502,18 @@ fr.insee jbdxricm - 1 + 1.0 CodeList fr.insee j6yzoc6g-RDOP-jbgd5e9f - 1 + 1.0 fr.insee jbdxricm - 1 + 1.0 CodeList @@ -2532,18 +2532,18 @@ fr.insee jbdxricm - 1 + 1.0 CodeList fr.insee j6yzoc6g-RDOP-jbgd912x - 1 + 1.0 fr.insee jbdxricm - 1 + 1.0 CodeList @@ -2562,18 +2562,18 @@ fr.insee jbdxricm - 1 + 1.0 CodeList fr.insee j6yzoc6g-RDOP-jbgd6bdy - 1 + 1.0 fr.insee jbdxricm - 1 + 1.0 CodeList @@ -2592,18 +2592,18 @@ fr.insee jbdxricm - 1 + 1.0 CodeList fr.insee j6yzoc6g-RDOP-jbgddyry - 1 + 1.0 fr.insee jbdxricm - 1 + 1.0 CodeList @@ -2621,14 +2621,14 @@ fr.insee j4nwc63q - 1 + 1.0 PERCENTAGE_EXPENSES fr.insee j4nwc63q-QOP-jbgde5yl - 1 + 1.0 PERCENTAGE_EXPENSES11 @@ -2636,7 +2636,7 @@ fr.insee j4nwc63q-QOP-jbgd2x2t - 1 + 1.0 PERCENTAGE_EXPENSES21 @@ -2644,7 +2644,7 @@ fr.insee j4nwc63q-QOP-jbgdjypz - 1 + 1.0 PERCENTAGE_EXPENSES31 @@ -2652,7 +2652,7 @@ fr.insee j4nwc63q-QOP-jbgdcftu - 1 + 1.0 PERCENTAGE_EXPENSES41 @@ -2660,7 +2660,7 @@ fr.insee j4nwc63q-QOP-jbgdiyfe - 1 + 1.0 PERCENTAGE_EXPENSES51 @@ -2668,7 +2668,7 @@ fr.insee j4nwc63q-QOP-jbgdj1wd - 1 + 1.0 PERCENTAGE_EXPENSES61 @@ -2676,7 +2676,7 @@ fr.insee j4nwc63q-QOP-jbgddylk - 1 + 1.0 PERCENTAGE_EXPENSES71 @@ -2684,7 +2684,7 @@ fr.insee j4nwc63q-QOP-jbgd3jj6 - 1 + 1.0 PERCENTAGE_EXPENSES81 @@ -2692,7 +2692,7 @@ fr.insee j4nwc63q-QOP-jbgd4w3k - 1 + 1.0 PERCENTAGE_EXPENSES91 @@ -2700,7 +2700,7 @@ fr.insee j4nwc63q-QOP-jbgd4w4k - 1 + 1.0 PERCENTAGE_EXPENSES101 @@ -2709,13 +2709,13 @@ fr.insee j4nwc63q-RDOP-jbgde5yl - 1 + 1.0 OutParameter fr.insee j4nwc63q-QOP-jbgde5yl - 1 + 1.0 OutParameter @@ -2723,13 +2723,13 @@ fr.insee j4nwc63q-RDOP-jbgd2x2t - 1 + 1.0 OutParameter fr.insee j4nwc63q-QOP-jbgd2x2t - 1 + 1.0 OutParameter @@ -2737,13 +2737,13 @@ fr.insee j4nwc63q-RDOP-jbgdjypz - 1 + 1.0 OutParameter fr.insee j4nwc63q-QOP-jbgdjypz - 1 + 1.0 OutParameter @@ -2751,13 +2751,13 @@ fr.insee j4nwc63q-RDOP-jbgdcftu - 1 + 1.0 OutParameter fr.insee j4nwc63q-QOP-jbgdcftu - 1 + 1.0 OutParameter @@ -2765,13 +2765,13 @@ fr.insee j4nwc63q-RDOP-jbgdiyfe - 1 + 1.0 OutParameter fr.insee j4nwc63q-QOP-jbgdiyfe - 1 + 1.0 OutParameter @@ -2779,13 +2779,13 @@ fr.insee j4nwc63q-RDOP-jbgdj1wd - 1 + 1.0 OutParameter fr.insee j4nwc63q-QOP-jbgdj1wd - 1 + 1.0 OutParameter @@ -2793,13 +2793,13 @@ fr.insee j4nwc63q-RDOP-jbgddylk - 1 + 1.0 OutParameter fr.insee j4nwc63q-QOP-jbgddylk - 1 + 1.0 OutParameter @@ -2807,13 +2807,13 @@ fr.insee j4nwc63q-RDOP-jbgd3jj6 - 1 + 1.0 OutParameter fr.insee j4nwc63q-QOP-jbgd3jj6 - 1 + 1.0 OutParameter @@ -2821,13 +2821,13 @@ fr.insee j4nwc63q-RDOP-jbgd4w3k - 1 + 1.0 OutParameter fr.insee j4nwc63q-QOP-jbgd4w3k - 1 + 1.0 OutParameter @@ -2835,13 +2835,13 @@ fr.insee j4nwc63q-RDOP-jbgd4w4k - 1 + 1.0 OutParameter fr.insee j4nwc63q-QOP-jbgd4w4k - 1 + 1.0 OutParameter @@ -2856,7 +2856,7 @@ fr.insee j4nwh16i - 1 + 1.0 CodeList @@ -2866,7 +2866,7 @@ fr.insee j4nwc63q-secondDimension-fakeCL-1 - 1 + 1.0 CodeList @@ -2882,7 +2882,7 @@ fr.insee j4nwc63q-RDOP-jbgde5yl - 1 + 1.0 @@ -2902,7 +2902,7 @@ fr.insee j4nwc63q-RDOP-jbgd2x2t - 1 + 1.0 @@ -2922,7 +2922,7 @@ fr.insee j4nwc63q-RDOP-jbgdjypz - 1 + 1.0 @@ -2942,7 +2942,7 @@ fr.insee j4nwc63q-RDOP-jbgdcftu - 1 + 1.0 @@ -2962,7 +2962,7 @@ fr.insee j4nwc63q-RDOP-jbgdiyfe - 1 + 1.0 @@ -2982,7 +2982,7 @@ fr.insee j4nwc63q-RDOP-jbgdj1wd - 1 + 1.0 @@ -3002,7 +3002,7 @@ fr.insee j4nwc63q-RDOP-jbgddylk - 1 + 1.0 @@ -3022,7 +3022,7 @@ fr.insee j4nwc63q-RDOP-jbgd3jj6 - 1 + 1.0 @@ -3042,7 +3042,7 @@ fr.insee j4nwc63q-RDOP-jbgd4w3k - 1 + 1.0 @@ -3062,7 +3062,7 @@ fr.insee j4nwc63q-RDOP-jbgd4w4k - 1 + 1.0 @@ -3077,14 +3077,14 @@ fr.insee j4nw0rr6 - 1 + 1.0 CLOWNING fr.insee j4nw0rr6-QOP-jbgd8tyr - 1 + 1.0 CLOWNING11 @@ -3092,7 +3092,7 @@ fr.insee j4nw0rr6-QOP-jbgdep36 - 1 + 1.0 CLOWNING21 @@ -3100,7 +3100,7 @@ fr.insee j4nw0rr6-QOP-jbgdjjgi - 1 + 1.0 CLOWNING31 @@ -3108,7 +3108,7 @@ fr.insee j4nw0rr6-QOP-jbgdgh6k - 1 + 1.0 CLOWNING41 @@ -3116,7 +3116,7 @@ fr.insee j4nw0rr6-QOP-jbgdit3o - 1 + 1.0 CLOWNING12 @@ -3124,7 +3124,7 @@ fr.insee j4nw0rr6-QOP-jbgd366k - 1 + 1.0 CLOWNING22 @@ -3132,7 +3132,7 @@ fr.insee j4nw0rr6-QOP-jbgdax06 - 1 + 1.0 CLOWNING32 @@ -3140,7 +3140,7 @@ fr.insee j4nw0rr6-QOP-jbgdfo1j - 1 + 1.0 CLOWNING42 @@ -3149,13 +3149,13 @@ fr.insee j4nw0rr6-RDOP-jbgd8tyr - 1 + 1.0 OutParameter fr.insee j4nw0rr6-QOP-jbgd8tyr - 1 + 1.0 OutParameter @@ -3163,13 +3163,13 @@ fr.insee j4nw0rr6-RDOP-jbgdep36 - 1 + 1.0 OutParameter fr.insee j4nw0rr6-QOP-jbgdep36 - 1 + 1.0 OutParameter @@ -3177,13 +3177,13 @@ fr.insee j4nw0rr6-RDOP-jbgdjjgi - 1 + 1.0 OutParameter fr.insee j4nw0rr6-QOP-jbgdjjgi - 1 + 1.0 OutParameter @@ -3191,13 +3191,13 @@ fr.insee j4nw0rr6-RDOP-jbgdgh6k - 1 + 1.0 OutParameter fr.insee j4nw0rr6-QOP-jbgdgh6k - 1 + 1.0 OutParameter @@ -3205,13 +3205,13 @@ fr.insee j4nw0rr6-RDOP-jbgdit3o - 1 + 1.0 OutParameter fr.insee j4nw0rr6-QOP-jbgdit3o - 1 + 1.0 OutParameter @@ -3219,13 +3219,13 @@ fr.insee j4nw0rr6-RDOP-jbgd366k - 1 + 1.0 OutParameter fr.insee j4nw0rr6-QOP-jbgd366k - 1 + 1.0 OutParameter @@ -3233,13 +3233,13 @@ fr.insee j4nw0rr6-RDOP-jbgdax06 - 1 + 1.0 OutParameter fr.insee j4nw0rr6-QOP-jbgdax06 - 1 + 1.0 OutParameter @@ -3247,13 +3247,13 @@ fr.insee j4nw0rr6-RDOP-jbgdfo1j - 1 + 1.0 OutParameter fr.insee j4nw0rr6-QOP-jbgdfo1j - 1 + 1.0 OutParameter @@ -3267,7 +3267,7 @@ fr.insee j77dav9b - 1 + 1.0 CodeList @@ -3277,7 +3277,7 @@ fr.insee j4nw0rr6-secondDimension-fakeCL-1 - 1 + 1.0 CodeList @@ -3289,18 +3289,18 @@ fr.insee jbdyh6b5 - 1 + 1.0 CodeList fr.insee j4nw0rr6-RDOP-jbgd8tyr - 1 + 1.0 fr.insee jbdyh6b5 - 1 + 1.0 CodeList @@ -3320,18 +3320,18 @@ fr.insee jbdyh6b5 - 1 + 1.0 CodeList fr.insee j4nw0rr6-RDOP-jbgdep36 - 1 + 1.0 fr.insee jbdyh6b5 - 1 + 1.0 CodeList @@ -3351,18 +3351,18 @@ fr.insee jbdyh6b5 - 1 + 1.0 CodeList fr.insee j4nw0rr6-RDOP-jbgdjjgi - 1 + 1.0 fr.insee jbdyh6b5 - 1 + 1.0 CodeList @@ -3382,18 +3382,18 @@ fr.insee jbdyh6b5 - 1 + 1.0 CodeList fr.insee j4nw0rr6-RDOP-jbgdgh6k - 1 + 1.0 fr.insee jbdyh6b5 - 1 + 1.0 CodeList @@ -3412,7 +3412,7 @@ fr.insee j4nw0rr6-RDOP-jbgdit3o - 1 + 1.0 @@ -3428,7 +3428,7 @@ fr.insee j4nw0rr6-RDOP-jbgd366k - 1 + 1.0 @@ -3444,7 +3444,7 @@ fr.insee j4nw0rr6-RDOP-jbgdax06 - 1 + 1.0 @@ -3460,7 +3460,7 @@ fr.insee j4nw0rr6-RDOP-jbgdfo1j - 1 + 1.0 @@ -3476,14 +3476,14 @@ fr.insee j6p2lwuj - 1 + 1.0 TRAVEL fr.insee j6p2lwuj-QOP-jbgd92mb - 1 + 1.0 TRAVEL11 @@ -3491,7 +3491,7 @@ fr.insee j6p2lwuj-QOP-jbgdgsat - 1 + 1.0 TRAVEL21 @@ -3499,7 +3499,7 @@ fr.insee j6p2lwuj-QOP-jbgdaxk2 - 1 + 1.0 TRAVEL31 @@ -3507,7 +3507,7 @@ fr.insee j6p2lwuj-QOP-jbgd7myn - 1 + 1.0 TRAVEL41 @@ -3515,7 +3515,7 @@ fr.insee j6p2lwuj-QOP-jbgdnxkt - 1 + 1.0 TRAVEL12 @@ -3523,7 +3523,7 @@ fr.insee j6p2lwuj-QOP-jbgd3ef5 - 1 + 1.0 TRAVEL22 @@ -3531,7 +3531,7 @@ fr.insee j6p2lwuj-QOP-jbgd8p1v - 1 + 1.0 TRAVEL32 @@ -3539,7 +3539,7 @@ fr.insee j6p2lwuj-QOP-jbgdgm0c - 1 + 1.0 TRAVEL42 @@ -3547,7 +3547,7 @@ fr.insee j6p2lwuj-QOP-jbgdcppc - 1 + 1.0 TRAVEL13 @@ -3555,7 +3555,7 @@ fr.insee j6p2lwuj-QOP-jbgd4cm6 - 1 + 1.0 TRAVEL23 @@ -3563,7 +3563,7 @@ fr.insee j6p2lwuj-QOP-jbgdd2lo - 1 + 1.0 TRAVEL33 @@ -3571,7 +3571,7 @@ fr.insee j6p2lwuj-QOP-jbgdo0ay - 1 + 1.0 TRAVEL43 @@ -3579,7 +3579,7 @@ fr.insee j6p2lwuj-QOP-jbgd4r2a - 1 + 1.0 TRAVEL14 @@ -3587,7 +3587,7 @@ fr.insee j6p2lwuj-QOP-jbgdkfpq - 1 + 1.0 TRAVEL24 @@ -3595,7 +3595,7 @@ fr.insee j6p2lwuj-QOP-jbgd7u52 - 1 + 1.0 TRAVEL34 @@ -3603,7 +3603,7 @@ fr.insee j6p2lwuj-QOP-jbgdgfwl - 1 + 1.0 TRAVEL44 @@ -3611,7 +3611,7 @@ fr.insee j6p2lwuj-QOP-jbgd9cff - 1 + 1.0 TRAVEL15 @@ -3619,7 +3619,7 @@ fr.insee j6p2lwuj-QOP-jbgddwsp - 1 + 1.0 TRAVEL25 @@ -3627,7 +3627,7 @@ fr.insee j6p2lwuj-QOP-jbgdncn8 - 1 + 1.0 TRAVEL35 @@ -3635,7 +3635,7 @@ fr.insee j6p2lwuj-QOP-jbgdnz6b - 1 + 1.0 TRAVEL45 @@ -3643,7 +3643,7 @@ fr.insee j6p2lwuj-QOP-jbgdiva0 - 1 + 1.0 TRAVEL16 @@ -3651,7 +3651,7 @@ fr.insee j6p2lwuj-QOP-jbgd7dqf - 1 + 1.0 TRAVEL26 @@ -3659,7 +3659,7 @@ fr.insee j6p2lwuj-QOP-jbgdnous - 1 + 1.0 TRAVEL36 @@ -3667,7 +3667,7 @@ fr.insee j6p2lwuj-QOP-jbgdkfcz - 1 + 1.0 TRAVEL46 @@ -3676,13 +3676,13 @@ fr.insee j6p2lwuj-RDOP-jbgd92mb - 1 + 1.0 OutParameter fr.insee j6p2lwuj-QOP-jbgd92mb - 1 + 1.0 OutParameter @@ -3690,13 +3690,13 @@ fr.insee j6p2lwuj-RDOP-jbgdgsat - 1 + 1.0 OutParameter fr.insee j6p2lwuj-QOP-jbgdgsat - 1 + 1.0 OutParameter @@ -3704,13 +3704,13 @@ fr.insee j6p2lwuj-RDOP-jbgdaxk2 - 1 + 1.0 OutParameter fr.insee j6p2lwuj-QOP-jbgdaxk2 - 1 + 1.0 OutParameter @@ -3718,13 +3718,13 @@ fr.insee j6p2lwuj-RDOP-jbgd7myn - 1 + 1.0 OutParameter fr.insee j6p2lwuj-QOP-jbgd7myn - 1 + 1.0 OutParameter @@ -3732,13 +3732,13 @@ fr.insee j6p2lwuj-RDOP-jbgdnxkt - 1 + 1.0 OutParameter fr.insee j6p2lwuj-QOP-jbgdnxkt - 1 + 1.0 OutParameter @@ -3746,13 +3746,13 @@ fr.insee j6p2lwuj-RDOP-jbgd3ef5 - 1 + 1.0 OutParameter fr.insee j6p2lwuj-QOP-jbgd3ef5 - 1 + 1.0 OutParameter @@ -3760,13 +3760,13 @@ fr.insee j6p2lwuj-RDOP-jbgd8p1v - 1 + 1.0 OutParameter fr.insee j6p2lwuj-QOP-jbgd8p1v - 1 + 1.0 OutParameter @@ -3774,13 +3774,13 @@ fr.insee j6p2lwuj-RDOP-jbgdgm0c - 1 + 1.0 OutParameter fr.insee j6p2lwuj-QOP-jbgdgm0c - 1 + 1.0 OutParameter @@ -3788,13 +3788,13 @@ fr.insee j6p2lwuj-RDOP-jbgdcppc - 1 + 1.0 OutParameter fr.insee j6p2lwuj-QOP-jbgdcppc - 1 + 1.0 OutParameter @@ -3802,13 +3802,13 @@ fr.insee j6p2lwuj-RDOP-jbgd4cm6 - 1 + 1.0 OutParameter fr.insee j6p2lwuj-QOP-jbgd4cm6 - 1 + 1.0 OutParameter @@ -3816,13 +3816,13 @@ fr.insee j6p2lwuj-RDOP-jbgdd2lo - 1 + 1.0 OutParameter fr.insee j6p2lwuj-QOP-jbgdd2lo - 1 + 1.0 OutParameter @@ -3830,13 +3830,13 @@ fr.insee j6p2lwuj-RDOP-jbgdo0ay - 1 + 1.0 OutParameter fr.insee j6p2lwuj-QOP-jbgdo0ay - 1 + 1.0 OutParameter @@ -3844,13 +3844,13 @@ fr.insee j6p2lwuj-RDOP-jbgd4r2a - 1 + 1.0 OutParameter fr.insee j6p2lwuj-QOP-jbgd4r2a - 1 + 1.0 OutParameter @@ -3858,13 +3858,13 @@ fr.insee j6p2lwuj-RDOP-jbgdkfpq - 1 + 1.0 OutParameter fr.insee j6p2lwuj-QOP-jbgdkfpq - 1 + 1.0 OutParameter @@ -3872,13 +3872,13 @@ fr.insee j6p2lwuj-RDOP-jbgd7u52 - 1 + 1.0 OutParameter fr.insee j6p2lwuj-QOP-jbgd7u52 - 1 + 1.0 OutParameter @@ -3886,13 +3886,13 @@ fr.insee j6p2lwuj-RDOP-jbgdgfwl - 1 + 1.0 OutParameter fr.insee j6p2lwuj-QOP-jbgdgfwl - 1 + 1.0 OutParameter @@ -3900,13 +3900,13 @@ fr.insee j6p2lwuj-RDOP-jbgd9cff - 1 + 1.0 OutParameter fr.insee j6p2lwuj-QOP-jbgd9cff - 1 + 1.0 OutParameter @@ -3914,13 +3914,13 @@ fr.insee j6p2lwuj-RDOP-jbgddwsp - 1 + 1.0 OutParameter fr.insee j6p2lwuj-QOP-jbgddwsp - 1 + 1.0 OutParameter @@ -3928,13 +3928,13 @@ fr.insee j6p2lwuj-RDOP-jbgdncn8 - 1 + 1.0 OutParameter fr.insee j6p2lwuj-QOP-jbgdncn8 - 1 + 1.0 OutParameter @@ -3942,13 +3942,13 @@ fr.insee j6p2lwuj-RDOP-jbgdnz6b - 1 + 1.0 OutParameter fr.insee j6p2lwuj-QOP-jbgdnz6b - 1 + 1.0 OutParameter @@ -3956,13 +3956,13 @@ fr.insee j6p2lwuj-RDOP-jbgdiva0 - 1 + 1.0 OutParameter fr.insee j6p2lwuj-QOP-jbgdiva0 - 1 + 1.0 OutParameter @@ -3970,13 +3970,13 @@ fr.insee j6p2lwuj-RDOP-jbgd7dqf - 1 + 1.0 OutParameter fr.insee j6p2lwuj-QOP-jbgd7dqf - 1 + 1.0 OutParameter @@ -3984,13 +3984,13 @@ fr.insee j6p2lwuj-RDOP-jbgdnous - 1 + 1.0 OutParameter fr.insee j6p2lwuj-QOP-jbgdnous - 1 + 1.0 OutParameter @@ -3998,13 +3998,13 @@ fr.insee j6p2lwuj-RDOP-jbgdkfcz - 1 + 1.0 OutParameter fr.insee j6p2lwuj-QOP-jbgdkfcz - 1 + 1.0 OutParameter @@ -4019,7 +4019,7 @@ fr.insee j6p2kivg - 1 + 1.0 CodeList @@ -4029,7 +4029,7 @@ fr.insee jbdye1wa - 1 + 1.0 CodeList @@ -4040,14 +4040,14 @@ fr.insee j6p2lwuj-RDOP-jbgd92mb - 1 + 1.0 fr.insee INSEE-COMMUN-CL-Booleen-1 - 1 + 1.0 Code @@ -4069,14 +4069,14 @@ fr.insee j6p2lwuj-RDOP-jbgdgsat - 1 + 1.0 fr.insee INSEE-COMMUN-CL-Booleen-1 - 1 + 1.0 Code @@ -4098,14 +4098,14 @@ fr.insee j6p2lwuj-RDOP-jbgdaxk2 - 1 + 1.0 fr.insee INSEE-COMMUN-CL-Booleen-1 - 1 + 1.0 Code @@ -4127,14 +4127,14 @@ fr.insee j6p2lwuj-RDOP-jbgd7myn - 1 + 1.0 fr.insee INSEE-COMMUN-CL-Booleen-1 - 1 + 1.0 Code @@ -4156,14 +4156,14 @@ fr.insee j6p2lwuj-RDOP-jbgdnxkt - 1 + 1.0 fr.insee INSEE-COMMUN-CL-Booleen-1 - 1 + 1.0 Code @@ -4185,14 +4185,14 @@ fr.insee j6p2lwuj-RDOP-jbgd3ef5 - 1 + 1.0 fr.insee INSEE-COMMUN-CL-Booleen-1 - 1 + 1.0 Code @@ -4214,14 +4214,14 @@ fr.insee j6p2lwuj-RDOP-jbgd8p1v - 1 + 1.0 fr.insee INSEE-COMMUN-CL-Booleen-1 - 1 + 1.0 Code @@ -4243,14 +4243,14 @@ fr.insee j6p2lwuj-RDOP-jbgdgm0c - 1 + 1.0 fr.insee INSEE-COMMUN-CL-Booleen-1 - 1 + 1.0 Code @@ -4272,14 +4272,14 @@ fr.insee j6p2lwuj-RDOP-jbgdcppc - 1 + 1.0 fr.insee INSEE-COMMUN-CL-Booleen-1 - 1 + 1.0 Code @@ -4301,14 +4301,14 @@ fr.insee j6p2lwuj-RDOP-jbgd4cm6 - 1 + 1.0 fr.insee INSEE-COMMUN-CL-Booleen-1 - 1 + 1.0 Code @@ -4330,14 +4330,14 @@ fr.insee j6p2lwuj-RDOP-jbgdd2lo - 1 + 1.0 fr.insee INSEE-COMMUN-CL-Booleen-1 - 1 + 1.0 Code @@ -4359,14 +4359,14 @@ fr.insee j6p2lwuj-RDOP-jbgdo0ay - 1 + 1.0 fr.insee INSEE-COMMUN-CL-Booleen-1 - 1 + 1.0 Code @@ -4388,14 +4388,14 @@ fr.insee j6p2lwuj-RDOP-jbgd4r2a - 1 + 1.0 fr.insee INSEE-COMMUN-CL-Booleen-1 - 1 + 1.0 Code @@ -4417,14 +4417,14 @@ fr.insee j6p2lwuj-RDOP-jbgdkfpq - 1 + 1.0 fr.insee INSEE-COMMUN-CL-Booleen-1 - 1 + 1.0 Code @@ -4446,14 +4446,14 @@ fr.insee j6p2lwuj-RDOP-jbgd7u52 - 1 + 1.0 fr.insee INSEE-COMMUN-CL-Booleen-1 - 1 + 1.0 Code @@ -4475,14 +4475,14 @@ fr.insee j6p2lwuj-RDOP-jbgdgfwl - 1 + 1.0 fr.insee INSEE-COMMUN-CL-Booleen-1 - 1 + 1.0 Code @@ -4504,14 +4504,14 @@ fr.insee j6p2lwuj-RDOP-jbgd9cff - 1 + 1.0 fr.insee INSEE-COMMUN-CL-Booleen-1 - 1 + 1.0 Code @@ -4533,14 +4533,14 @@ fr.insee j6p2lwuj-RDOP-jbgddwsp - 1 + 1.0 fr.insee INSEE-COMMUN-CL-Booleen-1 - 1 + 1.0 Code @@ -4562,14 +4562,14 @@ fr.insee j6p2lwuj-RDOP-jbgdncn8 - 1 + 1.0 fr.insee INSEE-COMMUN-CL-Booleen-1 - 1 + 1.0 Code @@ -4591,14 +4591,14 @@ fr.insee j6p2lwuj-RDOP-jbgdnz6b - 1 + 1.0 fr.insee INSEE-COMMUN-CL-Booleen-1 - 1 + 1.0 Code @@ -4620,14 +4620,14 @@ fr.insee j6p2lwuj-RDOP-jbgdiva0 - 1 + 1.0 fr.insee INSEE-COMMUN-CL-Booleen-1 - 1 + 1.0 Code @@ -4649,14 +4649,14 @@ fr.insee j6p2lwuj-RDOP-jbgd7dqf - 1 + 1.0 fr.insee INSEE-COMMUN-CL-Booleen-1 - 1 + 1.0 Code @@ -4678,14 +4678,14 @@ fr.insee j6p2lwuj-RDOP-jbgdnous - 1 + 1.0 fr.insee INSEE-COMMUN-CL-Booleen-1 - 1 + 1.0 Code @@ -4707,14 +4707,14 @@ fr.insee j6p2lwuj-RDOP-jbgdkfcz - 1 + 1.0 fr.insee INSEE-COMMUN-CL-Booleen-1 - 1 + 1.0 Code @@ -4735,21 +4735,21 @@ fr.insee d10 - 1 + 1.0 Instruction fr.insee j6qg8rc6 - 1 + 1.0 FAVOURITE_CHARACTERS fr.insee j6qg8rc6-QOP-jbgdl5jb - 1 + 1.0 FAVOURITE_CHARACTERS11 @@ -4757,7 +4757,7 @@ fr.insee j6qg8rc6-QOP-jbgd8lwo - 1 + 1.0 FAVOURITE_CHARACTERS21 @@ -4765,7 +4765,7 @@ fr.insee j6qg8rc6-QOP-jbgdbfag - 1 + 1.0 FAVOURITE_CHARACTERS31 @@ -4773,7 +4773,7 @@ fr.insee j6qg8rc6-QOP-jbgdlgja - 1 + 1.0 FAVOURITE_CHARACTERS41 @@ -4781,7 +4781,7 @@ fr.insee j6qg8rc6-QOP-jbgd745y - 1 + 1.0 FAVOURITE_CHARACTERS51 @@ -4789,7 +4789,7 @@ fr.insee j6qg8rc6-QOP-jbgdjkts - 1 + 1.0 FAVOURITE_CHARACTERS61 @@ -4797,7 +4797,7 @@ fr.insee j6qg8rc6-QOP-jbgdcax7 - 1 + 1.0 FAVOURITE_CHARACTERS71 @@ -4805,7 +4805,7 @@ fr.insee j6qg8rc6-QOP-jbgdjye1 - 1 + 1.0 FAVOURITE_CHARACTERS81 @@ -4813,7 +4813,7 @@ fr.insee j6qg8rc6-QOP-jbgd5jet - 1 + 1.0 FAVOURITE_CHARACTERS91 @@ -4821,7 +4821,7 @@ fr.insee j6qg8rc6-QOP-jbgdjw90 - 1 + 1.0 FAVOURITE_CHARACTERS101 @@ -4829,7 +4829,7 @@ fr.insee j6qg8rc6-QOP-jbgdfndq - 1 + 1.0 FAVOURITE_CHARACTERS12 @@ -4837,7 +4837,7 @@ fr.insee j6qg8rc6-QOP-jbgd7osi - 1 + 1.0 FAVOURITE_CHARACTERS22 @@ -4845,7 +4845,7 @@ fr.insee j6qg8rc6-QOP-jbgd7bnw - 1 + 1.0 FAVOURITE_CHARACTERS32 @@ -4853,7 +4853,7 @@ fr.insee j6qg8rc6-QOP-jbgd9k71 - 1 + 1.0 FAVOURITE_CHARACTERS42 @@ -4861,7 +4861,7 @@ fr.insee j6qg8rc6-QOP-jbgdimks - 1 + 1.0 FAVOURITE_CHARACTERS52 @@ -4869,7 +4869,7 @@ fr.insee j6qg8rc6-QOP-jbgdjquz - 1 + 1.0 FAVOURITE_CHARACTERS62 @@ -4877,7 +4877,7 @@ fr.insee j6qg8rc6-QOP-jbgdd2w3 - 1 + 1.0 FAVOURITE_CHARACTERS72 @@ -4885,7 +4885,7 @@ fr.insee j6qg8rc6-QOP-jbgdkosc - 1 + 1.0 FAVOURITE_CHARACTERS82 @@ -4893,7 +4893,7 @@ fr.insee j6qg8rc6-QOP-jbgdk0x4 - 1 + 1.0 FAVOURITE_CHARACTERS92 @@ -4901,7 +4901,7 @@ fr.insee j6qg8rc6-QOP-jbgd2wgf - 1 + 1.0 FAVOURITE_CHARACTERS102 @@ -4910,13 +4910,13 @@ fr.insee j6qg8rc6-RDOP-jbgdl5jb - 1 + 1.0 OutParameter fr.insee j6qg8rc6-QOP-jbgdl5jb - 1 + 1.0 OutParameter @@ -4924,13 +4924,13 @@ fr.insee j6qg8rc6-RDOP-jbgd8lwo - 1 + 1.0 OutParameter fr.insee j6qg8rc6-QOP-jbgd8lwo - 1 + 1.0 OutParameter @@ -4938,13 +4938,13 @@ fr.insee j6qg8rc6-RDOP-jbgdbfag - 1 + 1.0 OutParameter fr.insee j6qg8rc6-QOP-jbgdbfag - 1 + 1.0 OutParameter @@ -4952,13 +4952,13 @@ fr.insee j6qg8rc6-RDOP-jbgdlgja - 1 + 1.0 OutParameter fr.insee j6qg8rc6-QOP-jbgdlgja - 1 + 1.0 OutParameter @@ -4966,13 +4966,13 @@ fr.insee j6qg8rc6-RDOP-jbgd745y - 1 + 1.0 OutParameter fr.insee j6qg8rc6-QOP-jbgd745y - 1 + 1.0 OutParameter @@ -4980,13 +4980,13 @@ fr.insee j6qg8rc6-RDOP-jbgdjkts - 1 + 1.0 OutParameter fr.insee j6qg8rc6-QOP-jbgdjkts - 1 + 1.0 OutParameter @@ -4994,13 +4994,13 @@ fr.insee j6qg8rc6-RDOP-jbgdcax7 - 1 + 1.0 OutParameter fr.insee j6qg8rc6-QOP-jbgdcax7 - 1 + 1.0 OutParameter @@ -5008,13 +5008,13 @@ fr.insee j6qg8rc6-RDOP-jbgdjye1 - 1 + 1.0 OutParameter fr.insee j6qg8rc6-QOP-jbgdjye1 - 1 + 1.0 OutParameter @@ -5022,13 +5022,13 @@ fr.insee j6qg8rc6-RDOP-jbgd5jet - 1 + 1.0 OutParameter fr.insee j6qg8rc6-QOP-jbgd5jet - 1 + 1.0 OutParameter @@ -5036,13 +5036,13 @@ fr.insee j6qg8rc6-RDOP-jbgdjw90 - 1 + 1.0 OutParameter fr.insee j6qg8rc6-QOP-jbgdjw90 - 1 + 1.0 OutParameter @@ -5050,13 +5050,13 @@ fr.insee j6qg8rc6-RDOP-jbgdfndq - 1 + 1.0 OutParameter fr.insee j6qg8rc6-QOP-jbgdfndq - 1 + 1.0 OutParameter @@ -5064,13 +5064,13 @@ fr.insee j6qg8rc6-RDOP-jbgd7osi - 1 + 1.0 OutParameter fr.insee j6qg8rc6-QOP-jbgd7osi - 1 + 1.0 OutParameter @@ -5078,13 +5078,13 @@ fr.insee j6qg8rc6-RDOP-jbgd7bnw - 1 + 1.0 OutParameter fr.insee j6qg8rc6-QOP-jbgd7bnw - 1 + 1.0 OutParameter @@ -5092,13 +5092,13 @@ fr.insee j6qg8rc6-RDOP-jbgd9k71 - 1 + 1.0 OutParameter fr.insee j6qg8rc6-QOP-jbgd9k71 - 1 + 1.0 OutParameter @@ -5106,13 +5106,13 @@ fr.insee j6qg8rc6-RDOP-jbgdimks - 1 + 1.0 OutParameter fr.insee j6qg8rc6-QOP-jbgdimks - 1 + 1.0 OutParameter @@ -5120,13 +5120,13 @@ fr.insee j6qg8rc6-RDOP-jbgdjquz - 1 + 1.0 OutParameter fr.insee j6qg8rc6-QOP-jbgdjquz - 1 + 1.0 OutParameter @@ -5134,13 +5134,13 @@ fr.insee j6qg8rc6-RDOP-jbgdd2w3 - 1 + 1.0 OutParameter fr.insee j6qg8rc6-QOP-jbgdd2w3 - 1 + 1.0 OutParameter @@ -5148,13 +5148,13 @@ fr.insee j6qg8rc6-RDOP-jbgdkosc - 1 + 1.0 OutParameter fr.insee j6qg8rc6-QOP-jbgdkosc - 1 + 1.0 OutParameter @@ -5162,13 +5162,13 @@ fr.insee j6qg8rc6-RDOP-jbgdk0x4 - 1 + 1.0 OutParameter fr.insee j6qg8rc6-QOP-jbgdk0x4 - 1 + 1.0 OutParameter @@ -5176,13 +5176,13 @@ fr.insee j6qg8rc6-RDOP-jbgd2wgf - 1 + 1.0 OutParameter fr.insee j6qg8rc6-QOP-jbgd2wgf - 1 + 1.0 OutParameter @@ -5199,7 +5199,7 @@ fr.insee j6qg8rc6-secondDimension-fakeCL-1 - 1 + 1.0 CodeList @@ -5210,7 +5210,7 @@ fr.insee j6qg8rc6-RDOP-jbgdl5jb - 1 + 1.0 @@ -5226,7 +5226,7 @@ fr.insee j6qg8rc6-RDOP-jbgd8lwo - 1 + 1.0 @@ -5242,7 +5242,7 @@ fr.insee j6qg8rc6-RDOP-jbgdbfag - 1 + 1.0 @@ -5258,7 +5258,7 @@ fr.insee j6qg8rc6-RDOP-jbgdlgja - 1 + 1.0 @@ -5274,7 +5274,7 @@ fr.insee j6qg8rc6-RDOP-jbgd745y - 1 + 1.0 @@ -5290,7 +5290,7 @@ fr.insee j6qg8rc6-RDOP-jbgdjkts - 1 + 1.0 @@ -5306,7 +5306,7 @@ fr.insee j6qg8rc6-RDOP-jbgdcax7 - 1 + 1.0 @@ -5322,7 +5322,7 @@ fr.insee j6qg8rc6-RDOP-jbgdjye1 - 1 + 1.0 @@ -5338,7 +5338,7 @@ fr.insee j6qg8rc6-RDOP-jbgd5jet - 1 + 1.0 @@ -5354,7 +5354,7 @@ fr.insee j6qg8rc6-RDOP-jbgdjw90 - 1 + 1.0 @@ -5375,7 +5375,7 @@ fr.insee j6qg8rc6-RDOP-jbgdfndq - 1 + 1.0 @@ -5395,7 +5395,7 @@ fr.insee j6qg8rc6-RDOP-jbgd7osi - 1 + 1.0 @@ -5415,7 +5415,7 @@ fr.insee j6qg8rc6-RDOP-jbgd7bnw - 1 + 1.0 @@ -5435,7 +5435,7 @@ fr.insee j6qg8rc6-RDOP-jbgd9k71 - 1 + 1.0 @@ -5455,7 +5455,7 @@ fr.insee j6qg8rc6-RDOP-jbgdimks - 1 + 1.0 @@ -5475,7 +5475,7 @@ fr.insee j6qg8rc6-RDOP-jbgdjquz - 1 + 1.0 @@ -5495,7 +5495,7 @@ fr.insee j6qg8rc6-RDOP-jbgdd2w3 - 1 + 1.0 @@ -5515,7 +5515,7 @@ fr.insee j6qg8rc6-RDOP-jbgdkosc - 1 + 1.0 @@ -5535,7 +5535,7 @@ fr.insee j6qg8rc6-RDOP-jbgdk0x4 - 1 + 1.0 @@ -5555,7 +5555,7 @@ fr.insee j6qg8rc6-RDOP-jbgd2wgf - 1 + 1.0 @@ -5571,14 +5571,14 @@ fr.insee CategoryScheme-j334iumu - 1 + 1.0 TOWN fr.insee CA-j334iumu-1 - 1 + 1.0 Springfield @@ -5586,7 +5586,7 @@ fr.insee CA-j334iumu-2 - 1 + 1.0 Shelbyville @@ -5594,7 +5594,7 @@ fr.insee CA-j334iumu-3 - 1 + 1.0 Seinfeld @@ -5603,14 +5603,14 @@ fr.insee CategoryScheme-j6qdqoen - 1 + 1.0 MAYOR fr.insee CA-j6qdqoen-1 - 1 + 1.0 Constance Harm @@ -5618,7 +5618,7 @@ fr.insee CA-j6qdqoen-2 - 1 + 1.0 Timothy Lovejoy @@ -5626,7 +5626,7 @@ fr.insee CA-j6qdqoen-3 - 1 + 1.0 Joe Quimby @@ -5634,7 +5634,7 @@ fr.insee CA-j6qdqoen-4 - 1 + 1.0 Poochie @@ -5643,14 +5643,14 @@ fr.insee CategoryScheme-j4nwo00f - 1 + 1.0 State fr.insee CA-j4nwo00f-1 - 1 + 1.0 Washington @@ -5658,7 +5658,7 @@ fr.insee CA-j4nwo00f-2 - 1 + 1.0 Kentucky @@ -5666,7 +5666,7 @@ fr.insee CA-j4nwo00f-3 - 1 + 1.0 Ohio @@ -5674,7 +5674,7 @@ fr.insee CA-j4nwo00f-4 - 1 + 1.0 Maine @@ -5682,7 +5682,7 @@ fr.insee CA-j4nwo00f-5 - 1 + 1.0 North Dakota @@ -5690,7 +5690,7 @@ fr.insee CA-j4nwo00f-6 - 1 + 1.0 Florida @@ -5698,7 +5698,7 @@ fr.insee CA-j4nwo00f-7 - 1 + 1.0 North Takoma @@ -5706,7 +5706,7 @@ fr.insee CA-j4nwo00f-8 - 1 + 1.0 California @@ -5714,7 +5714,7 @@ fr.insee CA-j4nwo00f-9 - 1 + 1.0 Texas @@ -5722,7 +5722,7 @@ fr.insee CA-j4nwo00f-10 - 1 + 1.0 Massachusetts @@ -5730,7 +5730,7 @@ fr.insee CA-j4nwo00f-11 - 1 + 1.0 Nevada @@ -5738,7 +5738,7 @@ fr.insee CA-j4nwo00f-12 - 1 + 1.0 Illinois @@ -5746,7 +5746,7 @@ fr.insee CA-j4nwo00f-13 - 1 + 1.0 Not in any state, you fool! @@ -5755,14 +5755,14 @@ fr.insee CategoryScheme-j335cu3c - 1 + 1.0 ANIMALS fr.insee CA-j335cu3c-1 - 1 + 1.0 Santa's Little Helper @@ -5770,7 +5770,7 @@ fr.insee CA-j335cu3c-2 - 1 + 1.0 Snowball I @@ -5778,7 +5778,7 @@ fr.insee CA-j335cu3c-3 - 1 + 1.0 Coltrane @@ -5786,7 +5786,7 @@ fr.insee CA-j335cu3c-4 - 1 + 1.0 Mojo the Helper Monkey @@ -5795,14 +5795,14 @@ fr.insee CategoryScheme-j6p2mvca - 1 + 1.0 Flavours fr.insee CA-j6p2mvca-1 - 1 + 1.0 Vanilla @@ -5810,7 +5810,7 @@ fr.insee CA-j6p2mvca-2 - 1 + 1.0 Strawberry @@ -5818,7 +5818,7 @@ fr.insee CA-j6p2mvca-3 - 1 + 1.0 Apple @@ -5826,7 +5826,7 @@ fr.insee CA-j6p2mvca-4 - 1 + 1.0 Bacon @@ -5835,14 +5835,14 @@ fr.insee CategoryScheme-jbdxh138 - 1 + 1.0 YESNO fr.insee CA-jbdxh138-1 - 1 + 1.0 Yes @@ -5850,7 +5850,7 @@ fr.insee CA-jbdxh138-2 - 1 + 1.0 No @@ -5859,14 +5859,14 @@ fr.insee CategoryScheme-j6qeytgc - 1 + 1.0 NUCLEAR_CHARACTERS fr.insee CA-j6qeytgc-1 - 1 + 1.0 Charles Montgomery Burns @@ -5874,7 +5874,7 @@ fr.insee CA-j6qeytgc-2 - 1 + 1.0 Carl Carlson @@ -5882,7 +5882,7 @@ fr.insee CA-j6qeytgc-3 - 1 + 1.0 Otto Mann @@ -5890,7 +5890,7 @@ fr.insee CA-j6qeytgc-4 - 1 + 1.0 Carl Carlson @@ -5899,14 +5899,14 @@ fr.insee CategoryScheme-j6z087mq - 1 + 1.0 BIRTH_CHARACTER fr.insee CA-j6z087mq-1 - 1 + 1.0 Selma Bouvier @@ -5914,7 +5914,7 @@ fr.insee CA-j6z087mq-2 - 1 + 1.0 Kent Brockman @@ -5922,7 +5922,7 @@ fr.insee CA-j6z087mq-3 - 1 + 1.0 Milhouse Van Houten @@ -5930,7 +5930,7 @@ fr.insee CA-j6z087mq-4 - 1 + 1.0 Nelson Muntz @@ -5938,7 +5938,7 @@ fr.insee CA-j6z087mq-5 - 1 + 1.0 Crazy Cat Lady @@ -5947,14 +5947,14 @@ fr.insee CategoryScheme-jbdxricm - 1 + 1.0 CITY_BIRTH fr.insee CA-jbdxricm-1 - 1 + 1.0 Albuquerque @@ -5962,7 +5962,7 @@ fr.insee CA-jbdxricm-2 - 1 + 1.0 Springfield @@ -5970,7 +5970,7 @@ fr.insee CA-jbdxricm-3 - 1 + 1.0 Portland @@ -5978,7 +5978,7 @@ fr.insee CA-jbdxricm-4 - 1 + 1.0 Shelbyville @@ -5986,7 +5986,7 @@ fr.insee CA-jbdxricm-5 - 1 + 1.0 Dagstuhl @@ -5995,14 +5995,14 @@ fr.insee CategoryScheme-j4nwh16i - 1 + 1.0 Products fr.insee CA-j4nwh16i-1 - 1 + 1.0 Frozen products @@ -6010,7 +6010,7 @@ fr.insee CA-j4nwh16i-2 - 1 + 1.0 Ice creams @@ -6018,7 +6018,7 @@ fr.insee CA-j4nwh16i-3 - 1 + 1.0 Jasper Beardly @@ -6026,7 +6026,7 @@ fr.insee CA-j4nwh16i-4 - 1 + 1.0 Meat @@ -6034,7 +6034,7 @@ fr.insee CA-j4nwh16i-5 - 1 + 1.0 Bacon @@ -6042,7 +6042,7 @@ fr.insee CA-j4nwh16i-6 - 1 + 1.0 Pork chop @@ -6050,7 +6050,7 @@ fr.insee CA-j4nwh16i-7 - 1 + 1.0 Chicken @@ -6058,7 +6058,7 @@ fr.insee CA-j4nwh16i-8 - 1 + 1.0 Compote @@ -6066,7 +6066,7 @@ fr.insee CA-j4nwh16i-9 - 1 + 1.0 Powersauce @@ -6074,7 +6074,7 @@ fr.insee CA-j4nwh16i-10 - 1 + 1.0 Other @@ -6083,14 +6083,14 @@ fr.insee CategoryScheme-j77dav9b - 1 + 1.0 Clownings fr.insee CA-j77dav9b-1 - 1 + 1.0 Break the windows of the whole city @@ -6098,7 +6098,7 @@ fr.insee CA-j77dav9b-2 - 1 + 1.0 Loose the violin of his daughter playing poker @@ -6106,7 +6106,7 @@ fr.insee CA-j77dav9b-3 - 1 + 1.0 Kill Mr Burns @@ -6114,7 +6114,7 @@ fr.insee CA-j77dav9b-4 - 1 + 1.0 Leaving a mechanical object to control the nuclear power plant @@ -6123,14 +6123,14 @@ fr.insee CategoryScheme-jbdyh6b5 - 1 + 1.0 Clowning_Characters fr.insee CA-jbdyh6b5-1 - 1 + 1.0 Jay @@ -6138,7 +6138,7 @@ fr.insee CA-jbdyh6b5-2 - 1 + 1.0 Bart @@ -6146,7 +6146,7 @@ fr.insee CA-jbdyh6b5-3 - 1 + 1.0 Krusty the clown @@ -6154,7 +6154,7 @@ fr.insee CA-jbdyh6b5-4 - 1 + 1.0 Maggie @@ -6163,14 +6163,14 @@ fr.insee CategoryScheme-j6p2kivg - 1 + 1.0 Means of transport fr.insee CA-j6p2kivg-1 - 1 + 1.0 Car @@ -6178,7 +6178,7 @@ fr.insee CA-j6p2kivg-2 - 1 + 1.0 Bike @@ -6186,7 +6186,7 @@ fr.insee CA-j6p2kivg-3 - 1 + 1.0 Skateboard @@ -6194,7 +6194,7 @@ fr.insee CA-j6p2kivg-4 - 1 + 1.0 Plane @@ -6203,14 +6203,14 @@ fr.insee CategoryScheme-jbdye1wa - 1 + 1.0 Country fr.insee CA-jbdye1wa-1 - 1 + 1.0 Brazil @@ -6218,7 +6218,7 @@ fr.insee CA-jbdye1wa-2 - 1 + 1.0 Canada @@ -6226,7 +6226,7 @@ fr.insee CA-jbdye1wa-3 - 1 + 1.0 Japan @@ -6234,7 +6234,7 @@ fr.insee CA-jbdye1wa-4 - 1 + 1.0 France @@ -6242,7 +6242,7 @@ fr.insee CA-jbdye1wa-5 - 1 + 1.0 Other country @@ -6250,7 +6250,7 @@ fr.insee CA-jbdye1wa-6 - 1 + 1.0 Other planet @@ -6259,14 +6259,14 @@ fr.insee CategoryScheme-j4nwc63q-secondDimension-fakeCL-1 - 1 + 1.0 FAKE-CODELIST-j4nwc63q-secondDimension-fakeCL-1 fr.insee CA-j4nwc63q-secondDimension-fakeCL-1-1 - 1 + 1.0 Percentage @@ -6275,14 +6275,14 @@ fr.insee CategoryScheme-j4nw0rr6-secondDimension-fakeCL-1 - 1 + 1.0 FAKE-CODELIST-j4nw0rr6-secondDimension-fakeCL-1 fr.insee CA-j4nw0rr6-secondDimension-fakeCL-1-1 - 1 + 1.0 Clowning @@ -6290,7 +6290,7 @@ fr.insee CA-j4nw0rr6-secondDimension-fakeCL-1-2 - 1 + 1.0 Remember? @@ -6299,14 +6299,14 @@ fr.insee CategoryScheme-j6qg8rc6-secondDimension-fakeCL-1 - 1 + 1.0 FAKE-CODELIST-j6qg8rc6-secondDimension-fakeCL-1 fr.insee CA-j6qg8rc6-secondDimension-fakeCL-1-1 - 1 + 1.0 Name @@ -6314,7 +6314,7 @@ fr.insee CA-j6qg8rc6-secondDimension-fakeCL-1-2 - 1 + 1.0 Age @@ -6323,14 +6323,14 @@ fr.insee CategoryScheme-i6vwi0 - 1 + 1.0 A définir fr.insee INSEE-COMMUN-CA-Booleen-1 - 1 + 1.0 @@ -6339,14 +6339,14 @@ fr.insee SIMPSONS-CLS - 1 + 1.0 SIMPSONS fr.insee j334iumu - 1 + 1.0 TOWN @@ -6357,11 +6357,11 @@ fr.insee j334iumu-1 - 1 + 1.0 fr.insee CA-j334iumu-1 - 1 + 1.0 Category 00001 @@ -6369,11 +6369,11 @@ fr.insee j334iumu-2 - 1 + 1.0 fr.insee CA-j334iumu-2 - 1 + 1.0 Category 00002 @@ -6381,11 +6381,11 @@ fr.insee j334iumu-3 - 1 + 1.0 fr.insee CA-j334iumu-3 - 1 + 1.0 Category 00003 @@ -6394,7 +6394,7 @@ fr.insee j6qdqoen - 1 + 1.0 MAYOR @@ -6405,11 +6405,11 @@ fr.insee j6qdqoen-1 - 1 + 1.0 fr.insee CA-j6qdqoen-1 - 1 + 1.0 Category 1 @@ -6417,11 +6417,11 @@ fr.insee j6qdqoen-2 - 1 + 1.0 fr.insee CA-j6qdqoen-2 - 1 + 1.0 Category 2 @@ -6429,11 +6429,11 @@ fr.insee j6qdqoen-3 - 1 + 1.0 fr.insee CA-j6qdqoen-3 - 1 + 1.0 Category 3 @@ -6441,11 +6441,11 @@ fr.insee j6qdqoen-4 - 1 + 1.0 fr.insee CA-j6qdqoen-4 - 1 + 1.0 Category 4 @@ -6454,7 +6454,7 @@ fr.insee j4nwo00f - 1 + 1.0 State @@ -6465,11 +6465,11 @@ fr.insee j4nwo00f-1 - 1 + 1.0 fr.insee CA-j4nwo00f-1 - 1 + 1.0 Category 1 @@ -6477,11 +6477,11 @@ fr.insee j4nwo00f-2 - 1 + 1.0 fr.insee CA-j4nwo00f-2 - 1 + 1.0 Category 2 @@ -6489,11 +6489,11 @@ fr.insee j4nwo00f-3 - 1 + 1.0 fr.insee CA-j4nwo00f-3 - 1 + 1.0 Category 3 @@ -6501,11 +6501,11 @@ fr.insee j4nwo00f-4 - 1 + 1.0 fr.insee CA-j4nwo00f-4 - 1 + 1.0 Category 4 @@ -6513,11 +6513,11 @@ fr.insee j4nwo00f-5 - 1 + 1.0 fr.insee CA-j4nwo00f-5 - 1 + 1.0 Category 5 @@ -6525,11 +6525,11 @@ fr.insee j4nwo00f-6 - 1 + 1.0 fr.insee CA-j4nwo00f-6 - 1 + 1.0 Category 6 @@ -6537,11 +6537,11 @@ fr.insee j4nwo00f-7 - 1 + 1.0 fr.insee CA-j4nwo00f-7 - 1 + 1.0 Category 7 @@ -6549,11 +6549,11 @@ fr.insee j4nwo00f-8 - 1 + 1.0 fr.insee CA-j4nwo00f-8 - 1 + 1.0 Category 8 @@ -6561,11 +6561,11 @@ fr.insee j4nwo00f-9 - 1 + 1.0 fr.insee CA-j4nwo00f-9 - 1 + 1.0 Category 9 @@ -6573,11 +6573,11 @@ fr.insee j4nwo00f-10 - 1 + 1.0 fr.insee CA-j4nwo00f-10 - 1 + 1.0 Category 10 @@ -6585,11 +6585,11 @@ fr.insee j4nwo00f-11 - 1 + 1.0 fr.insee CA-j4nwo00f-11 - 1 + 1.0 Category 11 @@ -6597,11 +6597,11 @@ fr.insee j4nwo00f-12 - 1 + 1.0 fr.insee CA-j4nwo00f-12 - 1 + 1.0 Category 12 @@ -6609,11 +6609,11 @@ fr.insee j4nwo00f-13 - 1 + 1.0 fr.insee CA-j4nwo00f-13 - 1 + 1.0 Category 13 @@ -6622,7 +6622,7 @@ fr.insee j335cu3c - 1 + 1.0 ANIMALS @@ -6633,11 +6633,11 @@ fr.insee j335cu3c-1 - 1 + 1.0 fr.insee CA-j335cu3c-1 - 1 + 1.0 Category 1 @@ -6645,11 +6645,11 @@ fr.insee j335cu3c-2 - 1 + 1.0 fr.insee CA-j335cu3c-2 - 1 + 1.0 Category 2 @@ -6657,11 +6657,11 @@ fr.insee j335cu3c-3 - 1 + 1.0 fr.insee CA-j335cu3c-3 - 1 + 1.0 Category 3 @@ -6669,11 +6669,11 @@ fr.insee j335cu3c-4 - 1 + 1.0 fr.insee CA-j335cu3c-4 - 1 + 1.0 Category 4 @@ -6682,7 +6682,7 @@ fr.insee j6p2mvca - 1 + 1.0 Flavours @@ -6693,11 +6693,11 @@ fr.insee j6p2mvca-1 - 1 + 1.0 fr.insee CA-j6p2mvca-1 - 1 + 1.0 Category 1 @@ -6705,11 +6705,11 @@ fr.insee j6p2mvca-2 - 1 + 1.0 fr.insee CA-j6p2mvca-2 - 1 + 1.0 Category 2 @@ -6717,11 +6717,11 @@ fr.insee j6p2mvca-3 - 1 + 1.0 fr.insee CA-j6p2mvca-3 - 1 + 1.0 Category 3 @@ -6729,11 +6729,11 @@ fr.insee j6p2mvca-4 - 1 + 1.0 fr.insee CA-j6p2mvca-4 - 1 + 1.0 Category 4 @@ -6742,7 +6742,7 @@ fr.insee jbdxh138 - 1 + 1.0 YESNO @@ -6753,11 +6753,11 @@ fr.insee jbdxh138-1 - 1 + 1.0 fr.insee CA-jbdxh138-1 - 1 + 1.0 Category 1 @@ -6765,11 +6765,11 @@ fr.insee jbdxh138-2 - 1 + 1.0 fr.insee CA-jbdxh138-2 - 1 + 1.0 Category 0 @@ -6778,7 +6778,7 @@ fr.insee j6qeytgc - 1 + 1.0 NUCLEAR_CHARACTERS @@ -6789,11 +6789,11 @@ fr.insee j6qeytgc-1 - 1 + 1.0 fr.insee CA-j6qeytgc-1 - 1 + 1.0 Category 1 @@ -6801,11 +6801,11 @@ fr.insee j6qeytgc-2 - 1 + 1.0 fr.insee CA-j6qeytgc-2 - 1 + 1.0 Category 2 @@ -6813,11 +6813,11 @@ fr.insee j6qeytgc-3 - 1 + 1.0 fr.insee CA-j6qeytgc-3 - 1 + 1.0 Category 3 @@ -6825,11 +6825,11 @@ fr.insee j6qeytgc-4 - 1 + 1.0 fr.insee CA-j6qeytgc-4 - 1 + 1.0 Category 4 @@ -6838,7 +6838,7 @@ fr.insee j6z087mq - 1 + 1.0 BIRTH_CHARACTER @@ -6849,11 +6849,11 @@ fr.insee j6z087mq-1 - 1 + 1.0 fr.insee CA-j6z087mq-1 - 1 + 1.0 Category 1 @@ -6861,11 +6861,11 @@ fr.insee j6z087mq-2 - 1 + 1.0 fr.insee CA-j6z087mq-2 - 1 + 1.0 Category 2 @@ -6873,11 +6873,11 @@ fr.insee j6z087mq-3 - 1 + 1.0 fr.insee CA-j6z087mq-3 - 1 + 1.0 Category 3 @@ -6885,11 +6885,11 @@ fr.insee j6z087mq-4 - 1 + 1.0 fr.insee CA-j6z087mq-4 - 1 + 1.0 Category 4 @@ -6897,11 +6897,11 @@ fr.insee j6z087mq-5 - 1 + 1.0 fr.insee CA-j6z087mq-5 - 1 + 1.0 Category 5 @@ -6910,7 +6910,7 @@ fr.insee jbdxricm - 1 + 1.0 CITY_BIRTH @@ -6921,11 +6921,11 @@ fr.insee jbdxricm-1 - 1 + 1.0 fr.insee CA-jbdxricm-1 - 1 + 1.0 Category 1 @@ -6933,11 +6933,11 @@ fr.insee jbdxricm-2 - 1 + 1.0 fr.insee CA-jbdxricm-2 - 1 + 1.0 Category 2 @@ -6945,11 +6945,11 @@ fr.insee jbdxricm-3 - 1 + 1.0 fr.insee CA-jbdxricm-3 - 1 + 1.0 Category 3 @@ -6957,11 +6957,11 @@ fr.insee jbdxricm-4 - 1 + 1.0 fr.insee CA-jbdxricm-4 - 1 + 1.0 Category 4 @@ -6969,11 +6969,11 @@ fr.insee jbdxricm-5 - 1 + 1.0 fr.insee CA-jbdxricm-5 - 1 + 1.0 Category 5 @@ -6982,7 +6982,7 @@ fr.insee j4nwh16i - 1 + 1.0 Products @@ -6993,22 +6993,22 @@ fr.insee j4nwh16i-1 - 1 + 1.0 fr.insee CA-j4nwh16i-1 - 1 + 1.0 Category A fr.insee j4nwh16i-2 - 1 + 1.0 fr.insee CA-j4nwh16i-2 - 1 + 1.0 Category A1 @@ -7016,11 +7016,11 @@ fr.insee j4nwh16i-3 - 1 + 1.0 fr.insee CA-j4nwh16i-3 - 1 + 1.0 Category A2 @@ -7029,22 +7029,22 @@ fr.insee j4nwh16i-4 - 1 + 1.0 fr.insee CA-j4nwh16i-4 - 1 + 1.0 Category B fr.insee j4nwh16i-5 - 1 + 1.0 fr.insee CA-j4nwh16i-5 - 1 + 1.0 Category B1 @@ -7052,11 +7052,11 @@ fr.insee j4nwh16i-6 - 1 + 1.0 fr.insee CA-j4nwh16i-6 - 1 + 1.0 Category B2 @@ -7064,11 +7064,11 @@ fr.insee j4nwh16i-7 - 1 + 1.0 fr.insee CA-j4nwh16i-7 - 1 + 1.0 Category B3 @@ -7077,22 +7077,22 @@ fr.insee j4nwh16i-8 - 1 + 1.0 fr.insee CA-j4nwh16i-8 - 1 + 1.0 Category C fr.insee j4nwh16i-9 - 1 + 1.0 fr.insee CA-j4nwh16i-9 - 1 + 1.0 Category C1 @@ -7101,11 +7101,11 @@ fr.insee j4nwh16i-10 - 1 + 1.0 fr.insee CA-j4nwh16i-10 - 1 + 1.0 Category D @@ -7114,7 +7114,7 @@ fr.insee j77dav9b - 1 + 1.0 Clownings @@ -7125,11 +7125,11 @@ fr.insee j77dav9b-1 - 1 + 1.0 fr.insee CA-j77dav9b-1 - 1 + 1.0 Category 1 @@ -7137,11 +7137,11 @@ fr.insee j77dav9b-2 - 1 + 1.0 fr.insee CA-j77dav9b-2 - 1 + 1.0 Category 2 @@ -7149,11 +7149,11 @@ fr.insee j77dav9b-3 - 1 + 1.0 fr.insee CA-j77dav9b-3 - 1 + 1.0 Category 3 @@ -7161,11 +7161,11 @@ fr.insee j77dav9b-4 - 1 + 1.0 fr.insee CA-j77dav9b-4 - 1 + 1.0 Category 4 @@ -7174,7 +7174,7 @@ fr.insee jbdyh6b5 - 1 + 1.0 Clowning_Characters @@ -7185,11 +7185,11 @@ fr.insee jbdyh6b5-1 - 1 + 1.0 fr.insee CA-jbdyh6b5-1 - 1 + 1.0 Category 1 @@ -7197,11 +7197,11 @@ fr.insee jbdyh6b5-2 - 1 + 1.0 fr.insee CA-jbdyh6b5-2 - 1 + 1.0 Category 2 @@ -7209,11 +7209,11 @@ fr.insee jbdyh6b5-3 - 1 + 1.0 fr.insee CA-jbdyh6b5-3 - 1 + 1.0 Category 3 @@ -7221,11 +7221,11 @@ fr.insee jbdyh6b5-4 - 1 + 1.0 fr.insee CA-jbdyh6b5-4 - 1 + 1.0 Category 4 @@ -7234,7 +7234,7 @@ fr.insee j6p2kivg - 1 + 1.0 Means of transport @@ -7245,11 +7245,11 @@ fr.insee j6p2kivg-1 - 1 + 1.0 fr.insee CA-j6p2kivg-1 - 1 + 1.0 Category 1 @@ -7257,11 +7257,11 @@ fr.insee j6p2kivg-2 - 1 + 1.0 fr.insee CA-j6p2kivg-2 - 1 + 1.0 Category 2 @@ -7269,11 +7269,11 @@ fr.insee j6p2kivg-3 - 1 + 1.0 fr.insee CA-j6p2kivg-3 - 1 + 1.0 Category 3 @@ -7281,11 +7281,11 @@ fr.insee j6p2kivg-4 - 1 + 1.0 fr.insee CA-j6p2kivg-4 - 1 + 1.0 Category 4 @@ -7294,7 +7294,7 @@ fr.insee jbdye1wa - 1 + 1.0 Country @@ -7305,11 +7305,11 @@ fr.insee jbdye1wa-1 - 1 + 1.0 fr.insee CA-jbdye1wa-1 - 1 + 1.0 Category 1 @@ -7317,11 +7317,11 @@ fr.insee jbdye1wa-2 - 1 + 1.0 fr.insee CA-jbdye1wa-2 - 1 + 1.0 Category 2 @@ -7329,11 +7329,11 @@ fr.insee jbdye1wa-3 - 1 + 1.0 fr.insee CA-jbdye1wa-3 - 1 + 1.0 Category 3 @@ -7341,11 +7341,11 @@ fr.insee jbdye1wa-4 - 1 + 1.0 fr.insee CA-jbdye1wa-4 - 1 + 1.0 Category 4 @@ -7353,11 +7353,11 @@ fr.insee jbdye1wa-5 - 1 + 1.0 fr.insee CA-jbdye1wa-5 - 1 + 1.0 Category 5 @@ -7365,11 +7365,11 @@ fr.insee jbdye1wa-6 - 1 + 1.0 fr.insee CA-jbdye1wa-6 - 1 + 1.0 Category 6 @@ -7378,7 +7378,7 @@ fr.insee j4nwc63q-secondDimension-fakeCL-1 - 1 + 1.0 FAKE-CODELIST-j4nwc63q-secondDimension-fakeCL-1 @@ -7389,11 +7389,11 @@ fr.insee j4nwc63q-secondDimension-fakeCL-1-1 - 1 + 1.0 fr.insee CA-j4nwc63q-secondDimension-fakeCL-1-1 - 1 + 1.0 Category 1 @@ -7402,7 +7402,7 @@ fr.insee j4nw0rr6-secondDimension-fakeCL-1 - 1 + 1.0 FAKE-CODELIST-j4nw0rr6-secondDimension-fakeCL-1 @@ -7413,11 +7413,11 @@ fr.insee j4nw0rr6-secondDimension-fakeCL-1-1 - 1 + 1.0 fr.insee CA-j4nw0rr6-secondDimension-fakeCL-1-1 - 1 + 1.0 Category 1 @@ -7425,11 +7425,11 @@ fr.insee j4nw0rr6-secondDimension-fakeCL-1-2 - 1 + 1.0 fr.insee CA-j4nw0rr6-secondDimension-fakeCL-1-2 - 1 + 1.0 Category 2 @@ -7438,7 +7438,7 @@ fr.insee j6qg8rc6-secondDimension-fakeCL-1 - 1 + 1.0 FAKE-CODELIST-j6qg8rc6-secondDimension-fakeCL-1 @@ -7449,11 +7449,11 @@ fr.insee j6qg8rc6-secondDimension-fakeCL-1-1 - 1 + 1.0 fr.insee CA-j6qg8rc6-secondDimension-fakeCL-1-1 - 1 + 1.0 Category 1 @@ -7461,11 +7461,11 @@ fr.insee j6qg8rc6-secondDimension-fakeCL-1-2 - 1 + 1.0 fr.insee CA-j6qg8rc6-secondDimension-fakeCL-1-2 - 1 + 1.0 Category 2 @@ -7474,7 +7474,7 @@ fr.insee INSEE-COMMUN-CL-Booleen - 1 + 1.0 Booleen @@ -7485,11 +7485,11 @@ fr.insee INSEE-COMMUN-CL-Booleen-1 - 1 + 1.0 fr.insee INSEE-COMMUN-CA-Booleen-1 - 1 + 1.0 Category 1 @@ -7499,14 +7499,14 @@ fr.insee VariableScheme-i6vwi0 - 1 + 1.0 Variable Scheme for the survey fr.insee jbcggtca - 1 + 1.0 SUM_EXPENSES @@ -7516,25 +7516,25 @@ fr.insee jbcggtca-VROP - 1 + 1.0 fr.insee jbcggtca-GI - 1 + 1.0 GenerationInstruction fr.insee jbcggtca-GOP - 1 + 1.0 OutParameter fr.insee jbcggtca-VROP - 1 + 1.0 OutParameter @@ -7545,7 +7545,7 @@ fr.insee jbcggtex - 1 + 1.0 LAST_BROADCAST @@ -7556,7 +7556,7 @@ fr.insee jbcgfvir - 1 + 1.0 COMMENT @@ -7566,13 +7566,13 @@ fr.insee j6p3dkx6-QOP-jbgdhaht - 1 + 1.0 OutParameter fr.insee j6p3dkx6 - 1 + 1.0 QuestionItem @@ -7582,7 +7582,7 @@ fr.insee jbcgm0ip - 1 + 1.0 READY @@ -7592,13 +7592,13 @@ fr.insee j6p0np9q-QOP-jbgd3set - 1 + 1.0 OutParameter fr.insee j6p0np9q - 1 + 1.0 QuestionItem @@ -7608,7 +7608,7 @@ fr.insee INSEE-COMMUN-CL-Booleen-1 - 1 + 1.0 Code @@ -7619,7 +7619,7 @@ fr.insee jbcgf11f - 1 + 1.0 PRODUCER @@ -7629,13 +7629,13 @@ fr.insee j3343qhx-QOP-jbgd90cy - 1 + 1.0 OutParameter fr.insee j3343qhx - 1 + 1.0 QuestionItem @@ -7645,7 +7645,7 @@ fr.insee jbcgcy2x - 1 + 1.0 SEASON_NUMBER @@ -7655,13 +7655,13 @@ fr.insee j6q9h8tj-QOP-jbgdjy8h - 1 + 1.0 OutParameter fr.insee j6q9h8tj - 1 + 1.0 QuestionItem @@ -7677,7 +7677,7 @@ fr.insee jbcgbg33 - 1 + 1.0 DATEFIRST @@ -7687,20 +7687,20 @@ fr.insee j334cyqb-QOP-jbgdih2z - 1 + 1.0 OutParameter fr.insee j334cyqb - 1 + 1.0 QuestionItem fr.insee INSEE-COMMUN-MNR-DateTimedate-YYYY-MM-DD - 1 + 1.0 ManagedDateTimeRepresentation @@ -7708,7 +7708,7 @@ fr.insee jbcgieyw - 1 + 1.0 AUDIENCE_SHARE @@ -7718,13 +7718,13 @@ fr.insee j6z06z1e-QOP-jbgddnrd - 1 + 1.0 OutParameter fr.insee j6z06z1e - 1 + 1.0 QuestionItem @@ -7740,7 +7740,7 @@ fr.insee jbcgasbh - 1 + 1.0 CITY @@ -7750,13 +7750,13 @@ fr.insee j3343clt-QOP-jbgdjdkn - 1 + 1.0 OutParameter fr.insee j3343clt - 1 + 1.0 QuestionItem @@ -7764,7 +7764,7 @@ fr.insee j334iumu - 1 + 1.0 CodeList @@ -7773,7 +7773,7 @@ fr.insee jbcg9yr6 - 1 + 1.0 MAYOR @@ -7783,13 +7783,13 @@ fr.insee j6qdfhvw-QOP-jbgd8ghp - 1 + 1.0 OutParameter fr.insee j6qdfhvw - 1 + 1.0 QuestionItem @@ -7797,7 +7797,7 @@ fr.insee j6qdqoen - 1 + 1.0 CodeList @@ -7806,7 +7806,7 @@ fr.insee jbcgpija - 1 + 1.0 STATE @@ -7816,13 +7816,13 @@ fr.insee j4nw5cqz-QOP-jbgdkd7v - 1 + 1.0 OutParameter fr.insee j4nw5cqz - 1 + 1.0 QuestionItem @@ -7830,7 +7830,7 @@ fr.insee j4nwo00f - 1 + 1.0 CodeList @@ -7839,7 +7839,7 @@ fr.insee jbdxewlq - 1 + 1.0 PET1 @@ -7849,13 +7849,13 @@ fr.insee j334akov-QOP-jbgd8qmn - 1 + 1.0 OutParameter fr.insee j334akov - 1 + 1.0 QuestionGrid @@ -7865,7 +7865,7 @@ fr.insee INSEE-COMMUN-CL-Booleen-1 - 1 + 1.0 Code @@ -7876,7 +7876,7 @@ fr.insee jbdxjmst - 1 + 1.0 PET2 @@ -7886,13 +7886,13 @@ fr.insee j334akov-QOP-jbgd60vl - 1 + 1.0 OutParameter fr.insee j334akov - 1 + 1.0 QuestionGrid @@ -7902,7 +7902,7 @@ fr.insee INSEE-COMMUN-CL-Booleen-1 - 1 + 1.0 Code @@ -7913,7 +7913,7 @@ fr.insee jbdxjuay - 1 + 1.0 PET3 @@ -7923,13 +7923,13 @@ fr.insee j334akov-QOP-jbgda2jo - 1 + 1.0 OutParameter fr.insee j334akov - 1 + 1.0 QuestionGrid @@ -7939,7 +7939,7 @@ fr.insee INSEE-COMMUN-CL-Booleen-1 - 1 + 1.0 Code @@ -7950,7 +7950,7 @@ fr.insee jbdxniuw - 1 + 1.0 PET4 @@ -7960,13 +7960,13 @@ fr.insee j334akov-QOP-jbgdfssy - 1 + 1.0 OutParameter fr.insee j334akov - 1 + 1.0 QuestionGrid @@ -7976,7 +7976,7 @@ fr.insee INSEE-COMMUN-CL-Booleen-1 - 1 + 1.0 Code @@ -7987,7 +7987,7 @@ fr.insee jbdxtl1d - 1 + 1.0 ICE_FLAVOUR1 @@ -7997,13 +7997,13 @@ fr.insee j6p29i81-QOP-jbgdb3jx - 1 + 1.0 OutParameter fr.insee j6p29i81 - 1 + 1.0 QuestionGrid @@ -8011,7 +8011,7 @@ fr.insee jbdxh138 - 1 + 1.0 CodeList @@ -8020,7 +8020,7 @@ fr.insee jbdxvai9 - 1 + 1.0 ICE_FLAVOUR2 @@ -8030,13 +8030,13 @@ fr.insee j6p29i81-QOP-jbgdb61k - 1 + 1.0 OutParameter fr.insee j6p29i81 - 1 + 1.0 QuestionGrid @@ -8044,7 +8044,7 @@ fr.insee jbdxh138 - 1 + 1.0 CodeList @@ -8053,7 +8053,7 @@ fr.insee jbdxpltw - 1 + 1.0 ICE_FLAVOUR3 @@ -8063,13 +8063,13 @@ fr.insee j6p29i81-QOP-jbgdl3kc - 1 + 1.0 OutParameter fr.insee j6p29i81 - 1 + 1.0 QuestionGrid @@ -8077,7 +8077,7 @@ fr.insee jbdxh138 - 1 + 1.0 CodeList @@ -8086,7 +8086,7 @@ fr.insee jbdxzx2x - 1 + 1.0 ICE_FLAVOUR4 @@ -8096,13 +8096,13 @@ fr.insee j6p29i81-QOP-jbgdcobo - 1 + 1.0 OutParameter fr.insee j6p29i81 - 1 + 1.0 QuestionGrid @@ -8110,7 +8110,7 @@ fr.insee jbdxh138 - 1 + 1.0 CodeList @@ -8119,7 +8119,7 @@ fr.insee jbdy4nhp - 1 + 1.0 NUCLEAR_CHARACTER1 @@ -8129,13 +8129,13 @@ fr.insee j6qefnga-QOP-jbgd6p0k - 1 + 1.0 OutParameter fr.insee j6qefnga - 1 + 1.0 QuestionGrid @@ -8143,7 +8143,7 @@ fr.insee jbdxh138 - 1 + 1.0 CodeList @@ -8152,7 +8152,7 @@ fr.insee jbdxtanu - 1 + 1.0 NUCLEAR_CHARACTER2 @@ -8162,13 +8162,13 @@ fr.insee j6qefnga-QOP-jbgd9ato - 1 + 1.0 OutParameter fr.insee j6qefnga - 1 + 1.0 QuestionGrid @@ -8176,7 +8176,7 @@ fr.insee jbdxh138 - 1 + 1.0 CodeList @@ -8185,7 +8185,7 @@ fr.insee jbdy25if - 1 + 1.0 NUCLEAR_CHARACTER3 @@ -8195,13 +8195,13 @@ fr.insee j6qefnga-QOP-jbgd3e0p - 1 + 1.0 OutParameter fr.insee j6qefnga - 1 + 1.0 QuestionGrid @@ -8209,7 +8209,7 @@ fr.insee jbdxh138 - 1 + 1.0 CodeList @@ -8218,7 +8218,7 @@ fr.insee jbdxvta8 - 1 + 1.0 NUCLEAR_CHARACTER4 @@ -8228,13 +8228,13 @@ fr.insee j6qefnga-QOP-jbgdkxne - 1 + 1.0 OutParameter fr.insee j6qefnga - 1 + 1.0 QuestionGrid @@ -8242,7 +8242,7 @@ fr.insee jbdxh138 - 1 + 1.0 CodeList @@ -8251,7 +8251,7 @@ fr.insee jbdy3nh7 - 1 + 1.0 BIRTH_CHARACTER1 @@ -8261,13 +8261,13 @@ fr.insee j6yzoc6g-QOP-jbgd7fr6 - 1 + 1.0 OutParameter fr.insee j6yzoc6g - 1 + 1.0 QuestionGrid @@ -8275,7 +8275,7 @@ fr.insee jbdxricm - 1 + 1.0 CodeList @@ -8284,7 +8284,7 @@ fr.insee jbdy6lk3 - 1 + 1.0 BIRTH_CHARACTER2 @@ -8294,13 +8294,13 @@ fr.insee j6yzoc6g-QOP-jbgd5e9f - 1 + 1.0 OutParameter fr.insee j6yzoc6g - 1 + 1.0 QuestionGrid @@ -8308,7 +8308,7 @@ fr.insee jbdxricm - 1 + 1.0 CodeList @@ -8317,7 +8317,7 @@ fr.insee jbdxsby0 - 1 + 1.0 BIRTH_CHARACTER3 @@ -8327,13 +8327,13 @@ fr.insee j6yzoc6g-QOP-jbgd912x - 1 + 1.0 OutParameter fr.insee j6yzoc6g - 1 + 1.0 QuestionGrid @@ -8341,7 +8341,7 @@ fr.insee jbdxricm - 1 + 1.0 CodeList @@ -8350,7 +8350,7 @@ fr.insee jbdy7sra - 1 + 1.0 BIRTH_CHARACTER4 @@ -8360,13 +8360,13 @@ fr.insee j6yzoc6g-QOP-jbgd6bdy - 1 + 1.0 OutParameter fr.insee j6yzoc6g - 1 + 1.0 QuestionGrid @@ -8374,7 +8374,7 @@ fr.insee jbdxricm - 1 + 1.0 CodeList @@ -8383,7 +8383,7 @@ fr.insee jbdy2wyl - 1 + 1.0 BIRTH_CHARACTER5 @@ -8393,13 +8393,13 @@ fr.insee j6yzoc6g-QOP-jbgddyry - 1 + 1.0 OutParameter fr.insee j6yzoc6g - 1 + 1.0 QuestionGrid @@ -8407,7 +8407,7 @@ fr.insee jbdxricm - 1 + 1.0 CodeList @@ -8416,7 +8416,7 @@ fr.insee jbgdnfk7 - 1 + 1.0 PERCENTAGE_EXPENSES11 @@ -8426,13 +8426,13 @@ fr.insee j4nwc63q-QOP-jbgde5yl - 1 + 1.0 OutParameter fr.insee j4nwc63q - 1 + 1.0 QuestionGrid @@ -8449,7 +8449,7 @@ fr.insee jbgdje4w - 1 + 1.0 PERCENTAGE_EXPENSES21 @@ -8459,13 +8459,13 @@ fr.insee j4nwc63q-QOP-jbgd2x2t - 1 + 1.0 OutParameter fr.insee j4nwc63q - 1 + 1.0 QuestionGrid @@ -8482,7 +8482,7 @@ fr.insee jbgdlth7 - 1 + 1.0 PERCENTAGE_EXPENSES31 @@ -8492,13 +8492,13 @@ fr.insee j4nwc63q-QOP-jbgdjypz - 1 + 1.0 OutParameter fr.insee j4nwc63q - 1 + 1.0 QuestionGrid @@ -8515,7 +8515,7 @@ fr.insee jbgdelbl - 1 + 1.0 PERCENTAGE_EXPENSES41 @@ -8525,13 +8525,13 @@ fr.insee j4nwc63q-QOP-jbgdcftu - 1 + 1.0 OutParameter fr.insee j4nwc63q - 1 + 1.0 QuestionGrid @@ -8548,7 +8548,7 @@ fr.insee jbgd95jq - 1 + 1.0 PERCENTAGE_EXPENSES51 @@ -8558,13 +8558,13 @@ fr.insee j4nwc63q-QOP-jbgdiyfe - 1 + 1.0 OutParameter fr.insee j4nwc63q - 1 + 1.0 QuestionGrid @@ -8581,7 +8581,7 @@ fr.insee jbgdadd9 - 1 + 1.0 PERCENTAGE_EXPENSES61 @@ -8591,13 +8591,13 @@ fr.insee j4nwc63q-QOP-jbgdj1wd - 1 + 1.0 OutParameter fr.insee j4nwc63q - 1 + 1.0 QuestionGrid @@ -8614,7 +8614,7 @@ fr.insee jbgdlwzk - 1 + 1.0 PERCENTAGE_EXPENSES71 @@ -8624,13 +8624,13 @@ fr.insee j4nwc63q-QOP-jbgddylk - 1 + 1.0 OutParameter fr.insee j4nwc63q - 1 + 1.0 QuestionGrid @@ -8647,7 +8647,7 @@ fr.insee jbgdfz77 - 1 + 1.0 PERCENTAGE_EXPENSES81 @@ -8657,13 +8657,13 @@ fr.insee j4nwc63q-QOP-jbgd3jj6 - 1 + 1.0 OutParameter fr.insee j4nwc63q - 1 + 1.0 QuestionGrid @@ -8680,7 +8680,7 @@ fr.insee jbgdepx6 - 1 + 1.0 PERCENTAGE_EXPENSES91 @@ -8690,13 +8690,13 @@ fr.insee j4nwc63q-QOP-jbgd4w3k - 1 + 1.0 OutParameter fr.insee j4nwc63q - 1 + 1.0 QuestionGrid @@ -8713,7 +8713,7 @@ fr.insee jbgdepx7 - 1 + 1.0 PERCENTAGE_EXPENSES101 @@ -8723,13 +8723,13 @@ fr.insee j4nwc63q-QOP-jbgd4w4k - 1 + 1.0 OutParameter fr.insee j4nwc63q - 1 + 1.0 QuestionGrid @@ -8746,7 +8746,7 @@ fr.insee jbgd9vqv - 1 + 1.0 CLOWNING11 @@ -8756,13 +8756,13 @@ fr.insee j4nw0rr6-QOP-jbgd8tyr - 1 + 1.0 OutParameter fr.insee j4nw0rr6 - 1 + 1.0 QuestionGrid @@ -8770,7 +8770,7 @@ fr.insee jbdyh6b5 - 1 + 1.0 CodeList @@ -8779,7 +8779,7 @@ fr.insee jbgden0i - 1 + 1.0 CLOWNING21 @@ -8789,13 +8789,13 @@ fr.insee j4nw0rr6-QOP-jbgdep36 - 1 + 1.0 OutParameter fr.insee j4nw0rr6 - 1 + 1.0 QuestionGrid @@ -8803,7 +8803,7 @@ fr.insee jbdyh6b5 - 1 + 1.0 CodeList @@ -8812,7 +8812,7 @@ fr.insee jbgdndju - 1 + 1.0 CLOWNING31 @@ -8822,13 +8822,13 @@ fr.insee j4nw0rr6-QOP-jbgdjjgi - 1 + 1.0 OutParameter fr.insee j4nw0rr6 - 1 + 1.0 QuestionGrid @@ -8836,7 +8836,7 @@ fr.insee jbdyh6b5 - 1 + 1.0 CodeList @@ -8845,7 +8845,7 @@ fr.insee jbgdfwg9 - 1 + 1.0 CLOWNING41 @@ -8855,13 +8855,13 @@ fr.insee j4nw0rr6-QOP-jbgdgh6k - 1 + 1.0 OutParameter fr.insee j4nw0rr6 - 1 + 1.0 QuestionGrid @@ -8869,7 +8869,7 @@ fr.insee jbdyh6b5 - 1 + 1.0 CodeList @@ -8878,7 +8878,7 @@ fr.insee jbgdd3ky - 1 + 1.0 CLOWNING12 @@ -8888,13 +8888,13 @@ fr.insee j4nw0rr6-QOP-jbgdit3o - 1 + 1.0 OutParameter fr.insee j4nw0rr6 - 1 + 1.0 QuestionGrid @@ -8904,7 +8904,7 @@ fr.insee jbgdm9lm - 1 + 1.0 CLOWNING22 @@ -8914,13 +8914,13 @@ fr.insee j4nw0rr6-QOP-jbgd366k - 1 + 1.0 OutParameter fr.insee j4nw0rr6 - 1 + 1.0 QuestionGrid @@ -8930,7 +8930,7 @@ fr.insee jbgdcdhv - 1 + 1.0 CLOWNING32 @@ -8940,13 +8940,13 @@ fr.insee j4nw0rr6-QOP-jbgdax06 - 1 + 1.0 OutParameter fr.insee j4nw0rr6 - 1 + 1.0 QuestionGrid @@ -8956,7 +8956,7 @@ fr.insee jbgdjlit - 1 + 1.0 CLOWNING42 @@ -8966,13 +8966,13 @@ fr.insee j4nw0rr6-QOP-jbgdfo1j - 1 + 1.0 OutParameter fr.insee j4nw0rr6 - 1 + 1.0 QuestionGrid @@ -8982,7 +8982,7 @@ fr.insee jbgd1zxu - 1 + 1.0 TRAVEL11 @@ -8992,13 +8992,13 @@ fr.insee j6p2lwuj-QOP-jbgd92mb - 1 + 1.0 OutParameter fr.insee j6p2lwuj - 1 + 1.0 QuestionGrid @@ -9008,7 +9008,7 @@ fr.insee INSEE-COMMUN-CL-Booleen-1 - 1 + 1.0 Code @@ -9019,7 +9019,7 @@ fr.insee jbgd8lfs - 1 + 1.0 TRAVEL21 @@ -9029,13 +9029,13 @@ fr.insee j6p2lwuj-QOP-jbgdgsat - 1 + 1.0 OutParameter fr.insee j6p2lwuj - 1 + 1.0 QuestionGrid @@ -9045,7 +9045,7 @@ fr.insee INSEE-COMMUN-CL-Booleen-1 - 1 + 1.0 Code @@ -9056,7 +9056,7 @@ fr.insee jbgd56qo - 1 + 1.0 TRAVEL31 @@ -9066,13 +9066,13 @@ fr.insee j6p2lwuj-QOP-jbgdaxk2 - 1 + 1.0 OutParameter fr.insee j6p2lwuj - 1 + 1.0 QuestionGrid @@ -9082,7 +9082,7 @@ fr.insee INSEE-COMMUN-CL-Booleen-1 - 1 + 1.0 Code @@ -9093,7 +9093,7 @@ fr.insee jbgd4wu8 - 1 + 1.0 TRAVEL41 @@ -9103,13 +9103,13 @@ fr.insee j6p2lwuj-QOP-jbgd7myn - 1 + 1.0 OutParameter fr.insee j6p2lwuj - 1 + 1.0 QuestionGrid @@ -9119,7 +9119,7 @@ fr.insee INSEE-COMMUN-CL-Booleen-1 - 1 + 1.0 Code @@ -9130,7 +9130,7 @@ fr.insee jbgdak6h - 1 + 1.0 TRAVEL12 @@ -9140,13 +9140,13 @@ fr.insee j6p2lwuj-QOP-jbgdnxkt - 1 + 1.0 OutParameter fr.insee j6p2lwuj - 1 + 1.0 QuestionGrid @@ -9156,7 +9156,7 @@ fr.insee INSEE-COMMUN-CL-Booleen-1 - 1 + 1.0 Code @@ -9167,7 +9167,7 @@ fr.insee jbgdmsy4 - 1 + 1.0 TRAVEL22 @@ -9177,13 +9177,13 @@ fr.insee j6p2lwuj-QOP-jbgd3ef5 - 1 + 1.0 OutParameter fr.insee j6p2lwuj - 1 + 1.0 QuestionGrid @@ -9193,7 +9193,7 @@ fr.insee INSEE-COMMUN-CL-Booleen-1 - 1 + 1.0 Code @@ -9204,7 +9204,7 @@ fr.insee jbgd2zlu - 1 + 1.0 TRAVEL32 @@ -9214,13 +9214,13 @@ fr.insee j6p2lwuj-QOP-jbgd8p1v - 1 + 1.0 OutParameter fr.insee j6p2lwuj - 1 + 1.0 QuestionGrid @@ -9230,7 +9230,7 @@ fr.insee INSEE-COMMUN-CL-Booleen-1 - 1 + 1.0 Code @@ -9241,7 +9241,7 @@ fr.insee jbgd6v73 - 1 + 1.0 TRAVEL42 @@ -9251,13 +9251,13 @@ fr.insee j6p2lwuj-QOP-jbgdgm0c - 1 + 1.0 OutParameter fr.insee j6p2lwuj - 1 + 1.0 QuestionGrid @@ -9267,7 +9267,7 @@ fr.insee INSEE-COMMUN-CL-Booleen-1 - 1 + 1.0 Code @@ -9278,7 +9278,7 @@ fr.insee jbgdf5fg - 1 + 1.0 TRAVEL13 @@ -9288,13 +9288,13 @@ fr.insee j6p2lwuj-QOP-jbgdcppc - 1 + 1.0 OutParameter fr.insee j6p2lwuj - 1 + 1.0 QuestionGrid @@ -9304,7 +9304,7 @@ fr.insee INSEE-COMMUN-CL-Booleen-1 - 1 + 1.0 Code @@ -9315,7 +9315,7 @@ fr.insee jbgd2xg0 - 1 + 1.0 TRAVEL23 @@ -9325,13 +9325,13 @@ fr.insee j6p2lwuj-QOP-jbgd4cm6 - 1 + 1.0 OutParameter fr.insee j6p2lwuj - 1 + 1.0 QuestionGrid @@ -9341,7 +9341,7 @@ fr.insee INSEE-COMMUN-CL-Booleen-1 - 1 + 1.0 Code @@ -9352,7 +9352,7 @@ fr.insee jbgdc06l - 1 + 1.0 TRAVEL33 @@ -9362,13 +9362,13 @@ fr.insee j6p2lwuj-QOP-jbgdd2lo - 1 + 1.0 OutParameter fr.insee j6p2lwuj - 1 + 1.0 QuestionGrid @@ -9378,7 +9378,7 @@ fr.insee INSEE-COMMUN-CL-Booleen-1 - 1 + 1.0 Code @@ -9389,7 +9389,7 @@ fr.insee jbgdb8i9 - 1 + 1.0 TRAVEL43 @@ -9399,13 +9399,13 @@ fr.insee j6p2lwuj-QOP-jbgdo0ay - 1 + 1.0 OutParameter fr.insee j6p2lwuj - 1 + 1.0 QuestionGrid @@ -9415,7 +9415,7 @@ fr.insee INSEE-COMMUN-CL-Booleen-1 - 1 + 1.0 Code @@ -9426,7 +9426,7 @@ fr.insee jbgdhzve - 1 + 1.0 TRAVEL14 @@ -9436,13 +9436,13 @@ fr.insee j6p2lwuj-QOP-jbgd4r2a - 1 + 1.0 OutParameter fr.insee j6p2lwuj - 1 + 1.0 QuestionGrid @@ -9452,7 +9452,7 @@ fr.insee INSEE-COMMUN-CL-Booleen-1 - 1 + 1.0 Code @@ -9463,7 +9463,7 @@ fr.insee jbgd93ks - 1 + 1.0 TRAVEL24 @@ -9473,13 +9473,13 @@ fr.insee j6p2lwuj-QOP-jbgdkfpq - 1 + 1.0 OutParameter fr.insee j6p2lwuj - 1 + 1.0 QuestionGrid @@ -9489,7 +9489,7 @@ fr.insee INSEE-COMMUN-CL-Booleen-1 - 1 + 1.0 Code @@ -9500,7 +9500,7 @@ fr.insee jbgdfw7h - 1 + 1.0 TRAVEL34 @@ -9510,13 +9510,13 @@ fr.insee j6p2lwuj-QOP-jbgd7u52 - 1 + 1.0 OutParameter fr.insee j6p2lwuj - 1 + 1.0 QuestionGrid @@ -9526,7 +9526,7 @@ fr.insee INSEE-COMMUN-CL-Booleen-1 - 1 + 1.0 Code @@ -9537,7 +9537,7 @@ fr.insee jbgdfavn - 1 + 1.0 TRAVEL44 @@ -9547,13 +9547,13 @@ fr.insee j6p2lwuj-QOP-jbgdgfwl - 1 + 1.0 OutParameter fr.insee j6p2lwuj - 1 + 1.0 QuestionGrid @@ -9563,7 +9563,7 @@ fr.insee INSEE-COMMUN-CL-Booleen-1 - 1 + 1.0 Code @@ -9574,7 +9574,7 @@ fr.insee jbgdc199 - 1 + 1.0 TRAVEL15 @@ -9584,13 +9584,13 @@ fr.insee j6p2lwuj-QOP-jbgd9cff - 1 + 1.0 OutParameter fr.insee j6p2lwuj - 1 + 1.0 QuestionGrid @@ -9600,7 +9600,7 @@ fr.insee INSEE-COMMUN-CL-Booleen-1 - 1 + 1.0 Code @@ -9611,7 +9611,7 @@ fr.insee jbgdfqph - 1 + 1.0 TRAVEL25 @@ -9621,13 +9621,13 @@ fr.insee j6p2lwuj-QOP-jbgddwsp - 1 + 1.0 OutParameter fr.insee j6p2lwuj - 1 + 1.0 QuestionGrid @@ -9637,7 +9637,7 @@ fr.insee INSEE-COMMUN-CL-Booleen-1 - 1 + 1.0 Code @@ -9648,7 +9648,7 @@ fr.insee jbgd8r0n - 1 + 1.0 TRAVEL35 @@ -9658,13 +9658,13 @@ fr.insee j6p2lwuj-QOP-jbgdncn8 - 1 + 1.0 OutParameter fr.insee j6p2lwuj - 1 + 1.0 QuestionGrid @@ -9674,7 +9674,7 @@ fr.insee INSEE-COMMUN-CL-Booleen-1 - 1 + 1.0 Code @@ -9685,7 +9685,7 @@ fr.insee jbgd3aqk - 1 + 1.0 TRAVEL45 @@ -9695,13 +9695,13 @@ fr.insee j6p2lwuj-QOP-jbgdnz6b - 1 + 1.0 OutParameter fr.insee j6p2lwuj - 1 + 1.0 QuestionGrid @@ -9711,7 +9711,7 @@ fr.insee INSEE-COMMUN-CL-Booleen-1 - 1 + 1.0 Code @@ -9722,7 +9722,7 @@ fr.insee jbgdltql - 1 + 1.0 TRAVEL16 @@ -9732,13 +9732,13 @@ fr.insee j6p2lwuj-QOP-jbgdiva0 - 1 + 1.0 OutParameter fr.insee j6p2lwuj - 1 + 1.0 QuestionGrid @@ -9748,7 +9748,7 @@ fr.insee INSEE-COMMUN-CL-Booleen-1 - 1 + 1.0 Code @@ -9759,7 +9759,7 @@ fr.insee jbgd9um3 - 1 + 1.0 TRAVEL26 @@ -9769,13 +9769,13 @@ fr.insee j6p2lwuj-QOP-jbgd7dqf - 1 + 1.0 OutParameter fr.insee j6p2lwuj - 1 + 1.0 QuestionGrid @@ -9785,7 +9785,7 @@ fr.insee INSEE-COMMUN-CL-Booleen-1 - 1 + 1.0 Code @@ -9796,7 +9796,7 @@ fr.insee jbgddj7v - 1 + 1.0 TRAVEL36 @@ -9806,13 +9806,13 @@ fr.insee j6p2lwuj-QOP-jbgdnous - 1 + 1.0 OutParameter fr.insee j6p2lwuj - 1 + 1.0 QuestionGrid @@ -9822,7 +9822,7 @@ fr.insee INSEE-COMMUN-CL-Booleen-1 - 1 + 1.0 Code @@ -9833,7 +9833,7 @@ fr.insee jbgdb4ym - 1 + 1.0 TRAVEL46 @@ -9843,13 +9843,13 @@ fr.insee j6p2lwuj-QOP-jbgdkfcz - 1 + 1.0 OutParameter fr.insee j6p2lwuj - 1 + 1.0 QuestionGrid @@ -9859,7 +9859,7 @@ fr.insee INSEE-COMMUN-CL-Booleen-1 - 1 + 1.0 Code @@ -9870,7 +9870,7 @@ fr.insee jbgd3fkz - 1 + 1.0 FAVOURITE_CHARACTERS11 @@ -9880,13 +9880,13 @@ fr.insee j6qg8rc6-QOP-jbgdl5jb - 1 + 1.0 OutParameter fr.insee j6qg8rc6 - 1 + 1.0 QuestionGrid @@ -9896,7 +9896,7 @@ fr.insee jbgdf2md - 1 + 1.0 FAVOURITE_CHARACTERS21 @@ -9906,13 +9906,13 @@ fr.insee j6qg8rc6-QOP-jbgd8lwo - 1 + 1.0 OutParameter fr.insee j6qg8rc6 - 1 + 1.0 QuestionGrid @@ -9922,7 +9922,7 @@ fr.insee jbgdfle1 - 1 + 1.0 FAVOURITE_CHARACTERS31 @@ -9932,13 +9932,13 @@ fr.insee j6qg8rc6-QOP-jbgdbfag - 1 + 1.0 OutParameter fr.insee j6qg8rc6 - 1 + 1.0 QuestionGrid @@ -9948,7 +9948,7 @@ fr.insee jbgdix8x - 1 + 1.0 FAVOURITE_CHARACTERS41 @@ -9958,13 +9958,13 @@ fr.insee j6qg8rc6-QOP-jbgdlgja - 1 + 1.0 OutParameter fr.insee j6qg8rc6 - 1 + 1.0 QuestionGrid @@ -9974,7 +9974,7 @@ fr.insee jbgd782k - 1 + 1.0 FAVOURITE_CHARACTERS51 @@ -9984,13 +9984,13 @@ fr.insee j6qg8rc6-QOP-jbgd745y - 1 + 1.0 OutParameter fr.insee j6qg8rc6 - 1 + 1.0 QuestionGrid @@ -10000,7 +10000,7 @@ fr.insee jbgd68rf - 1 + 1.0 FAVOURITE_CHARACTERS61 @@ -10010,13 +10010,13 @@ fr.insee j6qg8rc6-QOP-jbgdjkts - 1 + 1.0 OutParameter fr.insee j6qg8rc6 - 1 + 1.0 QuestionGrid @@ -10026,7 +10026,7 @@ fr.insee jbgdfoj4 - 1 + 1.0 FAVOURITE_CHARACTERS71 @@ -10036,13 +10036,13 @@ fr.insee j6qg8rc6-QOP-jbgdcax7 - 1 + 1.0 OutParameter fr.insee j6qg8rc6 - 1 + 1.0 QuestionGrid @@ -10052,7 +10052,7 @@ fr.insee jbgdb116 - 1 + 1.0 FAVOURITE_CHARACTERS81 @@ -10062,13 +10062,13 @@ fr.insee j6qg8rc6-QOP-jbgdjye1 - 1 + 1.0 OutParameter fr.insee j6qg8rc6 - 1 + 1.0 QuestionGrid @@ -10078,7 +10078,7 @@ fr.insee jbgd7w5p - 1 + 1.0 FAVOURITE_CHARACTERS91 @@ -10088,13 +10088,13 @@ fr.insee j6qg8rc6-QOP-jbgd5jet - 1 + 1.0 OutParameter fr.insee j6qg8rc6 - 1 + 1.0 QuestionGrid @@ -10104,7 +10104,7 @@ fr.insee jbgd8rj2 - 1 + 1.0 FAVOURITE_CHARACTERS101 @@ -10114,13 +10114,13 @@ fr.insee j6qg8rc6-QOP-jbgdjw90 - 1 + 1.0 OutParameter fr.insee j6qg8rc6 - 1 + 1.0 QuestionGrid @@ -10130,7 +10130,7 @@ fr.insee jbgdidnp - 1 + 1.0 FAVOURITE_CHARACTERS12 @@ -10140,13 +10140,13 @@ fr.insee j6qg8rc6-QOP-jbgdfndq - 1 + 1.0 OutParameter fr.insee j6qg8rc6 - 1 + 1.0 QuestionGrid @@ -10162,7 +10162,7 @@ fr.insee jbgd47wz - 1 + 1.0 FAVOURITE_CHARACTERS22 @@ -10172,13 +10172,13 @@ fr.insee j6qg8rc6-QOP-jbgd7osi - 1 + 1.0 OutParameter fr.insee j6qg8rc6 - 1 + 1.0 QuestionGrid @@ -10194,7 +10194,7 @@ fr.insee jbgdj2nn - 1 + 1.0 FAVOURITE_CHARACTERS32 @@ -10204,13 +10204,13 @@ fr.insee j6qg8rc6-QOP-jbgd7bnw - 1 + 1.0 OutParameter fr.insee j6qg8rc6 - 1 + 1.0 QuestionGrid @@ -10226,7 +10226,7 @@ fr.insee jbgd2ipx - 1 + 1.0 FAVOURITE_CHARACTERS42 @@ -10236,13 +10236,13 @@ fr.insee j6qg8rc6-QOP-jbgd9k71 - 1 + 1.0 OutParameter fr.insee j6qg8rc6 - 1 + 1.0 QuestionGrid @@ -10258,7 +10258,7 @@ fr.insee jbgd4pe3 - 1 + 1.0 FAVOURITE_CHARACTERS52 @@ -10268,13 +10268,13 @@ fr.insee j6qg8rc6-QOP-jbgdimks - 1 + 1.0 OutParameter fr.insee j6qg8rc6 - 1 + 1.0 QuestionGrid @@ -10290,7 +10290,7 @@ fr.insee jbgdjgb1 - 1 + 1.0 FAVOURITE_CHARACTERS62 @@ -10300,13 +10300,13 @@ fr.insee j6qg8rc6-QOP-jbgdjquz - 1 + 1.0 OutParameter fr.insee j6qg8rc6 - 1 + 1.0 QuestionGrid @@ -10322,7 +10322,7 @@ fr.insee jbgdb5c1 - 1 + 1.0 FAVOURITE_CHARACTERS72 @@ -10332,13 +10332,13 @@ fr.insee j6qg8rc6-QOP-jbgdd2w3 - 1 + 1.0 OutParameter fr.insee j6qg8rc6 - 1 + 1.0 QuestionGrid @@ -10354,7 +10354,7 @@ fr.insee jbgdju9y - 1 + 1.0 FAVOURITE_CHARACTERS82 @@ -10364,13 +10364,13 @@ fr.insee j6qg8rc6-QOP-jbgdkosc - 1 + 1.0 OutParameter fr.insee j6qg8rc6 - 1 + 1.0 QuestionGrid @@ -10386,7 +10386,7 @@ fr.insee jbgdatyx - 1 + 1.0 FAVOURITE_CHARACTERS92 @@ -10396,13 +10396,13 @@ fr.insee j6qg8rc6-QOP-jbgdk0x4 - 1 + 1.0 OutParameter fr.insee j6qg8rc6 - 1 + 1.0 QuestionGrid @@ -10418,7 +10418,7 @@ fr.insee jbgdi1dt - 1 + 1.0 FAVOURITE_CHARACTERS102 @@ -10428,13 +10428,13 @@ fr.insee j6qg8rc6-QOP-jbgd2wgf - 1 + 1.0 OutParameter fr.insee j6qg8rc6 - 1 + 1.0 QuestionGrid @@ -10450,7 +10450,7 @@ fr.insee jbcggt4x - 1 + 1.0 SURVEY_COMMENT @@ -10460,13 +10460,13 @@ fr.insee j6z0z3us-QOP-jbgd6m6e - 1 + 1.0 OutParameter fr.insee j6z0z3us - 1 + 1.0 QuestionItem @@ -10476,12 +10476,12 @@ fr.insee j6qg8rc6-gp - 1 + 1.0 fr.insee j6qg8rc6 - 1 + 1.0 QuestionGrid @@ -10492,121 +10492,121 @@ fr.insee jbgd3fkz - 1 + 1.0 Variable fr.insee jbgdf2md - 1 + 1.0 Variable fr.insee jbgdfle1 - 1 + 1.0 Variable fr.insee jbgdix8x - 1 + 1.0 Variable fr.insee jbgd782k - 1 + 1.0 Variable fr.insee jbgd68rf - 1 + 1.0 Variable fr.insee jbgdfoj4 - 1 + 1.0 Variable fr.insee jbgdb116 - 1 + 1.0 Variable fr.insee jbgd7w5p - 1 + 1.0 Variable fr.insee jbgd8rj2 - 1 + 1.0 Variable fr.insee jbgdidnp - 1 + 1.0 Variable fr.insee jbgd47wz - 1 + 1.0 Variable fr.insee jbgdj2nn - 1 + 1.0 Variable fr.insee jbgd2ipx - 1 + 1.0 Variable fr.insee jbgd4pe3 - 1 + 1.0 Variable fr.insee jbgdjgb1 - 1 + 1.0 Variable fr.insee jbgdb5c1 - 1 + 1.0 Variable fr.insee jbgdju9y - 1 + 1.0 Variable fr.insee jbgdatyx - 1 + 1.0 Variable fr.insee jbgdi1dt - 1 + 1.0 Variable @@ -10614,7 +10614,7 @@ fr.insee INSEE-SIMPSONS-PIS-1 - 1 + 1.0 SIMPSONS @@ -10624,66 +10624,66 @@ fr.insee jbcggtca-GI - 1 + 1.0 fr.insee jbgdnfk7 - 1 + 1.0 Variable fr.insee jbgdje4w - 1 + 1.0 Variable fr.insee jbgdlth7 - 1 + 1.0 Variable fr.insee jbgdelbl - 1 + 1.0 Variable fr.insee jbgd95jq - 1 + 1.0 Variable fr.insee jbgdadd9 - 1 + 1.0 Variable fr.insee jbgdlwzk - 1 + 1.0 Variable fr.insee jbgdfz77 - 1 + 1.0 Variable fr.insee jbgdepx6 - 1 + 1.0 Variable fr.insee jbgdepx7 - 1 + 1.0 Variable @@ -10692,7 +10692,7 @@ fr.insee jbcggtca-IP-1 - 1 + 1.0 PERCENTAGE_EXPENSES11 @@ -10700,7 +10700,7 @@ fr.insee jbcggtca-IP-2 - 1 + 1.0 PERCENTAGE_EXPENSES21 @@ -10708,7 +10708,7 @@ fr.insee jbcggtca-IP-3 - 1 + 1.0 PERCENTAGE_EXPENSES31 @@ -10716,7 +10716,7 @@ fr.insee jbcggtca-IP-4 - 1 + 1.0 PERCENTAGE_EXPENSES41 @@ -10724,7 +10724,7 @@ fr.insee jbcggtca-IP-5 - 1 + 1.0 PERCENTAGE_EXPENSES51 @@ -10732,7 +10732,7 @@ fr.insee jbcggtca-IP-6 - 1 + 1.0 PERCENTAGE_EXPENSES61 @@ -10740,7 +10740,7 @@ fr.insee jbcggtca-IP-7 - 1 + 1.0 PERCENTAGE_EXPENSES71 @@ -10748,7 +10748,7 @@ fr.insee jbcggtca-IP-8 - 1 + 1.0 PERCENTAGE_EXPENSES81 @@ -10756,7 +10756,7 @@ fr.insee jbcggtca-IP-9 - 1 + 1.0 PERCENTAGE_EXPENSES91 @@ -10764,7 +10764,7 @@ fr.insee jbcggtca-IP-10 - 1 + 1.0 PERCENTAGE_EXPENSES101 @@ -10772,19 +10772,19 @@ fr.insee jbcggtca-GOP - 1 + 1.0 fr.insee j4nwc63q-QOP-jbgde5yl - 1 + 1.0 OutParameter fr.insee jbcggtca-IP-1 - 1 + 1.0 InParameter @@ -10792,13 +10792,13 @@ fr.insee j4nwc63q-QOP-jbgd2x2t - 1 + 1.0 OutParameter fr.insee jbcggtca-IP-2 - 1 + 1.0 InParameter @@ -10806,13 +10806,13 @@ fr.insee j4nwc63q-QOP-jbgdjypz - 1 + 1.0 OutParameter fr.insee jbcggtca-IP-3 - 1 + 1.0 InParameter @@ -10820,13 +10820,13 @@ fr.insee j4nwc63q-QOP-jbgdcftu - 1 + 1.0 OutParameter fr.insee jbcggtca-IP-4 - 1 + 1.0 InParameter @@ -10834,13 +10834,13 @@ fr.insee j4nwc63q-QOP-jbgdiyfe - 1 + 1.0 OutParameter fr.insee jbcggtca-IP-5 - 1 + 1.0 InParameter @@ -10848,13 +10848,13 @@ fr.insee j4nwc63q-QOP-jbgdj1wd - 1 + 1.0 OutParameter fr.insee jbcggtca-IP-6 - 1 + 1.0 InParameter @@ -10862,13 +10862,13 @@ fr.insee j4nwc63q-QOP-jbgddylk - 1 + 1.0 OutParameter fr.insee jbcggtca-IP-7 - 1 + 1.0 InParameter @@ -10876,13 +10876,13 @@ fr.insee j4nwc63q-QOP-jbgd3jj6 - 1 + 1.0 OutParameter fr.insee jbcggtca-IP-8 - 1 + 1.0 InParameter @@ -10890,13 +10890,13 @@ fr.insee j4nwc63q-QOP-jbgd4w3k - 1 + 1.0 OutParameter fr.insee jbcggtca-IP-9 - 1 + 1.0 InParameter @@ -10904,13 +10904,13 @@ fr.insee j4nwc63q-QOP-jbgd4w4k - 1 + 1.0 OutParameter fr.insee jbcggtca-IP-10 - 1 + 1.0 InParameter @@ -10923,7 +10923,7 @@ fr.insee Sequence-i6vwi0 - 1 + 1.0 Sequence @@ -10931,7 +10931,7 @@ fr.insee INSEE-SIMPSONS-MRS - 1 + 1.0 Liste de formats numériques et dates de l'enquête @@ -10940,7 +10940,7 @@ fr.insee INSEE-COMMUN-MNR-DateTimedate-YYYY-MM-DD - 1 + 1.0 YYYY-MM-DD date @@ -10953,38 +10953,38 @@ fr.insee StudyUnit-i6vwi0 - 1 + 1.0 fr.insee DataCollection-i6vwi0 - 1 + 1.0 fr.insee QuestionScheme-i6vwi0 - 1 + 1.0 QuestionScheme fr.insee ControlConstructScheme-i6vwi0 - 1 + 1.0 ControlConstructScheme fr.insee InterviewerInstructionScheme-i6vwi0 - 1 + 1.0 InterviewerInstructionScheme fr.insee InstrumentScheme-i6vwi0 - 1 + 1.0 fr.insee Instrument-i6vwi0 - 1 + 1.0 SIMPSONS @@ -10995,7 +10995,7 @@ fr.insee Sequence-i6vwi0 - 1 + 1.0 Sequence From bcf44f992285a3656e66c608d0497f38d1945a8b Mon Sep 17 00:00:00 2001 From: CHTAINET Badr Date: Tue, 10 Sep 2019 17:31:34 +0200 Subject: [PATCH 123/439] 189B Optimize code --- .../xslt/inputs/pogues-xml/functions.fods | 28 +- .../xslt/inputs/pogues-xml/source-fixed.xsl | 9 +- .../xslt/inputs/pogues-xml/templates.fods | 337 +++++++++--------- .../resources/xslt/outputs/ddi/models.xsl | 20 +- .../pogues-xml2ddi/functions.fods | 30 +- 5 files changed, 223 insertions(+), 201 deletions(-) diff --git a/src/main/resources/xslt/inputs/pogues-xml/functions.fods b/src/main/resources/xslt/inputs/pogues-xml/functions.fods index 6db0b3f26..8c3c306c0 100644 --- a/src/main/resources/xslt/inputs/pogues-xml/functions.fods +++ b/src/main/resources/xslt/inputs/pogues-xml/functions.fods @@ -1,20 +1,20 @@ - 2009-04-16T11:32:48.39P5DT7H3M15S188LibreOffice/6.1.5.2$Windows_X86_64 LibreOffice_project/90f8dcf33c87b3705e78202e3df5142b201bd8052019-08-01T12:19:10.564000000 + 2009-04-16T11:32:48.39P5DT7H3M38S189LibreOffice/6.1.5.2$Windows_X86_64 LibreOffice_project/90f8dcf33c87b3705e78202e3df5142b201bd8052019-09-10T14:58:13.142000000 0 0 44116 - 30771 + 31222 view1 - 0 - 67 + 3 + 66 0 0 0 @@ -32,7 +32,7 @@ Sheet1 - 1286 + 1302 0 100 60 @@ -607,7 +607,7 @@ ???(???) - 00/00/0000, 00:00:00 + 00/00/0000, 00:00:00 @@ -1254,6 +1254,18 @@ Return Format + + + enopogues:get-clarified-code + + + idList,otherValue + + + + Return id of Other Choice question in the list + + enopogues:get-clarification-expression @@ -1272,7 +1284,7 @@ Return id of response inside clarification - + @@ -1281,7 +1293,7 @@ - + diff --git a/src/main/resources/xslt/inputs/pogues-xml/source-fixed.xsl b/src/main/resources/xslt/inputs/pogues-xml/source-fixed.xsl index d0ccd9e18..8938dbcad 100644 --- a/src/main/resources/xslt/inputs/pogues-xml/source-fixed.xsl +++ b/src/main/resources/xslt/inputs/pogues-xml/source-fixed.xsl @@ -313,6 +313,13 @@ Multi Variables references in ConditionnalText (coming from FailMessage) are not supported. - + + + + + + + + diff --git a/src/main/resources/xslt/inputs/pogues-xml/templates.fods b/src/main/resources/xslt/inputs/pogues-xml/templates.fods index 489cb7bf3..afacbb82b 100644 --- a/src/main/resources/xslt/inputs/pogues-xml/templates.fods +++ b/src/main/resources/xslt/inputs/pogues-xml/templates.fods @@ -1,20 +1,20 @@ - 2009-04-16T11:32:48.39P11DT17H56M33S509LibreOffice/6.1.5.2$Windows_X86_64 LibreOffice_project/90f8dcf33c87b3705e78202e3df5142b201bd8052019-08-26T14:42:30.924000000 + 2009-04-16T11:32:48.39P11DT18H13M55S513LibreOffice/6.1.5.2$Windows_X86_64 LibreOffice_project/90f8dcf33c87b3705e78202e3df5142b201bd8052019-09-10T15:18:18.470000000 0 0 - 64075 - 55414 + 52309 + 57150 view1 0 - 9 + 12 0 0 0 @@ -32,7 +32,7 @@ Sheet1 - 1286 + 1261 0 100 60 @@ -516,13 +516,13 @@ - + - + @@ -542,13 +542,6 @@ - - - - - - - @@ -598,7 +591,7 @@ ???(???) - 00/00/0000, 00:00:00 + 00/00/0000, 00:00:00 @@ -857,12 +850,11 @@ - - - - - - + + + + + Xpath @@ -879,7 +871,6 @@ Documentation - @@ -895,7 +886,6 @@ This is used to implement the code of booleans if this return something - @@ -911,7 +901,6 @@ Return the agency that created the survey - @@ -926,7 +915,7 @@ with-tag - + @@ -938,7 +927,7 @@ concat(enopogues:get-id(.),'-CI') - + @@ -950,7 +939,7 @@ enopogues:get-id(.) - + @@ -962,19 +951,19 @@ enopogues:get-code-list-id(parent::pogues:Response) - + - + *[pogues:Response] - + enopogues:get-code-list-id - + descendant-or-self::pogues:CodeListReference[parent::pogues:Response][1] - + @@ -986,7 +975,7 @@ enopogues:get-id(descendant-or-self::pogues:CodeListReference) - + @@ -1001,7 +990,7 @@ with-tag - + @@ -1019,7 +1008,6 @@ Return all the controls of the Survey. - @@ -1035,7 +1023,6 @@ Return the number of decimals of the data type. - @@ -1044,10 +1031,10 @@ enopogues:get-description - + pogues:Description - + @@ -1063,7 +1050,6 @@ Return the dynamic attribute of the pogues:Dimension. This value is used to compute positions in grids - @@ -1079,7 +1065,6 @@ Expression is the default element for expressions in Pogues. - @@ -1094,7 +1079,7 @@ with-tag - + @@ -1106,8 +1091,7 @@ concat(enopogues:get-id(.),'-II-',count(preceding-sibling::*[name()=current()/name()])) - - + @@ -1125,7 +1109,6 @@ Return the attribut coding the level of the sequence (QUESTIONNAIRE, MODULE, SUBMODULE,...) - @@ -1141,7 +1124,6 @@ Return the ID attribute of the element - @@ -1153,7 +1135,7 @@ enopogues:get-code-list-id(.) - + @@ -1169,7 +1151,6 @@ The CodeListRefence element contains the ID of the CodeList it reference. It doesn't have an ID attribute - @@ -1185,7 +1166,6 @@ Using the patent's id for pogues:Expression's id. Because of a tweak to escape from Goto, pogues:IfThenElse could contain pogues:Expression so a parent::* is needed in the Xpath instead of a parent::pogues:Control. - @@ -1197,7 +1177,7 @@ enopogues:get-id(parent::pogues:Variable) - + @@ -1209,7 +1189,7 @@ concat(parent::pogues:*/@id,'-CI-',count(preceding-sibling::*[name()=current()/name()])) - + @@ -1218,17 +1198,16 @@ enopogues:get-id - + concat(parent::pogues:CodeList/@id,'-',count(preceding-sibling::*[name()=current()/name()])+1) The id for a l:Code is build upon the CodeList id and the rank index of the current l:Code in the CodeList - - + pogues:FlowControl[not(@flowControlType)] @@ -1241,7 +1220,6 @@ Return the ID to which the GoTo aim - @@ -1259,7 +1237,6 @@ Return all IfThenElses elements of the survey. The with-tag of the Match_Mode column means that this template is hard-coded in the src\main\resources\xslt\inputs\pogues-xml\source-fixed.xml. This is to keep the tags as well as their content by makig a sequence instead of a value-of - @@ -1271,7 +1248,7 @@ enopogues:get-id(.) - + @@ -1283,7 +1260,7 @@ enopogues:get-generated-instruction-id(.) - + @@ -1295,7 +1272,7 @@ enopogues:get-name(.) - + @@ -1307,7 +1284,7 @@ 'warning' - + @@ -1322,7 +1299,7 @@ id-variable - + @@ -1337,7 +1314,7 @@ id-variable - + @@ -1352,7 +1329,7 @@ with-tag - + @@ -1370,13 +1347,12 @@ Return all Declarations of the survey - - + pogues:Questionnaire - + enopogues:get-instructions-before @@ -1385,7 +1361,7 @@ with-tag - + @@ -1403,7 +1379,6 @@ Label is the default element for labels in Pogues. - @@ -1419,7 +1394,6 @@ Return a lang for the survey. As this information in not available in PoguesXML, it is hard-coded in this document - @@ -1435,7 +1409,6 @@ Return the attribut coding if the anwser is mandatory. This part is not implemented - @@ -1451,7 +1424,21 @@ Return the maximum length of the data type - + + + + * + + + enopogues:get-maximum + + + pogues:Maximum + + + + Return the maximal value of the data type + @@ -1467,7 +1454,21 @@ Return the maximal value of the data type - + + + + * + + + enopogues:get-minimum + + + pogues:Minimum + + + + Return the minimal value of the data type + @@ -1483,7 +1484,6 @@ Return the minimal value of the data type - @@ -1499,7 +1499,6 @@ Name is the default element for names in Pogues. - @@ -1517,7 +1516,6 @@ The <d:InstructionName> of ddi InterviwerInstruction is equal to the Declaration@declarationType of PoguesXML - @@ -1533,7 +1531,6 @@ Return the ID of the parent of the current element - @@ -1542,14 +1539,13 @@ enopogues:get-position - + @position Return the position for a Declaration. - @@ -1561,7 +1557,7 @@ concat(enopogues:get-id(.),'-QC') - + @@ -1573,10 +1569,10 @@ concat(parent::*/@id,'-QOP-',@id) - + - + pogues:Variable[@xsi:type='CalculatedVariableType']/pogues:Formula @@ -1585,10 +1581,10 @@ enopogues:get-qop-id(parent::pogues:Variable) - + - + pogues:Variable[@xsi:type='CalculatedVariableType'] @@ -1597,10 +1593,10 @@ concat(@id,'-GOP') - + - + pogues:Variable[@xsi:type='ExternalVariableType']/pogues:Formula @@ -1609,10 +1605,10 @@ enopogues:get-qop-id(parent::pogues:Variable) - + - + pogues:Variable[@xsi:type='ExternalVariableType'] @@ -1621,10 +1617,10 @@ concat(@id,'-GOP') - + - + pogues:Variable[@xsi:type='CollectedVariableType'] @@ -1633,10 +1629,10 @@ enopogues:get-qop-id(enopogues:get-related-response(.)) - + - + pogues:Control @@ -1645,7 +1641,7 @@ enopogues:get-qop-id(pogues:FailMessage) - + @@ -1657,7 +1653,7 @@ enopogues:get-id(ancestor-or-self::pogues:Child[@xsi:type='QuestionType']) - + @@ -1669,19 +1665,19 @@ enopogues:get-type(ancestor-or-self::pogues:Child[@xsi:type='QuestionType']) - + * - + enopogues:get-questionnaire-id - + enopogues:get-id(ancestor-or-self::pogues:Questionnaire) - + @@ -1699,7 +1695,6 @@ Return all Questions elements of the survey. The with-tag of the Match_Mode column means that this template is hard-coded in the src\main\resources\xslt\inputs\pogues-xml\source-fixed.xml. This is to keep the tags as well as their content by makig a sequence instead of a value-of - @@ -1717,7 +1712,6 @@ Return all the simple Question of the survey (needed to drive the output order) - @@ -1735,7 +1729,6 @@ Return all the table Question of the survey (needed to drive the output order) - @@ -1747,7 +1740,7 @@ '1' - + @@ -1759,7 +1752,7 @@ '2' - + @@ -1771,7 +1764,7 @@ concat(parent::*/@id,'-RDOP-',@id) - + @@ -1783,7 +1776,7 @@ enopogues:get-rdop-id(parent::*) - + @@ -1801,13 +1794,12 @@ Return the controls related to an element, mandatory Response are equivalent to Controls. - pogues:Variable - + enopogues:get-related-formula @@ -1816,7 +1808,7 @@ with-tag - + @@ -1825,7 +1817,7 @@ enopogues:get-related-response - + //pogues:Response[pogues:CollectedVariableReference = current()/@id] @@ -1834,7 +1826,6 @@ From a Variable, you need to get related response to have Question Out Parameters. - @@ -1843,7 +1834,7 @@ enopogues:get-related-response - + . @@ -1852,7 +1843,6 @@ From a Response (in the context of a mandatory Response), the related response is itself (the Expression is induced by the Response itself). - @@ -1861,19 +1851,19 @@ enopogues:get-related-variable - + enopogues:get-related-variable(pogues:Text | pogues:FailMessage) with-tag - + * - + enopogues:get-sequences @@ -1885,25 +1875,24 @@ Return all Sequenses elements of the survey. The with-tag of the Match_Mode column means that this template is hard-coded in the src\main\resources\xslt\inputs\pogues-xml\source-fixed.xml. This is to keep the tags as well as their content by makig a sequence instead of a value-of - * - + enopogues:get-survey-name enopogues:get-name(ancestor-or-self::pogues:Questionnaire) - + pogues:IfThenElse - + enopogues:get-then-id @@ -1913,13 +1902,12 @@ Return the ID of the element that result a true condition. - pogues:Response - + enopogues:get-type @@ -1929,13 +1917,12 @@ Return the type of data of a response (NUMERIC, TEXT, DATE,...) - pogues:Child[@xsi:type='QuestionType' and @questionType!='TABLE'] - + enopogues:get-type @@ -1945,13 +1932,12 @@ Return the type of the question (SIMPLE, SINGLE_CHOICE, MULTIPLE_CHOICE) - pogues:Child[@questionType='TABLE' and not(pogues:ResponseStructure/pogues:Dimension[@dimensionType="PRIMARY" and @dynamic != '0'])] - + enopogues:get-type @@ -1961,25 +1947,24 @@ Return the type of the question : TABLE - pogues:Child[@questionType='TABLE' and pogues:ResponseStructure/pogues:Dimension[@dimensionType="PRIMARY" and @dynamic != '0']] - + enopogues:get-type 'DYNAMIC_TABLE' - + pogues:Control - + enopogues:get-type @@ -1988,25 +1973,25 @@ conversion-table - + pogues:Variable - + enopogues:get-type @xsi:type - + pogues:Response - + enopogues:get-type-name @@ -2016,60 +2001,57 @@ Return the name of the type of data of a response (TEXT, NUMERIC,...) - - + pogues:Unit - + enopogues:get-unit - + . conversion-table - + - + * - + enopogues:get-value - + pogues:Value Value is the default element for values in Pogues. - * - + enopogues:get-version - - '1.0' + + '1' Return a version for the survey. As this information in not available in PoguesXML, it is hard-coded in this document - pogues:Response - + enopogues:get-visualization-hint @@ -2081,7 +2063,6 @@ Return the type of visualisation of a response (checkbox, radio-button,..) - @@ -2096,7 +2077,7 @@ conversion-table - + @@ -2112,7 +2093,6 @@ Return the string expected as value of the isDiscrete attribut of l:code in ddi3.2 . If the Code has child codes = false, else true. - @@ -2124,7 +2104,7 @@ 'false' - + @@ -2136,7 +2116,7 @@ 'true' - + @@ -2148,7 +2128,7 @@ 'false' - + @@ -2160,7 +2140,7 @@ 'true' - + @@ -2172,7 +2152,7 @@ 'true' - + @@ -2184,7 +2164,7 @@ enopogues:is-with-dynamic-text(*[self::pogues:Text or self::pogues:FailMessage]) - + @@ -2196,7 +2176,7 @@ contains(.,'$') - + @@ -2208,7 +2188,7 @@ 'false' - + @@ -2220,48 +2200,55 @@ pogues:Datatype/@typeName - + + + + + * + + + enopogues:get-format + + + pogues:Format + + - + *[pogues:FlowControl[@flowControlType='CLARIFICATION']] - + enopogues:get-clarification-expression - + pogues:FlowControl[@flowControlType='CLARIFICATION']/pogues:Expression - - + + Expression is the default element for expressions in Pogues for clarification question - - + *[pogues:ClarificationQuestion] - + enopogues:get-clarification-responseid - + pogues:ClarificationQuestion/pogues:Response/@id - + Return id of response inside clarification - - - + + - - - - - + + diff --git a/src/main/resources/xslt/outputs/ddi/models.xsl b/src/main/resources/xslt/outputs/ddi/models.xsl index 56ede7662..7850b59d5 100644 --- a/src/main/resources/xslt/outputs/ddi/models.xsl +++ b/src/main/resources/xslt/outputs/ddi/models.xsl @@ -1142,7 +1142,7 @@ - - + Code @@ -1195,7 +1195,7 @@ - - + INSEE-COMMUN-CL-Booleen- @@ -1216,27 +1216,29 @@ - + + - + - - - + + + - + + - + diff --git a/src/main/resources/xslt/transformations/pogues-xml2ddi/functions.fods b/src/main/resources/xslt/transformations/pogues-xml2ddi/functions.fods index 21e8e58e8..133cb9add 100644 --- a/src/main/resources/xslt/transformations/pogues-xml2ddi/functions.fods +++ b/src/main/resources/xslt/transformations/pogues-xml2ddi/functions.fods @@ -1,26 +1,26 @@ - 2009-04-16T11:32:48.39P6DT6H48M47S153LibreOffice/6.1.5.2$Windows_X86_64 LibreOffice_project/90f8dcf33c87b3705e78202e3df5142b201bd8052019-08-01T12:18:36.593000000 + 2009-04-16T11:32:48.39P6DT6H49M34S154LibreOffice/6.1.5.2$Windows_X86_64 LibreOffice_project/90f8dcf33c87b3705e78202e3df5142b201bd8052019-09-10T14:56:45.087000000 0 0 31963 - 31481 + 31933 view1 - 2 - 60 + 3 + 59 0 0 0 0 2 - 1 + 0 0 0 40 @@ -32,7 +32,7 @@ Sheet1 - 1286 + 1302 0 100 60 @@ -581,7 +581,7 @@ ???(???) - 00/00/0000, 00:00:00 + 00/00/0000, 00:00:00 @@ -1338,6 +1338,20 @@ Return format + + + enoddi33:get-clarified-code + + + idList,otherValue + + + enopogues:get-clarified-code + + + Return id of Other Choice question in the list + + enoddi33:get-clarification-expression @@ -1365,7 +1379,7 @@ - + From f1d816b5872c9366da93f35c90cd62fbfe387e98 Mon Sep 17 00:00:00 2001 From: BulotF Date: Wed, 11 Sep 2019 14:16:36 +0200 Subject: [PATCH 124/439] create get-variable-representation --- .../resources/xslt/inputs/ddi/functions.fods | 26 +++++++++++---- .../xslt/inputs/ddi/source-fixed.xsl | 33 +++++++++++++++++++ src/main/resources/xslt/outputs/fr/models.xsl | 6 ++-- .../transformations/ddi2fr/functions.fods | 30 ++++++++++++----- 4 files changed, 78 insertions(+), 17 deletions(-) diff --git a/src/main/resources/xslt/inputs/ddi/functions.fods b/src/main/resources/xslt/inputs/ddi/functions.fods index ae839e39a..259a2381c 100644 --- a/src/main/resources/xslt/inputs/ddi/functions.fods +++ b/src/main/resources/xslt/inputs/ddi/functions.fods @@ -1,20 +1,20 @@ - 2009-04-16T11:32:48.39PT22H22M21S148LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-08-27T17:42:49.698000000François Bulot + 2009-04-16T11:32:48.39PT22H27M12S149LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-09-11T14:00:46.229000000François Bulot 0 0 44116 - 32131 + 32582 view1 - 0 - 54 + 3 + 53 0 0 0 @@ -78,7 +78,7 @@ true true \\S20SLINNG\LP0000554-CLR-DR59-SNDI-Secretariat - nin+/1xcUzIwU0xJTk5HXExQMDAwMDU1NC1DTFItRFI1OS1TTkRJLVNlY3JldGFyaWF0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAS09OSUNBIE1JTk9MVEEgVW5pdmVyc2FsIFBDTAAAAAAWAAEAuigAAAAAAAAEAAhSAAAEdAAAM1ROVwAAAAAKAFwAXABTADIAMABTAEwASQBOAE4ARwBcAEwAUAAwADAAMAAwADUANQA0AC0AQwBMAFIALQBEAFIANQA5AAAAAAABBAAB3ADUJw+/AAIBAAkAmgs0CGQAAQAHAFgCAgACAFgCAwAAAEEANAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAyCcAAFNQTFgBAAAAAAAAAPwL192wJwAAyCcAAFVQRF9PV04AAAAAAAAAAABQQ0xYTAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAkANAiaCysAKwArACsAADQImgsAAABMIAAArS0AAGUBNAiaCwA0CJoLAEwgAACtLQAAAQBkAAcAAQEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQEBAAABAQBJblRyYXkxAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEBAAABAQEBAAABAQBJblRyYXkyAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIBAAABAQEBAAABAQBJblRyYXkzAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMBAAABAQEBAAABAQBJblRyYXk0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQBAAABAQEBAAABAQBJblRyYXlMQ1QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOgDAAABAQEBAAABAQBJblRyYXlNYW51YWwAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAABAQEBAAABAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAAABAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAAABAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAAABAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAEAAQEBAAEAAQAAAAEAAA4BAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAwAEAAEBAAAAAAQAAAAAAAEAAQAAAAAAAAEBAAAAZAB9AAAEAQEABAEBAAEBAQAB/38AAOkDAQAA6QMBAAABAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEASAD/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAQABAAAAAAABAAAAAQAAAAEAAAABAAEAAQABAQAAAQAAAAEAAQABAQADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAQEAAAAAAQABAAAAAAEAAAEAAQAAAAAAAQAAAAABAAEAAQABAQAAAQAAAAEAAAABAAAAAAEBAAEAAQABAQAAAQAAAAAAAQABBQAAAAAAAAABAAAAAAAAAAEAAQAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQQByAGkAYQBsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAAAgAAAQEAZAABAQBkAAEAAP//AAABAAEAAAAAAAAAAQABAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQAAAAAAAAAAAAAAAAAAAAABAgBYAlgCUAMYAAEEAAAAAAAAAQAAAQAAAAEAAAABAQAAAAABAAABAQABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQABAAEAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEAAABfAgABQXJpYWwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABDb3VyaWVyIE5ldwAAAAAAAAAAAAAAAAAAAAAAAAAAAFRpbWVzIE5ldyBSb21hbgAAAAAAAAAAAAAAAAAAAAAAU3ltYm9sAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABXaW5nZGluZ3MAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQsXFBoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQXJpYWwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABDb3VyaWVyAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFRpbWVzIE5ldyBSb21hbgAAAAAAAAAAAAAAAAAAAAAAU3ltYm9sAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABXaW5nZGluZ3MAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAADpAQAAIwQAAGkFAAB2AgAAqgMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAQAAAAEBAEsBAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANAiaCwCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABzAG8AZgBmAGkAYwBlAC4AYgBpAG4AAAAAAAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAYAAAABAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEACQA0CJoLTCAAAK0tAAD//wAA//8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZAAAAAQAAAAAAAAAAAAAAAAAAAAZYREoAAAAABIAQ09NUEFUX0RVUExFWF9NT0RFFABEdXBsZXhNb2RlOjpMb25nRWRnZQ== + nin+/1xcUzIwU0xJTk5HXExQMDAwMDU1NC1DTFItRFI1OS1TTkRJLVNlY3JldGFyaWF0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAS09OSUNBIE1JTk9MVEEgVW5pdmVyc2FsIFBDTAAAAAAWAAEAuigAAAAAAAAEAAhSAAAEdAAAM1ROVwAAAAAKAFwAXABTADIAMABTAEwASQBOAE4ARwBcAEwAUAAwADAAMAAwADUANQA0AC0AQwBMAFIALQBEAFIANQA5AAAAAAABBAAB3ADUJw+/AAIBAAkAmgs0CGQAAQAHAFgCAQACAFgCAwAAAEEANAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAyCcAAFNQTFgBAAAAAAAAAB2g5u2wJwAAyCcAAFVQRF9PV04AAAAAAAAAAABQQ0xYTAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAkANAiaCysAKwArACsAADQImgsAAABMIAAArS0AAGUBNAiaCwA0CJoLAEwgAACtLQAAAQBkAAcAAQEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQEBAAABAQBJblRyYXkxAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEBAAABAQEBAAABAQBJblRyYXkyAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIBAAABAQEBAAABAQBJblRyYXkzAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMBAAABAQEBAAABAQBJblRyYXk0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQBAAABAQEBAAABAQBJblRyYXlNYW51YWwAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAABAQEBAAABAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAAABAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAAABAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAAABAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAAABAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAEAAQEBAAEAAQAAAAEAAA4BAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAwAEAAEBAAAAAAQAAAAAAAEAAQAAAAAAAAEBAAAAZAB9AAAEAQEABAEBAAEBAQAB/38AAOkDAQAA6QMBAAABAAABAAAAAAAAAAAAAAAAV01fMTAxAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABVAFIARwBFAE4AVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVQBSAEcARQBOAFQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQQByAGkAYQBsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEASAD/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAQABAAAAAAABAAAAAQAAAAEAAAABAAEAAQABAQAAAQAAAAEAAQABAQADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAQEAAAAAAQABAAAAAAEAAAEAAQAAAAAAAQAAAAABAAEAAQABAQAAAQAAAAEAAAABAAAAAAEBAAEAAQABAQAAAQAAAAAAAQABBQAAAAAAAAABAAAAAAAAAAEAAQAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQQByAGkAYQBsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAAAgAAAQEAZAABAQBkAAEAAP//AAABAAEAAAAAAAAAAQABAQEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQAAAAAAAAAAAAAAAAAAAAABAgBYAlgCUAMYAAEEAAAAAAAAAQAAAQAAAAEAAAABAQAAAAABAAABAQABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQABAAEAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEAAABfAgABQXJpYWwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABDb3VyaWVyIE5ldwAAAAAAAAAAAAAAAAAAAAAAAAAAAFRpbWVzIE5ldyBSb21hbgAAAAAAAAAAAAAAAAAAAAAAU3ltYm9sAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABXaW5nZGluZ3MAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQsXFBoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQXJpYWwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABDb3VyaWVyAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFRpbWVzIE5ldyBSb21hbgAAAAAAAAAAAAAAAAAAAAAAU3ltYm9sAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABXaW5nZGluZ3MAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAADpAQAAIwQAAGkFAAB2AgAAqgMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAQAAAAEBAEsBAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAcgBfAGQAdgBxAG4AcQB0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANAiaCwCAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABzAG8AZgBmAGkAYwBlAC4AYgBpAG4AAAAAAAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAYAAAABAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEACQA0CJoLTCAAAK0tAAD//wAA//8AAOMHCQACAAMADgAPADQAUgEAAAAAAAAAAEkAAAAAAAkAAAByAF8AZAB2AHEAbgBxAHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZAAAAAQAAAAAAAAAAAAAAAAAAAAZYREoAAAAABIAQ09NUEFUX0RVUExFWF9NT0RFFABEdXBsZXhNb2RlOjpMb25nRWRnZQ== zxx @@ -600,7 +600,7 @@ ???(???) - 00/00/0000, 00:00:00 + 00/00/0000, 00:00:00 @@ -1300,6 +1300,18 @@ Function that returns the variables of the formula of a conditioning variable + + + enoddi:get-variable-representation + + + variable + + + + Function that returns the representation of a variable : text, number, boolean, date, duration + + enoddi:get-variable-type @@ -1486,7 +1498,7 @@ Function that returns a boolean which define if the response is mandatory. - + diff --git a/src/main/resources/xslt/inputs/ddi/source-fixed.xsl b/src/main/resources/xslt/inputs/ddi/source-fixed.xsl index 4cf8dc374..797577abc 100644 --- a/src/main/resources/xslt/inputs/ddi/source-fixed.xsl +++ b/src/main/resources/xslt/inputs/ddi/source-fixed.xsl @@ -1149,6 +1149,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Defining getter get-instruction-by-anchor-ref. diff --git a/src/main/resources/xslt/outputs/fr/models.xsl b/src/main/resources/xslt/outputs/fr/models.xsl index 777260bf7..0506304b0 100644 --- a/src/main/resources/xslt/outputs/fr/models.xsl +++ b/src/main/resources/xslt/outputs/fr/models.xsl @@ -2899,9 +2899,10 @@ - Template named:replaceVariablesInFormula. - It replaces variables in a all formula (Filter, ConsistencyCheck, CalculatedVariable). + Template named: replaceVariablesInFormula. + It replaces variables in a all formulas (Filter, ConsistencyCheck, CalculatedVariable, personalized text). "variable" -> "variableBusinessName" + or more complicated for numeric variables @@ -2928,6 +2929,7 @@ + - 2009-04-16T11:32:48.39PT10H54M15S88LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-08-27T17:42:14.491000000François Bulot + 2009-04-16T11:32:48.39PT12H56S90LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-09-11T13:57:16.541000000François Bulot 0 0 33709 - 30832 + 31284 view1 - 3 - 43 + 4 + 39 0 0 0 @@ -23,7 +23,7 @@ 0 0 0 - 23 + 9 0 100 60 @@ -78,7 +78,7 @@ true true \\S20SLINNG\LP0000554-CLR-DR59-SNDI-Secretariat - nin+/1xcUzIwU0xJTk5HXExQMDAwMDU1NC1DTFItRFI1OS1TTkRJLVNlY3JldGFyaWF0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAS09OSUNBIE1JTk9MVEEgVW5pdmVyc2FsIFBDTAAAAAAWAAEAuigAAAAAAAAEAAhSAAAEdAAAM1ROVwAAAAAKAFwAXABTADIAMABTAEwASQBOAE4ARwBcAEwAUAAwADAAMAAwADUANQA0AC0AQwBMAFIALQBEAFIANQA5AAAAAAABBAAB3ADUJw+/AAIBAAkAmgs0CGQAAQAHAFgCAgACAFgCAwAAAEEANAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAyCcAAFNQTFgBAAAAAAAAAPwL192wJwAAyCcAAFVQRF9PV04AAAAAAAAAAABQQ0xYTAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAkANAiaCysAKwArACsAADQImgsAAABMIAAArS0AAGUBNAiaCwA0CJoLAEwgAACtLQAAAQBkAAcAAQEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQEBAAABAQBJblRyYXkxAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEBAAABAQEBAAABAQBJblRyYXkyAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIBAAABAQEBAAABAQBJblRyYXkzAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMBAAABAQEBAAABAQBJblRyYXk0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQBAAABAQEBAAABAQBJblRyYXlMQ1QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOgDAAABAQEBAAABAQBJblRyYXlNYW51YWwAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAABAQEBAAABAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAAABAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAAABAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAAABAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAEAAQEBAAEAAQAAAAEAAA4BAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAwAEAAEBAAAAAAQAAAAAAAEAAQAAAAAAAAEBAAAAZAB9AAAEAQEABAEBAAEBAQAB/38AAOkDAQAA6QMBAAABAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEASAD/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAQABAAAAAAABAAAAAQAAAAEAAAABAAEAAQABAQAAAQAAAAEAAQABAQADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAQEAAAAAAQABAAAAAAEAAAEAAQAAAAAAAQAAAAABAAEAAQABAQAAAQAAAAEAAAABAAAAAAEBAAEAAQABAQAAAQAAAAAAAQABBQAAAAAAAAABAAAAAAAAAAEAAQAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQQByAGkAYQBsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAAAgAAAQEAZAABAQBkAAEAAP//AAABAAEAAAAAAAAAAQABAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQAAAAAAAAAAAAAAAAAAAAABAgBYAlgCUAMYAAEEAAAAAAAAAQAAAQAAAAEAAAABAQAAAAABAAABAQABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQABAAEAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEAAABfAgABQXJpYWwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABDb3VyaWVyIE5ldwAAAAAAAAAAAAAAAAAAAAAAAAAAAFRpbWVzIE5ldyBSb21hbgAAAAAAAAAAAAAAAAAAAAAAU3ltYm9sAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABXaW5nZGluZ3MAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQsXFBoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQXJpYWwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABDb3VyaWVyAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFRpbWVzIE5ldyBSb21hbgAAAAAAAAAAAAAAAAAAAAAAU3ltYm9sAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABXaW5nZGluZ3MAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAADpAQAAIwQAAGkFAAB2AgAAqgMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAQAAAAEBAEsBAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANAiaCwCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABzAG8AZgBmAGkAYwBlAC4AYgBpAG4AAAAAAAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAYAAAABAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEACQA0CJoLTCAAAK0tAAD//wAA//8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZAAAAAQAAAAAAAAAAAAAAAAAAAAZYREoAAAAABIAQ09NUEFUX0RVUExFWF9NT0RFFABEdXBsZXhNb2RlOjpMb25nRWRnZQ== + nin+/1xcUzIwU0xJTk5HXExQMDAwMDU1NC1DTFItRFI1OS1TTkRJLVNlY3JldGFyaWF0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAS09OSUNBIE1JTk9MVEEgVW5pdmVyc2FsIFBDTAAAAAAWAAEAuigAAAAAAAAEAAhSAAAEdAAAM1ROVwAAAAAKAFwAXABTADIAMABTAEwASQBOAE4ARwBcAEwAUAAwADAAMAAwADUANQA0AC0AQwBMAFIALQBEAFIANQA5AAAAAAABBAAB3ADUJw+/AAIBAAkAmgs0CGQAAQAHAFgCAQACAFgCAwAAAEEANAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAyCcAAFNQTFgBAAAAAAAAAB2g5u2wJwAAyCcAAFVQRF9PV04AAAAAAAAAAABQQ0xYTAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAkANAiaCysAKwArACsAADQImgsAAABMIAAArS0AAGUBNAiaCwA0CJoLAEwgAACtLQAAAQBkAAcAAQEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQEBAAABAQBJblRyYXkxAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEBAAABAQEBAAABAQBJblRyYXkyAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIBAAABAQEBAAABAQBJblRyYXkzAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMBAAABAQEBAAABAQBJblRyYXk0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQBAAABAQEBAAABAQBJblRyYXlNYW51YWwAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAABAQEBAAABAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAAABAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAAABAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAAABAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAAABAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAEAAQEBAAEAAQAAAAEAAA4BAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAwAEAAEBAAAAAAQAAAAAAAEAAQAAAAAAAAEBAAAAZAB9AAAEAQEABAEBAAEBAQAB/38AAOkDAQAA6QMBAAABAAABAAAAAAAAAAAAAAAAV01fMTAxAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABVAFIARwBFAE4AVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVQBSAEcARQBOAFQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQQByAGkAYQBsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEASAD/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAQABAAAAAAABAAAAAQAAAAEAAAABAAEAAQABAQAAAQAAAAEAAQABAQADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAQEAAAAAAQABAAAAAAEAAAEAAQAAAAAAAQAAAAABAAEAAQABAQAAAQAAAAEAAAABAAAAAAEBAAEAAQABAQAAAQAAAAAAAQABBQAAAAAAAAABAAAAAAAAAAEAAQAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQQByAGkAYQBsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAAAgAAAQEAZAABAQBkAAEAAP//AAABAAEAAAAAAAAAAQABAQEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQAAAAAAAAAAAAAAAAAAAAABAgBYAlgCUAMYAAEEAAAAAAAAAQAAAQAAAAEAAAABAQAAAAABAAABAQABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQABAAEAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEAAABfAgABQXJpYWwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABDb3VyaWVyIE5ldwAAAAAAAAAAAAAAAAAAAAAAAAAAAFRpbWVzIE5ldyBSb21hbgAAAAAAAAAAAAAAAAAAAAAAU3ltYm9sAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABXaW5nZGluZ3MAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQsXFBoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQXJpYWwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABDb3VyaWVyAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFRpbWVzIE5ldyBSb21hbgAAAAAAAAAAAAAAAAAAAAAAU3ltYm9sAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABXaW5nZGluZ3MAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAADpAQAAIwQAAGkFAAB2AgAAqgMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAQAAAAEBAEsBAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAcgBfAGQAdgBxAG4AcQB0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANAiaCwCAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABzAG8AZgBmAGkAYwBlAC4AYgBpAG4AAAAAAAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAYAAAABAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEACQA0CJoLTCAAAK0tAAD//wAA//8AAOMHCQACAAMADgAPADQAUgEAAAAAAAAAAEkAAAAAAAkAAAByAF8AZAB2AHEAbgBxAHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZAAAAAQAAAAAAAAAAAAAAAAAAAAZYREoAAAAABIAQ09NUEFUX0RVUExFWF9NT0RFFABEdXBsZXhNb2RlOjpMb25nRWRnZQ== zxx @@ -598,7 +598,7 @@ ???(???) - 00/00/0000, 00:00:00 + 00/00/0000, 00:00:00 @@ -1183,6 +1183,20 @@ Linking output function enofr:get-conditioning-variable-formula-variables to input function enoddi:get-conditioning-variable-formula-variables + + + enofr:get-variable-representation + + + variable + + + enoddi:get-variable-representation + + + Linking output function enofr:get-variable-representation to input function enoddi:get-variable-representation + + enofr:get-item-label-conditioning-variables @@ -1418,7 +1432,7 @@ Linking output function enofr:get-cell-value-variables to input function enoddi:get-cell-value-variables - + From 57b903afcae6659fb3a9d8c6b2500e80955b740d Mon Sep 17 00:00:00 2001 From: BulotF Date: Thu, 12 Sep 2019 14:47:09 +0200 Subject: [PATCH 125/439] update formulas with numbers --- src/main/resources/xslt/outputs/fr/models.xsl | 172 +++++++++++++++--- 1 file changed, 145 insertions(+), 27 deletions(-) diff --git a/src/main/resources/xslt/outputs/fr/models.xsl b/src/main/resources/xslt/outputs/fr/models.xsl index 0506304b0..f3b0c1316 100644 --- a/src/main/resources/xslt/outputs/fr/models.xsl +++ b/src/main/resources/xslt/outputs/fr/models.xsl @@ -374,7 +374,6 @@ - @@ -391,7 +390,6 @@ - @@ -409,7 +407,6 @@ - @@ -438,7 +435,6 @@ - @@ -452,7 +448,6 @@ - @@ -501,7 +496,6 @@ - @@ -519,7 +513,6 @@ - @@ -577,7 +570,6 @@ - @@ -595,7 +587,6 @@ - @@ -906,7 +897,6 @@ - @@ -924,7 +914,6 @@ - @@ -1114,7 +1103,6 @@ - @@ -1132,7 +1120,6 @@ - @@ -2865,7 +2852,6 @@ - @@ -2908,7 +2894,6 @@ - @@ -2930,18 +2915,151 @@ - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 61d26b53d2457e92c4a325f1a3dcac9d0fe94b8d Mon Sep 17 00:00:00 2001 From: CHTAINET Badr Date: Thu, 12 Sep 2019 16:14:49 +0200 Subject: [PATCH 126/439] 189B Fix id for clarification --- src/main/resources/xslt/outputs/ddi/models.xsl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/xslt/outputs/ddi/models.xsl b/src/main/resources/xslt/outputs/ddi/models.xsl index 7850b59d5..1de86e336 100644 --- a/src/main/resources/xslt/outputs/ddi/models.xsl +++ b/src/main/resources/xslt/outputs/ddi/models.xsl @@ -1196,7 +1196,7 @@ - INSEE-COMMUN-CL-Booleen- + INSEE-COMMUN-CL-Booleen-1 Code From f97179319e9db160d2477b53071eddcd5d3b19ba Mon Sep 17 00:00:00 2001 From: CHTAINET Badr Date: Thu, 12 Sep 2019 18:26:32 +0200 Subject: [PATCH 127/439] 189B Fix out file --- .../resources/xslt/outputs/ddi/models.xsl | 66 +- src/test/resources/pogues-xml-to-ddi/out.xml | 2548 ++++++++--------- 2 files changed, 1307 insertions(+), 1307 deletions(-) diff --git a/src/main/resources/xslt/outputs/ddi/models.xsl b/src/main/resources/xslt/outputs/ddi/models.xsl index e2413ca68..01b7d20bc 100644 --- a/src/main/resources/xslt/outputs/ddi/models.xsl +++ b/src/main/resources/xslt/outputs/ddi/models.xsl @@ -1111,44 +1111,44 @@ - + - - - - - - - - - - + + + + + + + + + + - - - - - - - + + + + + + + - - - + + + - - - - + + + + - Code - - + Code + + - - + + @@ -1222,9 +1222,9 @@ - - - + + + diff --git a/src/test/resources/pogues-xml-to-ddi/out.xml b/src/test/resources/pogues-xml-to-ddi/out.xml index 91c318197..52605f2ac 100644 --- a/src/test/resources/pogues-xml-to-ddi/out.xml +++ b/src/test/resources/pogues-xml-to-ddi/out.xml @@ -1,7 +1,7 @@ fr.insee INSEE-i6vwi0 - 1.0 + 1 Questionnaire SIMPSONS @@ -10,18 +10,18 @@ fr.insee RessourcePackage-i6vwi0 - 1.0 + 1 fr.insee InterviewerInstructionScheme-i6vwi0 - 1.0 + 1 A définir fr.insee d1 - 1.0 + 1 comment @@ -34,7 +34,7 @@ fr.insee d11 - 1.0 + 1 comment @@ -48,7 +48,7 @@ fr.insee d2 - 1.0 + 1 comment @@ -61,7 +61,7 @@ fr.insee d3 - 1.0 + 1 instruction @@ -74,7 +74,7 @@ fr.insee d4 - 1.0 + 1 instruction @@ -87,7 +87,7 @@ fr.insee d5 - 1.0 + 1 instruction @@ -100,7 +100,7 @@ fr.insee j4nwc63q-CI-0-II-0 - 1.0 + 1 warning @@ -113,7 +113,7 @@ fr.insee jbcggtca-GOP - 1.0 + 1 OutParameter @@ -122,7 +122,7 @@ fr.insee d10 - 1.0 + 1 instruction @@ -132,15 +132,15 @@ - fr.inseeFTN-INSTRUCTION-11.0tooltipIncluded principalities + fr.inseeFTN-INSTRUCTION-11tooltipIncluded principalities fr.insee ControlConstructScheme-i6vwi0 - 1.0 + 1 fr.insee Sequence-i6vwi0 - 1.0 + 1 Questionnaire SIMPSONS @@ -148,26 +148,26 @@ fr.insee j6p0ti5h - 1.0 + 1 Sequence fr.insee d1e119 - 1.0 + 1 IfThenElse fr.insee j6z12s2d - 1.0 + 1 Sequence fr.insee j6p0ti5h - 1.0 + 1 MODULE1 @@ -177,33 +177,33 @@ fr.insee d1 - 1.0 + 1 Instruction module fr.insee j6p3dkx6-QC - 1.0 + 1 QuestionConstruct fr.insee j6p0np9q-QC - 1.0 + 1 QuestionConstruct fr.insee d1e50 - 1.0 + 1 IfThenElse fr.insee j6p0s7o5 - 1.0 + 1 MODULE11 @@ -214,32 +214,32 @@ fr.insee j3343qhx-QC - 1.0 + 1 QuestionConstruct fr.insee j6q9h8tj-QC - 1.0 + 1 QuestionConstruct fr.insee j334cyqb-QC - 1.0 + 1 QuestionConstruct fr.insee j6z06z1e-QC - 1.0 + 1 QuestionConstruct fr.insee j3341528 - 1.0 + 1 MODULE2 @@ -249,33 +249,33 @@ fr.insee d2 - 1.0 + 1 Instruction module fr.insee j3343clt-QC - 1.0 + 1 QuestionConstruct fr.insee j6qdfhvw-QC - 1.0 + 1 QuestionConstruct fr.insee j4nw5cqz-QC - 1.0 + 1 QuestionConstruct fr.insee j6qe0h9q - 1.0 + 1 MODULE3 @@ -286,38 +286,38 @@ fr.insee j334akov-QC - 1.0 + 1 QuestionConstruct fr.insee d12-SI - 1.0 + 1 StatementItem fr.insee j6p29i81-QC - 1.0 + 1 QuestionConstruct fr.insee j6qefnga-QC - 1.0 + 1 QuestionConstruct fr.insee j6yzoc6g-QC - 1.0 + 1 QuestionConstruct fr.insee j4nw88h2 - 1.0 + 1 MODULE4 @@ -328,26 +328,26 @@ fr.insee j6qe237q - 1.0 + 1 Sequence fr.insee j6qejudb - 1.0 + 1 Sequence fr.insee j6qeh91y - 1.0 + 1 Sequence fr.insee j6qe237q - 1.0 + 1 MODULE41 @@ -358,20 +358,20 @@ fr.insee j4nwc63q-QC - 1.0 + 1 QuestionConstruct fr.insee j4nwc63q-CI-0 - 1.0 + 1 ComputationItem fr.insee j6qejudb - 1.0 + 1 MODULE42 @@ -382,14 +382,14 @@ fr.insee j4nw0rr6-QC - 1.0 + 1 QuestionConstruct fr.insee j6qeh91y - 1.0 + 1 MODULE43 @@ -400,14 +400,14 @@ fr.insee j6p2lwuj-QC - 1.0 + 1 QuestionConstruct fr.insee j6qfx9qe - 1.0 + 1 MODULE5 @@ -418,14 +418,14 @@ fr.insee j6qg8rc6-QC - 1.0 + 1 QuestionConstruct fr.insee j6z12s2d - 1.0 + 1 MODULE6 @@ -436,14 +436,14 @@ fr.insee j6z0z3us-QC - 1.0 + 1 QuestionConstruct fr.insee d1e50 - 1.0 + 1 A définir @@ -457,7 +457,7 @@ fr.insee d1e50-IP-1 - 1.0 + 1 READY @@ -466,13 +466,13 @@ fr.insee j6p0np9q-QOP-jbgd3set - 1.0 + 1 OutParameter fr.insee d1e50-IP-1 - 1.0 + 1 InParameter @@ -482,28 +482,28 @@ fr.insee d1e50-THEN - 1.0 + 1 Sequence fr.insee d1e50-THEN - 1.0 + 1 fr.insee j6p0s7o5 - 1.0 + 1 Sequence fr.insee d1e119 - 1.0 + 1 A définir @@ -517,7 +517,7 @@ fr.insee d1e119-IP-1 - 1.0 + 1 READY @@ -526,13 +526,13 @@ fr.insee j6p0np9q-QOP-jbgd3set - 1.0 + 1 OutParameter fr.insee d1e119-IP-1 - 1.0 + 1 InParameter @@ -542,298 +542,298 @@ fr.insee d1e119-THEN - 1.0 + 1 Sequence fr.insee d1e119-THEN - 1.0 + 1 fr.insee j3341528 - 1.0 + 1 Sequence fr.insee j6qe0h9q - 1.0 + 1 Sequence fr.insee j4nw88h2 - 1.0 + 1 Sequence fr.insee j6qfx9qe - 1.0 + 1 Sequence fr.insee j6p3dkx6-QC - 1.0 + 1 COMMENT fr.insee j6p3dkx6 - 1.0 + 1 QuestionItem fr.insee j6p0np9q-QC - 1.0 + 1 READY fr.insee j6p0np9q - 1.0 + 1 QuestionItem fr.insee j3343qhx-QC - 1.0 + 1 PRODUCER fr.insee j3343qhx - 1.0 + 1 QuestionItem fr.insee j6q9h8tj-QC - 1.0 + 1 SEASON_NUMBER fr.insee j6q9h8tj - 1.0 + 1 QuestionItem fr.insee j334cyqb-QC - 1.0 + 1 DATEFIRST fr.insee j334cyqb - 1.0 + 1 QuestionItem fr.insee j6z06z1e-QC - 1.0 + 1 AUDIENCE_SHARE fr.insee j6z06z1e - 1.0 + 1 QuestionItem fr.insee j3343clt-QC - 1.0 + 1 CITY fr.insee j3343clt - 1.0 + 1 QuestionItem fr.insee j6qdfhvw-QC - 1.0 + 1 MAYOR fr.insee j6qdfhvw - 1.0 + 1 QuestionItem fr.insee j4nw5cqz-QC - 1.0 + 1 STATE fr.insee j4nw5cqz - 1.0 + 1 QuestionItem fr.insee j334akov-QC - 1.0 + 1 PET fr.insee j334akov - 1.0 + 1 QuestionGrid fr.insee j6p29i81-QC - 1.0 + 1 ICE_FLAVOUR fr.insee j6p29i81 - 1.0 + 1 QuestionGrid fr.insee j6qefnga-QC - 1.0 + 1 NUCLEAR_CHARACTER fr.insee j6qefnga - 1.0 + 1 QuestionGrid fr.insee j6yzoc6g-QC - 1.0 + 1 BIRTH_CHARACTER fr.insee j6yzoc6g - 1.0 + 1 QuestionGrid fr.insee j4nwc63q-QC - 1.0 + 1 PERCENTAGE_EXPENSES fr.insee j4nwc63q - 1.0 + 1 QuestionGrid fr.insee j4nw0rr6-QC - 1.0 + 1 CLOWNING fr.insee j4nw0rr6 - 1.0 + 1 QuestionGrid fr.insee j6p2lwuj-QC - 1.0 + 1 TRAVEL fr.insee j6p2lwuj - 1.0 + 1 QuestionGrid fr.insee j6qg8rc6-QC - 1.0 + 1 FAVOURITE_CHARACTERS fr.insee j6qg8rc6 - 1.0 + 1 QuestionGrid fr.insee j6z0z3us-QC - 1.0 + 1 SURVEY_COMMENT fr.insee j6z0z3us - 1.0 + 1 QuestionItem fr.insee j4nwc63q-CI-0 - 1.0 + 1 Total of percentages @@ -843,7 +843,7 @@ fr.insee j4nwc63q-CI-0-II-0 - 1.0 + 1 Instruction stumblingblock @@ -853,7 +853,7 @@ fr.insee j4nwc63q-CI-0-IP-1 - 1.0 + 1 PERCENTAGE_EXPENSES11 @@ -861,7 +861,7 @@ fr.insee j4nwc63q-CI-0-IP-2 - 1.0 + 1 PERCENTAGE_EXPENSES21 @@ -869,7 +869,7 @@ fr.insee j4nwc63q-CI-0-IP-3 - 1.0 + 1 PERCENTAGE_EXPENSES31 @@ -877,7 +877,7 @@ fr.insee j4nwc63q-CI-0-IP-4 - 1.0 + 1 PERCENTAGE_EXPENSES41 @@ -885,7 +885,7 @@ fr.insee j4nwc63q-CI-0-IP-5 - 1.0 + 1 PERCENTAGE_EXPENSES51 @@ -893,7 +893,7 @@ fr.insee j4nwc63q-CI-0-IP-6 - 1.0 + 1 PERCENTAGE_EXPENSES61 @@ -901,7 +901,7 @@ fr.insee j4nwc63q-CI-0-IP-7 - 1.0 + 1 PERCENTAGE_EXPENSES71 @@ -909,7 +909,7 @@ fr.insee j4nwc63q-CI-0-IP-8 - 1.0 + 1 PERCENTAGE_EXPENSES81 @@ -917,7 +917,7 @@ fr.insee j4nwc63q-CI-0-IP-9 - 1.0 + 1 PERCENTAGE_EXPENSES91 @@ -925,7 +925,7 @@ fr.insee j4nwc63q-CI-0-IP-10 - 1.0 + 1 PERCENTAGE_EXPENSES101 @@ -934,13 +934,13 @@ fr.insee j4nwc63q-QOP-jbgde5yl - 1.0 + 1 OutParameter fr.insee j4nwc63q-CI-0-IP-1 - 1.0 + 1 InParameter @@ -948,13 +948,13 @@ fr.insee j4nwc63q-QOP-jbgd2x2t - 1.0 + 1 OutParameter fr.insee j4nwc63q-CI-0-IP-2 - 1.0 + 1 InParameter @@ -962,13 +962,13 @@ fr.insee j4nwc63q-QOP-jbgdjypz - 1.0 + 1 OutParameter fr.insee j4nwc63q-CI-0-IP-3 - 1.0 + 1 InParameter @@ -976,13 +976,13 @@ fr.insee j4nwc63q-QOP-jbgdcftu - 1.0 + 1 OutParameter fr.insee j4nwc63q-CI-0-IP-4 - 1.0 + 1 InParameter @@ -990,13 +990,13 @@ fr.insee j4nwc63q-QOP-jbgdiyfe - 1.0 + 1 OutParameter fr.insee j4nwc63q-CI-0-IP-5 - 1.0 + 1 InParameter @@ -1004,13 +1004,13 @@ fr.insee j4nwc63q-QOP-jbgdj1wd - 1.0 + 1 OutParameter fr.insee j4nwc63q-CI-0-IP-6 - 1.0 + 1 InParameter @@ -1018,13 +1018,13 @@ fr.insee j4nwc63q-QOP-jbgddylk - 1.0 + 1 OutParameter fr.insee j4nwc63q-CI-0-IP-7 - 1.0 + 1 InParameter @@ -1032,13 +1032,13 @@ fr.insee j4nwc63q-QOP-jbgd3jj6 - 1.0 + 1 OutParameter fr.insee j4nwc63q-CI-0-IP-8 - 1.0 + 1 InParameter @@ -1046,13 +1046,13 @@ fr.insee j4nwc63q-QOP-jbgd4w3k - 1.0 + 1 OutParameter fr.insee j4nwc63q-CI-0-IP-9 - 1.0 + 1 InParameter @@ -1060,13 +1060,13 @@ fr.insee j4nwc63q-QOP-jbgd4w4k - 1.0 + 1 OutParameter fr.insee j4nwc63q-CI-0-IP-10 - 1.0 + 1 InParameter @@ -1080,7 +1080,7 @@ fr.insee d12-SI - 1.0 + 1 Now we are going to know if you think that Jay is a gluton. @@ -1091,21 +1091,21 @@ fr.insee QuestionScheme-i6vwi0 - 1.0 + 1 A définir fr.insee j6p3dkx6 - 1.0 + 1 COMMENT fr.insee j6p3dkx6-QOP-jbgdhaht - 1.0 + 1 COMMENT @@ -1114,13 +1114,13 @@ fr.insee j6p3dkx6-RDOP-jbgdhaht - 1.0 + 1 OutParameter fr.insee j6p3dkx6-QOP-jbgdhaht - 1.0 + 1 OutParameter @@ -1133,7 +1133,7 @@ fr.insee j6p3dkx6-RDOP-jbgdhaht - 1.0 + 1 @@ -1141,14 +1141,14 @@ fr.insee j6p0np9q - 1.0 + 1 READY fr.insee j6p0np9q-QOP-jbgd3set - 1.0 + 1 READY @@ -1157,13 +1157,13 @@ fr.insee j6p0np9q-RDOP-jbgd3set - 1.0 + 1 OutParameter fr.insee j6p0np9q-QOP-jbgd3set - 1.0 + 1 OutParameter @@ -1176,14 +1176,14 @@ fr.insee j6p0np9q-RDOP-jbgd3set - 1.0 + 1 fr.insee INSEE-COMMUN-CL-Booleen-1 - 1.0 + 1 Code @@ -1197,7 +1197,7 @@ fr.insee j6p6my1d - 1.0 + 1 @@ -1214,14 +1214,14 @@ fr.insee j3343qhx - 1.0 + 1 PRODUCER fr.insee j3343qhx-QOP-jbgd90cy - 1.0 + 1 PRODUCER @@ -1230,13 +1230,13 @@ fr.insee j3343qhx-RDOP-jbgd90cy - 1.0 + 1 OutParameter fr.insee j3343qhx-QOP-jbgd90cy - 1.0 + 1 OutParameter @@ -1249,7 +1249,7 @@ fr.insee j3343qhx-RDOP-jbgd90cy - 1.0 + 1 @@ -1257,14 +1257,14 @@ fr.insee j6q9h8tj - 1.0 + 1 SEASON_NUMBER fr.insee j6q9h8tj-QOP-jbgdjy8h - 1.0 + 1 SEASON_NUMBER @@ -1273,13 +1273,13 @@ fr.insee j6q9h8tj-RDOP-jbgdjy8h - 1.0 + 1 OutParameter fr.insee j6q9h8tj-QOP-jbgdjy8h - 1.0 + 1 OutParameter @@ -1297,21 +1297,21 @@ fr.insee j6q9h8tj-RDOP-jbgdjy8h - 1.0 + 1 fr.insee j334cyqb - 1.0 + 1 DATEFIRST fr.insee j334cyqb-QOP-jbgdih2z - 1.0 + 1 DATEFIRST @@ -1320,13 +1320,13 @@ fr.insee j334cyqb-RDOP-jbgdih2z - 1.0 + 1 OutParameter fr.insee j334cyqb-QOP-jbgdih2z - 1.0 + 1 OutParameter @@ -1338,16 +1338,16 @@ fr.insee INSEE-COMMUN-MNR-DateTimedate-YYYY-MM-DD - 1.0 + 1 ManagedDateTimeRepresentation fr.insee j334cyqb-RDOP-jbgdih2z - 1.0 + 1 fr.insee INSEE-COMMUN-MNR-DateTimedate-YYYY-MM-DD - 1.0 + 1 ManagedDateTimeRepresentation @@ -1355,21 +1355,21 @@ fr.insee d11 - 1.0 + 1 Instruction fr.insee j6z06z1e - 1.0 + 1 AUDIENCE_SHARE fr.insee j6z06z1e-QOP-jbgddnrd - 1.0 + 1 AUDIENCE_SHARE @@ -1378,13 +1378,13 @@ fr.insee j6z06z1e-RDOP-jbgddnrd - 1.0 + 1 OutParameter fr.insee j6z06z1e-QOP-jbgddnrd - 1.0 + 1 OutParameter @@ -1403,21 +1403,21 @@ fr.insee j6z06z1e-RDOP-jbgddnrd - 1.0 + 1 fr.insee j3343clt - 1.0 + 1 CITY fr.insee j3343clt-QOP-jbgdjdkn - 1.0 + 1 CITY @@ -1426,13 +1426,13 @@ fr.insee j3343clt-RDOP-jbgdjdkn - 1.0 + 1 OutParameter fr.insee j3343clt-QOP-jbgdjdkn - 1.0 + 1 OutParameter @@ -1446,18 +1446,18 @@ fr.insee j334iumu - 1.0 + 1 CodeList fr.insee j3343clt-RDOP-jbgdjdkn - 1.0 + 1 fr.insee j334iumu - 1.0 + 1 CodeList @@ -1467,21 +1467,21 @@ fr.insee d3 - 1.0 + 1 Instruction fr.insee j6qdfhvw - 1.0 + 1 MAYOR fr.insee j6qdfhvw-QOP-jbgd8ghp - 1.0 + 1 MAYOR @@ -1490,13 +1490,13 @@ fr.insee j6qdfhvw-RDOP-jbgd8ghp - 1.0 + 1 OutParameter fr.insee j6qdfhvw-QOP-jbgd8ghp - 1.0 + 1 OutParameter @@ -1510,18 +1510,18 @@ fr.insee j6qdqoen - 1.0 + 1 CodeList fr.insee j6qdfhvw-RDOP-jbgd8ghp - 1.0 + 1 fr.insee j6qdqoen - 1.0 + 1 CodeList @@ -1531,21 +1531,21 @@ fr.insee d4 - 1.0 + 1 Instruction fr.insee j4nw5cqz - 1.0 + 1 STATE fr.insee j4nw5cqz-QOP-jbgdkd7v - 1.0 + 1 STATE @@ -1554,13 +1554,13 @@ fr.insee j4nw5cqz-RDOP-jbgdkd7v - 1.0 + 1 OutParameter fr.insee j4nw5cqz-QOP-jbgdkd7v - 1.0 + 1 OutParameter @@ -1574,18 +1574,18 @@ fr.insee j4nwo00f - 1.0 + 1 CodeList fr.insee j4nw5cqz-RDOP-jbgdkd7v - 1.0 + 1 fr.insee j4nwo00f - 1.0 + 1 CodeList @@ -1596,14 +1596,14 @@ fr.insee j6z0z3us - 1.0 + 1 SURVEY_COMMENT fr.insee j6z0z3us-QOP-jbgd6m6e - 1.0 + 1 SURVEY_COMMENT @@ -1612,13 +1612,13 @@ fr.insee j6z0z3us-RDOP-jbgd6m6e - 1.0 + 1 OutParameter fr.insee j6z0z3us-QOP-jbgd6m6e - 1.0 + 1 OutParameter @@ -1631,7 +1631,7 @@ fr.insee j6z0z3us-RDOP-jbgd6m6e - 1.0 + 1 @@ -1639,14 +1639,14 @@ fr.insee j334akov - 1.0 + 1 PET fr.insee j334akov-QOP-jbgd8qmn - 1.0 + 1 PET1 @@ -1654,7 +1654,7 @@ fr.insee j334akov-QOP-jbgd60vl - 1.0 + 1 PET2 @@ -1662,7 +1662,7 @@ fr.insee j334akov-QOP-jbgda2jo - 1.0 + 1 PET3 @@ -1670,7 +1670,7 @@ fr.insee j334akov-QOP-jbgdfssy - 1.0 + 1 PET4 @@ -1679,13 +1679,13 @@ fr.insee j334akov-RDOP-jbgd8qmn - 1.0 + 1 OutParameter fr.insee j334akov-QOP-jbgd8qmn - 1.0 + 1 OutParameter @@ -1693,13 +1693,13 @@ fr.insee j334akov-RDOP-jbgd60vl - 1.0 + 1 OutParameter fr.insee j334akov-QOP-jbgd60vl - 1.0 + 1 OutParameter @@ -1707,13 +1707,13 @@ fr.insee j334akov-RDOP-jbgda2jo - 1.0 + 1 OutParameter fr.insee j334akov-QOP-jbgda2jo - 1.0 + 1 OutParameter @@ -1721,13 +1721,13 @@ fr.insee j334akov-RDOP-jbgdfssy - 1.0 + 1 OutParameter fr.insee j334akov-QOP-jbgdfssy - 1.0 + 1 OutParameter @@ -1741,7 +1741,7 @@ fr.insee j335cu3c - 1.0 + 1 CodeList @@ -1752,14 +1752,14 @@ fr.insee j334akov-RDOP-jbgd8qmn - 1.0 + 1 fr.insee INSEE-COMMUN-CL-Booleen-1 - 1.0 + 1 Code @@ -1780,14 +1780,14 @@ fr.insee j334akov-RDOP-jbgd60vl - 1.0 + 1 fr.insee INSEE-COMMUN-CL-Booleen-1 - 1.0 + 1 Code @@ -1808,14 +1808,14 @@ fr.insee j334akov-RDOP-jbgda2jo - 1.0 + 1 fr.insee INSEE-COMMUN-CL-Booleen-1 - 1.0 + 1 Code @@ -1836,14 +1836,14 @@ fr.insee j334akov-RDOP-jbgdfssy - 1.0 + 1 fr.insee INSEE-COMMUN-CL-Booleen-1 - 1.0 + 1 Code @@ -1863,21 +1863,21 @@ fr.insee d5 - 1.0 + 1 Instruction fr.insee j6p29i81 - 1.0 + 1 ICE_FLAVOUR fr.insee j6p29i81-QOP-jbgdb3jx - 1.0 + 1 ICE_FLAVOUR1 @@ -1885,7 +1885,7 @@ fr.insee j6p29i81-QOP-jbgdb61k - 1.0 + 1 ICE_FLAVOUR2 @@ -1893,7 +1893,7 @@ fr.insee j6p29i81-QOP-jbgdl3kc - 1.0 + 1 ICE_FLAVOUR3 @@ -1901,7 +1901,7 @@ fr.insee j6p29i81-QOP-jbgdcobo - 1.0 + 1 ICE_FLAVOUR4 @@ -1910,13 +1910,13 @@ fr.insee j6p29i81-RDOP-jbgdb3jx - 1.0 + 1 OutParameter fr.insee j6p29i81-QOP-jbgdb3jx - 1.0 + 1 OutParameter @@ -1924,13 +1924,13 @@ fr.insee j6p29i81-RDOP-jbgdb61k - 1.0 + 1 OutParameter fr.insee j6p29i81-QOP-jbgdb61k - 1.0 + 1 OutParameter @@ -1938,13 +1938,13 @@ fr.insee j6p29i81-RDOP-jbgdl3kc - 1.0 + 1 OutParameter fr.insee j6p29i81-QOP-jbgdl3kc - 1.0 + 1 OutParameter @@ -1952,13 +1952,13 @@ fr.insee j6p29i81-RDOP-jbgdcobo - 1.0 + 1 OutParameter fr.insee j6p29i81-QOP-jbgdcobo - 1.0 + 1 OutParameter @@ -1972,7 +1972,7 @@ fr.insee j6p2mvca - 1.0 + 1 CodeList @@ -1984,18 +1984,18 @@ fr.insee jbdxh138 - 1.0 + 1 CodeList fr.insee j6p29i81-RDOP-jbgdb3jx - 1.0 + 1 fr.insee jbdxh138 - 1.0 + 1 CodeList @@ -2014,18 +2014,18 @@ fr.insee jbdxh138 - 1.0 + 1 CodeList fr.insee j6p29i81-RDOP-jbgdb61k - 1.0 + 1 fr.insee jbdxh138 - 1.0 + 1 CodeList @@ -2044,18 +2044,18 @@ fr.insee jbdxh138 - 1.0 + 1 CodeList fr.insee j6p29i81-RDOP-jbgdl3kc - 1.0 + 1 fr.insee jbdxh138 - 1.0 + 1 CodeList @@ -2074,18 +2074,18 @@ fr.insee jbdxh138 - 1.0 + 1 CodeList fr.insee j6p29i81-RDOP-jbgdcobo - 1.0 + 1 fr.insee jbdxh138 - 1.0 + 1 CodeList @@ -2103,14 +2103,14 @@ fr.insee j6qefnga - 1.0 + 1 NUCLEAR_CHARACTER fr.insee j6qefnga-QOP-jbgd6p0k - 1.0 + 1 NUCLEAR_CHARACTER1 @@ -2118,7 +2118,7 @@ fr.insee j6qefnga-QOP-jbgd9ato - 1.0 + 1 NUCLEAR_CHARACTER2 @@ -2126,7 +2126,7 @@ fr.insee j6qefnga-QOP-jbgd3e0p - 1.0 + 1 NUCLEAR_CHARACTER3 @@ -2134,7 +2134,7 @@ fr.insee j6qefnga-QOP-jbgdkxne - 1.0 + 1 NUCLEAR_CHARACTER4 @@ -2143,13 +2143,13 @@ fr.insee j6qefnga-RDOP-jbgd6p0k - 1.0 + 1 OutParameter fr.insee j6qefnga-QOP-jbgd6p0k - 1.0 + 1 OutParameter @@ -2157,13 +2157,13 @@ fr.insee j6qefnga-RDOP-jbgd9ato - 1.0 + 1 OutParameter fr.insee j6qefnga-QOP-jbgd9ato - 1.0 + 1 OutParameter @@ -2171,13 +2171,13 @@ fr.insee j6qefnga-RDOP-jbgd3e0p - 1.0 + 1 OutParameter fr.insee j6qefnga-QOP-jbgd3e0p - 1.0 + 1 OutParameter @@ -2185,13 +2185,13 @@ fr.insee j6qefnga-RDOP-jbgdkxne - 1.0 + 1 OutParameter fr.insee j6qefnga-QOP-jbgdkxne - 1.0 + 1 OutParameter @@ -2205,7 +2205,7 @@ fr.insee j6qeytgc - 1.0 + 1 CodeList @@ -2217,18 +2217,18 @@ fr.insee jbdxh138 - 1.0 + 1 CodeList fr.insee j6qefnga-RDOP-jbgd6p0k - 1.0 + 1 fr.insee jbdxh138 - 1.0 + 1 CodeList @@ -2247,18 +2247,18 @@ fr.insee jbdxh138 - 1.0 + 1 CodeList fr.insee j6qefnga-RDOP-jbgd9ato - 1.0 + 1 fr.insee jbdxh138 - 1.0 + 1 CodeList @@ -2277,18 +2277,18 @@ fr.insee jbdxh138 - 1.0 + 1 CodeList fr.insee j6qefnga-RDOP-jbgd3e0p - 1.0 + 1 fr.insee jbdxh138 - 1.0 + 1 CodeList @@ -2307,18 +2307,18 @@ fr.insee jbdxh138 - 1.0 + 1 CodeList fr.insee j6qefnga-RDOP-jbgdkxne - 1.0 + 1 fr.insee jbdxh138 - 1.0 + 1 CodeList @@ -2336,14 +2336,14 @@ fr.insee j6yzoc6g - 1.0 + 1 BIRTH_CHARACTER fr.insee j6yzoc6g-QOP-jbgd7fr6 - 1.0 + 1 BIRTH_CHARACTER1 @@ -2351,7 +2351,7 @@ fr.insee j6yzoc6g-QOP-jbgd5e9f - 1.0 + 1 BIRTH_CHARACTER2 @@ -2359,7 +2359,7 @@ fr.insee j6yzoc6g-QOP-jbgd912x - 1.0 + 1 BIRTH_CHARACTER3 @@ -2367,7 +2367,7 @@ fr.insee j6yzoc6g-QOP-jbgd6bdy - 1.0 + 1 BIRTH_CHARACTER4 @@ -2375,7 +2375,7 @@ fr.insee j6yzoc6g-QOP-jbgddyry - 1.0 + 1 BIRTH_CHARACTER5 @@ -2384,13 +2384,13 @@ fr.insee j6yzoc6g-RDOP-jbgd7fr6 - 1.0 + 1 OutParameter fr.insee j6yzoc6g-QOP-jbgd7fr6 - 1.0 + 1 OutParameter @@ -2398,13 +2398,13 @@ fr.insee j6yzoc6g-RDOP-jbgd5e9f - 1.0 + 1 OutParameter fr.insee j6yzoc6g-QOP-jbgd5e9f - 1.0 + 1 OutParameter @@ -2412,13 +2412,13 @@ fr.insee j6yzoc6g-RDOP-jbgd912x - 1.0 + 1 OutParameter fr.insee j6yzoc6g-QOP-jbgd912x - 1.0 + 1 OutParameter @@ -2426,13 +2426,13 @@ fr.insee j6yzoc6g-RDOP-jbgd6bdy - 1.0 + 1 OutParameter fr.insee j6yzoc6g-QOP-jbgd6bdy - 1.0 + 1 OutParameter @@ -2440,13 +2440,13 @@ fr.insee j6yzoc6g-RDOP-jbgddyry - 1.0 + 1 OutParameter fr.insee j6yzoc6g-QOP-jbgddyry - 1.0 + 1 OutParameter @@ -2460,7 +2460,7 @@ fr.insee j6z087mq - 1.0 + 1 CodeList @@ -2472,18 +2472,18 @@ fr.insee jbdxricm - 1.0 + 1 CodeList fr.insee j6yzoc6g-RDOP-jbgd7fr6 - 1.0 + 1 fr.insee jbdxricm - 1.0 + 1 CodeList @@ -2502,18 +2502,18 @@ fr.insee jbdxricm - 1.0 + 1 CodeList fr.insee j6yzoc6g-RDOP-jbgd5e9f - 1.0 + 1 fr.insee jbdxricm - 1.0 + 1 CodeList @@ -2532,18 +2532,18 @@ fr.insee jbdxricm - 1.0 + 1 CodeList fr.insee j6yzoc6g-RDOP-jbgd912x - 1.0 + 1 fr.insee jbdxricm - 1.0 + 1 CodeList @@ -2562,18 +2562,18 @@ fr.insee jbdxricm - 1.0 + 1 CodeList fr.insee j6yzoc6g-RDOP-jbgd6bdy - 1.0 + 1 fr.insee jbdxricm - 1.0 + 1 CodeList @@ -2592,18 +2592,18 @@ fr.insee jbdxricm - 1.0 + 1 CodeList fr.insee j6yzoc6g-RDOP-jbgddyry - 1.0 + 1 fr.insee jbdxricm - 1.0 + 1 CodeList @@ -2621,14 +2621,14 @@ fr.insee j4nwc63q - 1.0 + 1 PERCENTAGE_EXPENSES fr.insee j4nwc63q-QOP-jbgde5yl - 1.0 + 1 PERCENTAGE_EXPENSES11 @@ -2636,7 +2636,7 @@ fr.insee j4nwc63q-QOP-jbgd2x2t - 1.0 + 1 PERCENTAGE_EXPENSES21 @@ -2644,7 +2644,7 @@ fr.insee j4nwc63q-QOP-jbgdjypz - 1.0 + 1 PERCENTAGE_EXPENSES31 @@ -2652,7 +2652,7 @@ fr.insee j4nwc63q-QOP-jbgdcftu - 1.0 + 1 PERCENTAGE_EXPENSES41 @@ -2660,7 +2660,7 @@ fr.insee j4nwc63q-QOP-jbgdiyfe - 1.0 + 1 PERCENTAGE_EXPENSES51 @@ -2668,7 +2668,7 @@ fr.insee j4nwc63q-QOP-jbgdj1wd - 1.0 + 1 PERCENTAGE_EXPENSES61 @@ -2676,7 +2676,7 @@ fr.insee j4nwc63q-QOP-jbgddylk - 1.0 + 1 PERCENTAGE_EXPENSES71 @@ -2684,7 +2684,7 @@ fr.insee j4nwc63q-QOP-jbgd3jj6 - 1.0 + 1 PERCENTAGE_EXPENSES81 @@ -2692,7 +2692,7 @@ fr.insee j4nwc63q-QOP-jbgd4w3k - 1.0 + 1 PERCENTAGE_EXPENSES91 @@ -2700,7 +2700,7 @@ fr.insee j4nwc63q-QOP-jbgd4w4k - 1.0 + 1 PERCENTAGE_EXPENSES101 @@ -2709,13 +2709,13 @@ fr.insee j4nwc63q-RDOP-jbgde5yl - 1.0 + 1 OutParameter fr.insee j4nwc63q-QOP-jbgde5yl - 1.0 + 1 OutParameter @@ -2723,13 +2723,13 @@ fr.insee j4nwc63q-RDOP-jbgd2x2t - 1.0 + 1 OutParameter fr.insee j4nwc63q-QOP-jbgd2x2t - 1.0 + 1 OutParameter @@ -2737,13 +2737,13 @@ fr.insee j4nwc63q-RDOP-jbgdjypz - 1.0 + 1 OutParameter fr.insee j4nwc63q-QOP-jbgdjypz - 1.0 + 1 OutParameter @@ -2751,13 +2751,13 @@ fr.insee j4nwc63q-RDOP-jbgdcftu - 1.0 + 1 OutParameter fr.insee j4nwc63q-QOP-jbgdcftu - 1.0 + 1 OutParameter @@ -2765,13 +2765,13 @@ fr.insee j4nwc63q-RDOP-jbgdiyfe - 1.0 + 1 OutParameter fr.insee j4nwc63q-QOP-jbgdiyfe - 1.0 + 1 OutParameter @@ -2779,13 +2779,13 @@ fr.insee j4nwc63q-RDOP-jbgdj1wd - 1.0 + 1 OutParameter fr.insee j4nwc63q-QOP-jbgdj1wd - 1.0 + 1 OutParameter @@ -2793,13 +2793,13 @@ fr.insee j4nwc63q-RDOP-jbgddylk - 1.0 + 1 OutParameter fr.insee j4nwc63q-QOP-jbgddylk - 1.0 + 1 OutParameter @@ -2807,13 +2807,13 @@ fr.insee j4nwc63q-RDOP-jbgd3jj6 - 1.0 + 1 OutParameter fr.insee j4nwc63q-QOP-jbgd3jj6 - 1.0 + 1 OutParameter @@ -2821,13 +2821,13 @@ fr.insee j4nwc63q-RDOP-jbgd4w3k - 1.0 + 1 OutParameter fr.insee j4nwc63q-QOP-jbgd4w3k - 1.0 + 1 OutParameter @@ -2835,13 +2835,13 @@ fr.insee j4nwc63q-RDOP-jbgd4w4k - 1.0 + 1 OutParameter fr.insee j4nwc63q-QOP-jbgd4w4k - 1.0 + 1 OutParameter @@ -2856,7 +2856,7 @@ fr.insee j4nwh16i - 1.0 + 1 CodeList @@ -2866,7 +2866,7 @@ fr.insee j4nwc63q-secondDimension-fakeCL-1 - 1.0 + 1 CodeList @@ -2882,7 +2882,7 @@ fr.insee j4nwc63q-RDOP-jbgde5yl - 1.0 + 1 @@ -2902,7 +2902,7 @@ fr.insee j4nwc63q-RDOP-jbgd2x2t - 1.0 + 1 @@ -2922,7 +2922,7 @@ fr.insee j4nwc63q-RDOP-jbgdjypz - 1.0 + 1 @@ -2942,7 +2942,7 @@ fr.insee j4nwc63q-RDOP-jbgdcftu - 1.0 + 1 @@ -2962,7 +2962,7 @@ fr.insee j4nwc63q-RDOP-jbgdiyfe - 1.0 + 1 @@ -2982,7 +2982,7 @@ fr.insee j4nwc63q-RDOP-jbgdj1wd - 1.0 + 1 @@ -3002,7 +3002,7 @@ fr.insee j4nwc63q-RDOP-jbgddylk - 1.0 + 1 @@ -3022,7 +3022,7 @@ fr.insee j4nwc63q-RDOP-jbgd3jj6 - 1.0 + 1 @@ -3042,7 +3042,7 @@ fr.insee j4nwc63q-RDOP-jbgd4w3k - 1.0 + 1 @@ -3062,7 +3062,7 @@ fr.insee j4nwc63q-RDOP-jbgd4w4k - 1.0 + 1 @@ -3077,14 +3077,14 @@ fr.insee j4nw0rr6 - 1.0 + 1 CLOWNING fr.insee j4nw0rr6-QOP-jbgd8tyr - 1.0 + 1 CLOWNING11 @@ -3092,7 +3092,7 @@ fr.insee j4nw0rr6-QOP-jbgdep36 - 1.0 + 1 CLOWNING21 @@ -3100,7 +3100,7 @@ fr.insee j4nw0rr6-QOP-jbgdjjgi - 1.0 + 1 CLOWNING31 @@ -3108,7 +3108,7 @@ fr.insee j4nw0rr6-QOP-jbgdgh6k - 1.0 + 1 CLOWNING41 @@ -3116,7 +3116,7 @@ fr.insee j4nw0rr6-QOP-jbgdit3o - 1.0 + 1 CLOWNING12 @@ -3124,7 +3124,7 @@ fr.insee j4nw0rr6-QOP-jbgd366k - 1.0 + 1 CLOWNING22 @@ -3132,7 +3132,7 @@ fr.insee j4nw0rr6-QOP-jbgdax06 - 1.0 + 1 CLOWNING32 @@ -3140,7 +3140,7 @@ fr.insee j4nw0rr6-QOP-jbgdfo1j - 1.0 + 1 CLOWNING42 @@ -3149,13 +3149,13 @@ fr.insee j4nw0rr6-RDOP-jbgd8tyr - 1.0 + 1 OutParameter fr.insee j4nw0rr6-QOP-jbgd8tyr - 1.0 + 1 OutParameter @@ -3163,13 +3163,13 @@ fr.insee j4nw0rr6-RDOP-jbgdep36 - 1.0 + 1 OutParameter fr.insee j4nw0rr6-QOP-jbgdep36 - 1.0 + 1 OutParameter @@ -3177,13 +3177,13 @@ fr.insee j4nw0rr6-RDOP-jbgdjjgi - 1.0 + 1 OutParameter fr.insee j4nw0rr6-QOP-jbgdjjgi - 1.0 + 1 OutParameter @@ -3191,13 +3191,13 @@ fr.insee j4nw0rr6-RDOP-jbgdgh6k - 1.0 + 1 OutParameter fr.insee j4nw0rr6-QOP-jbgdgh6k - 1.0 + 1 OutParameter @@ -3205,13 +3205,13 @@ fr.insee j4nw0rr6-RDOP-jbgdit3o - 1.0 + 1 OutParameter fr.insee j4nw0rr6-QOP-jbgdit3o - 1.0 + 1 OutParameter @@ -3219,13 +3219,13 @@ fr.insee j4nw0rr6-RDOP-jbgd366k - 1.0 + 1 OutParameter fr.insee j4nw0rr6-QOP-jbgd366k - 1.0 + 1 OutParameter @@ -3233,13 +3233,13 @@ fr.insee j4nw0rr6-RDOP-jbgdax06 - 1.0 + 1 OutParameter fr.insee j4nw0rr6-QOP-jbgdax06 - 1.0 + 1 OutParameter @@ -3247,13 +3247,13 @@ fr.insee j4nw0rr6-RDOP-jbgdfo1j - 1.0 + 1 OutParameter fr.insee j4nw0rr6-QOP-jbgdfo1j - 1.0 + 1 OutParameter @@ -3267,7 +3267,7 @@ fr.insee j77dav9b - 1.0 + 1 CodeList @@ -3277,7 +3277,7 @@ fr.insee j4nw0rr6-secondDimension-fakeCL-1 - 1.0 + 1 CodeList @@ -3289,18 +3289,18 @@ fr.insee jbdyh6b5 - 1.0 + 1 CodeList fr.insee j4nw0rr6-RDOP-jbgd8tyr - 1.0 + 1 fr.insee jbdyh6b5 - 1.0 + 1 CodeList @@ -3320,18 +3320,18 @@ fr.insee jbdyh6b5 - 1.0 + 1 CodeList fr.insee j4nw0rr6-RDOP-jbgdep36 - 1.0 + 1 fr.insee jbdyh6b5 - 1.0 + 1 CodeList @@ -3351,18 +3351,18 @@ fr.insee jbdyh6b5 - 1.0 + 1 CodeList fr.insee j4nw0rr6-RDOP-jbgdjjgi - 1.0 + 1 fr.insee jbdyh6b5 - 1.0 + 1 CodeList @@ -3382,18 +3382,18 @@ fr.insee jbdyh6b5 - 1.0 + 1 CodeList fr.insee j4nw0rr6-RDOP-jbgdgh6k - 1.0 + 1 fr.insee jbdyh6b5 - 1.0 + 1 CodeList @@ -3412,7 +3412,7 @@ fr.insee j4nw0rr6-RDOP-jbgdit3o - 1.0 + 1 @@ -3428,7 +3428,7 @@ fr.insee j4nw0rr6-RDOP-jbgd366k - 1.0 + 1 @@ -3444,7 +3444,7 @@ fr.insee j4nw0rr6-RDOP-jbgdax06 - 1.0 + 1 @@ -3460,7 +3460,7 @@ fr.insee j4nw0rr6-RDOP-jbgdfo1j - 1.0 + 1 @@ -3476,14 +3476,14 @@ fr.insee j6p2lwuj - 1.0 + 1 TRAVEL fr.insee j6p2lwuj-QOP-jbgd92mb - 1.0 + 1 TRAVEL11 @@ -3491,7 +3491,7 @@ fr.insee j6p2lwuj-QOP-jbgdgsat - 1.0 + 1 TRAVEL21 @@ -3499,7 +3499,7 @@ fr.insee j6p2lwuj-QOP-jbgdaxk2 - 1.0 + 1 TRAVEL31 @@ -3507,7 +3507,7 @@ fr.insee j6p2lwuj-QOP-jbgd7myn - 1.0 + 1 TRAVEL41 @@ -3515,7 +3515,7 @@ fr.insee j6p2lwuj-QOP-jbgdnxkt - 1.0 + 1 TRAVEL12 @@ -3523,7 +3523,7 @@ fr.insee j6p2lwuj-QOP-jbgd3ef5 - 1.0 + 1 TRAVEL22 @@ -3531,7 +3531,7 @@ fr.insee j6p2lwuj-QOP-jbgd8p1v - 1.0 + 1 TRAVEL32 @@ -3539,7 +3539,7 @@ fr.insee j6p2lwuj-QOP-jbgdgm0c - 1.0 + 1 TRAVEL42 @@ -3547,7 +3547,7 @@ fr.insee j6p2lwuj-QOP-jbgdcppc - 1.0 + 1 TRAVEL13 @@ -3555,7 +3555,7 @@ fr.insee j6p2lwuj-QOP-jbgd4cm6 - 1.0 + 1 TRAVEL23 @@ -3563,7 +3563,7 @@ fr.insee j6p2lwuj-QOP-jbgdd2lo - 1.0 + 1 TRAVEL33 @@ -3571,7 +3571,7 @@ fr.insee j6p2lwuj-QOP-jbgdo0ay - 1.0 + 1 TRAVEL43 @@ -3579,7 +3579,7 @@ fr.insee j6p2lwuj-QOP-jbgd4r2a - 1.0 + 1 TRAVEL14 @@ -3587,7 +3587,7 @@ fr.insee j6p2lwuj-QOP-jbgdkfpq - 1.0 + 1 TRAVEL24 @@ -3595,7 +3595,7 @@ fr.insee j6p2lwuj-QOP-jbgd7u52 - 1.0 + 1 TRAVEL34 @@ -3603,7 +3603,7 @@ fr.insee j6p2lwuj-QOP-jbgdgfwl - 1.0 + 1 TRAVEL44 @@ -3611,7 +3611,7 @@ fr.insee j6p2lwuj-QOP-jbgd9cff - 1.0 + 1 TRAVEL15 @@ -3619,7 +3619,7 @@ fr.insee j6p2lwuj-QOP-jbgddwsp - 1.0 + 1 TRAVEL25 @@ -3627,7 +3627,7 @@ fr.insee j6p2lwuj-QOP-jbgdncn8 - 1.0 + 1 TRAVEL35 @@ -3635,7 +3635,7 @@ fr.insee j6p2lwuj-QOP-jbgdnz6b - 1.0 + 1 TRAVEL45 @@ -3643,7 +3643,7 @@ fr.insee j6p2lwuj-QOP-jbgdiva0 - 1.0 + 1 TRAVEL16 @@ -3651,7 +3651,7 @@ fr.insee j6p2lwuj-QOP-jbgd7dqf - 1.0 + 1 TRAVEL26 @@ -3659,7 +3659,7 @@ fr.insee j6p2lwuj-QOP-jbgdnous - 1.0 + 1 TRAVEL36 @@ -3667,7 +3667,7 @@ fr.insee j6p2lwuj-QOP-jbgdkfcz - 1.0 + 1 TRAVEL46 @@ -3676,13 +3676,13 @@ fr.insee j6p2lwuj-RDOP-jbgd92mb - 1.0 + 1 OutParameter fr.insee j6p2lwuj-QOP-jbgd92mb - 1.0 + 1 OutParameter @@ -3690,13 +3690,13 @@ fr.insee j6p2lwuj-RDOP-jbgdgsat - 1.0 + 1 OutParameter fr.insee j6p2lwuj-QOP-jbgdgsat - 1.0 + 1 OutParameter @@ -3704,13 +3704,13 @@ fr.insee j6p2lwuj-RDOP-jbgdaxk2 - 1.0 + 1 OutParameter fr.insee j6p2lwuj-QOP-jbgdaxk2 - 1.0 + 1 OutParameter @@ -3718,13 +3718,13 @@ fr.insee j6p2lwuj-RDOP-jbgd7myn - 1.0 + 1 OutParameter fr.insee j6p2lwuj-QOP-jbgd7myn - 1.0 + 1 OutParameter @@ -3732,13 +3732,13 @@ fr.insee j6p2lwuj-RDOP-jbgdnxkt - 1.0 + 1 OutParameter fr.insee j6p2lwuj-QOP-jbgdnxkt - 1.0 + 1 OutParameter @@ -3746,13 +3746,13 @@ fr.insee j6p2lwuj-RDOP-jbgd3ef5 - 1.0 + 1 OutParameter fr.insee j6p2lwuj-QOP-jbgd3ef5 - 1.0 + 1 OutParameter @@ -3760,13 +3760,13 @@ fr.insee j6p2lwuj-RDOP-jbgd8p1v - 1.0 + 1 OutParameter fr.insee j6p2lwuj-QOP-jbgd8p1v - 1.0 + 1 OutParameter @@ -3774,13 +3774,13 @@ fr.insee j6p2lwuj-RDOP-jbgdgm0c - 1.0 + 1 OutParameter fr.insee j6p2lwuj-QOP-jbgdgm0c - 1.0 + 1 OutParameter @@ -3788,13 +3788,13 @@ fr.insee j6p2lwuj-RDOP-jbgdcppc - 1.0 + 1 OutParameter fr.insee j6p2lwuj-QOP-jbgdcppc - 1.0 + 1 OutParameter @@ -3802,13 +3802,13 @@ fr.insee j6p2lwuj-RDOP-jbgd4cm6 - 1.0 + 1 OutParameter fr.insee j6p2lwuj-QOP-jbgd4cm6 - 1.0 + 1 OutParameter @@ -3816,13 +3816,13 @@ fr.insee j6p2lwuj-RDOP-jbgdd2lo - 1.0 + 1 OutParameter fr.insee j6p2lwuj-QOP-jbgdd2lo - 1.0 + 1 OutParameter @@ -3830,13 +3830,13 @@ fr.insee j6p2lwuj-RDOP-jbgdo0ay - 1.0 + 1 OutParameter fr.insee j6p2lwuj-QOP-jbgdo0ay - 1.0 + 1 OutParameter @@ -3844,13 +3844,13 @@ fr.insee j6p2lwuj-RDOP-jbgd4r2a - 1.0 + 1 OutParameter fr.insee j6p2lwuj-QOP-jbgd4r2a - 1.0 + 1 OutParameter @@ -3858,13 +3858,13 @@ fr.insee j6p2lwuj-RDOP-jbgdkfpq - 1.0 + 1 OutParameter fr.insee j6p2lwuj-QOP-jbgdkfpq - 1.0 + 1 OutParameter @@ -3872,13 +3872,13 @@ fr.insee j6p2lwuj-RDOP-jbgd7u52 - 1.0 + 1 OutParameter fr.insee j6p2lwuj-QOP-jbgd7u52 - 1.0 + 1 OutParameter @@ -3886,13 +3886,13 @@ fr.insee j6p2lwuj-RDOP-jbgdgfwl - 1.0 + 1 OutParameter fr.insee j6p2lwuj-QOP-jbgdgfwl - 1.0 + 1 OutParameter @@ -3900,13 +3900,13 @@ fr.insee j6p2lwuj-RDOP-jbgd9cff - 1.0 + 1 OutParameter fr.insee j6p2lwuj-QOP-jbgd9cff - 1.0 + 1 OutParameter @@ -3914,13 +3914,13 @@ fr.insee j6p2lwuj-RDOP-jbgddwsp - 1.0 + 1 OutParameter fr.insee j6p2lwuj-QOP-jbgddwsp - 1.0 + 1 OutParameter @@ -3928,13 +3928,13 @@ fr.insee j6p2lwuj-RDOP-jbgdncn8 - 1.0 + 1 OutParameter fr.insee j6p2lwuj-QOP-jbgdncn8 - 1.0 + 1 OutParameter @@ -3942,13 +3942,13 @@ fr.insee j6p2lwuj-RDOP-jbgdnz6b - 1.0 + 1 OutParameter fr.insee j6p2lwuj-QOP-jbgdnz6b - 1.0 + 1 OutParameter @@ -3956,13 +3956,13 @@ fr.insee j6p2lwuj-RDOP-jbgdiva0 - 1.0 + 1 OutParameter fr.insee j6p2lwuj-QOP-jbgdiva0 - 1.0 + 1 OutParameter @@ -3970,13 +3970,13 @@ fr.insee j6p2lwuj-RDOP-jbgd7dqf - 1.0 + 1 OutParameter fr.insee j6p2lwuj-QOP-jbgd7dqf - 1.0 + 1 OutParameter @@ -3984,13 +3984,13 @@ fr.insee j6p2lwuj-RDOP-jbgdnous - 1.0 + 1 OutParameter fr.insee j6p2lwuj-QOP-jbgdnous - 1.0 + 1 OutParameter @@ -3998,13 +3998,13 @@ fr.insee j6p2lwuj-RDOP-jbgdkfcz - 1.0 + 1 OutParameter fr.insee j6p2lwuj-QOP-jbgdkfcz - 1.0 + 1 OutParameter @@ -4019,7 +4019,7 @@ fr.insee j6p2kivg - 1.0 + 1 CodeList @@ -4029,7 +4029,7 @@ fr.insee jbdye1wa - 1.0 + 1 CodeList @@ -4040,14 +4040,14 @@ fr.insee j6p2lwuj-RDOP-jbgd92mb - 1.0 + 1 fr.insee INSEE-COMMUN-CL-Booleen-1 - 1.0 + 1 Code @@ -4069,14 +4069,14 @@ fr.insee j6p2lwuj-RDOP-jbgdgsat - 1.0 + 1 fr.insee INSEE-COMMUN-CL-Booleen-1 - 1.0 + 1 Code @@ -4098,14 +4098,14 @@ fr.insee j6p2lwuj-RDOP-jbgdaxk2 - 1.0 + 1 fr.insee INSEE-COMMUN-CL-Booleen-1 - 1.0 + 1 Code @@ -4127,14 +4127,14 @@ fr.insee j6p2lwuj-RDOP-jbgd7myn - 1.0 + 1 fr.insee INSEE-COMMUN-CL-Booleen-1 - 1.0 + 1 Code @@ -4156,14 +4156,14 @@ fr.insee j6p2lwuj-RDOP-jbgdnxkt - 1.0 + 1 fr.insee INSEE-COMMUN-CL-Booleen-1 - 1.0 + 1 Code @@ -4185,14 +4185,14 @@ fr.insee j6p2lwuj-RDOP-jbgd3ef5 - 1.0 + 1 fr.insee INSEE-COMMUN-CL-Booleen-1 - 1.0 + 1 Code @@ -4214,14 +4214,14 @@ fr.insee j6p2lwuj-RDOP-jbgd8p1v - 1.0 + 1 fr.insee INSEE-COMMUN-CL-Booleen-1 - 1.0 + 1 Code @@ -4243,14 +4243,14 @@ fr.insee j6p2lwuj-RDOP-jbgdgm0c - 1.0 + 1 fr.insee INSEE-COMMUN-CL-Booleen-1 - 1.0 + 1 Code @@ -4272,14 +4272,14 @@ fr.insee j6p2lwuj-RDOP-jbgdcppc - 1.0 + 1 fr.insee INSEE-COMMUN-CL-Booleen-1 - 1.0 + 1 Code @@ -4301,14 +4301,14 @@ fr.insee j6p2lwuj-RDOP-jbgd4cm6 - 1.0 + 1 fr.insee INSEE-COMMUN-CL-Booleen-1 - 1.0 + 1 Code @@ -4330,14 +4330,14 @@ fr.insee j6p2lwuj-RDOP-jbgdd2lo - 1.0 + 1 fr.insee INSEE-COMMUN-CL-Booleen-1 - 1.0 + 1 Code @@ -4359,14 +4359,14 @@ fr.insee j6p2lwuj-RDOP-jbgdo0ay - 1.0 + 1 fr.insee INSEE-COMMUN-CL-Booleen-1 - 1.0 + 1 Code @@ -4388,14 +4388,14 @@ fr.insee j6p2lwuj-RDOP-jbgd4r2a - 1.0 + 1 fr.insee INSEE-COMMUN-CL-Booleen-1 - 1.0 + 1 Code @@ -4417,14 +4417,14 @@ fr.insee j6p2lwuj-RDOP-jbgdkfpq - 1.0 + 1 fr.insee INSEE-COMMUN-CL-Booleen-1 - 1.0 + 1 Code @@ -4446,14 +4446,14 @@ fr.insee j6p2lwuj-RDOP-jbgd7u52 - 1.0 + 1 fr.insee INSEE-COMMUN-CL-Booleen-1 - 1.0 + 1 Code @@ -4475,14 +4475,14 @@ fr.insee j6p2lwuj-RDOP-jbgdgfwl - 1.0 + 1 fr.insee INSEE-COMMUN-CL-Booleen-1 - 1.0 + 1 Code @@ -4504,14 +4504,14 @@ fr.insee j6p2lwuj-RDOP-jbgd9cff - 1.0 + 1 fr.insee INSEE-COMMUN-CL-Booleen-1 - 1.0 + 1 Code @@ -4533,14 +4533,14 @@ fr.insee j6p2lwuj-RDOP-jbgddwsp - 1.0 + 1 fr.insee INSEE-COMMUN-CL-Booleen-1 - 1.0 + 1 Code @@ -4562,14 +4562,14 @@ fr.insee j6p2lwuj-RDOP-jbgdncn8 - 1.0 + 1 fr.insee INSEE-COMMUN-CL-Booleen-1 - 1.0 + 1 Code @@ -4591,14 +4591,14 @@ fr.insee j6p2lwuj-RDOP-jbgdnz6b - 1.0 + 1 fr.insee INSEE-COMMUN-CL-Booleen-1 - 1.0 + 1 Code @@ -4620,14 +4620,14 @@ fr.insee j6p2lwuj-RDOP-jbgdiva0 - 1.0 + 1 fr.insee INSEE-COMMUN-CL-Booleen-1 - 1.0 + 1 Code @@ -4649,14 +4649,14 @@ fr.insee j6p2lwuj-RDOP-jbgd7dqf - 1.0 + 1 fr.insee INSEE-COMMUN-CL-Booleen-1 - 1.0 + 1 Code @@ -4678,14 +4678,14 @@ fr.insee j6p2lwuj-RDOP-jbgdnous - 1.0 + 1 fr.insee INSEE-COMMUN-CL-Booleen-1 - 1.0 + 1 Code @@ -4707,14 +4707,14 @@ fr.insee j6p2lwuj-RDOP-jbgdkfcz - 1.0 + 1 fr.insee INSEE-COMMUN-CL-Booleen-1 - 1.0 + 1 Code @@ -4735,21 +4735,21 @@ fr.insee d10 - 1.0 + 1 Instruction fr.insee j6qg8rc6 - 1.0 + 1 FAVOURITE_CHARACTERS fr.insee j6qg8rc6-QOP-jbgdl5jb - 1.0 + 1 FAVOURITE_CHARACTERS11 @@ -4757,7 +4757,7 @@ fr.insee j6qg8rc6-QOP-jbgd8lwo - 1.0 + 1 FAVOURITE_CHARACTERS21 @@ -4765,7 +4765,7 @@ fr.insee j6qg8rc6-QOP-jbgdbfag - 1.0 + 1 FAVOURITE_CHARACTERS31 @@ -4773,7 +4773,7 @@ fr.insee j6qg8rc6-QOP-jbgdlgja - 1.0 + 1 FAVOURITE_CHARACTERS41 @@ -4781,7 +4781,7 @@ fr.insee j6qg8rc6-QOP-jbgd745y - 1.0 + 1 FAVOURITE_CHARACTERS51 @@ -4789,7 +4789,7 @@ fr.insee j6qg8rc6-QOP-jbgdjkts - 1.0 + 1 FAVOURITE_CHARACTERS61 @@ -4797,7 +4797,7 @@ fr.insee j6qg8rc6-QOP-jbgdcax7 - 1.0 + 1 FAVOURITE_CHARACTERS71 @@ -4805,7 +4805,7 @@ fr.insee j6qg8rc6-QOP-jbgdjye1 - 1.0 + 1 FAVOURITE_CHARACTERS81 @@ -4813,7 +4813,7 @@ fr.insee j6qg8rc6-QOP-jbgd5jet - 1.0 + 1 FAVOURITE_CHARACTERS91 @@ -4821,7 +4821,7 @@ fr.insee j6qg8rc6-QOP-jbgdjw90 - 1.0 + 1 FAVOURITE_CHARACTERS101 @@ -4829,7 +4829,7 @@ fr.insee j6qg8rc6-QOP-jbgdfndq - 1.0 + 1 FAVOURITE_CHARACTERS12 @@ -4837,7 +4837,7 @@ fr.insee j6qg8rc6-QOP-jbgd7osi - 1.0 + 1 FAVOURITE_CHARACTERS22 @@ -4845,7 +4845,7 @@ fr.insee j6qg8rc6-QOP-jbgd7bnw - 1.0 + 1 FAVOURITE_CHARACTERS32 @@ -4853,7 +4853,7 @@ fr.insee j6qg8rc6-QOP-jbgd9k71 - 1.0 + 1 FAVOURITE_CHARACTERS42 @@ -4861,7 +4861,7 @@ fr.insee j6qg8rc6-QOP-jbgdimks - 1.0 + 1 FAVOURITE_CHARACTERS52 @@ -4869,7 +4869,7 @@ fr.insee j6qg8rc6-QOP-jbgdjquz - 1.0 + 1 FAVOURITE_CHARACTERS62 @@ -4877,7 +4877,7 @@ fr.insee j6qg8rc6-QOP-jbgdd2w3 - 1.0 + 1 FAVOURITE_CHARACTERS72 @@ -4885,7 +4885,7 @@ fr.insee j6qg8rc6-QOP-jbgdkosc - 1.0 + 1 FAVOURITE_CHARACTERS82 @@ -4893,7 +4893,7 @@ fr.insee j6qg8rc6-QOP-jbgdk0x4 - 1.0 + 1 FAVOURITE_CHARACTERS92 @@ -4901,7 +4901,7 @@ fr.insee j6qg8rc6-QOP-jbgd2wgf - 1.0 + 1 FAVOURITE_CHARACTERS102 @@ -4910,13 +4910,13 @@ fr.insee j6qg8rc6-RDOP-jbgdl5jb - 1.0 + 1 OutParameter fr.insee j6qg8rc6-QOP-jbgdl5jb - 1.0 + 1 OutParameter @@ -4924,13 +4924,13 @@ fr.insee j6qg8rc6-RDOP-jbgd8lwo - 1.0 + 1 OutParameter fr.insee j6qg8rc6-QOP-jbgd8lwo - 1.0 + 1 OutParameter @@ -4938,13 +4938,13 @@ fr.insee j6qg8rc6-RDOP-jbgdbfag - 1.0 + 1 OutParameter fr.insee j6qg8rc6-QOP-jbgdbfag - 1.0 + 1 OutParameter @@ -4952,13 +4952,13 @@ fr.insee j6qg8rc6-RDOP-jbgdlgja - 1.0 + 1 OutParameter fr.insee j6qg8rc6-QOP-jbgdlgja - 1.0 + 1 OutParameter @@ -4966,13 +4966,13 @@ fr.insee j6qg8rc6-RDOP-jbgd745y - 1.0 + 1 OutParameter fr.insee j6qg8rc6-QOP-jbgd745y - 1.0 + 1 OutParameter @@ -4980,13 +4980,13 @@ fr.insee j6qg8rc6-RDOP-jbgdjkts - 1.0 + 1 OutParameter fr.insee j6qg8rc6-QOP-jbgdjkts - 1.0 + 1 OutParameter @@ -4994,13 +4994,13 @@ fr.insee j6qg8rc6-RDOP-jbgdcax7 - 1.0 + 1 OutParameter fr.insee j6qg8rc6-QOP-jbgdcax7 - 1.0 + 1 OutParameter @@ -5008,13 +5008,13 @@ fr.insee j6qg8rc6-RDOP-jbgdjye1 - 1.0 + 1 OutParameter fr.insee j6qg8rc6-QOP-jbgdjye1 - 1.0 + 1 OutParameter @@ -5022,13 +5022,13 @@ fr.insee j6qg8rc6-RDOP-jbgd5jet - 1.0 + 1 OutParameter fr.insee j6qg8rc6-QOP-jbgd5jet - 1.0 + 1 OutParameter @@ -5036,13 +5036,13 @@ fr.insee j6qg8rc6-RDOP-jbgdjw90 - 1.0 + 1 OutParameter fr.insee j6qg8rc6-QOP-jbgdjw90 - 1.0 + 1 OutParameter @@ -5050,13 +5050,13 @@ fr.insee j6qg8rc6-RDOP-jbgdfndq - 1.0 + 1 OutParameter fr.insee j6qg8rc6-QOP-jbgdfndq - 1.0 + 1 OutParameter @@ -5064,13 +5064,13 @@ fr.insee j6qg8rc6-RDOP-jbgd7osi - 1.0 + 1 OutParameter fr.insee j6qg8rc6-QOP-jbgd7osi - 1.0 + 1 OutParameter @@ -5078,13 +5078,13 @@ fr.insee j6qg8rc6-RDOP-jbgd7bnw - 1.0 + 1 OutParameter fr.insee j6qg8rc6-QOP-jbgd7bnw - 1.0 + 1 OutParameter @@ -5092,13 +5092,13 @@ fr.insee j6qg8rc6-RDOP-jbgd9k71 - 1.0 + 1 OutParameter fr.insee j6qg8rc6-QOP-jbgd9k71 - 1.0 + 1 OutParameter @@ -5106,13 +5106,13 @@ fr.insee j6qg8rc6-RDOP-jbgdimks - 1.0 + 1 OutParameter fr.insee j6qg8rc6-QOP-jbgdimks - 1.0 + 1 OutParameter @@ -5120,13 +5120,13 @@ fr.insee j6qg8rc6-RDOP-jbgdjquz - 1.0 + 1 OutParameter fr.insee j6qg8rc6-QOP-jbgdjquz - 1.0 + 1 OutParameter @@ -5134,13 +5134,13 @@ fr.insee j6qg8rc6-RDOP-jbgdd2w3 - 1.0 + 1 OutParameter fr.insee j6qg8rc6-QOP-jbgdd2w3 - 1.0 + 1 OutParameter @@ -5148,13 +5148,13 @@ fr.insee j6qg8rc6-RDOP-jbgdkosc - 1.0 + 1 OutParameter fr.insee j6qg8rc6-QOP-jbgdkosc - 1.0 + 1 OutParameter @@ -5162,13 +5162,13 @@ fr.insee j6qg8rc6-RDOP-jbgdk0x4 - 1.0 + 1 OutParameter fr.insee j6qg8rc6-QOP-jbgdk0x4 - 1.0 + 1 OutParameter @@ -5176,13 +5176,13 @@ fr.insee j6qg8rc6-RDOP-jbgd2wgf - 1.0 + 1 OutParameter fr.insee j6qg8rc6-QOP-jbgd2wgf - 1.0 + 1 OutParameter @@ -5199,7 +5199,7 @@ fr.insee j6qg8rc6-secondDimension-fakeCL-1 - 1.0 + 1 CodeList @@ -5210,7 +5210,7 @@ fr.insee j6qg8rc6-RDOP-jbgdl5jb - 1.0 + 1 @@ -5226,7 +5226,7 @@ fr.insee j6qg8rc6-RDOP-jbgd8lwo - 1.0 + 1 @@ -5242,7 +5242,7 @@ fr.insee j6qg8rc6-RDOP-jbgdbfag - 1.0 + 1 @@ -5258,7 +5258,7 @@ fr.insee j6qg8rc6-RDOP-jbgdlgja - 1.0 + 1 @@ -5274,7 +5274,7 @@ fr.insee j6qg8rc6-RDOP-jbgd745y - 1.0 + 1 @@ -5290,7 +5290,7 @@ fr.insee j6qg8rc6-RDOP-jbgdjkts - 1.0 + 1 @@ -5306,7 +5306,7 @@ fr.insee j6qg8rc6-RDOP-jbgdcax7 - 1.0 + 1 @@ -5322,7 +5322,7 @@ fr.insee j6qg8rc6-RDOP-jbgdjye1 - 1.0 + 1 @@ -5338,7 +5338,7 @@ fr.insee j6qg8rc6-RDOP-jbgd5jet - 1.0 + 1 @@ -5354,7 +5354,7 @@ fr.insee j6qg8rc6-RDOP-jbgdjw90 - 1.0 + 1 @@ -5375,7 +5375,7 @@ fr.insee j6qg8rc6-RDOP-jbgdfndq - 1.0 + 1 @@ -5395,7 +5395,7 @@ fr.insee j6qg8rc6-RDOP-jbgd7osi - 1.0 + 1 @@ -5415,7 +5415,7 @@ fr.insee j6qg8rc6-RDOP-jbgd7bnw - 1.0 + 1 @@ -5435,7 +5435,7 @@ fr.insee j6qg8rc6-RDOP-jbgd9k71 - 1.0 + 1 @@ -5455,7 +5455,7 @@ fr.insee j6qg8rc6-RDOP-jbgdimks - 1.0 + 1 @@ -5475,7 +5475,7 @@ fr.insee j6qg8rc6-RDOP-jbgdjquz - 1.0 + 1 @@ -5495,7 +5495,7 @@ fr.insee j6qg8rc6-RDOP-jbgdd2w3 - 1.0 + 1 @@ -5515,7 +5515,7 @@ fr.insee j6qg8rc6-RDOP-jbgdkosc - 1.0 + 1 @@ -5535,7 +5535,7 @@ fr.insee j6qg8rc6-RDOP-jbgdk0x4 - 1.0 + 1 @@ -5555,7 +5555,7 @@ fr.insee j6qg8rc6-RDOP-jbgd2wgf - 1.0 + 1 @@ -5571,14 +5571,14 @@ fr.insee CategoryScheme-j334iumu - 1.0 + 1 TOWN fr.insee CA-j334iumu-1 - 1.0 + 1 Springfield @@ -5586,7 +5586,7 @@ fr.insee CA-j334iumu-2 - 1.0 + 1 Shelbyville @@ -5594,7 +5594,7 @@ fr.insee CA-j334iumu-3 - 1.0 + 1 Seinfeld @@ -5603,14 +5603,14 @@ fr.insee CategoryScheme-j6qdqoen - 1.0 + 1 MAYOR fr.insee CA-j6qdqoen-1 - 1.0 + 1 Constance Harm @@ -5618,7 +5618,7 @@ fr.insee CA-j6qdqoen-2 - 1.0 + 1 Timothy Lovejoy @@ -5626,7 +5626,7 @@ fr.insee CA-j6qdqoen-3 - 1.0 + 1 Joe Quimby @@ -5634,7 +5634,7 @@ fr.insee CA-j6qdqoen-4 - 1.0 + 1 Poochie @@ -5643,14 +5643,14 @@ fr.insee CategoryScheme-j4nwo00f - 1.0 + 1 State fr.insee CA-j4nwo00f-1 - 1.0 + 1 Washington @@ -5658,7 +5658,7 @@ fr.insee CA-j4nwo00f-2 - 1.0 + 1 Kentucky @@ -5666,7 +5666,7 @@ fr.insee CA-j4nwo00f-3 - 1.0 + 1 Ohio @@ -5674,7 +5674,7 @@ fr.insee CA-j4nwo00f-4 - 1.0 + 1 Maine @@ -5682,7 +5682,7 @@ fr.insee CA-j4nwo00f-5 - 1.0 + 1 North Dakota @@ -5690,7 +5690,7 @@ fr.insee CA-j4nwo00f-6 - 1.0 + 1 Florida @@ -5698,7 +5698,7 @@ fr.insee CA-j4nwo00f-7 - 1.0 + 1 North Takoma @@ -5706,7 +5706,7 @@ fr.insee CA-j4nwo00f-8 - 1.0 + 1 California @@ -5714,7 +5714,7 @@ fr.insee CA-j4nwo00f-9 - 1.0 + 1 Texas @@ -5722,7 +5722,7 @@ fr.insee CA-j4nwo00f-10 - 1.0 + 1 Massachusetts @@ -5730,7 +5730,7 @@ fr.insee CA-j4nwo00f-11 - 1.0 + 1 Nevada @@ -5738,7 +5738,7 @@ fr.insee CA-j4nwo00f-12 - 1.0 + 1 Illinois @@ -5746,7 +5746,7 @@ fr.insee CA-j4nwo00f-13 - 1.0 + 1 Not in any state, you fool! @@ -5755,14 +5755,14 @@ fr.insee CategoryScheme-j335cu3c - 1.0 + 1 ANIMALS fr.insee CA-j335cu3c-1 - 1.0 + 1 Santa's Little Helper @@ -5770,7 +5770,7 @@ fr.insee CA-j335cu3c-2 - 1.0 + 1 Snowball I @@ -5778,7 +5778,7 @@ fr.insee CA-j335cu3c-3 - 1.0 + 1 Coltrane @@ -5786,7 +5786,7 @@ fr.insee CA-j335cu3c-4 - 1.0 + 1 Mojo the Helper Monkey @@ -5795,14 +5795,14 @@ fr.insee CategoryScheme-j6p2mvca - 1.0 + 1 Flavours fr.insee CA-j6p2mvca-1 - 1.0 + 1 Vanilla @@ -5810,7 +5810,7 @@ fr.insee CA-j6p2mvca-2 - 1.0 + 1 Strawberry @@ -5818,7 +5818,7 @@ fr.insee CA-j6p2mvca-3 - 1.0 + 1 Apple @@ -5826,7 +5826,7 @@ fr.insee CA-j6p2mvca-4 - 1.0 + 1 Bacon @@ -5835,14 +5835,14 @@ fr.insee CategoryScheme-jbdxh138 - 1.0 + 1 YESNO fr.insee CA-jbdxh138-1 - 1.0 + 1 Yes @@ -5850,7 +5850,7 @@ fr.insee CA-jbdxh138-2 - 1.0 + 1 No @@ -5859,14 +5859,14 @@ fr.insee CategoryScheme-j6qeytgc - 1.0 + 1 NUCLEAR_CHARACTERS fr.insee CA-j6qeytgc-1 - 1.0 + 1 Charles Montgomery Burns @@ -5874,7 +5874,7 @@ fr.insee CA-j6qeytgc-2 - 1.0 + 1 Carl Carlson @@ -5882,7 +5882,7 @@ fr.insee CA-j6qeytgc-3 - 1.0 + 1 Otto Mann @@ -5890,7 +5890,7 @@ fr.insee CA-j6qeytgc-4 - 1.0 + 1 Carl Carlson @@ -5899,14 +5899,14 @@ fr.insee CategoryScheme-j6z087mq - 1.0 + 1 BIRTH_CHARACTER fr.insee CA-j6z087mq-1 - 1.0 + 1 Selma Bouvier @@ -5914,7 +5914,7 @@ fr.insee CA-j6z087mq-2 - 1.0 + 1 Kent Brockman @@ -5922,7 +5922,7 @@ fr.insee CA-j6z087mq-3 - 1.0 + 1 Milhouse Van Houten @@ -5930,7 +5930,7 @@ fr.insee CA-j6z087mq-4 - 1.0 + 1 Nelson Muntz @@ -5938,7 +5938,7 @@ fr.insee CA-j6z087mq-5 - 1.0 + 1 Crazy Cat Lady @@ -5947,14 +5947,14 @@ fr.insee CategoryScheme-jbdxricm - 1.0 + 1 CITY_BIRTH fr.insee CA-jbdxricm-1 - 1.0 + 1 Albuquerque @@ -5962,7 +5962,7 @@ fr.insee CA-jbdxricm-2 - 1.0 + 1 Springfield @@ -5970,7 +5970,7 @@ fr.insee CA-jbdxricm-3 - 1.0 + 1 Portland @@ -5978,7 +5978,7 @@ fr.insee CA-jbdxricm-4 - 1.0 + 1 Shelbyville @@ -5986,7 +5986,7 @@ fr.insee CA-jbdxricm-5 - 1.0 + 1 Dagstuhl @@ -5995,14 +5995,14 @@ fr.insee CategoryScheme-j4nwh16i - 1.0 + 1 Products fr.insee CA-j4nwh16i-1 - 1.0 + 1 Frozen products @@ -6010,7 +6010,7 @@ fr.insee CA-j4nwh16i-2 - 1.0 + 1 Ice creams @@ -6018,7 +6018,7 @@ fr.insee CA-j4nwh16i-3 - 1.0 + 1 Jasper Beardly @@ -6026,7 +6026,7 @@ fr.insee CA-j4nwh16i-4 - 1.0 + 1 Meat @@ -6034,7 +6034,7 @@ fr.insee CA-j4nwh16i-5 - 1.0 + 1 Bacon @@ -6042,7 +6042,7 @@ fr.insee CA-j4nwh16i-6 - 1.0 + 1 Pork chop @@ -6050,7 +6050,7 @@ fr.insee CA-j4nwh16i-7 - 1.0 + 1 Chicken @@ -6058,7 +6058,7 @@ fr.insee CA-j4nwh16i-8 - 1.0 + 1 Compote @@ -6066,7 +6066,7 @@ fr.insee CA-j4nwh16i-9 - 1.0 + 1 Powersauce @@ -6074,7 +6074,7 @@ fr.insee CA-j4nwh16i-10 - 1.0 + 1 Other @@ -6083,14 +6083,14 @@ fr.insee CategoryScheme-j77dav9b - 1.0 + 1 Clownings fr.insee CA-j77dav9b-1 - 1.0 + 1 Break the windows of the whole city @@ -6098,7 +6098,7 @@ fr.insee CA-j77dav9b-2 - 1.0 + 1 Loose the violin of his daughter playing poker @@ -6106,7 +6106,7 @@ fr.insee CA-j77dav9b-3 - 1.0 + 1 Kill Mr Burns @@ -6114,7 +6114,7 @@ fr.insee CA-j77dav9b-4 - 1.0 + 1 Leaving a mechanical object to control the nuclear power plant @@ -6123,14 +6123,14 @@ fr.insee CategoryScheme-jbdyh6b5 - 1.0 + 1 Clowning_Characters fr.insee CA-jbdyh6b5-1 - 1.0 + 1 Jay @@ -6138,7 +6138,7 @@ fr.insee CA-jbdyh6b5-2 - 1.0 + 1 Bart @@ -6146,7 +6146,7 @@ fr.insee CA-jbdyh6b5-3 - 1.0 + 1 Krusty the clown @@ -6154,7 +6154,7 @@ fr.insee CA-jbdyh6b5-4 - 1.0 + 1 Maggie @@ -6163,14 +6163,14 @@ fr.insee CategoryScheme-j6p2kivg - 1.0 + 1 Means of transport fr.insee CA-j6p2kivg-1 - 1.0 + 1 Car @@ -6178,7 +6178,7 @@ fr.insee CA-j6p2kivg-2 - 1.0 + 1 Bike @@ -6186,7 +6186,7 @@ fr.insee CA-j6p2kivg-3 - 1.0 + 1 Skateboard @@ -6194,7 +6194,7 @@ fr.insee CA-j6p2kivg-4 - 1.0 + 1 Plane @@ -6203,14 +6203,14 @@ fr.insee CategoryScheme-jbdye1wa - 1.0 + 1 Country fr.insee CA-jbdye1wa-1 - 1.0 + 1 Brazil @@ -6218,7 +6218,7 @@ fr.insee CA-jbdye1wa-2 - 1.0 + 1 Canada @@ -6226,7 +6226,7 @@ fr.insee CA-jbdye1wa-3 - 1.0 + 1 Japan @@ -6234,7 +6234,7 @@ fr.insee CA-jbdye1wa-4 - 1.0 + 1 France @@ -6242,7 +6242,7 @@ fr.insee CA-jbdye1wa-5 - 1.0 + 1 Other country @@ -6250,7 +6250,7 @@ fr.insee CA-jbdye1wa-6 - 1.0 + 1 Other planet @@ -6259,14 +6259,14 @@ fr.insee CategoryScheme-j4nwc63q-secondDimension-fakeCL-1 - 1.0 + 1 FAKE-CODELIST-j4nwc63q-secondDimension-fakeCL-1 fr.insee CA-j4nwc63q-secondDimension-fakeCL-1-1 - 1.0 + 1 Percentage @@ -6275,14 +6275,14 @@ fr.insee CategoryScheme-j4nw0rr6-secondDimension-fakeCL-1 - 1.0 + 1 FAKE-CODELIST-j4nw0rr6-secondDimension-fakeCL-1 fr.insee CA-j4nw0rr6-secondDimension-fakeCL-1-1 - 1.0 + 1 Clowning @@ -6290,7 +6290,7 @@ fr.insee CA-j4nw0rr6-secondDimension-fakeCL-1-2 - 1.0 + 1 Remember? @@ -6299,14 +6299,14 @@ fr.insee CategoryScheme-j6qg8rc6-secondDimension-fakeCL-1 - 1.0 + 1 FAKE-CODELIST-j6qg8rc6-secondDimension-fakeCL-1 fr.insee CA-j6qg8rc6-secondDimension-fakeCL-1-1 - 1.0 + 1 Name @@ -6314,7 +6314,7 @@ fr.insee CA-j6qg8rc6-secondDimension-fakeCL-1-2 - 1.0 + 1 Age @@ -6323,14 +6323,14 @@ fr.insee CategoryScheme-i6vwi0 - 1.0 + 1 A définir fr.insee INSEE-COMMUN-CA-Booleen-1 - 1.0 + 1 @@ -6339,14 +6339,14 @@ fr.insee SIMPSONS-CLS - 1.0 + 1 SIMPSONS fr.insee j334iumu - 1.0 + 1 TOWN @@ -6357,11 +6357,11 @@ fr.insee j334iumu-1 - 1.0 + 1 fr.insee CA-j334iumu-1 - 1.0 + 1 Category 00001 @@ -6369,11 +6369,11 @@ fr.insee j334iumu-2 - 1.0 + 1 fr.insee CA-j334iumu-2 - 1.0 + 1 Category 00002 @@ -6381,11 +6381,11 @@ fr.insee j334iumu-3 - 1.0 + 1 fr.insee CA-j334iumu-3 - 1.0 + 1 Category 00003 @@ -6394,7 +6394,7 @@ fr.insee j6qdqoen - 1.0 + 1 MAYOR @@ -6405,11 +6405,11 @@ fr.insee j6qdqoen-1 - 1.0 + 1 fr.insee CA-j6qdqoen-1 - 1.0 + 1 Category 1 @@ -6417,11 +6417,11 @@ fr.insee j6qdqoen-2 - 1.0 + 1 fr.insee CA-j6qdqoen-2 - 1.0 + 1 Category 2 @@ -6429,11 +6429,11 @@ fr.insee j6qdqoen-3 - 1.0 + 1 fr.insee CA-j6qdqoen-3 - 1.0 + 1 Category 3 @@ -6441,11 +6441,11 @@ fr.insee j6qdqoen-4 - 1.0 + 1 fr.insee CA-j6qdqoen-4 - 1.0 + 1 Category 4 @@ -6454,7 +6454,7 @@ fr.insee j4nwo00f - 1.0 + 1 State @@ -6465,11 +6465,11 @@ fr.insee j4nwo00f-1 - 1.0 + 1 fr.insee CA-j4nwo00f-1 - 1.0 + 1 Category 1 @@ -6477,11 +6477,11 @@ fr.insee j4nwo00f-2 - 1.0 + 1 fr.insee CA-j4nwo00f-2 - 1.0 + 1 Category 2 @@ -6489,11 +6489,11 @@ fr.insee j4nwo00f-3 - 1.0 + 1 fr.insee CA-j4nwo00f-3 - 1.0 + 1 Category 3 @@ -6501,11 +6501,11 @@ fr.insee j4nwo00f-4 - 1.0 + 1 fr.insee CA-j4nwo00f-4 - 1.0 + 1 Category 4 @@ -6513,11 +6513,11 @@ fr.insee j4nwo00f-5 - 1.0 + 1 fr.insee CA-j4nwo00f-5 - 1.0 + 1 Category 5 @@ -6525,11 +6525,11 @@ fr.insee j4nwo00f-6 - 1.0 + 1 fr.insee CA-j4nwo00f-6 - 1.0 + 1 Category 6 @@ -6537,11 +6537,11 @@ fr.insee j4nwo00f-7 - 1.0 + 1 fr.insee CA-j4nwo00f-7 - 1.0 + 1 Category 7 @@ -6549,11 +6549,11 @@ fr.insee j4nwo00f-8 - 1.0 + 1 fr.insee CA-j4nwo00f-8 - 1.0 + 1 Category 8 @@ -6561,11 +6561,11 @@ fr.insee j4nwo00f-9 - 1.0 + 1 fr.insee CA-j4nwo00f-9 - 1.0 + 1 Category 9 @@ -6573,11 +6573,11 @@ fr.insee j4nwo00f-10 - 1.0 + 1 fr.insee CA-j4nwo00f-10 - 1.0 + 1 Category 10 @@ -6585,11 +6585,11 @@ fr.insee j4nwo00f-11 - 1.0 + 1 fr.insee CA-j4nwo00f-11 - 1.0 + 1 Category 11 @@ -6597,11 +6597,11 @@ fr.insee j4nwo00f-12 - 1.0 + 1 fr.insee CA-j4nwo00f-12 - 1.0 + 1 Category 12 @@ -6609,11 +6609,11 @@ fr.insee j4nwo00f-13 - 1.0 + 1 fr.insee CA-j4nwo00f-13 - 1.0 + 1 Category 13 @@ -6622,7 +6622,7 @@ fr.insee j335cu3c - 1.0 + 1 ANIMALS @@ -6633,11 +6633,11 @@ fr.insee j335cu3c-1 - 1.0 + 1 fr.insee CA-j335cu3c-1 - 1.0 + 1 Category 1 @@ -6645,11 +6645,11 @@ fr.insee j335cu3c-2 - 1.0 + 1 fr.insee CA-j335cu3c-2 - 1.0 + 1 Category 2 @@ -6657,11 +6657,11 @@ fr.insee j335cu3c-3 - 1.0 + 1 fr.insee CA-j335cu3c-3 - 1.0 + 1 Category 3 @@ -6669,11 +6669,11 @@ fr.insee j335cu3c-4 - 1.0 + 1 fr.insee CA-j335cu3c-4 - 1.0 + 1 Category 4 @@ -6682,7 +6682,7 @@ fr.insee j6p2mvca - 1.0 + 1 Flavours @@ -6693,11 +6693,11 @@ fr.insee j6p2mvca-1 - 1.0 + 1 fr.insee CA-j6p2mvca-1 - 1.0 + 1 Category 1 @@ -6705,11 +6705,11 @@ fr.insee j6p2mvca-2 - 1.0 + 1 fr.insee CA-j6p2mvca-2 - 1.0 + 1 Category 2 @@ -6717,11 +6717,11 @@ fr.insee j6p2mvca-3 - 1.0 + 1 fr.insee CA-j6p2mvca-3 - 1.0 + 1 Category 3 @@ -6729,11 +6729,11 @@ fr.insee j6p2mvca-4 - 1.0 + 1 fr.insee CA-j6p2mvca-4 - 1.0 + 1 Category 4 @@ -6742,7 +6742,7 @@ fr.insee jbdxh138 - 1.0 + 1 YESNO @@ -6753,11 +6753,11 @@ fr.insee jbdxh138-1 - 1.0 + 1 fr.insee CA-jbdxh138-1 - 1.0 + 1 Category 1 @@ -6765,11 +6765,11 @@ fr.insee jbdxh138-2 - 1.0 + 1 fr.insee CA-jbdxh138-2 - 1.0 + 1 Category 0 @@ -6778,7 +6778,7 @@ fr.insee j6qeytgc - 1.0 + 1 NUCLEAR_CHARACTERS @@ -6789,11 +6789,11 @@ fr.insee j6qeytgc-1 - 1.0 + 1 fr.insee CA-j6qeytgc-1 - 1.0 + 1 Category 1 @@ -6801,11 +6801,11 @@ fr.insee j6qeytgc-2 - 1.0 + 1 fr.insee CA-j6qeytgc-2 - 1.0 + 1 Category 2 @@ -6813,11 +6813,11 @@ fr.insee j6qeytgc-3 - 1.0 + 1 fr.insee CA-j6qeytgc-3 - 1.0 + 1 Category 3 @@ -6825,11 +6825,11 @@ fr.insee j6qeytgc-4 - 1.0 + 1 fr.insee CA-j6qeytgc-4 - 1.0 + 1 Category 4 @@ -6838,7 +6838,7 @@ fr.insee j6z087mq - 1.0 + 1 BIRTH_CHARACTER @@ -6849,11 +6849,11 @@ fr.insee j6z087mq-1 - 1.0 + 1 fr.insee CA-j6z087mq-1 - 1.0 + 1 Category 1 @@ -6861,11 +6861,11 @@ fr.insee j6z087mq-2 - 1.0 + 1 fr.insee CA-j6z087mq-2 - 1.0 + 1 Category 2 @@ -6873,11 +6873,11 @@ fr.insee j6z087mq-3 - 1.0 + 1 fr.insee CA-j6z087mq-3 - 1.0 + 1 Category 3 @@ -6885,11 +6885,11 @@ fr.insee j6z087mq-4 - 1.0 + 1 fr.insee CA-j6z087mq-4 - 1.0 + 1 Category 4 @@ -6897,11 +6897,11 @@ fr.insee j6z087mq-5 - 1.0 + 1 fr.insee CA-j6z087mq-5 - 1.0 + 1 Category 5 @@ -6910,7 +6910,7 @@ fr.insee jbdxricm - 1.0 + 1 CITY_BIRTH @@ -6921,11 +6921,11 @@ fr.insee jbdxricm-1 - 1.0 + 1 fr.insee CA-jbdxricm-1 - 1.0 + 1 Category 1 @@ -6933,11 +6933,11 @@ fr.insee jbdxricm-2 - 1.0 + 1 fr.insee CA-jbdxricm-2 - 1.0 + 1 Category 2 @@ -6945,11 +6945,11 @@ fr.insee jbdxricm-3 - 1.0 + 1 fr.insee CA-jbdxricm-3 - 1.0 + 1 Category 3 @@ -6957,11 +6957,11 @@ fr.insee jbdxricm-4 - 1.0 + 1 fr.insee CA-jbdxricm-4 - 1.0 + 1 Category 4 @@ -6969,11 +6969,11 @@ fr.insee jbdxricm-5 - 1.0 + 1 fr.insee CA-jbdxricm-5 - 1.0 + 1 Category 5 @@ -6982,7 +6982,7 @@ fr.insee j4nwh16i - 1.0 + 1 Products @@ -6993,22 +6993,22 @@ fr.insee j4nwh16i-1 - 1.0 + 1 fr.insee CA-j4nwh16i-1 - 1.0 + 1 Category A fr.insee j4nwh16i-2 - 1.0 + 1 fr.insee CA-j4nwh16i-2 - 1.0 + 1 Category A1 @@ -7016,11 +7016,11 @@ fr.insee j4nwh16i-3 - 1.0 + 1 fr.insee CA-j4nwh16i-3 - 1.0 + 1 Category A2 @@ -7029,22 +7029,22 @@ fr.insee j4nwh16i-4 - 1.0 + 1 fr.insee CA-j4nwh16i-4 - 1.0 + 1 Category B fr.insee j4nwh16i-5 - 1.0 + 1 fr.insee CA-j4nwh16i-5 - 1.0 + 1 Category B1 @@ -7052,11 +7052,11 @@ fr.insee j4nwh16i-6 - 1.0 + 1 fr.insee CA-j4nwh16i-6 - 1.0 + 1 Category B2 @@ -7064,11 +7064,11 @@ fr.insee j4nwh16i-7 - 1.0 + 1 fr.insee CA-j4nwh16i-7 - 1.0 + 1 Category B3 @@ -7077,22 +7077,22 @@ fr.insee j4nwh16i-8 - 1.0 + 1 fr.insee CA-j4nwh16i-8 - 1.0 + 1 Category C fr.insee j4nwh16i-9 - 1.0 + 1 fr.insee CA-j4nwh16i-9 - 1.0 + 1 Category C1 @@ -7101,11 +7101,11 @@ fr.insee j4nwh16i-10 - 1.0 + 1 fr.insee CA-j4nwh16i-10 - 1.0 + 1 Category D @@ -7114,7 +7114,7 @@ fr.insee j77dav9b - 1.0 + 1 Clownings @@ -7125,11 +7125,11 @@ fr.insee j77dav9b-1 - 1.0 + 1 fr.insee CA-j77dav9b-1 - 1.0 + 1 Category 1 @@ -7137,11 +7137,11 @@ fr.insee j77dav9b-2 - 1.0 + 1 fr.insee CA-j77dav9b-2 - 1.0 + 1 Category 2 @@ -7149,11 +7149,11 @@ fr.insee j77dav9b-3 - 1.0 + 1 fr.insee CA-j77dav9b-3 - 1.0 + 1 Category 3 @@ -7161,11 +7161,11 @@ fr.insee j77dav9b-4 - 1.0 + 1 fr.insee CA-j77dav9b-4 - 1.0 + 1 Category 4 @@ -7174,7 +7174,7 @@ fr.insee jbdyh6b5 - 1.0 + 1 Clowning_Characters @@ -7185,11 +7185,11 @@ fr.insee jbdyh6b5-1 - 1.0 + 1 fr.insee CA-jbdyh6b5-1 - 1.0 + 1 Category 1 @@ -7197,11 +7197,11 @@ fr.insee jbdyh6b5-2 - 1.0 + 1 fr.insee CA-jbdyh6b5-2 - 1.0 + 1 Category 2 @@ -7209,11 +7209,11 @@ fr.insee jbdyh6b5-3 - 1.0 + 1 fr.insee CA-jbdyh6b5-3 - 1.0 + 1 Category 3 @@ -7221,11 +7221,11 @@ fr.insee jbdyh6b5-4 - 1.0 + 1 fr.insee CA-jbdyh6b5-4 - 1.0 + 1 Category 4 @@ -7234,7 +7234,7 @@ fr.insee j6p2kivg - 1.0 + 1 Means of transport @@ -7245,11 +7245,11 @@ fr.insee j6p2kivg-1 - 1.0 + 1 fr.insee CA-j6p2kivg-1 - 1.0 + 1 Category 1 @@ -7257,11 +7257,11 @@ fr.insee j6p2kivg-2 - 1.0 + 1 fr.insee CA-j6p2kivg-2 - 1.0 + 1 Category 2 @@ -7269,11 +7269,11 @@ fr.insee j6p2kivg-3 - 1.0 + 1 fr.insee CA-j6p2kivg-3 - 1.0 + 1 Category 3 @@ -7281,11 +7281,11 @@ fr.insee j6p2kivg-4 - 1.0 + 1 fr.insee CA-j6p2kivg-4 - 1.0 + 1 Category 4 @@ -7294,7 +7294,7 @@ fr.insee jbdye1wa - 1.0 + 1 Country @@ -7305,11 +7305,11 @@ fr.insee jbdye1wa-1 - 1.0 + 1 fr.insee CA-jbdye1wa-1 - 1.0 + 1 Category 1 @@ -7317,11 +7317,11 @@ fr.insee jbdye1wa-2 - 1.0 + 1 fr.insee CA-jbdye1wa-2 - 1.0 + 1 Category 2 @@ -7329,11 +7329,11 @@ fr.insee jbdye1wa-3 - 1.0 + 1 fr.insee CA-jbdye1wa-3 - 1.0 + 1 Category 3 @@ -7341,11 +7341,11 @@ fr.insee jbdye1wa-4 - 1.0 + 1 fr.insee CA-jbdye1wa-4 - 1.0 + 1 Category 4 @@ -7353,11 +7353,11 @@ fr.insee jbdye1wa-5 - 1.0 + 1 fr.insee CA-jbdye1wa-5 - 1.0 + 1 Category 5 @@ -7365,11 +7365,11 @@ fr.insee jbdye1wa-6 - 1.0 + 1 fr.insee CA-jbdye1wa-6 - 1.0 + 1 Category 6 @@ -7378,7 +7378,7 @@ fr.insee j4nwc63q-secondDimension-fakeCL-1 - 1.0 + 1 FAKE-CODELIST-j4nwc63q-secondDimension-fakeCL-1 @@ -7389,11 +7389,11 @@ fr.insee j4nwc63q-secondDimension-fakeCL-1-1 - 1.0 + 1 fr.insee CA-j4nwc63q-secondDimension-fakeCL-1-1 - 1.0 + 1 Category 1 @@ -7402,7 +7402,7 @@ fr.insee j4nw0rr6-secondDimension-fakeCL-1 - 1.0 + 1 FAKE-CODELIST-j4nw0rr6-secondDimension-fakeCL-1 @@ -7413,11 +7413,11 @@ fr.insee j4nw0rr6-secondDimension-fakeCL-1-1 - 1.0 + 1 fr.insee CA-j4nw0rr6-secondDimension-fakeCL-1-1 - 1.0 + 1 Category 1 @@ -7425,11 +7425,11 @@ fr.insee j4nw0rr6-secondDimension-fakeCL-1-2 - 1.0 + 1 fr.insee CA-j4nw0rr6-secondDimension-fakeCL-1-2 - 1.0 + 1 Category 2 @@ -7438,7 +7438,7 @@ fr.insee j6qg8rc6-secondDimension-fakeCL-1 - 1.0 + 1 FAKE-CODELIST-j6qg8rc6-secondDimension-fakeCL-1 @@ -7449,11 +7449,11 @@ fr.insee j6qg8rc6-secondDimension-fakeCL-1-1 - 1.0 + 1 fr.insee CA-j6qg8rc6-secondDimension-fakeCL-1-1 - 1.0 + 1 Category 1 @@ -7461,11 +7461,11 @@ fr.insee j6qg8rc6-secondDimension-fakeCL-1-2 - 1.0 + 1 fr.insee CA-j6qg8rc6-secondDimension-fakeCL-1-2 - 1.0 + 1 Category 2 @@ -7474,7 +7474,7 @@ fr.insee INSEE-COMMUN-CL-Booleen - 1.0 + 1 Booleen @@ -7485,11 +7485,11 @@ fr.insee INSEE-COMMUN-CL-Booleen-1 - 1.0 + 1 fr.insee INSEE-COMMUN-CA-Booleen-1 - 1.0 + 1 Category 1 @@ -7499,14 +7499,14 @@ fr.insee VariableScheme-i6vwi0 - 1.0 + 1 Variable Scheme for the survey fr.insee jbcggtca - 1.0 + 1 SUM_EXPENSES @@ -7516,25 +7516,25 @@ fr.insee jbcggtca-VROP - 1.0 + 1 fr.insee jbcggtca-GI - 1.0 + 1 GenerationInstruction fr.insee jbcggtca-GOP - 1.0 + 1 OutParameter fr.insee jbcggtca-VROP - 1.0 + 1 OutParameter @@ -7545,7 +7545,7 @@ fr.insee jbcggtex - 1.0 + 1 LAST_BROADCAST @@ -7556,7 +7556,7 @@ fr.insee jbcgfvir - 1.0 + 1 COMMENT @@ -7566,13 +7566,13 @@ fr.insee j6p3dkx6-QOP-jbgdhaht - 1.0 + 1 OutParameter fr.insee j6p3dkx6 - 1.0 + 1 QuestionItem @@ -7582,7 +7582,7 @@ fr.insee jbcgm0ip - 1.0 + 1 READY @@ -7592,13 +7592,13 @@ fr.insee j6p0np9q-QOP-jbgd3set - 1.0 + 1 OutParameter fr.insee j6p0np9q - 1.0 + 1 QuestionItem @@ -7608,7 +7608,7 @@ fr.insee INSEE-COMMUN-CL-Booleen-1 - 1.0 + 1 Code @@ -7619,7 +7619,7 @@ fr.insee jbcgf11f - 1.0 + 1 PRODUCER @@ -7629,13 +7629,13 @@ fr.insee j3343qhx-QOP-jbgd90cy - 1.0 + 1 OutParameter fr.insee j3343qhx - 1.0 + 1 QuestionItem @@ -7645,7 +7645,7 @@ fr.insee jbcgcy2x - 1.0 + 1 SEASON_NUMBER @@ -7655,13 +7655,13 @@ fr.insee j6q9h8tj-QOP-jbgdjy8h - 1.0 + 1 OutParameter fr.insee j6q9h8tj - 1.0 + 1 QuestionItem @@ -7677,7 +7677,7 @@ fr.insee jbcgbg33 - 1.0 + 1 DATEFIRST @@ -7687,20 +7687,20 @@ fr.insee j334cyqb-QOP-jbgdih2z - 1.0 + 1 OutParameter fr.insee j334cyqb - 1.0 + 1 QuestionItem fr.insee INSEE-COMMUN-MNR-DateTimedate-YYYY-MM-DD - 1.0 + 1 ManagedDateTimeRepresentation @@ -7708,7 +7708,7 @@ fr.insee jbcgieyw - 1.0 + 1 AUDIENCE_SHARE @@ -7718,13 +7718,13 @@ fr.insee j6z06z1e-QOP-jbgddnrd - 1.0 + 1 OutParameter fr.insee j6z06z1e - 1.0 + 1 QuestionItem @@ -7740,7 +7740,7 @@ fr.insee jbcgasbh - 1.0 + 1 CITY @@ -7750,13 +7750,13 @@ fr.insee j3343clt-QOP-jbgdjdkn - 1.0 + 1 OutParameter fr.insee j3343clt - 1.0 + 1 QuestionItem @@ -7764,7 +7764,7 @@ fr.insee j334iumu - 1.0 + 1 CodeList @@ -7773,7 +7773,7 @@ fr.insee jbcg9yr6 - 1.0 + 1 MAYOR @@ -7783,13 +7783,13 @@ fr.insee j6qdfhvw-QOP-jbgd8ghp - 1.0 + 1 OutParameter fr.insee j6qdfhvw - 1.0 + 1 QuestionItem @@ -7797,7 +7797,7 @@ fr.insee j6qdqoen - 1.0 + 1 CodeList @@ -7806,7 +7806,7 @@ fr.insee jbcgpija - 1.0 + 1 STATE @@ -7816,13 +7816,13 @@ fr.insee j4nw5cqz-QOP-jbgdkd7v - 1.0 + 1 OutParameter fr.insee j4nw5cqz - 1.0 + 1 QuestionItem @@ -7830,7 +7830,7 @@ fr.insee j4nwo00f - 1.0 + 1 CodeList @@ -7839,7 +7839,7 @@ fr.insee jbdxewlq - 1.0 + 1 PET1 @@ -7849,13 +7849,13 @@ fr.insee j334akov-QOP-jbgd8qmn - 1.0 + 1 OutParameter fr.insee j334akov - 1.0 + 1 QuestionGrid @@ -7865,7 +7865,7 @@ fr.insee INSEE-COMMUN-CL-Booleen-1 - 1.0 + 1 Code @@ -7876,7 +7876,7 @@ fr.insee jbdxjmst - 1.0 + 1 PET2 @@ -7886,13 +7886,13 @@ fr.insee j334akov-QOP-jbgd60vl - 1.0 + 1 OutParameter fr.insee j334akov - 1.0 + 1 QuestionGrid @@ -7902,7 +7902,7 @@ fr.insee INSEE-COMMUN-CL-Booleen-1 - 1.0 + 1 Code @@ -7913,7 +7913,7 @@ fr.insee jbdxjuay - 1.0 + 1 PET3 @@ -7923,13 +7923,13 @@ fr.insee j334akov-QOP-jbgda2jo - 1.0 + 1 OutParameter fr.insee j334akov - 1.0 + 1 QuestionGrid @@ -7939,7 +7939,7 @@ fr.insee INSEE-COMMUN-CL-Booleen-1 - 1.0 + 1 Code @@ -7950,7 +7950,7 @@ fr.insee jbdxniuw - 1.0 + 1 PET4 @@ -7960,13 +7960,13 @@ fr.insee j334akov-QOP-jbgdfssy - 1.0 + 1 OutParameter fr.insee j334akov - 1.0 + 1 QuestionGrid @@ -7976,7 +7976,7 @@ fr.insee INSEE-COMMUN-CL-Booleen-1 - 1.0 + 1 Code @@ -7987,7 +7987,7 @@ fr.insee jbdxtl1d - 1.0 + 1 ICE_FLAVOUR1 @@ -7997,13 +7997,13 @@ fr.insee j6p29i81-QOP-jbgdb3jx - 1.0 + 1 OutParameter fr.insee j6p29i81 - 1.0 + 1 QuestionGrid @@ -8011,7 +8011,7 @@ fr.insee jbdxh138 - 1.0 + 1 CodeList @@ -8020,7 +8020,7 @@ fr.insee jbdxvai9 - 1.0 + 1 ICE_FLAVOUR2 @@ -8030,13 +8030,13 @@ fr.insee j6p29i81-QOP-jbgdb61k - 1.0 + 1 OutParameter fr.insee j6p29i81 - 1.0 + 1 QuestionGrid @@ -8044,7 +8044,7 @@ fr.insee jbdxh138 - 1.0 + 1 CodeList @@ -8053,7 +8053,7 @@ fr.insee jbdxpltw - 1.0 + 1 ICE_FLAVOUR3 @@ -8063,13 +8063,13 @@ fr.insee j6p29i81-QOP-jbgdl3kc - 1.0 + 1 OutParameter fr.insee j6p29i81 - 1.0 + 1 QuestionGrid @@ -8077,7 +8077,7 @@ fr.insee jbdxh138 - 1.0 + 1 CodeList @@ -8086,7 +8086,7 @@ fr.insee jbdxzx2x - 1.0 + 1 ICE_FLAVOUR4 @@ -8096,13 +8096,13 @@ fr.insee j6p29i81-QOP-jbgdcobo - 1.0 + 1 OutParameter fr.insee j6p29i81 - 1.0 + 1 QuestionGrid @@ -8110,7 +8110,7 @@ fr.insee jbdxh138 - 1.0 + 1 CodeList @@ -8119,7 +8119,7 @@ fr.insee jbdy4nhp - 1.0 + 1 NUCLEAR_CHARACTER1 @@ -8129,13 +8129,13 @@ fr.insee j6qefnga-QOP-jbgd6p0k - 1.0 + 1 OutParameter fr.insee j6qefnga - 1.0 + 1 QuestionGrid @@ -8143,7 +8143,7 @@ fr.insee jbdxh138 - 1.0 + 1 CodeList @@ -8152,7 +8152,7 @@ fr.insee jbdxtanu - 1.0 + 1 NUCLEAR_CHARACTER2 @@ -8162,13 +8162,13 @@ fr.insee j6qefnga-QOP-jbgd9ato - 1.0 + 1 OutParameter fr.insee j6qefnga - 1.0 + 1 QuestionGrid @@ -8176,7 +8176,7 @@ fr.insee jbdxh138 - 1.0 + 1 CodeList @@ -8185,7 +8185,7 @@ fr.insee jbdy25if - 1.0 + 1 NUCLEAR_CHARACTER3 @@ -8195,13 +8195,13 @@ fr.insee j6qefnga-QOP-jbgd3e0p - 1.0 + 1 OutParameter fr.insee j6qefnga - 1.0 + 1 QuestionGrid @@ -8209,7 +8209,7 @@ fr.insee jbdxh138 - 1.0 + 1 CodeList @@ -8218,7 +8218,7 @@ fr.insee jbdxvta8 - 1.0 + 1 NUCLEAR_CHARACTER4 @@ -8228,13 +8228,13 @@ fr.insee j6qefnga-QOP-jbgdkxne - 1.0 + 1 OutParameter fr.insee j6qefnga - 1.0 + 1 QuestionGrid @@ -8242,7 +8242,7 @@ fr.insee jbdxh138 - 1.0 + 1 CodeList @@ -8251,7 +8251,7 @@ fr.insee jbdy3nh7 - 1.0 + 1 BIRTH_CHARACTER1 @@ -8261,13 +8261,13 @@ fr.insee j6yzoc6g-QOP-jbgd7fr6 - 1.0 + 1 OutParameter fr.insee j6yzoc6g - 1.0 + 1 QuestionGrid @@ -8275,7 +8275,7 @@ fr.insee jbdxricm - 1.0 + 1 CodeList @@ -8284,7 +8284,7 @@ fr.insee jbdy6lk3 - 1.0 + 1 BIRTH_CHARACTER2 @@ -8294,13 +8294,13 @@ fr.insee j6yzoc6g-QOP-jbgd5e9f - 1.0 + 1 OutParameter fr.insee j6yzoc6g - 1.0 + 1 QuestionGrid @@ -8308,7 +8308,7 @@ fr.insee jbdxricm - 1.0 + 1 CodeList @@ -8317,7 +8317,7 @@ fr.insee jbdxsby0 - 1.0 + 1 BIRTH_CHARACTER3 @@ -8327,13 +8327,13 @@ fr.insee j6yzoc6g-QOP-jbgd912x - 1.0 + 1 OutParameter fr.insee j6yzoc6g - 1.0 + 1 QuestionGrid @@ -8341,7 +8341,7 @@ fr.insee jbdxricm - 1.0 + 1 CodeList @@ -8350,7 +8350,7 @@ fr.insee jbdy7sra - 1.0 + 1 BIRTH_CHARACTER4 @@ -8360,13 +8360,13 @@ fr.insee j6yzoc6g-QOP-jbgd6bdy - 1.0 + 1 OutParameter fr.insee j6yzoc6g - 1.0 + 1 QuestionGrid @@ -8374,7 +8374,7 @@ fr.insee jbdxricm - 1.0 + 1 CodeList @@ -8383,7 +8383,7 @@ fr.insee jbdy2wyl - 1.0 + 1 BIRTH_CHARACTER5 @@ -8393,13 +8393,13 @@ fr.insee j6yzoc6g-QOP-jbgddyry - 1.0 + 1 OutParameter fr.insee j6yzoc6g - 1.0 + 1 QuestionGrid @@ -8407,7 +8407,7 @@ fr.insee jbdxricm - 1.0 + 1 CodeList @@ -8416,7 +8416,7 @@ fr.insee jbgdnfk7 - 1.0 + 1 PERCENTAGE_EXPENSES11 @@ -8426,13 +8426,13 @@ fr.insee j4nwc63q-QOP-jbgde5yl - 1.0 + 1 OutParameter fr.insee j4nwc63q - 1.0 + 1 QuestionGrid @@ -8449,7 +8449,7 @@ fr.insee jbgdje4w - 1.0 + 1 PERCENTAGE_EXPENSES21 @@ -8459,13 +8459,13 @@ fr.insee j4nwc63q-QOP-jbgd2x2t - 1.0 + 1 OutParameter fr.insee j4nwc63q - 1.0 + 1 QuestionGrid @@ -8482,7 +8482,7 @@ fr.insee jbgdlth7 - 1.0 + 1 PERCENTAGE_EXPENSES31 @@ -8492,13 +8492,13 @@ fr.insee j4nwc63q-QOP-jbgdjypz - 1.0 + 1 OutParameter fr.insee j4nwc63q - 1.0 + 1 QuestionGrid @@ -8515,7 +8515,7 @@ fr.insee jbgdelbl - 1.0 + 1 PERCENTAGE_EXPENSES41 @@ -8525,13 +8525,13 @@ fr.insee j4nwc63q-QOP-jbgdcftu - 1.0 + 1 OutParameter fr.insee j4nwc63q - 1.0 + 1 QuestionGrid @@ -8548,7 +8548,7 @@ fr.insee jbgd95jq - 1.0 + 1 PERCENTAGE_EXPENSES51 @@ -8558,13 +8558,13 @@ fr.insee j4nwc63q-QOP-jbgdiyfe - 1.0 + 1 OutParameter fr.insee j4nwc63q - 1.0 + 1 QuestionGrid @@ -8581,7 +8581,7 @@ fr.insee jbgdadd9 - 1.0 + 1 PERCENTAGE_EXPENSES61 @@ -8591,13 +8591,13 @@ fr.insee j4nwc63q-QOP-jbgdj1wd - 1.0 + 1 OutParameter fr.insee j4nwc63q - 1.0 + 1 QuestionGrid @@ -8614,7 +8614,7 @@ fr.insee jbgdlwzk - 1.0 + 1 PERCENTAGE_EXPENSES71 @@ -8624,13 +8624,13 @@ fr.insee j4nwc63q-QOP-jbgddylk - 1.0 + 1 OutParameter fr.insee j4nwc63q - 1.0 + 1 QuestionGrid @@ -8647,7 +8647,7 @@ fr.insee jbgdfz77 - 1.0 + 1 PERCENTAGE_EXPENSES81 @@ -8657,13 +8657,13 @@ fr.insee j4nwc63q-QOP-jbgd3jj6 - 1.0 + 1 OutParameter fr.insee j4nwc63q - 1.0 + 1 QuestionGrid @@ -8680,7 +8680,7 @@ fr.insee jbgdepx6 - 1.0 + 1 PERCENTAGE_EXPENSES91 @@ -8690,13 +8690,13 @@ fr.insee j4nwc63q-QOP-jbgd4w3k - 1.0 + 1 OutParameter fr.insee j4nwc63q - 1.0 + 1 QuestionGrid @@ -8713,7 +8713,7 @@ fr.insee jbgdepx7 - 1.0 + 1 PERCENTAGE_EXPENSES101 @@ -8723,13 +8723,13 @@ fr.insee j4nwc63q-QOP-jbgd4w4k - 1.0 + 1 OutParameter fr.insee j4nwc63q - 1.0 + 1 QuestionGrid @@ -8746,7 +8746,7 @@ fr.insee jbgd9vqv - 1.0 + 1 CLOWNING11 @@ -8756,13 +8756,13 @@ fr.insee j4nw0rr6-QOP-jbgd8tyr - 1.0 + 1 OutParameter fr.insee j4nw0rr6 - 1.0 + 1 QuestionGrid @@ -8770,7 +8770,7 @@ fr.insee jbdyh6b5 - 1.0 + 1 CodeList @@ -8779,7 +8779,7 @@ fr.insee jbgden0i - 1.0 + 1 CLOWNING21 @@ -8789,13 +8789,13 @@ fr.insee j4nw0rr6-QOP-jbgdep36 - 1.0 + 1 OutParameter fr.insee j4nw0rr6 - 1.0 + 1 QuestionGrid @@ -8803,7 +8803,7 @@ fr.insee jbdyh6b5 - 1.0 + 1 CodeList @@ -8812,7 +8812,7 @@ fr.insee jbgdndju - 1.0 + 1 CLOWNING31 @@ -8822,13 +8822,13 @@ fr.insee j4nw0rr6-QOP-jbgdjjgi - 1.0 + 1 OutParameter fr.insee j4nw0rr6 - 1.0 + 1 QuestionGrid @@ -8836,7 +8836,7 @@ fr.insee jbdyh6b5 - 1.0 + 1 CodeList @@ -8845,7 +8845,7 @@ fr.insee jbgdfwg9 - 1.0 + 1 CLOWNING41 @@ -8855,13 +8855,13 @@ fr.insee j4nw0rr6-QOP-jbgdgh6k - 1.0 + 1 OutParameter fr.insee j4nw0rr6 - 1.0 + 1 QuestionGrid @@ -8869,7 +8869,7 @@ fr.insee jbdyh6b5 - 1.0 + 1 CodeList @@ -8878,7 +8878,7 @@ fr.insee jbgdd3ky - 1.0 + 1 CLOWNING12 @@ -8888,13 +8888,13 @@ fr.insee j4nw0rr6-QOP-jbgdit3o - 1.0 + 1 OutParameter fr.insee j4nw0rr6 - 1.0 + 1 QuestionGrid @@ -8904,7 +8904,7 @@ fr.insee jbgdm9lm - 1.0 + 1 CLOWNING22 @@ -8914,13 +8914,13 @@ fr.insee j4nw0rr6-QOP-jbgd366k - 1.0 + 1 OutParameter fr.insee j4nw0rr6 - 1.0 + 1 QuestionGrid @@ -8930,7 +8930,7 @@ fr.insee jbgdcdhv - 1.0 + 1 CLOWNING32 @@ -8940,13 +8940,13 @@ fr.insee j4nw0rr6-QOP-jbgdax06 - 1.0 + 1 OutParameter fr.insee j4nw0rr6 - 1.0 + 1 QuestionGrid @@ -8956,7 +8956,7 @@ fr.insee jbgdjlit - 1.0 + 1 CLOWNING42 @@ -8966,13 +8966,13 @@ fr.insee j4nw0rr6-QOP-jbgdfo1j - 1.0 + 1 OutParameter fr.insee j4nw0rr6 - 1.0 + 1 QuestionGrid @@ -8982,7 +8982,7 @@ fr.insee jbgd1zxu - 1.0 + 1 TRAVEL11 @@ -8992,13 +8992,13 @@ fr.insee j6p2lwuj-QOP-jbgd92mb - 1.0 + 1 OutParameter fr.insee j6p2lwuj - 1.0 + 1 QuestionGrid @@ -9008,7 +9008,7 @@ fr.insee INSEE-COMMUN-CL-Booleen-1 - 1.0 + 1 Code @@ -9019,7 +9019,7 @@ fr.insee jbgd8lfs - 1.0 + 1 TRAVEL21 @@ -9029,13 +9029,13 @@ fr.insee j6p2lwuj-QOP-jbgdgsat - 1.0 + 1 OutParameter fr.insee j6p2lwuj - 1.0 + 1 QuestionGrid @@ -9045,7 +9045,7 @@ fr.insee INSEE-COMMUN-CL-Booleen-1 - 1.0 + 1 Code @@ -9056,7 +9056,7 @@ fr.insee jbgd56qo - 1.0 + 1 TRAVEL31 @@ -9066,13 +9066,13 @@ fr.insee j6p2lwuj-QOP-jbgdaxk2 - 1.0 + 1 OutParameter fr.insee j6p2lwuj - 1.0 + 1 QuestionGrid @@ -9082,7 +9082,7 @@ fr.insee INSEE-COMMUN-CL-Booleen-1 - 1.0 + 1 Code @@ -9093,7 +9093,7 @@ fr.insee jbgd4wu8 - 1.0 + 1 TRAVEL41 @@ -9103,13 +9103,13 @@ fr.insee j6p2lwuj-QOP-jbgd7myn - 1.0 + 1 OutParameter fr.insee j6p2lwuj - 1.0 + 1 QuestionGrid @@ -9119,7 +9119,7 @@ fr.insee INSEE-COMMUN-CL-Booleen-1 - 1.0 + 1 Code @@ -9130,7 +9130,7 @@ fr.insee jbgdak6h - 1.0 + 1 TRAVEL12 @@ -9140,13 +9140,13 @@ fr.insee j6p2lwuj-QOP-jbgdnxkt - 1.0 + 1 OutParameter fr.insee j6p2lwuj - 1.0 + 1 QuestionGrid @@ -9156,7 +9156,7 @@ fr.insee INSEE-COMMUN-CL-Booleen-1 - 1.0 + 1 Code @@ -9167,7 +9167,7 @@ fr.insee jbgdmsy4 - 1.0 + 1 TRAVEL22 @@ -9177,13 +9177,13 @@ fr.insee j6p2lwuj-QOP-jbgd3ef5 - 1.0 + 1 OutParameter fr.insee j6p2lwuj - 1.0 + 1 QuestionGrid @@ -9193,7 +9193,7 @@ fr.insee INSEE-COMMUN-CL-Booleen-1 - 1.0 + 1 Code @@ -9204,7 +9204,7 @@ fr.insee jbgd2zlu - 1.0 + 1 TRAVEL32 @@ -9214,13 +9214,13 @@ fr.insee j6p2lwuj-QOP-jbgd8p1v - 1.0 + 1 OutParameter fr.insee j6p2lwuj - 1.0 + 1 QuestionGrid @@ -9230,7 +9230,7 @@ fr.insee INSEE-COMMUN-CL-Booleen-1 - 1.0 + 1 Code @@ -9241,7 +9241,7 @@ fr.insee jbgd6v73 - 1.0 + 1 TRAVEL42 @@ -9251,13 +9251,13 @@ fr.insee j6p2lwuj-QOP-jbgdgm0c - 1.0 + 1 OutParameter fr.insee j6p2lwuj - 1.0 + 1 QuestionGrid @@ -9267,7 +9267,7 @@ fr.insee INSEE-COMMUN-CL-Booleen-1 - 1.0 + 1 Code @@ -9278,7 +9278,7 @@ fr.insee jbgdf5fg - 1.0 + 1 TRAVEL13 @@ -9288,13 +9288,13 @@ fr.insee j6p2lwuj-QOP-jbgdcppc - 1.0 + 1 OutParameter fr.insee j6p2lwuj - 1.0 + 1 QuestionGrid @@ -9304,7 +9304,7 @@ fr.insee INSEE-COMMUN-CL-Booleen-1 - 1.0 + 1 Code @@ -9315,7 +9315,7 @@ fr.insee jbgd2xg0 - 1.0 + 1 TRAVEL23 @@ -9325,13 +9325,13 @@ fr.insee j6p2lwuj-QOP-jbgd4cm6 - 1.0 + 1 OutParameter fr.insee j6p2lwuj - 1.0 + 1 QuestionGrid @@ -9341,7 +9341,7 @@ fr.insee INSEE-COMMUN-CL-Booleen-1 - 1.0 + 1 Code @@ -9352,7 +9352,7 @@ fr.insee jbgdc06l - 1.0 + 1 TRAVEL33 @@ -9362,13 +9362,13 @@ fr.insee j6p2lwuj-QOP-jbgdd2lo - 1.0 + 1 OutParameter fr.insee j6p2lwuj - 1.0 + 1 QuestionGrid @@ -9378,7 +9378,7 @@ fr.insee INSEE-COMMUN-CL-Booleen-1 - 1.0 + 1 Code @@ -9389,7 +9389,7 @@ fr.insee jbgdb8i9 - 1.0 + 1 TRAVEL43 @@ -9399,13 +9399,13 @@ fr.insee j6p2lwuj-QOP-jbgdo0ay - 1.0 + 1 OutParameter fr.insee j6p2lwuj - 1.0 + 1 QuestionGrid @@ -9415,7 +9415,7 @@ fr.insee INSEE-COMMUN-CL-Booleen-1 - 1.0 + 1 Code @@ -9426,7 +9426,7 @@ fr.insee jbgdhzve - 1.0 + 1 TRAVEL14 @@ -9436,13 +9436,13 @@ fr.insee j6p2lwuj-QOP-jbgd4r2a - 1.0 + 1 OutParameter fr.insee j6p2lwuj - 1.0 + 1 QuestionGrid @@ -9452,7 +9452,7 @@ fr.insee INSEE-COMMUN-CL-Booleen-1 - 1.0 + 1 Code @@ -9463,7 +9463,7 @@ fr.insee jbgd93ks - 1.0 + 1 TRAVEL24 @@ -9473,13 +9473,13 @@ fr.insee j6p2lwuj-QOP-jbgdkfpq - 1.0 + 1 OutParameter fr.insee j6p2lwuj - 1.0 + 1 QuestionGrid @@ -9489,7 +9489,7 @@ fr.insee INSEE-COMMUN-CL-Booleen-1 - 1.0 + 1 Code @@ -9500,7 +9500,7 @@ fr.insee jbgdfw7h - 1.0 + 1 TRAVEL34 @@ -9510,13 +9510,13 @@ fr.insee j6p2lwuj-QOP-jbgd7u52 - 1.0 + 1 OutParameter fr.insee j6p2lwuj - 1.0 + 1 QuestionGrid @@ -9526,7 +9526,7 @@ fr.insee INSEE-COMMUN-CL-Booleen-1 - 1.0 + 1 Code @@ -9537,7 +9537,7 @@ fr.insee jbgdfavn - 1.0 + 1 TRAVEL44 @@ -9547,13 +9547,13 @@ fr.insee j6p2lwuj-QOP-jbgdgfwl - 1.0 + 1 OutParameter fr.insee j6p2lwuj - 1.0 + 1 QuestionGrid @@ -9563,7 +9563,7 @@ fr.insee INSEE-COMMUN-CL-Booleen-1 - 1.0 + 1 Code @@ -9574,7 +9574,7 @@ fr.insee jbgdc199 - 1.0 + 1 TRAVEL15 @@ -9584,13 +9584,13 @@ fr.insee j6p2lwuj-QOP-jbgd9cff - 1.0 + 1 OutParameter fr.insee j6p2lwuj - 1.0 + 1 QuestionGrid @@ -9600,7 +9600,7 @@ fr.insee INSEE-COMMUN-CL-Booleen-1 - 1.0 + 1 Code @@ -9611,7 +9611,7 @@ fr.insee jbgdfqph - 1.0 + 1 TRAVEL25 @@ -9621,13 +9621,13 @@ fr.insee j6p2lwuj-QOP-jbgddwsp - 1.0 + 1 OutParameter fr.insee j6p2lwuj - 1.0 + 1 QuestionGrid @@ -9637,7 +9637,7 @@ fr.insee INSEE-COMMUN-CL-Booleen-1 - 1.0 + 1 Code @@ -9648,7 +9648,7 @@ fr.insee jbgd8r0n - 1.0 + 1 TRAVEL35 @@ -9658,13 +9658,13 @@ fr.insee j6p2lwuj-QOP-jbgdncn8 - 1.0 + 1 OutParameter fr.insee j6p2lwuj - 1.0 + 1 QuestionGrid @@ -9674,7 +9674,7 @@ fr.insee INSEE-COMMUN-CL-Booleen-1 - 1.0 + 1 Code @@ -9685,7 +9685,7 @@ fr.insee jbgd3aqk - 1.0 + 1 TRAVEL45 @@ -9695,13 +9695,13 @@ fr.insee j6p2lwuj-QOP-jbgdnz6b - 1.0 + 1 OutParameter fr.insee j6p2lwuj - 1.0 + 1 QuestionGrid @@ -9711,7 +9711,7 @@ fr.insee INSEE-COMMUN-CL-Booleen-1 - 1.0 + 1 Code @@ -9722,7 +9722,7 @@ fr.insee jbgdltql - 1.0 + 1 TRAVEL16 @@ -9732,13 +9732,13 @@ fr.insee j6p2lwuj-QOP-jbgdiva0 - 1.0 + 1 OutParameter fr.insee j6p2lwuj - 1.0 + 1 QuestionGrid @@ -9748,7 +9748,7 @@ fr.insee INSEE-COMMUN-CL-Booleen-1 - 1.0 + 1 Code @@ -9759,7 +9759,7 @@ fr.insee jbgd9um3 - 1.0 + 1 TRAVEL26 @@ -9769,13 +9769,13 @@ fr.insee j6p2lwuj-QOP-jbgd7dqf - 1.0 + 1 OutParameter fr.insee j6p2lwuj - 1.0 + 1 QuestionGrid @@ -9785,7 +9785,7 @@ fr.insee INSEE-COMMUN-CL-Booleen-1 - 1.0 + 1 Code @@ -9796,7 +9796,7 @@ fr.insee jbgddj7v - 1.0 + 1 TRAVEL36 @@ -9806,13 +9806,13 @@ fr.insee j6p2lwuj-QOP-jbgdnous - 1.0 + 1 OutParameter fr.insee j6p2lwuj - 1.0 + 1 QuestionGrid @@ -9822,7 +9822,7 @@ fr.insee INSEE-COMMUN-CL-Booleen-1 - 1.0 + 1 Code @@ -9833,7 +9833,7 @@ fr.insee jbgdb4ym - 1.0 + 1 TRAVEL46 @@ -9843,13 +9843,13 @@ fr.insee j6p2lwuj-QOP-jbgdkfcz - 1.0 + 1 OutParameter fr.insee j6p2lwuj - 1.0 + 1 QuestionGrid @@ -9859,7 +9859,7 @@ fr.insee INSEE-COMMUN-CL-Booleen-1 - 1.0 + 1 Code @@ -9870,7 +9870,7 @@ fr.insee jbgd3fkz - 1.0 + 1 FAVOURITE_CHARACTERS11 @@ -9880,13 +9880,13 @@ fr.insee j6qg8rc6-QOP-jbgdl5jb - 1.0 + 1 OutParameter fr.insee j6qg8rc6 - 1.0 + 1 QuestionGrid @@ -9896,7 +9896,7 @@ fr.insee jbgdf2md - 1.0 + 1 FAVOURITE_CHARACTERS21 @@ -9906,13 +9906,13 @@ fr.insee j6qg8rc6-QOP-jbgd8lwo - 1.0 + 1 OutParameter fr.insee j6qg8rc6 - 1.0 + 1 QuestionGrid @@ -9922,7 +9922,7 @@ fr.insee jbgdfle1 - 1.0 + 1 FAVOURITE_CHARACTERS31 @@ -9932,13 +9932,13 @@ fr.insee j6qg8rc6-QOP-jbgdbfag - 1.0 + 1 OutParameter fr.insee j6qg8rc6 - 1.0 + 1 QuestionGrid @@ -9948,7 +9948,7 @@ fr.insee jbgdix8x - 1.0 + 1 FAVOURITE_CHARACTERS41 @@ -9958,13 +9958,13 @@ fr.insee j6qg8rc6-QOP-jbgdlgja - 1.0 + 1 OutParameter fr.insee j6qg8rc6 - 1.0 + 1 QuestionGrid @@ -9974,7 +9974,7 @@ fr.insee jbgd782k - 1.0 + 1 FAVOURITE_CHARACTERS51 @@ -9984,13 +9984,13 @@ fr.insee j6qg8rc6-QOP-jbgd745y - 1.0 + 1 OutParameter fr.insee j6qg8rc6 - 1.0 + 1 QuestionGrid @@ -10000,7 +10000,7 @@ fr.insee jbgd68rf - 1.0 + 1 FAVOURITE_CHARACTERS61 @@ -10010,13 +10010,13 @@ fr.insee j6qg8rc6-QOP-jbgdjkts - 1.0 + 1 OutParameter fr.insee j6qg8rc6 - 1.0 + 1 QuestionGrid @@ -10026,7 +10026,7 @@ fr.insee jbgdfoj4 - 1.0 + 1 FAVOURITE_CHARACTERS71 @@ -10036,13 +10036,13 @@ fr.insee j6qg8rc6-QOP-jbgdcax7 - 1.0 + 1 OutParameter fr.insee j6qg8rc6 - 1.0 + 1 QuestionGrid @@ -10052,7 +10052,7 @@ fr.insee jbgdb116 - 1.0 + 1 FAVOURITE_CHARACTERS81 @@ -10062,13 +10062,13 @@ fr.insee j6qg8rc6-QOP-jbgdjye1 - 1.0 + 1 OutParameter fr.insee j6qg8rc6 - 1.0 + 1 QuestionGrid @@ -10078,7 +10078,7 @@ fr.insee jbgd7w5p - 1.0 + 1 FAVOURITE_CHARACTERS91 @@ -10088,13 +10088,13 @@ fr.insee j6qg8rc6-QOP-jbgd5jet - 1.0 + 1 OutParameter fr.insee j6qg8rc6 - 1.0 + 1 QuestionGrid @@ -10104,7 +10104,7 @@ fr.insee jbgd8rj2 - 1.0 + 1 FAVOURITE_CHARACTERS101 @@ -10114,13 +10114,13 @@ fr.insee j6qg8rc6-QOP-jbgdjw90 - 1.0 + 1 OutParameter fr.insee j6qg8rc6 - 1.0 + 1 QuestionGrid @@ -10130,7 +10130,7 @@ fr.insee jbgdidnp - 1.0 + 1 FAVOURITE_CHARACTERS12 @@ -10140,13 +10140,13 @@ fr.insee j6qg8rc6-QOP-jbgdfndq - 1.0 + 1 OutParameter fr.insee j6qg8rc6 - 1.0 + 1 QuestionGrid @@ -10162,7 +10162,7 @@ fr.insee jbgd47wz - 1.0 + 1 FAVOURITE_CHARACTERS22 @@ -10172,13 +10172,13 @@ fr.insee j6qg8rc6-QOP-jbgd7osi - 1.0 + 1 OutParameter fr.insee j6qg8rc6 - 1.0 + 1 QuestionGrid @@ -10194,7 +10194,7 @@ fr.insee jbgdj2nn - 1.0 + 1 FAVOURITE_CHARACTERS32 @@ -10204,13 +10204,13 @@ fr.insee j6qg8rc6-QOP-jbgd7bnw - 1.0 + 1 OutParameter fr.insee j6qg8rc6 - 1.0 + 1 QuestionGrid @@ -10226,7 +10226,7 @@ fr.insee jbgd2ipx - 1.0 + 1 FAVOURITE_CHARACTERS42 @@ -10236,13 +10236,13 @@ fr.insee j6qg8rc6-QOP-jbgd9k71 - 1.0 + 1 OutParameter fr.insee j6qg8rc6 - 1.0 + 1 QuestionGrid @@ -10258,7 +10258,7 @@ fr.insee jbgd4pe3 - 1.0 + 1 FAVOURITE_CHARACTERS52 @@ -10268,13 +10268,13 @@ fr.insee j6qg8rc6-QOP-jbgdimks - 1.0 + 1 OutParameter fr.insee j6qg8rc6 - 1.0 + 1 QuestionGrid @@ -10290,7 +10290,7 @@ fr.insee jbgdjgb1 - 1.0 + 1 FAVOURITE_CHARACTERS62 @@ -10300,13 +10300,13 @@ fr.insee j6qg8rc6-QOP-jbgdjquz - 1.0 + 1 OutParameter fr.insee j6qg8rc6 - 1.0 + 1 QuestionGrid @@ -10322,7 +10322,7 @@ fr.insee jbgdb5c1 - 1.0 + 1 FAVOURITE_CHARACTERS72 @@ -10332,13 +10332,13 @@ fr.insee j6qg8rc6-QOP-jbgdd2w3 - 1.0 + 1 OutParameter fr.insee j6qg8rc6 - 1.0 + 1 QuestionGrid @@ -10354,7 +10354,7 @@ fr.insee jbgdju9y - 1.0 + 1 FAVOURITE_CHARACTERS82 @@ -10364,13 +10364,13 @@ fr.insee j6qg8rc6-QOP-jbgdkosc - 1.0 + 1 OutParameter fr.insee j6qg8rc6 - 1.0 + 1 QuestionGrid @@ -10386,7 +10386,7 @@ fr.insee jbgdatyx - 1.0 + 1 FAVOURITE_CHARACTERS92 @@ -10396,13 +10396,13 @@ fr.insee j6qg8rc6-QOP-jbgdk0x4 - 1.0 + 1 OutParameter fr.insee j6qg8rc6 - 1.0 + 1 QuestionGrid @@ -10418,7 +10418,7 @@ fr.insee jbgdi1dt - 1.0 + 1 FAVOURITE_CHARACTERS102 @@ -10428,13 +10428,13 @@ fr.insee j6qg8rc6-QOP-jbgd2wgf - 1.0 + 1 OutParameter fr.insee j6qg8rc6 - 1.0 + 1 QuestionGrid @@ -10450,7 +10450,7 @@ fr.insee jbcggt4x - 1.0 + 1 SURVEY_COMMENT @@ -10460,13 +10460,13 @@ fr.insee j6z0z3us-QOP-jbgd6m6e - 1.0 + 1 OutParameter fr.insee j6z0z3us - 1.0 + 1 QuestionItem @@ -10476,12 +10476,12 @@ fr.insee j6qg8rc6-gp - 1.0 + 1 fr.insee j6qg8rc6 - 1.0 + 1 QuestionGrid @@ -10492,121 +10492,121 @@ fr.insee jbgd3fkz - 1.0 + 1 Variable fr.insee jbgdf2md - 1.0 + 1 Variable fr.insee jbgdfle1 - 1.0 + 1 Variable fr.insee jbgdix8x - 1.0 + 1 Variable fr.insee jbgd782k - 1.0 + 1 Variable fr.insee jbgd68rf - 1.0 + 1 Variable fr.insee jbgdfoj4 - 1.0 + 1 Variable fr.insee jbgdb116 - 1.0 + 1 Variable fr.insee jbgd7w5p - 1.0 + 1 Variable fr.insee jbgd8rj2 - 1.0 + 1 Variable fr.insee jbgdidnp - 1.0 + 1 Variable fr.insee jbgd47wz - 1.0 + 1 Variable fr.insee jbgdj2nn - 1.0 + 1 Variable fr.insee jbgd2ipx - 1.0 + 1 Variable fr.insee jbgd4pe3 - 1.0 + 1 Variable fr.insee jbgdjgb1 - 1.0 + 1 Variable fr.insee jbgdb5c1 - 1.0 + 1 Variable fr.insee jbgdju9y - 1.0 + 1 Variable fr.insee jbgdatyx - 1.0 + 1 Variable fr.insee jbgdi1dt - 1.0 + 1 Variable @@ -10614,7 +10614,7 @@ fr.insee INSEE-SIMPSONS-PIS-1 - 1.0 + 1 SIMPSONS @@ -10624,66 +10624,66 @@ fr.insee jbcggtca-GI - 1.0 + 1 fr.insee jbgdnfk7 - 1.0 + 1 Variable fr.insee jbgdje4w - 1.0 + 1 Variable fr.insee jbgdlth7 - 1.0 + 1 Variable fr.insee jbgdelbl - 1.0 + 1 Variable fr.insee jbgd95jq - 1.0 + 1 Variable fr.insee jbgdadd9 - 1.0 + 1 Variable fr.insee jbgdlwzk - 1.0 + 1 Variable fr.insee jbgdfz77 - 1.0 + 1 Variable fr.insee jbgdepx6 - 1.0 + 1 Variable fr.insee jbgdepx7 - 1.0 + 1 Variable @@ -10692,7 +10692,7 @@ fr.insee jbcggtca-IP-1 - 1.0 + 1 PERCENTAGE_EXPENSES11 @@ -10700,7 +10700,7 @@ fr.insee jbcggtca-IP-2 - 1.0 + 1 PERCENTAGE_EXPENSES21 @@ -10708,7 +10708,7 @@ fr.insee jbcggtca-IP-3 - 1.0 + 1 PERCENTAGE_EXPENSES31 @@ -10716,7 +10716,7 @@ fr.insee jbcggtca-IP-4 - 1.0 + 1 PERCENTAGE_EXPENSES41 @@ -10724,7 +10724,7 @@ fr.insee jbcggtca-IP-5 - 1.0 + 1 PERCENTAGE_EXPENSES51 @@ -10732,7 +10732,7 @@ fr.insee jbcggtca-IP-6 - 1.0 + 1 PERCENTAGE_EXPENSES61 @@ -10740,7 +10740,7 @@ fr.insee jbcggtca-IP-7 - 1.0 + 1 PERCENTAGE_EXPENSES71 @@ -10748,7 +10748,7 @@ fr.insee jbcggtca-IP-8 - 1.0 + 1 PERCENTAGE_EXPENSES81 @@ -10756,7 +10756,7 @@ fr.insee jbcggtca-IP-9 - 1.0 + 1 PERCENTAGE_EXPENSES91 @@ -10764,7 +10764,7 @@ fr.insee jbcggtca-IP-10 - 1.0 + 1 PERCENTAGE_EXPENSES101 @@ -10772,19 +10772,19 @@ fr.insee jbcggtca-GOP - 1.0 + 1 fr.insee j4nwc63q-QOP-jbgde5yl - 1.0 + 1 OutParameter fr.insee jbcggtca-IP-1 - 1.0 + 1 InParameter @@ -10792,13 +10792,13 @@ fr.insee j4nwc63q-QOP-jbgd2x2t - 1.0 + 1 OutParameter fr.insee jbcggtca-IP-2 - 1.0 + 1 InParameter @@ -10806,13 +10806,13 @@ fr.insee j4nwc63q-QOP-jbgdjypz - 1.0 + 1 OutParameter fr.insee jbcggtca-IP-3 - 1.0 + 1 InParameter @@ -10820,13 +10820,13 @@ fr.insee j4nwc63q-QOP-jbgdcftu - 1.0 + 1 OutParameter fr.insee jbcggtca-IP-4 - 1.0 + 1 InParameter @@ -10834,13 +10834,13 @@ fr.insee j4nwc63q-QOP-jbgdiyfe - 1.0 + 1 OutParameter fr.insee jbcggtca-IP-5 - 1.0 + 1 InParameter @@ -10848,13 +10848,13 @@ fr.insee j4nwc63q-QOP-jbgdj1wd - 1.0 + 1 OutParameter fr.insee jbcggtca-IP-6 - 1.0 + 1 InParameter @@ -10862,13 +10862,13 @@ fr.insee j4nwc63q-QOP-jbgddylk - 1.0 + 1 OutParameter fr.insee jbcggtca-IP-7 - 1.0 + 1 InParameter @@ -10876,13 +10876,13 @@ fr.insee j4nwc63q-QOP-jbgd3jj6 - 1.0 + 1 OutParameter fr.insee jbcggtca-IP-8 - 1.0 + 1 InParameter @@ -10890,13 +10890,13 @@ fr.insee j4nwc63q-QOP-jbgd4w3k - 1.0 + 1 OutParameter fr.insee jbcggtca-IP-9 - 1.0 + 1 InParameter @@ -10904,13 +10904,13 @@ fr.insee j4nwc63q-QOP-jbgd4w4k - 1.0 + 1 OutParameter fr.insee jbcggtca-IP-10 - 1.0 + 1 InParameter @@ -10923,7 +10923,7 @@ fr.insee Sequence-i6vwi0 - 1.0 + 1 Sequence @@ -10931,7 +10931,7 @@ fr.insee INSEE-SIMPSONS-MRS - 1.0 + 1 Liste de formats numériques et dates de l'enquête @@ -10940,7 +10940,7 @@ fr.insee INSEE-COMMUN-MNR-DateTimedate-YYYY-MM-DD - 1.0 + 1 YYYY-MM-DD date @@ -10953,38 +10953,38 @@ fr.insee StudyUnit-i6vwi0 - 1.0 + 1 fr.insee DataCollection-i6vwi0 - 1.0 + 1 fr.insee QuestionScheme-i6vwi0 - 1.0 + 1 QuestionScheme fr.insee ControlConstructScheme-i6vwi0 - 1.0 + 1 ControlConstructScheme fr.insee InterviewerInstructionScheme-i6vwi0 - 1.0 + 1 InterviewerInstructionScheme fr.insee InstrumentScheme-i6vwi0 - 1.0 + 1 fr.insee Instrument-i6vwi0 - 1.0 + 1 SIMPSONS @@ -10995,7 +10995,7 @@ fr.insee Sequence-i6vwi0 - 1.0 + 1 Sequence From 10f1ed306f93eda3dba778c722cb4b8a4f1cca28 Mon Sep 17 00:00:00 2001 From: CHTAINET Badr Date: Fri, 13 Sep 2019 11:15:48 +0200 Subject: [PATCH 128/439] 287bis change date format --- src/main/resources/xslt/outputs/ddi/models.xsl | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/resources/xslt/outputs/ddi/models.xsl b/src/main/resources/xslt/outputs/ddi/models.xsl index 01b7d20bc..e81c463e9 100644 --- a/src/main/resources/xslt/outputs/ddi/models.xsl +++ b/src/main/resources/xslt/outputs/ddi/models.xsl @@ -221,7 +221,10 @@ P99Y11M PT99H59M - format-dateTime(current-date(),'') + year-from-date(current-date()) + format-date(current-date(),'[Y0001]-[M01]') + + format-date(current-date(),'[Y0001]-[M01]-[D01]') From 5bfd26a24d790c239da9a84cfc9dc8921332fdd2 Mon Sep 17 00:00:00 2001 From: BulotF Date: Fri, 13 Sep 2019 17:24:43 +0200 Subject: [PATCH 129/439] Update models.xsl debug formulas --- src/main/resources/xslt/outputs/fr/models.xsl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/resources/xslt/outputs/fr/models.xsl b/src/main/resources/xslt/outputs/fr/models.xsl index f3b0c1316..65f2acae9 100644 --- a/src/main/resources/xslt/outputs/fr/models.xsl +++ b/src/main/resources/xslt/outputs/fr/models.xsl @@ -3000,7 +3000,6 @@ - @@ -3020,7 +3019,7 @@ - + From d56368edd2c3ed41e5b857c8a1402e17543a7176 Mon Sep 17 00:00:00 2001 From: BulotF Date: Fri, 13 Sep 2019 17:25:34 +0200 Subject: [PATCH 130/439] create get-variable-business-name properly --- .../resources/xslt/inputs/ddi/functions.fods | 24 ++++++++++++---- .../xslt/inputs/ddi/source-fixed.xsl | 19 +++++++++++++ .../transformations/ddi2fr/ddi2fr-fixed.xsl | 9 ------ .../transformations/ddi2fr/functions.fods | 28 ++++++++++++++----- 4 files changed, 59 insertions(+), 21 deletions(-) diff --git a/src/main/resources/xslt/inputs/ddi/functions.fods b/src/main/resources/xslt/inputs/ddi/functions.fods index 259a2381c..98fd229e5 100644 --- a/src/main/resources/xslt/inputs/ddi/functions.fods +++ b/src/main/resources/xslt/inputs/ddi/functions.fods @@ -1,20 +1,20 @@ - 2009-04-16T11:32:48.39PT22H27M12S149LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-09-11T14:00:46.229000000François Bulot + 2009-04-16T11:32:48.39PT22H38M31S151LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-09-13T17:17:41.927000000François Bulot 0 0 44116 - 32582 + 33034 view1 3 - 53 + 51 0 0 0 @@ -600,7 +600,7 @@ ???(???) - 00/00/0000, 00:00:00 + 00/00/0000, 00:00:00 @@ -1274,6 +1274,20 @@ Function that returns the list of the variables conditioning a label + + + enoddi:get-variable-business-name + + + variable + + + xs:string + + + Function that returns the business name of a variable from its ID + + enoddi:get-conditioning-variable-formula @@ -1498,7 +1512,7 @@ Function that returns a boolean which define if the response is mandatory. - + diff --git a/src/main/resources/xslt/inputs/ddi/source-fixed.xsl b/src/main/resources/xslt/inputs/ddi/source-fixed.xsl index 797577abc..45fd923f4 100644 --- a/src/main/resources/xslt/inputs/ddi/source-fixed.xsl +++ b/src/main/resources/xslt/inputs/ddi/source-fixed.xsl @@ -1066,7 +1066,26 @@ + + + + Defining getter get-variable-business-name. + Function that returns the business name of a variable from its DDI ID. + + + + + + + + + + + + Name template get-business-name that returns the business name of a variable from its DDI ID. + + diff --git a/src/main/resources/xslt/transformations/ddi2fr/ddi2fr-fixed.xsl b/src/main/resources/xslt/transformations/ddi2fr/ddi2fr-fixed.xsl index 85e428ad1..bfab462b8 100644 --- a/src/main/resources/xslt/transformations/ddi2fr/ddi2fr-fixed.xsl +++ b/src/main/resources/xslt/transformations/ddi2fr/ddi2fr-fixed.xsl @@ -128,15 +128,6 @@ - - - - - - - - - diff --git a/src/main/resources/xslt/transformations/ddi2fr/functions.fods b/src/main/resources/xslt/transformations/ddi2fr/functions.fods index 3a0f4b345..4455812d4 100644 --- a/src/main/resources/xslt/transformations/ddi2fr/functions.fods +++ b/src/main/resources/xslt/transformations/ddi2fr/functions.fods @@ -1,20 +1,20 @@ - 2009-04-16T11:32:48.39PT12H56S90LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-09-11T13:57:16.541000000François Bulot + 2009-04-16T11:32:48.39PT12H4M41S92LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-09-13T17:15:10.894000000François Bulot 0 0 33709 - 31284 + 31735 view1 - 4 - 39 + 0 + 38 0 0 0 @@ -23,7 +23,7 @@ 0 0 0 - 9 + 18 0 100 60 @@ -598,7 +598,7 @@ ???(???) - 00/00/0000, 00:00:00 + 00/00/0000, 00:00:00 @@ -1155,6 +1155,20 @@ Linking output function enofr:get-readonly-ancestors-variables to input function enoddi:get-deactivatable-ancestors-variables + + + enofr:get-variable-business-name + + + variable + + + enoddi:get-variable-business-name + + + Linking output function enofr:get-variable-business-name to input function enoddi:get-variable-business-name + + enofr:get-conditioning-variable-formula @@ -1432,7 +1446,7 @@ Linking output function enofr:get-cell-value-variables to input function enoddi:get-cell-value-variables - + From 96535f954163c999289d65471dd0d3dcd44d9c18 Mon Sep 17 00:00:00 2001 From: CHTAINET Badr Date: Fri, 13 Sep 2019 17:30:58 +0200 Subject: [PATCH 131/439] 287bis Change Date Format Maximum --- .../resources/xslt/outputs/ddi/models.xsl | 21 ++++++------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/src/main/resources/xslt/outputs/ddi/models.xsl b/src/main/resources/xslt/outputs/ddi/models.xsl index e81c463e9..5c3328da3 100644 --- a/src/main/resources/xslt/outputs/ddi/models.xsl +++ b/src/main/resources/xslt/outputs/ddi/models.xsl @@ -192,7 +192,7 @@ - + @@ -1688,26 +1688,17 @@ - - + + + - - - - - - - + - - - - - + ; From f1522022a06ac2e71d3cfdf15eeb61d62792cbf3 Mon Sep 17 00:00:00 2001 From: BulotF Date: Fri, 13 Sep 2019 17:37:18 +0200 Subject: [PATCH 132/439] create get-variable-business-ancestors properly --- .../resources/xslt/inputs/ddi/functions.fods | 24 +++++++++++++++---- .../xslt/inputs/ddi/source-fixed.xsl | 14 +++++++++++ .../transformations/ddi2fr/ddi2fr-fixed.xsl | 9 ------- .../transformations/ddi2fr/functions.fods | 22 +++++++++++++---- 4 files changed, 51 insertions(+), 18 deletions(-) diff --git a/src/main/resources/xslt/inputs/ddi/functions.fods b/src/main/resources/xslt/inputs/ddi/functions.fods index 98fd229e5..b4dbb97af 100644 --- a/src/main/resources/xslt/inputs/ddi/functions.fods +++ b/src/main/resources/xslt/inputs/ddi/functions.fods @@ -1,20 +1,20 @@ - 2009-04-16T11:32:48.39PT22H38M31S151LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-09-13T17:17:41.927000000François Bulot + 2009-04-16T11:32:48.39PT22H49M31S152LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-09-13T17:28:42.696000000François Bulot 0 0 44116 - 33034 + 33485 view1 - 3 - 51 + 0 + 53 0 0 0 @@ -1288,6 +1288,20 @@ Function that returns the business name of a variable from its ID + + + enoddi:get-variable-business-ancestors + + + variable + + + xs:string* + + + Function that returns the business ancestors of a variable from its ID + + enoddi:get-conditioning-variable-formula @@ -1512,7 +1526,7 @@ Function that returns a boolean which define if the response is mandatory. - + diff --git a/src/main/resources/xslt/inputs/ddi/source-fixed.xsl b/src/main/resources/xslt/inputs/ddi/source-fixed.xsl index 45fd923f4..e238e3bab 100644 --- a/src/main/resources/xslt/inputs/ddi/source-fixed.xsl +++ b/src/main/resources/xslt/inputs/ddi/source-fixed.xsl @@ -1126,6 +1126,20 @@ + + + Defining getter get-variable-business-ancestors. + Function that returns the business ascendants loop and rowloop business names from a DDI variable ID. + + + + + + + + + + diff --git a/src/main/resources/xslt/transformations/ddi2fr/ddi2fr-fixed.xsl b/src/main/resources/xslt/transformations/ddi2fr/ddi2fr-fixed.xsl index bfab462b8..3548346f0 100644 --- a/src/main/resources/xslt/transformations/ddi2fr/ddi2fr-fixed.xsl +++ b/src/main/resources/xslt/transformations/ddi2fr/ddi2fr-fixed.xsl @@ -128,15 +128,6 @@ - - - - - - - - - This function returns an xforms label for the context on which it is applied. diff --git a/src/main/resources/xslt/transformations/ddi2fr/functions.fods b/src/main/resources/xslt/transformations/ddi2fr/functions.fods index 4455812d4..53d1a9b06 100644 --- a/src/main/resources/xslt/transformations/ddi2fr/functions.fods +++ b/src/main/resources/xslt/transformations/ddi2fr/functions.fods @@ -1,19 +1,19 @@ - 2009-04-16T11:32:48.39PT12H4M41S92LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-09-13T17:15:10.894000000François Bulot + 2009-04-16T11:32:48.39PT12H18M53S93LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-09-13T17:29:22.897000000François Bulot 0 0 33709 - 31735 + 32187 view1 - 0 + 4 38 0 0 @@ -1169,6 +1169,20 @@ Linking output function enofr:get-variable-business-name to input function enoddi:get-variable-business-name + + + enofr:get-variable-business-ancestors + + + variable + + + enoddi:get-variable-business-ancestors + + + Linking output function enofr:get-variable-business-ancestors to input function enoddi:get-variable-business-ancestors + + enofr:get-conditioning-variable-formula @@ -1446,7 +1460,7 @@ Linking output function enofr:get-cell-value-variables to input function enoddi:get-cell-value-variables - + From 90895d3c0de8e02ea3a01dbfda73e606ef84ff94 Mon Sep 17 00:00:00 2001 From: BulotF Date: Fri, 13 Sep 2019 17:44:17 +0200 Subject: [PATCH 133/439] Update models.xsl reorder formulas --- src/main/resources/xslt/outputs/fr/models.xsl | 58 +++++++++---------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/src/main/resources/xslt/outputs/fr/models.xsl b/src/main/resources/xslt/outputs/fr/models.xsl index 65f2acae9..955963dc3 100644 --- a/src/main/resources/xslt/outputs/fr/models.xsl +++ b/src/main/resources/xslt/outputs/fr/models.xsl @@ -2917,33 +2917,25 @@ - - - + + - + - - - - - - - + - - - - + + + @@ -2956,7 +2948,7 @@ - + @@ -2964,34 +2956,40 @@ - - - + + + + - + + + + + + + - - - - + + + - + @@ -2999,17 +2997,19 @@ - - + + + + - + - + From 3a7f9068a07fbd89a4566e78ae0c29f1ef745abe Mon Sep 17 00:00:00 2001 From: CHTAINET Badr Date: Mon, 16 Sep 2019 10:33:56 +0200 Subject: [PATCH 134/439] 287bis add out test file --- src/test/resources/pogues-xml-to-ddi/out.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/resources/pogues-xml-to-ddi/out.xml b/src/test/resources/pogues-xml-to-ddi/out.xml index 52605f2ac..fb76627a4 100644 --- a/src/test/resources/pogues-xml-to-ddi/out.xml +++ b/src/test/resources/pogues-xml-to-ddi/out.xml @@ -10945,7 +10945,7 @@ date 1900-01-01 - format-dateTime(current-date(),'YYYY-MM-DD') + format-date(current-date(),'[Y0001]-[M01]-[D01]') From ea54b4361c6cd3ba04a7bcc0c67341f40de9d98f Mon Sep 17 00:00:00 2001 From: BulotF Date: Tue, 17 Sep 2019 09:40:57 +0200 Subject: [PATCH 135/439] Update models.xsl improve formulas --- src/main/resources/xslt/outputs/fr/models.xsl | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/resources/xslt/outputs/fr/models.xsl b/src/main/resources/xslt/outputs/fr/models.xsl index 955963dc3..278a43f64 100644 --- a/src/main/resources/xslt/outputs/fr/models.xsl +++ b/src/main/resources/xslt/outputs/fr/models.xsl @@ -2915,10 +2915,11 @@ + - + @@ -2982,7 +2983,7 @@ - + @@ -3000,7 +3001,7 @@ - + From 08cc5846cef7205ba56a1c04a698563f98842fb0 Mon Sep 17 00:00:00 2001 From: BulotF Date: Tue, 17 Sep 2019 09:41:31 +0200 Subject: [PATCH 136/439] create getter get-variable-representation --- .../xslt/inputs/ddi/source-fixed.xsl | 2 +- .../resources/xslt/inputs/ddi/templates.fods | 87 +++++++++++++++++-- 2 files changed, 82 insertions(+), 7 deletions(-) diff --git a/src/main/resources/xslt/inputs/ddi/source-fixed.xsl b/src/main/resources/xslt/inputs/ddi/source-fixed.xsl index e238e3bab..9aee92082 100644 --- a/src/main/resources/xslt/inputs/ddi/source-fixed.xsl +++ b/src/main/resources/xslt/inputs/ddi/source-fixed.xsl @@ -1186,7 +1186,7 @@ - + diff --git a/src/main/resources/xslt/inputs/ddi/templates.fods b/src/main/resources/xslt/inputs/ddi/templates.fods index ac644f6e9..7c3c4fce9 100644 --- a/src/main/resources/xslt/inputs/ddi/templates.fods +++ b/src/main/resources/xslt/inputs/ddi/templates.fods @@ -1,20 +1,20 @@ - 2009-04-16T11:32:48.39P3DT8H47M47S404LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-08-30T15:58:20.281000000François Bulot + 2009-04-16T11:32:48.39P3DT8H53M32S408LibreOffice/5.4.6.2$Windows_X86_64 LibreOffice_project/4014ce260a04f1026ba855d3b8d91541c224eab82019-09-16T18:00:29.184000000François Bulot 0 0 63256 - 82493 + 85386 view1 0 - 47 + 123 0 0 0 @@ -23,7 +23,7 @@ 0 0 0 - 30 + 99 0 100 60 @@ -78,7 +78,7 @@ true true \\S20SLINNG\LP0000554-CLR-DR59-SNDI-Secretariat - nin+/1xcUzIwU0xJTk5HXExQMDAwMDU1NC1DTFItRFI1OS1TTkRJLVNlY3JldGFyaWF0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAS09OSUNBIE1JTk9MVEEgVW5pdmVyc2FsIFBDTAAAAAAWAAEAuigAAAAAAAAEAAhSAAAEdAAAM1ROVwAAAAAKAFwAXABTADIAMABTAEwASQBOAE4ARwBcAEwAUAAwADAAMAAwADUANQA0AC0AQwBMAFIALQBEAFIANQA5AAAAAAABBAAB3ADUJw+/AAIBAAkAmgs0CGQAAQAHAFgCAgACAFgCAwAAAEEANAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAyCcAAFNQTFgBAAAAAAAAAPwL192wJwAAyCcAAFVQRF9PV04AAAAAAAAAAABQQ0xYTAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAkANAiaCysAKwArACsAADQImgsAAABMIAAArS0AAGUBNAiaCwA0CJoLAEwgAACtLQAAAQBkAAcAAQEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQEBAAABAQBJblRyYXkxAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEBAAABAQEBAAABAQBJblRyYXkyAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIBAAABAQEBAAABAQBJblRyYXkzAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMBAAABAQEBAAABAQBJblRyYXk0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQBAAABAQEBAAABAQBJblRyYXlMQ1QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOgDAAABAQEBAAABAQBJblRyYXlNYW51YWwAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAABAQEBAAABAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAAABAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAAABAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAAABAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAEAAQEBAAEAAQAAAAEAAA4BAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAwAEAAEBAAAAAAQAAAAAAAEAAQAAAAAAAAEBAAAAZAB9AAAEAQEABAEBAAEBAQAB/38AAOkDAQAA6QMBAAABAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEASAD/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAQABAAAAAAABAAAAAQAAAAEAAAABAAEAAQABAQAAAQAAAAEAAQABAQADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAQEAAAAAAQABAAAAAAEAAAEAAQAAAAAAAQAAAAABAAEAAQABAQAAAQAAAAEAAAABAAAAAAEBAAEAAQABAQAAAQAAAAAAAQABBQAAAAAAAAABAAAAAAAAAAEAAQAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQQByAGkAYQBsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAAAgAAAQEAZAABAQBkAAEAAP//AAABAAEAAAAAAAAAAQABAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQAAAAAAAAAAAAAAAAAAAAABAgBYAlgCUAMYAAEEAAAAAAAAAQAAAQAAAAEAAAABAQAAAAABAAABAQABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQABAAEAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEAAABfAgABQXJpYWwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABDb3VyaWVyIE5ldwAAAAAAAAAAAAAAAAAAAAAAAAAAAFRpbWVzIE5ldyBSb21hbgAAAAAAAAAAAAAAAAAAAAAAU3ltYm9sAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABXaW5nZGluZ3MAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQsXFBoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQXJpYWwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABDb3VyaWVyAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFRpbWVzIE5ldyBSb21hbgAAAAAAAAAAAAAAAAAAAAAAU3ltYm9sAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABXaW5nZGluZ3MAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAADpAQAAIwQAAGkFAAB2AgAAqgMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAQAAAAEBAEsBAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANAiaCwCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABzAG8AZgBmAGkAYwBlAC4AYgBpAG4AAAAAAAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAYAAAABAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEACQA0CJoLTCAAAK0tAAD//wAA//8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZAAAAAQAAAAAAAAAAAAAAAAAAAAZYREoAAAAABIAQ09NUEFUX0RVUExFWF9NT0RFFABEdXBsZXhNb2RlOjpMb25nRWRnZQ== + nin+/1xcUzIwU0xJTk5HXExQMDAwMDU1NC1DTFItRFI1OS1TTkRJLVNlY3JldGFyaWF0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAS09OSUNBIE1JTk9MVEEgVW5pdmVyc2FsIFBDTAAAAAAWAAEAuigAAAAAAAAEAAhSAAAEdAAAM1ROVwAAAAAKAFwAXABTADIAMABTAEwASQBOAE4ARwBcAEwAUAAwADAAMAAwADUANQA0AC0AQwBMAFIALQBEAFIANQA5AAAAAAABBAAB3ADUJw+/AAIBAAkAmgs0CGQAAQAHAFgCAQACAFgCAwAAAEEANAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAyCcAAFNQTFgBAAAAAAAAAB2g5u2wJwAAyCcAAFVQRF9PV04AAAAAAAAAAABQQ0xYTAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAkANAiaCysAKwArACsAADQImgsAAABMIAAArS0AAGUBNAiaCwA0CJoLAEwgAACtLQAAAQBkAAcAAQEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQEBAAABAQBJblRyYXkxAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEBAAABAQEBAAABAQBJblRyYXkyAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIBAAABAQEBAAABAQBJblRyYXkzAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMBAAABAQEBAAABAQBJblRyYXk0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQBAAABAQEBAAABAQBJblRyYXlNYW51YWwAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAABAQEBAAABAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAAABAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAAABAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAAABAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAAABAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAEAAQEBAAEAAQAAAAEAAA4BAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAwAEAAEBAAAAAAQAAAAAAAEAAQAAAAAAAAEBAAAAZAB9AAAEAQEABAEBAAEBAQAB/38AAOkDAQAA6QMBAAABAAABAAAAAAAAAAAAAAAAV01fMTAxAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABVAFIARwBFAE4AVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVQBSAEcARQBOAFQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQQByAGkAYQBsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEASAD/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAQABAAAAAAABAAAAAQAAAAEAAAABAAEAAQABAQAAAQAAAAEAAQABAQADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAQEAAAAAAQABAAAAAAEAAAEAAQAAAAAAAQAAAAABAAEAAQABAQAAAQAAAAEAAAABAAAAAAEBAAEAAQABAQAAAQAAAAAAAQABBQAAAAAAAAABAAAAAAAAAAEAAQAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQQByAGkAYQBsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAAAgAAAQEAZAABAQBkAAEAAP//AAABAAEAAAAAAAAAAQABAQEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQAAAAAAAAAAAAAAAAAAAAABAgBYAlgCUAMYAAEEAAAAAAAAAQAAAQAAAAEAAAABAQAAAAABAAABAQABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQABAAEAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEAAABfAgABQXJpYWwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABDb3VyaWVyIE5ldwAAAAAAAAAAAAAAAAAAAAAAAAAAAFRpbWVzIE5ldyBSb21hbgAAAAAAAAAAAAAAAAAAAAAAU3ltYm9sAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABXaW5nZGluZ3MAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQsXFBoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQXJpYWwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABDb3VyaWVyAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFRpbWVzIE5ldyBSb21hbgAAAAAAAAAAAAAAAAAAAAAAU3ltYm9sAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABXaW5nZGluZ3MAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAADpAQAAIwQAAGkFAAB2AgAAqgMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAQAAAAEBAEsBAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAcgBfAGQAdgBxAG4AcQB0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANAiaCwCAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABzAG8AZgBmAGkAYwBlAC4AYgBpAG4AAAAAAAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAYAAAABAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEACQA0CJoLTCAAAK0tAAD//wAA//8AAOMHCQACAAMADgAPADQAUgEAAAAAAAAAAEkAAAAAAAkAAAByAF8AZAB2AHEAbgBxAHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZAAAAAQAAAAAAAAAAAAAAAAAAAAZYREoAAAAABIAQ09NUEFUX0RVUExFWF9NT0RFFABEdXBsZXhNb2RlOjpMb25nRWRnZQ== zxx @@ -634,7 +634,7 @@ ???(???) - 00/00/0000, 00:00:00 + 00/00/0000, 00:00:00 @@ -2442,6 +2442,81 @@ Getting the type of a d:QuestionItem having a d:NominalDomain + + + *[starts-with(name(),'r:DateTimeRepresentation')] + + + enoddi:get-type + + + descendant::r:DateTypeCode[not(ancestor::r:OutParameter)] + + + + Getting the type of a d:DateTimeDomain or d:DateTimeRepresentation. + + + + + *[starts-with(name(),'r:NumericRepresentation')] + + + enoddi:get-type + + + 'number' + + + + Getting the type of a d:NumericRepresentation or d:NumericRepresentationReference. + + + + + r:TextRepresentation + + + enoddi:get-type + + + 'text' + + + + Getting the type of a d:TextRepresentation. + + + + + r:CodeRepresentation[r:CodeSubsetInformation] + + + enoddi:get-type + + + 'boolean' + + + + Getting the type of a boolean representation + + + + + r:CodeRepresentation[r:CodeListReference] + + + enoddi:get-type + + + 'code' + + + + Getting the type of a boolean representation + + From a08558e5b26995af84a2ffcf6626910a5ce694e1 Mon Sep 17 00:00:00 2001 From: BulotF Date: Tue, 17 Sep 2019 10:11:43 +0200 Subject: [PATCH 137/439] Update models.xsl improve formulas --- src/main/resources/xslt/outputs/fr/models.xsl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/resources/xslt/outputs/fr/models.xsl b/src/main/resources/xslt/outputs/fr/models.xsl index 278a43f64..45af4d6e2 100644 --- a/src/main/resources/xslt/outputs/fr/models.xsl +++ b/src/main/resources/xslt/outputs/fr/models.xsl @@ -2915,11 +2915,10 @@ - - + From b7eb6cc5018bcba0029730f3358a3a0e0c14e795 Mon Sep 17 00:00:00 2001 From: Laurent Caouissin Date: Wed, 18 Sep 2019 10:51:10 +0200 Subject: [PATCH 138/439] Merge branch 'eno-v2' of https://github.com/InseeFr/Eno into eno-v2 From a110a7d9bffe8c8442dfaa582d83f22ca0150022 Mon Sep 17 00:00:00 2001 From: Laurent Caouissin Date: Fri, 20 Sep 2019 11:10:00 +0200 Subject: [PATCH 139/439] Change package --- .../insee/eno/params/{ => pipeline}/PipeLineGeneratorImpl.java | 2 +- .../fr/insee/eno/params/{ => pipeline}/PipelineGenerator.java | 2 +- .../fr/insee/eno/{ => params}/validation/ValidationBoolean.java | 2 +- .../java/fr/insee/eno/{ => params}/validation/Validator.java | 2 +- .../fr/insee/eno/{ => params}/validation/ValidatorImpl.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) rename src/main/java/fr/insee/eno/params/{ => pipeline}/PipeLineGeneratorImpl.java (99%) rename src/main/java/fr/insee/eno/params/{ => pipeline}/PipelineGenerator.java (95%) rename src/main/java/fr/insee/eno/{ => params}/validation/ValidationBoolean.java (88%) rename src/main/java/fr/insee/eno/{ => params}/validation/Validator.java (81%) rename src/main/java/fr/insee/eno/{ => params}/validation/ValidatorImpl.java (99%) diff --git a/src/main/java/fr/insee/eno/params/PipeLineGeneratorImpl.java b/src/main/java/fr/insee/eno/params/pipeline/PipeLineGeneratorImpl.java similarity index 99% rename from src/main/java/fr/insee/eno/params/PipeLineGeneratorImpl.java rename to src/main/java/fr/insee/eno/params/pipeline/PipeLineGeneratorImpl.java index 18dddc308..b089bea3f 100644 --- a/src/main/java/fr/insee/eno/params/PipeLineGeneratorImpl.java +++ b/src/main/java/fr/insee/eno/params/pipeline/PipeLineGeneratorImpl.java @@ -1,4 +1,4 @@ -package fr.insee.eno.params; +package fr.insee.eno.params.pipeline; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/fr/insee/eno/params/PipelineGenerator.java b/src/main/java/fr/insee/eno/params/pipeline/PipelineGenerator.java similarity index 95% rename from src/main/java/fr/insee/eno/params/PipelineGenerator.java rename to src/main/java/fr/insee/eno/params/pipeline/PipelineGenerator.java index aec100e94..24bd991bc 100644 --- a/src/main/java/fr/insee/eno/params/PipelineGenerator.java +++ b/src/main/java/fr/insee/eno/params/pipeline/PipelineGenerator.java @@ -1,4 +1,4 @@ -package fr.insee.eno.params; +package fr.insee.eno.params.pipeline; import java.util.List; diff --git a/src/main/java/fr/insee/eno/validation/ValidationBoolean.java b/src/main/java/fr/insee/eno/params/validation/ValidationBoolean.java similarity index 88% rename from src/main/java/fr/insee/eno/validation/ValidationBoolean.java rename to src/main/java/fr/insee/eno/params/validation/ValidationBoolean.java index 7ee2deb08..8d6ab699a 100644 --- a/src/main/java/fr/insee/eno/validation/ValidationBoolean.java +++ b/src/main/java/fr/insee/eno/params/validation/ValidationBoolean.java @@ -1,4 +1,4 @@ -package fr.insee.eno.validation; +package fr.insee.eno.params.validation; public class ValidationBoolean { diff --git a/src/main/java/fr/insee/eno/validation/Validator.java b/src/main/java/fr/insee/eno/params/validation/Validator.java similarity index 81% rename from src/main/java/fr/insee/eno/validation/Validator.java rename to src/main/java/fr/insee/eno/params/validation/Validator.java index 144ae3af8..5022ba2b2 100644 --- a/src/main/java/fr/insee/eno/validation/Validator.java +++ b/src/main/java/fr/insee/eno/params/validation/Validator.java @@ -1,4 +1,4 @@ -package fr.insee.eno.validation; +package fr.insee.eno.params.validation; import fr.insee.eno.parameters.ENOParameters; diff --git a/src/main/java/fr/insee/eno/validation/ValidatorImpl.java b/src/main/java/fr/insee/eno/params/validation/ValidatorImpl.java similarity index 99% rename from src/main/java/fr/insee/eno/validation/ValidatorImpl.java rename to src/main/java/fr/insee/eno/params/validation/ValidatorImpl.java index 4b31615f9..445298048 100644 --- a/src/main/java/fr/insee/eno/validation/ValidatorImpl.java +++ b/src/main/java/fr/insee/eno/params/validation/ValidatorImpl.java @@ -1,4 +1,4 @@ -package fr.insee.eno.validation; +package fr.insee.eno.params.validation; import java.util.Arrays; import java.util.List; From da332ce37cefaa250d2a508c7bf8caf7b7abcdb7 Mon Sep 17 00:00:00 2001 From: CHTAINET Badr Date: Fri, 20 Sep 2019 12:40:15 +0200 Subject: [PATCH 140/439] 288-Bis Fix Date and Duration MaximumResponses --- src/main/resources/xslt/outputs/ddi/models.xsl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/xslt/outputs/ddi/models.xsl b/src/main/resources/xslt/outputs/ddi/models.xsl index 5c3328da3..06e61c0a5 100644 --- a/src/main/resources/xslt/outputs/ddi/models.xsl +++ b/src/main/resources/xslt/outputs/ddi/models.xsl @@ -1600,7 +1600,7 @@ - + From 44ecee29eab69e7e77a056bd459e1fe217fa3adc Mon Sep 17 00:00:00 2001 From: Laurent Caouissin Date: Mon, 23 Sep 2019 11:45:54 +0200 Subject: [PATCH 141/439] Create identity generator --- .../eno/generation/IdentityGenerator.java | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 src/main/java/fr/insee/eno/generation/IdentityGenerator.java diff --git a/src/main/java/fr/insee/eno/generation/IdentityGenerator.java b/src/main/java/fr/insee/eno/generation/IdentityGenerator.java new file mode 100644 index 000000000..f44fc2230 --- /dev/null +++ b/src/main/java/fr/insee/eno/generation/IdentityGenerator.java @@ -0,0 +1,22 @@ +package fr.insee.eno.generation; + +import java.io.File; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class IdentityGenerator implements Generator { + + private static final Logger logger = LoggerFactory.getLogger(IdentityGenerator.class); + + @Override + public File generate(File finalInput, byte[] parameters, String surveyName) throws Exception { + logger.info("Indentity generation : START"); + logger.info("The output file is the input file."); + return finalInput; + } + + public String in2out() { + return "identity"; + } +} From eef9cc33390ab4a8a0c17030a408aaff97fbaa36 Mon Sep 17 00:00:00 2001 From: Laurent Caouissin Date: Mon, 23 Sep 2019 12:01:50 +0200 Subject: [PATCH 142/439] Create Java transforamtion : DDI32ToDDI33 - add path to xslSheet - add extension "ddi33.xml" - add dummy Test (file and java test) --- src/main/java/fr/insee/eno/Constants.java | 2 + .../eno/generation/IdentityGenerator.java | 14 +- .../DDI32ToDDI33Preprocessor.java | 47 + .../insee/eno/main/DummyTestDDI32ToDDI33.java | 30 + src/test/resources/ddi32-to-ddi33/in.xml | 10085 ++++++++++++++++ 5 files changed, 10174 insertions(+), 4 deletions(-) create mode 100644 src/main/java/fr/insee/eno/preprocessing/DDI32ToDDI33Preprocessor.java create mode 100644 src/test/java/fr/insee/eno/main/DummyTestDDI32ToDDI33.java create mode 100644 src/test/resources/ddi32-to-ddi33/in.xml diff --git a/src/main/java/fr/insee/eno/Constants.java b/src/main/java/fr/insee/eno/Constants.java index 003028fbf..6a1be78d0 100644 --- a/src/main/java/fr/insee/eno/Constants.java +++ b/src/main/java/fr/insee/eno/Constants.java @@ -60,6 +60,7 @@ private Constants() { public static final String UTIL_FODS_PREFORMATTING_XSL = UTIL_FOLDER_PATH + "/fods/preformatting.xsl"; public static final String UTIL_XSL_INCORPORATION_XSL = UTIL_FOLDER_PATH + "/xsl/incorporation.xsl"; public static final String UTIL_DDI_DEREFERENCING_XSL = UTIL_FOLDER_PATH + "/ddi/dereferencing.xsl"; + public static final String UTIL_DDI32_TO_DDI33_XSL = UTIL_FOLDER_PATH + "/ddi/ddi32toddi33.xsl"; public static final String BROWSING_FR_TEMPLATE_XSL = UTIL_FOLDER_PATH + "/fr/browsing.xsl"; public static final String BROWSING_JS_TEMPLATE_XSL = UTIL_FOLDER_PATH + "/js/browsing.xsl"; // public static final String PROPERTIES_FILE_FR = CONFIG_FOLDER + "/ddi2fr.xml"; @@ -290,6 +291,7 @@ public String oLD_TEMP_NULL_TMP2(String sUB_TEMP_FOLDER){ public static final String FINAL_EXTENSION = "-final.tmp"; public static final String TEMP_EXTENSION = "-temp.xml"; public static final String FINAL_DDI_EXTENSION = "-final.xml"; + public static final String DDI32_DDI33_EXTENSION = "-ddi33.xml"; public static final String ACCOMPANYING_MAILS_FO_EXTENSION = "-accompanying-mails.fo"; diff --git a/src/main/java/fr/insee/eno/generation/IdentityGenerator.java b/src/main/java/fr/insee/eno/generation/IdentityGenerator.java index f44fc2230..1f5cef5cf 100644 --- a/src/main/java/fr/insee/eno/generation/IdentityGenerator.java +++ b/src/main/java/fr/insee/eno/generation/IdentityGenerator.java @@ -2,21 +2,27 @@ import java.io.File; +import org.apache.commons.io.FileUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import fr.insee.eno.Constants; + public class IdentityGenerator implements Generator { private static final Logger logger = LoggerFactory.getLogger(IdentityGenerator.class); @Override public File generate(File finalInput, byte[] parameters, String surveyName) throws Exception { - logger.info("Indentity generation : START"); - logger.info("The output file is the input file."); - return finalInput; + logger.info("Identity generation : START"); + logger.info("Identity generation : simply copying input file in another file"); + String outputForm = Constants.TEMP_FOLDER_PATH + "/" + surveyName + "/ddi33/out.xml"; + FileUtils.copyFile(finalInput, new File(outputForm)); + logger.info("Identity generation : END"); + return new File(outputForm); } public String in2out() { return "identity"; - } + } } diff --git a/src/main/java/fr/insee/eno/preprocessing/DDI32ToDDI33Preprocessor.java b/src/main/java/fr/insee/eno/preprocessing/DDI32ToDDI33Preprocessor.java new file mode 100644 index 000000000..bf9d76572 --- /dev/null +++ b/src/main/java/fr/insee/eno/preprocessing/DDI32ToDDI33Preprocessor.java @@ -0,0 +1,47 @@ +package fr.insee.eno.preprocessing; + +import java.io.File; +import java.io.InputStream; +import java.io.OutputStream; + +import org.apache.commons.io.FileUtils; +import org.apache.commons.io.FilenameUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import fr.insee.eno.Constants; +import fr.insee.eno.transform.xsl.XslTransformation; + +/** + * A DDI specific preprocessor. + */ +public class DDI32ToDDI33Preprocessor implements Preprocessor { + + private static final Logger logger = LoggerFactory.getLogger(DDI32ToDDI33Preprocessor.class); + + // FIXME Inject ! + private static XslTransformation saxonService = new XslTransformation(); + + @Override + public File process(File inputFile, byte[] parametersFile, String survey, String in2out) throws Exception { + logger.info("DDI32ToDDI33Preprocessing Target : START"); + + String sUB_TEMP_FOLDER = Constants.sUB_TEMP_FOLDER(survey); + String output = FilenameUtils.removeExtension(inputFile.getAbsolutePath()) + Constants.DDI32_DDI33_EXTENSION;; + + logger.debug("DDI32ToDDI33 : -Input : " + inputFile + " -Output : " +output + + " -Stylesheet : " + Constants.UTIL_DDI32_TO_DDI33_XSL + " -Parameters : " + sUB_TEMP_FOLDER); + + InputStream isDDI32_TO_DDI33_XSL = Constants.getInputStreamFromPath(Constants.UTIL_DDI32_TO_DDI33_XSL); + InputStream isInputFile = FileUtils.openInputStream(inputFile); + OutputStream osDDI32DDI33 = FileUtils.openOutputStream(new File(output)); + saxonService.transform(isInputFile, isDDI32_TO_DDI33_XSL, osDDI32DDI33); + isInputFile.close(); + isDDI32_TO_DDI33_XSL.close(); + osDDI32DDI33.close(); + + logger.debug("DDI32ToDDI33Preprocessing : END"); + return new File(output); + } + +} diff --git a/src/test/java/fr/insee/eno/main/DummyTestDDI32ToDDI33.java b/src/test/java/fr/insee/eno/main/DummyTestDDI32ToDDI33.java new file mode 100644 index 000000000..c2b858216 --- /dev/null +++ b/src/test/java/fr/insee/eno/main/DummyTestDDI32ToDDI33.java @@ -0,0 +1,30 @@ +package fr.insee.eno.main; + +import java.io.File; + +import fr.insee.eno.GenerationService; +import fr.insee.eno.generation.IdentityGenerator; +import fr.insee.eno.postprocessing.NoopPostprocessor; +import fr.insee.eno.preprocessing.DDI32ToDDI33Preprocessor; + +public class DummyTestDDI32ToDDI33 { + + public static void main(String[] args) { + + String basePathDDI32DDI33FO = "src/test/resources/ddi32-to-ddi33"; + GenerationService genServiceDDI32DDI33 = new GenerationService(new DDI32ToDDI33Preprocessor(), new IdentityGenerator(),new NoopPostprocessor()); + File in = new File(String.format("%s/in.xml", basePathDDI32DDI33FO)); + try { + File output = genServiceDDI32DDI33.generateQuestionnaire(in, "test"); + System.out.println(output.getAbsolutePath()); + } catch (Exception e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + + + } + +} + diff --git a/src/test/resources/ddi32-to-ddi33/in.xml b/src/test/resources/ddi32-to-ddi33/in.xml new file mode 100644 index 000000000..383252d9c --- /dev/null +++ b/src/test/resources/ddi32-to-ddi33/in.xml @@ -0,0 +1,10085 @@ + + fr.insee + INSEE-i6vwid + 0.1.0 + + + Questionnaire SIMPSONS + + + + fr.insee + RessourcePackage-i6vwid + 0.1.0 + + fr.insee + InterviewerInstructionScheme-i6vwid + 0.1.0 + + A définir + + + fr.insee + d1 + 0.1.0 + + comment + + + + We're going to test your knowledge about the simpsons series.Welcome in the simspons world! + + + + + fr.insee + d11 + 0.1.0 + + comment + + + + For your information, the date of the last broadcast was on + øLAST_BROADCASTø + + + + + fr.insee + d2 + 0.1.0 + + comment + + + + This module asks about your general knowledge of the Simpsons city + + + + + fr.insee + d3 + 0.1.0 + + instruction + + + + One possible answer + + + + + fr.insee + d4 + 0.1.0 + + instruction + + + + Only one possible answer + + + + + fr.insee + d5 + 0.1.0 + + instruction + + + + Several possible answers + + + + + fr.insee + j4nwc63q-CI-0-II-0 + 0.1.0 + + warning + + + + The sum of percentages is: ¤jbcggtca-GOP¤ %. The total of + percentages must be equal to 100%. + + + + fr.insee + jbcggtca-GOP + 0.1.0 + OutParameter + + + + + + fr.insee + d10 + 0.1.0 + + instruction + + + + Several answers possible: check off all the relevant boxes + + + + fr.inseeFTN-INSTRUCTION-10.1.0tooltipIncluded principalities + + fr.insee + ControlConstructScheme-i6vwid + 0.1.0 + + fr.insee + Sequence-i6vwid + 0.1.0 + + Questionnaire SIMPSONS + + template + + fr.insee + j6p0ti5h + 0.1.0 + Sequence + + + fr.insee + d1e101 + 0.1.0 + IfThenElse + + + fr.insee + j6z12s2d + 0.1.0 + Sequence + + + + fr.insee + j6p0ti5h + 0.1.0 + + MODULE1 + + + Introduction + + + fr.insee + d1 + 0.1.0 + Instruction + + module + + fr.insee + j6p3dkx6-QC + 0.1.0 + QuestionConstruct + + + fr.insee + j6p0np9q-QC + 0.1.0 + QuestionConstruct + + + fr.insee + d1e42 + 0.1.0 + IfThenElse + + + + fr.insee + j6p0s7o5 + 0.1.0 + + MODULE11 + + + General knowledge of the series + + submodule + + fr.insee + j3343qhx-QC + 0.1.0 + QuestionConstruct + + + fr.insee + j6q9h8tj-QC + 0.1.0 + QuestionConstruct + + + fr.insee + j334cyqb-QC + 0.1.0 + QuestionConstruct + + + fr.insee + j6z06z1e-QC + 0.1.0 + QuestionConstruct + + + + fr.insee + j3341528 + 0.1.0 + + MODULE2 + + + Simpsons' city + + + fr.insee + d2 + 0.1.0 + Instruction + + module + + fr.insee + j3343clt-QC + 0.1.0 + QuestionConstruct + + + fr.insee + j6qdfhvw-QC + 0.1.0 + QuestionConstruct + + + fr.insee + j4nw5cqz-QC + 0.1.0 + QuestionConstruct + + + + fr.insee + j6qe0h9q + 0.1.0 + + MODULE3 + + + Characters + + module + + fr.insee + j334akov-QC + 0.1.0 + QuestionConstruct + + + fr.insee + d12-SI + 0.1.0 + StatementItem + + + fr.insee + j6p29i81-QC + 0.1.0 + QuestionConstruct + + + fr.insee + j6qefnga-QC + 0.1.0 + QuestionConstruct + + + fr.insee + j6yzoc6g-QC + 0.1.0 + QuestionConstruct + + + + fr.insee + j4nw88h2 + 0.1.0 + + MODULE4 + + + General questions + + module + + fr.insee + j6qe237q + 0.1.0 + Sequence + + + fr.insee + j6qejudb + 0.1.0 + Sequence + + + fr.insee + j6qeh91y + 0.1.0 + Sequence + + + + fr.insee + j6qe237q + 0.1.0 + + MODULE41 + + + Kwik-E-Mart + + submodule + + fr.insee + j4nwc63q-QC + 0.1.0 + QuestionConstruct + + + fr.insee + j4nwc63q-CI-0 + 0.1.0 + ComputationItem + + + + fr.insee + j6qejudb + 0.1.0 + + MODULE42 + + + Clowning + + submodule + + fr.insee + j4nw0rr6-QC + 0.1.0 + QuestionConstruct + + + + fr.insee + j6qeh91y + 0.1.0 + + MODULE43 + + + Transport + + submodule + + fr.insee + j6p2lwuj-QC + 0.1.0 + QuestionConstruct + + + + fr.insee + j6qfx9qe + 0.1.0 + + MODULE5 + + + Favourite characters + + module + + fr.insee + j6qg8rc6-QC + 0.1.0 + QuestionConstruct + + + + fr.insee + j6z12s2d + 0.1.0 + + MODULE6 + + + Comment + + module + + fr.insee + j6z0z3us-QC + 0.1.0 + QuestionConstruct + + + + fr.insee + d1e42 + 0.1.0 + + + xpath + + fr.insee + d1e42-IP-1 + 0.1.0 + + READY + + + + + fr.insee + j6p0np9q-QOP-jbgd3set + 0.1.0 + OutParameter + + + fr.insee + d1e42-IP-1 + 0.1.0 + InParameter + + + not( d1e42-IP-1 != '1') + + + + fr.insee + d1e42-THEN + 0.1.0 + Sequence + + + + fr.insee + d1e42-THEN + 0.1.0 + + + + hideable + + fr.insee + j6p0s7o5 + 0.1.0 + Sequence + + + + fr.insee + d1e101 + 0.1.0 + + + xpath + + fr.insee + d1e101-IP-1 + 0.1.0 + + READY + + + + + fr.insee + j6p0np9q-QOP-jbgd3set + 0.1.0 + OutParameter + + + fr.insee + d1e101-IP-1 + 0.1.0 + InParameter + + + not( d1e101-IP-1 != '1') + + + + fr.insee + d1e101-THEN + 0.1.0 + Sequence + + + + fr.insee + d1e101-THEN + 0.1.0 + + + + hideable + + fr.insee + j3341528 + 0.1.0 + Sequence + + + fr.insee + j6qe0h9q + 0.1.0 + Sequence + + + fr.insee + j4nw88h2 + 0.1.0 + Sequence + + + fr.insee + j6qfx9qe + 0.1.0 + Sequence + + + + fr.insee + j6p3dkx6-QC + 0.1.0 + + COMMENT + + + fr.insee + j6p3dkx6 + 0.1.0 + QuestionItem + + + + fr.insee + j6p0np9q-QC + 0.1.0 + + READY + + + fr.insee + j6p0np9q + 0.1.0 + QuestionItem + + + + fr.insee + j3343qhx-QC + 0.1.0 + + PRODUCER + + + fr.insee + j3343qhx + 0.1.0 + QuestionItem + + + + fr.insee + j6q9h8tj-QC + 0.1.0 + + SEASON_NUMBER + + + fr.insee + j6q9h8tj + 0.1.0 + QuestionItem + + + + fr.insee + j334cyqb-QC + 0.1.0 + + DATEFIRST + + + fr.insee + j334cyqb + 0.1.0 + QuestionItem + + + + fr.insee + j6z06z1e-QC + 0.1.0 + + AUDIENCE_SHARE + + + fr.insee + j6z06z1e + 0.1.0 + QuestionItem + + + + fr.insee + j3343clt-QC + 0.1.0 + + CITY + + + fr.insee + j3343clt + 0.1.0 + QuestionItem + + + + fr.insee + j6qdfhvw-QC + 0.1.0 + + MAYOR + + + fr.insee + j6qdfhvw + 0.1.0 + QuestionItem + + + + fr.insee + j4nw5cqz-QC + 0.1.0 + + STATE + + + fr.insee + j4nw5cqz + 0.1.0 + QuestionItem + + + + fr.insee + j334akov-QC + 0.1.0 + + PET + + + fr.insee + j334akov + 0.1.0 + QuestionGrid + + + + fr.insee + j6p29i81-QC + 0.1.0 + + ICE_FLAVOUR + + + fr.insee + j6p29i81 + 0.1.0 + QuestionGrid + + + + fr.insee + j6qefnga-QC + 0.1.0 + + NUCLEAR_CHARACTER + + + fr.insee + j6qefnga + 0.1.0 + QuestionGrid + + + + fr.insee + j6yzoc6g-QC + 0.1.0 + + BIRTH_CHARACTER + + + fr.insee + j6yzoc6g + 0.1.0 + QuestionGrid + + + + fr.insee + j4nwc63q-QC + 0.1.0 + + PERCENTAGE_EXPENSES + + + fr.insee + j4nwc63q + 0.1.0 + QuestionGrid + + + + fr.insee + j4nw0rr6-QC + 0.1.0 + + CLOWNING + + + fr.insee + j4nw0rr6 + 0.1.0 + QuestionGrid + + + + fr.insee + j6p2lwuj-QC + 0.1.0 + + TRAVEL + + + fr.insee + j6p2lwuj + 0.1.0 + QuestionGrid + + + + fr.insee + j6qg8rc6-QC + 0.1.0 + + FAVOURITE_CHARACTERS + + + fr.insee + j6qg8rc6 + 0.1.0 + QuestionGrid + + + + fr.insee + j6z0z3us-QC + 0.1.0 + + SURVEY_COMMENT + + + fr.insee + j6z0z3us + 0.1.0 + QuestionItem + + + + fr.insee + j4nwc63q-CI-0 + 0.1.0 + + Total of percentages + + + Total of percentages + + + fr.insee + j4nwc63q-CI-0-II-0 + 0.1.0 + Instruction + + + + xpath + + fr.insee + j4nwc63q-CI-0-IP-1 + 0.1.0 + + PERCENTAGE_EXPENSES11 + + + + fr.insee + j4nwc63q-CI-0-IP-2 + 0.1.0 + + PERCENTAGE_EXPENSES21 + + + + fr.insee + j4nwc63q-CI-0-IP-3 + 0.1.0 + + PERCENTAGE_EXPENSES31 + + + + fr.insee + j4nwc63q-CI-0-IP-4 + 0.1.0 + + PERCENTAGE_EXPENSES41 + + + + fr.insee + j4nwc63q-CI-0-IP-5 + 0.1.0 + + PERCENTAGE_EXPENSES51 + + + + fr.insee + j4nwc63q-CI-0-IP-6 + 0.1.0 + + PERCENTAGE_EXPENSES61 + + + + fr.insee + j4nwc63q-CI-0-IP-7 + 0.1.0 + + PERCENTAGE_EXPENSES71 + + + + fr.insee + j4nwc63q-CI-0-IP-8 + 0.1.0 + + PERCENTAGE_EXPENSES81 + + + + fr.insee + j4nwc63q-CI-0-IP-9 + 0.1.0 + + PERCENTAGE_EXPENSES91 + + + + fr.insee + j4nwc63q-CI-0-IP-10 + 0.1.0 + + PERCENTAGE_EXPENSES101 + + + + + fr.insee + j4nwc63q-QOP-jbgde5yl + 0.1.0 + OutParameter + + + fr.insee + j4nwc63q-CI-0-IP-1 + 0.1.0 + InParameter + + + + + fr.insee + j4nwc63q-QOP-jbgd2x2t + 0.1.0 + OutParameter + + + fr.insee + j4nwc63q-CI-0-IP-2 + 0.1.0 + InParameter + + + + + fr.insee + j4nwc63q-QOP-jbgdjypz + 0.1.0 + OutParameter + + + fr.insee + j4nwc63q-CI-0-IP-3 + 0.1.0 + InParameter + + + + + fr.insee + j4nwc63q-QOP-jbgdcftu + 0.1.0 + OutParameter + + + fr.insee + j4nwc63q-CI-0-IP-4 + 0.1.0 + InParameter + + + + + fr.insee + j4nwc63q-QOP-jbgdiyfe + 0.1.0 + OutParameter + + + fr.insee + j4nwc63q-CI-0-IP-5 + 0.1.0 + InParameter + + + + + fr.insee + j4nwc63q-QOP-jbgdj1wd + 0.1.0 + OutParameter + + + fr.insee + j4nwc63q-CI-0-IP-6 + 0.1.0 + InParameter + + + + + fr.insee + j4nwc63q-QOP-jbgddylk + 0.1.0 + OutParameter + + + fr.insee + j4nwc63q-CI-0-IP-7 + 0.1.0 + InParameter + + + + + fr.insee + j4nwc63q-QOP-jbgd3jj6 + 0.1.0 + OutParameter + + + fr.insee + j4nwc63q-CI-0-IP-8 + 0.1.0 + InParameter + + + + + fr.insee + j4nwc63q-QOP-jbgd4w3k + 0.1.0 + OutParameter + + + fr.insee + j4nwc63q-CI-0-IP-9 + 0.1.0 + InParameter + + + + + fr.insee + j4nwc63q-QOP-jbgd4w4k + 0.1.0 + OutParameter + + + fr.insee + j4nwc63q-CI-0-IP-10 + 0.1.0 + InParameter + + + number(if (j4nwc63q-CI-0-IP-1='') then '0' else j4nwc63q-CI-0-IP-1) + number(if (j4nwc63q-CI-0-IP-2='') then '0' else j4nwc63q-CI-0-IP-2) + + number(if (j4nwc63q-CI-0-IP-3='') then '0' else j4nwc63q-CI-0-IP-3) + number(if (j4nwc63q-CI-0-IP-4='') then '0' else j4nwc63q-CI-0-IP-4) + number(if (j4nwc63q-CI-0-IP-5='') then '0' else j4nwc63q-CI-0-IP-5) + + number(if (j4nwc63q-CI-0-IP-6='') then '0' else j4nwc63q-CI-0-IP-6) + number(if (j4nwc63q-CI-0-IP-7='') then '0' else j4nwc63q-CI-0-IP-7) + number(if (j4nwc63q-CI-0-IP-8='') then '0' else j4nwc63q-CI-0-IP-8) + + number(if (j4nwc63q-CI-0-IP-9='') then '0' else j4nwc63q-CI-0-IP-9) + number(if (j4nwc63q-CI-0-IP-10='') then '0' else j4nwc63q-CI-0-IP-10) != 100 + + + + + fr.insee + d12-SI + 0.1.0 + + + Now we are going to know if you think that Jay is a gluton. + + + + + + fr.insee + QuestionScheme-i6vwid + 0.1.0 + + A définir + + + fr.insee + j6p3dkx6 + 0.1.0 + + COMMENT + + + fr.insee + j6p3dkx6-QOP-jbgdhaht + 0.1.0 + + COMMENT + + + + + fr.insee + j6p3dkx6-RDOP-jbgdhaht + 0.1.0 + OutParameter + + + fr.insee + j6p3dkx6-QOP-jbgdhaht + 0.1.0 + OutParameter + + + + + Before starting, do you have any comments about the Simpsons family? + + + + + fr.insee + j6p3dkx6-RDOP-jbgdhaht + 0.1.0 + + + + + + fr.insee + j6p0np9q + 0.1.0 + + READY + + + fr.insee + j6p0np9q-QOP-jbgd3set + 0.1.0 + + READY + + + + + fr.insee + j6p0np9q-RDOP-jbgd3set + 0.1.0 + OutParameter + + + fr.insee + j6p0np9q-QOP-jbgd3set + 0.1.0 + OutParameter + + + + + Are you ready? + + + + + fr.insee + j6p0np9q-RDOP-jbgd3set + 0.1.0 + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 0.1.0 + Code + + + + + + + + + + fr.insee + j6p6my1d + 0.1.0 + + + + If you are not ready, please go to the end of the + questionnaire + $READY != '1' + j6z12s2d + + + + + + + fr.insee + j3343qhx + 0.1.0 + + PRODUCER + + + fr.insee + j3343qhx-QOP-jbgd90cy + 0.1.0 + + PRODUCER + + + + + fr.insee + j3343qhx-RDOP-jbgd90cy + 0.1.0 + OutParameter + + + fr.insee + j3343qhx-QOP-jbgd90cy + 0.1.0 + OutParameter + + + + + Who is the producer? + + + + + fr.insee + j3343qhx-RDOP-jbgd90cy + 0.1.0 + + + + + + fr.insee + j6q9h8tj + 0.1.0 + + SEASON_NUMBER + + + fr.insee + j6q9h8tj-QOP-jbgdjy8h + 0.1.0 + + SEASON_NUMBER + + + + + fr.insee + j6q9h8tj-RDOP-jbgdjy8h + 0.1.0 + OutParameter + + + fr.insee + j6q9h8tj-QOP-jbgdjy8h + 0.1.0 + OutParameter + + + + + What is the current season number? + + + + + 0 + 99 + + Decimal + + fr.insee + j6q9h8tj-RDOP-jbgdjy8h + 0.1.0 + + + + + fr.insee + j334cyqb + 0.1.0 + + DATEFIRST + + + fr.insee + j334cyqb-QOP-jbgdih2z + 0.1.0 + + DATEFIRST + + + + + fr.insee + j334cyqb-RDOP-jbgdih2z + 0.1.0 + OutParameter + + + fr.insee + j334cyqb-QOP-jbgdih2z + 0.1.0 + OutParameter + + + + + When was the first episode of the Simpsons? + + + + fr.insee + INSEE-COMMUN-MNR-DateTimedate + 0.1.0 + ManagedDateTimeRepresentation + + fr.insee + j334cyqb-RDOP-jbgdih2z + 0.1.0 + + fr.insee + INSEE-COMMUN-MNR-DateTimedate + 0.1.0 + ManagedDateTimeRepresentation + + + + + fr.insee + d11 + 0.1.0 + Instruction + + + + fr.insee + j6z06z1e + 0.1.0 + + AUDIENCE_SHARE + + + fr.insee + j6z06z1e-QOP-jbgddnrd + 0.1.0 + + AUDIENCE_SHARE + + + + + fr.insee + j6z06z1e-RDOP-jbgddnrd + 0.1.0 + OutParameter + + + fr.insee + j6z06z1e-QOP-jbgddnrd + 0.1.0 + OutParameter + + + + + In your opinion, how much is the part of audience share in US for the 2016 + season? + + + + + 0 + 99 + + Decimal + + fr.insee + j6z06z1e-RDOP-jbgddnrd + 0.1.0 + + + + + fr.insee + j3343clt + 0.1.0 + + CITY + + + fr.insee + j3343clt-QOP-jbgdjdkn + 0.1.0 + + CITY + + + + + fr.insee + j3343clt-RDOP-jbgdjdkn + 0.1.0 + OutParameter + + + fr.insee + j3343clt-QOP-jbgdjdkn + 0.1.0 + OutParameter + + + + + In which city do the Simpsons reside? + + + + radio-button + + fr.insee + j334iumu + 0.1.0 + CodeList + + + fr.insee + j3343clt-RDOP-jbgdjdkn + 0.1.0 + + + fr.insee + j334iumu + 0.1.0 + CodeList + + + + + + + fr.insee + d3 + 0.1.0 + Instruction + + + + fr.insee + j6qdfhvw + 0.1.0 + + MAYOR + + + fr.insee + j6qdfhvw-QOP-jbgd8ghp + 0.1.0 + + MAYOR + + + + + fr.insee + j6qdfhvw-RDOP-jbgd8ghp + 0.1.0 + OutParameter + + + fr.insee + j6qdfhvw-QOP-jbgd8ghp + 0.1.0 + OutParameter + + + + + Who is the Simpsons city mayor? + + + + checkbox + + fr.insee + j6qdqoen + 0.1.0 + CodeList + + + fr.insee + j6qdfhvw-RDOP-jbgd8ghp + 0.1.0 + + + fr.insee + j6qdqoen + 0.1.0 + CodeList + + + + + + + fr.insee + d4 + 0.1.0 + Instruction + + + + fr.insee + j4nw5cqz + 0.1.0 + + STATE + + + fr.insee + j4nw5cqz-QOP-jbgdkd7v + 0.1.0 + + STATE + + + + + fr.insee + j4nw5cqz-RDOP-jbgdkd7v + 0.1.0 + OutParameter + + + fr.insee + j4nw5cqz-QOP-jbgdkd7v + 0.1.0 + OutParameter + + + + + In which state do The Simpsons reside? + + + + drop-down-list + + fr.insee + j4nwo00f + 0.1.0 + CodeList + + + fr.insee + j4nw5cqz-RDOP-jbgdkd7v + 0.1.0 + + + fr.insee + j4nwo00f + 0.1.0 + CodeList + + + + + + + + fr.insee + j6z0z3us + 0.1.0 + + SURVEY_COMMENT + + + fr.insee + j6z0z3us-QOP-jbgd6m6e + 0.1.0 + + SURVEY_COMMENT + + + + + fr.insee + j6z0z3us-RDOP-jbgd6m6e + 0.1.0 + OutParameter + + + fr.insee + j6z0z3us-QOP-jbgd6m6e + 0.1.0 + OutParameter + + + + + Do you have any comment about the survey? + + + + + fr.insee + j6z0z3us-RDOP-jbgd6m6e + 0.1.0 + + + + + + fr.insee + j334akov + 0.1.0 + + PET + + + fr.insee + j334akov-QOP-jbgd8qmn + 0.1.0 + + PET1 + + + + fr.insee + j334akov-QOP-jbgd60vl + 0.1.0 + + PET2 + + + + fr.insee + j334akov-QOP-jbgda2jo + 0.1.0 + + PET3 + + + + fr.insee + j334akov-QOP-jbgdfssy + 0.1.0 + + PET4 + + + + + fr.insee + j334akov-RDOP-jbgd8qmn + 0.1.0 + OutParameter + + + fr.insee + j334akov-QOP-jbgd8qmn + 0.1.0 + OutParameter + + + + + fr.insee + j334akov-RDOP-jbgd60vl + 0.1.0 + OutParameter + + + fr.insee + j334akov-QOP-jbgd60vl + 0.1.0 + OutParameter + + + + + fr.insee + j334akov-RDOP-jbgda2jo + 0.1.0 + OutParameter + + + fr.insee + j334akov-QOP-jbgda2jo + 0.1.0 + OutParameter + + + + + fr.insee + j334akov-RDOP-jbgdfssy + 0.1.0 + OutParameter + + + fr.insee + j334akov-QOP-jbgdfssy + 0.1.0 + OutParameter + + + + + What are the pet names that the Simpsons family had? + + + + + + fr.insee + j335cu3c + 0.1.0 + CodeList + + + + + + + + fr.insee + j334akov-RDOP-jbgd8qmn + 0.1.0 + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 0.1.0 + Code + + + + + + + + + + + + + + + + + + fr.insee + j334akov-RDOP-jbgd60vl + 0.1.0 + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 0.1.0 + Code + + + + + + + + + + + + + + + + + + fr.insee + j334akov-RDOP-jbgda2jo + 0.1.0 + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 0.1.0 + Code + + + + + + + + + + + + + + + + + + fr.insee + j334akov-RDOP-jbgdfssy + 0.1.0 + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 0.1.0 + Code + + + + + + + + + + + + + + + + + fr.insee + d5 + 0.1.0 + Instruction + + + + fr.insee + j6p29i81 + 0.1.0 + + ICE_FLAVOUR + + + fr.insee + j6p29i81-QOP-jbgdb3jx + 0.1.0 + + ICE_FLAVOUR1 + + + + fr.insee + j6p29i81-QOP-jbgdb61k + 0.1.0 + + ICE_FLAVOUR2 + + + + fr.insee + j6p29i81-QOP-jbgdl3kc + 0.1.0 + + ICE_FLAVOUR3 + + + + fr.insee + j6p29i81-QOP-jbgdcobo + 0.1.0 + + ICE_FLAVOUR4 + + + + + fr.insee + j6p29i81-RDOP-jbgdb3jx + 0.1.0 + OutParameter + + + fr.insee + j6p29i81-QOP-jbgdb3jx + 0.1.0 + OutParameter + + + + + fr.insee + j6p29i81-RDOP-jbgdb61k + 0.1.0 + OutParameter + + + fr.insee + j6p29i81-QOP-jbgdb61k + 0.1.0 + OutParameter + + + + + fr.insee + j6p29i81-RDOP-jbgdl3kc + 0.1.0 + OutParameter + + + fr.insee + j6p29i81-QOP-jbgdl3kc + 0.1.0 + OutParameter + + + + + fr.insee + j6p29i81-RDOP-jbgdcobo + 0.1.0 + OutParameter + + + fr.insee + j6p29i81-QOP-jbgdcobo + 0.1.0 + OutParameter + + + + + Does Jay like the following ice cream flavours? + + + + + + fr.insee + j6p2mvca + 0.1.0 + CodeList + + + + + + + radio-button + + fr.insee + jbdxh138 + 0.1.0 + CodeList + + + fr.insee + j6p29i81-RDOP-jbgdb3jx + 0.1.0 + + + fr.insee + jbdxh138 + 0.1.0 + CodeList + + + + + + + + + + + + + + radio-button + + fr.insee + jbdxh138 + 0.1.0 + CodeList + + + fr.insee + j6p29i81-RDOP-jbgdb61k + 0.1.0 + + + fr.insee + jbdxh138 + 0.1.0 + CodeList + + + + + + + + + + + + + + radio-button + + fr.insee + jbdxh138 + 0.1.0 + CodeList + + + fr.insee + j6p29i81-RDOP-jbgdl3kc + 0.1.0 + + + fr.insee + jbdxh138 + 0.1.0 + CodeList + + + + + + + + + + + + + + radio-button + + fr.insee + jbdxh138 + 0.1.0 + CodeList + + + fr.insee + j6p29i81-RDOP-jbgdcobo + 0.1.0 + + + fr.insee + jbdxh138 + 0.1.0 + CodeList + + + + + + + + + + + + + + + fr.insee + j6qefnga + 0.1.0 + + NUCLEAR_CHARACTER + + + fr.insee + j6qefnga-QOP-jbgd6p0k + 0.1.0 + + NUCLEAR_CHARACTER1 + + + + fr.insee + j6qefnga-QOP-jbgd9ato + 0.1.0 + + NUCLEAR_CHARACTER2 + + + + fr.insee + j6qefnga-QOP-jbgd3e0p + 0.1.0 + + NUCLEAR_CHARACTER3 + + + + fr.insee + j6qefnga-QOP-jbgdkxne + 0.1.0 + + NUCLEAR_CHARACTER4 + + + + + fr.insee + j6qefnga-RDOP-jbgd6p0k + 0.1.0 + OutParameter + + + fr.insee + j6qefnga-QOP-jbgd6p0k + 0.1.0 + OutParameter + + + + + fr.insee + j6qefnga-RDOP-jbgd9ato + 0.1.0 + OutParameter + + + fr.insee + j6qefnga-QOP-jbgd9ato + 0.1.0 + OutParameter + + + + + fr.insee + j6qefnga-RDOP-jbgd3e0p + 0.1.0 + OutParameter + + + fr.insee + j6qefnga-QOP-jbgd3e0p + 0.1.0 + OutParameter + + + + + fr.insee + j6qefnga-RDOP-jbgdkxne + 0.1.0 + OutParameter + + + fr.insee + j6qefnga-QOP-jbgdkxne + 0.1.0 + OutParameter + + + + + Which character works in the nuclear power plant? + + + + + + fr.insee + j6qeytgc + 0.1.0 + CodeList + + + + + + + drop-down-list + + fr.insee + jbdxh138 + 0.1.0 + CodeList + + + fr.insee + j6qefnga-RDOP-jbgd6p0k + 0.1.0 + + + fr.insee + jbdxh138 + 0.1.0 + CodeList + + + + + + + + + + + + + + drop-down-list + + fr.insee + jbdxh138 + 0.1.0 + CodeList + + + fr.insee + j6qefnga-RDOP-jbgd9ato + 0.1.0 + + + fr.insee + jbdxh138 + 0.1.0 + CodeList + + + + + + + + + + + + + + drop-down-list + + fr.insee + jbdxh138 + 0.1.0 + CodeList + + + fr.insee + j6qefnga-RDOP-jbgd3e0p + 0.1.0 + + + fr.insee + jbdxh138 + 0.1.0 + CodeList + + + + + + + + + + + + + + drop-down-list + + fr.insee + jbdxh138 + 0.1.0 + CodeList + + + fr.insee + j6qefnga-RDOP-jbgdkxne + 0.1.0 + + + fr.insee + jbdxh138 + 0.1.0 + CodeList + + + + + + + + + + + + + + + fr.insee + j6yzoc6g + 0.1.0 + + BIRTH_CHARACTER + + + fr.insee + j6yzoc6g-QOP-jbgd7fr6 + 0.1.0 + + BIRTH_CHARACTER1 + + + + fr.insee + j6yzoc6g-QOP-jbgd5e9f + 0.1.0 + + BIRTH_CHARACTER2 + + + + fr.insee + j6yzoc6g-QOP-jbgd912x + 0.1.0 + + BIRTH_CHARACTER3 + + + + fr.insee + j6yzoc6g-QOP-jbgd6bdy + 0.1.0 + + BIRTH_CHARACTER4 + + + + fr.insee + j6yzoc6g-QOP-jbgddyry + 0.1.0 + + BIRTH_CHARACTER5 + + + + + fr.insee + j6yzoc6g-RDOP-jbgd7fr6 + 0.1.0 + OutParameter + + + fr.insee + j6yzoc6g-QOP-jbgd7fr6 + 0.1.0 + OutParameter + + + + + fr.insee + j6yzoc6g-RDOP-jbgd5e9f + 0.1.0 + OutParameter + + + fr.insee + j6yzoc6g-QOP-jbgd5e9f + 0.1.0 + OutParameter + + + + + fr.insee + j6yzoc6g-RDOP-jbgd912x + 0.1.0 + OutParameter + + + fr.insee + j6yzoc6g-QOP-jbgd912x + 0.1.0 + OutParameter + + + + + fr.insee + j6yzoc6g-RDOP-jbgd6bdy + 0.1.0 + OutParameter + + + fr.insee + j6yzoc6g-QOP-jbgd6bdy + 0.1.0 + OutParameter + + + + + fr.insee + j6yzoc6g-RDOP-jbgddyry + 0.1.0 + OutParameter + + + fr.insee + j6yzoc6g-QOP-jbgddyry + 0.1.0 + OutParameter + + + + + In which city each character was born? + + + + + + fr.insee + j6z087mq + 0.1.0 + CodeList + + + + + + + checkbox + + fr.insee + jbdxricm + 0.1.0 + CodeList + + + fr.insee + j6yzoc6g-RDOP-jbgd7fr6 + 0.1.0 + + + fr.insee + jbdxricm + 0.1.0 + CodeList + + + + + + + + + + + + + + checkbox + + fr.insee + jbdxricm + 0.1.0 + CodeList + + + fr.insee + j6yzoc6g-RDOP-jbgd5e9f + 0.1.0 + + + fr.insee + jbdxricm + 0.1.0 + CodeList + + + + + + + + + + + + + + checkbox + + fr.insee + jbdxricm + 0.1.0 + CodeList + + + fr.insee + j6yzoc6g-RDOP-jbgd912x + 0.1.0 + + + fr.insee + jbdxricm + 0.1.0 + CodeList + + + + + + + + + + + + + + checkbox + + fr.insee + jbdxricm + 0.1.0 + CodeList + + + fr.insee + j6yzoc6g-RDOP-jbgd6bdy + 0.1.0 + + + fr.insee + jbdxricm + 0.1.0 + CodeList + + + + + + + + + + + + + + checkbox + + fr.insee + jbdxricm + 0.1.0 + CodeList + + + fr.insee + j6yzoc6g-RDOP-jbgddyry + 0.1.0 + + + fr.insee + jbdxricm + 0.1.0 + CodeList + + + + + + + + + + + + + + + fr.insee + j4nwc63q + 0.1.0 + + PERCENTAGE_EXPENSES + + + fr.insee + j4nwc63q-QOP-jbgde5yl + 0.1.0 + + PERCENTAGE_EXPENSES11 + + + + fr.insee + j4nwc63q-QOP-jbgd2x2t + 0.1.0 + + PERCENTAGE_EXPENSES21 + + + + fr.insee + j4nwc63q-QOP-jbgdjypz + 0.1.0 + + PERCENTAGE_EXPENSES31 + + + + fr.insee + j4nwc63q-QOP-jbgdcftu + 0.1.0 + + PERCENTAGE_EXPENSES41 + + + + fr.insee + j4nwc63q-QOP-jbgdiyfe + 0.1.0 + + PERCENTAGE_EXPENSES51 + + + + fr.insee + j4nwc63q-QOP-jbgdj1wd + 0.1.0 + + PERCENTAGE_EXPENSES61 + + + + fr.insee + j4nwc63q-QOP-jbgddylk + 0.1.0 + + PERCENTAGE_EXPENSES71 + + + + fr.insee + j4nwc63q-QOP-jbgd3jj6 + 0.1.0 + + PERCENTAGE_EXPENSES81 + + + + fr.insee + j4nwc63q-QOP-jbgd4w3k + 0.1.0 + + PERCENTAGE_EXPENSES91 + + + + fr.insee + j4nwc63q-QOP-jbgd4w4k + 0.1.0 + + PERCENTAGE_EXPENSES101 + + + + + fr.insee + j4nwc63q-RDOP-jbgde5yl + 0.1.0 + OutParameter + + + fr.insee + j4nwc63q-QOP-jbgde5yl + 0.1.0 + OutParameter + + + + + fr.insee + j4nwc63q-RDOP-jbgd2x2t + 0.1.0 + OutParameter + + + fr.insee + j4nwc63q-QOP-jbgd2x2t + 0.1.0 + OutParameter + + + + + fr.insee + j4nwc63q-RDOP-jbgdjypz + 0.1.0 + OutParameter + + + fr.insee + j4nwc63q-QOP-jbgdjypz + 0.1.0 + OutParameter + + + + + fr.insee + j4nwc63q-RDOP-jbgdcftu + 0.1.0 + OutParameter + + + fr.insee + j4nwc63q-QOP-jbgdcftu + 0.1.0 + OutParameter + + + + + fr.insee + j4nwc63q-RDOP-jbgdiyfe + 0.1.0 + OutParameter + + + fr.insee + j4nwc63q-QOP-jbgdiyfe + 0.1.0 + OutParameter + + + + + fr.insee + j4nwc63q-RDOP-jbgdj1wd + 0.1.0 + OutParameter + + + fr.insee + j4nwc63q-QOP-jbgdj1wd + 0.1.0 + OutParameter + + + + + fr.insee + j4nwc63q-RDOP-jbgddylk + 0.1.0 + OutParameter + + + fr.insee + j4nwc63q-QOP-jbgddylk + 0.1.0 + OutParameter + + + + + fr.insee + j4nwc63q-RDOP-jbgd3jj6 + 0.1.0 + OutParameter + + + fr.insee + j4nwc63q-QOP-jbgd3jj6 + 0.1.0 + OutParameter + + + + + fr.insee + j4nwc63q-RDOP-jbgd4w3k + 0.1.0 + OutParameter + + + fr.insee + j4nwc63q-QOP-jbgd4w3k + 0.1.0 + OutParameter + + + + + fr.insee + j4nwc63q-RDOP-jbgd4w4k + 0.1.0 + OutParameter + + + fr.insee + j4nwc63q-QOP-jbgd4w4k + 0.1.0 + OutParameter + + + + + Please, specify the percentage of Jay's expenses in the Kwik-E-Mart for each + product? + + + + + + fr.insee + j4nwh16i + 0.1.0 + CodeList + + + + + + + fr.insee + j4nwc63q-secondDimension-fakeCL-1 + 0.1.0 + CodeList + + + + + + + + 0 + 100 + + Decimal + + fr.insee + j4nwc63q-RDOP-jbgde5yl + 0.1.0 + + + + + + + + + + + + + 0 + 100 + + Decimal + + fr.insee + j4nwc63q-RDOP-jbgd2x2t + 0.1.0 + + + + + + + + + + + + + 0 + 100 + + Decimal + + fr.insee + j4nwc63q-RDOP-jbgdjypz + 0.1.0 + + + + + + + + + + + + + 0 + 100 + + Decimal + + fr.insee + j4nwc63q-RDOP-jbgdcftu + 0.1.0 + + + + + + + + + + + + + 0 + 100 + + Decimal + + fr.insee + j4nwc63q-RDOP-jbgdiyfe + 0.1.0 + + + + + + + + + + + + + 0 + 100 + + Decimal + + fr.insee + j4nwc63q-RDOP-jbgdj1wd + 0.1.0 + + + + + + + + + + + + + 0 + 100 + + Decimal + + fr.insee + j4nwc63q-RDOP-jbgddylk + 0.1.0 + + + + + + + + + + + + + 0 + 100 + + Decimal + + fr.insee + j4nwc63q-RDOP-jbgd3jj6 + 0.1.0 + + + + + + + + + + + + + 0 + 100 + + Decimal + + fr.insee + j4nwc63q-RDOP-jbgd4w3k + 0.1.0 + + + + + + + + + + + + + 0 + 100 + + Decimal + + fr.insee + j4nwc63q-RDOP-jbgd4w4k + 0.1.0 + + + + + + + + + + + + + fr.insee + j4nw0rr6 + 0.1.0 + + CLOWNING + + + fr.insee + j4nw0rr6-QOP-jbgd8tyr + 0.1.0 + + CLOWNING11 + + + + fr.insee + j4nw0rr6-QOP-jbgdep36 + 0.1.0 + + CLOWNING21 + + + + fr.insee + j4nw0rr6-QOP-jbgdjjgi + 0.1.0 + + CLOWNING31 + + + + fr.insee + j4nw0rr6-QOP-jbgdgh6k + 0.1.0 + + CLOWNING41 + + + + fr.insee + j4nw0rr6-QOP-jbgdit3o + 0.1.0 + + CLOWNING12 + + + + fr.insee + j4nw0rr6-QOP-jbgd366k + 0.1.0 + + CLOWNING22 + + + + fr.insee + j4nw0rr6-QOP-jbgdax06 + 0.1.0 + + CLOWNING32 + + + + fr.insee + j4nw0rr6-QOP-jbgdfo1j + 0.1.0 + + CLOWNING42 + + + + + fr.insee + j4nw0rr6-RDOP-jbgd8tyr + 0.1.0 + OutParameter + + + fr.insee + j4nw0rr6-QOP-jbgd8tyr + 0.1.0 + OutParameter + + + + + fr.insee + j4nw0rr6-RDOP-jbgdep36 + 0.1.0 + OutParameter + + + fr.insee + j4nw0rr6-QOP-jbgdep36 + 0.1.0 + OutParameter + + + + + fr.insee + j4nw0rr6-RDOP-jbgdjjgi + 0.1.0 + OutParameter + + + fr.insee + j4nw0rr6-QOP-jbgdjjgi + 0.1.0 + OutParameter + + + + + fr.insee + j4nw0rr6-RDOP-jbgdgh6k + 0.1.0 + OutParameter + + + fr.insee + j4nw0rr6-QOP-jbgdgh6k + 0.1.0 + OutParameter + + + + + fr.insee + j4nw0rr6-RDOP-jbgdit3o + 0.1.0 + OutParameter + + + fr.insee + j4nw0rr6-QOP-jbgdit3o + 0.1.0 + OutParameter + + + + + fr.insee + j4nw0rr6-RDOP-jbgd366k + 0.1.0 + OutParameter + + + fr.insee + j4nw0rr6-QOP-jbgd366k + 0.1.0 + OutParameter + + + + + fr.insee + j4nw0rr6-RDOP-jbgdax06 + 0.1.0 + OutParameter + + + fr.insee + j4nw0rr6-QOP-jbgdax06 + 0.1.0 + OutParameter + + + + + fr.insee + j4nw0rr6-RDOP-jbgdfo1j + 0.1.0 + OutParameter + + + fr.insee + j4nw0rr6-QOP-jbgdfo1j + 0.1.0 + OutParameter + + + + + Who did these clownings and tell us what you remember? + + + + + + fr.insee + j77dav9b + 0.1.0 + CodeList + + + + + + + fr.insee + j4nw0rr6-secondDimension-fakeCL-1 + 0.1.0 + CodeList + + + + + + + drop-down-list + + fr.insee + jbdyh6b5 + 0.1.0 + CodeList + + + fr.insee + j4nw0rr6-RDOP-jbgd8tyr + 0.1.0 + + + fr.insee + jbdyh6b5 + 0.1.0 + CodeList + + + + + + + + + + + + + + + drop-down-list + + fr.insee + jbdyh6b5 + 0.1.0 + CodeList + + + fr.insee + j4nw0rr6-RDOP-jbgdep36 + 0.1.0 + + + fr.insee + jbdyh6b5 + 0.1.0 + CodeList + + + + + + + + + + + + + + + drop-down-list + + fr.insee + jbdyh6b5 + 0.1.0 + CodeList + + + fr.insee + j4nw0rr6-RDOP-jbgdjjgi + 0.1.0 + + + fr.insee + jbdyh6b5 + 0.1.0 + CodeList + + + + + + + + + + + + + + + drop-down-list + + fr.insee + jbdyh6b5 + 0.1.0 + CodeList + + + fr.insee + j4nw0rr6-RDOP-jbgdgh6k + 0.1.0 + + + fr.insee + jbdyh6b5 + 0.1.0 + CodeList + + + + + + + + + + + + + + + + fr.insee + j4nw0rr6-RDOP-jbgdit3o + 0.1.0 + + + + + + + + + + + + + + fr.insee + j4nw0rr6-RDOP-jbgd366k + 0.1.0 + + + + + + + + + + + + + + fr.insee + j4nw0rr6-RDOP-jbgdax06 + 0.1.0 + + + + + + + + + + + + + + fr.insee + j4nw0rr6-RDOP-jbgdfo1j + 0.1.0 + + + + + + + + + + + + + + fr.insee + j6p2lwuj + 0.1.0 + + TRAVEL + + + fr.insee + j6p2lwuj-QOP-jbgd92mb + 0.1.0 + + TRAVEL11 + + + + fr.insee + j6p2lwuj-QOP-jbgdgsat + 0.1.0 + + TRAVEL21 + + + + fr.insee + j6p2lwuj-QOP-jbgdaxk2 + 0.1.0 + + TRAVEL31 + + + + fr.insee + j6p2lwuj-QOP-jbgd7myn + 0.1.0 + + TRAVEL41 + + + + fr.insee + j6p2lwuj-QOP-jbgdnxkt + 0.1.0 + + TRAVEL12 + + + + fr.insee + j6p2lwuj-QOP-jbgd3ef5 + 0.1.0 + + TRAVEL22 + + + + fr.insee + j6p2lwuj-QOP-jbgd8p1v + 0.1.0 + + TRAVEL32 + + + + fr.insee + j6p2lwuj-QOP-jbgdgm0c + 0.1.0 + + TRAVEL42 + + + + fr.insee + j6p2lwuj-QOP-jbgdcppc + 0.1.0 + + TRAVEL13 + + + + fr.insee + j6p2lwuj-QOP-jbgd4cm6 + 0.1.0 + + TRAVEL23 + + + + fr.insee + j6p2lwuj-QOP-jbgdd2lo + 0.1.0 + + TRAVEL33 + + + + fr.insee + j6p2lwuj-QOP-jbgdo0ay + 0.1.0 + + TRAVEL43 + + + + fr.insee + j6p2lwuj-QOP-jbgd4r2a + 0.1.0 + + TRAVEL14 + + + + fr.insee + j6p2lwuj-QOP-jbgdkfpq + 0.1.0 + + TRAVEL24 + + + + fr.insee + j6p2lwuj-QOP-jbgd7u52 + 0.1.0 + + TRAVEL34 + + + + fr.insee + j6p2lwuj-QOP-jbgdgfwl + 0.1.0 + + TRAVEL44 + + + + fr.insee + j6p2lwuj-QOP-jbgd9cff + 0.1.0 + + TRAVEL15 + + + + fr.insee + j6p2lwuj-QOP-jbgddwsp + 0.1.0 + + TRAVEL25 + + + + fr.insee + j6p2lwuj-QOP-jbgdncn8 + 0.1.0 + + TRAVEL35 + + + + fr.insee + j6p2lwuj-QOP-jbgdnz6b + 0.1.0 + + TRAVEL45 + + + + fr.insee + j6p2lwuj-QOP-jbgdiva0 + 0.1.0 + + TRAVEL16 + + + + fr.insee + j6p2lwuj-QOP-jbgd7dqf + 0.1.0 + + TRAVEL26 + + + + fr.insee + j6p2lwuj-QOP-jbgdnous + 0.1.0 + + TRAVEL36 + + + + fr.insee + j6p2lwuj-QOP-jbgdkfcz + 0.1.0 + + TRAVEL46 + + + + + fr.insee + j6p2lwuj-RDOP-jbgd92mb + 0.1.0 + OutParameter + + + fr.insee + j6p2lwuj-QOP-jbgd92mb + 0.1.0 + OutParameter + + + + + fr.insee + j6p2lwuj-RDOP-jbgdgsat + 0.1.0 + OutParameter + + + fr.insee + j6p2lwuj-QOP-jbgdgsat + 0.1.0 + OutParameter + + + + + fr.insee + j6p2lwuj-RDOP-jbgdaxk2 + 0.1.0 + OutParameter + + + fr.insee + j6p2lwuj-QOP-jbgdaxk2 + 0.1.0 + OutParameter + + + + + fr.insee + j6p2lwuj-RDOP-jbgd7myn + 0.1.0 + OutParameter + + + fr.insee + j6p2lwuj-QOP-jbgd7myn + 0.1.0 + OutParameter + + + + + fr.insee + j6p2lwuj-RDOP-jbgdnxkt + 0.1.0 + OutParameter + + + fr.insee + j6p2lwuj-QOP-jbgdnxkt + 0.1.0 + OutParameter + + + + + fr.insee + j6p2lwuj-RDOP-jbgd3ef5 + 0.1.0 + OutParameter + + + fr.insee + j6p2lwuj-QOP-jbgd3ef5 + 0.1.0 + OutParameter + + + + + fr.insee + j6p2lwuj-RDOP-jbgd8p1v + 0.1.0 + OutParameter + + + fr.insee + j6p2lwuj-QOP-jbgd8p1v + 0.1.0 + OutParameter + + + + + fr.insee + j6p2lwuj-RDOP-jbgdgm0c + 0.1.0 + OutParameter + + + fr.insee + j6p2lwuj-QOP-jbgdgm0c + 0.1.0 + OutParameter + + + + + fr.insee + j6p2lwuj-RDOP-jbgdcppc + 0.1.0 + OutParameter + + + fr.insee + j6p2lwuj-QOP-jbgdcppc + 0.1.0 + OutParameter + + + + + fr.insee + j6p2lwuj-RDOP-jbgd4cm6 + 0.1.0 + OutParameter + + + fr.insee + j6p2lwuj-QOP-jbgd4cm6 + 0.1.0 + OutParameter + + + + + fr.insee + j6p2lwuj-RDOP-jbgdd2lo + 0.1.0 + OutParameter + + + fr.insee + j6p2lwuj-QOP-jbgdd2lo + 0.1.0 + OutParameter + + + + + fr.insee + j6p2lwuj-RDOP-jbgdo0ay + 0.1.0 + OutParameter + + + fr.insee + j6p2lwuj-QOP-jbgdo0ay + 0.1.0 + OutParameter + + + + + fr.insee + j6p2lwuj-RDOP-jbgd4r2a + 0.1.0 + OutParameter + + + fr.insee + j6p2lwuj-QOP-jbgd4r2a + 0.1.0 + OutParameter + + + + + fr.insee + j6p2lwuj-RDOP-jbgdkfpq + 0.1.0 + OutParameter + + + fr.insee + j6p2lwuj-QOP-jbgdkfpq + 0.1.0 + OutParameter + + + + + fr.insee + j6p2lwuj-RDOP-jbgd7u52 + 0.1.0 + OutParameter + + + fr.insee + j6p2lwuj-QOP-jbgd7u52 + 0.1.0 + OutParameter + + + + + fr.insee + j6p2lwuj-RDOP-jbgdgfwl + 0.1.0 + OutParameter + + + fr.insee + j6p2lwuj-QOP-jbgdgfwl + 0.1.0 + OutParameter + + + + + fr.insee + j6p2lwuj-RDOP-jbgd9cff + 0.1.0 + OutParameter + + + fr.insee + j6p2lwuj-QOP-jbgd9cff + 0.1.0 + OutParameter + + + + + fr.insee + j6p2lwuj-RDOP-jbgddwsp + 0.1.0 + OutParameter + + + fr.insee + j6p2lwuj-QOP-jbgddwsp + 0.1.0 + OutParameter + + + + + fr.insee + j6p2lwuj-RDOP-jbgdncn8 + 0.1.0 + OutParameter + + + fr.insee + j6p2lwuj-QOP-jbgdncn8 + 0.1.0 + OutParameter + + + + + fr.insee + j6p2lwuj-RDOP-jbgdnz6b + 0.1.0 + OutParameter + + + fr.insee + j6p2lwuj-QOP-jbgdnz6b + 0.1.0 + OutParameter + + + + + fr.insee + j6p2lwuj-RDOP-jbgdiva0 + 0.1.0 + OutParameter + + + fr.insee + j6p2lwuj-QOP-jbgdiva0 + 0.1.0 + OutParameter + + + + + fr.insee + j6p2lwuj-RDOP-jbgd7dqf + 0.1.0 + OutParameter + + + fr.insee + j6p2lwuj-QOP-jbgd7dqf + 0.1.0 + OutParameter + + + + + fr.insee + j6p2lwuj-RDOP-jbgdnous + 0.1.0 + OutParameter + + + fr.insee + j6p2lwuj-QOP-jbgdnous + 0.1.0 + OutParameter + + + + + fr.insee + j6p2lwuj-RDOP-jbgdkfcz + 0.1.0 + OutParameter + + + fr.insee + j6p2lwuj-QOP-jbgdkfcz + 0.1.0 + OutParameter + + + + + Which of the following means of transport were used by the hero and in which + country? + + + + + + fr.insee + j6p2kivg + 0.1.0 + CodeList + + + + + + + fr.insee + jbdye1wa + 0.1.0 + CodeList + + + + + + + + fr.insee + j6p2lwuj-RDOP-jbgd92mb + 0.1.0 + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 0.1.0 + Code + + + + + + + + + + + + + + + + + + + fr.insee + j6p2lwuj-RDOP-jbgdgsat + 0.1.0 + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 0.1.0 + Code + + + + + + + + + + + + + + + + + + + fr.insee + j6p2lwuj-RDOP-jbgdaxk2 + 0.1.0 + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 0.1.0 + Code + + + + + + + + + + + + + + + + + + + fr.insee + j6p2lwuj-RDOP-jbgd7myn + 0.1.0 + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 0.1.0 + Code + + + + + + + + + + + + + + + + + + + fr.insee + j6p2lwuj-RDOP-jbgdnxkt + 0.1.0 + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 0.1.0 + Code + + + + + + + + + + + + + + + + + + + fr.insee + j6p2lwuj-RDOP-jbgd3ef5 + 0.1.0 + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 0.1.0 + Code + + + + + + + + + + + + + + + + + + + fr.insee + j6p2lwuj-RDOP-jbgd8p1v + 0.1.0 + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 0.1.0 + Code + + + + + + + + + + + + + + + + + + + fr.insee + j6p2lwuj-RDOP-jbgdgm0c + 0.1.0 + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 0.1.0 + Code + + + + + + + + + + + + + + + + + + + fr.insee + j6p2lwuj-RDOP-jbgdcppc + 0.1.0 + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 0.1.0 + Code + + + + + + + + + + + + + + + + + + + fr.insee + j6p2lwuj-RDOP-jbgd4cm6 + 0.1.0 + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 0.1.0 + Code + + + + + + + + + + + + + + + + + + + fr.insee + j6p2lwuj-RDOP-jbgdd2lo + 0.1.0 + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 0.1.0 + Code + + + + + + + + + + + + + + + + + + + fr.insee + j6p2lwuj-RDOP-jbgdo0ay + 0.1.0 + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 0.1.0 + Code + + + + + + + + + + + + + + + + + + + fr.insee + j6p2lwuj-RDOP-jbgd4r2a + 0.1.0 + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 0.1.0 + Code + + + + + + + + + + + + + + + + + + + fr.insee + j6p2lwuj-RDOP-jbgdkfpq + 0.1.0 + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 0.1.0 + Code + + + + + + + + + + + + + + + + + + + fr.insee + j6p2lwuj-RDOP-jbgd7u52 + 0.1.0 + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 0.1.0 + Code + + + + + + + + + + + + + + + + + + + fr.insee + j6p2lwuj-RDOP-jbgdgfwl + 0.1.0 + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 0.1.0 + Code + + + + + + + + + + + + + + + + + + + fr.insee + j6p2lwuj-RDOP-jbgd9cff + 0.1.0 + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 0.1.0 + Code + + + + + + + + + + + + + + + + + + + fr.insee + j6p2lwuj-RDOP-jbgddwsp + 0.1.0 + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 0.1.0 + Code + + + + + + + + + + + + + + + + + + + fr.insee + j6p2lwuj-RDOP-jbgdncn8 + 0.1.0 + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 0.1.0 + Code + + + + + + + + + + + + + + + + + + + fr.insee + j6p2lwuj-RDOP-jbgdnz6b + 0.1.0 + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 0.1.0 + Code + + + + + + + + + + + + + + + + + + + fr.insee + j6p2lwuj-RDOP-jbgdiva0 + 0.1.0 + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 0.1.0 + Code + + + + + + + + + + + + + + + + + + + fr.insee + j6p2lwuj-RDOP-jbgd7dqf + 0.1.0 + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 0.1.0 + Code + + + + + + + + + + + + + + + + + + + fr.insee + j6p2lwuj-RDOP-jbgdnous + 0.1.0 + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 0.1.0 + Code + + + + + + + + + + + + + + + + + + + fr.insee + j6p2lwuj-RDOP-jbgdkfcz + 0.1.0 + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 0.1.0 + Code + + + + + + + + + + + + + + + + + + fr.insee + d10 + 0.1.0 + Instruction + + + + fr.insee + j6qg8rc6 + 0.1.0 + + FAVOURITE_CHARACTERS + + + fr.insee + j6qg8rc6-QOP-jbgdl5jb + 0.1.0 + + FAVOURITE_CHARACTERS11 + + + + fr.insee + j6qg8rc6-QOP-jbgd8lwo + 0.1.0 + + FAVOURITE_CHARACTERS21 + + + + fr.insee + j6qg8rc6-QOP-jbgdbfag + 0.1.0 + + FAVOURITE_CHARACTERS31 + + + + fr.insee + j6qg8rc6-QOP-jbgdlgja + 0.1.0 + + FAVOURITE_CHARACTERS41 + + + + fr.insee + j6qg8rc6-QOP-jbgd745y + 0.1.0 + + FAVOURITE_CHARACTERS51 + + + + fr.insee + j6qg8rc6-QOP-jbgdjkts + 0.1.0 + + FAVOURITE_CHARACTERS61 + + + + fr.insee + j6qg8rc6-QOP-jbgdcax7 + 0.1.0 + + FAVOURITE_CHARACTERS71 + + + + fr.insee + j6qg8rc6-QOP-jbgdjye1 + 0.1.0 + + FAVOURITE_CHARACTERS81 + + + + fr.insee + j6qg8rc6-QOP-jbgd5jet + 0.1.0 + + FAVOURITE_CHARACTERS91 + + + + fr.insee + j6qg8rc6-QOP-jbgdjw90 + 0.1.0 + + FAVOURITE_CHARACTERS101 + + + + fr.insee + j6qg8rc6-QOP-jbgdfndq + 0.1.0 + + FAVOURITE_CHARACTERS12 + + + + fr.insee + j6qg8rc6-QOP-jbgd7osi + 0.1.0 + + FAVOURITE_CHARACTERS22 + + + + fr.insee + j6qg8rc6-QOP-jbgd7bnw + 0.1.0 + + FAVOURITE_CHARACTERS32 + + + + fr.insee + j6qg8rc6-QOP-jbgd9k71 + 0.1.0 + + FAVOURITE_CHARACTERS42 + + + + fr.insee + j6qg8rc6-QOP-jbgdimks + 0.1.0 + + FAVOURITE_CHARACTERS52 + + + + fr.insee + j6qg8rc6-QOP-jbgdjquz + 0.1.0 + + FAVOURITE_CHARACTERS62 + + + + fr.insee + j6qg8rc6-QOP-jbgdd2w3 + 0.1.0 + + FAVOURITE_CHARACTERS72 + + + + fr.insee + j6qg8rc6-QOP-jbgdkosc + 0.1.0 + + FAVOURITE_CHARACTERS82 + + + + fr.insee + j6qg8rc6-QOP-jbgdk0x4 + 0.1.0 + + FAVOURITE_CHARACTERS92 + + + + fr.insee + j6qg8rc6-QOP-jbgd2wgf + 0.1.0 + + FAVOURITE_CHARACTERS102 + + + + + fr.insee + j6qg8rc6-RDOP-jbgdl5jb + 0.1.0 + OutParameter + + + fr.insee + j6qg8rc6-QOP-jbgdl5jb + 0.1.0 + OutParameter + + + + + fr.insee + j6qg8rc6-RDOP-jbgd8lwo + 0.1.0 + OutParameter + + + fr.insee + j6qg8rc6-QOP-jbgd8lwo + 0.1.0 + OutParameter + + + + + fr.insee + j6qg8rc6-RDOP-jbgdbfag + 0.1.0 + OutParameter + + + fr.insee + j6qg8rc6-QOP-jbgdbfag + 0.1.0 + OutParameter + + + + + fr.insee + j6qg8rc6-RDOP-jbgdlgja + 0.1.0 + OutParameter + + + fr.insee + j6qg8rc6-QOP-jbgdlgja + 0.1.0 + OutParameter + + + + + fr.insee + j6qg8rc6-RDOP-jbgd745y + 0.1.0 + OutParameter + + + fr.insee + j6qg8rc6-QOP-jbgd745y + 0.1.0 + OutParameter + + + + + fr.insee + j6qg8rc6-RDOP-jbgdjkts + 0.1.0 + OutParameter + + + fr.insee + j6qg8rc6-QOP-jbgdjkts + 0.1.0 + OutParameter + + + + + fr.insee + j6qg8rc6-RDOP-jbgdcax7 + 0.1.0 + OutParameter + + + fr.insee + j6qg8rc6-QOP-jbgdcax7 + 0.1.0 + OutParameter + + + + + fr.insee + j6qg8rc6-RDOP-jbgdjye1 + 0.1.0 + OutParameter + + + fr.insee + j6qg8rc6-QOP-jbgdjye1 + 0.1.0 + OutParameter + + + + + fr.insee + j6qg8rc6-RDOP-jbgd5jet + 0.1.0 + OutParameter + + + fr.insee + j6qg8rc6-QOP-jbgd5jet + 0.1.0 + OutParameter + + + + + fr.insee + j6qg8rc6-RDOP-jbgdjw90 + 0.1.0 + OutParameter + + + fr.insee + j6qg8rc6-QOP-jbgdjw90 + 0.1.0 + OutParameter + + + + + fr.insee + j6qg8rc6-RDOP-jbgdfndq + 0.1.0 + OutParameter + + + fr.insee + j6qg8rc6-QOP-jbgdfndq + 0.1.0 + OutParameter + + + + + fr.insee + j6qg8rc6-RDOP-jbgd7osi + 0.1.0 + OutParameter + + + fr.insee + j6qg8rc6-QOP-jbgd7osi + 0.1.0 + OutParameter + + + + + fr.insee + j6qg8rc6-RDOP-jbgd7bnw + 0.1.0 + OutParameter + + + fr.insee + j6qg8rc6-QOP-jbgd7bnw + 0.1.0 + OutParameter + + + + + fr.insee + j6qg8rc6-RDOP-jbgd9k71 + 0.1.0 + OutParameter + + + fr.insee + j6qg8rc6-QOP-jbgd9k71 + 0.1.0 + OutParameter + + + + + fr.insee + j6qg8rc6-RDOP-jbgdimks + 0.1.0 + OutParameter + + + fr.insee + j6qg8rc6-QOP-jbgdimks + 0.1.0 + OutParameter + + + + + fr.insee + j6qg8rc6-RDOP-jbgdjquz + 0.1.0 + OutParameter + + + fr.insee + j6qg8rc6-QOP-jbgdjquz + 0.1.0 + OutParameter + + + + + fr.insee + j6qg8rc6-RDOP-jbgdd2w3 + 0.1.0 + OutParameter + + + fr.insee + j6qg8rc6-QOP-jbgdd2w3 + 0.1.0 + OutParameter + + + + + fr.insee + j6qg8rc6-RDOP-jbgdkosc + 0.1.0 + OutParameter + + + fr.insee + j6qg8rc6-QOP-jbgdkosc + 0.1.0 + OutParameter + + + + + fr.insee + j6qg8rc6-RDOP-jbgdk0x4 + 0.1.0 + OutParameter + + + fr.insee + j6qg8rc6-QOP-jbgdk0x4 + 0.1.0 + OutParameter + + + + + fr.insee + j6qg8rc6-RDOP-jbgd2wgf + 0.1.0 + OutParameter + + + fr.insee + j6qg8rc6-QOP-jbgd2wgf + 0.1.0 + OutParameter + + + + + Please, complete the following grid with your favourite characters + + + + + + + + + fr.insee + j6qg8rc6-secondDimension-fakeCL-1 + 0.1.0 + CodeList + + + + + + + + fr.insee + j6qg8rc6-RDOP-jbgdl5jb + 0.1.0 + + + + + + + + + + + + + + fr.insee + j6qg8rc6-RDOP-jbgd8lwo + 0.1.0 + + + + + + + + + + + + + + fr.insee + j6qg8rc6-RDOP-jbgdbfag + 0.1.0 + + + + + + + + + + + + + + fr.insee + j6qg8rc6-RDOP-jbgdlgja + 0.1.0 + + + + + + + + + + + + + + fr.insee + j6qg8rc6-RDOP-jbgd745y + 0.1.0 + + + + + + + + + + + + + + fr.insee + j6qg8rc6-RDOP-jbgdjkts + 0.1.0 + + + + + + + + + + + + + + fr.insee + j6qg8rc6-RDOP-jbgdcax7 + 0.1.0 + + + + + + + + + + + + + + fr.insee + j6qg8rc6-RDOP-jbgdjye1 + 0.1.0 + + + + + + + + + + + + + + fr.insee + j6qg8rc6-RDOP-jbgd5jet + 0.1.0 + + + + + + + + + + + + + + fr.insee + j6qg8rc6-RDOP-jbgdjw90 + 0.1.0 + + + + + + + + + + + + + + 0 + 120 + + Decimal + + fr.insee + j6qg8rc6-RDOP-jbgdfndq + 0.1.0 + + + + + + + + + + + + + 0 + 120 + + Decimal + + fr.insee + j6qg8rc6-RDOP-jbgd7osi + 0.1.0 + + + + + + + + + + + + + 0 + 120 + + Decimal + + fr.insee + j6qg8rc6-RDOP-jbgd7bnw + 0.1.0 + + + + + + + + + + + + + 0 + 120 + + Decimal + + fr.insee + j6qg8rc6-RDOP-jbgd9k71 + 0.1.0 + + + + + + + + + + + + + 0 + 120 + + Decimal + + fr.insee + j6qg8rc6-RDOP-jbgdimks + 0.1.0 + + + + + + + + + + + + + 0 + 120 + + Decimal + + fr.insee + j6qg8rc6-RDOP-jbgdjquz + 0.1.0 + + + + + + + + + + + + + 0 + 120 + + Decimal + + fr.insee + j6qg8rc6-RDOP-jbgdd2w3 + 0.1.0 + + + + + + + + + + + + + 0 + 120 + + Decimal + + fr.insee + j6qg8rc6-RDOP-jbgdkosc + 0.1.0 + + + + + + + + + + + + + 0 + 120 + + Decimal + + fr.insee + j6qg8rc6-RDOP-jbgdk0x4 + 0.1.0 + + + + + + + + + + + + + 0 + 120 + + Decimal + + fr.insee + j6qg8rc6-RDOP-jbgd2wgf + 0.1.0 + + + + + + + + + + + + + + fr.insee + CategoryScheme-j334iumu + 0.1.0 + + TOWN + + + fr.insee + CA-j334iumu--1 + 0.1.0 + + Springfield + + + + fr.insee + CA-j334iumu-0 + 0.1.0 + + Shelbyville + + + + fr.insee + CA-j334iumu-1 + 0.1.0 + + Seinfeld + + + + + fr.insee + CategoryScheme-j6qdqoen + 0.1.0 + + MAYOR + + + fr.insee + CA-j6qdqoen--1 + 0.1.0 + + Constance Harm + + + + fr.insee + CA-j6qdqoen-0 + 0.1.0 + + Timothy Lovejoy + + + + fr.insee + CA-j6qdqoen-1 + 0.1.0 + + Joe Quimby + + + + fr.insee + CA-j6qdqoen-2 + 0.1.0 + + Poochie + + + + + fr.insee + CategoryScheme-j4nwo00f + 0.1.0 + + State + + + fr.insee + CA-j4nwo00f--1 + 0.1.0 + + Washington + + + + fr.insee + CA-j4nwo00f-0 + 0.1.0 + + Kentucky + + + + fr.insee + CA-j4nwo00f-1 + 0.1.0 + + Ohio + + + + fr.insee + CA-j4nwo00f-2 + 0.1.0 + + Maine + + + + fr.insee + CA-j4nwo00f-3 + 0.1.0 + + North Dakota + + + + fr.insee + CA-j4nwo00f-4 + 0.1.0 + + Florida + + + + fr.insee + CA-j4nwo00f-5 + 0.1.0 + + North Takoma + + + + fr.insee + CA-j4nwo00f-6 + 0.1.0 + + California + + + + fr.insee + CA-j4nwo00f-7 + 0.1.0 + + Texas + + + + fr.insee + CA-j4nwo00f-8 + 0.1.0 + + Massachusetts + + + + fr.insee + CA-j4nwo00f-9 + 0.1.0 + + Nevada + + + + fr.insee + CA-j4nwo00f-10 + 0.1.0 + + Illinois + + + + fr.insee + CA-j4nwo00f-11 + 0.1.0 + + Not in any state, you fool! + + + + + fr.insee + CategoryScheme-j335cu3c + 0.1.0 + + ANIMALS + + + fr.insee + CA-j335cu3c--1 + 0.1.0 + + Santa's Little Helper + + + + fr.insee + CA-j335cu3c-0 + 0.1.0 + + Snowball I + + + + fr.insee + CA-j335cu3c-1 + 0.1.0 + + Coltrane + + + + fr.insee + CA-j335cu3c-2 + 0.1.0 + + Mojo the Helper Monkey + + + + + fr.insee + CategoryScheme-j6p2mvca + 0.1.0 + + Flavours + + + fr.insee + CA-j6p2mvca--1 + 0.1.0 + + Vanilla + + + + fr.insee + CA-j6p2mvca-0 + 0.1.0 + + Strawberry + + + + fr.insee + CA-j6p2mvca-1 + 0.1.0 + + Apple + + + + fr.insee + CA-j6p2mvca-2 + 0.1.0 + + Bacon + + + + + fr.insee + CategoryScheme-jbdxh138 + 0.1.0 + + YESNO + + + fr.insee + CA-jbdxh138--1 + 0.1.0 + + Yes + + + + fr.insee + CA-jbdxh138-0 + 0.1.0 + + No + + + + + fr.insee + CategoryScheme-j6qeytgc + 0.1.0 + + NUCLEAR_CHARACTERS + + + fr.insee + CA-j6qeytgc--1 + 0.1.0 + + Charles Montgomery Burns + + + + fr.insee + CA-j6qeytgc-0 + 0.1.0 + + Carl Carlson + + + + fr.insee + CA-j6qeytgc-1 + 0.1.0 + + Otto Mann + + + + fr.insee + CA-j6qeytgc-2 + 0.1.0 + + Carl Carlson + + + + + fr.insee + CategoryScheme-j6z087mq + 0.1.0 + + BIRTH_CHARACTER + + + fr.insee + CA-j6z087mq--1 + 0.1.0 + + Selma Bouvier + + + + fr.insee + CA-j6z087mq-0 + 0.1.0 + + Kent Brockman + + + + fr.insee + CA-j6z087mq-1 + 0.1.0 + + Milhouse Van Houten + + + + fr.insee + CA-j6z087mq-2 + 0.1.0 + + Nelson Muntz + + + + fr.insee + CA-j6z087mq-3 + 0.1.0 + + Crazy Cat Lady + + + + + fr.insee + CategoryScheme-jbdxricm + 0.1.0 + + CITY_BIRTH + + + fr.insee + CA-jbdxricm--1 + 0.1.0 + + Albuquerque + + + + fr.insee + CA-jbdxricm-0 + 0.1.0 + + Springfield + + + + fr.insee + CA-jbdxricm-1 + 0.1.0 + + Portland + + + + fr.insee + CA-jbdxricm-2 + 0.1.0 + + Shelbyville + + + + fr.insee + CA-jbdxricm-3 + 0.1.0 + + Dagstuhl + + + + + fr.insee + CategoryScheme-j4nwh16i + 0.1.0 + + Products + + + fr.insee + CA-j4nwh16i--1 + 0.1.0 + + Frozen products + + + + fr.insee + CA-j4nwh16i-0 + 0.1.0 + + Ice creams + + + + fr.insee + CA-j4nwh16i-1 + 0.1.0 + + Jasper Beardly + + + + fr.insee + CA-j4nwh16i-2 + 0.1.0 + + Meat + + + + fr.insee + CA-j4nwh16i-3 + 0.1.0 + + Bacon + + + + fr.insee + CA-j4nwh16i-4 + 0.1.0 + + Pork chop + + + + fr.insee + CA-j4nwh16i-5 + 0.1.0 + + Chicken + + + + fr.insee + CA-j4nwh16i-6 + 0.1.0 + + Compote + + + + fr.insee + CA-j4nwh16i-7 + 0.1.0 + + Powersauce + + + + fr.insee + CA-j4nwh16i-8 + 0.1.0 + + Other + + + + + fr.insee + CategoryScheme-j77dav9b + 0.1.0 + + Clownings + + + fr.insee + CA-j77dav9b--1 + 0.1.0 + + Break the windows of the whole city + + + + fr.insee + CA-j77dav9b-0 + 0.1.0 + + Loose the violin of his daughter playing poker + + + + fr.insee + CA-j77dav9b-1 + 0.1.0 + + Kill Mr Burns + + + + fr.insee + CA-j77dav9b-2 + 0.1.0 + + Leaving a mechanical object to control the nuclear power plant + + + + + fr.insee + CategoryScheme-jbdyh6b5 + 0.1.0 + + Clowning_Characters + + + fr.insee + CA-jbdyh6b5--1 + 0.1.0 + + Jay + + + + fr.insee + CA-jbdyh6b5-0 + 0.1.0 + + Bart + + + + fr.insee + CA-jbdyh6b5-1 + 0.1.0 + + Krusty the clown + + + + fr.insee + CA-jbdyh6b5-2 + 0.1.0 + + Maggie + + + + + fr.insee + CategoryScheme-j6p2kivg + 0.1.0 + + Means of transport + + + fr.insee + CA-j6p2kivg--1 + 0.1.0 + + Car + + + + fr.insee + CA-j6p2kivg-0 + 0.1.0 + + Bike + + + + fr.insee + CA-j6p2kivg-1 + 0.1.0 + + Skateboard + + + + fr.insee + CA-j6p2kivg-2 + 0.1.0 + + Plane + + + + + fr.insee + CategoryScheme-jbdye1wa + 0.1.0 + + Country + + + fr.insee + CA-jbdye1wa--1 + 0.1.0 + + Brazil + + + + fr.insee + CA-jbdye1wa-0 + 0.1.0 + + Canada + + + + fr.insee + CA-jbdye1wa-1 + 0.1.0 + + Japan + + + + fr.insee + CA-jbdye1wa-2 + 0.1.0 + + France + + + + fr.insee + CA-jbdye1wa-3 + 0.1.0 + + Other country + + + + fr.insee + CA-jbdye1wa-4 + 0.1.0 + + Other planet + + + + + fr.insee + CategoryScheme-j4nwc63q-secondDimension-fakeCL-1 + 0.1.0 + + FAKE-CODELIST-j4nwc63q-secondDimension-fakeCL-1 + + + fr.insee + CA-j4nwc63q-secondDimension-fakeCL-1--1 + 0.1.0 + + Percentage + + + + + fr.insee + CategoryScheme-j4nw0rr6-secondDimension-fakeCL-1 + 0.1.0 + + FAKE-CODELIST-j4nw0rr6-secondDimension-fakeCL-1 + + + fr.insee + CA-j4nw0rr6-secondDimension-fakeCL-1--1 + 0.1.0 + + Clowning + + + + fr.insee + CA-j4nw0rr6-secondDimension-fakeCL-1-0 + 0.1.0 + + Remember? + + + + + fr.insee + CategoryScheme-j6qg8rc6-secondDimension-fakeCL-1 + 0.1.0 + + FAKE-CODELIST-j6qg8rc6-secondDimension-fakeCL-1 + + + fr.insee + CA-j6qg8rc6-secondDimension-fakeCL-1--1 + 0.1.0 + + Name + + + + fr.insee + CA-j6qg8rc6-secondDimension-fakeCL-1-0 + 0.1.0 + + Age + + + + + fr.insee + CategoryScheme-i6vwid + 0.1.0 + + A définir + + + fr.insee + INSEE-COMMUN-CA-Booleen-1 + 0.1.0 + + + + + + + fr.insee + SIMPSONS-CLS + 0.1.0 + + SIMPSONS + + + fr.insee + j334iumu + 0.1.0 + + TOWN + + Regular + + Ordinal + + + fr.insee + j334iumu--1 + 0.1.0 + + fr.insee + CA-j334iumu--1 + 0.1.0 + Category + + 00001 + + + fr.insee + j334iumu-0 + 0.1.0 + + fr.insee + CA-j334iumu-0 + 0.1.0 + Category + + 00002 + + + fr.insee + j334iumu-1 + 0.1.0 + + fr.insee + CA-j334iumu-1 + 0.1.0 + Category + + 00003 + + + + fr.insee + j6qdqoen + 0.1.0 + + MAYOR + + Regular + + Ordinal + + + fr.insee + j6qdqoen--1 + 0.1.0 + + fr.insee + CA-j6qdqoen--1 + 0.1.0 + Category + + 1 + + + fr.insee + j6qdqoen-0 + 0.1.0 + + fr.insee + CA-j6qdqoen-0 + 0.1.0 + Category + + 2 + + + fr.insee + j6qdqoen-1 + 0.1.0 + + fr.insee + CA-j6qdqoen-1 + 0.1.0 + Category + + 3 + + + fr.insee + j6qdqoen-2 + 0.1.0 + + fr.insee + CA-j6qdqoen-2 + 0.1.0 + Category + + 4 + + + + fr.insee + j4nwo00f + 0.1.0 + + State + + Regular + + Ordinal + + + fr.insee + j4nwo00f--1 + 0.1.0 + + fr.insee + CA-j4nwo00f--1 + 0.1.0 + Category + + 1 + + + fr.insee + j4nwo00f-0 + 0.1.0 + + fr.insee + CA-j4nwo00f-0 + 0.1.0 + Category + + 2 + + + fr.insee + j4nwo00f-1 + 0.1.0 + + fr.insee + CA-j4nwo00f-1 + 0.1.0 + Category + + 3 + + + fr.insee + j4nwo00f-2 + 0.1.0 + + fr.insee + CA-j4nwo00f-2 + 0.1.0 + Category + + 4 + + + fr.insee + j4nwo00f-3 + 0.1.0 + + fr.insee + CA-j4nwo00f-3 + 0.1.0 + Category + + 5 + + + fr.insee + j4nwo00f-4 + 0.1.0 + + fr.insee + CA-j4nwo00f-4 + 0.1.0 + Category + + 6 + + + fr.insee + j4nwo00f-5 + 0.1.0 + + fr.insee + CA-j4nwo00f-5 + 0.1.0 + Category + + 7 + + + fr.insee + j4nwo00f-6 + 0.1.0 + + fr.insee + CA-j4nwo00f-6 + 0.1.0 + Category + + 8 + + + fr.insee + j4nwo00f-7 + 0.1.0 + + fr.insee + CA-j4nwo00f-7 + 0.1.0 + Category + + 9 + + + fr.insee + j4nwo00f-8 + 0.1.0 + + fr.insee + CA-j4nwo00f-8 + 0.1.0 + Category + + 10 + + + fr.insee + j4nwo00f-9 + 0.1.0 + + fr.insee + CA-j4nwo00f-9 + 0.1.0 + Category + + 11 + + + fr.insee + j4nwo00f-10 + 0.1.0 + + fr.insee + CA-j4nwo00f-10 + 0.1.0 + Category + + 12 + + + fr.insee + j4nwo00f-11 + 0.1.0 + + fr.insee + CA-j4nwo00f-11 + 0.1.0 + Category + + 13 + + + + fr.insee + j335cu3c + 0.1.0 + + ANIMALS + + Regular + + Ordinal + + + fr.insee + j335cu3c--1 + 0.1.0 + + fr.insee + CA-j335cu3c--1 + 0.1.0 + Category + + 1 + + + fr.insee + j335cu3c-0 + 0.1.0 + + fr.insee + CA-j335cu3c-0 + 0.1.0 + Category + + 2 + + + fr.insee + j335cu3c-1 + 0.1.0 + + fr.insee + CA-j335cu3c-1 + 0.1.0 + Category + + 3 + + + fr.insee + j335cu3c-2 + 0.1.0 + + fr.insee + CA-j335cu3c-2 + 0.1.0 + Category + + 4 + + + + fr.insee + j6p2mvca + 0.1.0 + + Flavours + + Regular + + Ordinal + + + fr.insee + j6p2mvca--1 + 0.1.0 + + fr.insee + CA-j6p2mvca--1 + 0.1.0 + Category + + 1 + + + fr.insee + j6p2mvca-0 + 0.1.0 + + fr.insee + CA-j6p2mvca-0 + 0.1.0 + Category + + 2 + + + fr.insee + j6p2mvca-1 + 0.1.0 + + fr.insee + CA-j6p2mvca-1 + 0.1.0 + Category + + 3 + + + fr.insee + j6p2mvca-2 + 0.1.0 + + fr.insee + CA-j6p2mvca-2 + 0.1.0 + Category + + 4 + + + + fr.insee + jbdxh138 + 0.1.0 + + YESNO + + Regular + + Ordinal + + + fr.insee + jbdxh138--1 + 0.1.0 + + fr.insee + CA-jbdxh138--1 + 0.1.0 + Category + + 1 + + + fr.insee + jbdxh138-0 + 0.1.0 + + fr.insee + CA-jbdxh138-0 + 0.1.0 + Category + + 0 + + + + fr.insee + j6qeytgc + 0.1.0 + + NUCLEAR_CHARACTERS + + Regular + + Ordinal + + + fr.insee + j6qeytgc--1 + 0.1.0 + + fr.insee + CA-j6qeytgc--1 + 0.1.0 + Category + + 1 + + + fr.insee + j6qeytgc-0 + 0.1.0 + + fr.insee + CA-j6qeytgc-0 + 0.1.0 + Category + + 2 + + + fr.insee + j6qeytgc-1 + 0.1.0 + + fr.insee + CA-j6qeytgc-1 + 0.1.0 + Category + + 3 + + + fr.insee + j6qeytgc-2 + 0.1.0 + + fr.insee + CA-j6qeytgc-2 + 0.1.0 + Category + + 4 + + + + fr.insee + j6z087mq + 0.1.0 + + BIRTH_CHARACTER + + Regular + + Ordinal + + + fr.insee + j6z087mq--1 + 0.1.0 + + fr.insee + CA-j6z087mq--1 + 0.1.0 + Category + + 1 + + + fr.insee + j6z087mq-0 + 0.1.0 + + fr.insee + CA-j6z087mq-0 + 0.1.0 + Category + + 2 + + + fr.insee + j6z087mq-1 + 0.1.0 + + fr.insee + CA-j6z087mq-1 + 0.1.0 + Category + + 3 + + + fr.insee + j6z087mq-2 + 0.1.0 + + fr.insee + CA-j6z087mq-2 + 0.1.0 + Category + + 4 + + + fr.insee + j6z087mq-3 + 0.1.0 + + fr.insee + CA-j6z087mq-3 + 0.1.0 + Category + + 5 + + + + fr.insee + jbdxricm + 0.1.0 + + CITY_BIRTH + + Regular + + Ordinal + + + fr.insee + jbdxricm--1 + 0.1.0 + + fr.insee + CA-jbdxricm--1 + 0.1.0 + Category + + 1 + + + fr.insee + jbdxricm-0 + 0.1.0 + + fr.insee + CA-jbdxricm-0 + 0.1.0 + Category + + 2 + + + fr.insee + jbdxricm-1 + 0.1.0 + + fr.insee + CA-jbdxricm-1 + 0.1.0 + Category + + 3 + + + fr.insee + jbdxricm-2 + 0.1.0 + + fr.insee + CA-jbdxricm-2 + 0.1.0 + Category + + 4 + + + fr.insee + jbdxricm-3 + 0.1.0 + + fr.insee + CA-jbdxricm-3 + 0.1.0 + Category + + 5 + + + + fr.insee + j4nwh16i + 0.1.0 + + Products + + Regular + + Ordinal + + + fr.insee + j4nwh16i--1 + 0.1.0 + + fr.insee + CA-j4nwh16i--1 + 0.1.0 + Category + + A + + fr.insee + j4nwh16i-0 + 0.1.0 + + fr.insee + CA-j4nwh16i-0 + 0.1.0 + Category + + A1 + + + fr.insee + j4nwh16i-1 + 0.1.0 + + fr.insee + CA-j4nwh16i-1 + 0.1.0 + Category + + A2 + + + + fr.insee + j4nwh16i-2 + 0.1.0 + + fr.insee + CA-j4nwh16i-2 + 0.1.0 + Category + + B + + fr.insee + j4nwh16i-3 + 0.1.0 + + fr.insee + CA-j4nwh16i-3 + 0.1.0 + Category + + B1 + + + fr.insee + j4nwh16i-4 + 0.1.0 + + fr.insee + CA-j4nwh16i-4 + 0.1.0 + Category + + B2 + + + fr.insee + j4nwh16i-5 + 0.1.0 + + fr.insee + CA-j4nwh16i-5 + 0.1.0 + Category + + B3 + + + + fr.insee + j4nwh16i-6 + 0.1.0 + + fr.insee + CA-j4nwh16i-6 + 0.1.0 + Category + + C + + fr.insee + j4nwh16i-7 + 0.1.0 + + fr.insee + CA-j4nwh16i-7 + 0.1.0 + Category + + C1 + + + + fr.insee + j4nwh16i-8 + 0.1.0 + + fr.insee + CA-j4nwh16i-8 + 0.1.0 + Category + + D + + + + fr.insee + j77dav9b + 0.1.0 + + Clownings + + Regular + + Ordinal + + + fr.insee + j77dav9b--1 + 0.1.0 + + fr.insee + CA-j77dav9b--1 + 0.1.0 + Category + + 1 + + + fr.insee + j77dav9b-0 + 0.1.0 + + fr.insee + CA-j77dav9b-0 + 0.1.0 + Category + + 2 + + + fr.insee + j77dav9b-1 + 0.1.0 + + fr.insee + CA-j77dav9b-1 + 0.1.0 + Category + + 3 + + + fr.insee + j77dav9b-2 + 0.1.0 + + fr.insee + CA-j77dav9b-2 + 0.1.0 + Category + + 4 + + + + fr.insee + jbdyh6b5 + 0.1.0 + + Clowning_Characters + + Regular + + Ordinal + + + fr.insee + jbdyh6b5--1 + 0.1.0 + + fr.insee + CA-jbdyh6b5--1 + 0.1.0 + Category + + 1 + + + fr.insee + jbdyh6b5-0 + 0.1.0 + + fr.insee + CA-jbdyh6b5-0 + 0.1.0 + Category + + 2 + + + fr.insee + jbdyh6b5-1 + 0.1.0 + + fr.insee + CA-jbdyh6b5-1 + 0.1.0 + Category + + 3 + + + fr.insee + jbdyh6b5-2 + 0.1.0 + + fr.insee + CA-jbdyh6b5-2 + 0.1.0 + Category + + 4 + + + + fr.insee + j6p2kivg + 0.1.0 + + Means of transport + + Regular + + Ordinal + + + fr.insee + j6p2kivg--1 + 0.1.0 + + fr.insee + CA-j6p2kivg--1 + 0.1.0 + Category + + 1 + + + fr.insee + j6p2kivg-0 + 0.1.0 + + fr.insee + CA-j6p2kivg-0 + 0.1.0 + Category + + 2 + + + fr.insee + j6p2kivg-1 + 0.1.0 + + fr.insee + CA-j6p2kivg-1 + 0.1.0 + Category + + 3 + + + fr.insee + j6p2kivg-2 + 0.1.0 + + fr.insee + CA-j6p2kivg-2 + 0.1.0 + Category + + 4 + + + + fr.insee + jbdye1wa + 0.1.0 + + Country + + Regular + + Ordinal + + + fr.insee + jbdye1wa--1 + 0.1.0 + + fr.insee + CA-jbdye1wa--1 + 0.1.0 + Category + + 1 + + + fr.insee + jbdye1wa-0 + 0.1.0 + + fr.insee + CA-jbdye1wa-0 + 0.1.0 + Category + + 2 + + + fr.insee + jbdye1wa-1 + 0.1.0 + + fr.insee + CA-jbdye1wa-1 + 0.1.0 + Category + + 3 + + + fr.insee + jbdye1wa-2 + 0.1.0 + + fr.insee + CA-jbdye1wa-2 + 0.1.0 + Category + + 4 + + + fr.insee + jbdye1wa-3 + 0.1.0 + + fr.insee + CA-jbdye1wa-3 + 0.1.0 + Category + + 5 + + + fr.insee + jbdye1wa-4 + 0.1.0 + + fr.insee + CA-jbdye1wa-4 + 0.1.0 + Category + + 6 + + + + fr.insee + j4nwc63q-secondDimension-fakeCL-1 + 0.1.0 + + FAKE-CODELIST-j4nwc63q-secondDimension-fakeCL-1 + + Regular + + Ordinal + + + fr.insee + j4nwc63q-secondDimension-fakeCL-1--1 + 0.1.0 + + fr.insee + CA-j4nwc63q-secondDimension-fakeCL-1--1 + 0.1.0 + Category + + 1 + + + + fr.insee + j4nw0rr6-secondDimension-fakeCL-1 + 0.1.0 + + FAKE-CODELIST-j4nw0rr6-secondDimension-fakeCL-1 + + Regular + + Ordinal + + + fr.insee + j4nw0rr6-secondDimension-fakeCL-1--1 + 0.1.0 + + fr.insee + CA-j4nw0rr6-secondDimension-fakeCL-1--1 + 0.1.0 + Category + + 1 + + + fr.insee + j4nw0rr6-secondDimension-fakeCL-1-0 + 0.1.0 + + fr.insee + CA-j4nw0rr6-secondDimension-fakeCL-1-0 + 0.1.0 + Category + + 2 + + + + fr.insee + j6qg8rc6-secondDimension-fakeCL-1 + 0.1.0 + + FAKE-CODELIST-j6qg8rc6-secondDimension-fakeCL-1 + + Regular + + Ordinal + + + fr.insee + j6qg8rc6-secondDimension-fakeCL-1--1 + 0.1.0 + + fr.insee + CA-j6qg8rc6-secondDimension-fakeCL-1--1 + 0.1.0 + Category + + 1 + + + fr.insee + j6qg8rc6-secondDimension-fakeCL-1-0 + 0.1.0 + + fr.insee + CA-j6qg8rc6-secondDimension-fakeCL-1-0 + 0.1.0 + Category + + 2 + + + + fr.insee + INSEE-COMMUN-CL-Booleen + 0.1.0 + + Booleen + + Regular + + Ordinal + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 0.1.0 + + fr.insee + INSEE-COMMUN-CA-Booleen-1 + 0.1.0 + Category + + 1 + + + + + fr.insee + VariableScheme-i6vwid + 0.1.0 + + Variable Scheme for the survey + + + fr.insee + jbcgfvir + 0.1.0 + + COMMENT + + + COMMENT label + + + fr.insee + j6p3dkx6-QOP-jbgdhaht + 0.1.0 + OutParameter + + + fr.insee + j6p3dkx6 + 0.1.0 + QuestionItem + + + + + fr.insee + jbcgm0ip + 0.1.0 + + READY + + + READY label + + + fr.insee + j6p0np9q-QOP-jbgd3set + 0.1.0 + OutParameter + + + fr.insee + j6p0np9q + 0.1.0 + QuestionItem + + + + + fr.insee + jbcgf11f + 0.1.0 + + PRODUCER + + + PRODUCER label + + + fr.insee + j3343qhx-QOP-jbgd90cy + 0.1.0 + OutParameter + + + fr.insee + j3343qhx + 0.1.0 + QuestionItem + + + + + fr.insee + jbcgcy2x + 0.1.0 + + SEASON_NUMBER + + + SEASON_NUMBER label + + + fr.insee + j6q9h8tj-QOP-jbgdjy8h + 0.1.0 + OutParameter + + + fr.insee + j6q9h8tj + 0.1.0 + QuestionItem + + + + + fr.insee + jbcgbg33 + 0.1.0 + + DATEFIRST + + + DATEFIRST label + + + fr.insee + j334cyqb-QOP-jbgdih2z + 0.1.0 + OutParameter + + + fr.insee + j334cyqb + 0.1.0 + QuestionItem + + + + + fr.insee + jbcgieyw + 0.1.0 + + AUDIENCE_SHARE + + + AUDIENCE_SHARE label + + + fr.insee + j6z06z1e-QOP-jbgddnrd + 0.1.0 + OutParameter + + + fr.insee + j6z06z1e + 0.1.0 + QuestionItem + + + + + fr.insee + jbcgasbh + 0.1.0 + + CITY + + + CITY label + + + fr.insee + j3343clt-QOP-jbgdjdkn + 0.1.0 + OutParameter + + + fr.insee + j3343clt + 0.1.0 + QuestionItem + + + + + fr.insee + jbcg9yr6 + 0.1.0 + + MAYOR + + + MAYOR label + + + fr.insee + j6qdfhvw-QOP-jbgd8ghp + 0.1.0 + OutParameter + + + fr.insee + j6qdfhvw + 0.1.0 + QuestionItem + + + + + fr.insee + jbcgpija + 0.1.0 + + STATE + + + STATE label + + + fr.insee + j4nw5cqz-QOP-jbgdkd7v + 0.1.0 + OutParameter + + + fr.insee + j4nw5cqz + 0.1.0 + QuestionItem + + + + + fr.insee + jbdxewlq + 0.1.0 + + PET1 + + + 1 - Santa's Little Helper + + + fr.insee + j334akov-QOP-jbgd8qmn + 0.1.0 + OutParameter + + + fr.insee + j334akov + 0.1.0 + QuestionGrid + + + + + fr.insee + jbdxjmst + 0.1.0 + + PET2 + + + 2 - Snowball I + + + fr.insee + j334akov-QOP-jbgd60vl + 0.1.0 + OutParameter + + + fr.insee + j334akov + 0.1.0 + QuestionGrid + + + + + fr.insee + jbdxjuay + 0.1.0 + + PET3 + + + 3 - Coltrane + + + fr.insee + j334akov-QOP-jbgda2jo + 0.1.0 + OutParameter + + + fr.insee + j334akov + 0.1.0 + QuestionGrid + + + + + fr.insee + jbdxniuw + 0.1.0 + + PET4 + + + 4 - Mojo the Helper Monkey + + + fr.insee + j334akov-QOP-jbgdfssy + 0.1.0 + OutParameter + + + fr.insee + j334akov + 0.1.0 + QuestionGrid + + + + + fr.insee + jbdxtl1d + 0.1.0 + + ICE_FLAVOUR1 + + + 1 - Vanilla + + + fr.insee + j6p29i81-QOP-jbgdb3jx + 0.1.0 + OutParameter + + + fr.insee + j6p29i81 + 0.1.0 + QuestionGrid + + + + + fr.insee + jbdxvai9 + 0.1.0 + + ICE_FLAVOUR2 + + + 2 - Strawberry + + + fr.insee + j6p29i81-QOP-jbgdb61k + 0.1.0 + OutParameter + + + fr.insee + j6p29i81 + 0.1.0 + QuestionGrid + + + + + fr.insee + jbdxpltw + 0.1.0 + + ICE_FLAVOUR3 + + + 3 - Apple + + + fr.insee + j6p29i81-QOP-jbgdl3kc + 0.1.0 + OutParameter + + + fr.insee + j6p29i81 + 0.1.0 + QuestionGrid + + + + + fr.insee + jbdxzx2x + 0.1.0 + + ICE_FLAVOUR4 + + + 4 - Bacon + + + fr.insee + j6p29i81-QOP-jbgdcobo + 0.1.0 + OutParameter + + + fr.insee + j6p29i81 + 0.1.0 + QuestionGrid + + + + + fr.insee + jbdy4nhp + 0.1.0 + + NUCLEAR_CHARACTER1 + + + 1 - Charles Montgomery Burns + + + fr.insee + j6qefnga-QOP-jbgd6p0k + 0.1.0 + OutParameter + + + fr.insee + j6qefnga + 0.1.0 + QuestionGrid + + + + + fr.insee + jbdxtanu + 0.1.0 + + NUCLEAR_CHARACTER2 + + + 2 - Carl Carlson + + + fr.insee + j6qefnga-QOP-jbgd9ato + 0.1.0 + OutParameter + + + fr.insee + j6qefnga + 0.1.0 + QuestionGrid + + + + + fr.insee + jbdy25if + 0.1.0 + + NUCLEAR_CHARACTER3 + + + 3 - Otto Mann + + + fr.insee + j6qefnga-QOP-jbgd3e0p + 0.1.0 + OutParameter + + + fr.insee + j6qefnga + 0.1.0 + QuestionGrid + + + + + fr.insee + jbdxvta8 + 0.1.0 + + NUCLEAR_CHARACTER4 + + + 4 - Carl Carlson + + + fr.insee + j6qefnga-QOP-jbgdkxne + 0.1.0 + OutParameter + + + fr.insee + j6qefnga + 0.1.0 + QuestionGrid + + + + + fr.insee + jbdy3nh7 + 0.1.0 + + BIRTH_CHARACTER1 + + + 1 - Selma Bouvier + + + fr.insee + j6yzoc6g-QOP-jbgd7fr6 + 0.1.0 + OutParameter + + + fr.insee + j6yzoc6g + 0.1.0 + QuestionGrid + + + + + fr.insee + jbdy6lk3 + 0.1.0 + + BIRTH_CHARACTER2 + + + 2 - Kent Brockman + + + fr.insee + j6yzoc6g-QOP-jbgd5e9f + 0.1.0 + OutParameter + + + fr.insee + j6yzoc6g + 0.1.0 + QuestionGrid + + + + + fr.insee + jbdxsby0 + 0.1.0 + + BIRTH_CHARACTER3 + + + 3 - Milhouse Van Houten + + + fr.insee + j6yzoc6g-QOP-jbgd912x + 0.1.0 + OutParameter + + + fr.insee + j6yzoc6g + 0.1.0 + QuestionGrid + + + + + fr.insee + jbdy7sra + 0.1.0 + + BIRTH_CHARACTER4 + + + 4 - Nelson Muntz + + + fr.insee + j6yzoc6g-QOP-jbgd6bdy + 0.1.0 + OutParameter + + + fr.insee + j6yzoc6g + 0.1.0 + QuestionGrid + + + + + fr.insee + jbdy2wyl + 0.1.0 + + BIRTH_CHARACTER5 + + + 5 - Crazy Cat Lady + + + fr.insee + j6yzoc6g-QOP-jbgddyry + 0.1.0 + OutParameter + + + fr.insee + j6yzoc6g + 0.1.0 + QuestionGrid + + + + + fr.insee + jbgdnfk7 + 0.1.0 + + PERCENTAGE_EXPENSES11 + + + Frozen products-Percentage + + + fr.insee + j4nwc63q-QOP-jbgde5yl + 0.1.0 + OutParameter + + + fr.insee + j4nwc63q + 0.1.0 + QuestionGrid + + + % + + + + fr.insee + jbgdje4w + 0.1.0 + + PERCENTAGE_EXPENSES21 + + + Ice creams-Percentage + + + fr.insee + j4nwc63q-QOP-jbgd2x2t + 0.1.0 + OutParameter + + + fr.insee + j4nwc63q + 0.1.0 + QuestionGrid + + + % + + + + fr.insee + jbgdlth7 + 0.1.0 + + PERCENTAGE_EXPENSES31 + + + Jasper Beardly-Percentage + + + fr.insee + j4nwc63q-QOP-jbgdjypz + 0.1.0 + OutParameter + + + fr.insee + j4nwc63q + 0.1.0 + QuestionGrid + + + % + + + + fr.insee + jbgdelbl + 0.1.0 + + PERCENTAGE_EXPENSES41 + + + Meat-Percentage + + + fr.insee + j4nwc63q-QOP-jbgdcftu + 0.1.0 + OutParameter + + + fr.insee + j4nwc63q + 0.1.0 + QuestionGrid + + + % + + + + fr.insee + jbgd95jq + 0.1.0 + + PERCENTAGE_EXPENSES51 + + + Bacon-Percentage + + + fr.insee + j4nwc63q-QOP-jbgdiyfe + 0.1.0 + OutParameter + + + fr.insee + j4nwc63q + 0.1.0 + QuestionGrid + + + % + + + + fr.insee + jbgdadd9 + 0.1.0 + + PERCENTAGE_EXPENSES61 + + + Pork chop-Percentage + + + fr.insee + j4nwc63q-QOP-jbgdj1wd + 0.1.0 + OutParameter + + + fr.insee + j4nwc63q + 0.1.0 + QuestionGrid + + + % + + + + fr.insee + jbgdlwzk + 0.1.0 + + PERCENTAGE_EXPENSES71 + + + Chicken-Percentage + + + fr.insee + j4nwc63q-QOP-jbgddylk + 0.1.0 + OutParameter + + + fr.insee + j4nwc63q + 0.1.0 + QuestionGrid + + + % + + + + fr.insee + jbgdfz77 + 0.1.0 + + PERCENTAGE_EXPENSES81 + + + Compote-Percentage + + + fr.insee + j4nwc63q-QOP-jbgd3jj6 + 0.1.0 + OutParameter + + + fr.insee + j4nwc63q + 0.1.0 + QuestionGrid + + + % + + + + fr.insee + jbgdepx6 + 0.1.0 + + PERCENTAGE_EXPENSES91 + + + Powersauce-Percentage + + + fr.insee + j4nwc63q-QOP-jbgd4w3k + 0.1.0 + OutParameter + + + fr.insee + j4nwc63q + 0.1.0 + QuestionGrid + + + % + + + + fr.insee + jbgdepx7 + 0.1.0 + + PERCENTAGE_EXPENSES101 + + + Other-Percentage + + + fr.insee + j4nwc63q-QOP-jbgd4w4k + 0.1.0 + OutParameter + + + fr.insee + j4nwc63q + 0.1.0 + QuestionGrid + + + % + + + + fr.insee + jbgd9vqv + 0.1.0 + + CLOWNING11 + + + Break the windows of the whole city-Clowning + + + fr.insee + j4nw0rr6-QOP-jbgd8tyr + 0.1.0 + OutParameter + + + fr.insee + j4nw0rr6 + 0.1.0 + QuestionGrid + + + + + fr.insee + jbgden0i + 0.1.0 + + CLOWNING21 + + + Loose the violin of his daughter playing poker-Clowning + + + fr.insee + j4nw0rr6-QOP-jbgdep36 + 0.1.0 + OutParameter + + + fr.insee + j4nw0rr6 + 0.1.0 + QuestionGrid + + + + + fr.insee + jbgdndju + 0.1.0 + + CLOWNING31 + + + Kill Mr Burns-Clowning + + + fr.insee + j4nw0rr6-QOP-jbgdjjgi + 0.1.0 + OutParameter + + + fr.insee + j4nw0rr6 + 0.1.0 + QuestionGrid + + + + + fr.insee + jbgdfwg9 + 0.1.0 + + CLOWNING41 + + + Leaving a mechanical object to control the nuclear power plant-Clowning + + + fr.insee + j4nw0rr6-QOP-jbgdgh6k + 0.1.0 + OutParameter + + + fr.insee + j4nw0rr6 + 0.1.0 + QuestionGrid + + + + + fr.insee + jbgdd3ky + 0.1.0 + + CLOWNING12 + + + Break the windows of the whole city-Remember? + + + fr.insee + j4nw0rr6-QOP-jbgdit3o + 0.1.0 + OutParameter + + + fr.insee + j4nw0rr6 + 0.1.0 + QuestionGrid + + + + + fr.insee + jbgdm9lm + 0.1.0 + + CLOWNING22 + + + Loose the violin of his daughter playing poker-Remember? + + + fr.insee + j4nw0rr6-QOP-jbgd366k + 0.1.0 + OutParameter + + + fr.insee + j4nw0rr6 + 0.1.0 + QuestionGrid + + + + + fr.insee + jbgdcdhv + 0.1.0 + + CLOWNING32 + + + Kill Mr Burns-Remember? + + + fr.insee + j4nw0rr6-QOP-jbgdax06 + 0.1.0 + OutParameter + + + fr.insee + j4nw0rr6 + 0.1.0 + QuestionGrid + + + + + fr.insee + jbgdjlit + 0.1.0 + + CLOWNING42 + + + Leaving a mechanical object to control the nuclear power plant-Remember? + + + fr.insee + j4nw0rr6-QOP-jbgdfo1j + 0.1.0 + OutParameter + + + fr.insee + j4nw0rr6 + 0.1.0 + QuestionGrid + + + + + fr.insee + jbgd1zxu + 0.1.0 + + TRAVEL11 + + + Car-Brazil-Means + + + fr.insee + j6p2lwuj-QOP-jbgd92mb + 0.1.0 + OutParameter + + + fr.insee + j6p2lwuj + 0.1.0 + QuestionGrid + + + + + fr.insee + jbgd8lfs + 0.1.0 + + TRAVEL21 + + + Bike-Brazil-Means + + + fr.insee + j6p2lwuj-QOP-jbgdgsat + 0.1.0 + OutParameter + + + fr.insee + j6p2lwuj + 0.1.0 + QuestionGrid + + + + + fr.insee + jbgd56qo + 0.1.0 + + TRAVEL31 + + + Skateboard-Brazil-Means + + + fr.insee + j6p2lwuj-QOP-jbgdaxk2 + 0.1.0 + OutParameter + + + fr.insee + j6p2lwuj + 0.1.0 + QuestionGrid + + + + + fr.insee + jbgd4wu8 + 0.1.0 + + TRAVEL41 + + + Plane-Brazil-Means + + + fr.insee + j6p2lwuj-QOP-jbgd7myn + 0.1.0 + OutParameter + + + fr.insee + j6p2lwuj + 0.1.0 + QuestionGrid + + + + + fr.insee + jbgdak6h + 0.1.0 + + TRAVEL12 + + + Car-Canada-Means + + + fr.insee + j6p2lwuj-QOP-jbgdnxkt + 0.1.0 + OutParameter + + + fr.insee + j6p2lwuj + 0.1.0 + QuestionGrid + + + + + fr.insee + jbgdmsy4 + 0.1.0 + + TRAVEL22 + + + Bike-Canada-Means + + + fr.insee + j6p2lwuj-QOP-jbgd3ef5 + 0.1.0 + OutParameter + + + fr.insee + j6p2lwuj + 0.1.0 + QuestionGrid + + + + + fr.insee + jbgd2zlu + 0.1.0 + + TRAVEL32 + + + Skateboard-Canada-Means + + + fr.insee + j6p2lwuj-QOP-jbgd8p1v + 0.1.0 + OutParameter + + + fr.insee + j6p2lwuj + 0.1.0 + QuestionGrid + + + + + fr.insee + jbgd6v73 + 0.1.0 + + TRAVEL42 + + + Plane-Canada-Means + + + fr.insee + j6p2lwuj-QOP-jbgdgm0c + 0.1.0 + OutParameter + + + fr.insee + j6p2lwuj + 0.1.0 + QuestionGrid + + + + + fr.insee + jbgdf5fg + 0.1.0 + + TRAVEL13 + + + Car-Japan-Means + + + fr.insee + j6p2lwuj-QOP-jbgdcppc + 0.1.0 + OutParameter + + + fr.insee + j6p2lwuj + 0.1.0 + QuestionGrid + + + + + fr.insee + jbgd2xg0 + 0.1.0 + + TRAVEL23 + + + Bike-Japan-Means + + + fr.insee + j6p2lwuj-QOP-jbgd4cm6 + 0.1.0 + OutParameter + + + fr.insee + j6p2lwuj + 0.1.0 + QuestionGrid + + + + + fr.insee + jbgdc06l + 0.1.0 + + TRAVEL33 + + + Skateboard-Japan-Means + + + fr.insee + j6p2lwuj-QOP-jbgdd2lo + 0.1.0 + OutParameter + + + fr.insee + j6p2lwuj + 0.1.0 + QuestionGrid + + + + + fr.insee + jbgdb8i9 + 0.1.0 + + TRAVEL43 + + + Plane-Japan-Means + + + fr.insee + j6p2lwuj-QOP-jbgdo0ay + 0.1.0 + OutParameter + + + fr.insee + j6p2lwuj + 0.1.0 + QuestionGrid + + + + + fr.insee + jbgdhzve + 0.1.0 + + TRAVEL14 + + + Car-France-Means + + + fr.insee + j6p2lwuj-QOP-jbgd4r2a + 0.1.0 + OutParameter + + + fr.insee + j6p2lwuj + 0.1.0 + QuestionGrid + + + + + fr.insee + jbgd93ks + 0.1.0 + + TRAVEL24 + + + Bike-France-Means + + + fr.insee + j6p2lwuj-QOP-jbgdkfpq + 0.1.0 + OutParameter + + + fr.insee + j6p2lwuj + 0.1.0 + QuestionGrid + + + + + fr.insee + jbgdfw7h + 0.1.0 + + TRAVEL34 + + + Skateboard-France-Means + + + fr.insee + j6p2lwuj-QOP-jbgd7u52 + 0.1.0 + OutParameter + + + fr.insee + j6p2lwuj + 0.1.0 + QuestionGrid + + + + + fr.insee + jbgdfavn + 0.1.0 + + TRAVEL44 + + + Plane-France-Means + + + fr.insee + j6p2lwuj-QOP-jbgdgfwl + 0.1.0 + OutParameter + + + fr.insee + j6p2lwuj + 0.1.0 + QuestionGrid + + + + + fr.insee + jbgdc199 + 0.1.0 + + TRAVEL15 + + + Car-Other country-Means + + + fr.insee + j6p2lwuj-QOP-jbgd9cff + 0.1.0 + OutParameter + + + fr.insee + j6p2lwuj + 0.1.0 + QuestionGrid + + + + + fr.insee + jbgdfqph + 0.1.0 + + TRAVEL25 + + + Bike-Other country-Means + + + fr.insee + j6p2lwuj-QOP-jbgddwsp + 0.1.0 + OutParameter + + + fr.insee + j6p2lwuj + 0.1.0 + QuestionGrid + + + + + fr.insee + jbgd8r0n + 0.1.0 + + TRAVEL35 + + + Skateboard-Other country-Means + + + fr.insee + j6p2lwuj-QOP-jbgdncn8 + 0.1.0 + OutParameter + + + fr.insee + j6p2lwuj + 0.1.0 + QuestionGrid + + + + + fr.insee + jbgd3aqk + 0.1.0 + + TRAVEL45 + + + Plane-Other country-Means + + + fr.insee + j6p2lwuj-QOP-jbgdnz6b + 0.1.0 + OutParameter + + + fr.insee + j6p2lwuj + 0.1.0 + QuestionGrid + + + + + fr.insee + jbgdltql + 0.1.0 + + TRAVEL16 + + + Car-Other Planet-Means + + + fr.insee + j6p2lwuj-QOP-jbgdiva0 + 0.1.0 + OutParameter + + + fr.insee + j6p2lwuj + 0.1.0 + QuestionGrid + + + + + fr.insee + jbgd9um3 + 0.1.0 + + TRAVEL26 + + + Bike-Other Planet-Means + + + fr.insee + j6p2lwuj-QOP-jbgd7dqf + 0.1.0 + OutParameter + + + fr.insee + j6p2lwuj + 0.1.0 + QuestionGrid + + + + + fr.insee + jbgddj7v + 0.1.0 + + TRAVEL36 + + + Skateboard-Other Planet-Means + + + fr.insee + j6p2lwuj-QOP-jbgdnous + 0.1.0 + OutParameter + + + fr.insee + j6p2lwuj + 0.1.0 + QuestionGrid + + + + + fr.insee + jbgdb4ym + 0.1.0 + + TRAVEL46 + + + Plane-Other Planet-Means + + + fr.insee + j6p2lwuj-QOP-jbgdkfcz + 0.1.0 + OutParameter + + + fr.insee + j6p2lwuj + 0.1.0 + QuestionGrid + + + + + fr.insee + jbgd3fkz + 0.1.0 + + FAVOURITE_CHARACTERS11 + + + Line1-Name + + + fr.insee + j6qg8rc6-QOP-jbgdl5jb + 0.1.0 + OutParameter + + + fr.insee + j6qg8rc6 + 0.1.0 + QuestionGrid + + + + + fr.insee + jbgdf2md + 0.1.0 + + FAVOURITE_CHARACTERS21 + + + Line2-Name + + + fr.insee + j6qg8rc6-QOP-jbgd8lwo + 0.1.0 + OutParameter + + + fr.insee + j6qg8rc6 + 0.1.0 + QuestionGrid + + + + + fr.insee + jbgdfle1 + 0.1.0 + + FAVOURITE_CHARACTERS31 + + + Line3-Name + + + fr.insee + j6qg8rc6-QOP-jbgdbfag + 0.1.0 + OutParameter + + + fr.insee + j6qg8rc6 + 0.1.0 + QuestionGrid + + + + + fr.insee + jbgdix8x + 0.1.0 + + FAVOURITE_CHARACTERS41 + + + Line4-Name + + + fr.insee + j6qg8rc6-QOP-jbgdlgja + 0.1.0 + OutParameter + + + fr.insee + j6qg8rc6 + 0.1.0 + QuestionGrid + + + + + fr.insee + jbgd782k + 0.1.0 + + FAVOURITE_CHARACTERS51 + + + Line5-Name + + + fr.insee + j6qg8rc6-QOP-jbgd745y + 0.1.0 + OutParameter + + + fr.insee + j6qg8rc6 + 0.1.0 + QuestionGrid + + + + + fr.insee + jbgd68rf + 0.1.0 + + FAVOURITE_CHARACTERS61 + + + Line6-Name + + + fr.insee + j6qg8rc6-QOP-jbgdjkts + 0.1.0 + OutParameter + + + fr.insee + j6qg8rc6 + 0.1.0 + QuestionGrid + + + + + fr.insee + jbgdfoj4 + 0.1.0 + + FAVOURITE_CHARACTERS71 + + + Line7-Name + + + fr.insee + j6qg8rc6-QOP-jbgdcax7 + 0.1.0 + OutParameter + + + fr.insee + j6qg8rc6 + 0.1.0 + QuestionGrid + + + + + fr.insee + jbgdb116 + 0.1.0 + + FAVOURITE_CHARACTERS81 + + + Line8-Name + + + fr.insee + j6qg8rc6-QOP-jbgdjye1 + 0.1.0 + OutParameter + + + fr.insee + j6qg8rc6 + 0.1.0 + QuestionGrid + + + + + fr.insee + jbgd7w5p + 0.1.0 + + FAVOURITE_CHARACTERS91 + + + Line9-Name + + + fr.insee + j6qg8rc6-QOP-jbgd5jet + 0.1.0 + OutParameter + + + fr.insee + j6qg8rc6 + 0.1.0 + QuestionGrid + + + + + fr.insee + jbgd8rj2 + 0.1.0 + + FAVOURITE_CHARACTERS101 + + + Line10-Name + + + fr.insee + j6qg8rc6-QOP-jbgdjw90 + 0.1.0 + OutParameter + + + fr.insee + j6qg8rc6 + 0.1.0 + QuestionGrid + + + + + fr.insee + jbgdidnp + 0.1.0 + + FAVOURITE_CHARACTERS12 + + + Line1-Age + + + fr.insee + j6qg8rc6-QOP-jbgdfndq + 0.1.0 + OutParameter + + + fr.insee + j6qg8rc6 + 0.1.0 + QuestionGrid + + + + + fr.insee + jbgd47wz + 0.1.0 + + FAVOURITE_CHARACTERS22 + + + Line2-Age + + + fr.insee + j6qg8rc6-QOP-jbgd7osi + 0.1.0 + OutParameter + + + fr.insee + j6qg8rc6 + 0.1.0 + QuestionGrid + + + + + fr.insee + jbgdj2nn + 0.1.0 + + FAVOURITE_CHARACTERS32 + + + Line3-Age + + + fr.insee + j6qg8rc6-QOP-jbgd7bnw + 0.1.0 + OutParameter + + + fr.insee + j6qg8rc6 + 0.1.0 + QuestionGrid + + + + + fr.insee + jbgd2ipx + 0.1.0 + + FAVOURITE_CHARACTERS42 + + + Line4-Age + + + fr.insee + j6qg8rc6-QOP-jbgd9k71 + 0.1.0 + OutParameter + + + fr.insee + j6qg8rc6 + 0.1.0 + QuestionGrid + + + + + fr.insee + jbgd4pe3 + 0.1.0 + + FAVOURITE_CHARACTERS52 + + + Line5-Age + + + fr.insee + j6qg8rc6-QOP-jbgdimks + 0.1.0 + OutParameter + + + fr.insee + j6qg8rc6 + 0.1.0 + QuestionGrid + + + + + fr.insee + jbgdjgb1 + 0.1.0 + + FAVOURITE_CHARACTERS62 + + + Line6-Age + + + fr.insee + j6qg8rc6-QOP-jbgdjquz + 0.1.0 + OutParameter + + + fr.insee + j6qg8rc6 + 0.1.0 + QuestionGrid + + + + + fr.insee + jbgdb5c1 + 0.1.0 + + FAVOURITE_CHARACTERS72 + + + Line7-Age + + + fr.insee + j6qg8rc6-QOP-jbgdd2w3 + 0.1.0 + OutParameter + + + fr.insee + j6qg8rc6 + 0.1.0 + QuestionGrid + + + + + fr.insee + jbgdju9y + 0.1.0 + + FAVOURITE_CHARACTERS82 + + + Line8-Age + + + fr.insee + j6qg8rc6-QOP-jbgdkosc + 0.1.0 + OutParameter + + + fr.insee + j6qg8rc6 + 0.1.0 + QuestionGrid + + + + + fr.insee + jbgdatyx + 0.1.0 + + FAVOURITE_CHARACTERS92 + + + Line9-Age + + + fr.insee + j6qg8rc6-QOP-jbgdk0x4 + 0.1.0 + OutParameter + + + fr.insee + j6qg8rc6 + 0.1.0 + QuestionGrid + + + + + fr.insee + jbgdi1dt + 0.1.0 + + FAVOURITE_CHARACTERS102 + + + Line10-Age + + + fr.insee + j6qg8rc6-QOP-jbgd2wgf + 0.1.0 + OutParameter + + + fr.insee + j6qg8rc6 + 0.1.0 + QuestionGrid + + + + + fr.insee + jbcggt4x + 0.1.0 + + SURVEY_COMMENT + + + SURVEY_COMMENT label + + + fr.insee + j6z0z3us-QOP-jbgd6m6e + 0.1.0 + OutParameter + + + fr.insee + j6z0z3us + 0.1.0 + QuestionItem + + + + + fr.insee + jbcggtca + 0.1.0 + + SUM_EXPENSES + + + SUM_EXPENSES label + + + fr.insee + jbcggtca-VROP + 0.1.0 + + + + fr.insee + jbcggtca-GI + 0.1.0 + GenerationInstruction + + + fr.insee + jbcggtca-GOP + 0.1.0 + OutParameter + + + fr.insee + jbcggtca-VROP + 0.1.0 + OutParameter + + + + + + + + fr.insee + jbcggtex + 0.1.0 + + LAST_BROADCAST + + + LAST_BROADCAST label + + + + + fr.insee + INSEE-SIMPSONS-PIS-1 + 0.1.0 + + SIMPSONS + + + Processing instructions of the Simpsons questionnaire + + + fr.insee + jbcggtca-GI + 0.1.0 + + + fr.insee + jbgdnfk7 + 0.1.0 + Variable + + + fr.insee + jbgdje4w + 0.1.0 + Variable + + + fr.insee + jbgdlth7 + 0.1.0 + Variable + + + fr.insee + jbgdelbl + 0.1.0 + Variable + + + fr.insee + jbgd95jq + 0.1.0 + Variable + + + fr.insee + jbgdadd9 + 0.1.0 + Variable + + + fr.insee + jbgdlwzk + 0.1.0 + Variable + + + fr.insee + jbgdfz77 + 0.1.0 + Variable + + + fr.insee + jbgdepx6 + 0.1.0 + Variable + + + fr.insee + jbgdepx7 + 0.1.0 + Variable + + + + xpath + + fr.insee + jbcggtca-IP-1 + 0.1.0 + + PERCENTAGE_EXPENSES11 + + + + fr.insee + jbcggtca-IP-2 + 0.1.0 + + PERCENTAGE_EXPENSES21 + + + + fr.insee + jbcggtca-IP-3 + 0.1.0 + + PERCENTAGE_EXPENSES31 + + + + fr.insee + jbcggtca-IP-4 + 0.1.0 + + PERCENTAGE_EXPENSES41 + + + + fr.insee + jbcggtca-IP-5 + 0.1.0 + + PERCENTAGE_EXPENSES51 + + + + fr.insee + jbcggtca-IP-6 + 0.1.0 + + PERCENTAGE_EXPENSES61 + + + + fr.insee + jbcggtca-IP-7 + 0.1.0 + + PERCENTAGE_EXPENSES71 + + + + fr.insee + jbcggtca-IP-8 + 0.1.0 + + PERCENTAGE_EXPENSES81 + + + + fr.insee + jbcggtca-IP-9 + 0.1.0 + + PERCENTAGE_EXPENSES91 + + + + fr.insee + jbcggtca-IP-10 + 0.1.0 + + PERCENTAGE_EXPENSES101 + + + + fr.insee + jbcggtca-GOP + 0.1.0 + + + + fr.insee + j4nwc63q-QOP-jbgde5yl + 0.1.0 + OutParameter + + + fr.insee + jbcggtca-IP-1 + 0.1.0 + InParameter + + + + + fr.insee + j4nwc63q-QOP-jbgd2x2t + 0.1.0 + OutParameter + + + fr.insee + jbcggtca-IP-2 + 0.1.0 + InParameter + + + + + fr.insee + j4nwc63q-QOP-jbgdjypz + 0.1.0 + OutParameter + + + fr.insee + jbcggtca-IP-3 + 0.1.0 + InParameter + + + + + fr.insee + j4nwc63q-QOP-jbgdcftu + 0.1.0 + OutParameter + + + fr.insee + jbcggtca-IP-4 + 0.1.0 + InParameter + + + + + fr.insee + j4nwc63q-QOP-jbgdiyfe + 0.1.0 + OutParameter + + + fr.insee + jbcggtca-IP-5 + 0.1.0 + InParameter + + + + + fr.insee + j4nwc63q-QOP-jbgdj1wd + 0.1.0 + OutParameter + + + fr.insee + jbcggtca-IP-6 + 0.1.0 + InParameter + + + + + fr.insee + j4nwc63q-QOP-jbgddylk + 0.1.0 + OutParameter + + + fr.insee + jbcggtca-IP-7 + 0.1.0 + InParameter + + + + + fr.insee + j4nwc63q-QOP-jbgd3jj6 + 0.1.0 + OutParameter + + + fr.insee + jbcggtca-IP-8 + 0.1.0 + InParameter + + + + + fr.insee + j4nwc63q-QOP-jbgd4w3k + 0.1.0 + OutParameter + + + fr.insee + jbcggtca-IP-9 + 0.1.0 + InParameter + + + + + fr.insee + j4nwc63q-QOP-jbgd4w4k + 0.1.0 + OutParameter + + + fr.insee + jbcggtca-IP-10 + 0.1.0 + InParameter + + + number(if (jbcggtca-IP-1='') then '0' else jbcggtca-IP-1) + number(if (jbcggtca-IP-2='') then '0' else jbcggtca-IP-2) + number(if (jbcggtca-IP-3='') then '0' else jbcggtca-IP-3) + + number(if (jbcggtca-IP-4='') then '0' else jbcggtca-IP-4) + number(if (jbcggtca-IP-5='') then '0' else jbcggtca-IP-5) + number(if (jbcggtca-IP-6='') then '0' else jbcggtca-IP-6) + + number(if (jbcggtca-IP-7='') then '0' else jbcggtca-IP-7) + number(if (jbcggtca-IP-8='') then '0' else jbcggtca-IP-8) + number(if (jbcggtca-IP-9='') then '0' else jbcggtca-IP-9) + + number(if (jbcggtca-IP-10='') then '0' else jbcggtca-IP-10) + + + + fr.insee + Sequence-i6vwid + 0.1.0 + Sequence + + + + + fr.insee + INSEE-SIMPSONS-MRS + 0.1.0 + + Liste de formats numériques et dates de + l'enquête + Numeric and DateTime list for the survey + + + fr.insee + INSEE-COMMUN-MNR-DateTimedate + 0.1.0 + jj/mm/aaaa + date + + + + + fr.insee + StudyUnit-i6vwid + 0.1.0 + + + fr.insee + DataCollection-i6vwid + 0.1.0 + + fr.insee + QuestionScheme-i6vwid + 0.1.0 + QuestionScheme + + + fr.insee + ControlConstructScheme-i6vwid + 0.1.0 + ControlConstructScheme + + + fr.insee + InterviewerInstructionScheme-i6vwid + 0.1.0 + InterviewerInstructionScheme + + + fr.insee + InstrumentScheme-i6vwid + 0.1.0 + + fr.insee + Instrument-i6vwid + 0.1.0 + + Questionnaire SIMPSONS questionnaire + + A définir + + fr.insee + Sequence-i6vwid + 0.1.0 + Sequence + + + + + + \ No newline at end of file From 944f8e5bc6faaa07b69649821f40063b83a34f92 Mon Sep 17 00:00:00 2001 From: Laurent Caouissin Date: Mon, 23 Sep 2019 13:28:12 +0200 Subject: [PATCH 143/439] Eno v2 : update xsd schema and update insert-end - add decimal separator - add url satisfaction - add default for studyUnit --- src/main/resources/config/ddi2fr.xml | 1 + .../params/schemas/ENOParameters.xsd | 40 +++++++++-------- .../resources/params/schemas/Pipeline.xsd | 19 ++++---- .../schemas/generation/DDI2FRGeneration.xsd | 4 +- .../schemas/generation/DDI2PDFGeneration.xsd | 14 +++--- .../params/schemas/generation/Generation.xsd | 2 +- .../preprocessing/DDIPreprocessing.xsd | 44 ++++++++++++------- .../resources/xslt/util/fr/insert-end.xsl | 10 ++++- 8 files changed, 82 insertions(+), 52 deletions(-) diff --git a/src/main/resources/config/ddi2fr.xml b/src/main/resources/config/ddi2fr.xml index 63157b3e7..bf317d1dd 100644 --- a/src/main/resources/config/ddi2fr.xml +++ b/src/main/resources/config/ddi2fr.xml @@ -22,4 +22,5 @@ https://www.legifrance.gouv.fr/affichTexte.do?cidTexte=JORFTEXT000000888573 https://eur-lex.europa.eu/legal-content/FR/TXT/HTML/?uri=OJ:L:2016:119:FULL&from=FR + https://www.sphinxonline.com/SurveyServer/s/ccpesatisf/EnqueteColtrane2019/questionnaire.htm \ No newline at end of file diff --git a/src/main/resources/params/schemas/ENOParameters.xsd b/src/main/resources/params/schemas/ENOParameters.xsd index bb27bd677..89aa67089 100644 --- a/src/main/resources/params/schemas/ENOParameters.xsd +++ b/src/main/resources/params/schemas/ENOParameters.xsd @@ -1,5 +1,8 @@ - + @@ -12,19 +15,25 @@ - - - - - - - - - + + + + + + + + + - + + + + + + + @@ -33,13 +42,7 @@ - - - - - - - + @@ -51,6 +54,7 @@ + diff --git a/src/main/resources/params/schemas/Pipeline.xsd b/src/main/resources/params/schemas/Pipeline.xsd index ad7f64613..34c0d6761 100644 --- a/src/main/resources/params/schemas/Pipeline.xsd +++ b/src/main/resources/params/schemas/Pipeline.xsd @@ -46,6 +46,8 @@ + + @@ -58,22 +60,22 @@ - - - + - - - - + + + + + + - + @@ -82,6 +84,7 @@ + diff --git a/src/main/resources/params/schemas/generation/DDI2FRGeneration.xsd b/src/main/resources/params/schemas/generation/DDI2FRGeneration.xsd index b35e477d1..626f51801 100644 --- a/src/main/resources/params/schemas/generation/DDI2FRGeneration.xsd +++ b/src/main/resources/params/schemas/generation/DDI2FRGeneration.xsd @@ -9,7 +9,9 @@ + + @@ -17,7 +19,7 @@ - + diff --git a/src/main/resources/params/schemas/generation/DDI2PDFGeneration.xsd b/src/main/resources/params/schemas/generation/DDI2PDFGeneration.xsd index b8a2151ff..c79beafd1 100644 --- a/src/main/resources/params/schemas/generation/DDI2PDFGeneration.xsd +++ b/src/main/resources/params/schemas/generation/DDI2PDFGeneration.xsd @@ -13,7 +13,13 @@ - + + + + + + + @@ -78,11 +84,7 @@ - - - - - + diff --git a/src/main/resources/params/schemas/generation/Generation.xsd b/src/main/resources/params/schemas/generation/Generation.xsd index 3f6dfcb34..fb3ba6947 100644 --- a/src/main/resources/params/schemas/generation/Generation.xsd +++ b/src/main/resources/params/schemas/generation/Generation.xsd @@ -1,7 +1,7 @@ - + diff --git a/src/main/resources/params/schemas/preprocessing/DDIPreprocessing.xsd b/src/main/resources/params/schemas/preprocessing/DDIPreprocessing.xsd index e9661bec1..3c37d7aa0 100644 --- a/src/main/resources/params/schemas/preprocessing/DDIPreprocessing.xsd +++ b/src/main/resources/params/schemas/preprocessing/DDIPreprocessing.xsd @@ -24,33 +24,42 @@ + + + - - - - - - - - + + + + + + + + + + + - - - - - - - - + + + + + + + + + + + - + @@ -73,6 +82,7 @@ + diff --git a/src/main/resources/xslt/util/fr/insert-end.xsl b/src/main/resources/xslt/util/fr/insert-end.xsl index a5f80e7ec..c6a33a9f4 100644 --- a/src/main/resources/xslt/util/fr/insert-end.xsl +++ b/src/main/resources/xslt/util/fr/insert-end.xsl @@ -36,6 +36,7 @@ + @@ -204,7 +205,7 @@ - revenir dessus dès à présent en cliquant sur le bouton "Retour" ; - ou plus tard en cliquant sur le bouton "Fermer le questionnaire" et en vous authentifiant à nouveau. Dans les deux cas, vos données seront enregistrées mais le questionnaire ne sera pas - envoyé à . + envoyé à . @@ -357,6 +358,13 @@ La Statistique publique vous remercie de votre collaboration à cette enquête. + + + + Aidez-nous à améliorer notre site en répondant à notre enquête de satisfaction ! + + + From 34b5d8809f9e2a90b1f2f5b7c476fac17ca92a22 Mon Sep 17 00:00:00 2001 From: Laurent Caouissin Date: Mon, 23 Sep 2019 13:30:04 +0200 Subject: [PATCH 144/439] Eno v2 : update parameters-default.xml --- src/main/resources/parameters-default.xml | 33 ++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/src/main/resources/parameters-default.xml b/src/main/resources/parameters-default.xml index 106e55bd1..1f88e669e 100644 --- a/src/main/resources/parameters-default.xml +++ b/src/main/resources/parameters-default.xml @@ -1,6 +1,30 @@ - - + + + ddi + fr + + ddi-dereferencing + ddi-cleaning + ddi-titling + ddi-mapping + + fr-insert-generic-questions + fr-browsing + fr-modele-coltrane + fr-edit-patron + fr-identification + fr-insert-welcome + fr-insert-end + fr-fix-adherence + + false + false + false + false + false + + <!-- no-number ; template ; module ; submodule ; unnumbered-filter --> @@ -67,9 +91,11 @@ </EndQuestion> <NumericExample>false</NumericExample> <Deblocage>false</Deblocage> + <Satisfaction>false</Satisfaction> <LengthOfLongTable> <Length>7</Length> </LengthOfLongTable> + <DecimalSeparator>,</DecimalSeparator> </fr-parameters> <pdf-parameters> @@ -128,6 +154,7 @@ <ResponseTimeQuestion>false</ResponseTimeQuestion> <CommentQuestion>true</CommentQuestion> </EndQuestion> - </odt-parameters> + </odt-parameters> </Parameters> + </ENOParameters> From 6c2031fb3fc2bcd87a51cb60b3a527988d916d04 Mon Sep 17 00:00:00 2001 From: Laurent Caouissin <laurent.caouissin@insee.fr> Date: Mon, 23 Sep 2019 13:37:31 +0200 Subject: [PATCH 145/439] Eno v2 : Change name of params --- src/main/resources/parameters-default.xml | 34 +++++++++---------- .../resources/params/schemas/Pipeline.xsd | 14 ++++---- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/main/resources/parameters-default.xml b/src/main/resources/parameters-default.xml index 1f88e669e..86446ee40 100644 --- a/src/main/resources/parameters-default.xml +++ b/src/main/resources/parameters-default.xml @@ -4,25 +4,25 @@ <InFormat>ddi</InFormat> <OutFormat>fr</OutFormat> - <pre-processing>ddi-dereferencing</pre-processing> - <pre-processing>ddi-cleaning</pre-processing> - <pre-processing>ddi-titling</pre-processing> - <pre-processing>ddi-mapping</pre-processing> + <PreProcessing>ddi-dereferencing</PreProcessing> + <PreProcessing>ddi-cleaning</PreProcessing> + <PreProcessing>ddi-titling</PreProcessing> + <PreProcessing>ddi-mapping</PreProcessing> - <post-processing>fr-insert-generic-questions</post-processing> - <post-processing>fr-browsing</post-processing> - <post-processing>fr-modele-coltrane</post-processing> - <post-processing>fr-edit-patron</post-processing> - <post-processing>fr-identification</post-processing> - <post-processing>fr-insert-welcome</post-processing> - <post-processing>fr-insert-end</post-processing> - <post-processing>fr-fix-adherence</post-processing> + <PostProcessing>fr-insert-generic-questions</PostProcessing> + <PostProcessing>fr-browsing</PostProcessing> + <PostProcessing>fr-modele-coltrane</PostProcessing> + <PostProcessing>fr-edit-patron</PostProcessing> + <PostProcessing>fr-identification</PostProcessing> + <PostProcessing>fr-insert-welcome</PostProcessing> + <PostProcessing>fr-insert-end</PostProcessing> + <PostProcessing>fr-fix-adherence</PostProcessing> - <VerrueDDI>false</VerrueDDI> - <VerrueFR>false</VerrueFR> - <VerruePDF>false</VerruePDF> - <VerrueODT>false</VerrueODT> - <VerrueJS>false</VerrueJS> + <SpecificTreatmentDDI>false</SpecificTreatmentDDI> + <SpecificTreatmentFR>false</SpecificTreatmentFR> + <SpecificTreatmentPDF>false</SpecificTreatmentPDF> + <SpecificTreatmentODT>false</SpecificTreatmentODT> + <SpecificTreatmentS>false</SpecificTreatmentS> </Pipeline> <Parameters> diff --git a/src/main/resources/params/schemas/Pipeline.xsd b/src/main/resources/params/schemas/Pipeline.xsd index 34c0d6761..141edb8ba 100644 --- a/src/main/resources/params/schemas/Pipeline.xsd +++ b/src/main/resources/params/schemas/Pipeline.xsd @@ -8,16 +8,16 @@ <xs:element name="InFormat" type="InFormat"/> <xs:element name="OutFormat" type="OutFormat"/> <xs:sequence> - <xs:element name="pre-processing" type="PreProcessing" minOccurs="0" maxOccurs="unbounded"/> + <xs:element name="PreProcessing" type="PreProcessing" minOccurs="0" maxOccurs="unbounded"/> </xs:sequence> <xs:sequence> - <xs:element name="post-processing" type="PostProcessing" minOccurs="0" maxOccurs="unbounded"/> + <xs:element name="PostProcessing" type="PostProcessing" minOccurs="0" maxOccurs="unbounded"/> </xs:sequence> - <xs:element name="VerrueDDI" type="xs:boolean" default="false"/> - <xs:element name="VerrueFR" type="xs:boolean" default="false"/> - <xs:element name="VerruePDF" type="xs:boolean" default="false"/> - <xs:element name="VerrueODT" type="xs:boolean" default="false"/> - <xs:element name="VerrueJS" type="xs:boolean" default="false"/> + <xs:element name="SpecificTreatmentDDI" type="xs:boolean" default="false"/> + <xs:element name="SpecificTreatmentFR" type="xs:boolean" default="false"/> + <xs:element name="SpecificTreatmentPDF" type="xs:boolean" default="false"/> + <xs:element name="SpecificTreatmentODT" type="xs:boolean" default="false"/> + <xs:element name="SpecificTreatmentJS" type="xs:boolean" default="false"/> </xs:sequence> </xs:complexType> From 0730892422e3b84e5eb0044125d1b1bd1fbace21 Mon Sep 17 00:00:00 2001 From: BulotF <francois.bulot@insee.fr> Date: Mon, 23 Sep 2019 14:56:26 +0200 Subject: [PATCH 146/439] normalize formulas --- src/main/resources/xslt/outputs/fr/models.xsl | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/resources/xslt/outputs/fr/models.xsl b/src/main/resources/xslt/outputs/fr/models.xsl index 45af4d6e2..36ca00869 100644 --- a/src/main/resources/xslt/outputs/fr/models.xsl +++ b/src/main/resources/xslt/outputs/fr/models.xsl @@ -2898,6 +2898,7 @@ <xsl:param name="variables" as="node()"/> <xsl:variable name="instance-group" select="tokenize($instance-ancestor,' ')[last()]"/> + <xsl:variable name="formula" select="normalize-space($formula)"/> <xsl:choose> <xsl:when test="$variables/Variable"> From 4336951520e3c2eac526ab435d769364591915d4 Mon Sep 17 00:00:00 2001 From: BulotF <francois.bulot@insee.fr> Date: Mon, 23 Sep 2019 15:44:57 +0200 Subject: [PATCH 147/439] create parameter DecimalSeparator --- src/main/resources/config/ddi2fr.xml | 1 + src/main/resources/xslt/outputs/fr/models.xsl | 15 ------------- .../transformations/ddi2fr/ddi2fr-fixed.xsl | 22 +++++++++++++++++++ 3 files changed, 23 insertions(+), 15 deletions(-) diff --git a/src/main/resources/config/ddi2fr.xml b/src/main/resources/config/ddi2fr.xml index 63157b3e7..2880eed61 100644 --- a/src/main/resources/config/ddi2fr.xml +++ b/src/main/resources/config/ddi2fr.xml @@ -17,6 +17,7 @@ <LengthOfLongTable> <Length>7</Length> </LengthOfLongTable> + <DecimalSeparator>,</DecimalSeparator> <lois> <informatique>https://www.legifrance.gouv.fr/affichTexte.do?cidTexte=JORFTEXT000000886460</informatique> <statistique>https://www.legifrance.gouv.fr/affichTexte.do?cidTexte=JORFTEXT000000888573</statistique> diff --git a/src/main/resources/xslt/outputs/fr/models.xsl b/src/main/resources/xslt/outputs/fr/models.xsl index 36ca00869..680d28dfa 100644 --- a/src/main/resources/xslt/outputs/fr/models.xsl +++ b/src/main/resources/xslt/outputs/fr/models.xsl @@ -16,21 +16,6 @@ </xd:desc> </xd:doc> - <xd:doc> - <xd:desc> - <xd:p>The properties file used by the stylesheet.</xd:p> - <xd:p>It's on a transformation level.</xd:p> - </xd:desc> - </xd:doc> - <xsl:param name="properties-file"/> - - <xd:doc> - <xd:desc> - <xd:p>The properties file is charged as an xml tree.</xd:p> - </xd:desc> - </xd:doc> - <xsl:variable name="properties" select="doc($properties-file)"/> - <xd:doc> <xd:desc> <xd:p>The highest driver, which starts the generation of the xforms.</xd:p> diff --git a/src/main/resources/xslt/transformations/ddi2fr/ddi2fr-fixed.xsl b/src/main/resources/xslt/transformations/ddi2fr/ddi2fr-fixed.xsl index 3548346f0..d688e756a 100644 --- a/src/main/resources/xslt/transformations/ddi2fr/ddi2fr-fixed.xsl +++ b/src/main/resources/xslt/transformations/ddi2fr/ddi2fr-fixed.xsl @@ -24,6 +24,21 @@ <!--<xsl:strip-space elements="*"/>--> + <xd:doc> + <xd:desc> + <xd:p>The properties file used by the stylesheet.</xd:p> + <xd:p>It's on a transformation level.</xd:p> + </xd:desc> + </xd:doc> + <xsl:param name="properties-file"/> + + <xd:doc> + <xd:desc> + <xd:p>The properties file is charged as an xml tree.</xd:p> + </xd:desc> + </xd:doc> + <xsl:variable name="properties" select="doc($properties-file)"/> + <xd:doc> <xd:desc> <xd:p>The parameter file used by the stylesheet.</xd:p> @@ -84,6 +99,13 @@ </xd:doc> <xsl:variable name="numeric-example" select="$parameters//NumericExample"/> + <xd:doc> + <xd:desc> + <xd:p>Character for the decimal separator.</xd:p> + </xd:desc> + </xd:doc> + <xsl:variable name="decimal-separator" select="$parameters//DecimalSeparator"/> + <xd:doc> <xd:desc>Loops and dynamic array's ids may be called in many calculs : filters, consistency checks, calculated variables</xd:desc> <xd:dec>To change their in-language-ID into business-name, everywhere it is necessary, it is simple to try everywhere it could be necessary</xd:dec> From b02a28292f76aa183b5530011d4912e86330747a Mon Sep 17 00:00:00 2001 From: Laurent Caouissin <laurent.caouissin@insee.fr> Date: Tue, 24 Sep 2019 11:06:57 +0200 Subject: [PATCH 148/439] Update IdentityGenerator.java --- .../eno/generation/IdentityGenerator.java | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/src/main/java/fr/insee/eno/generation/IdentityGenerator.java b/src/main/java/fr/insee/eno/generation/IdentityGenerator.java index 1f5cef5cf..fc0e3bf77 100644 --- a/src/main/java/fr/insee/eno/generation/IdentityGenerator.java +++ b/src/main/java/fr/insee/eno/generation/IdentityGenerator.java @@ -3,10 +3,12 @@ import java.io.File; import org.apache.commons.io.FileUtils; +import org.apache.commons.io.FilenameUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import fr.insee.eno.Constants; +import fr.insee.eno.transform.xsl.XslParameters; public class IdentityGenerator implements Generator { @@ -16,11 +18,28 @@ public class IdentityGenerator implements Generator { public File generate(File finalInput, byte[] parameters, String surveyName) throws Exception { logger.info("Identity generation : START"); logger.info("Identity generation : simply copying input file in another file"); - String outputForm = Constants.TEMP_FOLDER_PATH + "/" + surveyName + "/ddi33/out.xml"; + logger.debug("Arguments : finalInput : " + finalInput + " surveyName " + surveyName); + String formNameFolder = null; + String outputBasicFormPath = null; + + formNameFolder = getFormNameFolder(finalInput); + + logger.debug("formNameFolder : " + formNameFolder); + outputBasicFormPath = Constants.TEMP_FOLDER_PATH + "/" + surveyName + "/" + formNameFolder + "/form"; + logger.debug("Output folder for basic-form : " + outputBasicFormPath); + String outputForm = outputBasicFormPath + "/form.xml"; FileUtils.copyFile(finalInput, new File(outputForm)); logger.info("Identity generation : END"); return new File(outputForm); } + + private String getFormNameFolder(File finalInput) { + String formNameFolder; + formNameFolder = FilenameUtils.getBaseName(finalInput.getAbsolutePath()); + formNameFolder = FilenameUtils.removeExtension(formNameFolder); + formNameFolder = formNameFolder.replace(XslParameters.TITLED_EXTENSION, ""); + return formNameFolder; + } public String in2out() { return "identity"; From 795c604d16c1bebdf4ac59d8110c8b48e3eda5f4 Mon Sep 17 00:00:00 2001 From: BulotF <francois.bulot@insee.fr> Date: Tue, 24 Sep 2019 13:53:32 +0200 Subject: [PATCH 149/439] improve get-variable-representation --- src/main/resources/xslt/inputs/ddi/source-fixed.xsl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/xslt/inputs/ddi/source-fixed.xsl b/src/main/resources/xslt/inputs/ddi/source-fixed.xsl index 9aee92082..798539089 100644 --- a/src/main/resources/xslt/inputs/ddi/source-fixed.xsl +++ b/src/main/resources/xslt/inputs/ddi/source-fixed.xsl @@ -1196,7 +1196,7 @@ </xsl:when> <!-- calculated variable --> <xsl:when test="$root//l:VariableScheme//l:Variable//r:ProcessingInstructionReference/r:Binding/r:SourceParameterReference/r:ID = $variable"> - <xsl:value-of select="enoddi:get-type($root//l:VariableScheme//l:Variable[descendant::r:ProcessingInstructionReference/r:Binding/r:SourceParameterReference/r:ID = $variable]/l:VariableRepresentation/*)"/> + <xsl:value-of select="enoddi:get-type($root//l:VariableScheme//l:Variable[descendant::r:ProcessingInstructionReference/r:Binding/r:SourceParameterReference/r:ID = $variable]/l:VariableRepresentation/*[not(self::r:ProcessingInstructionReference)])"/> </xsl:when> <!-- external variable --> <xsl:when test="$root//l:VariableScheme//l:Variable[not(r:QuestionReference or r:SourceParameterReference or descendant::r:ProcessingInstructionReference)]/l:VariableName/r:String= $variable"> From 0f8f7fa86666e255bc610bd615e86f9e7a4e8e37 Mon Sep 17 00:00:00 2001 From: BulotF <francois.bulot@insee.fr> Date: Tue, 24 Sep 2019 13:54:18 +0200 Subject: [PATCH 150/439] fr:number and DecimalSeparator parameter --- src/main/resources/lang/fr/en.xml | 6 ++-- src/main/resources/lang/fr/fr.xml | 6 ++-- src/main/resources/xslt/outputs/fr/models.xsl | 29 ++++++++++++++++--- .../transformations/ddi2fr/ddi2fr-fixed.xsl | 25 ++++++++++++---- 4 files changed, 52 insertions(+), 14 deletions(-) diff --git a/src/main/resources/lang/fr/en.xml b/src/main/resources/lang/fr/en.xml index c80fed842..7b5389c73 100644 --- a/src/main/resources/lang/fr/en.xml +++ b/src/main/resources/lang/fr/en.xml @@ -10,10 +10,12 @@ <Number> <Integer>You shall type an integer number</Integer> <Decimal> - <Beginning>You shall use point as decimal separator, with no spaces, and type a number</Beginning> + <Beginning>You shall use "</Beginning> + <Beginning2>" character as decimal separator, with no spaces, and type a number</Beginning2> <DecimalCondition>(with at most</DecimalCondition> <Digit>digit</Digit> - <End>behind the "." separator)</End> + <End>behind the "</End> + <End2>" separator)</End2> </Decimal> </Number> <Date>Type a valid date</Date> diff --git a/src/main/resources/lang/fr/fr.xml b/src/main/resources/lang/fr/fr.xml index 018d15a23..e48f66fac 100644 --- a/src/main/resources/lang/fr/fr.xml +++ b/src/main/resources/lang/fr/fr.xml @@ -10,10 +10,12 @@ <Number> <Integer>Vous devez saisir un nombre entier compris</Integer> <Decimal> - <Beginning>Vous devez utiliser le point comme séparateur de décimale, sans espace, et saisir un nombre compris</Beginning> + <Beginning>Vous devez utiliser le caractère "</Beginning> + <Beginning2>" comme séparateur de décimale, sans espace, et saisir un nombre compris</Beginning2> <DecimalCondition>(avec au plus</DecimalCondition> <Digit>chiffre</Digit> - <End>derrière le séparateur ".")</End> + <End>derrière le séparateur "</End> + <End2>")</End2> </Decimal> </Number> <Date>Entrez une date valide</Date> diff --git a/src/main/resources/xslt/outputs/fr/models.xsl b/src/main/resources/xslt/outputs/fr/models.xsl index 680d28dfa..a3fb1f97e 100644 --- a/src/main/resources/xslt/outputs/fr/models.xsl +++ b/src/main/resources/xslt/outputs/fr/models.xsl @@ -1690,9 +1690,12 @@ </xsl:variable> <xsl:variable name="xforms-element"> <xsl:choose> - <xsl:when test="self::NumericDomain | self::TextDomain"> + <xsl:when test="self::TextDomain"> <xsl:value-of select="'xf:input'"/> </xsl:when> + <xsl:when test="self::NumericDomain"> + <xsl:value-of select="'fr:number'"/> + </xsl:when> <xsl:when test="self::TextareaDomain"> <xsl:value-of select="'xf:textarea'"/> </xsl:when> @@ -1742,6 +1745,20 @@ <xsl:if test="not($length = '')"> <xsl:attribute name="xxf:maxlength" select="$length"/> </xsl:if> + <xsl:if test="self::NumericDomain"> + <xsl:attribute name="grouping-separator" select="' '"/> + <xsl:choose> + <xsl:when test="number(enofr:get-number-of-decimals($source-context)) > 0"> + <xsl:attribute name="decimal-separator" select="$decimal-separator"/> + </xsl:when> + <xsl:otherwise> + <xsl:attribute name="xxf:fraction-digits" select="'0'"/> + <xsl:if test="number(enofr:get-minimum($source-context)) >= 0"> + <xsl:attribute name="xxf:non-negative" select="'true()'"/> + </xsl:if> + </xsl:otherwise> + </xsl:choose> + </xsl:if> <xsl:if test="$label != '' or $question-label!= ''"> <xsl:variable name="conditioning-variables" as="xs:string*"> <xsl:choose> @@ -2904,7 +2921,7 @@ <xsl:choose> <xsl:when test="$variable-representation = 'number' and contains($formula,concat($conditioning-variable-begin,$current-variable,$conditioning-variable-end))"> <!-- former default formula for variableId --> - <xsl:analyze-string select="$formula" regex="^(.*)number\(if\s+\({$conditioning-variable-begin}{$current-variable}{$conditioning-variable-end}=''\)\s+then\s+'0'\s+else\s+{$conditioning-variable-begin}{$current-variable}{$conditioning-variable-end}\)(.*)$"> + <xsl:analyze-string select="$formula" regex="^(.*)number\(if \({$conditioning-variable-begin}{$current-variable}{$conditioning-variable-end}=''\) then '0' else {$conditioning-variable-begin}{$current-variable}{$conditioning-variable-end}\)(.*)$"> <xsl:matching-substring> <xsl:call-template name="replaceVariablesInFormula"> <xsl:with-param name="formula" select="regex-group(1)"/> @@ -2986,14 +3003,18 @@ <!-- =0 or !=0 --> <!-- the same as the default case except that empty value is not transformed into 0 --> <!-- e.g. variableId != 0 becomes (if (variableName/string()='') then 1 else variableName)!=0 --> - <xsl:analyze-string select="$formula" regex="^(.*){$conditioning-variable-begin}{$current-variable}{$conditioning-variable-end} *(!)?= *0([^\.](.*))?$"> + <xsl:analyze-string select="$formula" regex="^(.*){$conditioning-variable-begin}{$current-variable}{$conditioning-variable-end} *(<|!|>)?= *0([^\.](.*))?$"> <xsl:matching-substring> <xsl:call-template name="replaceVariablesInFormula"> <xsl:with-param name="formula" select="regex-group(1)"/> <xsl:with-param name="variables" as="node()" select="$variables"/> <xsl:with-param name="instance-ancestor" select="$instance-ancestor"/> </xsl:call-template> - <xsl:value-of select="concat('(if (',$variable-business-name,'/string()='''') then 1 else ',$variable-business-name,')',regex-group(2),'=0')"/> + <xsl:value-of select="concat('(if (',$variable-business-name,'/string()='''') then ')"/> + <xsl:if test="regex-group(2) = '>'"> + <xsl:value-of select="'-'"/> + </xsl:if> + <xsl:value-of select="concat('1 else ',$variable-business-name,')',regex-group(2),'=0')"/> <xsl:call-template name="replaceVariablesInFormula"> <xsl:with-param name="formula" select="regex-group(3)"/> <xsl:with-param name="variables" as="node()" select="$variables"/> diff --git a/src/main/resources/xslt/transformations/ddi2fr/ddi2fr-fixed.xsl b/src/main/resources/xslt/transformations/ddi2fr/ddi2fr-fixed.xsl index d688e756a..2f18417c1 100644 --- a/src/main/resources/xslt/transformations/ddi2fr/ddi2fr-fixed.xsl +++ b/src/main/resources/xslt/transformations/ddi2fr/ddi2fr-fixed.xsl @@ -104,7 +104,16 @@ <xd:p>Character for the decimal separator.</xd:p> </xd:desc> </xd:doc> - <xsl:variable name="decimal-separator" select="$parameters//DecimalSeparator"/> + <xsl:variable name="decimal-separator"> + <xsl:choose> + <xsl:when test="$parameters//DecimalSeparator != ''"> + <xsl:value-of select="$parameters//DecimalSeparator"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="$properties//DecimalSeparator"/> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> <xd:doc> <xd:desc>Loops and dynamic array's ids may be called in many calculs : filters, consistency checks, calculated variables</xd:desc> @@ -439,10 +448,10 @@ <xsl:value-of select="enoddi:get-format($context)"/> </xsl:variable> <xsl:variable name="minimum"> - <xsl:value-of select="enoddi:get-minimum($context)"/> + <xsl:value-of select="replace(enoddi:get-minimum($context),'\.',$decimal-separator)"/> </xsl:variable> <xsl:variable name="maximum"> - <xsl:value-of select="enoddi:get-maximum($context)"/> + <xsl:value-of select="replace(enoddi:get-maximum($context),'\.',$decimal-separator)"/> </xsl:variable> <xsl:choose> <xsl:when test="$type='text'"> @@ -458,6 +467,8 @@ <xsl:choose> <xsl:when test="not($number-of-decimals='' or $number-of-decimals='0')"> <xsl:value-of select="$labels-resource/Languages/Language[@xml:lang=$language]/Alert/Number/Decimal/Beginning"/> + <xsl:value-of select="$decimal-separator"/> + <xsl:value-of select="$labels-resource/Languages/Language[@xml:lang=$language]/Alert/Number/Decimal/Beginning2"/> </xsl:when> <xsl:otherwise> <xsl:value-of select="$labels-resource/Languages/Language[@xml:lang=$language]/Alert/Number/Integer"/> @@ -469,15 +480,17 @@ <xsl:choose> <xsl:when test="not($number-of-decimals='' or $number-of-decimals='0')"> <xsl:value-of - select="' ', - concat($labels-resource/Languages/Language[@xml:lang=$language]/Alert/Number/Decimal/DecimalCondition, + select="concat(' ', + $labels-resource/Languages/Language[@xml:lang=$language]/Alert/Number/Decimal/DecimalCondition, ' ', $number-of-decimals, ' ', $labels-resource/Languages/Language[@xml:lang=$language]/Alert/Number/Decimal/Digit, if (number($number-of-decimals)>1) then $labels-resource/Languages/Language[@xml:lang=$language]/Plural else '', ' ', - $labels-resource/Languages/Language[@xml:lang=$language]/Alert/Number/Decimal/End)" + $labels-resource/Languages/Language[@xml:lang=$language]/Alert/Number/Decimal/End, + $decimal-separator, + $labels-resource/Languages/Language[@xml:lang=$language]/Alert/Number/Decimal/End2)" /> </xsl:when> </xsl:choose> From ad6c83cc270f936244aea1cf9b8c0bd1bd0653ef Mon Sep 17 00:00:00 2001 From: BulotF <francois.bulot@insee.fr> Date: Tue, 24 Sep 2019 16:13:40 +0200 Subject: [PATCH 151/439] update durations collected like numbers --- src/main/resources/xslt/outputs/fr/models.xsl | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/resources/xslt/outputs/fr/models.xsl b/src/main/resources/xslt/outputs/fr/models.xsl index a3fb1f97e..bc5a7d49e 100644 --- a/src/main/resources/xslt/outputs/fr/models.xsl +++ b/src/main/resources/xslt/outputs/fr/models.xsl @@ -2286,7 +2286,7 @@ <xsl:variable name="input-format"> <xsl:choose> <xsl:when test="$current-driver='DurationDomain' or $dateduration-format = 'YYYY-MM-DD' or upper-case($dateduration-format) = 'JJ/MM/AAAA'"> - <xsl:value-of select="'xf:input'"/> + <xsl:value-of select="'fr:number'"/> </xsl:when> <xsl:otherwise> <xsl:value-of select="'xf:select1'"/> @@ -2302,6 +2302,10 @@ <xsl:if test="$input-format='xf:select1'"> <xsl:attribute name="appearance" select="'minimal'"/> </xsl:if> + <xsl:if test="$input-format='fr:number'"> + <xsl:attribute name="xxf:fraction-digits" select="'0'"/> + <xsl:attribute name="xxf:non-negative" select="'true()'"/> + </xsl:if> <xsl:attribute name="class"> <xsl:choose> <xsl:when test="$question-label !='' and $current-driver='DurationDomain'"> From 277c7190c597aca0f4811e0c46d955b6c3a3d8c6 Mon Sep 17 00:00:00 2001 From: BulotF <francois.bulot@insee.fr> Date: Tue, 24 Sep 2019 16:45:32 +0200 Subject: [PATCH 152/439] update simpsons questionnaire for Xforms and pdf --- questionnaires/simpsons/ddi/simpsons.xml | 4390 +++++++++++++-------- src/test/resources/ddi-to-fo/in.xml | 4390 +++++++++++++-------- src/test/resources/ddi-to-fo/out.fo | 20 +- src/test/resources/ddi-to-xform/in.xml | 4390 +++++++++++++-------- src/test/resources/ddi-to-xform/out.xhtml | 930 ++--- 5 files changed, 8384 insertions(+), 5736 deletions(-) diff --git a/questionnaires/simpsons/ddi/simpsons.xml b/questionnaires/simpsons/ddi/simpsons.xml index 43c0c1a62..fb76627a4 100644 --- a/questionnaires/simpsons/ddi/simpsons.xml +++ b/questionnaires/simpsons/ddi/simpsons.xml @@ -1,49 +1,54 @@ -<?xml version="1.0" encoding="UTF-8"?><DDIInstance xmlns="ddi:instance:3_3" xmlns:d="ddi:datacollection:3_3" xmlns:r="ddi:reusable:3_3" xmlns:l="ddi:logicalproduct:3_3" xmlns:g="ddi:group:3_3" xmlns:s="ddi:studyunit:3_3" xmlns:a="ddi:archive:3_3" xmlns:pr="ddi:ddiprofile:3_3" xmlns:c="ddi:conceptualcomponent:3_3" xmlns:cm="ddi:comparative:3_3" xmlns:xhtml="http://www.w3.org/1999/xhtml"><r:Agency>fr.insee</r:Agency><r:ID>INSEE-i6vwid</r:ID><r:Version>0.1.0</r:Version><r:Citation> +<?xml version="1.0" encoding="UTF-8"?><DDIInstance xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="ddi:instance:3_3" xmlns:g="ddi:group:3_3" xmlns:d="ddi:datacollection:3_3" xmlns:s="ddi:studyunit:3_3" xmlns:r="ddi:reusable:3_3" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:a="ddi:archive:3_3" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:l="ddi:logicalproduct:3_3" xsi:schemaLocation="ddi:instance:3_3 https://www.ddialliance.org/Specification/DDI-Lifecycle/3.3/XMLSchema/instance.xsd" isMaintainable="true"> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-i6vwi0</r:ID> + <r:Version>1</r:Version> + <r:Citation> <r:Title> <r:String>Questionnaire SIMPSONS</r:String> </r:Title> - </r:Citation><g:ResourcePackage isMaintainable="true" versionDate="2018-01-25+01:00"> + </r:Citation> + <g:ResourcePackage isMaintainable="true" versionDate="2018-01-25+01:00"> <r:Agency>fr.insee</r:Agency> - <r:ID>RessourcePackage-i6vwid</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>RessourcePackage-i6vwi0</r:ID> + <r:Version>1</r:Version> <d:InterviewerInstructionScheme> <r:Agency>fr.insee</r:Agency> - <r:ID>InterviewerInstructionScheme-i6vwid</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>InterviewerInstructionScheme-i6vwi0</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">A définir</r:Content> </r:Label> <d:Instruction> <r:Agency>fr.insee</r:Agency> <r:ID>d1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:InstructionName> <r:String xml:lang="fr-FR">comment</r:String> </d:InstructionName> <d:InstructionText> <d:LiteralText> - <d:Text xml:lang="fr-FR"><xhtml:p>We're going to test your knowledge about the simpsons series.<xhtml:br/><xhtml:b>Welcome in the simspons world!</xhtml:b></xhtml:p></d:Text> + <d:Text xml:lang="fr-FR"><xhtml:p>We're going to test your knowledge about the simpsons series.<xhtml:br/><xhtml:br/><xhtml:b>Welcome in the simspons world!</xhtml:b></xhtml:p></d:Text> </d:LiteralText> </d:InstructionText> </d:Instruction> <d:Instruction> <r:Agency>fr.insee</r:Agency> <r:ID>d11</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:InstructionName> <r:String xml:lang="fr-FR">comment</r:String> </d:InstructionName> <d:InstructionText> <d:LiteralText> <d:Text xml:lang="fr-FR">For your information, the date of the last broadcast was on - øLAST_BROADCASTø</d:Text> + ¤LAST_BROADCAST¤ </d:Text> </d:LiteralText> </d:InstructionText> </d:Instruction> <d:Instruction> <r:Agency>fr.insee</r:Agency> <r:ID>d2</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:InstructionName> <r:String xml:lang="fr-FR">comment</r:String> </d:InstructionName> @@ -56,7 +61,7 @@ <d:Instruction> <r:Agency>fr.insee</r:Agency> <r:ID>d3</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:InstructionName> <r:String xml:lang="fr-FR">instruction</r:String> </d:InstructionName> @@ -69,7 +74,7 @@ <d:Instruction> <r:Agency>fr.insee</r:Agency> <r:ID>d4</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:InstructionName> <r:String xml:lang="fr-FR">instruction</r:String> </d:InstructionName> @@ -82,7 +87,7 @@ <d:Instruction> <r:Agency>fr.insee</r:Agency> <r:ID>d5</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:InstructionName> <r:String xml:lang="fr-FR">instruction</r:String> </d:InstructionName> @@ -95,20 +100,20 @@ <d:Instruction> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-II-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:InstructionName> <r:String xml:lang="fr-FR">warning</r:String> </d:InstructionName> <d:InstructionText> <d:LiteralText> <d:Text xml:lang="fr-FR">The sum of percentages is: ¤jbcggtca-GOP¤ %. The total of - percentages must be equal to 100%.</d:Text> + percentages must be equal to 100%. </d:Text> </d:LiteralText> <d:ConditionalText> <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-GOP</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> </d:ConditionalText> @@ -117,25 +122,25 @@ <d:Instruction> <r:Agency>fr.insee</r:Agency> <r:ID>d10</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:InstructionName> <r:String xml:lang="fr-FR">instruction</r:String> </d:InstructionName> <d:InstructionText> <d:LiteralText> - <d:Text xml:lang="fr-FR">Several answers possible: check off all the relevant boxes </d:Text> + <d:Text xml:lang="fr-FR">Several answers possible: check off all the relevant boxes</d:Text> </d:LiteralText> </d:InstructionText> </d:Instruction> - <d:Instruction><r:Agency>fr.insee</r:Agency><r:ID>FTN-INSTRUCTION-1</r:ID><r:Version>0.1.0</r:Version><d:InstructionName><r:String xml:lang="fr-FR">tooltip</r:String></d:InstructionName><d:InstructionText><d:LiteralText><d:Text xml:lang="fr-FR"><xhtml:p id="ftn1">Included principalities</xhtml:p></d:Text></d:LiteralText></d:InstructionText></d:Instruction></d:InterviewerInstructionScheme> + <d:Instruction><r:Agency>fr.insee</r:Agency><r:ID>FTN-INSTRUCTION-1</r:ID><r:Version>1</r:Version><d:InstructionName><r:String xml:lang="fr-FR">tooltip</r:String></d:InstructionName><d:InstructionText><d:LiteralText><d:Text xml:lang="fr-FR"><xhtml:p id="ftn1">Included principalities</xhtml:p></d:Text></d:LiteralText></d:InstructionText></d:Instruction></d:InterviewerInstructionScheme> <d:ControlConstructScheme> <r:Agency>fr.insee</r:Agency> - <r:ID>ControlConstructScheme-i6vwid</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>ControlConstructScheme-i6vwi0</r:ID> + <r:Version>1</r:Version> <d:Sequence> <r:Agency>fr.insee</r:Agency> - <r:ID>Sequence-i6vwid</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>Sequence-i6vwi0</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Questionnaire SIMPSONS</r:Content> </r:Label> @@ -143,26 +148,26 @@ <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p0ti5h</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Sequence</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> - <r:ID>d1e101</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>d1e119</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>IfThenElse</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6z12s2d</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Sequence</r:TypeOfObject> </d:ControlConstructReference> </d:Sequence> <d:Sequence> <r:Agency>fr.insee</r:Agency> <r:ID>j6p0ti5h</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">MODULE1</r:String> </d:ConstructName> @@ -172,33 +177,33 @@ <d:InterviewerInstructionReference> <r:Agency>fr.insee</r:Agency> <r:ID>d1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Instruction</r:TypeOfObject> </d:InterviewerInstructionReference> <d:TypeOfSequence controlledVocabularyID="INSEE-TOS-CL-1">module</d:TypeOfSequence> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p3dkx6-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p0np9q-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> - <r:ID>d1e42</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>d1e50</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>IfThenElse</r:TypeOfObject> </d:ControlConstructReference> </d:Sequence> <d:Sequence> <r:Agency>fr.insee</r:Agency> <r:ID>j6p0s7o5</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">MODULE11</r:String> </d:ConstructName> @@ -209,32 +214,32 @@ <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j3343qhx-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6q9h8tj-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334cyqb-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6z06z1e-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> </d:Sequence> <d:Sequence> <r:Agency>fr.insee</r:Agency> <r:ID>j3341528</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">MODULE2</r:String> </d:ConstructName> @@ -244,33 +249,33 @@ <d:InterviewerInstructionReference> <r:Agency>fr.insee</r:Agency> <r:ID>d2</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Instruction</r:TypeOfObject> </d:InterviewerInstructionReference> <d:TypeOfSequence controlledVocabularyID="INSEE-TOS-CL-1">module</d:TypeOfSequence> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j3343clt-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qdfhvw-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw5cqz-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> </d:Sequence> <d:Sequence> <r:Agency>fr.insee</r:Agency> <r:ID>j6qe0h9q</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">MODULE3</r:String> </d:ConstructName> @@ -281,38 +286,38 @@ <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>d12-SI</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>StatementItem</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> </d:Sequence> <d:Sequence> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw88h2</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">MODULE4</r:String> </d:ConstructName> @@ -323,26 +328,26 @@ <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qe237q</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Sequence</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qejudb</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Sequence</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qeh91y</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Sequence</r:TypeOfObject> </d:ControlConstructReference> </d:Sequence> <d:Sequence> <r:Agency>fr.insee</r:Agency> <r:ID>j6qe237q</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">MODULE41</r:String> </d:ConstructName> @@ -353,20 +358,20 @@ <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>ComputationItem</r:TypeOfObject> </d:ControlConstructReference> </d:Sequence> <d:Sequence> <r:Agency>fr.insee</r:Agency> <r:ID>j6qejudb</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">MODULE42</r:String> </d:ConstructName> @@ -377,14 +382,14 @@ <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> </d:Sequence> <d:Sequence> <r:Agency>fr.insee</r:Agency> <r:ID>j6qeh91y</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">MODULE43</r:String> </d:ConstructName> @@ -395,14 +400,14 @@ <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> </d:Sequence> <d:Sequence> <r:Agency>fr.insee</r:Agency> <r:ID>j6qfx9qe</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">MODULE5</r:String> </d:ConstructName> @@ -413,14 +418,14 @@ <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> </d:Sequence> <d:Sequence> <r:Agency>fr.insee</r:Agency> <r:ID>j6z12s2d</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">MODULE6</r:String> </d:ConstructName> @@ -431,21 +436,28 @@ <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6z0z3us-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> </d:Sequence> <d:IfThenElse> <r:Agency>fr.insee</r:Agency> - <r:ID>d1e42</r:ID> - <r:Version>0.1.0</r:Version> - <d:TypeOfIfThenElse>hideable</d:TypeOfIfThenElse><d:IfCondition> + <r:ID>d1e50</r:ID> + <r:Version>1</r:Version> + <r:Label> + <r:Content xml:lang="fr-FR">A définir</r:Content> + </r:Label> + <r:Description> + <r:Content xml:lang="fr-FR"/> + </r:Description> + <d:TypeOfIfThenElse controlledVocabularyID="INSEE-TOITE-CL-1">hideable</d:TypeOfIfThenElse> + <d:IfCondition> <r:Command> <r:ProgramLanguage>xpath</r:ProgramLanguage> <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> - <r:ID>d1e42-IP-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>d1e50-IP-1</r:ID> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">READY</r:String> </r:ParameterName> @@ -454,52 +466,58 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p0np9q-QOP-jbgd3set</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> - <r:ID>d1e42-IP-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>d1e50-IP-1</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> - <r:CommandContent>not( d1e42-IP-1 != '1')</r:CommandContent> + <r:CommandContent>not( d1e50-IP-1!= '1') </r:CommandContent> </r:Command> </d:IfCondition> <d:ThenConstructReference> <r:Agency>fr.insee</r:Agency> - <r:ID>d1e42-THEN</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>d1e50-THEN</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Sequence</r:TypeOfObject> </d:ThenConstructReference> </d:IfThenElse> <d:Sequence> <r:Agency>fr.insee</r:Agency> - <r:ID>d1e42-THEN</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>d1e50-THEN</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR"/> </r:Label> - <d:TypeOfSequence controlledVocabularyID="INSEE-TOS-CL-1">hideable</d:TypeOfSequence> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p0s7o5</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Sequence</r:TypeOfObject> </d:ControlConstructReference> </d:Sequence> <d:IfThenElse> <r:Agency>fr.insee</r:Agency> - <r:ID>d1e101</r:ID> - <r:Version>0.1.0</r:Version> - <d:TypeOfIfThenElse>hideable</d:TypeOfIfThenElse><d:IfCondition> + <r:ID>d1e119</r:ID> + <r:Version>1</r:Version> + <r:Label> + <r:Content xml:lang="fr-FR">A définir</r:Content> + </r:Label> + <r:Description> + <r:Content xml:lang="fr-FR"/> + </r:Description> + <d:TypeOfIfThenElse controlledVocabularyID="INSEE-TOITE-CL-1">hideable</d:TypeOfIfThenElse> + <d:IfCondition> <r:Command> <r:ProgramLanguage>xpath</r:ProgramLanguage> <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> - <r:ID>d1e101-IP-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>d1e119-IP-1</r:ID> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">READY</r:String> </r:ParameterName> @@ -508,315 +526,314 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p0np9q-QOP-jbgd3set</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> - <r:ID>d1e101-IP-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>d1e119-IP-1</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> - <r:CommandContent>not( d1e101-IP-1 != '1')</r:CommandContent> + <r:CommandContent>not( d1e119-IP-1!= '1') </r:CommandContent> </r:Command> </d:IfCondition> <d:ThenConstructReference> <r:Agency>fr.insee</r:Agency> - <r:ID>d1e101-THEN</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>d1e119-THEN</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Sequence</r:TypeOfObject> </d:ThenConstructReference> </d:IfThenElse> <d:Sequence> <r:Agency>fr.insee</r:Agency> - <r:ID>d1e101-THEN</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>d1e119-THEN</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR"/> </r:Label> - <d:TypeOfSequence controlledVocabularyID="INSEE-TOS-CL-1">hideable</d:TypeOfSequence> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j3341528</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Sequence</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qe0h9q</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Sequence</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw88h2</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Sequence</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qfx9qe</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Sequence</r:TypeOfObject> </d:ControlConstructReference> </d:Sequence> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j6p3dkx6-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">COMMENT</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p3dkx6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j6p0np9q-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">READY</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p0np9q</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j3343qhx-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">PRODUCER</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j3343qhx</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j6q9h8tj-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">SEASON_NUMBER</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6q9h8tj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j334cyqb-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">DATEFIRST</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334cyqb</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j6z06z1e-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">AUDIENCE_SHARE</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6z06z1e</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j3343clt-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">CITY</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j3343clt</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j6qdfhvw-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">MAYOR</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qdfhvw</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw5cqz-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">STATE</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw5cqz</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">PET</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">ICE_FLAVOUR</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">NUCLEAR_CHARACTER</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">BIRTH_CHARACTER</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">CLOWNING</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">TRAVEL</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j6z0z3us-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">SURVEY_COMMENT</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6z0z3us</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> - <d:ComputationItem><d:TypeOfComputationItem>informational</d:TypeOfComputationItem> + <d:ComputationItem> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">Total of percentages</r:String> </d:ConstructName> @@ -826,16 +843,17 @@ <d:InterviewerInstructionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-II-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Instruction</r:TypeOfObject> </d:InterviewerInstructionReference> + <d:TypeOfComputationItem controlledVocabularyID="INSEE-TOCI-CL-3">stumblingblock</d:TypeOfComputationItem> <r:CommandCode> <r:Command> <r:ProgramLanguage>xpath</r:ProgramLanguage> <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES11</r:String> </r:ParameterName> @@ -843,7 +861,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES21</r:String> </r:ParameterName> @@ -851,7 +869,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-3</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES31</r:String> </r:ParameterName> @@ -859,7 +877,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-4</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES41</r:String> </r:ParameterName> @@ -867,7 +885,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-5</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES51</r:String> </r:ParameterName> @@ -875,7 +893,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES61</r:String> </r:ParameterName> @@ -883,7 +901,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-7</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES71</r:String> </r:ParameterName> @@ -891,7 +909,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-8</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES81</r:String> </r:ParameterName> @@ -899,7 +917,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-9</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES91</r:String> </r:ParameterName> @@ -907,7 +925,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-10</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES101</r:String> </r:ParameterName> @@ -916,13 +934,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgde5yl</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -930,13 +948,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd2x2t</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -944,13 +962,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdjypz</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-3</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -958,13 +976,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdcftu</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-4</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -972,13 +990,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdiyfe</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-5</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -986,13 +1004,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdj1wd</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1000,13 +1018,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgddylk</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-7</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1014,13 +1032,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd3jj6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-8</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1028,13 +1046,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd4w3k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-9</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1042,27 +1060,27 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd4w4k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-10</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> <r:CommandContent>number(if (j4nwc63q-CI-0-IP-1='') then '0' else j4nwc63q-CI-0-IP-1) + number(if (j4nwc63q-CI-0-IP-2='') then '0' else j4nwc63q-CI-0-IP-2) + - number(if (j4nwc63q-CI-0-IP-3='') then '0' else j4nwc63q-CI-0-IP-3) + number(if (j4nwc63q-CI-0-IP-4='') then '0' else j4nwc63q-CI-0-IP-4) + number(if (j4nwc63q-CI-0-IP-5='') then '0' else j4nwc63q-CI-0-IP-5) + - number(if (j4nwc63q-CI-0-IP-6='') then '0' else j4nwc63q-CI-0-IP-6) + number(if (j4nwc63q-CI-0-IP-7='') then '0' else j4nwc63q-CI-0-IP-7) + number(if (j4nwc63q-CI-0-IP-8='') then '0' else j4nwc63q-CI-0-IP-8) + - number(if (j4nwc63q-CI-0-IP-9='') then '0' else j4nwc63q-CI-0-IP-9) + number(if (j4nwc63q-CI-0-IP-10='') then '0' else j4nwc63q-CI-0-IP-10) != 100 </r:CommandContent> + number(if (j4nwc63q-CI-0-IP-3='') then '0' else j4nwc63q-CI-0-IP-3)+ number(if (j4nwc63q-CI-0-IP-4='') then '0' else j4nwc63q-CI-0-IP-4)+ number(if (j4nwc63q-CI-0-IP-5='') then '0' else j4nwc63q-CI-0-IP-5)+ + number(if (j4nwc63q-CI-0-IP-6='') then '0' else j4nwc63q-CI-0-IP-6)+ number(if (j4nwc63q-CI-0-IP-7='') then '0' else j4nwc63q-CI-0-IP-7)+ number(if (j4nwc63q-CI-0-IP-8='') then '0' else j4nwc63q-CI-0-IP-8)+ + number(if (j4nwc63q-CI-0-IP-9='') then '0' else j4nwc63q-CI-0-IP-9)+ number(if (j4nwc63q-CI-0-IP-10='') then '0' else j4nwc63q-CI-0-IP-10)!= 100 </r:CommandContent> </r:Command> </r:CommandCode> - <!--<r:TypeOfComputationItem>error</r:TypeOfComputationItem>--></d:ComputationItem> + </d:ComputationItem> <d:StatementItem> <r:Agency>fr.insee</r:Agency> <r:ID>d12-SI</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:DisplayText> <d:LiteralText> <d:Text xml:lang="fr-FR"><xhtml:p><xhtml:b>Now we are going to know if you think that Jay is a gluton.</xhtml:b></xhtml:p></d:Text> @@ -1072,22 +1090,22 @@ </d:ControlConstructScheme> <d:QuestionScheme> <r:Agency>fr.insee</r:Agency> - <r:ID>QuestionScheme-i6vwid</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>QuestionScheme-i6vwi0</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">A définir</r:Content> </r:Label> <d:QuestionItem> <r:Agency>fr.insee</r:Agency> <r:ID>j6p3dkx6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:QuestionItemName> <r:String xml:lang="fr-FR">COMMENT</r:String> </d:QuestionItemName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p3dkx6-QOP-jbgdhaht</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">COMMENT</r:String> </r:ParameterName> @@ -1096,26 +1114,26 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p3dkx6-RDOP-jbgdhaht</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p3dkx6-QOP-jbgdhaht</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> <d:QuestionText> <d:LiteralText> - <d:Text xml:lang="fr-FR">Before starting, do you have any comments about the Simpsons family?</d:Text> + <d:Text xml:lang="fr-FR"><xhtml:p>Before starting, do you have any comments about the Simpsons<xhtml:br/> family?</xhtml:p></d:Text> </d:LiteralText> </d:QuestionText> <d:TextDomain maxLength="500"> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p3dkx6-RDOP-jbgdhaht</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TextRepresentation maxLength="500"/> </r:OutParameter> </d:TextDomain> @@ -1123,14 +1141,14 @@ <d:QuestionItem> <r:Agency>fr.insee</r:Agency> <r:ID>j6p0np9q</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:QuestionItemName> <r:String xml:lang="fr-FR">READY</r:String> </d:QuestionItemName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p0np9q-QOP-jbgd3set</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">READY</r:String> </r:ParameterName> @@ -1139,13 +1157,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p0np9q-RDOP-jbgd3set</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p0np9q-QOP-jbgd3set</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1158,14 +1176,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p0np9q-RDOP-jbgd3set</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -1175,33 +1193,35 @@ </r:OutParameter> <r:ResponseCardinality maximumResponses="1"/> </d:NominalDomain> - <d:ExternalAid><r:OtherMaterial> - <r:Agency>fr.insee</r:Agency> - <r:ID>j6p6my1d</r:ID> - <r:Version>0.1.0</r:Version> - <r:Description> - <r:Content> - <xhtml:div class="FlowControl" id="j6p6my1d"> - <xhtml:div class="Description">If you are not ready, please go to the end of the - questionnaire</xhtml:div> - <xhtml:div class="Expression">$READY != '1'</xhtml:div> - <xhtml:div class="IfTrue">j6z12s2d</xhtml:div> - </xhtml:div> - </r:Content> - </r:Description> - </r:OtherMaterial></d:ExternalAid> + <d:ExternalAid> + <r:OtherMaterial> + <r:Agency>fr.insee</r:Agency> + <r:ID>j6p6my1d</r:ID> + <r:Version>1</r:Version> + <r:Description> + <r:Content> + <xhtml:div class="FlowControl" id="j6p6my1d"> + <xhtml:div class="Description">If you are not ready, please go to the end of the + questionnaire</xhtml:div> + <xhtml:div class="Expression">$READY != '1'</xhtml:div> + <xhtml:div class="IfTrue">j6z12s2d</xhtml:div> + </xhtml:div> + </r:Content> + </r:Description> + </r:OtherMaterial> + </d:ExternalAid> </d:QuestionItem> <d:QuestionItem> <r:Agency>fr.insee</r:Agency> <r:ID>j3343qhx</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:QuestionItemName> <r:String xml:lang="fr-FR">PRODUCER</r:String> </d:QuestionItemName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j3343qhx-QOP-jbgd90cy</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PRODUCER</r:String> </r:ParameterName> @@ -1210,13 +1230,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j3343qhx-RDOP-jbgd90cy</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j3343qhx-QOP-jbgd90cy</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1229,7 +1249,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j3343qhx-RDOP-jbgd90cy</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TextRepresentation maxLength="30"/> </r:OutParameter> </d:TextDomain> @@ -1237,14 +1257,14 @@ <d:QuestionItem> <r:Agency>fr.insee</r:Agency> <r:ID>j6q9h8tj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:QuestionItemName> <r:String xml:lang="fr-FR">SEASON_NUMBER</r:String> </d:QuestionItemName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6q9h8tj-QOP-jbgdjy8h</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">SEASON_NUMBER</r:String> </r:ParameterName> @@ -1253,13 +1273,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6q9h8tj-RDOP-jbgdjy8h</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6q9h8tj-QOP-jbgdjy8h</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1277,21 +1297,21 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6q9h8tj-RDOP-jbgdjy8h</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> </d:QuestionItem> <d:QuestionItem> <r:Agency>fr.insee</r:Agency> <r:ID>j334cyqb</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:QuestionItemName> <r:String xml:lang="fr-FR">DATEFIRST</r:String> </d:QuestionItemName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j334cyqb-QOP-jbgdih2z</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">DATEFIRST</r:String> </r:ParameterName> @@ -1300,13 +1320,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334cyqb-RDOP-jbgdih2z</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334cyqb-QOP-jbgdih2z</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1317,17 +1337,17 @@ </d:QuestionText> <d:DateTimeDomainReference> <r:Agency>fr.insee</r:Agency> - <r:ID>INSEE-COMMUN-MNR-DateTimedate</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>INSEE-COMMUN-MNR-DateTimedate-YYYY-MM-DD</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>ManagedDateTimeRepresentation</r:TypeOfObject> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j334cyqb-RDOP-jbgdih2z</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:DateTimeRepresentationReference> <r:Agency>fr.insee</r:Agency> - <r:ID>INSEE-COMMUN-MNR-DateTimedate</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>INSEE-COMMUN-MNR-DateTimedate-YYYY-MM-DD</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>ManagedDateTimeRepresentation</r:TypeOfObject> </r:DateTimeRepresentationReference> </r:OutParameter> @@ -1335,21 +1355,21 @@ <d:InterviewerInstructionReference> <r:Agency>fr.insee</r:Agency> <r:ID>d11</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Instruction</r:TypeOfObject> </d:InterviewerInstructionReference> </d:QuestionItem> <d:QuestionItem> <r:Agency>fr.insee</r:Agency> <r:ID>j6z06z1e</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:QuestionItemName> <r:String xml:lang="fr-FR">AUDIENCE_SHARE</r:String> </d:QuestionItemName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6z06z1e-QOP-jbgddnrd</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">AUDIENCE_SHARE</r:String> </r:ParameterName> @@ -1358,20 +1378,20 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6z06z1e-RDOP-jbgddnrd</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6z06z1e-QOP-jbgddnrd</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> <d:QuestionText> <d:LiteralText> <d:Text xml:lang="fr-FR">In your opinion, how much is the part of audience share in US for the 2016 - season? </d:Text> + season?</d:Text> </d:LiteralText> </d:QuestionText> <d:NumericDomain decimalPositions="1"> @@ -1383,21 +1403,21 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6z06z1e-RDOP-jbgddnrd</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> </d:QuestionItem> <d:QuestionItem> <r:Agency>fr.insee</r:Agency> <r:ID>j3343clt</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:QuestionItemName> <r:String xml:lang="fr-FR">CITY</r:String> </d:QuestionItemName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j3343clt-QOP-jbgdjdkn</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">CITY</r:String> </r:ParameterName> @@ -1406,13 +1426,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j3343clt-RDOP-jbgdjdkn</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j3343clt-QOP-jbgdjdkn</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1421,47 +1441,47 @@ <d:Text xml:lang="fr-FR">In which city do the Simpsons reside?</d:Text> </d:LiteralText> </d:QuestionText> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV">radio-button</r:GenericOutputFormat> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334iumu</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j3343clt-RDOP-jbgdjdkn</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334iumu</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> </r:OutParameter> - <r:ResponseCardinality maximumResponses="1"/> + <r:ResponseCardinality minimumResponses="1" maximumResponses="1"/> </d:CodeDomain> <d:InterviewerInstructionReference> <r:Agency>fr.insee</r:Agency> <r:ID>d3</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Instruction</r:TypeOfObject> </d:InterviewerInstructionReference> </d:QuestionItem> <d:QuestionItem> <r:Agency>fr.insee</r:Agency> <r:ID>j6qdfhvw</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:QuestionItemName> <r:String xml:lang="fr-FR">MAYOR</r:String> </d:QuestionItemName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qdfhvw-QOP-jbgd8ghp</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">MAYOR</r:String> </r:ParameterName> @@ -1470,13 +1490,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qdfhvw-RDOP-jbgd8ghp</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qdfhvw-QOP-jbgd8ghp</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1485,23 +1505,23 @@ <d:Text xml:lang="fr-FR">Who is the Simpsons city mayor?</d:Text> </d:LiteralText> </d:QuestionText> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV">checkbox</r:GenericOutputFormat> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qdqoen</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qdfhvw-RDOP-jbgd8ghp</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qdqoen</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -1511,21 +1531,21 @@ <d:InterviewerInstructionReference> <r:Agency>fr.insee</r:Agency> <r:ID>d4</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Instruction</r:TypeOfObject> </d:InterviewerInstructionReference> </d:QuestionItem> <d:QuestionItem> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw5cqz</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:QuestionItemName> <r:String xml:lang="fr-FR">STATE</r:String> </d:QuestionItemName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw5cqz-QOP-jbgdkd7v</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">STATE</r:String> </r:ParameterName> @@ -1534,13 +1554,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw5cqz-RDOP-jbgdkd7v</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw5cqz-QOP-jbgdkd7v</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1549,23 +1569,23 @@ <d:Text xml:lang="fr-FR">In which state do The Simpsons reside?</d:Text> </d:LiteralText> </d:QuestionText> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV">drop-down-list</r:GenericOutputFormat> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwo00f</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw5cqz-RDOP-jbgdkd7v</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwo00f</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -1576,14 +1596,14 @@ <d:QuestionItem> <r:Agency>fr.insee</r:Agency> <r:ID>j6z0z3us</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:QuestionItemName> <r:String xml:lang="fr-FR">SURVEY_COMMENT</r:String> </d:QuestionItemName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6z0z3us-QOP-jbgd6m6e</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">SURVEY_COMMENT</r:String> </r:ParameterName> @@ -1592,13 +1612,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6z0z3us-RDOP-jbgd6m6e</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6z0z3us-QOP-jbgd6m6e</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1611,7 +1631,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6z0z3us-RDOP-jbgd6m6e</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TextRepresentation maxLength="255"/> </r:OutParameter> </d:TextDomain> @@ -1619,14 +1639,14 @@ <d:QuestionGrid> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:QuestionGridName> <r:String xml:lang="fr-FR">PET</r:String> </d:QuestionGridName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-QOP-jbgd8qmn</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PET1</r:String> </r:ParameterName> @@ -1634,7 +1654,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-QOP-jbgd60vl</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PET2</r:String> </r:ParameterName> @@ -1642,7 +1662,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-QOP-jbgda2jo</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PET3</r:String> </r:ParameterName> @@ -1650,7 +1670,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-QOP-jbgdfssy</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PET4</r:String> </r:ParameterName> @@ -1659,13 +1679,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-RDOP-jbgd8qmn</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-QOP-jbgd8qmn</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1673,13 +1693,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-RDOP-jbgd60vl</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-QOP-jbgd60vl</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1687,13 +1707,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-RDOP-jbgda2jo</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-QOP-jbgda2jo</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1701,13 +1721,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-RDOP-jbgdfssy</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-QOP-jbgdfssy</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1717,11 +1737,11 @@ </d:LiteralText> </d:QuestionText> <d:GridDimension displayCode="false" displayLabel="false" rank="1"> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j335cu3c</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </d:CodeDomain> @@ -1732,14 +1752,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-RDOP-jbgd8qmn</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -1760,14 +1780,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-RDOP-jbgd60vl</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -1788,14 +1808,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-RDOP-jbgda2jo</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -1816,14 +1836,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-RDOP-jbgdfssy</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -1843,21 +1863,21 @@ <d:InterviewerInstructionReference> <r:Agency>fr.insee</r:Agency> <r:ID>d5</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Instruction</r:TypeOfObject> </d:InterviewerInstructionReference> </d:QuestionGrid> <d:QuestionGrid> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:QuestionGridName> <r:String xml:lang="fr-FR">ICE_FLAVOUR</r:String> </d:QuestionGridName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-QOP-jbgdb3jx</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">ICE_FLAVOUR1</r:String> </r:ParameterName> @@ -1865,7 +1885,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-QOP-jbgdb61k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">ICE_FLAVOUR2</r:String> </r:ParameterName> @@ -1873,7 +1893,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-QOP-jbgdl3kc</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">ICE_FLAVOUR3</r:String> </r:ParameterName> @@ -1881,7 +1901,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-QOP-jbgdcobo</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">ICE_FLAVOUR4</r:String> </r:ParameterName> @@ -1890,13 +1910,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-RDOP-jbgdb3jx</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-QOP-jbgdb3jx</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1904,13 +1924,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-RDOP-jbgdb61k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-QOP-jbgdb61k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1918,13 +1938,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-RDOP-jbgdl3kc</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-QOP-jbgdl3kc</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1932,13 +1952,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-RDOP-jbgdcobo</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-QOP-jbgdcobo</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1948,34 +1968,34 @@ </d:LiteralText> </d:QuestionText> <d:GridDimension displayCode="false" displayLabel="false" rank="1"> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2mvca</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </d:CodeDomain> </d:GridDimension> <d:StructuredMixedGridResponseDomain> <d:GridResponseDomainInMixed> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV">radio-button</r:GenericOutputFormat> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-RDOP-jbgdb3jx</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -1989,23 +2009,23 @@ </d:GridAttachment> </d:GridResponseDomainInMixed> <d:GridResponseDomainInMixed> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV">radio-button</r:GenericOutputFormat> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-RDOP-jbgdb61k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -2019,23 +2039,23 @@ </d:GridAttachment> </d:GridResponseDomainInMixed> <d:GridResponseDomainInMixed> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV">radio-button</r:GenericOutputFormat> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-RDOP-jbgdl3kc</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -2049,23 +2069,23 @@ </d:GridAttachment> </d:GridResponseDomainInMixed> <d:GridResponseDomainInMixed> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV">radio-button</r:GenericOutputFormat> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-RDOP-jbgdcobo</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -2083,14 +2103,14 @@ <d:QuestionGrid> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:QuestionGridName> <r:String xml:lang="fr-FR">NUCLEAR_CHARACTER</r:String> </d:QuestionGridName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-QOP-jbgd6p0k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">NUCLEAR_CHARACTER1</r:String> </r:ParameterName> @@ -2098,7 +2118,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-QOP-jbgd9ato</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">NUCLEAR_CHARACTER2</r:String> </r:ParameterName> @@ -2106,7 +2126,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-QOP-jbgd3e0p</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">NUCLEAR_CHARACTER3</r:String> </r:ParameterName> @@ -2114,7 +2134,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-QOP-jbgdkxne</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">NUCLEAR_CHARACTER4</r:String> </r:ParameterName> @@ -2123,13 +2143,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-RDOP-jbgd6p0k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-QOP-jbgd6p0k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2137,13 +2157,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-RDOP-jbgd9ato</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-QOP-jbgd9ato</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2151,13 +2171,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-RDOP-jbgd3e0p</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-QOP-jbgd3e0p</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2165,13 +2185,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-RDOP-jbgdkxne</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-QOP-jbgdkxne</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2181,34 +2201,34 @@ </d:LiteralText> </d:QuestionText> <d:GridDimension displayCode="false" displayLabel="false" rank="1"> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qeytgc</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </d:CodeDomain> </d:GridDimension> <d:StructuredMixedGridResponseDomain> <d:GridResponseDomainInMixed> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV">drop-down-list</r:GenericOutputFormat> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-RDOP-jbgd6p0k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -2222,23 +2242,23 @@ </d:GridAttachment> </d:GridResponseDomainInMixed> <d:GridResponseDomainInMixed> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV">drop-down-list</r:GenericOutputFormat> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-RDOP-jbgd9ato</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -2252,23 +2272,23 @@ </d:GridAttachment> </d:GridResponseDomainInMixed> <d:GridResponseDomainInMixed> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV">drop-down-list</r:GenericOutputFormat> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-RDOP-jbgd3e0p</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -2282,23 +2302,23 @@ </d:GridAttachment> </d:GridResponseDomainInMixed> <d:GridResponseDomainInMixed> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV">drop-down-list</r:GenericOutputFormat> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-RDOP-jbgdkxne</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -2316,14 +2336,14 @@ <d:QuestionGrid> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:QuestionGridName> <r:String xml:lang="fr-FR">BIRTH_CHARACTER</r:String> </d:QuestionGridName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QOP-jbgd7fr6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">BIRTH_CHARACTER1</r:String> </r:ParameterName> @@ -2331,7 +2351,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QOP-jbgd5e9f</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">BIRTH_CHARACTER2</r:String> </r:ParameterName> @@ -2339,7 +2359,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QOP-jbgd912x</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">BIRTH_CHARACTER3</r:String> </r:ParameterName> @@ -2347,7 +2367,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QOP-jbgd6bdy</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">BIRTH_CHARACTER4</r:String> </r:ParameterName> @@ -2355,7 +2375,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QOP-jbgddyry</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">BIRTH_CHARACTER5</r:String> </r:ParameterName> @@ -2364,13 +2384,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-RDOP-jbgd7fr6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QOP-jbgd7fr6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2378,13 +2398,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-RDOP-jbgd5e9f</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QOP-jbgd5e9f</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2392,13 +2412,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-RDOP-jbgd912x</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QOP-jbgd912x</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2406,13 +2426,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-RDOP-jbgd6bdy</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QOP-jbgd6bdy</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2420,13 +2440,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-RDOP-jbgddyry</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QOP-jbgddyry</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2436,34 +2456,34 @@ </d:LiteralText> </d:QuestionText> <d:GridDimension displayCode="false" displayLabel="false" rank="1"> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6z087mq</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </d:CodeDomain> </d:GridDimension> <d:StructuredMixedGridResponseDomain> <d:GridResponseDomainInMixed> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV">checkbox</r:GenericOutputFormat> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxricm</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-RDOP-jbgd7fr6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxricm</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -2477,23 +2497,23 @@ </d:GridAttachment> </d:GridResponseDomainInMixed> <d:GridResponseDomainInMixed> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV">checkbox</r:GenericOutputFormat> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxricm</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-RDOP-jbgd5e9f</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxricm</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -2507,23 +2527,23 @@ </d:GridAttachment> </d:GridResponseDomainInMixed> <d:GridResponseDomainInMixed> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV">checkbox</r:GenericOutputFormat> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxricm</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-RDOP-jbgd912x</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxricm</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -2537,23 +2557,23 @@ </d:GridAttachment> </d:GridResponseDomainInMixed> <d:GridResponseDomainInMixed> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV">checkbox</r:GenericOutputFormat> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxricm</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-RDOP-jbgd6bdy</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxricm</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -2567,23 +2587,23 @@ </d:GridAttachment> </d:GridResponseDomainInMixed> <d:GridResponseDomainInMixed> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV">checkbox</r:GenericOutputFormat> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxricm</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-RDOP-jbgddyry</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxricm</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -2601,14 +2621,14 @@ <d:QuestionGrid> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:QuestionGridName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES</r:String> </d:QuestionGridName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgde5yl</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES11</r:String> </r:ParameterName> @@ -2616,7 +2636,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd2x2t</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES21</r:String> </r:ParameterName> @@ -2624,7 +2644,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdjypz</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES31</r:String> </r:ParameterName> @@ -2632,7 +2652,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdcftu</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES41</r:String> </r:ParameterName> @@ -2640,7 +2660,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdiyfe</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES51</r:String> </r:ParameterName> @@ -2648,7 +2668,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdj1wd</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES61</r:String> </r:ParameterName> @@ -2656,7 +2676,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgddylk</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES71</r:String> </r:ParameterName> @@ -2664,7 +2684,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd3jj6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES81</r:String> </r:ParameterName> @@ -2672,7 +2692,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd4w3k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES91</r:String> </r:ParameterName> @@ -2680,7 +2700,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd4w4k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES101</r:String> </r:ParameterName> @@ -2689,13 +2709,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgde5yl</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgde5yl</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2703,13 +2723,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgd2x2t</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd2x2t</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2717,13 +2737,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgdjypz</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdjypz</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2731,13 +2751,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgdcftu</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdcftu</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2745,13 +2765,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgdiyfe</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdiyfe</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2759,13 +2779,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgdj1wd</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdj1wd</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2773,13 +2793,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgddylk</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgddylk</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2787,13 +2807,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgd3jj6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd3jj6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2801,13 +2821,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgd4w3k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd4w3k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2815,38 +2835,38 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgd4w4k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd4w4k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> <d:QuestionText> <d:LiteralText> <d:Text xml:lang="fr-FR">Please, specify the percentage of Jay's expenses in the Kwik-E-Mart for each - product? </d:Text> + product?</d:Text> </d:LiteralText> </d:QuestionText> <d:GridDimension displayCode="false" displayLabel="false" rank="1"> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwh16i</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </d:CodeDomain> </d:GridDimension> <d:GridDimension displayCode="false" displayLabel="false" rank="2"> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-secondDimension-fakeCL-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </d:CodeDomain> @@ -2862,7 +2882,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgde5yl</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -2882,7 +2902,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgd2x2t</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -2902,7 +2922,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgdjypz</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -2922,7 +2942,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgdcftu</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -2942,7 +2962,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgdiyfe</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -2962,7 +2982,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgdj1wd</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -2982,7 +3002,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgddylk</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -3002,7 +3022,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgd3jj6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -3022,7 +3042,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgd4w3k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -3042,7 +3062,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgd4w4k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -3057,14 +3077,14 @@ <d:QuestionGrid> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:QuestionGridName> <r:String xml:lang="fr-FR">CLOWNING</r:String> </d:QuestionGridName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgd8tyr</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">CLOWNING11</r:String> </r:ParameterName> @@ -3072,7 +3092,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdep36</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">CLOWNING21</r:String> </r:ParameterName> @@ -3080,7 +3100,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdjjgi</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">CLOWNING31</r:String> </r:ParameterName> @@ -3088,7 +3108,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdgh6k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">CLOWNING41</r:String> </r:ParameterName> @@ -3096,7 +3116,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdit3o</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">CLOWNING12</r:String> </r:ParameterName> @@ -3104,7 +3124,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgd366k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">CLOWNING22</r:String> </r:ParameterName> @@ -3112,7 +3132,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdax06</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">CLOWNING32</r:String> </r:ParameterName> @@ -3120,7 +3140,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdfo1j</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">CLOWNING42</r:String> </r:ParameterName> @@ -3129,13 +3149,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-RDOP-jbgd8tyr</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgd8tyr</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3143,13 +3163,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-RDOP-jbgdep36</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdep36</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3157,13 +3177,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-RDOP-jbgdjjgi</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdjjgi</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3171,13 +3191,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-RDOP-jbgdgh6k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdgh6k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3185,13 +3205,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-RDOP-jbgdit3o</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdit3o</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3199,13 +3219,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-RDOP-jbgd366k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgd366k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3213,13 +3233,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-RDOP-jbgdax06</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdax06</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3227,60 +3247,60 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-RDOP-jbgdfo1j</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdfo1j</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> <d:QuestionText> <d:LiteralText> - <d:Text xml:lang="fr-FR">Who did these clownings and tell us what you remember? </d:Text> + <d:Text xml:lang="fr-FR">Who did these clownings and tell us what you remember?</d:Text> </d:LiteralText> </d:QuestionText> <d:GridDimension displayCode="false" displayLabel="false" rank="1"> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j77dav9b</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </d:CodeDomain> </d:GridDimension> <d:GridDimension displayCode="false" displayLabel="false" rank="2"> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-secondDimension-fakeCL-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </d:CodeDomain> </d:GridDimension> <d:StructuredMixedGridResponseDomain> <d:GridResponseDomainInMixed> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV">drop-down-list</r:GenericOutputFormat> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdyh6b5</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-RDOP-jbgd8tyr</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdyh6b5</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -3295,23 +3315,23 @@ </d:GridAttachment> </d:GridResponseDomainInMixed> <d:GridResponseDomainInMixed> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV">drop-down-list</r:GenericOutputFormat> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdyh6b5</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-RDOP-jbgdep36</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdyh6b5</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -3326,23 +3346,23 @@ </d:GridAttachment> </d:GridResponseDomainInMixed> <d:GridResponseDomainInMixed> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV">drop-down-list</r:GenericOutputFormat> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdyh6b5</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-RDOP-jbgdjjgi</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdyh6b5</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -3357,23 +3377,23 @@ </d:GridAttachment> </d:GridResponseDomainInMixed> <d:GridResponseDomainInMixed> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV">drop-down-list</r:GenericOutputFormat> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdyh6b5</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-RDOP-jbgdgh6k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdyh6b5</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -3392,7 +3412,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-RDOP-jbgdit3o</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TextRepresentation maxLength="255"/> </r:OutParameter> </d:TextDomain> @@ -3408,7 +3428,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-RDOP-jbgd366k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TextRepresentation maxLength="255"/> </r:OutParameter> </d:TextDomain> @@ -3424,7 +3444,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-RDOP-jbgdax06</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TextRepresentation maxLength="255"/> </r:OutParameter> </d:TextDomain> @@ -3440,7 +3460,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-RDOP-jbgdfo1j</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TextRepresentation maxLength="255"/> </r:OutParameter> </d:TextDomain> @@ -3456,14 +3476,14 @@ <d:QuestionGrid> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:QuestionGridName> <r:String xml:lang="fr-FR">TRAVEL</r:String> </d:QuestionGridName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd92mb</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL11</r:String> </r:ParameterName> @@ -3471,7 +3491,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdgsat</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL21</r:String> </r:ParameterName> @@ -3479,7 +3499,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdaxk2</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL31</r:String> </r:ParameterName> @@ -3487,7 +3507,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd7myn</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL41</r:String> </r:ParameterName> @@ -3495,7 +3515,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdnxkt</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL12</r:String> </r:ParameterName> @@ -3503,7 +3523,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd3ef5</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL22</r:String> </r:ParameterName> @@ -3511,7 +3531,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd8p1v</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL32</r:String> </r:ParameterName> @@ -3519,7 +3539,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdgm0c</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL42</r:String> </r:ParameterName> @@ -3527,7 +3547,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdcppc</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL13</r:String> </r:ParameterName> @@ -3535,7 +3555,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd4cm6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL23</r:String> </r:ParameterName> @@ -3543,7 +3563,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdd2lo</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL33</r:String> </r:ParameterName> @@ -3551,7 +3571,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdo0ay</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL43</r:String> </r:ParameterName> @@ -3559,7 +3579,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd4r2a</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL14</r:String> </r:ParameterName> @@ -3567,7 +3587,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdkfpq</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL24</r:String> </r:ParameterName> @@ -3575,7 +3595,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd7u52</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL34</r:String> </r:ParameterName> @@ -3583,7 +3603,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdgfwl</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL44</r:String> </r:ParameterName> @@ -3591,7 +3611,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd9cff</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL15</r:String> </r:ParameterName> @@ -3599,7 +3619,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgddwsp</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL25</r:String> </r:ParameterName> @@ -3607,7 +3627,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdncn8</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL35</r:String> </r:ParameterName> @@ -3615,7 +3635,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdnz6b</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL45</r:String> </r:ParameterName> @@ -3623,7 +3643,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdiva0</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL16</r:String> </r:ParameterName> @@ -3631,7 +3651,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd7dqf</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL26</r:String> </r:ParameterName> @@ -3639,7 +3659,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdnous</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL36</r:String> </r:ParameterName> @@ -3647,7 +3667,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdkfcz</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL46</r:String> </r:ParameterName> @@ -3656,13 +3676,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd92mb</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd92mb</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3670,13 +3690,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdgsat</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdgsat</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3684,13 +3704,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdaxk2</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdaxk2</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3698,13 +3718,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd7myn</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd7myn</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3712,13 +3732,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdnxkt</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdnxkt</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3726,13 +3746,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd3ef5</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd3ef5</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3740,13 +3760,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd8p1v</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd8p1v</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3754,13 +3774,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdgm0c</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdgm0c</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3768,13 +3788,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdcppc</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdcppc</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3782,13 +3802,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd4cm6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd4cm6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3796,13 +3816,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdd2lo</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdd2lo</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3810,13 +3830,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdo0ay</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdo0ay</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3824,13 +3844,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd4r2a</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd4r2a</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3838,13 +3858,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdkfpq</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdkfpq</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3852,13 +3872,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd7u52</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd7u52</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3866,13 +3886,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdgfwl</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdgfwl</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3880,13 +3900,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd9cff</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd9cff</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3894,13 +3914,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgddwsp</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgddwsp</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3908,13 +3928,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdncn8</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdncn8</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3922,13 +3942,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdnz6b</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdnz6b</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3936,13 +3956,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdiva0</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdiva0</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3950,13 +3970,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd7dqf</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd7dqf</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3964,13 +3984,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdnous</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdnous</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3978,38 +3998,38 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdkfcz</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdkfcz</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> <d:QuestionText> <d:LiteralText> <d:Text xml:lang="fr-FR">Which of the following means of transport were used by the hero and in which - country? </d:Text> + country?</d:Text> </d:LiteralText> </d:QuestionText> <d:GridDimension displayCode="false" displayLabel="false" rank="1"> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2kivg</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </d:CodeDomain> </d:GridDimension> <d:GridDimension displayCode="false" displayLabel="false" rank="2"> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdye1wa</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </d:CodeDomain> @@ -4020,14 +4040,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd92mb</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4049,14 +4069,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdgsat</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4078,14 +4098,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdaxk2</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4107,14 +4127,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd7myn</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4136,14 +4156,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdnxkt</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4165,14 +4185,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd3ef5</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4194,14 +4214,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd8p1v</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4223,14 +4243,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdgm0c</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4252,14 +4272,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdcppc</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4281,14 +4301,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd4cm6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4310,14 +4330,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdd2lo</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4339,14 +4359,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdo0ay</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4368,14 +4388,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd4r2a</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4397,14 +4417,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdkfpq</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4426,14 +4446,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd7u52</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4455,14 +4475,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdgfwl</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4484,14 +4504,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd9cff</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4513,14 +4533,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgddwsp</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4542,14 +4562,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdncn8</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4571,14 +4591,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdnz6b</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4600,14 +4620,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdiva0</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4629,14 +4649,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd7dqf</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4658,14 +4678,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdnous</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4687,14 +4707,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdkfcz</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4715,21 +4735,21 @@ <d:InterviewerInstructionReference> <r:Agency>fr.insee</r:Agency> <r:ID>d10</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Instruction</r:TypeOfObject> </d:InterviewerInstructionReference> </d:QuestionGrid> <d:QuestionGrid> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:QuestionGridName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS</r:String> </d:QuestionGridName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdl5jb</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS11</r:String> </r:ParameterName> @@ -4737,7 +4757,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd8lwo</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS21</r:String> </r:ParameterName> @@ -4745,7 +4765,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdbfag</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS31</r:String> </r:ParameterName> @@ -4753,7 +4773,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdlgja</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS41</r:String> </r:ParameterName> @@ -4761,7 +4781,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd745y</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS51</r:String> </r:ParameterName> @@ -4769,7 +4789,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdjkts</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS61</r:String> </r:ParameterName> @@ -4777,7 +4797,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdcax7</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS71</r:String> </r:ParameterName> @@ -4785,7 +4805,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdjye1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS81</r:String> </r:ParameterName> @@ -4793,7 +4813,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd5jet</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS91</r:String> </r:ParameterName> @@ -4801,7 +4821,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdjw90</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS101</r:String> </r:ParameterName> @@ -4809,7 +4829,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdfndq</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS12</r:String> </r:ParameterName> @@ -4817,7 +4837,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd7osi</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS22</r:String> </r:ParameterName> @@ -4825,7 +4845,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd7bnw</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS32</r:String> </r:ParameterName> @@ -4833,7 +4853,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd9k71</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS42</r:String> </r:ParameterName> @@ -4841,7 +4861,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdimks</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS52</r:String> </r:ParameterName> @@ -4849,7 +4869,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdjquz</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS62</r:String> </r:ParameterName> @@ -4857,7 +4877,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdd2w3</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS72</r:String> </r:ParameterName> @@ -4865,7 +4885,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdkosc</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS82</r:String> </r:ParameterName> @@ -4873,7 +4893,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdk0x4</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS92</r:String> </r:ParameterName> @@ -4881,7 +4901,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd2wgf</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS102</r:String> </r:ParameterName> @@ -4890,13 +4910,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdl5jb</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdl5jb</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -4904,13 +4924,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgd8lwo</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd8lwo</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -4918,13 +4938,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdbfag</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdbfag</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -4932,13 +4952,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdlgja</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdlgja</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -4946,13 +4966,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgd745y</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd745y</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -4960,13 +4980,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdjkts</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdjkts</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -4974,13 +4994,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdcax7</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdcax7</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -4988,13 +5008,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdjye1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdjye1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -5002,13 +5022,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgd5jet</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd5jet</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -5016,13 +5036,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdjw90</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdjw90</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -5030,13 +5050,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdfndq</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdfndq</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -5044,13 +5064,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgd7osi</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd7osi</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -5058,13 +5078,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgd7bnw</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd7bnw</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -5072,13 +5092,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgd9k71</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd9k71</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -5086,13 +5106,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdimks</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdimks</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -5100,13 +5120,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdjquz</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdjquz</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -5114,13 +5134,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdd2w3</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdd2w3</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -5128,13 +5148,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdkosc</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdkosc</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -5142,13 +5162,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdk0x4</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdk0x4</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -5156,13 +5176,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgd2wgf</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd2wgf</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -5175,11 +5195,11 @@ <d:Roster baseCodeValue="1" codeIterationValue="1" minimumRequired="1" maximumAllowed="10"/> </d:GridDimension> <d:GridDimension displayCode="false" displayLabel="false" rank="2"> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-secondDimension-fakeCL-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </d:CodeDomain> @@ -5190,7 +5210,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdl5jb</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TextRepresentation maxLength="255"/> </r:OutParameter> </d:TextDomain> @@ -5206,7 +5226,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgd8lwo</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TextRepresentation maxLength="255"/> </r:OutParameter> </d:TextDomain> @@ -5222,7 +5242,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdbfag</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TextRepresentation maxLength="255"/> </r:OutParameter> </d:TextDomain> @@ -5238,7 +5258,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdlgja</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TextRepresentation maxLength="255"/> </r:OutParameter> </d:TextDomain> @@ -5254,7 +5274,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgd745y</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TextRepresentation maxLength="255"/> </r:OutParameter> </d:TextDomain> @@ -5270,7 +5290,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdjkts</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TextRepresentation maxLength="255"/> </r:OutParameter> </d:TextDomain> @@ -5286,7 +5306,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdcax7</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TextRepresentation maxLength="255"/> </r:OutParameter> </d:TextDomain> @@ -5302,7 +5322,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdjye1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TextRepresentation maxLength="255"/> </r:OutParameter> </d:TextDomain> @@ -5318,7 +5338,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgd5jet</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TextRepresentation maxLength="255"/> </r:OutParameter> </d:TextDomain> @@ -5334,7 +5354,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdjw90</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TextRepresentation maxLength="255"/> </r:OutParameter> </d:TextDomain> @@ -5355,7 +5375,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdfndq</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -5375,7 +5395,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgd7osi</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -5395,7 +5415,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgd7bnw</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -5415,7 +5435,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgd9k71</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -5435,7 +5455,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdimks</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -5455,7 +5475,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdjquz</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -5475,7 +5495,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdd2w3</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -5495,7 +5515,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdkosc</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -5515,7 +5535,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdk0x4</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -5535,7 +5555,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgd2wgf</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -5551,30 +5571,30 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-j334iumu</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">TOWN</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j334iumu--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j334iumu-1</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Springfield</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j334iumu-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j334iumu-2</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Shelbyville</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j334iumu-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j334iumu-3</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Seinfeld</r:Content> </r:Label> @@ -5583,38 +5603,38 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-j6qdqoen</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> - <r:Content xml:lang="fr-FR">MAYOR</r:Content> + <r:Content xml:lang="fr-FR">MAYOR </r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6qdqoen--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6qdqoen-1</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Constance Harm</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6qdqoen-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6qdqoen-2</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Timothy Lovejoy</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6qdqoen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6qdqoen-3</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Joe Quimby</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6qdqoen-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6qdqoen-4</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Poochie</r:Content> </r:Label> @@ -5623,110 +5643,110 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-j4nwo00f</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">State</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwo00f--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwo00f-1</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Washington</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwo00f-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwo00f-2</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Kentucky</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwo00f-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwo00f-3</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Ohio</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwo00f-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwo00f-4</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Maine</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwo00f-3</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwo00f-5</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">North Dakota</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwo00f-4</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwo00f-6</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Florida</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwo00f-5</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwo00f-7</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">North Takoma</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwo00f-6</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwo00f-8</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">California</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwo00f-7</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwo00f-9</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Texas</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwo00f-8</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwo00f-10</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Massachusetts</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwo00f-9</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwo00f-11</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Nevada</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwo00f-10</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwo00f-12</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Illinois</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwo00f-11</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwo00f-13</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Not in any state, you fool!</r:Content> </r:Label> @@ -5735,38 +5755,38 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-j335cu3c</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">ANIMALS</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j335cu3c--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j335cu3c-1</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Santa's Little Helper</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j335cu3c-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j335cu3c-2</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Snowball I</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j335cu3c-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j335cu3c-3</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Coltrane</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j335cu3c-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j335cu3c-4</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Mojo the Helper Monkey</r:Content> </r:Label> @@ -5775,38 +5795,38 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-j6p2mvca</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Flavours</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6p2mvca--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6p2mvca-1</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Vanilla</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6p2mvca-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6p2mvca-2</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Strawberry</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6p2mvca-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6p2mvca-3</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Apple</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6p2mvca-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6p2mvca-4</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Bacon</r:Content> </r:Label> @@ -5815,22 +5835,22 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-jbdxh138</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">YESNO</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdxh138--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdxh138-1</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Yes</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdxh138-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdxh138-2</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">No</r:Content> </r:Label> @@ -5839,38 +5859,38 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-j6qeytgc</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">NUCLEAR_CHARACTERS</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6qeytgc--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6qeytgc-1</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Charles Montgomery Burns</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6qeytgc-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6qeytgc-2</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Carl Carlson</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6qeytgc-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6qeytgc-3</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Otto Mann</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6qeytgc-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6qeytgc-4</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Carl Carlson</r:Content> </r:Label> @@ -5879,46 +5899,46 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-j6z087mq</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">BIRTH_CHARACTER</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6z087mq--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6z087mq-1</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Selma Bouvier</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6z087mq-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6z087mq-2</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Kent Brockman</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6z087mq-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6z087mq-3</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Milhouse Van Houten</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6z087mq-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6z087mq-4</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Nelson Muntz</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6z087mq-3</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6z087mq-5</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Crazy Cat Lady</r:Content> </r:Label> @@ -5927,46 +5947,46 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-jbdxricm</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">CITY_BIRTH</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdxricm--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdxricm-1</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Albuquerque</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdxricm-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdxricm-2</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Springfield</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdxricm-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdxricm-3</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Portland</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdxricm-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdxricm-4</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Shelbyville</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdxricm-3</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdxricm-5</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Dagstuhl</r:Content> </r:Label> @@ -5975,86 +5995,86 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-j4nwh16i</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Products</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwh16i--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwh16i-1</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Frozen products</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwh16i-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwh16i-2</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Ice creams</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwh16i-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwh16i-3</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Jasper Beardly</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwh16i-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwh16i-4</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Meat</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwh16i-3</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwh16i-5</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Bacon</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwh16i-4</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwh16i-6</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Pork chop</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwh16i-5</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwh16i-7</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Chicken</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwh16i-6</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwh16i-8</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Compote</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwh16i-7</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwh16i-9</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Powersauce</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwh16i-8</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwh16i-10</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Other</r:Content> </r:Label> @@ -6063,38 +6083,38 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-j77dav9b</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Clownings</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j77dav9b--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j77dav9b-1</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR"><xhtml:p><xhtml:b><xhtml:i>Break the windows of the whole city</xhtml:i></xhtml:b></xhtml:p></r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j77dav9b-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j77dav9b-2</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR"><xhtml:p><xhtml:b><xhtml:i>Loose the violin of his daughter playing poker</xhtml:i></xhtml:b></xhtml:p></r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j77dav9b-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j77dav9b-3</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR"><xhtml:p><xhtml:b><xhtml:i>Kill Mr Burns</xhtml:i></xhtml:b></xhtml:p></r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j77dav9b-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j77dav9b-4</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR"><xhtml:p><xhtml:b><xhtml:i>Leaving a mechanical object to control the nuclear power plant</xhtml:i></xhtml:b></xhtml:p></r:Content> </r:Label> @@ -6103,38 +6123,38 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-jbdyh6b5</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Clowning_Characters</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdyh6b5--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdyh6b5-1</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Jay</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdyh6b5-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdyh6b5-2</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Bart</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdyh6b5-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdyh6b5-3</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Krusty the clown</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdyh6b5-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdyh6b5-4</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Maggie</r:Content> </r:Label> @@ -6143,38 +6163,38 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-j6p2kivg</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Means of transport</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6p2kivg--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6p2kivg-1</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Car</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6p2kivg-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6p2kivg-2</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Bike</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6p2kivg-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6p2kivg-3</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Skateboard</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6p2kivg-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6p2kivg-4</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Plane</r:Content> </r:Label> @@ -6183,54 +6203,54 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-jbdye1wa</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Country</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdye1wa--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdye1wa-1</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Brazil</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdye1wa-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdye1wa-2</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Canada</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdye1wa-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdye1wa-3</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Japan</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdye1wa-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdye1wa-4</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">France</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdye1wa-3</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdye1wa-5</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR"><xhtml:p>Other country<xhtml:a href="#ftn1"/></xhtml:p></r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdye1wa-4</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdye1wa-6</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Other planet</r:Content> </r:Label> @@ -6239,14 +6259,14 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-j4nwc63q-secondDimension-fakeCL-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">FAKE-CODELIST-j4nwc63q-secondDimension-fakeCL-1</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwc63q-secondDimension-fakeCL-1--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwc63q-secondDimension-fakeCL-1-1</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Percentage</r:Content> </r:Label> @@ -6255,22 +6275,22 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-j4nw0rr6-secondDimension-fakeCL-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">FAKE-CODELIST-j4nw0rr6-secondDimension-fakeCL-1</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nw0rr6-secondDimension-fakeCL-1--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nw0rr6-secondDimension-fakeCL-1-1</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Clowning</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nw0rr6-secondDimension-fakeCL-1-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nw0rr6-secondDimension-fakeCL-1-2</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Remember?</r:Content> </r:Label> @@ -6279,22 +6299,22 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-j6qg8rc6-secondDimension-fakeCL-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">FAKE-CODELIST-j6qg8rc6-secondDimension-fakeCL-1</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6qg8rc6-secondDimension-fakeCL-1--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6qg8rc6-secondDimension-fakeCL-1-1</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Name</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6qg8rc6-secondDimension-fakeCL-1-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6qg8rc6-secondDimension-fakeCL-1-2</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Age</r:Content> </r:Label> @@ -6302,15 +6322,15 @@ </l:CategoryScheme> <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> - <r:ID>CategoryScheme-i6vwid</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CategoryScheme-i6vwi0</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">A définir</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CA-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR"/> </r:Label> @@ -6319,14 +6339,14 @@ <l:CodeListScheme> <r:Agency>fr.insee</r:Agency> <r:ID>SIMPSONS-CLS</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:CodeListSchemeName> <r:String xml:lang="en-IE">SIMPSONS</r:String> </l:CodeListSchemeName> <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>j334iumu</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">TOWN</r:Content> </r:Label> @@ -6336,36 +6356,36 @@ </l:Level> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j334iumu--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j334iumu-1</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j334iumu--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j334iumu-1</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>00001</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j334iumu-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j334iumu-2</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j334iumu-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j334iumu-2</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>00002</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j334iumu-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j334iumu-3</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j334iumu-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j334iumu-3</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>00003</r:Value> @@ -6374,9 +6394,9 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>j6qdqoen</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> - <r:Content xml:lang="fr-FR">MAYOR</r:Content> + <r:Content xml:lang="fr-FR">MAYOR </r:Content> </r:Label> <l:HierarchyType>Regular</l:HierarchyType> <l:Level levelNumber="1"> @@ -6384,48 +6404,48 @@ </l:Level> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j6qdqoen--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j6qdqoen-1</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6qdqoen--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6qdqoen-1</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>1</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j6qdqoen-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j6qdqoen-2</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6qdqoen-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6qdqoen-2</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>2</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j6qdqoen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j6qdqoen-3</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6qdqoen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6qdqoen-3</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>3</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j6qdqoen-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j6qdqoen-4</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6qdqoen-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6qdqoen-4</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>4</r:Value> @@ -6434,7 +6454,7 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwo00f</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">State</r:Content> </r:Label> @@ -6444,156 +6464,156 @@ </l:Level> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwo00f--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j4nwo00f-1</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwo00f--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwo00f-1</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>1</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwo00f-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j4nwo00f-2</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwo00f-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwo00f-2</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>2</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwo00f-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j4nwo00f-3</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwo00f-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwo00f-3</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>3</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwo00f-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j4nwo00f-4</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwo00f-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwo00f-4</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>4</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwo00f-3</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j4nwo00f-5</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwo00f-3</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwo00f-5</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>5</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwo00f-4</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j4nwo00f-6</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwo00f-4</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwo00f-6</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>6</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwo00f-5</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j4nwo00f-7</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwo00f-5</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwo00f-7</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>7</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwo00f-6</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j4nwo00f-8</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwo00f-6</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwo00f-8</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>8</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwo00f-7</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j4nwo00f-9</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwo00f-7</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwo00f-9</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>9</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwo00f-8</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j4nwo00f-10</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwo00f-8</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwo00f-10</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>10</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwo00f-9</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j4nwo00f-11</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwo00f-9</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwo00f-11</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>11</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwo00f-10</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j4nwo00f-12</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwo00f-10</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwo00f-12</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>12</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwo00f-11</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j4nwo00f-13</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwo00f-11</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwo00f-13</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>13</r:Value> @@ -6602,7 +6622,7 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>j335cu3c</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">ANIMALS</r:Content> </r:Label> @@ -6612,48 +6632,48 @@ </l:Level> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j335cu3c--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j335cu3c-1</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j335cu3c--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j335cu3c-1</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>1</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j335cu3c-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j335cu3c-2</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j335cu3c-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j335cu3c-2</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>2</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j335cu3c-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j335cu3c-3</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j335cu3c-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j335cu3c-3</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>3</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j335cu3c-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j335cu3c-4</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j335cu3c-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j335cu3c-4</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>4</r:Value> @@ -6662,7 +6682,7 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2mvca</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Flavours</r:Content> </r:Label> @@ -6672,48 +6692,48 @@ </l:Level> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j6p2mvca--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j6p2mvca-1</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6p2mvca--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6p2mvca-1</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>1</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j6p2mvca-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j6p2mvca-2</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6p2mvca-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6p2mvca-2</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>2</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j6p2mvca-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j6p2mvca-3</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6p2mvca-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6p2mvca-3</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>3</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j6p2mvca-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j6p2mvca-4</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6p2mvca-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6p2mvca-4</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>4</r:Value> @@ -6722,7 +6742,7 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">YESNO</r:Content> </r:Label> @@ -6732,24 +6752,24 @@ </l:Level> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>jbdxh138--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>jbdxh138-1</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdxh138--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdxh138-1</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>1</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>jbdxh138-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>jbdxh138-2</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdxh138-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdxh138-2</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>0</r:Value> @@ -6758,7 +6778,7 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>j6qeytgc</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">NUCLEAR_CHARACTERS</r:Content> </r:Label> @@ -6768,48 +6788,48 @@ </l:Level> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j6qeytgc--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j6qeytgc-1</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6qeytgc--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6qeytgc-1</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>1</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j6qeytgc-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j6qeytgc-2</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6qeytgc-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6qeytgc-2</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>2</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j6qeytgc-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j6qeytgc-3</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6qeytgc-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6qeytgc-3</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>3</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j6qeytgc-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j6qeytgc-4</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6qeytgc-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6qeytgc-4</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>4</r:Value> @@ -6818,7 +6838,7 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>j6z087mq</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">BIRTH_CHARACTER</r:Content> </r:Label> @@ -6828,60 +6848,60 @@ </l:Level> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j6z087mq--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j6z087mq-1</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6z087mq--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6z087mq-1</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>1</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j6z087mq-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j6z087mq-2</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6z087mq-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6z087mq-2</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>2</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j6z087mq-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j6z087mq-3</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6z087mq-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6z087mq-3</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>3</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j6z087mq-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j6z087mq-4</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6z087mq-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6z087mq-4</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>4</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j6z087mq-3</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j6z087mq-5</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6z087mq-3</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6z087mq-5</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>5</r:Value> @@ -6890,7 +6910,7 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxricm</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">CITY_BIRTH</r:Content> </r:Label> @@ -6900,60 +6920,60 @@ </l:Level> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>jbdxricm--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>jbdxricm-1</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdxricm--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdxricm-1</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>1</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>jbdxricm-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>jbdxricm-2</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdxricm-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdxricm-2</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>2</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>jbdxricm-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>jbdxricm-3</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdxricm-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdxricm-3</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>3</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>jbdxricm-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>jbdxricm-4</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdxricm-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdxricm-4</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>4</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>jbdxricm-3</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>jbdxricm-5</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdxricm-3</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdxricm-5</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>5</r:Value> @@ -6962,7 +6982,7 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwh16i</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Products</r:Content> </r:Label> @@ -6972,35 +6992,35 @@ </l:Level> <l:Code levelNumber="1" isDiscrete="false"> <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwh16i--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j4nwh16i-1</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwh16i--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwh16i-1</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>A</r:Value> <l:Code levelNumber="2" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwh16i-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j4nwh16i-2</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwh16i-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwh16i-2</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>A1</r:Value> </l:Code> <l:Code levelNumber="2" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwh16i-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j4nwh16i-3</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwh16i-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwh16i-3</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>A2</r:Value> @@ -7008,47 +7028,47 @@ </l:Code> <l:Code levelNumber="1" isDiscrete="false"> <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwh16i-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j4nwh16i-4</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwh16i-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwh16i-4</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>B</r:Value> <l:Code levelNumber="2" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwh16i-3</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j4nwh16i-5</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwh16i-3</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwh16i-5</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>B1</r:Value> </l:Code> <l:Code levelNumber="2" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwh16i-4</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j4nwh16i-6</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwh16i-4</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwh16i-6</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>B2</r:Value> </l:Code> <l:Code levelNumber="2" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwh16i-5</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j4nwh16i-7</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwh16i-5</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwh16i-7</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>B3</r:Value> @@ -7056,23 +7076,23 @@ </l:Code> <l:Code levelNumber="1" isDiscrete="false"> <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwh16i-6</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j4nwh16i-8</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwh16i-6</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwh16i-8</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>C</r:Value> <l:Code levelNumber="2" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwh16i-7</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j4nwh16i-9</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwh16i-7</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwh16i-9</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>C1</r:Value> @@ -7080,12 +7100,12 @@ </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwh16i-8</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j4nwh16i-10</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwh16i-8</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwh16i-10</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>D</r:Value> @@ -7094,7 +7114,7 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>j77dav9b</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Clownings</r:Content> </r:Label> @@ -7104,48 +7124,48 @@ </l:Level> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j77dav9b--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j77dav9b-1</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j77dav9b--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j77dav9b-1</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>1</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j77dav9b-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j77dav9b-2</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j77dav9b-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j77dav9b-2</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>2</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j77dav9b-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j77dav9b-3</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j77dav9b-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j77dav9b-3</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>3</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j77dav9b-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j77dav9b-4</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j77dav9b-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j77dav9b-4</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>4</r:Value> @@ -7154,7 +7174,7 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>jbdyh6b5</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Clowning_Characters</r:Content> </r:Label> @@ -7164,48 +7184,48 @@ </l:Level> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>jbdyh6b5--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>jbdyh6b5-1</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdyh6b5--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdyh6b5-1</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>1</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>jbdyh6b5-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>jbdyh6b5-2</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdyh6b5-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdyh6b5-2</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>2</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>jbdyh6b5-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>jbdyh6b5-3</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdyh6b5-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdyh6b5-3</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>3</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>jbdyh6b5-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>jbdyh6b5-4</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdyh6b5-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdyh6b5-4</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>4</r:Value> @@ -7214,7 +7234,7 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2kivg</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Means of transport</r:Content> </r:Label> @@ -7224,48 +7244,48 @@ </l:Level> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j6p2kivg--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j6p2kivg-1</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6p2kivg--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6p2kivg-1</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>1</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j6p2kivg-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j6p2kivg-2</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6p2kivg-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6p2kivg-2</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>2</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j6p2kivg-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j6p2kivg-3</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6p2kivg-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6p2kivg-3</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>3</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j6p2kivg-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j6p2kivg-4</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6p2kivg-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6p2kivg-4</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>4</r:Value> @@ -7274,7 +7294,7 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>jbdye1wa</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Country</r:Content> </r:Label> @@ -7284,72 +7304,72 @@ </l:Level> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>jbdye1wa--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>jbdye1wa-1</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdye1wa--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdye1wa-1</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>1</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>jbdye1wa-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>jbdye1wa-2</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdye1wa-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdye1wa-2</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>2</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>jbdye1wa-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>jbdye1wa-3</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdye1wa-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdye1wa-3</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>3</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>jbdye1wa-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>jbdye1wa-4</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdye1wa-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdye1wa-4</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>4</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>jbdye1wa-3</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>jbdye1wa-5</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdye1wa-3</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdye1wa-5</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>5</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>jbdye1wa-4</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>jbdye1wa-6</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdye1wa-4</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdye1wa-6</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>6</r:Value> @@ -7358,7 +7378,7 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-secondDimension-fakeCL-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">FAKE-CODELIST-j4nwc63q-secondDimension-fakeCL-1</r:Content> </r:Label> @@ -7368,12 +7388,12 @@ </l:Level> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwc63q-secondDimension-fakeCL-1--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j4nwc63q-secondDimension-fakeCL-1-1</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwc63q-secondDimension-fakeCL-1--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwc63q-secondDimension-fakeCL-1-1</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>1</r:Value> @@ -7382,7 +7402,7 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-secondDimension-fakeCL-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">FAKE-CODELIST-j4nw0rr6-secondDimension-fakeCL-1</r:Content> </r:Label> @@ -7392,24 +7412,24 @@ </l:Level> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j4nw0rr6-secondDimension-fakeCL-1--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j4nw0rr6-secondDimension-fakeCL-1-1</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nw0rr6-secondDimension-fakeCL-1--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nw0rr6-secondDimension-fakeCL-1-1</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>1</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j4nw0rr6-secondDimension-fakeCL-1-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j4nw0rr6-secondDimension-fakeCL-1-2</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nw0rr6-secondDimension-fakeCL-1-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nw0rr6-secondDimension-fakeCL-1-2</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>2</r:Value> @@ -7418,7 +7438,7 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-secondDimension-fakeCL-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">FAKE-CODELIST-j6qg8rc6-secondDimension-fakeCL-1</r:Content> </r:Label> @@ -7428,24 +7448,24 @@ </l:Level> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j6qg8rc6-secondDimension-fakeCL-1--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j6qg8rc6-secondDimension-fakeCL-1-1</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6qg8rc6-secondDimension-fakeCL-1--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6qg8rc6-secondDimension-fakeCL-1-1</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>1</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j6qg8rc6-secondDimension-fakeCL-1-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j6qg8rc6-secondDimension-fakeCL-1-2</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6qg8rc6-secondDimension-fakeCL-1-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6qg8rc6-secondDimension-fakeCL-1-2</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>2</r:Value> @@ -7454,7 +7474,7 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:CodeListName> <r:String xml:lang="fr-FR">Booleen</r:String> </l:CodeListName> @@ -7465,11 +7485,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CA-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>1</r:Value> @@ -7478,231 +7498,348 @@ </l:CodeListScheme> <l:VariableScheme> <r:Agency>fr.insee</r:Agency> - <r:ID>VariableScheme-i6vwid</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>VariableScheme-i6vwi0</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Variable Scheme for the survey</r:Content> </r:Label> + <l:Variable> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbcggtca</r:ID> + <r:Version>1</r:Version> + <l:VariableName> + <r:String xml:lang="fr-FR">SUM_EXPENSES</r:String> + </l:VariableName> + <r:Label> + <r:Content xml:lang="fr-FR">SUM_EXPENSES label </r:Content> + </r:Label> + <r:OutParameter> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbcggtca-VROP</r:ID> + <r:Version>1</r:Version> + </r:OutParameter> + <l:VariableRepresentation> + <r:ProcessingInstructionReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbcggtca-GI</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>GenerationInstruction</r:TypeOfObject> + <r:Binding> + <r:SourceParameterReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbcggtca-GOP</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>OutParameter</r:TypeOfObject> + </r:SourceParameterReference> + <r:TargetParameterReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbcggtca-VROP</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>OutParameter</r:TypeOfObject> + </r:TargetParameterReference> + </r:Binding> + </r:ProcessingInstructionReference> + <r:NumericRepresentation/> + </l:VariableRepresentation> + </l:Variable> + <l:Variable> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbcggtex</r:ID> + <r:Version>1</r:Version> + <l:VariableName> + <r:String xml:lang="fr-FR">LAST_BROADCAST</r:String> + </l:VariableName> + <r:Label> + <r:Content xml:lang="fr-FR">LAST_BROADCAST label </r:Content> + </r:Label> + </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbcgfvir</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">COMMENT</r:String> </l:VariableName> <r:Label> - <r:Content xml:lang="fr-FR">COMMENT label</r:Content> + <r:Content xml:lang="fr-FR">COMMENT label </r:Content> </r:Label> <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p3dkx6-QOP-jbgdhaht</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p3dkx6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:TextRepresentation maxLength="500"/> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbcgm0ip</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">READY</r:String> </l:VariableName> <r:Label> - <r:Content xml:lang="fr-FR">READY label</r:Content> + <r:Content xml:lang="fr-FR">READY label </r:Content> </r:Label> <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p0np9q-QOP-jbgd3set</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p0np9q</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbcgf11f</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">PRODUCER</r:String> </l:VariableName> <r:Label> - <r:Content xml:lang="fr-FR">PRODUCER label</r:Content> + <r:Content xml:lang="fr-FR">PRODUCER label </r:Content> </r:Label> <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j3343qhx-QOP-jbgd90cy</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j3343qhx</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:TextRepresentation maxLength="30"/> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbcgcy2x</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">SEASON_NUMBER</r:String> </l:VariableName> <r:Label> - <r:Content xml:lang="fr-FR">SEASON_NUMBER label</r:Content> + <r:Content xml:lang="fr-FR">SEASON_NUMBER label </r:Content> </r:Label> <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6q9h8tj-QOP-jbgdjy8h</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6q9h8tj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:NumericRepresentation> + <r:NumberRange> + <r:Low isInclusive="true">0</r:Low> + <r:High isInclusive="true">99</r:High> + </r:NumberRange> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + </r:NumericRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbcgbg33</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">DATEFIRST</r:String> </l:VariableName> <r:Label> - <r:Content xml:lang="fr-FR">DATEFIRST label</r:Content> + <r:Content xml:lang="fr-FR">DATEFIRST label </r:Content> </r:Label> <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334cyqb-QOP-jbgdih2z</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334cyqb</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:DateTimeRepresentationReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-MNR-DateTimedate-YYYY-MM-DD</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>ManagedDateTimeRepresentation</r:TypeOfObject> + </r:DateTimeRepresentationReference> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbcgieyw</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">AUDIENCE_SHARE</r:String> </l:VariableName> <r:Label> - <r:Content xml:lang="fr-FR">AUDIENCE_SHARE label</r:Content> + <r:Content xml:lang="fr-FR">AUDIENCE_SHARE label </r:Content> </r:Label> <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6z06z1e-QOP-jbgddnrd</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6z06z1e</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:NumericRepresentation decimalPositions="1"> + <r:NumberRange> + <r:Low isInclusive="true">0</r:Low> + <r:High isInclusive="true">99</r:High> + </r:NumberRange> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + </r:NumericRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbcgasbh</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">CITY</r:String> </l:VariableName> <r:Label> - <r:Content xml:lang="fr-FR">CITY label</r:Content> + <r:Content xml:lang="fr-FR">CITY label </r:Content> </r:Label> <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j3343clt-QOP-jbgdjdkn</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j3343clt</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeListReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>j334iumu</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>CodeList</r:TypeOfObject> + </r:CodeListReference> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbcg9yr6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">MAYOR</r:String> </l:VariableName> <r:Label> - <r:Content xml:lang="fr-FR">MAYOR label</r:Content> + <r:Content xml:lang="fr-FR">MAYOR label </r:Content> </r:Label> <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qdfhvw-QOP-jbgd8ghp</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qdfhvw</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeListReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>j6qdqoen</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>CodeList</r:TypeOfObject> + </r:CodeListReference> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbcgpija</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">STATE</r:String> </l:VariableName> <r:Label> - <r:Content xml:lang="fr-FR">STATE label</r:Content> + <r:Content xml:lang="fr-FR">STATE label </r:Content> </r:Label> <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw5cqz-QOP-jbgdkd7v</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw5cqz</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeListReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>j4nwo00f</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>CodeList</r:TypeOfObject> + </r:CodeListReference> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxewlq</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">PET1</r:String> </l:VariableName> @@ -7712,21 +7849,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-QOP-jbgd8qmn</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxjmst</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">PET2</r:String> </l:VariableName> @@ -7736,21 +7886,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-QOP-jbgd60vl</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxjuay</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">PET3</r:String> </l:VariableName> @@ -7760,21 +7923,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-QOP-jbgda2jo</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxniuw</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">PET4</r:String> </l:VariableName> @@ -7784,21 +7960,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-QOP-jbgdfssy</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxtl1d</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">ICE_FLAVOUR1</r:String> </l:VariableName> @@ -7808,21 +7997,30 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-QOP-jbgdb3jx</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeListReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbdxh138</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>CodeList</r:TypeOfObject> + </r:CodeListReference> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxvai9</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">ICE_FLAVOUR2</r:String> </l:VariableName> @@ -7832,21 +8030,30 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-QOP-jbgdb61k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeListReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbdxh138</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>CodeList</r:TypeOfObject> + </r:CodeListReference> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxpltw</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">ICE_FLAVOUR3</r:String> </l:VariableName> @@ -7856,21 +8063,30 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-QOP-jbgdl3kc</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeListReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbdxh138</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>CodeList</r:TypeOfObject> + </r:CodeListReference> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxzx2x</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">ICE_FLAVOUR4</r:String> </l:VariableName> @@ -7880,21 +8096,30 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-QOP-jbgdcobo</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeListReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbdxh138</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>CodeList</r:TypeOfObject> + </r:CodeListReference> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdy4nhp</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">NUCLEAR_CHARACTER1</r:String> </l:VariableName> @@ -7904,21 +8129,30 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-QOP-jbgd6p0k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeListReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbdxh138</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>CodeList</r:TypeOfObject> + </r:CodeListReference> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxtanu</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">NUCLEAR_CHARACTER2</r:String> </l:VariableName> @@ -7928,21 +8162,30 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-QOP-jbgd9ato</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeListReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbdxh138</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>CodeList</r:TypeOfObject> + </r:CodeListReference> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdy25if</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">NUCLEAR_CHARACTER3</r:String> </l:VariableName> @@ -7952,21 +8195,30 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-QOP-jbgd3e0p</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeListReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbdxh138</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>CodeList</r:TypeOfObject> + </r:CodeListReference> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxvta8</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">NUCLEAR_CHARACTER4</r:String> </l:VariableName> @@ -7976,21 +8228,30 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-QOP-jbgdkxne</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeListReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbdxh138</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>CodeList</r:TypeOfObject> + </r:CodeListReference> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdy3nh7</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">BIRTH_CHARACTER1</r:String> </l:VariableName> @@ -8000,21 +8261,30 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QOP-jbgd7fr6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeListReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbdxricm</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>CodeList</r:TypeOfObject> + </r:CodeListReference> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdy6lk3</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">BIRTH_CHARACTER2</r:String> </l:VariableName> @@ -8024,21 +8294,30 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QOP-jbgd5e9f</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeListReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbdxricm</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>CodeList</r:TypeOfObject> + </r:CodeListReference> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxsby0</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">BIRTH_CHARACTER3</r:String> </l:VariableName> @@ -8048,21 +8327,30 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QOP-jbgd912x</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeListReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbdxricm</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>CodeList</r:TypeOfObject> + </r:CodeListReference> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdy7sra</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">BIRTH_CHARACTER4</r:String> </l:VariableName> @@ -8072,21 +8360,30 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QOP-jbgd6bdy</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeListReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbdxricm</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>CodeList</r:TypeOfObject> + </r:CodeListReference> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdy2wyl</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">BIRTH_CHARACTER5</r:String> </l:VariableName> @@ -8096,21 +8393,30 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QOP-jbgddyry</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeListReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbdxricm</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>CodeList</r:TypeOfObject> + </r:CodeListReference> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdnfk7</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES11</r:String> </l:VariableName> @@ -8120,28 +8426,30 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgde5yl</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation><d:NumericDomain decimalPositions="1"><r:MeasurementUnit>%</r:MeasurementUnit><r:NumberRange> - <r:Low isInclusive="true">0</r:Low> - <r:High isInclusive="true">100</r:High> - </r:NumberRange><r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode><r:OutParameter isArray="false"> - <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwc63q-RDOP-jbgde5yl</r:ID> - <r:Version>0.1.0</r:Version> - </r:OutParameter></d:NumericDomain></l:VariableRepresentation> + <l:VariableRepresentation> + <r:NumericRepresentation decimalPositions="1"> + <r:MeasurementUnit>%</r:MeasurementUnit> + <r:NumberRange> + <r:Low isInclusive="true">0</r:Low> + <r:High isInclusive="true">100</r:High> + </r:NumberRange> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + </r:NumericRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdje4w</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES21</r:String> </l:VariableName> @@ -8151,28 +8459,30 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd2x2t</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation><d:NumericDomain decimalPositions="1"><r:MeasurementUnit>%</r:MeasurementUnit><r:NumberRange> - <r:Low isInclusive="true">0</r:Low> - <r:High isInclusive="true">100</r:High> - </r:NumberRange><r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode><r:OutParameter isArray="false"> - <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwc63q-RDOP-jbgd2x2t</r:ID> - <r:Version>0.1.0</r:Version> - </r:OutParameter></d:NumericDomain></l:VariableRepresentation> + <l:VariableRepresentation> + <r:NumericRepresentation decimalPositions="1"> + <r:MeasurementUnit>%</r:MeasurementUnit> + <r:NumberRange> + <r:Low isInclusive="true">0</r:Low> + <r:High isInclusive="true">100</r:High> + </r:NumberRange> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + </r:NumericRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdlth7</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES31</r:String> </l:VariableName> @@ -8182,28 +8492,30 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdjypz</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation><d:NumericDomain decimalPositions="1"><r:MeasurementUnit>%</r:MeasurementUnit><r:NumberRange> - <r:Low isInclusive="true">0</r:Low> - <r:High isInclusive="true">100</r:High> - </r:NumberRange><r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode><r:OutParameter isArray="false"> - <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwc63q-RDOP-jbgdjypz</r:ID> - <r:Version>0.1.0</r:Version> - </r:OutParameter></d:NumericDomain></l:VariableRepresentation> + <l:VariableRepresentation> + <r:NumericRepresentation decimalPositions="1"> + <r:MeasurementUnit>%</r:MeasurementUnit> + <r:NumberRange> + <r:Low isInclusive="true">0</r:Low> + <r:High isInclusive="true">100</r:High> + </r:NumberRange> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + </r:NumericRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdelbl</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES41</r:String> </l:VariableName> @@ -8213,28 +8525,30 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdcftu</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation><d:NumericDomain decimalPositions="1"><r:MeasurementUnit>%</r:MeasurementUnit><r:NumberRange> - <r:Low isInclusive="true">0</r:Low> - <r:High isInclusive="true">100</r:High> - </r:NumberRange><r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode><r:OutParameter isArray="false"> - <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwc63q-RDOP-jbgdcftu</r:ID> - <r:Version>0.1.0</r:Version> - </r:OutParameter></d:NumericDomain></l:VariableRepresentation> + <l:VariableRepresentation> + <r:NumericRepresentation decimalPositions="1"> + <r:MeasurementUnit>%</r:MeasurementUnit> + <r:NumberRange> + <r:Low isInclusive="true">0</r:Low> + <r:High isInclusive="true">100</r:High> + </r:NumberRange> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + </r:NumericRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd95jq</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES51</r:String> </l:VariableName> @@ -8244,28 +8558,30 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdiyfe</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation><d:NumericDomain decimalPositions="1"><r:MeasurementUnit>%</r:MeasurementUnit><r:NumberRange> - <r:Low isInclusive="true">0</r:Low> - <r:High isInclusive="true">100</r:High> - </r:NumberRange><r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode><r:OutParameter isArray="false"> - <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwc63q-RDOP-jbgdiyfe</r:ID> - <r:Version>0.1.0</r:Version> - </r:OutParameter></d:NumericDomain></l:VariableRepresentation> + <l:VariableRepresentation> + <r:NumericRepresentation decimalPositions="1"> + <r:MeasurementUnit>%</r:MeasurementUnit> + <r:NumberRange> + <r:Low isInclusive="true">0</r:Low> + <r:High isInclusive="true">100</r:High> + </r:NumberRange> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + </r:NumericRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdadd9</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES61</r:String> </l:VariableName> @@ -8275,28 +8591,30 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdj1wd</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation><d:NumericDomain decimalPositions="1"><r:MeasurementUnit>%</r:MeasurementUnit><r:NumberRange> - <r:Low isInclusive="true">0</r:Low> - <r:High isInclusive="true">100</r:High> - </r:NumberRange><r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode><r:OutParameter isArray="false"> - <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwc63q-RDOP-jbgdj1wd</r:ID> - <r:Version>0.1.0</r:Version> - </r:OutParameter></d:NumericDomain></l:VariableRepresentation> + <l:VariableRepresentation> + <r:NumericRepresentation decimalPositions="1"> + <r:MeasurementUnit>%</r:MeasurementUnit> + <r:NumberRange> + <r:Low isInclusive="true">0</r:Low> + <r:High isInclusive="true">100</r:High> + </r:NumberRange> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + </r:NumericRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdlwzk</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES71</r:String> </l:VariableName> @@ -8306,28 +8624,30 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgddylk</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation><d:NumericDomain decimalPositions="1"><r:MeasurementUnit>%</r:MeasurementUnit><r:NumberRange> - <r:Low isInclusive="true">0</r:Low> - <r:High isInclusive="true">100</r:High> - </r:NumberRange><r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode><r:OutParameter isArray="false"> - <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwc63q-RDOP-jbgddylk</r:ID> - <r:Version>0.1.0</r:Version> - </r:OutParameter></d:NumericDomain></l:VariableRepresentation> + <l:VariableRepresentation> + <r:NumericRepresentation decimalPositions="1"> + <r:MeasurementUnit>%</r:MeasurementUnit> + <r:NumberRange> + <r:Low isInclusive="true">0</r:Low> + <r:High isInclusive="true">100</r:High> + </r:NumberRange> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + </r:NumericRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdfz77</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES81</r:String> </l:VariableName> @@ -8337,28 +8657,30 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd3jj6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation><d:NumericDomain decimalPositions="1"><r:MeasurementUnit>%</r:MeasurementUnit><r:NumberRange> - <r:Low isInclusive="true">0</r:Low> - <r:High isInclusive="true">100</r:High> - </r:NumberRange><r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode><r:OutParameter isArray="false"> - <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwc63q-RDOP-jbgd3jj6</r:ID> - <r:Version>0.1.0</r:Version> - </r:OutParameter></d:NumericDomain></l:VariableRepresentation> + <l:VariableRepresentation> + <r:NumericRepresentation decimalPositions="1"> + <r:MeasurementUnit>%</r:MeasurementUnit> + <r:NumberRange> + <r:Low isInclusive="true">0</r:Low> + <r:High isInclusive="true">100</r:High> + </r:NumberRange> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + </r:NumericRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdepx6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES91</r:String> </l:VariableName> @@ -8368,28 +8690,30 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd4w3k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation><d:NumericDomain decimalPositions="1"><r:MeasurementUnit>%</r:MeasurementUnit><r:NumberRange> - <r:Low isInclusive="true">0</r:Low> - <r:High isInclusive="true">100</r:High> - </r:NumberRange><r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode><r:OutParameter isArray="false"> - <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwc63q-RDOP-jbgd4w3k</r:ID> - <r:Version>0.1.0</r:Version> - </r:OutParameter></d:NumericDomain></l:VariableRepresentation> + <l:VariableRepresentation> + <r:NumericRepresentation decimalPositions="1"> + <r:MeasurementUnit>%</r:MeasurementUnit> + <r:NumberRange> + <r:Low isInclusive="true">0</r:Low> + <r:High isInclusive="true">100</r:High> + </r:NumberRange> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + </r:NumericRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdepx7</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES101</r:String> </l:VariableName> @@ -8399,28 +8723,30 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd4w4k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation><d:NumericDomain decimalPositions="1"><r:MeasurementUnit>%</r:MeasurementUnit><r:NumberRange> - <r:Low isInclusive="true">0</r:Low> - <r:High isInclusive="true">100</r:High> - </r:NumberRange><r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode><r:OutParameter isArray="false"> - <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwc63q-RDOP-jbgd4w4k</r:ID> - <r:Version>0.1.0</r:Version> - </r:OutParameter></d:NumericDomain></l:VariableRepresentation> + <l:VariableRepresentation> + <r:NumericRepresentation decimalPositions="1"> + <r:MeasurementUnit>%</r:MeasurementUnit> + <r:NumberRange> + <r:Low isInclusive="true">0</r:Low> + <r:High isInclusive="true">100</r:High> + </r:NumberRange> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + </r:NumericRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd9vqv</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">CLOWNING11</r:String> </l:VariableName> @@ -8430,45 +8756,63 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgd8tyr</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeListReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbdyh6b5</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>CodeList</r:TypeOfObject> + </r:CodeListReference> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgden0i</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">CLOWNING21</r:String> </l:VariableName> <r:Label> - <r:Content xml:lang="fr-FR">Loose the violin of his daughter playing poker-Clowning </r:Content> + <r:Content xml:lang="fr-FR">Loose the violin of his daughter playing poker-Clowning</r:Content> </r:Label> <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdep36</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeListReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbdyh6b5</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>CodeList</r:TypeOfObject> + </r:CodeListReference> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdndju</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">CLOWNING31</r:String> </l:VariableName> @@ -8478,21 +8822,30 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdjjgi</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeListReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbdyh6b5</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>CodeList</r:TypeOfObject> + </r:CodeListReference> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdfwg9</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">CLOWNING41</r:String> </l:VariableName> @@ -8502,21 +8855,30 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdgh6k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeListReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbdyh6b5</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>CodeList</r:TypeOfObject> + </r:CodeListReference> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdd3ky</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">CLOWNING12</r:String> </l:VariableName> @@ -8526,45 +8888,49 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdit3o</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:TextRepresentation maxLength="255"/> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdm9lm</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">CLOWNING22</r:String> </l:VariableName> <r:Label> - <r:Content xml:lang="fr-FR">Loose the violin of his daughter playing poker-Remember? </r:Content> + <r:Content xml:lang="fr-FR">Loose the violin of his daughter playing poker-Remember?</r:Content> </r:Label> <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgd366k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:TextRepresentation maxLength="255"/> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdcdhv</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">CLOWNING32</r:String> </l:VariableName> @@ -8574,21 +8940,23 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdax06</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:TextRepresentation maxLength="255"/> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdjlit</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">CLOWNING42</r:String> </l:VariableName> @@ -8598,21 +8966,23 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdfo1j</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:TextRepresentation maxLength="255"/> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd1zxu</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL11</r:String> </l:VariableName> @@ -8622,21 +8992,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd92mb</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd8lfs</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL21</r:String> </l:VariableName> @@ -8646,21 +9029,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdgsat</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd56qo</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL31</r:String> </l:VariableName> @@ -8670,21 +9066,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdaxk2</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd4wu8</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL41</r:String> </l:VariableName> @@ -8694,21 +9103,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd7myn</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdak6h</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL12</r:String> </l:VariableName> @@ -8718,21 +9140,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdnxkt</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdmsy4</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL22</r:String> </l:VariableName> @@ -8742,21 +9177,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd3ef5</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd2zlu</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL32</r:String> </l:VariableName> @@ -8766,21 +9214,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd8p1v</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd6v73</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL42</r:String> </l:VariableName> @@ -8790,21 +9251,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdgm0c</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdf5fg</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL13</r:String> </l:VariableName> @@ -8814,21 +9288,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdcppc</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd2xg0</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL23</r:String> </l:VariableName> @@ -8838,21 +9325,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd4cm6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdc06l</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL33</r:String> </l:VariableName> @@ -8862,21 +9362,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdd2lo</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdb8i9</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL43</r:String> </l:VariableName> @@ -8886,21 +9399,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdo0ay</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdhzve</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL14</r:String> </l:VariableName> @@ -8910,21 +9436,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd4r2a</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd93ks</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL24</r:String> </l:VariableName> @@ -8934,21 +9473,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdkfpq</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdfw7h</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL34</r:String> </l:VariableName> @@ -8958,21 +9510,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd7u52</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdfavn</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL44</r:String> </l:VariableName> @@ -8982,21 +9547,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdgfwl</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdc199</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL15</r:String> </l:VariableName> @@ -9006,21 +9584,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd9cff</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdfqph</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL25</r:String> </l:VariableName> @@ -9030,21 +9621,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgddwsp</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd8r0n</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL35</r:String> </l:VariableName> @@ -9054,21 +9658,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdncn8</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd3aqk</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL45</r:String> </l:VariableName> @@ -9078,21 +9695,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdnz6b</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdltql</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL16</r:String> </l:VariableName> @@ -9102,21 +9732,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdiva0</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd9um3</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL26</r:String> </l:VariableName> @@ -9126,21 +9769,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd7dqf</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgddj7v</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL36</r:String> </l:VariableName> @@ -9150,21 +9806,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdnous</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdb4ym</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL46</r:String> </l:VariableName> @@ -9174,21 +9843,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdkfcz</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd3fkz</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS11</r:String> </l:VariableName> @@ -9198,21 +9880,23 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdl5jb</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:TextRepresentation maxLength="255"/> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdf2md</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS21</r:String> </l:VariableName> @@ -9222,21 +9906,23 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd8lwo</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:TextRepresentation maxLength="255"/> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdfle1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS31</r:String> </l:VariableName> @@ -9246,21 +9932,23 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdbfag</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:TextRepresentation maxLength="255"/> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdix8x</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS41</r:String> </l:VariableName> @@ -9270,21 +9958,23 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdlgja</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:TextRepresentation maxLength="255"/> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd782k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS51</r:String> </l:VariableName> @@ -9294,21 +9984,23 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd745y</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:TextRepresentation maxLength="255"/> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd68rf</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS61</r:String> </l:VariableName> @@ -9318,21 +10010,23 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdjkts</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:TextRepresentation maxLength="255"/> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdfoj4</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS71</r:String> </l:VariableName> @@ -9342,21 +10036,23 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdcax7</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:TextRepresentation maxLength="255"/> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdb116</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS81</r:String> </l:VariableName> @@ -9366,21 +10062,23 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdjye1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:TextRepresentation maxLength="255"/> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd7w5p</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS91</r:String> </l:VariableName> @@ -9390,21 +10088,23 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd5jet</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:TextRepresentation maxLength="255"/> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd8rj2</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS101</r:String> </l:VariableName> @@ -9414,21 +10114,23 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdjw90</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:TextRepresentation maxLength="255"/> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdidnp</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS12</r:String> </l:VariableName> @@ -9438,21 +10140,29 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdfndq</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:NumericRepresentation> + <r:NumberRange> + <r:Low isInclusive="true">0</r:Low> + <r:High isInclusive="true">120</r:High> + </r:NumberRange> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + </r:NumericRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd47wz</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS22</r:String> </l:VariableName> @@ -9462,21 +10172,29 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd7osi</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:NumericRepresentation> + <r:NumberRange> + <r:Low isInclusive="true">0</r:Low> + <r:High isInclusive="true">120</r:High> + </r:NumberRange> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + </r:NumericRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdj2nn</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS32</r:String> </l:VariableName> @@ -9486,21 +10204,29 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd7bnw</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:NumericRepresentation> + <r:NumberRange> + <r:Low isInclusive="true">0</r:Low> + <r:High isInclusive="true">120</r:High> + </r:NumberRange> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + </r:NumericRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd2ipx</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS42</r:String> </l:VariableName> @@ -9510,21 +10236,29 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd9k71</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:NumericRepresentation> + <r:NumberRange> + <r:Low isInclusive="true">0</r:Low> + <r:High isInclusive="true">120</r:High> + </r:NumberRange> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + </r:NumericRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd4pe3</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS52</r:String> </l:VariableName> @@ -9534,21 +10268,29 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdimks</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:NumericRepresentation> + <r:NumberRange> + <r:Low isInclusive="true">0</r:Low> + <r:High isInclusive="true">120</r:High> + </r:NumberRange> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + </r:NumericRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdjgb1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS62</r:String> </l:VariableName> @@ -9558,21 +10300,29 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdjquz</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:NumericRepresentation> + <r:NumberRange> + <r:Low isInclusive="true">0</r:Low> + <r:High isInclusive="true">120</r:High> + </r:NumberRange> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + </r:NumericRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdb5c1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS72</r:String> </l:VariableName> @@ -9582,21 +10332,29 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdd2w3</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:NumericRepresentation> + <r:NumberRange> + <r:Low isInclusive="true">0</r:Low> + <r:High isInclusive="true">120</r:High> + </r:NumberRange> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + </r:NumericRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdju9y</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS82</r:String> </l:VariableName> @@ -9606,21 +10364,29 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdkosc</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:NumericRepresentation> + <r:NumberRange> + <r:Low isInclusive="true">0</r:Low> + <r:High isInclusive="true">120</r:High> + </r:NumberRange> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + </r:NumericRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdatyx</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS92</r:String> </l:VariableName> @@ -9630,21 +10396,29 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdk0x4</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:NumericRepresentation> + <r:NumberRange> + <r:Low isInclusive="true">0</r:Low> + <r:High isInclusive="true">120</r:High> + </r:NumberRange> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + </r:NumericRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdi1dt</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS102</r:String> </l:VariableName> @@ -9654,96 +10428,193 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd2wgf</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:NumericRepresentation> + <r:NumberRange> + <r:Low isInclusive="true">0</r:Low> + <r:High isInclusive="true">120</r:High> + </r:NumberRange> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + </r:NumericRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggt4x</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">SURVEY_COMMENT</r:String> </l:VariableName> <r:Label> - <r:Content xml:lang="fr-FR">SURVEY_COMMENT label</r:Content> + <r:Content xml:lang="fr-FR">SURVEY_COMMENT label </r:Content> </r:Label> <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6z0z3us-QOP-jbgd6m6e</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6z0z3us</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> - </l:Variable> - <l:Variable> - <r:Agency>fr.insee</r:Agency> - <r:ID>jbcggtca</r:ID> - <r:Version>0.1.0</r:Version> - <l:VariableName> - <r:String xml:lang="fr-FR">SUM_EXPENSES</r:String> - </l:VariableName> - <r:Label> - <r:Content xml:lang="fr-FR">SUM_EXPENSES label</r:Content> - </r:Label> - <r:OutParameter> - <r:Agency>fr.insee</r:Agency> - <r:ID>jbcggtca-VROP</r:ID> - <r:Version>0.1.0</r:Version> - </r:OutParameter> <l:VariableRepresentation> - <r:ProcessingInstructionReference> - <r:Agency>fr.insee</r:Agency> - <r:ID>jbcggtca-GI</r:ID> - <r:Version>0.1.0</r:Version> - <r:TypeOfObject>GenerationInstruction</r:TypeOfObject> - <r:Binding> - <r:SourceParameterReference> - <r:Agency>fr.insee</r:Agency> - <r:ID>jbcggtca-GOP</r:ID> - <r:Version>0.1.0</r:Version> - <r:TypeOfObject>OutParameter</r:TypeOfObject> - </r:SourceParameterReference> - <r:TargetParameterReference> - <r:Agency>fr.insee</r:Agency> - <r:ID>jbcggtca-VROP</r:ID> - <r:Version>0.1.0</r:Version> - <r:TypeOfObject>OutParameter</r:TypeOfObject> - </r:TargetParameterReference> - </r:Binding> - </r:ProcessingInstructionReference> - <r:NumericRepresentation/> + <r:TextRepresentation maxLength="255"/> </l:VariableRepresentation> </l:Variable> - <l:Variable> - <r:Agency>fr.insee</r:Agency> - <r:ID>jbcggtex</r:ID> - <r:Version>0.1.0</r:Version> - <l:VariableName> - <r:String xml:lang="fr-FR">LAST_BROADCAST</r:String> - </l:VariableName> - <r:Label> - <r:Content xml:lang="fr-FR">LAST_BROADCAST label</r:Content> - </r:Label> - </l:Variable> + <l:VariableGroup> + <r:Agency>fr.insee</r:Agency> + <r:ID>j6qg8rc6-gp</r:ID> + <r:Version>1</r:Version> + <r:BasedOnObject> + <r:BasedOnReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>j6qg8rc6</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>QuestionGrid</r:TypeOfObject> + </r:BasedOnReference> + </r:BasedOnObject> + <l:TypeOfVariableGroup>TableLoop</l:TypeOfVariableGroup> + <l:VariableGroupName> + <r:String>FAVOURITE_CHARACTERS</r:String> + </l:VariableGroupName> + <r:VariableReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbgd3fkz</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Variable</r:TypeOfObject> + </r:VariableReference> + <r:VariableReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbgdf2md</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Variable</r:TypeOfObject> + </r:VariableReference> + <r:VariableReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbgdfle1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Variable</r:TypeOfObject> + </r:VariableReference> + <r:VariableReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbgdix8x</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Variable</r:TypeOfObject> + </r:VariableReference> + <r:VariableReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbgd782k</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Variable</r:TypeOfObject> + </r:VariableReference> + <r:VariableReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbgd68rf</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Variable</r:TypeOfObject> + </r:VariableReference> + <r:VariableReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbgdfoj4</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Variable</r:TypeOfObject> + </r:VariableReference> + <r:VariableReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbgdb116</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Variable</r:TypeOfObject> + </r:VariableReference> + <r:VariableReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbgd7w5p</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Variable</r:TypeOfObject> + </r:VariableReference> + <r:VariableReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbgd8rj2</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Variable</r:TypeOfObject> + </r:VariableReference> + <r:VariableReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbgdidnp</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Variable</r:TypeOfObject> + </r:VariableReference> + <r:VariableReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbgd47wz</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Variable</r:TypeOfObject> + </r:VariableReference> + <r:VariableReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbgdj2nn</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Variable</r:TypeOfObject> + </r:VariableReference> + <r:VariableReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbgd2ipx</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Variable</r:TypeOfObject> + </r:VariableReference> + <r:VariableReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbgd4pe3</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Variable</r:TypeOfObject> + </r:VariableReference> + <r:VariableReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbgdjgb1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Variable</r:TypeOfObject> + </r:VariableReference> + <r:VariableReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbgdb5c1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Variable</r:TypeOfObject> + </r:VariableReference> + <r:VariableReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbgdju9y</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Variable</r:TypeOfObject> + </r:VariableReference> + <r:VariableReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbgdatyx</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Variable</r:TypeOfObject> + </r:VariableReference> + <r:VariableReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbgdi1dt</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Variable</r:TypeOfObject> + </r:VariableReference> + </l:VariableGroup> </l:VariableScheme> <d:ProcessingInstructionScheme> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-SIMPSONS-PIS-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ProcessingInstructionSchemeName> <r:String xml:lang="en-IE">SIMPSONS</r:String> </d:ProcessingInstructionSchemeName> @@ -9753,66 +10624,66 @@ <d:GenerationInstruction> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-GI</r:ID> - <r:Version>0.1.0</r:Version> - <d:SourceQuestion><!--Not implemented.--></d:SourceQuestion> + <r:Version>1</r:Version> + <!--<d:SourceQuestion>Not implemented.</d:SourceQuestion>--> <d:SourceVariable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdnfk7</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </d:SourceVariable> <d:SourceVariable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdje4w</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </d:SourceVariable> <d:SourceVariable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdlth7</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </d:SourceVariable> <d:SourceVariable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdelbl</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </d:SourceVariable> <d:SourceVariable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd95jq</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </d:SourceVariable> <d:SourceVariable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdadd9</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </d:SourceVariable> <d:SourceVariable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdlwzk</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </d:SourceVariable> <d:SourceVariable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdfz77</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </d:SourceVariable> <d:SourceVariable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdepx6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </d:SourceVariable> <d:SourceVariable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdepx7</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </d:SourceVariable> <r:CommandCode> @@ -9821,7 +10692,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES11</r:String> </r:ParameterName> @@ -9829,7 +10700,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES21</r:String> </r:ParameterName> @@ -9837,7 +10708,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-3</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES31</r:String> </r:ParameterName> @@ -9845,7 +10716,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-4</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES41</r:String> </r:ParameterName> @@ -9853,7 +10724,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-5</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES51</r:String> </r:ParameterName> @@ -9861,7 +10732,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES61</r:String> </r:ParameterName> @@ -9869,7 +10740,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-7</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES71</r:String> </r:ParameterName> @@ -9877,7 +10748,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-8</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES81</r:String> </r:ParameterName> @@ -9885,7 +10756,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-9</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES91</r:String> </r:ParameterName> @@ -9893,7 +10764,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-10</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES101</r:String> </r:ParameterName> @@ -9901,19 +10772,19 @@ <r:OutParameter> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-GOP</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> <r:Binding> <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgde5yl</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -9921,13 +10792,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd2x2t</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -9935,13 +10806,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdjypz</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-3</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -9949,13 +10820,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdcftu</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-4</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -9963,13 +10834,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdiyfe</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-5</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -9977,13 +10848,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdj1wd</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -9991,13 +10862,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgddylk</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-7</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -10005,13 +10876,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd3jj6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-8</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -10019,13 +10890,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd4w3k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-9</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -10033,26 +10904,26 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd4w4k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-10</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> - <r:CommandContent>number(if (jbcggtca-IP-1='') then '0' else jbcggtca-IP-1) + number(if (jbcggtca-IP-2='') then '0' else jbcggtca-IP-2) + number(if (jbcggtca-IP-3='') then '0' else jbcggtca-IP-3) + - number(if (jbcggtca-IP-4='') then '0' else jbcggtca-IP-4) + number(if (jbcggtca-IP-5='') then '0' else jbcggtca-IP-5) + number(if (jbcggtca-IP-6='') then '0' else jbcggtca-IP-6) + - number(if (jbcggtca-IP-7='') then '0' else jbcggtca-IP-7) + number(if (jbcggtca-IP-8='') then '0' else jbcggtca-IP-8) + number(if (jbcggtca-IP-9='') then '0' else jbcggtca-IP-9) + - number(if (jbcggtca-IP-10='') then '0' else jbcggtca-IP-10) </r:CommandContent> + <r:CommandContent>number(if (jbcggtca-IP-1='') then '0' else jbcggtca-IP-1) + number(if (jbcggtca-IP-2='') then '0' else jbcggtca-IP-2) + number(if (jbcggtca-IP-3='') then '0' else jbcggtca-IP-3)+ + number(if (jbcggtca-IP-4='') then '0' else jbcggtca-IP-4)+ number(if (jbcggtca-IP-5='') then '0' else jbcggtca-IP-5)+ number(if (jbcggtca-IP-6='') then '0' else jbcggtca-IP-6)+ + number(if (jbcggtca-IP-7='') then '0' else jbcggtca-IP-7)+ number(if (jbcggtca-IP-8='') then '0' else jbcggtca-IP-8)+ number(if (jbcggtca-IP-9='') then '0' else jbcggtca-IP-9)+ + number(if (jbcggtca-IP-10='') then '0' else jbcggtca-IP-10)</r:CommandContent> </r:Command> </r:CommandCode> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> - <r:ID>Sequence-i6vwid</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>Sequence-i6vwi0</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Sequence</r:TypeOfObject> </d:ControlConstructReference> </d:GenerationInstruction> @@ -10060,7 +10931,7 @@ <r:ManagedRepresentationScheme> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-SIMPSONS-MRS</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="en-IE">Liste de formats numériques et dates de l'enquête</r:Content> @@ -10068,58 +10939,67 @@ </r:Label> <r:ManagedDateTimeRepresentation> <r:Agency>fr.insee</r:Agency> - <r:ID>INSEE-COMMUN-MNR-DateTimedate</r:ID> - <r:Version>0.1.0</r:Version> - <r:DateFieldFormat>jj/mm/aaaa</r:DateFieldFormat> + <r:ID>INSEE-COMMUN-MNR-DateTimedate-YYYY-MM-DD</r:ID> + <r:Version>1</r:Version> + <r:DateFieldFormat>YYYY-MM-DD</r:DateFieldFormat> <r:DateTypeCode controlledVocabularyID="INSEE-DTC-CV">date</r:DateTypeCode> + <r:Range> + <r:MinimumValue included="true">1900-01-01</r:MinimumValue> + <r:MaximumValue included="true">format-date(current-date(),'[Y0001]-[M01]-[D01]')</r:MaximumValue> + </r:Range> </r:ManagedDateTimeRepresentation> </r:ManagedRepresentationScheme> - </g:ResourcePackage><s:StudyUnit> + </g:ResourcePackage> + <s:StudyUnit> <r:Agency>fr.insee</r:Agency> - <r:ID>StudyUnit-i6vwid</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>StudyUnit-i6vwi0</r:ID> + <r:Version>1</r:Version> <r:ExPostEvaluation/> <d:DataCollection> <r:Agency>fr.insee</r:Agency> - <r:ID>DataCollection-i6vwid</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>DataCollection-i6vwi0</r:ID> + <r:Version>1</r:Version> <r:QuestionSchemeReference> <r:Agency>fr.insee</r:Agency> - <r:ID>QuestionScheme-i6vwid</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>QuestionScheme-i6vwi0</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionScheme</r:TypeOfObject> </r:QuestionSchemeReference> <r:ControlConstructSchemeReference> <r:Agency>fr.insee</r:Agency> - <r:ID>ControlConstructScheme-i6vwid</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>ControlConstructScheme-i6vwi0</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>ControlConstructScheme</r:TypeOfObject> </r:ControlConstructSchemeReference> <r:InterviewerInstructionSchemeReference> <r:Agency>fr.insee</r:Agency> - <r:ID>InterviewerInstructionScheme-i6vwid</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>InterviewerInstructionScheme-i6vwi0</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>InterviewerInstructionScheme</r:TypeOfObject> </r:InterviewerInstructionSchemeReference> <d:InstrumentScheme xml:lang="fr-FR"> <r:Agency>fr.insee</r:Agency> - <r:ID>InstrumentScheme-i6vwid</r:ID> - <r:Version>0.1.0</r:Version> - <d:Instrument> + <r:ID>InstrumentScheme-i6vwi0</r:ID> + <r:Version>1</r:Version> + <d:Instrument xmlns:pogues="http://xml.insee.fr/schema/applis/pogues" xmlns:pr="ddi:ddiprofile:3_3" xmlns:c="ddi:conceptualcomponent:3_3" xmlns:cm="ddi:comparative:3_3"> <r:Agency>fr.insee</r:Agency> - <r:ID>Instrument-i6vwid</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>Instrument-i6vwi0</r:ID> + <r:Version>1</r:Version> + <d:InstrumentName> + <r:String>SIMPSONS</r:String> + </d:InstrumentName> <r:Label> <r:Content xml:lang="fr-FR">Questionnaire SIMPSONS questionnaire</r:Content> </r:Label> <d:TypeOfInstrument>A définir</d:TypeOfInstrument> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> - <r:ID>Sequence-i6vwid</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>Sequence-i6vwi0</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Sequence</r:TypeOfObject> </d:ControlConstructReference> </d:Instrument> </d:InstrumentScheme> </d:DataCollection> - </s:StudyUnit></DDIInstance> \ No newline at end of file + </s:StudyUnit> +</DDIInstance> \ No newline at end of file diff --git a/src/test/resources/ddi-to-fo/in.xml b/src/test/resources/ddi-to-fo/in.xml index 43c0c1a62..fb76627a4 100644 --- a/src/test/resources/ddi-to-fo/in.xml +++ b/src/test/resources/ddi-to-fo/in.xml @@ -1,49 +1,54 @@ -<?xml version="1.0" encoding="UTF-8"?><DDIInstance xmlns="ddi:instance:3_3" xmlns:d="ddi:datacollection:3_3" xmlns:r="ddi:reusable:3_3" xmlns:l="ddi:logicalproduct:3_3" xmlns:g="ddi:group:3_3" xmlns:s="ddi:studyunit:3_3" xmlns:a="ddi:archive:3_3" xmlns:pr="ddi:ddiprofile:3_3" xmlns:c="ddi:conceptualcomponent:3_3" xmlns:cm="ddi:comparative:3_3" xmlns:xhtml="http://www.w3.org/1999/xhtml"><r:Agency>fr.insee</r:Agency><r:ID>INSEE-i6vwid</r:ID><r:Version>0.1.0</r:Version><r:Citation> +<?xml version="1.0" encoding="UTF-8"?><DDIInstance xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="ddi:instance:3_3" xmlns:g="ddi:group:3_3" xmlns:d="ddi:datacollection:3_3" xmlns:s="ddi:studyunit:3_3" xmlns:r="ddi:reusable:3_3" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:a="ddi:archive:3_3" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:l="ddi:logicalproduct:3_3" xsi:schemaLocation="ddi:instance:3_3 https://www.ddialliance.org/Specification/DDI-Lifecycle/3.3/XMLSchema/instance.xsd" isMaintainable="true"> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-i6vwi0</r:ID> + <r:Version>1</r:Version> + <r:Citation> <r:Title> <r:String>Questionnaire SIMPSONS</r:String> </r:Title> - </r:Citation><g:ResourcePackage isMaintainable="true" versionDate="2018-01-25+01:00"> + </r:Citation> + <g:ResourcePackage isMaintainable="true" versionDate="2018-01-25+01:00"> <r:Agency>fr.insee</r:Agency> - <r:ID>RessourcePackage-i6vwid</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>RessourcePackage-i6vwi0</r:ID> + <r:Version>1</r:Version> <d:InterviewerInstructionScheme> <r:Agency>fr.insee</r:Agency> - <r:ID>InterviewerInstructionScheme-i6vwid</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>InterviewerInstructionScheme-i6vwi0</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">A définir</r:Content> </r:Label> <d:Instruction> <r:Agency>fr.insee</r:Agency> <r:ID>d1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:InstructionName> <r:String xml:lang="fr-FR">comment</r:String> </d:InstructionName> <d:InstructionText> <d:LiteralText> - <d:Text xml:lang="fr-FR"><xhtml:p>We're going to test your knowledge about the simpsons series.<xhtml:br/><xhtml:b>Welcome in the simspons world!</xhtml:b></xhtml:p></d:Text> + <d:Text xml:lang="fr-FR"><xhtml:p>We're going to test your knowledge about the simpsons series.<xhtml:br/><xhtml:br/><xhtml:b>Welcome in the simspons world!</xhtml:b></xhtml:p></d:Text> </d:LiteralText> </d:InstructionText> </d:Instruction> <d:Instruction> <r:Agency>fr.insee</r:Agency> <r:ID>d11</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:InstructionName> <r:String xml:lang="fr-FR">comment</r:String> </d:InstructionName> <d:InstructionText> <d:LiteralText> <d:Text xml:lang="fr-FR">For your information, the date of the last broadcast was on - øLAST_BROADCASTø</d:Text> + ¤LAST_BROADCAST¤ </d:Text> </d:LiteralText> </d:InstructionText> </d:Instruction> <d:Instruction> <r:Agency>fr.insee</r:Agency> <r:ID>d2</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:InstructionName> <r:String xml:lang="fr-FR">comment</r:String> </d:InstructionName> @@ -56,7 +61,7 @@ <d:Instruction> <r:Agency>fr.insee</r:Agency> <r:ID>d3</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:InstructionName> <r:String xml:lang="fr-FR">instruction</r:String> </d:InstructionName> @@ -69,7 +74,7 @@ <d:Instruction> <r:Agency>fr.insee</r:Agency> <r:ID>d4</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:InstructionName> <r:String xml:lang="fr-FR">instruction</r:String> </d:InstructionName> @@ -82,7 +87,7 @@ <d:Instruction> <r:Agency>fr.insee</r:Agency> <r:ID>d5</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:InstructionName> <r:String xml:lang="fr-FR">instruction</r:String> </d:InstructionName> @@ -95,20 +100,20 @@ <d:Instruction> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-II-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:InstructionName> <r:String xml:lang="fr-FR">warning</r:String> </d:InstructionName> <d:InstructionText> <d:LiteralText> <d:Text xml:lang="fr-FR">The sum of percentages is: ¤jbcggtca-GOP¤ %. The total of - percentages must be equal to 100%.</d:Text> + percentages must be equal to 100%. </d:Text> </d:LiteralText> <d:ConditionalText> <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-GOP</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> </d:ConditionalText> @@ -117,25 +122,25 @@ <d:Instruction> <r:Agency>fr.insee</r:Agency> <r:ID>d10</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:InstructionName> <r:String xml:lang="fr-FR">instruction</r:String> </d:InstructionName> <d:InstructionText> <d:LiteralText> - <d:Text xml:lang="fr-FR">Several answers possible: check off all the relevant boxes </d:Text> + <d:Text xml:lang="fr-FR">Several answers possible: check off all the relevant boxes</d:Text> </d:LiteralText> </d:InstructionText> </d:Instruction> - <d:Instruction><r:Agency>fr.insee</r:Agency><r:ID>FTN-INSTRUCTION-1</r:ID><r:Version>0.1.0</r:Version><d:InstructionName><r:String xml:lang="fr-FR">tooltip</r:String></d:InstructionName><d:InstructionText><d:LiteralText><d:Text xml:lang="fr-FR"><xhtml:p id="ftn1">Included principalities</xhtml:p></d:Text></d:LiteralText></d:InstructionText></d:Instruction></d:InterviewerInstructionScheme> + <d:Instruction><r:Agency>fr.insee</r:Agency><r:ID>FTN-INSTRUCTION-1</r:ID><r:Version>1</r:Version><d:InstructionName><r:String xml:lang="fr-FR">tooltip</r:String></d:InstructionName><d:InstructionText><d:LiteralText><d:Text xml:lang="fr-FR"><xhtml:p id="ftn1">Included principalities</xhtml:p></d:Text></d:LiteralText></d:InstructionText></d:Instruction></d:InterviewerInstructionScheme> <d:ControlConstructScheme> <r:Agency>fr.insee</r:Agency> - <r:ID>ControlConstructScheme-i6vwid</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>ControlConstructScheme-i6vwi0</r:ID> + <r:Version>1</r:Version> <d:Sequence> <r:Agency>fr.insee</r:Agency> - <r:ID>Sequence-i6vwid</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>Sequence-i6vwi0</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Questionnaire SIMPSONS</r:Content> </r:Label> @@ -143,26 +148,26 @@ <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p0ti5h</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Sequence</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> - <r:ID>d1e101</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>d1e119</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>IfThenElse</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6z12s2d</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Sequence</r:TypeOfObject> </d:ControlConstructReference> </d:Sequence> <d:Sequence> <r:Agency>fr.insee</r:Agency> <r:ID>j6p0ti5h</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">MODULE1</r:String> </d:ConstructName> @@ -172,33 +177,33 @@ <d:InterviewerInstructionReference> <r:Agency>fr.insee</r:Agency> <r:ID>d1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Instruction</r:TypeOfObject> </d:InterviewerInstructionReference> <d:TypeOfSequence controlledVocabularyID="INSEE-TOS-CL-1">module</d:TypeOfSequence> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p3dkx6-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p0np9q-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> - <r:ID>d1e42</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>d1e50</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>IfThenElse</r:TypeOfObject> </d:ControlConstructReference> </d:Sequence> <d:Sequence> <r:Agency>fr.insee</r:Agency> <r:ID>j6p0s7o5</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">MODULE11</r:String> </d:ConstructName> @@ -209,32 +214,32 @@ <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j3343qhx-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6q9h8tj-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334cyqb-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6z06z1e-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> </d:Sequence> <d:Sequence> <r:Agency>fr.insee</r:Agency> <r:ID>j3341528</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">MODULE2</r:String> </d:ConstructName> @@ -244,33 +249,33 @@ <d:InterviewerInstructionReference> <r:Agency>fr.insee</r:Agency> <r:ID>d2</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Instruction</r:TypeOfObject> </d:InterviewerInstructionReference> <d:TypeOfSequence controlledVocabularyID="INSEE-TOS-CL-1">module</d:TypeOfSequence> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j3343clt-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qdfhvw-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw5cqz-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> </d:Sequence> <d:Sequence> <r:Agency>fr.insee</r:Agency> <r:ID>j6qe0h9q</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">MODULE3</r:String> </d:ConstructName> @@ -281,38 +286,38 @@ <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>d12-SI</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>StatementItem</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> </d:Sequence> <d:Sequence> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw88h2</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">MODULE4</r:String> </d:ConstructName> @@ -323,26 +328,26 @@ <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qe237q</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Sequence</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qejudb</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Sequence</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qeh91y</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Sequence</r:TypeOfObject> </d:ControlConstructReference> </d:Sequence> <d:Sequence> <r:Agency>fr.insee</r:Agency> <r:ID>j6qe237q</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">MODULE41</r:String> </d:ConstructName> @@ -353,20 +358,20 @@ <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>ComputationItem</r:TypeOfObject> </d:ControlConstructReference> </d:Sequence> <d:Sequence> <r:Agency>fr.insee</r:Agency> <r:ID>j6qejudb</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">MODULE42</r:String> </d:ConstructName> @@ -377,14 +382,14 @@ <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> </d:Sequence> <d:Sequence> <r:Agency>fr.insee</r:Agency> <r:ID>j6qeh91y</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">MODULE43</r:String> </d:ConstructName> @@ -395,14 +400,14 @@ <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> </d:Sequence> <d:Sequence> <r:Agency>fr.insee</r:Agency> <r:ID>j6qfx9qe</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">MODULE5</r:String> </d:ConstructName> @@ -413,14 +418,14 @@ <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> </d:Sequence> <d:Sequence> <r:Agency>fr.insee</r:Agency> <r:ID>j6z12s2d</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">MODULE6</r:String> </d:ConstructName> @@ -431,21 +436,28 @@ <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6z0z3us-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> </d:Sequence> <d:IfThenElse> <r:Agency>fr.insee</r:Agency> - <r:ID>d1e42</r:ID> - <r:Version>0.1.0</r:Version> - <d:TypeOfIfThenElse>hideable</d:TypeOfIfThenElse><d:IfCondition> + <r:ID>d1e50</r:ID> + <r:Version>1</r:Version> + <r:Label> + <r:Content xml:lang="fr-FR">A définir</r:Content> + </r:Label> + <r:Description> + <r:Content xml:lang="fr-FR"/> + </r:Description> + <d:TypeOfIfThenElse controlledVocabularyID="INSEE-TOITE-CL-1">hideable</d:TypeOfIfThenElse> + <d:IfCondition> <r:Command> <r:ProgramLanguage>xpath</r:ProgramLanguage> <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> - <r:ID>d1e42-IP-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>d1e50-IP-1</r:ID> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">READY</r:String> </r:ParameterName> @@ -454,52 +466,58 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p0np9q-QOP-jbgd3set</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> - <r:ID>d1e42-IP-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>d1e50-IP-1</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> - <r:CommandContent>not( d1e42-IP-1 != '1')</r:CommandContent> + <r:CommandContent>not( d1e50-IP-1!= '1') </r:CommandContent> </r:Command> </d:IfCondition> <d:ThenConstructReference> <r:Agency>fr.insee</r:Agency> - <r:ID>d1e42-THEN</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>d1e50-THEN</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Sequence</r:TypeOfObject> </d:ThenConstructReference> </d:IfThenElse> <d:Sequence> <r:Agency>fr.insee</r:Agency> - <r:ID>d1e42-THEN</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>d1e50-THEN</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR"/> </r:Label> - <d:TypeOfSequence controlledVocabularyID="INSEE-TOS-CL-1">hideable</d:TypeOfSequence> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p0s7o5</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Sequence</r:TypeOfObject> </d:ControlConstructReference> </d:Sequence> <d:IfThenElse> <r:Agency>fr.insee</r:Agency> - <r:ID>d1e101</r:ID> - <r:Version>0.1.0</r:Version> - <d:TypeOfIfThenElse>hideable</d:TypeOfIfThenElse><d:IfCondition> + <r:ID>d1e119</r:ID> + <r:Version>1</r:Version> + <r:Label> + <r:Content xml:lang="fr-FR">A définir</r:Content> + </r:Label> + <r:Description> + <r:Content xml:lang="fr-FR"/> + </r:Description> + <d:TypeOfIfThenElse controlledVocabularyID="INSEE-TOITE-CL-1">hideable</d:TypeOfIfThenElse> + <d:IfCondition> <r:Command> <r:ProgramLanguage>xpath</r:ProgramLanguage> <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> - <r:ID>d1e101-IP-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>d1e119-IP-1</r:ID> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">READY</r:String> </r:ParameterName> @@ -508,315 +526,314 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p0np9q-QOP-jbgd3set</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> - <r:ID>d1e101-IP-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>d1e119-IP-1</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> - <r:CommandContent>not( d1e101-IP-1 != '1')</r:CommandContent> + <r:CommandContent>not( d1e119-IP-1!= '1') </r:CommandContent> </r:Command> </d:IfCondition> <d:ThenConstructReference> <r:Agency>fr.insee</r:Agency> - <r:ID>d1e101-THEN</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>d1e119-THEN</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Sequence</r:TypeOfObject> </d:ThenConstructReference> </d:IfThenElse> <d:Sequence> <r:Agency>fr.insee</r:Agency> - <r:ID>d1e101-THEN</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>d1e119-THEN</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR"/> </r:Label> - <d:TypeOfSequence controlledVocabularyID="INSEE-TOS-CL-1">hideable</d:TypeOfSequence> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j3341528</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Sequence</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qe0h9q</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Sequence</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw88h2</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Sequence</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qfx9qe</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Sequence</r:TypeOfObject> </d:ControlConstructReference> </d:Sequence> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j6p3dkx6-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">COMMENT</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p3dkx6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j6p0np9q-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">READY</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p0np9q</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j3343qhx-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">PRODUCER</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j3343qhx</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j6q9h8tj-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">SEASON_NUMBER</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6q9h8tj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j334cyqb-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">DATEFIRST</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334cyqb</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j6z06z1e-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">AUDIENCE_SHARE</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6z06z1e</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j3343clt-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">CITY</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j3343clt</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j6qdfhvw-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">MAYOR</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qdfhvw</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw5cqz-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">STATE</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw5cqz</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">PET</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">ICE_FLAVOUR</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">NUCLEAR_CHARACTER</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">BIRTH_CHARACTER</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">CLOWNING</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">TRAVEL</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j6z0z3us-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">SURVEY_COMMENT</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6z0z3us</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> - <d:ComputationItem><d:TypeOfComputationItem>informational</d:TypeOfComputationItem> + <d:ComputationItem> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">Total of percentages</r:String> </d:ConstructName> @@ -826,16 +843,17 @@ <d:InterviewerInstructionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-II-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Instruction</r:TypeOfObject> </d:InterviewerInstructionReference> + <d:TypeOfComputationItem controlledVocabularyID="INSEE-TOCI-CL-3">stumblingblock</d:TypeOfComputationItem> <r:CommandCode> <r:Command> <r:ProgramLanguage>xpath</r:ProgramLanguage> <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES11</r:String> </r:ParameterName> @@ -843,7 +861,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES21</r:String> </r:ParameterName> @@ -851,7 +869,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-3</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES31</r:String> </r:ParameterName> @@ -859,7 +877,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-4</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES41</r:String> </r:ParameterName> @@ -867,7 +885,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-5</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES51</r:String> </r:ParameterName> @@ -875,7 +893,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES61</r:String> </r:ParameterName> @@ -883,7 +901,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-7</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES71</r:String> </r:ParameterName> @@ -891,7 +909,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-8</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES81</r:String> </r:ParameterName> @@ -899,7 +917,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-9</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES91</r:String> </r:ParameterName> @@ -907,7 +925,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-10</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES101</r:String> </r:ParameterName> @@ -916,13 +934,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgde5yl</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -930,13 +948,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd2x2t</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -944,13 +962,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdjypz</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-3</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -958,13 +976,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdcftu</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-4</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -972,13 +990,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdiyfe</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-5</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -986,13 +1004,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdj1wd</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1000,13 +1018,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgddylk</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-7</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1014,13 +1032,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd3jj6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-8</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1028,13 +1046,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd4w3k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-9</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1042,27 +1060,27 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd4w4k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-10</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> <r:CommandContent>number(if (j4nwc63q-CI-0-IP-1='') then '0' else j4nwc63q-CI-0-IP-1) + number(if (j4nwc63q-CI-0-IP-2='') then '0' else j4nwc63q-CI-0-IP-2) + - number(if (j4nwc63q-CI-0-IP-3='') then '0' else j4nwc63q-CI-0-IP-3) + number(if (j4nwc63q-CI-0-IP-4='') then '0' else j4nwc63q-CI-0-IP-4) + number(if (j4nwc63q-CI-0-IP-5='') then '0' else j4nwc63q-CI-0-IP-5) + - number(if (j4nwc63q-CI-0-IP-6='') then '0' else j4nwc63q-CI-0-IP-6) + number(if (j4nwc63q-CI-0-IP-7='') then '0' else j4nwc63q-CI-0-IP-7) + number(if (j4nwc63q-CI-0-IP-8='') then '0' else j4nwc63q-CI-0-IP-8) + - number(if (j4nwc63q-CI-0-IP-9='') then '0' else j4nwc63q-CI-0-IP-9) + number(if (j4nwc63q-CI-0-IP-10='') then '0' else j4nwc63q-CI-0-IP-10) != 100 </r:CommandContent> + number(if (j4nwc63q-CI-0-IP-3='') then '0' else j4nwc63q-CI-0-IP-3)+ number(if (j4nwc63q-CI-0-IP-4='') then '0' else j4nwc63q-CI-0-IP-4)+ number(if (j4nwc63q-CI-0-IP-5='') then '0' else j4nwc63q-CI-0-IP-5)+ + number(if (j4nwc63q-CI-0-IP-6='') then '0' else j4nwc63q-CI-0-IP-6)+ number(if (j4nwc63q-CI-0-IP-7='') then '0' else j4nwc63q-CI-0-IP-7)+ number(if (j4nwc63q-CI-0-IP-8='') then '0' else j4nwc63q-CI-0-IP-8)+ + number(if (j4nwc63q-CI-0-IP-9='') then '0' else j4nwc63q-CI-0-IP-9)+ number(if (j4nwc63q-CI-0-IP-10='') then '0' else j4nwc63q-CI-0-IP-10)!= 100 </r:CommandContent> </r:Command> </r:CommandCode> - <!--<r:TypeOfComputationItem>error</r:TypeOfComputationItem>--></d:ComputationItem> + </d:ComputationItem> <d:StatementItem> <r:Agency>fr.insee</r:Agency> <r:ID>d12-SI</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:DisplayText> <d:LiteralText> <d:Text xml:lang="fr-FR"><xhtml:p><xhtml:b>Now we are going to know if you think that Jay is a gluton.</xhtml:b></xhtml:p></d:Text> @@ -1072,22 +1090,22 @@ </d:ControlConstructScheme> <d:QuestionScheme> <r:Agency>fr.insee</r:Agency> - <r:ID>QuestionScheme-i6vwid</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>QuestionScheme-i6vwi0</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">A définir</r:Content> </r:Label> <d:QuestionItem> <r:Agency>fr.insee</r:Agency> <r:ID>j6p3dkx6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:QuestionItemName> <r:String xml:lang="fr-FR">COMMENT</r:String> </d:QuestionItemName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p3dkx6-QOP-jbgdhaht</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">COMMENT</r:String> </r:ParameterName> @@ -1096,26 +1114,26 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p3dkx6-RDOP-jbgdhaht</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p3dkx6-QOP-jbgdhaht</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> <d:QuestionText> <d:LiteralText> - <d:Text xml:lang="fr-FR">Before starting, do you have any comments about the Simpsons family?</d:Text> + <d:Text xml:lang="fr-FR"><xhtml:p>Before starting, do you have any comments about the Simpsons<xhtml:br/> family?</xhtml:p></d:Text> </d:LiteralText> </d:QuestionText> <d:TextDomain maxLength="500"> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p3dkx6-RDOP-jbgdhaht</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TextRepresentation maxLength="500"/> </r:OutParameter> </d:TextDomain> @@ -1123,14 +1141,14 @@ <d:QuestionItem> <r:Agency>fr.insee</r:Agency> <r:ID>j6p0np9q</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:QuestionItemName> <r:String xml:lang="fr-FR">READY</r:String> </d:QuestionItemName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p0np9q-QOP-jbgd3set</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">READY</r:String> </r:ParameterName> @@ -1139,13 +1157,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p0np9q-RDOP-jbgd3set</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p0np9q-QOP-jbgd3set</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1158,14 +1176,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p0np9q-RDOP-jbgd3set</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -1175,33 +1193,35 @@ </r:OutParameter> <r:ResponseCardinality maximumResponses="1"/> </d:NominalDomain> - <d:ExternalAid><r:OtherMaterial> - <r:Agency>fr.insee</r:Agency> - <r:ID>j6p6my1d</r:ID> - <r:Version>0.1.0</r:Version> - <r:Description> - <r:Content> - <xhtml:div class="FlowControl" id="j6p6my1d"> - <xhtml:div class="Description">If you are not ready, please go to the end of the - questionnaire</xhtml:div> - <xhtml:div class="Expression">$READY != '1'</xhtml:div> - <xhtml:div class="IfTrue">j6z12s2d</xhtml:div> - </xhtml:div> - </r:Content> - </r:Description> - </r:OtherMaterial></d:ExternalAid> + <d:ExternalAid> + <r:OtherMaterial> + <r:Agency>fr.insee</r:Agency> + <r:ID>j6p6my1d</r:ID> + <r:Version>1</r:Version> + <r:Description> + <r:Content> + <xhtml:div class="FlowControl" id="j6p6my1d"> + <xhtml:div class="Description">If you are not ready, please go to the end of the + questionnaire</xhtml:div> + <xhtml:div class="Expression">$READY != '1'</xhtml:div> + <xhtml:div class="IfTrue">j6z12s2d</xhtml:div> + </xhtml:div> + </r:Content> + </r:Description> + </r:OtherMaterial> + </d:ExternalAid> </d:QuestionItem> <d:QuestionItem> <r:Agency>fr.insee</r:Agency> <r:ID>j3343qhx</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:QuestionItemName> <r:String xml:lang="fr-FR">PRODUCER</r:String> </d:QuestionItemName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j3343qhx-QOP-jbgd90cy</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PRODUCER</r:String> </r:ParameterName> @@ -1210,13 +1230,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j3343qhx-RDOP-jbgd90cy</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j3343qhx-QOP-jbgd90cy</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1229,7 +1249,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j3343qhx-RDOP-jbgd90cy</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TextRepresentation maxLength="30"/> </r:OutParameter> </d:TextDomain> @@ -1237,14 +1257,14 @@ <d:QuestionItem> <r:Agency>fr.insee</r:Agency> <r:ID>j6q9h8tj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:QuestionItemName> <r:String xml:lang="fr-FR">SEASON_NUMBER</r:String> </d:QuestionItemName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6q9h8tj-QOP-jbgdjy8h</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">SEASON_NUMBER</r:String> </r:ParameterName> @@ -1253,13 +1273,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6q9h8tj-RDOP-jbgdjy8h</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6q9h8tj-QOP-jbgdjy8h</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1277,21 +1297,21 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6q9h8tj-RDOP-jbgdjy8h</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> </d:QuestionItem> <d:QuestionItem> <r:Agency>fr.insee</r:Agency> <r:ID>j334cyqb</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:QuestionItemName> <r:String xml:lang="fr-FR">DATEFIRST</r:String> </d:QuestionItemName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j334cyqb-QOP-jbgdih2z</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">DATEFIRST</r:String> </r:ParameterName> @@ -1300,13 +1320,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334cyqb-RDOP-jbgdih2z</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334cyqb-QOP-jbgdih2z</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1317,17 +1337,17 @@ </d:QuestionText> <d:DateTimeDomainReference> <r:Agency>fr.insee</r:Agency> - <r:ID>INSEE-COMMUN-MNR-DateTimedate</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>INSEE-COMMUN-MNR-DateTimedate-YYYY-MM-DD</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>ManagedDateTimeRepresentation</r:TypeOfObject> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j334cyqb-RDOP-jbgdih2z</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:DateTimeRepresentationReference> <r:Agency>fr.insee</r:Agency> - <r:ID>INSEE-COMMUN-MNR-DateTimedate</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>INSEE-COMMUN-MNR-DateTimedate-YYYY-MM-DD</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>ManagedDateTimeRepresentation</r:TypeOfObject> </r:DateTimeRepresentationReference> </r:OutParameter> @@ -1335,21 +1355,21 @@ <d:InterviewerInstructionReference> <r:Agency>fr.insee</r:Agency> <r:ID>d11</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Instruction</r:TypeOfObject> </d:InterviewerInstructionReference> </d:QuestionItem> <d:QuestionItem> <r:Agency>fr.insee</r:Agency> <r:ID>j6z06z1e</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:QuestionItemName> <r:String xml:lang="fr-FR">AUDIENCE_SHARE</r:String> </d:QuestionItemName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6z06z1e-QOP-jbgddnrd</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">AUDIENCE_SHARE</r:String> </r:ParameterName> @@ -1358,20 +1378,20 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6z06z1e-RDOP-jbgddnrd</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6z06z1e-QOP-jbgddnrd</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> <d:QuestionText> <d:LiteralText> <d:Text xml:lang="fr-FR">In your opinion, how much is the part of audience share in US for the 2016 - season? </d:Text> + season?</d:Text> </d:LiteralText> </d:QuestionText> <d:NumericDomain decimalPositions="1"> @@ -1383,21 +1403,21 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6z06z1e-RDOP-jbgddnrd</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> </d:QuestionItem> <d:QuestionItem> <r:Agency>fr.insee</r:Agency> <r:ID>j3343clt</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:QuestionItemName> <r:String xml:lang="fr-FR">CITY</r:String> </d:QuestionItemName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j3343clt-QOP-jbgdjdkn</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">CITY</r:String> </r:ParameterName> @@ -1406,13 +1426,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j3343clt-RDOP-jbgdjdkn</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j3343clt-QOP-jbgdjdkn</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1421,47 +1441,47 @@ <d:Text xml:lang="fr-FR">In which city do the Simpsons reside?</d:Text> </d:LiteralText> </d:QuestionText> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV">radio-button</r:GenericOutputFormat> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334iumu</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j3343clt-RDOP-jbgdjdkn</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334iumu</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> </r:OutParameter> - <r:ResponseCardinality maximumResponses="1"/> + <r:ResponseCardinality minimumResponses="1" maximumResponses="1"/> </d:CodeDomain> <d:InterviewerInstructionReference> <r:Agency>fr.insee</r:Agency> <r:ID>d3</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Instruction</r:TypeOfObject> </d:InterviewerInstructionReference> </d:QuestionItem> <d:QuestionItem> <r:Agency>fr.insee</r:Agency> <r:ID>j6qdfhvw</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:QuestionItemName> <r:String xml:lang="fr-FR">MAYOR</r:String> </d:QuestionItemName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qdfhvw-QOP-jbgd8ghp</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">MAYOR</r:String> </r:ParameterName> @@ -1470,13 +1490,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qdfhvw-RDOP-jbgd8ghp</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qdfhvw-QOP-jbgd8ghp</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1485,23 +1505,23 @@ <d:Text xml:lang="fr-FR">Who is the Simpsons city mayor?</d:Text> </d:LiteralText> </d:QuestionText> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV">checkbox</r:GenericOutputFormat> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qdqoen</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qdfhvw-RDOP-jbgd8ghp</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qdqoen</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -1511,21 +1531,21 @@ <d:InterviewerInstructionReference> <r:Agency>fr.insee</r:Agency> <r:ID>d4</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Instruction</r:TypeOfObject> </d:InterviewerInstructionReference> </d:QuestionItem> <d:QuestionItem> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw5cqz</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:QuestionItemName> <r:String xml:lang="fr-FR">STATE</r:String> </d:QuestionItemName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw5cqz-QOP-jbgdkd7v</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">STATE</r:String> </r:ParameterName> @@ -1534,13 +1554,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw5cqz-RDOP-jbgdkd7v</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw5cqz-QOP-jbgdkd7v</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1549,23 +1569,23 @@ <d:Text xml:lang="fr-FR">In which state do The Simpsons reside?</d:Text> </d:LiteralText> </d:QuestionText> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV">drop-down-list</r:GenericOutputFormat> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwo00f</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw5cqz-RDOP-jbgdkd7v</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwo00f</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -1576,14 +1596,14 @@ <d:QuestionItem> <r:Agency>fr.insee</r:Agency> <r:ID>j6z0z3us</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:QuestionItemName> <r:String xml:lang="fr-FR">SURVEY_COMMENT</r:String> </d:QuestionItemName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6z0z3us-QOP-jbgd6m6e</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">SURVEY_COMMENT</r:String> </r:ParameterName> @@ -1592,13 +1612,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6z0z3us-RDOP-jbgd6m6e</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6z0z3us-QOP-jbgd6m6e</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1611,7 +1631,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6z0z3us-RDOP-jbgd6m6e</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TextRepresentation maxLength="255"/> </r:OutParameter> </d:TextDomain> @@ -1619,14 +1639,14 @@ <d:QuestionGrid> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:QuestionGridName> <r:String xml:lang="fr-FR">PET</r:String> </d:QuestionGridName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-QOP-jbgd8qmn</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PET1</r:String> </r:ParameterName> @@ -1634,7 +1654,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-QOP-jbgd60vl</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PET2</r:String> </r:ParameterName> @@ -1642,7 +1662,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-QOP-jbgda2jo</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PET3</r:String> </r:ParameterName> @@ -1650,7 +1670,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-QOP-jbgdfssy</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PET4</r:String> </r:ParameterName> @@ -1659,13 +1679,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-RDOP-jbgd8qmn</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-QOP-jbgd8qmn</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1673,13 +1693,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-RDOP-jbgd60vl</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-QOP-jbgd60vl</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1687,13 +1707,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-RDOP-jbgda2jo</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-QOP-jbgda2jo</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1701,13 +1721,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-RDOP-jbgdfssy</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-QOP-jbgdfssy</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1717,11 +1737,11 @@ </d:LiteralText> </d:QuestionText> <d:GridDimension displayCode="false" displayLabel="false" rank="1"> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j335cu3c</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </d:CodeDomain> @@ -1732,14 +1752,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-RDOP-jbgd8qmn</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -1760,14 +1780,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-RDOP-jbgd60vl</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -1788,14 +1808,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-RDOP-jbgda2jo</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -1816,14 +1836,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-RDOP-jbgdfssy</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -1843,21 +1863,21 @@ <d:InterviewerInstructionReference> <r:Agency>fr.insee</r:Agency> <r:ID>d5</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Instruction</r:TypeOfObject> </d:InterviewerInstructionReference> </d:QuestionGrid> <d:QuestionGrid> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:QuestionGridName> <r:String xml:lang="fr-FR">ICE_FLAVOUR</r:String> </d:QuestionGridName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-QOP-jbgdb3jx</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">ICE_FLAVOUR1</r:String> </r:ParameterName> @@ -1865,7 +1885,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-QOP-jbgdb61k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">ICE_FLAVOUR2</r:String> </r:ParameterName> @@ -1873,7 +1893,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-QOP-jbgdl3kc</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">ICE_FLAVOUR3</r:String> </r:ParameterName> @@ -1881,7 +1901,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-QOP-jbgdcobo</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">ICE_FLAVOUR4</r:String> </r:ParameterName> @@ -1890,13 +1910,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-RDOP-jbgdb3jx</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-QOP-jbgdb3jx</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1904,13 +1924,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-RDOP-jbgdb61k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-QOP-jbgdb61k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1918,13 +1938,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-RDOP-jbgdl3kc</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-QOP-jbgdl3kc</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1932,13 +1952,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-RDOP-jbgdcobo</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-QOP-jbgdcobo</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1948,34 +1968,34 @@ </d:LiteralText> </d:QuestionText> <d:GridDimension displayCode="false" displayLabel="false" rank="1"> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2mvca</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </d:CodeDomain> </d:GridDimension> <d:StructuredMixedGridResponseDomain> <d:GridResponseDomainInMixed> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV">radio-button</r:GenericOutputFormat> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-RDOP-jbgdb3jx</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -1989,23 +2009,23 @@ </d:GridAttachment> </d:GridResponseDomainInMixed> <d:GridResponseDomainInMixed> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV">radio-button</r:GenericOutputFormat> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-RDOP-jbgdb61k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -2019,23 +2039,23 @@ </d:GridAttachment> </d:GridResponseDomainInMixed> <d:GridResponseDomainInMixed> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV">radio-button</r:GenericOutputFormat> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-RDOP-jbgdl3kc</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -2049,23 +2069,23 @@ </d:GridAttachment> </d:GridResponseDomainInMixed> <d:GridResponseDomainInMixed> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV">radio-button</r:GenericOutputFormat> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-RDOP-jbgdcobo</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -2083,14 +2103,14 @@ <d:QuestionGrid> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:QuestionGridName> <r:String xml:lang="fr-FR">NUCLEAR_CHARACTER</r:String> </d:QuestionGridName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-QOP-jbgd6p0k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">NUCLEAR_CHARACTER1</r:String> </r:ParameterName> @@ -2098,7 +2118,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-QOP-jbgd9ato</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">NUCLEAR_CHARACTER2</r:String> </r:ParameterName> @@ -2106,7 +2126,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-QOP-jbgd3e0p</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">NUCLEAR_CHARACTER3</r:String> </r:ParameterName> @@ -2114,7 +2134,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-QOP-jbgdkxne</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">NUCLEAR_CHARACTER4</r:String> </r:ParameterName> @@ -2123,13 +2143,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-RDOP-jbgd6p0k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-QOP-jbgd6p0k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2137,13 +2157,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-RDOP-jbgd9ato</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-QOP-jbgd9ato</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2151,13 +2171,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-RDOP-jbgd3e0p</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-QOP-jbgd3e0p</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2165,13 +2185,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-RDOP-jbgdkxne</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-QOP-jbgdkxne</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2181,34 +2201,34 @@ </d:LiteralText> </d:QuestionText> <d:GridDimension displayCode="false" displayLabel="false" rank="1"> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qeytgc</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </d:CodeDomain> </d:GridDimension> <d:StructuredMixedGridResponseDomain> <d:GridResponseDomainInMixed> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV">drop-down-list</r:GenericOutputFormat> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-RDOP-jbgd6p0k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -2222,23 +2242,23 @@ </d:GridAttachment> </d:GridResponseDomainInMixed> <d:GridResponseDomainInMixed> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV">drop-down-list</r:GenericOutputFormat> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-RDOP-jbgd9ato</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -2252,23 +2272,23 @@ </d:GridAttachment> </d:GridResponseDomainInMixed> <d:GridResponseDomainInMixed> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV">drop-down-list</r:GenericOutputFormat> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-RDOP-jbgd3e0p</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -2282,23 +2302,23 @@ </d:GridAttachment> </d:GridResponseDomainInMixed> <d:GridResponseDomainInMixed> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV">drop-down-list</r:GenericOutputFormat> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-RDOP-jbgdkxne</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -2316,14 +2336,14 @@ <d:QuestionGrid> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:QuestionGridName> <r:String xml:lang="fr-FR">BIRTH_CHARACTER</r:String> </d:QuestionGridName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QOP-jbgd7fr6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">BIRTH_CHARACTER1</r:String> </r:ParameterName> @@ -2331,7 +2351,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QOP-jbgd5e9f</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">BIRTH_CHARACTER2</r:String> </r:ParameterName> @@ -2339,7 +2359,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QOP-jbgd912x</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">BIRTH_CHARACTER3</r:String> </r:ParameterName> @@ -2347,7 +2367,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QOP-jbgd6bdy</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">BIRTH_CHARACTER4</r:String> </r:ParameterName> @@ -2355,7 +2375,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QOP-jbgddyry</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">BIRTH_CHARACTER5</r:String> </r:ParameterName> @@ -2364,13 +2384,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-RDOP-jbgd7fr6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QOP-jbgd7fr6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2378,13 +2398,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-RDOP-jbgd5e9f</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QOP-jbgd5e9f</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2392,13 +2412,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-RDOP-jbgd912x</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QOP-jbgd912x</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2406,13 +2426,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-RDOP-jbgd6bdy</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QOP-jbgd6bdy</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2420,13 +2440,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-RDOP-jbgddyry</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QOP-jbgddyry</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2436,34 +2456,34 @@ </d:LiteralText> </d:QuestionText> <d:GridDimension displayCode="false" displayLabel="false" rank="1"> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6z087mq</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </d:CodeDomain> </d:GridDimension> <d:StructuredMixedGridResponseDomain> <d:GridResponseDomainInMixed> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV">checkbox</r:GenericOutputFormat> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxricm</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-RDOP-jbgd7fr6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxricm</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -2477,23 +2497,23 @@ </d:GridAttachment> </d:GridResponseDomainInMixed> <d:GridResponseDomainInMixed> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV">checkbox</r:GenericOutputFormat> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxricm</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-RDOP-jbgd5e9f</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxricm</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -2507,23 +2527,23 @@ </d:GridAttachment> </d:GridResponseDomainInMixed> <d:GridResponseDomainInMixed> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV">checkbox</r:GenericOutputFormat> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxricm</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-RDOP-jbgd912x</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxricm</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -2537,23 +2557,23 @@ </d:GridAttachment> </d:GridResponseDomainInMixed> <d:GridResponseDomainInMixed> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV">checkbox</r:GenericOutputFormat> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxricm</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-RDOP-jbgd6bdy</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxricm</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -2567,23 +2587,23 @@ </d:GridAttachment> </d:GridResponseDomainInMixed> <d:GridResponseDomainInMixed> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV">checkbox</r:GenericOutputFormat> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxricm</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-RDOP-jbgddyry</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxricm</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -2601,14 +2621,14 @@ <d:QuestionGrid> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:QuestionGridName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES</r:String> </d:QuestionGridName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgde5yl</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES11</r:String> </r:ParameterName> @@ -2616,7 +2636,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd2x2t</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES21</r:String> </r:ParameterName> @@ -2624,7 +2644,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdjypz</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES31</r:String> </r:ParameterName> @@ -2632,7 +2652,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdcftu</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES41</r:String> </r:ParameterName> @@ -2640,7 +2660,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdiyfe</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES51</r:String> </r:ParameterName> @@ -2648,7 +2668,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdj1wd</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES61</r:String> </r:ParameterName> @@ -2656,7 +2676,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgddylk</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES71</r:String> </r:ParameterName> @@ -2664,7 +2684,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd3jj6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES81</r:String> </r:ParameterName> @@ -2672,7 +2692,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd4w3k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES91</r:String> </r:ParameterName> @@ -2680,7 +2700,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd4w4k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES101</r:String> </r:ParameterName> @@ -2689,13 +2709,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgde5yl</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgde5yl</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2703,13 +2723,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgd2x2t</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd2x2t</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2717,13 +2737,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgdjypz</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdjypz</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2731,13 +2751,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgdcftu</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdcftu</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2745,13 +2765,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgdiyfe</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdiyfe</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2759,13 +2779,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgdj1wd</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdj1wd</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2773,13 +2793,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgddylk</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgddylk</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2787,13 +2807,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgd3jj6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd3jj6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2801,13 +2821,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgd4w3k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd4w3k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2815,38 +2835,38 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgd4w4k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd4w4k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> <d:QuestionText> <d:LiteralText> <d:Text xml:lang="fr-FR">Please, specify the percentage of Jay's expenses in the Kwik-E-Mart for each - product? </d:Text> + product?</d:Text> </d:LiteralText> </d:QuestionText> <d:GridDimension displayCode="false" displayLabel="false" rank="1"> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwh16i</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </d:CodeDomain> </d:GridDimension> <d:GridDimension displayCode="false" displayLabel="false" rank="2"> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-secondDimension-fakeCL-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </d:CodeDomain> @@ -2862,7 +2882,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgde5yl</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -2882,7 +2902,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgd2x2t</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -2902,7 +2922,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgdjypz</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -2922,7 +2942,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgdcftu</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -2942,7 +2962,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgdiyfe</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -2962,7 +2982,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgdj1wd</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -2982,7 +3002,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgddylk</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -3002,7 +3022,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgd3jj6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -3022,7 +3042,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgd4w3k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -3042,7 +3062,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgd4w4k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -3057,14 +3077,14 @@ <d:QuestionGrid> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:QuestionGridName> <r:String xml:lang="fr-FR">CLOWNING</r:String> </d:QuestionGridName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgd8tyr</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">CLOWNING11</r:String> </r:ParameterName> @@ -3072,7 +3092,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdep36</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">CLOWNING21</r:String> </r:ParameterName> @@ -3080,7 +3100,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdjjgi</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">CLOWNING31</r:String> </r:ParameterName> @@ -3088,7 +3108,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdgh6k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">CLOWNING41</r:String> </r:ParameterName> @@ -3096,7 +3116,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdit3o</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">CLOWNING12</r:String> </r:ParameterName> @@ -3104,7 +3124,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgd366k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">CLOWNING22</r:String> </r:ParameterName> @@ -3112,7 +3132,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdax06</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">CLOWNING32</r:String> </r:ParameterName> @@ -3120,7 +3140,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdfo1j</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">CLOWNING42</r:String> </r:ParameterName> @@ -3129,13 +3149,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-RDOP-jbgd8tyr</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgd8tyr</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3143,13 +3163,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-RDOP-jbgdep36</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdep36</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3157,13 +3177,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-RDOP-jbgdjjgi</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdjjgi</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3171,13 +3191,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-RDOP-jbgdgh6k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdgh6k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3185,13 +3205,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-RDOP-jbgdit3o</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdit3o</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3199,13 +3219,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-RDOP-jbgd366k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgd366k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3213,13 +3233,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-RDOP-jbgdax06</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdax06</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3227,60 +3247,60 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-RDOP-jbgdfo1j</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdfo1j</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> <d:QuestionText> <d:LiteralText> - <d:Text xml:lang="fr-FR">Who did these clownings and tell us what you remember? </d:Text> + <d:Text xml:lang="fr-FR">Who did these clownings and tell us what you remember?</d:Text> </d:LiteralText> </d:QuestionText> <d:GridDimension displayCode="false" displayLabel="false" rank="1"> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j77dav9b</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </d:CodeDomain> </d:GridDimension> <d:GridDimension displayCode="false" displayLabel="false" rank="2"> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-secondDimension-fakeCL-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </d:CodeDomain> </d:GridDimension> <d:StructuredMixedGridResponseDomain> <d:GridResponseDomainInMixed> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV">drop-down-list</r:GenericOutputFormat> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdyh6b5</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-RDOP-jbgd8tyr</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdyh6b5</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -3295,23 +3315,23 @@ </d:GridAttachment> </d:GridResponseDomainInMixed> <d:GridResponseDomainInMixed> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV">drop-down-list</r:GenericOutputFormat> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdyh6b5</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-RDOP-jbgdep36</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdyh6b5</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -3326,23 +3346,23 @@ </d:GridAttachment> </d:GridResponseDomainInMixed> <d:GridResponseDomainInMixed> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV">drop-down-list</r:GenericOutputFormat> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdyh6b5</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-RDOP-jbgdjjgi</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdyh6b5</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -3357,23 +3377,23 @@ </d:GridAttachment> </d:GridResponseDomainInMixed> <d:GridResponseDomainInMixed> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV">drop-down-list</r:GenericOutputFormat> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdyh6b5</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-RDOP-jbgdgh6k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdyh6b5</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -3392,7 +3412,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-RDOP-jbgdit3o</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TextRepresentation maxLength="255"/> </r:OutParameter> </d:TextDomain> @@ -3408,7 +3428,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-RDOP-jbgd366k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TextRepresentation maxLength="255"/> </r:OutParameter> </d:TextDomain> @@ -3424,7 +3444,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-RDOP-jbgdax06</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TextRepresentation maxLength="255"/> </r:OutParameter> </d:TextDomain> @@ -3440,7 +3460,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-RDOP-jbgdfo1j</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TextRepresentation maxLength="255"/> </r:OutParameter> </d:TextDomain> @@ -3456,14 +3476,14 @@ <d:QuestionGrid> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:QuestionGridName> <r:String xml:lang="fr-FR">TRAVEL</r:String> </d:QuestionGridName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd92mb</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL11</r:String> </r:ParameterName> @@ -3471,7 +3491,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdgsat</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL21</r:String> </r:ParameterName> @@ -3479,7 +3499,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdaxk2</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL31</r:String> </r:ParameterName> @@ -3487,7 +3507,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd7myn</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL41</r:String> </r:ParameterName> @@ -3495,7 +3515,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdnxkt</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL12</r:String> </r:ParameterName> @@ -3503,7 +3523,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd3ef5</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL22</r:String> </r:ParameterName> @@ -3511,7 +3531,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd8p1v</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL32</r:String> </r:ParameterName> @@ -3519,7 +3539,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdgm0c</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL42</r:String> </r:ParameterName> @@ -3527,7 +3547,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdcppc</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL13</r:String> </r:ParameterName> @@ -3535,7 +3555,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd4cm6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL23</r:String> </r:ParameterName> @@ -3543,7 +3563,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdd2lo</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL33</r:String> </r:ParameterName> @@ -3551,7 +3571,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdo0ay</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL43</r:String> </r:ParameterName> @@ -3559,7 +3579,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd4r2a</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL14</r:String> </r:ParameterName> @@ -3567,7 +3587,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdkfpq</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL24</r:String> </r:ParameterName> @@ -3575,7 +3595,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd7u52</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL34</r:String> </r:ParameterName> @@ -3583,7 +3603,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdgfwl</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL44</r:String> </r:ParameterName> @@ -3591,7 +3611,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd9cff</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL15</r:String> </r:ParameterName> @@ -3599,7 +3619,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgddwsp</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL25</r:String> </r:ParameterName> @@ -3607,7 +3627,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdncn8</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL35</r:String> </r:ParameterName> @@ -3615,7 +3635,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdnz6b</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL45</r:String> </r:ParameterName> @@ -3623,7 +3643,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdiva0</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL16</r:String> </r:ParameterName> @@ -3631,7 +3651,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd7dqf</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL26</r:String> </r:ParameterName> @@ -3639,7 +3659,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdnous</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL36</r:String> </r:ParameterName> @@ -3647,7 +3667,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdkfcz</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL46</r:String> </r:ParameterName> @@ -3656,13 +3676,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd92mb</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd92mb</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3670,13 +3690,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdgsat</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdgsat</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3684,13 +3704,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdaxk2</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdaxk2</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3698,13 +3718,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd7myn</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd7myn</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3712,13 +3732,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdnxkt</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdnxkt</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3726,13 +3746,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd3ef5</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd3ef5</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3740,13 +3760,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd8p1v</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd8p1v</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3754,13 +3774,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdgm0c</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdgm0c</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3768,13 +3788,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdcppc</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdcppc</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3782,13 +3802,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd4cm6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd4cm6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3796,13 +3816,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdd2lo</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdd2lo</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3810,13 +3830,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdo0ay</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdo0ay</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3824,13 +3844,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd4r2a</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd4r2a</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3838,13 +3858,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdkfpq</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdkfpq</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3852,13 +3872,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd7u52</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd7u52</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3866,13 +3886,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdgfwl</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdgfwl</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3880,13 +3900,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd9cff</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd9cff</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3894,13 +3914,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgddwsp</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgddwsp</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3908,13 +3928,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdncn8</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdncn8</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3922,13 +3942,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdnz6b</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdnz6b</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3936,13 +3956,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdiva0</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdiva0</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3950,13 +3970,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd7dqf</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd7dqf</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3964,13 +3984,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdnous</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdnous</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3978,38 +3998,38 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdkfcz</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdkfcz</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> <d:QuestionText> <d:LiteralText> <d:Text xml:lang="fr-FR">Which of the following means of transport were used by the hero and in which - country? </d:Text> + country?</d:Text> </d:LiteralText> </d:QuestionText> <d:GridDimension displayCode="false" displayLabel="false" rank="1"> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2kivg</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </d:CodeDomain> </d:GridDimension> <d:GridDimension displayCode="false" displayLabel="false" rank="2"> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdye1wa</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </d:CodeDomain> @@ -4020,14 +4040,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd92mb</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4049,14 +4069,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdgsat</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4078,14 +4098,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdaxk2</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4107,14 +4127,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd7myn</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4136,14 +4156,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdnxkt</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4165,14 +4185,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd3ef5</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4194,14 +4214,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd8p1v</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4223,14 +4243,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdgm0c</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4252,14 +4272,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdcppc</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4281,14 +4301,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd4cm6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4310,14 +4330,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdd2lo</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4339,14 +4359,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdo0ay</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4368,14 +4388,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd4r2a</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4397,14 +4417,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdkfpq</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4426,14 +4446,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd7u52</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4455,14 +4475,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdgfwl</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4484,14 +4504,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd9cff</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4513,14 +4533,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgddwsp</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4542,14 +4562,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdncn8</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4571,14 +4591,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdnz6b</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4600,14 +4620,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdiva0</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4629,14 +4649,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd7dqf</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4658,14 +4678,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdnous</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4687,14 +4707,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdkfcz</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4715,21 +4735,21 @@ <d:InterviewerInstructionReference> <r:Agency>fr.insee</r:Agency> <r:ID>d10</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Instruction</r:TypeOfObject> </d:InterviewerInstructionReference> </d:QuestionGrid> <d:QuestionGrid> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:QuestionGridName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS</r:String> </d:QuestionGridName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdl5jb</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS11</r:String> </r:ParameterName> @@ -4737,7 +4757,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd8lwo</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS21</r:String> </r:ParameterName> @@ -4745,7 +4765,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdbfag</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS31</r:String> </r:ParameterName> @@ -4753,7 +4773,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdlgja</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS41</r:String> </r:ParameterName> @@ -4761,7 +4781,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd745y</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS51</r:String> </r:ParameterName> @@ -4769,7 +4789,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdjkts</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS61</r:String> </r:ParameterName> @@ -4777,7 +4797,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdcax7</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS71</r:String> </r:ParameterName> @@ -4785,7 +4805,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdjye1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS81</r:String> </r:ParameterName> @@ -4793,7 +4813,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd5jet</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS91</r:String> </r:ParameterName> @@ -4801,7 +4821,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdjw90</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS101</r:String> </r:ParameterName> @@ -4809,7 +4829,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdfndq</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS12</r:String> </r:ParameterName> @@ -4817,7 +4837,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd7osi</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS22</r:String> </r:ParameterName> @@ -4825,7 +4845,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd7bnw</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS32</r:String> </r:ParameterName> @@ -4833,7 +4853,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd9k71</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS42</r:String> </r:ParameterName> @@ -4841,7 +4861,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdimks</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS52</r:String> </r:ParameterName> @@ -4849,7 +4869,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdjquz</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS62</r:String> </r:ParameterName> @@ -4857,7 +4877,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdd2w3</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS72</r:String> </r:ParameterName> @@ -4865,7 +4885,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdkosc</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS82</r:String> </r:ParameterName> @@ -4873,7 +4893,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdk0x4</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS92</r:String> </r:ParameterName> @@ -4881,7 +4901,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd2wgf</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS102</r:String> </r:ParameterName> @@ -4890,13 +4910,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdl5jb</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdl5jb</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -4904,13 +4924,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgd8lwo</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd8lwo</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -4918,13 +4938,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdbfag</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdbfag</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -4932,13 +4952,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdlgja</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdlgja</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -4946,13 +4966,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgd745y</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd745y</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -4960,13 +4980,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdjkts</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdjkts</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -4974,13 +4994,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdcax7</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdcax7</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -4988,13 +5008,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdjye1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdjye1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -5002,13 +5022,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgd5jet</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd5jet</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -5016,13 +5036,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdjw90</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdjw90</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -5030,13 +5050,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdfndq</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdfndq</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -5044,13 +5064,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgd7osi</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd7osi</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -5058,13 +5078,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgd7bnw</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd7bnw</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -5072,13 +5092,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgd9k71</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd9k71</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -5086,13 +5106,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdimks</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdimks</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -5100,13 +5120,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdjquz</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdjquz</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -5114,13 +5134,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdd2w3</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdd2w3</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -5128,13 +5148,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdkosc</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdkosc</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -5142,13 +5162,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdk0x4</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdk0x4</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -5156,13 +5176,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgd2wgf</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd2wgf</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -5175,11 +5195,11 @@ <d:Roster baseCodeValue="1" codeIterationValue="1" minimumRequired="1" maximumAllowed="10"/> </d:GridDimension> <d:GridDimension displayCode="false" displayLabel="false" rank="2"> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-secondDimension-fakeCL-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </d:CodeDomain> @@ -5190,7 +5210,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdl5jb</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TextRepresentation maxLength="255"/> </r:OutParameter> </d:TextDomain> @@ -5206,7 +5226,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgd8lwo</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TextRepresentation maxLength="255"/> </r:OutParameter> </d:TextDomain> @@ -5222,7 +5242,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdbfag</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TextRepresentation maxLength="255"/> </r:OutParameter> </d:TextDomain> @@ -5238,7 +5258,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdlgja</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TextRepresentation maxLength="255"/> </r:OutParameter> </d:TextDomain> @@ -5254,7 +5274,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgd745y</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TextRepresentation maxLength="255"/> </r:OutParameter> </d:TextDomain> @@ -5270,7 +5290,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdjkts</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TextRepresentation maxLength="255"/> </r:OutParameter> </d:TextDomain> @@ -5286,7 +5306,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdcax7</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TextRepresentation maxLength="255"/> </r:OutParameter> </d:TextDomain> @@ -5302,7 +5322,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdjye1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TextRepresentation maxLength="255"/> </r:OutParameter> </d:TextDomain> @@ -5318,7 +5338,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgd5jet</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TextRepresentation maxLength="255"/> </r:OutParameter> </d:TextDomain> @@ -5334,7 +5354,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdjw90</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TextRepresentation maxLength="255"/> </r:OutParameter> </d:TextDomain> @@ -5355,7 +5375,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdfndq</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -5375,7 +5395,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgd7osi</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -5395,7 +5415,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgd7bnw</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -5415,7 +5435,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgd9k71</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -5435,7 +5455,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdimks</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -5455,7 +5475,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdjquz</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -5475,7 +5495,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdd2w3</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -5495,7 +5515,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdkosc</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -5515,7 +5535,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdk0x4</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -5535,7 +5555,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgd2wgf</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -5551,30 +5571,30 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-j334iumu</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">TOWN</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j334iumu--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j334iumu-1</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Springfield</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j334iumu-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j334iumu-2</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Shelbyville</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j334iumu-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j334iumu-3</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Seinfeld</r:Content> </r:Label> @@ -5583,38 +5603,38 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-j6qdqoen</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> - <r:Content xml:lang="fr-FR">MAYOR</r:Content> + <r:Content xml:lang="fr-FR">MAYOR </r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6qdqoen--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6qdqoen-1</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Constance Harm</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6qdqoen-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6qdqoen-2</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Timothy Lovejoy</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6qdqoen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6qdqoen-3</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Joe Quimby</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6qdqoen-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6qdqoen-4</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Poochie</r:Content> </r:Label> @@ -5623,110 +5643,110 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-j4nwo00f</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">State</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwo00f--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwo00f-1</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Washington</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwo00f-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwo00f-2</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Kentucky</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwo00f-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwo00f-3</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Ohio</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwo00f-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwo00f-4</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Maine</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwo00f-3</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwo00f-5</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">North Dakota</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwo00f-4</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwo00f-6</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Florida</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwo00f-5</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwo00f-7</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">North Takoma</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwo00f-6</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwo00f-8</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">California</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwo00f-7</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwo00f-9</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Texas</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwo00f-8</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwo00f-10</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Massachusetts</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwo00f-9</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwo00f-11</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Nevada</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwo00f-10</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwo00f-12</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Illinois</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwo00f-11</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwo00f-13</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Not in any state, you fool!</r:Content> </r:Label> @@ -5735,38 +5755,38 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-j335cu3c</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">ANIMALS</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j335cu3c--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j335cu3c-1</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Santa's Little Helper</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j335cu3c-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j335cu3c-2</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Snowball I</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j335cu3c-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j335cu3c-3</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Coltrane</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j335cu3c-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j335cu3c-4</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Mojo the Helper Monkey</r:Content> </r:Label> @@ -5775,38 +5795,38 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-j6p2mvca</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Flavours</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6p2mvca--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6p2mvca-1</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Vanilla</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6p2mvca-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6p2mvca-2</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Strawberry</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6p2mvca-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6p2mvca-3</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Apple</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6p2mvca-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6p2mvca-4</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Bacon</r:Content> </r:Label> @@ -5815,22 +5835,22 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-jbdxh138</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">YESNO</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdxh138--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdxh138-1</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Yes</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdxh138-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdxh138-2</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">No</r:Content> </r:Label> @@ -5839,38 +5859,38 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-j6qeytgc</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">NUCLEAR_CHARACTERS</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6qeytgc--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6qeytgc-1</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Charles Montgomery Burns</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6qeytgc-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6qeytgc-2</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Carl Carlson</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6qeytgc-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6qeytgc-3</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Otto Mann</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6qeytgc-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6qeytgc-4</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Carl Carlson</r:Content> </r:Label> @@ -5879,46 +5899,46 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-j6z087mq</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">BIRTH_CHARACTER</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6z087mq--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6z087mq-1</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Selma Bouvier</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6z087mq-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6z087mq-2</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Kent Brockman</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6z087mq-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6z087mq-3</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Milhouse Van Houten</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6z087mq-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6z087mq-4</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Nelson Muntz</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6z087mq-3</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6z087mq-5</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Crazy Cat Lady</r:Content> </r:Label> @@ -5927,46 +5947,46 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-jbdxricm</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">CITY_BIRTH</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdxricm--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdxricm-1</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Albuquerque</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdxricm-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdxricm-2</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Springfield</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdxricm-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdxricm-3</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Portland</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdxricm-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdxricm-4</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Shelbyville</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdxricm-3</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdxricm-5</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Dagstuhl</r:Content> </r:Label> @@ -5975,86 +5995,86 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-j4nwh16i</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Products</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwh16i--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwh16i-1</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Frozen products</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwh16i-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwh16i-2</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Ice creams</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwh16i-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwh16i-3</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Jasper Beardly</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwh16i-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwh16i-4</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Meat</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwh16i-3</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwh16i-5</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Bacon</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwh16i-4</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwh16i-6</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Pork chop</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwh16i-5</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwh16i-7</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Chicken</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwh16i-6</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwh16i-8</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Compote</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwh16i-7</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwh16i-9</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Powersauce</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwh16i-8</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwh16i-10</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Other</r:Content> </r:Label> @@ -6063,38 +6083,38 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-j77dav9b</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Clownings</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j77dav9b--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j77dav9b-1</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR"><xhtml:p><xhtml:b><xhtml:i>Break the windows of the whole city</xhtml:i></xhtml:b></xhtml:p></r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j77dav9b-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j77dav9b-2</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR"><xhtml:p><xhtml:b><xhtml:i>Loose the violin of his daughter playing poker</xhtml:i></xhtml:b></xhtml:p></r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j77dav9b-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j77dav9b-3</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR"><xhtml:p><xhtml:b><xhtml:i>Kill Mr Burns</xhtml:i></xhtml:b></xhtml:p></r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j77dav9b-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j77dav9b-4</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR"><xhtml:p><xhtml:b><xhtml:i>Leaving a mechanical object to control the nuclear power plant</xhtml:i></xhtml:b></xhtml:p></r:Content> </r:Label> @@ -6103,38 +6123,38 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-jbdyh6b5</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Clowning_Characters</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdyh6b5--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdyh6b5-1</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Jay</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdyh6b5-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdyh6b5-2</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Bart</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdyh6b5-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdyh6b5-3</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Krusty the clown</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdyh6b5-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdyh6b5-4</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Maggie</r:Content> </r:Label> @@ -6143,38 +6163,38 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-j6p2kivg</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Means of transport</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6p2kivg--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6p2kivg-1</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Car</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6p2kivg-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6p2kivg-2</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Bike</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6p2kivg-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6p2kivg-3</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Skateboard</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6p2kivg-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6p2kivg-4</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Plane</r:Content> </r:Label> @@ -6183,54 +6203,54 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-jbdye1wa</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Country</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdye1wa--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdye1wa-1</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Brazil</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdye1wa-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdye1wa-2</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Canada</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdye1wa-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdye1wa-3</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Japan</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdye1wa-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdye1wa-4</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">France</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdye1wa-3</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdye1wa-5</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR"><xhtml:p>Other country<xhtml:a href="#ftn1"/></xhtml:p></r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdye1wa-4</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdye1wa-6</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Other planet</r:Content> </r:Label> @@ -6239,14 +6259,14 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-j4nwc63q-secondDimension-fakeCL-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">FAKE-CODELIST-j4nwc63q-secondDimension-fakeCL-1</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwc63q-secondDimension-fakeCL-1--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwc63q-secondDimension-fakeCL-1-1</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Percentage</r:Content> </r:Label> @@ -6255,22 +6275,22 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-j4nw0rr6-secondDimension-fakeCL-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">FAKE-CODELIST-j4nw0rr6-secondDimension-fakeCL-1</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nw0rr6-secondDimension-fakeCL-1--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nw0rr6-secondDimension-fakeCL-1-1</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Clowning</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nw0rr6-secondDimension-fakeCL-1-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nw0rr6-secondDimension-fakeCL-1-2</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Remember?</r:Content> </r:Label> @@ -6279,22 +6299,22 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-j6qg8rc6-secondDimension-fakeCL-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">FAKE-CODELIST-j6qg8rc6-secondDimension-fakeCL-1</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6qg8rc6-secondDimension-fakeCL-1--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6qg8rc6-secondDimension-fakeCL-1-1</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Name</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6qg8rc6-secondDimension-fakeCL-1-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6qg8rc6-secondDimension-fakeCL-1-2</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Age</r:Content> </r:Label> @@ -6302,15 +6322,15 @@ </l:CategoryScheme> <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> - <r:ID>CategoryScheme-i6vwid</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CategoryScheme-i6vwi0</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">A définir</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CA-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR"/> </r:Label> @@ -6319,14 +6339,14 @@ <l:CodeListScheme> <r:Agency>fr.insee</r:Agency> <r:ID>SIMPSONS-CLS</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:CodeListSchemeName> <r:String xml:lang="en-IE">SIMPSONS</r:String> </l:CodeListSchemeName> <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>j334iumu</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">TOWN</r:Content> </r:Label> @@ -6336,36 +6356,36 @@ </l:Level> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j334iumu--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j334iumu-1</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j334iumu--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j334iumu-1</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>00001</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j334iumu-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j334iumu-2</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j334iumu-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j334iumu-2</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>00002</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j334iumu-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j334iumu-3</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j334iumu-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j334iumu-3</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>00003</r:Value> @@ -6374,9 +6394,9 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>j6qdqoen</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> - <r:Content xml:lang="fr-FR">MAYOR</r:Content> + <r:Content xml:lang="fr-FR">MAYOR </r:Content> </r:Label> <l:HierarchyType>Regular</l:HierarchyType> <l:Level levelNumber="1"> @@ -6384,48 +6404,48 @@ </l:Level> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j6qdqoen--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j6qdqoen-1</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6qdqoen--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6qdqoen-1</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>1</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j6qdqoen-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j6qdqoen-2</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6qdqoen-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6qdqoen-2</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>2</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j6qdqoen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j6qdqoen-3</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6qdqoen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6qdqoen-3</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>3</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j6qdqoen-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j6qdqoen-4</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6qdqoen-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6qdqoen-4</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>4</r:Value> @@ -6434,7 +6454,7 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwo00f</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">State</r:Content> </r:Label> @@ -6444,156 +6464,156 @@ </l:Level> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwo00f--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j4nwo00f-1</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwo00f--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwo00f-1</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>1</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwo00f-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j4nwo00f-2</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwo00f-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwo00f-2</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>2</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwo00f-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j4nwo00f-3</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwo00f-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwo00f-3</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>3</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwo00f-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j4nwo00f-4</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwo00f-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwo00f-4</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>4</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwo00f-3</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j4nwo00f-5</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwo00f-3</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwo00f-5</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>5</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwo00f-4</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j4nwo00f-6</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwo00f-4</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwo00f-6</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>6</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwo00f-5</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j4nwo00f-7</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwo00f-5</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwo00f-7</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>7</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwo00f-6</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j4nwo00f-8</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwo00f-6</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwo00f-8</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>8</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwo00f-7</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j4nwo00f-9</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwo00f-7</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwo00f-9</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>9</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwo00f-8</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j4nwo00f-10</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwo00f-8</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwo00f-10</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>10</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwo00f-9</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j4nwo00f-11</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwo00f-9</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwo00f-11</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>11</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwo00f-10</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j4nwo00f-12</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwo00f-10</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwo00f-12</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>12</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwo00f-11</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j4nwo00f-13</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwo00f-11</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwo00f-13</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>13</r:Value> @@ -6602,7 +6622,7 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>j335cu3c</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">ANIMALS</r:Content> </r:Label> @@ -6612,48 +6632,48 @@ </l:Level> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j335cu3c--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j335cu3c-1</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j335cu3c--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j335cu3c-1</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>1</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j335cu3c-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j335cu3c-2</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j335cu3c-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j335cu3c-2</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>2</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j335cu3c-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j335cu3c-3</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j335cu3c-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j335cu3c-3</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>3</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j335cu3c-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j335cu3c-4</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j335cu3c-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j335cu3c-4</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>4</r:Value> @@ -6662,7 +6682,7 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2mvca</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Flavours</r:Content> </r:Label> @@ -6672,48 +6692,48 @@ </l:Level> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j6p2mvca--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j6p2mvca-1</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6p2mvca--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6p2mvca-1</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>1</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j6p2mvca-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j6p2mvca-2</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6p2mvca-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6p2mvca-2</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>2</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j6p2mvca-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j6p2mvca-3</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6p2mvca-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6p2mvca-3</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>3</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j6p2mvca-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j6p2mvca-4</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6p2mvca-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6p2mvca-4</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>4</r:Value> @@ -6722,7 +6742,7 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">YESNO</r:Content> </r:Label> @@ -6732,24 +6752,24 @@ </l:Level> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>jbdxh138--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>jbdxh138-1</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdxh138--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdxh138-1</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>1</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>jbdxh138-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>jbdxh138-2</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdxh138-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdxh138-2</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>0</r:Value> @@ -6758,7 +6778,7 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>j6qeytgc</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">NUCLEAR_CHARACTERS</r:Content> </r:Label> @@ -6768,48 +6788,48 @@ </l:Level> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j6qeytgc--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j6qeytgc-1</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6qeytgc--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6qeytgc-1</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>1</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j6qeytgc-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j6qeytgc-2</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6qeytgc-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6qeytgc-2</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>2</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j6qeytgc-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j6qeytgc-3</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6qeytgc-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6qeytgc-3</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>3</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j6qeytgc-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j6qeytgc-4</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6qeytgc-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6qeytgc-4</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>4</r:Value> @@ -6818,7 +6838,7 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>j6z087mq</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">BIRTH_CHARACTER</r:Content> </r:Label> @@ -6828,60 +6848,60 @@ </l:Level> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j6z087mq--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j6z087mq-1</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6z087mq--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6z087mq-1</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>1</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j6z087mq-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j6z087mq-2</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6z087mq-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6z087mq-2</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>2</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j6z087mq-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j6z087mq-3</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6z087mq-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6z087mq-3</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>3</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j6z087mq-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j6z087mq-4</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6z087mq-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6z087mq-4</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>4</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j6z087mq-3</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j6z087mq-5</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6z087mq-3</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6z087mq-5</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>5</r:Value> @@ -6890,7 +6910,7 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxricm</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">CITY_BIRTH</r:Content> </r:Label> @@ -6900,60 +6920,60 @@ </l:Level> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>jbdxricm--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>jbdxricm-1</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdxricm--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdxricm-1</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>1</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>jbdxricm-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>jbdxricm-2</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdxricm-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdxricm-2</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>2</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>jbdxricm-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>jbdxricm-3</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdxricm-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdxricm-3</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>3</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>jbdxricm-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>jbdxricm-4</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdxricm-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdxricm-4</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>4</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>jbdxricm-3</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>jbdxricm-5</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdxricm-3</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdxricm-5</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>5</r:Value> @@ -6962,7 +6982,7 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwh16i</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Products</r:Content> </r:Label> @@ -6972,35 +6992,35 @@ </l:Level> <l:Code levelNumber="1" isDiscrete="false"> <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwh16i--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j4nwh16i-1</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwh16i--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwh16i-1</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>A</r:Value> <l:Code levelNumber="2" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwh16i-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j4nwh16i-2</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwh16i-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwh16i-2</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>A1</r:Value> </l:Code> <l:Code levelNumber="2" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwh16i-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j4nwh16i-3</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwh16i-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwh16i-3</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>A2</r:Value> @@ -7008,47 +7028,47 @@ </l:Code> <l:Code levelNumber="1" isDiscrete="false"> <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwh16i-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j4nwh16i-4</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwh16i-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwh16i-4</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>B</r:Value> <l:Code levelNumber="2" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwh16i-3</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j4nwh16i-5</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwh16i-3</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwh16i-5</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>B1</r:Value> </l:Code> <l:Code levelNumber="2" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwh16i-4</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j4nwh16i-6</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwh16i-4</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwh16i-6</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>B2</r:Value> </l:Code> <l:Code levelNumber="2" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwh16i-5</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j4nwh16i-7</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwh16i-5</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwh16i-7</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>B3</r:Value> @@ -7056,23 +7076,23 @@ </l:Code> <l:Code levelNumber="1" isDiscrete="false"> <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwh16i-6</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j4nwh16i-8</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwh16i-6</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwh16i-8</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>C</r:Value> <l:Code levelNumber="2" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwh16i-7</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j4nwh16i-9</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwh16i-7</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwh16i-9</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>C1</r:Value> @@ -7080,12 +7100,12 @@ </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwh16i-8</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j4nwh16i-10</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwh16i-8</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwh16i-10</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>D</r:Value> @@ -7094,7 +7114,7 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>j77dav9b</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Clownings</r:Content> </r:Label> @@ -7104,48 +7124,48 @@ </l:Level> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j77dav9b--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j77dav9b-1</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j77dav9b--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j77dav9b-1</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>1</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j77dav9b-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j77dav9b-2</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j77dav9b-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j77dav9b-2</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>2</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j77dav9b-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j77dav9b-3</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j77dav9b-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j77dav9b-3</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>3</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j77dav9b-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j77dav9b-4</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j77dav9b-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j77dav9b-4</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>4</r:Value> @@ -7154,7 +7174,7 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>jbdyh6b5</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Clowning_Characters</r:Content> </r:Label> @@ -7164,48 +7184,48 @@ </l:Level> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>jbdyh6b5--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>jbdyh6b5-1</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdyh6b5--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdyh6b5-1</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>1</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>jbdyh6b5-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>jbdyh6b5-2</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdyh6b5-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdyh6b5-2</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>2</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>jbdyh6b5-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>jbdyh6b5-3</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdyh6b5-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdyh6b5-3</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>3</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>jbdyh6b5-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>jbdyh6b5-4</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdyh6b5-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdyh6b5-4</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>4</r:Value> @@ -7214,7 +7234,7 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2kivg</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Means of transport</r:Content> </r:Label> @@ -7224,48 +7244,48 @@ </l:Level> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j6p2kivg--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j6p2kivg-1</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6p2kivg--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6p2kivg-1</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>1</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j6p2kivg-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j6p2kivg-2</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6p2kivg-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6p2kivg-2</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>2</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j6p2kivg-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j6p2kivg-3</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6p2kivg-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6p2kivg-3</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>3</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j6p2kivg-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j6p2kivg-4</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6p2kivg-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6p2kivg-4</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>4</r:Value> @@ -7274,7 +7294,7 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>jbdye1wa</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Country</r:Content> </r:Label> @@ -7284,72 +7304,72 @@ </l:Level> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>jbdye1wa--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>jbdye1wa-1</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdye1wa--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdye1wa-1</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>1</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>jbdye1wa-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>jbdye1wa-2</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdye1wa-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdye1wa-2</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>2</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>jbdye1wa-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>jbdye1wa-3</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdye1wa-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdye1wa-3</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>3</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>jbdye1wa-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>jbdye1wa-4</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdye1wa-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdye1wa-4</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>4</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>jbdye1wa-3</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>jbdye1wa-5</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdye1wa-3</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdye1wa-5</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>5</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>jbdye1wa-4</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>jbdye1wa-6</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdye1wa-4</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdye1wa-6</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>6</r:Value> @@ -7358,7 +7378,7 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-secondDimension-fakeCL-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">FAKE-CODELIST-j4nwc63q-secondDimension-fakeCL-1</r:Content> </r:Label> @@ -7368,12 +7388,12 @@ </l:Level> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwc63q-secondDimension-fakeCL-1--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j4nwc63q-secondDimension-fakeCL-1-1</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwc63q-secondDimension-fakeCL-1--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwc63q-secondDimension-fakeCL-1-1</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>1</r:Value> @@ -7382,7 +7402,7 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-secondDimension-fakeCL-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">FAKE-CODELIST-j4nw0rr6-secondDimension-fakeCL-1</r:Content> </r:Label> @@ -7392,24 +7412,24 @@ </l:Level> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j4nw0rr6-secondDimension-fakeCL-1--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j4nw0rr6-secondDimension-fakeCL-1-1</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nw0rr6-secondDimension-fakeCL-1--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nw0rr6-secondDimension-fakeCL-1-1</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>1</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j4nw0rr6-secondDimension-fakeCL-1-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j4nw0rr6-secondDimension-fakeCL-1-2</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nw0rr6-secondDimension-fakeCL-1-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nw0rr6-secondDimension-fakeCL-1-2</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>2</r:Value> @@ -7418,7 +7438,7 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-secondDimension-fakeCL-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">FAKE-CODELIST-j6qg8rc6-secondDimension-fakeCL-1</r:Content> </r:Label> @@ -7428,24 +7448,24 @@ </l:Level> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j6qg8rc6-secondDimension-fakeCL-1--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j6qg8rc6-secondDimension-fakeCL-1-1</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6qg8rc6-secondDimension-fakeCL-1--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6qg8rc6-secondDimension-fakeCL-1-1</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>1</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j6qg8rc6-secondDimension-fakeCL-1-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j6qg8rc6-secondDimension-fakeCL-1-2</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6qg8rc6-secondDimension-fakeCL-1-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6qg8rc6-secondDimension-fakeCL-1-2</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>2</r:Value> @@ -7454,7 +7474,7 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:CodeListName> <r:String xml:lang="fr-FR">Booleen</r:String> </l:CodeListName> @@ -7465,11 +7485,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CA-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>1</r:Value> @@ -7478,231 +7498,348 @@ </l:CodeListScheme> <l:VariableScheme> <r:Agency>fr.insee</r:Agency> - <r:ID>VariableScheme-i6vwid</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>VariableScheme-i6vwi0</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Variable Scheme for the survey</r:Content> </r:Label> + <l:Variable> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbcggtca</r:ID> + <r:Version>1</r:Version> + <l:VariableName> + <r:String xml:lang="fr-FR">SUM_EXPENSES</r:String> + </l:VariableName> + <r:Label> + <r:Content xml:lang="fr-FR">SUM_EXPENSES label </r:Content> + </r:Label> + <r:OutParameter> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbcggtca-VROP</r:ID> + <r:Version>1</r:Version> + </r:OutParameter> + <l:VariableRepresentation> + <r:ProcessingInstructionReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbcggtca-GI</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>GenerationInstruction</r:TypeOfObject> + <r:Binding> + <r:SourceParameterReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbcggtca-GOP</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>OutParameter</r:TypeOfObject> + </r:SourceParameterReference> + <r:TargetParameterReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbcggtca-VROP</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>OutParameter</r:TypeOfObject> + </r:TargetParameterReference> + </r:Binding> + </r:ProcessingInstructionReference> + <r:NumericRepresentation/> + </l:VariableRepresentation> + </l:Variable> + <l:Variable> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbcggtex</r:ID> + <r:Version>1</r:Version> + <l:VariableName> + <r:String xml:lang="fr-FR">LAST_BROADCAST</r:String> + </l:VariableName> + <r:Label> + <r:Content xml:lang="fr-FR">LAST_BROADCAST label </r:Content> + </r:Label> + </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbcgfvir</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">COMMENT</r:String> </l:VariableName> <r:Label> - <r:Content xml:lang="fr-FR">COMMENT label</r:Content> + <r:Content xml:lang="fr-FR">COMMENT label </r:Content> </r:Label> <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p3dkx6-QOP-jbgdhaht</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p3dkx6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:TextRepresentation maxLength="500"/> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbcgm0ip</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">READY</r:String> </l:VariableName> <r:Label> - <r:Content xml:lang="fr-FR">READY label</r:Content> + <r:Content xml:lang="fr-FR">READY label </r:Content> </r:Label> <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p0np9q-QOP-jbgd3set</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p0np9q</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbcgf11f</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">PRODUCER</r:String> </l:VariableName> <r:Label> - <r:Content xml:lang="fr-FR">PRODUCER label</r:Content> + <r:Content xml:lang="fr-FR">PRODUCER label </r:Content> </r:Label> <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j3343qhx-QOP-jbgd90cy</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j3343qhx</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:TextRepresentation maxLength="30"/> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbcgcy2x</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">SEASON_NUMBER</r:String> </l:VariableName> <r:Label> - <r:Content xml:lang="fr-FR">SEASON_NUMBER label</r:Content> + <r:Content xml:lang="fr-FR">SEASON_NUMBER label </r:Content> </r:Label> <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6q9h8tj-QOP-jbgdjy8h</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6q9h8tj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:NumericRepresentation> + <r:NumberRange> + <r:Low isInclusive="true">0</r:Low> + <r:High isInclusive="true">99</r:High> + </r:NumberRange> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + </r:NumericRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbcgbg33</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">DATEFIRST</r:String> </l:VariableName> <r:Label> - <r:Content xml:lang="fr-FR">DATEFIRST label</r:Content> + <r:Content xml:lang="fr-FR">DATEFIRST label </r:Content> </r:Label> <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334cyqb-QOP-jbgdih2z</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334cyqb</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:DateTimeRepresentationReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-MNR-DateTimedate-YYYY-MM-DD</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>ManagedDateTimeRepresentation</r:TypeOfObject> + </r:DateTimeRepresentationReference> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbcgieyw</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">AUDIENCE_SHARE</r:String> </l:VariableName> <r:Label> - <r:Content xml:lang="fr-FR">AUDIENCE_SHARE label</r:Content> + <r:Content xml:lang="fr-FR">AUDIENCE_SHARE label </r:Content> </r:Label> <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6z06z1e-QOP-jbgddnrd</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6z06z1e</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:NumericRepresentation decimalPositions="1"> + <r:NumberRange> + <r:Low isInclusive="true">0</r:Low> + <r:High isInclusive="true">99</r:High> + </r:NumberRange> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + </r:NumericRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbcgasbh</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">CITY</r:String> </l:VariableName> <r:Label> - <r:Content xml:lang="fr-FR">CITY label</r:Content> + <r:Content xml:lang="fr-FR">CITY label </r:Content> </r:Label> <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j3343clt-QOP-jbgdjdkn</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j3343clt</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeListReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>j334iumu</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>CodeList</r:TypeOfObject> + </r:CodeListReference> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbcg9yr6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">MAYOR</r:String> </l:VariableName> <r:Label> - <r:Content xml:lang="fr-FR">MAYOR label</r:Content> + <r:Content xml:lang="fr-FR">MAYOR label </r:Content> </r:Label> <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qdfhvw-QOP-jbgd8ghp</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qdfhvw</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeListReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>j6qdqoen</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>CodeList</r:TypeOfObject> + </r:CodeListReference> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbcgpija</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">STATE</r:String> </l:VariableName> <r:Label> - <r:Content xml:lang="fr-FR">STATE label</r:Content> + <r:Content xml:lang="fr-FR">STATE label </r:Content> </r:Label> <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw5cqz-QOP-jbgdkd7v</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw5cqz</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeListReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>j4nwo00f</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>CodeList</r:TypeOfObject> + </r:CodeListReference> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxewlq</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">PET1</r:String> </l:VariableName> @@ -7712,21 +7849,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-QOP-jbgd8qmn</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxjmst</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">PET2</r:String> </l:VariableName> @@ -7736,21 +7886,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-QOP-jbgd60vl</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxjuay</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">PET3</r:String> </l:VariableName> @@ -7760,21 +7923,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-QOP-jbgda2jo</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxniuw</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">PET4</r:String> </l:VariableName> @@ -7784,21 +7960,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-QOP-jbgdfssy</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxtl1d</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">ICE_FLAVOUR1</r:String> </l:VariableName> @@ -7808,21 +7997,30 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-QOP-jbgdb3jx</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeListReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbdxh138</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>CodeList</r:TypeOfObject> + </r:CodeListReference> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxvai9</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">ICE_FLAVOUR2</r:String> </l:VariableName> @@ -7832,21 +8030,30 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-QOP-jbgdb61k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeListReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbdxh138</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>CodeList</r:TypeOfObject> + </r:CodeListReference> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxpltw</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">ICE_FLAVOUR3</r:String> </l:VariableName> @@ -7856,21 +8063,30 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-QOP-jbgdl3kc</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeListReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbdxh138</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>CodeList</r:TypeOfObject> + </r:CodeListReference> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxzx2x</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">ICE_FLAVOUR4</r:String> </l:VariableName> @@ -7880,21 +8096,30 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-QOP-jbgdcobo</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeListReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbdxh138</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>CodeList</r:TypeOfObject> + </r:CodeListReference> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdy4nhp</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">NUCLEAR_CHARACTER1</r:String> </l:VariableName> @@ -7904,21 +8129,30 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-QOP-jbgd6p0k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeListReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbdxh138</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>CodeList</r:TypeOfObject> + </r:CodeListReference> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxtanu</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">NUCLEAR_CHARACTER2</r:String> </l:VariableName> @@ -7928,21 +8162,30 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-QOP-jbgd9ato</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeListReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbdxh138</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>CodeList</r:TypeOfObject> + </r:CodeListReference> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdy25if</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">NUCLEAR_CHARACTER3</r:String> </l:VariableName> @@ -7952,21 +8195,30 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-QOP-jbgd3e0p</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeListReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbdxh138</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>CodeList</r:TypeOfObject> + </r:CodeListReference> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxvta8</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">NUCLEAR_CHARACTER4</r:String> </l:VariableName> @@ -7976,21 +8228,30 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-QOP-jbgdkxne</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeListReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbdxh138</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>CodeList</r:TypeOfObject> + </r:CodeListReference> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdy3nh7</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">BIRTH_CHARACTER1</r:String> </l:VariableName> @@ -8000,21 +8261,30 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QOP-jbgd7fr6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeListReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbdxricm</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>CodeList</r:TypeOfObject> + </r:CodeListReference> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdy6lk3</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">BIRTH_CHARACTER2</r:String> </l:VariableName> @@ -8024,21 +8294,30 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QOP-jbgd5e9f</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeListReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbdxricm</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>CodeList</r:TypeOfObject> + </r:CodeListReference> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxsby0</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">BIRTH_CHARACTER3</r:String> </l:VariableName> @@ -8048,21 +8327,30 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QOP-jbgd912x</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeListReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbdxricm</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>CodeList</r:TypeOfObject> + </r:CodeListReference> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdy7sra</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">BIRTH_CHARACTER4</r:String> </l:VariableName> @@ -8072,21 +8360,30 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QOP-jbgd6bdy</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeListReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbdxricm</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>CodeList</r:TypeOfObject> + </r:CodeListReference> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdy2wyl</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">BIRTH_CHARACTER5</r:String> </l:VariableName> @@ -8096,21 +8393,30 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QOP-jbgddyry</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeListReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbdxricm</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>CodeList</r:TypeOfObject> + </r:CodeListReference> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdnfk7</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES11</r:String> </l:VariableName> @@ -8120,28 +8426,30 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgde5yl</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation><d:NumericDomain decimalPositions="1"><r:MeasurementUnit>%</r:MeasurementUnit><r:NumberRange> - <r:Low isInclusive="true">0</r:Low> - <r:High isInclusive="true">100</r:High> - </r:NumberRange><r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode><r:OutParameter isArray="false"> - <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwc63q-RDOP-jbgde5yl</r:ID> - <r:Version>0.1.0</r:Version> - </r:OutParameter></d:NumericDomain></l:VariableRepresentation> + <l:VariableRepresentation> + <r:NumericRepresentation decimalPositions="1"> + <r:MeasurementUnit>%</r:MeasurementUnit> + <r:NumberRange> + <r:Low isInclusive="true">0</r:Low> + <r:High isInclusive="true">100</r:High> + </r:NumberRange> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + </r:NumericRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdje4w</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES21</r:String> </l:VariableName> @@ -8151,28 +8459,30 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd2x2t</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation><d:NumericDomain decimalPositions="1"><r:MeasurementUnit>%</r:MeasurementUnit><r:NumberRange> - <r:Low isInclusive="true">0</r:Low> - <r:High isInclusive="true">100</r:High> - </r:NumberRange><r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode><r:OutParameter isArray="false"> - <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwc63q-RDOP-jbgd2x2t</r:ID> - <r:Version>0.1.0</r:Version> - </r:OutParameter></d:NumericDomain></l:VariableRepresentation> + <l:VariableRepresentation> + <r:NumericRepresentation decimalPositions="1"> + <r:MeasurementUnit>%</r:MeasurementUnit> + <r:NumberRange> + <r:Low isInclusive="true">0</r:Low> + <r:High isInclusive="true">100</r:High> + </r:NumberRange> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + </r:NumericRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdlth7</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES31</r:String> </l:VariableName> @@ -8182,28 +8492,30 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdjypz</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation><d:NumericDomain decimalPositions="1"><r:MeasurementUnit>%</r:MeasurementUnit><r:NumberRange> - <r:Low isInclusive="true">0</r:Low> - <r:High isInclusive="true">100</r:High> - </r:NumberRange><r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode><r:OutParameter isArray="false"> - <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwc63q-RDOP-jbgdjypz</r:ID> - <r:Version>0.1.0</r:Version> - </r:OutParameter></d:NumericDomain></l:VariableRepresentation> + <l:VariableRepresentation> + <r:NumericRepresentation decimalPositions="1"> + <r:MeasurementUnit>%</r:MeasurementUnit> + <r:NumberRange> + <r:Low isInclusive="true">0</r:Low> + <r:High isInclusive="true">100</r:High> + </r:NumberRange> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + </r:NumericRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdelbl</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES41</r:String> </l:VariableName> @@ -8213,28 +8525,30 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdcftu</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation><d:NumericDomain decimalPositions="1"><r:MeasurementUnit>%</r:MeasurementUnit><r:NumberRange> - <r:Low isInclusive="true">0</r:Low> - <r:High isInclusive="true">100</r:High> - </r:NumberRange><r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode><r:OutParameter isArray="false"> - <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwc63q-RDOP-jbgdcftu</r:ID> - <r:Version>0.1.0</r:Version> - </r:OutParameter></d:NumericDomain></l:VariableRepresentation> + <l:VariableRepresentation> + <r:NumericRepresentation decimalPositions="1"> + <r:MeasurementUnit>%</r:MeasurementUnit> + <r:NumberRange> + <r:Low isInclusive="true">0</r:Low> + <r:High isInclusive="true">100</r:High> + </r:NumberRange> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + </r:NumericRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd95jq</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES51</r:String> </l:VariableName> @@ -8244,28 +8558,30 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdiyfe</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation><d:NumericDomain decimalPositions="1"><r:MeasurementUnit>%</r:MeasurementUnit><r:NumberRange> - <r:Low isInclusive="true">0</r:Low> - <r:High isInclusive="true">100</r:High> - </r:NumberRange><r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode><r:OutParameter isArray="false"> - <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwc63q-RDOP-jbgdiyfe</r:ID> - <r:Version>0.1.0</r:Version> - </r:OutParameter></d:NumericDomain></l:VariableRepresentation> + <l:VariableRepresentation> + <r:NumericRepresentation decimalPositions="1"> + <r:MeasurementUnit>%</r:MeasurementUnit> + <r:NumberRange> + <r:Low isInclusive="true">0</r:Low> + <r:High isInclusive="true">100</r:High> + </r:NumberRange> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + </r:NumericRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdadd9</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES61</r:String> </l:VariableName> @@ -8275,28 +8591,30 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdj1wd</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation><d:NumericDomain decimalPositions="1"><r:MeasurementUnit>%</r:MeasurementUnit><r:NumberRange> - <r:Low isInclusive="true">0</r:Low> - <r:High isInclusive="true">100</r:High> - </r:NumberRange><r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode><r:OutParameter isArray="false"> - <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwc63q-RDOP-jbgdj1wd</r:ID> - <r:Version>0.1.0</r:Version> - </r:OutParameter></d:NumericDomain></l:VariableRepresentation> + <l:VariableRepresentation> + <r:NumericRepresentation decimalPositions="1"> + <r:MeasurementUnit>%</r:MeasurementUnit> + <r:NumberRange> + <r:Low isInclusive="true">0</r:Low> + <r:High isInclusive="true">100</r:High> + </r:NumberRange> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + </r:NumericRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdlwzk</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES71</r:String> </l:VariableName> @@ -8306,28 +8624,30 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgddylk</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation><d:NumericDomain decimalPositions="1"><r:MeasurementUnit>%</r:MeasurementUnit><r:NumberRange> - <r:Low isInclusive="true">0</r:Low> - <r:High isInclusive="true">100</r:High> - </r:NumberRange><r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode><r:OutParameter isArray="false"> - <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwc63q-RDOP-jbgddylk</r:ID> - <r:Version>0.1.0</r:Version> - </r:OutParameter></d:NumericDomain></l:VariableRepresentation> + <l:VariableRepresentation> + <r:NumericRepresentation decimalPositions="1"> + <r:MeasurementUnit>%</r:MeasurementUnit> + <r:NumberRange> + <r:Low isInclusive="true">0</r:Low> + <r:High isInclusive="true">100</r:High> + </r:NumberRange> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + </r:NumericRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdfz77</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES81</r:String> </l:VariableName> @@ -8337,28 +8657,30 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd3jj6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation><d:NumericDomain decimalPositions="1"><r:MeasurementUnit>%</r:MeasurementUnit><r:NumberRange> - <r:Low isInclusive="true">0</r:Low> - <r:High isInclusive="true">100</r:High> - </r:NumberRange><r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode><r:OutParameter isArray="false"> - <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwc63q-RDOP-jbgd3jj6</r:ID> - <r:Version>0.1.0</r:Version> - </r:OutParameter></d:NumericDomain></l:VariableRepresentation> + <l:VariableRepresentation> + <r:NumericRepresentation decimalPositions="1"> + <r:MeasurementUnit>%</r:MeasurementUnit> + <r:NumberRange> + <r:Low isInclusive="true">0</r:Low> + <r:High isInclusive="true">100</r:High> + </r:NumberRange> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + </r:NumericRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdepx6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES91</r:String> </l:VariableName> @@ -8368,28 +8690,30 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd4w3k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation><d:NumericDomain decimalPositions="1"><r:MeasurementUnit>%</r:MeasurementUnit><r:NumberRange> - <r:Low isInclusive="true">0</r:Low> - <r:High isInclusive="true">100</r:High> - </r:NumberRange><r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode><r:OutParameter isArray="false"> - <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwc63q-RDOP-jbgd4w3k</r:ID> - <r:Version>0.1.0</r:Version> - </r:OutParameter></d:NumericDomain></l:VariableRepresentation> + <l:VariableRepresentation> + <r:NumericRepresentation decimalPositions="1"> + <r:MeasurementUnit>%</r:MeasurementUnit> + <r:NumberRange> + <r:Low isInclusive="true">0</r:Low> + <r:High isInclusive="true">100</r:High> + </r:NumberRange> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + </r:NumericRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdepx7</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES101</r:String> </l:VariableName> @@ -8399,28 +8723,30 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd4w4k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation><d:NumericDomain decimalPositions="1"><r:MeasurementUnit>%</r:MeasurementUnit><r:NumberRange> - <r:Low isInclusive="true">0</r:Low> - <r:High isInclusive="true">100</r:High> - </r:NumberRange><r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode><r:OutParameter isArray="false"> - <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwc63q-RDOP-jbgd4w4k</r:ID> - <r:Version>0.1.0</r:Version> - </r:OutParameter></d:NumericDomain></l:VariableRepresentation> + <l:VariableRepresentation> + <r:NumericRepresentation decimalPositions="1"> + <r:MeasurementUnit>%</r:MeasurementUnit> + <r:NumberRange> + <r:Low isInclusive="true">0</r:Low> + <r:High isInclusive="true">100</r:High> + </r:NumberRange> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + </r:NumericRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd9vqv</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">CLOWNING11</r:String> </l:VariableName> @@ -8430,45 +8756,63 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgd8tyr</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeListReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbdyh6b5</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>CodeList</r:TypeOfObject> + </r:CodeListReference> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgden0i</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">CLOWNING21</r:String> </l:VariableName> <r:Label> - <r:Content xml:lang="fr-FR">Loose the violin of his daughter playing poker-Clowning </r:Content> + <r:Content xml:lang="fr-FR">Loose the violin of his daughter playing poker-Clowning</r:Content> </r:Label> <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdep36</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeListReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbdyh6b5</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>CodeList</r:TypeOfObject> + </r:CodeListReference> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdndju</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">CLOWNING31</r:String> </l:VariableName> @@ -8478,21 +8822,30 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdjjgi</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeListReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbdyh6b5</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>CodeList</r:TypeOfObject> + </r:CodeListReference> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdfwg9</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">CLOWNING41</r:String> </l:VariableName> @@ -8502,21 +8855,30 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdgh6k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeListReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbdyh6b5</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>CodeList</r:TypeOfObject> + </r:CodeListReference> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdd3ky</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">CLOWNING12</r:String> </l:VariableName> @@ -8526,45 +8888,49 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdit3o</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:TextRepresentation maxLength="255"/> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdm9lm</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">CLOWNING22</r:String> </l:VariableName> <r:Label> - <r:Content xml:lang="fr-FR">Loose the violin of his daughter playing poker-Remember? </r:Content> + <r:Content xml:lang="fr-FR">Loose the violin of his daughter playing poker-Remember?</r:Content> </r:Label> <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgd366k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:TextRepresentation maxLength="255"/> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdcdhv</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">CLOWNING32</r:String> </l:VariableName> @@ -8574,21 +8940,23 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdax06</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:TextRepresentation maxLength="255"/> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdjlit</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">CLOWNING42</r:String> </l:VariableName> @@ -8598,21 +8966,23 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdfo1j</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:TextRepresentation maxLength="255"/> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd1zxu</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL11</r:String> </l:VariableName> @@ -8622,21 +8992,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd92mb</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd8lfs</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL21</r:String> </l:VariableName> @@ -8646,21 +9029,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdgsat</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd56qo</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL31</r:String> </l:VariableName> @@ -8670,21 +9066,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdaxk2</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd4wu8</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL41</r:String> </l:VariableName> @@ -8694,21 +9103,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd7myn</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdak6h</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL12</r:String> </l:VariableName> @@ -8718,21 +9140,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdnxkt</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdmsy4</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL22</r:String> </l:VariableName> @@ -8742,21 +9177,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd3ef5</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd2zlu</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL32</r:String> </l:VariableName> @@ -8766,21 +9214,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd8p1v</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd6v73</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL42</r:String> </l:VariableName> @@ -8790,21 +9251,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdgm0c</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdf5fg</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL13</r:String> </l:VariableName> @@ -8814,21 +9288,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdcppc</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd2xg0</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL23</r:String> </l:VariableName> @@ -8838,21 +9325,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd4cm6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdc06l</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL33</r:String> </l:VariableName> @@ -8862,21 +9362,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdd2lo</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdb8i9</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL43</r:String> </l:VariableName> @@ -8886,21 +9399,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdo0ay</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdhzve</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL14</r:String> </l:VariableName> @@ -8910,21 +9436,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd4r2a</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd93ks</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL24</r:String> </l:VariableName> @@ -8934,21 +9473,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdkfpq</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdfw7h</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL34</r:String> </l:VariableName> @@ -8958,21 +9510,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd7u52</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdfavn</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL44</r:String> </l:VariableName> @@ -8982,21 +9547,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdgfwl</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdc199</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL15</r:String> </l:VariableName> @@ -9006,21 +9584,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd9cff</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdfqph</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL25</r:String> </l:VariableName> @@ -9030,21 +9621,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgddwsp</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd8r0n</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL35</r:String> </l:VariableName> @@ -9054,21 +9658,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdncn8</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd3aqk</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL45</r:String> </l:VariableName> @@ -9078,21 +9695,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdnz6b</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdltql</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL16</r:String> </l:VariableName> @@ -9102,21 +9732,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdiva0</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd9um3</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL26</r:String> </l:VariableName> @@ -9126,21 +9769,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd7dqf</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgddj7v</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL36</r:String> </l:VariableName> @@ -9150,21 +9806,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdnous</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdb4ym</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL46</r:String> </l:VariableName> @@ -9174,21 +9843,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdkfcz</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd3fkz</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS11</r:String> </l:VariableName> @@ -9198,21 +9880,23 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdl5jb</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:TextRepresentation maxLength="255"/> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdf2md</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS21</r:String> </l:VariableName> @@ -9222,21 +9906,23 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd8lwo</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:TextRepresentation maxLength="255"/> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdfle1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS31</r:String> </l:VariableName> @@ -9246,21 +9932,23 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdbfag</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:TextRepresentation maxLength="255"/> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdix8x</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS41</r:String> </l:VariableName> @@ -9270,21 +9958,23 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdlgja</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:TextRepresentation maxLength="255"/> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd782k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS51</r:String> </l:VariableName> @@ -9294,21 +9984,23 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd745y</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:TextRepresentation maxLength="255"/> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd68rf</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS61</r:String> </l:VariableName> @@ -9318,21 +10010,23 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdjkts</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:TextRepresentation maxLength="255"/> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdfoj4</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS71</r:String> </l:VariableName> @@ -9342,21 +10036,23 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdcax7</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:TextRepresentation maxLength="255"/> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdb116</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS81</r:String> </l:VariableName> @@ -9366,21 +10062,23 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdjye1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:TextRepresentation maxLength="255"/> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd7w5p</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS91</r:String> </l:VariableName> @@ -9390,21 +10088,23 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd5jet</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:TextRepresentation maxLength="255"/> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd8rj2</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS101</r:String> </l:VariableName> @@ -9414,21 +10114,23 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdjw90</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:TextRepresentation maxLength="255"/> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdidnp</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS12</r:String> </l:VariableName> @@ -9438,21 +10140,29 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdfndq</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:NumericRepresentation> + <r:NumberRange> + <r:Low isInclusive="true">0</r:Low> + <r:High isInclusive="true">120</r:High> + </r:NumberRange> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + </r:NumericRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd47wz</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS22</r:String> </l:VariableName> @@ -9462,21 +10172,29 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd7osi</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:NumericRepresentation> + <r:NumberRange> + <r:Low isInclusive="true">0</r:Low> + <r:High isInclusive="true">120</r:High> + </r:NumberRange> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + </r:NumericRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdj2nn</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS32</r:String> </l:VariableName> @@ -9486,21 +10204,29 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd7bnw</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:NumericRepresentation> + <r:NumberRange> + <r:Low isInclusive="true">0</r:Low> + <r:High isInclusive="true">120</r:High> + </r:NumberRange> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + </r:NumericRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd2ipx</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS42</r:String> </l:VariableName> @@ -9510,21 +10236,29 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd9k71</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:NumericRepresentation> + <r:NumberRange> + <r:Low isInclusive="true">0</r:Low> + <r:High isInclusive="true">120</r:High> + </r:NumberRange> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + </r:NumericRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd4pe3</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS52</r:String> </l:VariableName> @@ -9534,21 +10268,29 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdimks</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:NumericRepresentation> + <r:NumberRange> + <r:Low isInclusive="true">0</r:Low> + <r:High isInclusive="true">120</r:High> + </r:NumberRange> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + </r:NumericRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdjgb1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS62</r:String> </l:VariableName> @@ -9558,21 +10300,29 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdjquz</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:NumericRepresentation> + <r:NumberRange> + <r:Low isInclusive="true">0</r:Low> + <r:High isInclusive="true">120</r:High> + </r:NumberRange> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + </r:NumericRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdb5c1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS72</r:String> </l:VariableName> @@ -9582,21 +10332,29 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdd2w3</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:NumericRepresentation> + <r:NumberRange> + <r:Low isInclusive="true">0</r:Low> + <r:High isInclusive="true">120</r:High> + </r:NumberRange> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + </r:NumericRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdju9y</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS82</r:String> </l:VariableName> @@ -9606,21 +10364,29 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdkosc</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:NumericRepresentation> + <r:NumberRange> + <r:Low isInclusive="true">0</r:Low> + <r:High isInclusive="true">120</r:High> + </r:NumberRange> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + </r:NumericRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdatyx</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS92</r:String> </l:VariableName> @@ -9630,21 +10396,29 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdk0x4</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:NumericRepresentation> + <r:NumberRange> + <r:Low isInclusive="true">0</r:Low> + <r:High isInclusive="true">120</r:High> + </r:NumberRange> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + </r:NumericRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdi1dt</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS102</r:String> </l:VariableName> @@ -9654,96 +10428,193 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd2wgf</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:NumericRepresentation> + <r:NumberRange> + <r:Low isInclusive="true">0</r:Low> + <r:High isInclusive="true">120</r:High> + </r:NumberRange> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + </r:NumericRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggt4x</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">SURVEY_COMMENT</r:String> </l:VariableName> <r:Label> - <r:Content xml:lang="fr-FR">SURVEY_COMMENT label</r:Content> + <r:Content xml:lang="fr-FR">SURVEY_COMMENT label </r:Content> </r:Label> <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6z0z3us-QOP-jbgd6m6e</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6z0z3us</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> - </l:Variable> - <l:Variable> - <r:Agency>fr.insee</r:Agency> - <r:ID>jbcggtca</r:ID> - <r:Version>0.1.0</r:Version> - <l:VariableName> - <r:String xml:lang="fr-FR">SUM_EXPENSES</r:String> - </l:VariableName> - <r:Label> - <r:Content xml:lang="fr-FR">SUM_EXPENSES label</r:Content> - </r:Label> - <r:OutParameter> - <r:Agency>fr.insee</r:Agency> - <r:ID>jbcggtca-VROP</r:ID> - <r:Version>0.1.0</r:Version> - </r:OutParameter> <l:VariableRepresentation> - <r:ProcessingInstructionReference> - <r:Agency>fr.insee</r:Agency> - <r:ID>jbcggtca-GI</r:ID> - <r:Version>0.1.0</r:Version> - <r:TypeOfObject>GenerationInstruction</r:TypeOfObject> - <r:Binding> - <r:SourceParameterReference> - <r:Agency>fr.insee</r:Agency> - <r:ID>jbcggtca-GOP</r:ID> - <r:Version>0.1.0</r:Version> - <r:TypeOfObject>OutParameter</r:TypeOfObject> - </r:SourceParameterReference> - <r:TargetParameterReference> - <r:Agency>fr.insee</r:Agency> - <r:ID>jbcggtca-VROP</r:ID> - <r:Version>0.1.0</r:Version> - <r:TypeOfObject>OutParameter</r:TypeOfObject> - </r:TargetParameterReference> - </r:Binding> - </r:ProcessingInstructionReference> - <r:NumericRepresentation/> + <r:TextRepresentation maxLength="255"/> </l:VariableRepresentation> </l:Variable> - <l:Variable> - <r:Agency>fr.insee</r:Agency> - <r:ID>jbcggtex</r:ID> - <r:Version>0.1.0</r:Version> - <l:VariableName> - <r:String xml:lang="fr-FR">LAST_BROADCAST</r:String> - </l:VariableName> - <r:Label> - <r:Content xml:lang="fr-FR">LAST_BROADCAST label</r:Content> - </r:Label> - </l:Variable> + <l:VariableGroup> + <r:Agency>fr.insee</r:Agency> + <r:ID>j6qg8rc6-gp</r:ID> + <r:Version>1</r:Version> + <r:BasedOnObject> + <r:BasedOnReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>j6qg8rc6</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>QuestionGrid</r:TypeOfObject> + </r:BasedOnReference> + </r:BasedOnObject> + <l:TypeOfVariableGroup>TableLoop</l:TypeOfVariableGroup> + <l:VariableGroupName> + <r:String>FAVOURITE_CHARACTERS</r:String> + </l:VariableGroupName> + <r:VariableReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbgd3fkz</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Variable</r:TypeOfObject> + </r:VariableReference> + <r:VariableReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbgdf2md</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Variable</r:TypeOfObject> + </r:VariableReference> + <r:VariableReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbgdfle1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Variable</r:TypeOfObject> + </r:VariableReference> + <r:VariableReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbgdix8x</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Variable</r:TypeOfObject> + </r:VariableReference> + <r:VariableReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbgd782k</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Variable</r:TypeOfObject> + </r:VariableReference> + <r:VariableReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbgd68rf</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Variable</r:TypeOfObject> + </r:VariableReference> + <r:VariableReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbgdfoj4</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Variable</r:TypeOfObject> + </r:VariableReference> + <r:VariableReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbgdb116</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Variable</r:TypeOfObject> + </r:VariableReference> + <r:VariableReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbgd7w5p</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Variable</r:TypeOfObject> + </r:VariableReference> + <r:VariableReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbgd8rj2</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Variable</r:TypeOfObject> + </r:VariableReference> + <r:VariableReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbgdidnp</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Variable</r:TypeOfObject> + </r:VariableReference> + <r:VariableReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbgd47wz</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Variable</r:TypeOfObject> + </r:VariableReference> + <r:VariableReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbgdj2nn</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Variable</r:TypeOfObject> + </r:VariableReference> + <r:VariableReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbgd2ipx</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Variable</r:TypeOfObject> + </r:VariableReference> + <r:VariableReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbgd4pe3</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Variable</r:TypeOfObject> + </r:VariableReference> + <r:VariableReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbgdjgb1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Variable</r:TypeOfObject> + </r:VariableReference> + <r:VariableReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbgdb5c1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Variable</r:TypeOfObject> + </r:VariableReference> + <r:VariableReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbgdju9y</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Variable</r:TypeOfObject> + </r:VariableReference> + <r:VariableReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbgdatyx</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Variable</r:TypeOfObject> + </r:VariableReference> + <r:VariableReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbgdi1dt</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Variable</r:TypeOfObject> + </r:VariableReference> + </l:VariableGroup> </l:VariableScheme> <d:ProcessingInstructionScheme> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-SIMPSONS-PIS-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ProcessingInstructionSchemeName> <r:String xml:lang="en-IE">SIMPSONS</r:String> </d:ProcessingInstructionSchemeName> @@ -9753,66 +10624,66 @@ <d:GenerationInstruction> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-GI</r:ID> - <r:Version>0.1.0</r:Version> - <d:SourceQuestion><!--Not implemented.--></d:SourceQuestion> + <r:Version>1</r:Version> + <!--<d:SourceQuestion>Not implemented.</d:SourceQuestion>--> <d:SourceVariable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdnfk7</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </d:SourceVariable> <d:SourceVariable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdje4w</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </d:SourceVariable> <d:SourceVariable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdlth7</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </d:SourceVariable> <d:SourceVariable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdelbl</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </d:SourceVariable> <d:SourceVariable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd95jq</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </d:SourceVariable> <d:SourceVariable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdadd9</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </d:SourceVariable> <d:SourceVariable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdlwzk</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </d:SourceVariable> <d:SourceVariable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdfz77</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </d:SourceVariable> <d:SourceVariable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdepx6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </d:SourceVariable> <d:SourceVariable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdepx7</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </d:SourceVariable> <r:CommandCode> @@ -9821,7 +10692,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES11</r:String> </r:ParameterName> @@ -9829,7 +10700,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES21</r:String> </r:ParameterName> @@ -9837,7 +10708,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-3</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES31</r:String> </r:ParameterName> @@ -9845,7 +10716,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-4</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES41</r:String> </r:ParameterName> @@ -9853,7 +10724,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-5</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES51</r:String> </r:ParameterName> @@ -9861,7 +10732,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES61</r:String> </r:ParameterName> @@ -9869,7 +10740,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-7</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES71</r:String> </r:ParameterName> @@ -9877,7 +10748,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-8</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES81</r:String> </r:ParameterName> @@ -9885,7 +10756,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-9</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES91</r:String> </r:ParameterName> @@ -9893,7 +10764,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-10</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES101</r:String> </r:ParameterName> @@ -9901,19 +10772,19 @@ <r:OutParameter> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-GOP</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> <r:Binding> <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgde5yl</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -9921,13 +10792,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd2x2t</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -9935,13 +10806,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdjypz</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-3</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -9949,13 +10820,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdcftu</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-4</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -9963,13 +10834,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdiyfe</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-5</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -9977,13 +10848,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdj1wd</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -9991,13 +10862,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgddylk</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-7</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -10005,13 +10876,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd3jj6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-8</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -10019,13 +10890,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd4w3k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-9</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -10033,26 +10904,26 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd4w4k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-10</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> - <r:CommandContent>number(if (jbcggtca-IP-1='') then '0' else jbcggtca-IP-1) + number(if (jbcggtca-IP-2='') then '0' else jbcggtca-IP-2) + number(if (jbcggtca-IP-3='') then '0' else jbcggtca-IP-3) + - number(if (jbcggtca-IP-4='') then '0' else jbcggtca-IP-4) + number(if (jbcggtca-IP-5='') then '0' else jbcggtca-IP-5) + number(if (jbcggtca-IP-6='') then '0' else jbcggtca-IP-6) + - number(if (jbcggtca-IP-7='') then '0' else jbcggtca-IP-7) + number(if (jbcggtca-IP-8='') then '0' else jbcggtca-IP-8) + number(if (jbcggtca-IP-9='') then '0' else jbcggtca-IP-9) + - number(if (jbcggtca-IP-10='') then '0' else jbcggtca-IP-10) </r:CommandContent> + <r:CommandContent>number(if (jbcggtca-IP-1='') then '0' else jbcggtca-IP-1) + number(if (jbcggtca-IP-2='') then '0' else jbcggtca-IP-2) + number(if (jbcggtca-IP-3='') then '0' else jbcggtca-IP-3)+ + number(if (jbcggtca-IP-4='') then '0' else jbcggtca-IP-4)+ number(if (jbcggtca-IP-5='') then '0' else jbcggtca-IP-5)+ number(if (jbcggtca-IP-6='') then '0' else jbcggtca-IP-6)+ + number(if (jbcggtca-IP-7='') then '0' else jbcggtca-IP-7)+ number(if (jbcggtca-IP-8='') then '0' else jbcggtca-IP-8)+ number(if (jbcggtca-IP-9='') then '0' else jbcggtca-IP-9)+ + number(if (jbcggtca-IP-10='') then '0' else jbcggtca-IP-10)</r:CommandContent> </r:Command> </r:CommandCode> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> - <r:ID>Sequence-i6vwid</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>Sequence-i6vwi0</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Sequence</r:TypeOfObject> </d:ControlConstructReference> </d:GenerationInstruction> @@ -10060,7 +10931,7 @@ <r:ManagedRepresentationScheme> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-SIMPSONS-MRS</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="en-IE">Liste de formats numériques et dates de l'enquête</r:Content> @@ -10068,58 +10939,67 @@ </r:Label> <r:ManagedDateTimeRepresentation> <r:Agency>fr.insee</r:Agency> - <r:ID>INSEE-COMMUN-MNR-DateTimedate</r:ID> - <r:Version>0.1.0</r:Version> - <r:DateFieldFormat>jj/mm/aaaa</r:DateFieldFormat> + <r:ID>INSEE-COMMUN-MNR-DateTimedate-YYYY-MM-DD</r:ID> + <r:Version>1</r:Version> + <r:DateFieldFormat>YYYY-MM-DD</r:DateFieldFormat> <r:DateTypeCode controlledVocabularyID="INSEE-DTC-CV">date</r:DateTypeCode> + <r:Range> + <r:MinimumValue included="true">1900-01-01</r:MinimumValue> + <r:MaximumValue included="true">format-date(current-date(),'[Y0001]-[M01]-[D01]')</r:MaximumValue> + </r:Range> </r:ManagedDateTimeRepresentation> </r:ManagedRepresentationScheme> - </g:ResourcePackage><s:StudyUnit> + </g:ResourcePackage> + <s:StudyUnit> <r:Agency>fr.insee</r:Agency> - <r:ID>StudyUnit-i6vwid</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>StudyUnit-i6vwi0</r:ID> + <r:Version>1</r:Version> <r:ExPostEvaluation/> <d:DataCollection> <r:Agency>fr.insee</r:Agency> - <r:ID>DataCollection-i6vwid</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>DataCollection-i6vwi0</r:ID> + <r:Version>1</r:Version> <r:QuestionSchemeReference> <r:Agency>fr.insee</r:Agency> - <r:ID>QuestionScheme-i6vwid</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>QuestionScheme-i6vwi0</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionScheme</r:TypeOfObject> </r:QuestionSchemeReference> <r:ControlConstructSchemeReference> <r:Agency>fr.insee</r:Agency> - <r:ID>ControlConstructScheme-i6vwid</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>ControlConstructScheme-i6vwi0</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>ControlConstructScheme</r:TypeOfObject> </r:ControlConstructSchemeReference> <r:InterviewerInstructionSchemeReference> <r:Agency>fr.insee</r:Agency> - <r:ID>InterviewerInstructionScheme-i6vwid</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>InterviewerInstructionScheme-i6vwi0</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>InterviewerInstructionScheme</r:TypeOfObject> </r:InterviewerInstructionSchemeReference> <d:InstrumentScheme xml:lang="fr-FR"> <r:Agency>fr.insee</r:Agency> - <r:ID>InstrumentScheme-i6vwid</r:ID> - <r:Version>0.1.0</r:Version> - <d:Instrument> + <r:ID>InstrumentScheme-i6vwi0</r:ID> + <r:Version>1</r:Version> + <d:Instrument xmlns:pogues="http://xml.insee.fr/schema/applis/pogues" xmlns:pr="ddi:ddiprofile:3_3" xmlns:c="ddi:conceptualcomponent:3_3" xmlns:cm="ddi:comparative:3_3"> <r:Agency>fr.insee</r:Agency> - <r:ID>Instrument-i6vwid</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>Instrument-i6vwi0</r:ID> + <r:Version>1</r:Version> + <d:InstrumentName> + <r:String>SIMPSONS</r:String> + </d:InstrumentName> <r:Label> <r:Content xml:lang="fr-FR">Questionnaire SIMPSONS questionnaire</r:Content> </r:Label> <d:TypeOfInstrument>A définir</d:TypeOfInstrument> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> - <r:ID>Sequence-i6vwid</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>Sequence-i6vwi0</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Sequence</r:TypeOfObject> </d:ControlConstructReference> </d:Instrument> </d:InstrumentScheme> </d:DataCollection> - </s:StudyUnit></DDIInstance> \ No newline at end of file + </s:StudyUnit> +</DDIInstance> \ No newline at end of file diff --git a/src/test/resources/ddi-to-fo/out.fo b/src/test/resources/ddi-to-fo/out.fo index fce64978d..7a5c095d3 100644 --- a/src/test/resources/ddi-to-fo/out.fo +++ b/src/test/resources/ddi-to-fo/out.fo @@ -223,6 +223,7 @@ page-break-inside="avoid" keep-with-next="always"> <fo:block>We're going to test your knowledge about the simpsons series.</fo:block> + <fo:block/> <fo:block> <fo:inline font-weight="bold">Welcome in the simspons world!</fo:inline> </fo:block> @@ -234,7 +235,10 @@ margin-bottom="3pt" text-align="justify" page-break-inside="avoid" - keep-with-next="always">➡ 1. Before starting, do you have any comments about the Simpsons family?</fo:block> + keep-with-next="always"> + <fo:block>➡ 1. Before starting, do you have any comments about the Simpsons</fo:block> + <fo:block> family?</fo:block> + </fo:block> <fo:block id="COMMENT" page-break-inside="avoid"> <fo:block-container height="40mm" border-color="black" border-style="solid"> <fo:block> </fo:block> @@ -359,7 +363,7 @@ margin-left="3pt" text-align="justify" page-break-inside="avoid" - keep-with-next="always">For your information, the date of the last broadcast was on ${LAST_BROADCAST}</fo:block> + keep-with-next="always">For your information, the date of the last broadcast was on ${LAST_BROADCAST} </fo:block> <fo:block id="DATEFIRST" page-break-inside="avoid"> <fo:block color="black" font-weight="normal" @@ -376,7 +380,7 @@ margin-bottom="3pt" text-align="justify" page-break-inside="avoid" - keep-with-next="always">➡ 6. In your opinion, how much is the part of audience share in US for the 2016 season? </fo:block> + keep-with-next="always">➡ 6. In your opinion, how much is the part of audience share in US for the 2016 season?</fo:block> <fo:block id="AUDIENCE_SHARE" page-break-inside="avoid"> <fo:block> <fo:block color="black" @@ -1475,7 +1479,7 @@ margin-bottom="3pt" text-align="justify" page-break-inside="avoid" - keep-with-next="always">➡ 1. Please, specify the percentage of Jay's expenses in the Kwik-E-Mart for each product? </fo:block> + keep-with-next="always">➡ 1. Please, specify the percentage of Jay's expenses in the Kwik-E-Mart for each product?</fo:block> <fo:block page-break-inside="avoid" id="PERCENTAGE_EXPENSES"> <fo:table inline-progression-dimension="auto" table-layout="fixed" @@ -1855,7 +1859,7 @@ margin-bottom="3pt" text-align="justify" page-break-inside="avoid" - keep-with-next="always">➡ 2. Who did these clownings and tell us what you remember? </fo:block> + keep-with-next="always">➡ 2. Who did these clownings and tell us what you remember?</fo:block> <fo:block page-break-inside="avoid" id="CLOWNING"> <fo:table inline-progression-dimension="auto" table-layout="fixed" @@ -2093,7 +2097,7 @@ margin-bottom="3pt" text-align="justify" page-break-inside="avoid" - keep-with-next="always">➡ 3. Which of the following means of transport were used by the hero and in which country? </fo:block> + keep-with-next="always">➡ 3. Which of the following means of transport were used by the hero and in which country?</fo:block> <fo:block font-size="10pt" font-weight="normal" font-style="italic" @@ -2101,7 +2105,7 @@ margin-left="3pt" text-align="justify" page-break-inside="avoid" - keep-with-next="always">Several answers possible: check off all the relevant boxes </fo:block> + keep-with-next="always">Several answers possible: check off all the relevant boxes</fo:block> <fo:block page-break-inside="avoid" id="TRAVEL"> <fo:table inline-progression-dimension="auto" table-layout="fixed" @@ -2850,7 +2854,7 @@ text-align="justify" page-break-inside="avoid" keep-with-next="always">➡ 1. Please, complete the following grid with your favourite characters</fo:block> - <fo:block page-break-inside="avoid" id="j6qg8rc6"> + <fo:block page-break-inside="avoid" id="FAVOURITE_CHARACTERS"> <fo:table inline-progression-dimension="auto" table-layout="fixed" width="100%" diff --git a/src/test/resources/ddi-to-xform/in.xml b/src/test/resources/ddi-to-xform/in.xml index 43c0c1a62..fb76627a4 100644 --- a/src/test/resources/ddi-to-xform/in.xml +++ b/src/test/resources/ddi-to-xform/in.xml @@ -1,49 +1,54 @@ -<?xml version="1.0" encoding="UTF-8"?><DDIInstance xmlns="ddi:instance:3_3" xmlns:d="ddi:datacollection:3_3" xmlns:r="ddi:reusable:3_3" xmlns:l="ddi:logicalproduct:3_3" xmlns:g="ddi:group:3_3" xmlns:s="ddi:studyunit:3_3" xmlns:a="ddi:archive:3_3" xmlns:pr="ddi:ddiprofile:3_3" xmlns:c="ddi:conceptualcomponent:3_3" xmlns:cm="ddi:comparative:3_3" xmlns:xhtml="http://www.w3.org/1999/xhtml"><r:Agency>fr.insee</r:Agency><r:ID>INSEE-i6vwid</r:ID><r:Version>0.1.0</r:Version><r:Citation> +<?xml version="1.0" encoding="UTF-8"?><DDIInstance xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="ddi:instance:3_3" xmlns:g="ddi:group:3_3" xmlns:d="ddi:datacollection:3_3" xmlns:s="ddi:studyunit:3_3" xmlns:r="ddi:reusable:3_3" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:a="ddi:archive:3_3" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:l="ddi:logicalproduct:3_3" xsi:schemaLocation="ddi:instance:3_3 https://www.ddialliance.org/Specification/DDI-Lifecycle/3.3/XMLSchema/instance.xsd" isMaintainable="true"> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-i6vwi0</r:ID> + <r:Version>1</r:Version> + <r:Citation> <r:Title> <r:String>Questionnaire SIMPSONS</r:String> </r:Title> - </r:Citation><g:ResourcePackage isMaintainable="true" versionDate="2018-01-25+01:00"> + </r:Citation> + <g:ResourcePackage isMaintainable="true" versionDate="2018-01-25+01:00"> <r:Agency>fr.insee</r:Agency> - <r:ID>RessourcePackage-i6vwid</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>RessourcePackage-i6vwi0</r:ID> + <r:Version>1</r:Version> <d:InterviewerInstructionScheme> <r:Agency>fr.insee</r:Agency> - <r:ID>InterviewerInstructionScheme-i6vwid</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>InterviewerInstructionScheme-i6vwi0</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">A définir</r:Content> </r:Label> <d:Instruction> <r:Agency>fr.insee</r:Agency> <r:ID>d1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:InstructionName> <r:String xml:lang="fr-FR">comment</r:String> </d:InstructionName> <d:InstructionText> <d:LiteralText> - <d:Text xml:lang="fr-FR"><xhtml:p>We're going to test your knowledge about the simpsons series.<xhtml:br/><xhtml:b>Welcome in the simspons world!</xhtml:b></xhtml:p></d:Text> + <d:Text xml:lang="fr-FR"><xhtml:p>We're going to test your knowledge about the simpsons series.<xhtml:br/><xhtml:br/><xhtml:b>Welcome in the simspons world!</xhtml:b></xhtml:p></d:Text> </d:LiteralText> </d:InstructionText> </d:Instruction> <d:Instruction> <r:Agency>fr.insee</r:Agency> <r:ID>d11</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:InstructionName> <r:String xml:lang="fr-FR">comment</r:String> </d:InstructionName> <d:InstructionText> <d:LiteralText> <d:Text xml:lang="fr-FR">For your information, the date of the last broadcast was on - øLAST_BROADCASTø</d:Text> + ¤LAST_BROADCAST¤ </d:Text> </d:LiteralText> </d:InstructionText> </d:Instruction> <d:Instruction> <r:Agency>fr.insee</r:Agency> <r:ID>d2</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:InstructionName> <r:String xml:lang="fr-FR">comment</r:String> </d:InstructionName> @@ -56,7 +61,7 @@ <d:Instruction> <r:Agency>fr.insee</r:Agency> <r:ID>d3</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:InstructionName> <r:String xml:lang="fr-FR">instruction</r:String> </d:InstructionName> @@ -69,7 +74,7 @@ <d:Instruction> <r:Agency>fr.insee</r:Agency> <r:ID>d4</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:InstructionName> <r:String xml:lang="fr-FR">instruction</r:String> </d:InstructionName> @@ -82,7 +87,7 @@ <d:Instruction> <r:Agency>fr.insee</r:Agency> <r:ID>d5</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:InstructionName> <r:String xml:lang="fr-FR">instruction</r:String> </d:InstructionName> @@ -95,20 +100,20 @@ <d:Instruction> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-II-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:InstructionName> <r:String xml:lang="fr-FR">warning</r:String> </d:InstructionName> <d:InstructionText> <d:LiteralText> <d:Text xml:lang="fr-FR">The sum of percentages is: ¤jbcggtca-GOP¤ %. The total of - percentages must be equal to 100%.</d:Text> + percentages must be equal to 100%. </d:Text> </d:LiteralText> <d:ConditionalText> <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-GOP</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> </d:ConditionalText> @@ -117,25 +122,25 @@ <d:Instruction> <r:Agency>fr.insee</r:Agency> <r:ID>d10</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:InstructionName> <r:String xml:lang="fr-FR">instruction</r:String> </d:InstructionName> <d:InstructionText> <d:LiteralText> - <d:Text xml:lang="fr-FR">Several answers possible: check off all the relevant boxes </d:Text> + <d:Text xml:lang="fr-FR">Several answers possible: check off all the relevant boxes</d:Text> </d:LiteralText> </d:InstructionText> </d:Instruction> - <d:Instruction><r:Agency>fr.insee</r:Agency><r:ID>FTN-INSTRUCTION-1</r:ID><r:Version>0.1.0</r:Version><d:InstructionName><r:String xml:lang="fr-FR">tooltip</r:String></d:InstructionName><d:InstructionText><d:LiteralText><d:Text xml:lang="fr-FR"><xhtml:p id="ftn1">Included principalities</xhtml:p></d:Text></d:LiteralText></d:InstructionText></d:Instruction></d:InterviewerInstructionScheme> + <d:Instruction><r:Agency>fr.insee</r:Agency><r:ID>FTN-INSTRUCTION-1</r:ID><r:Version>1</r:Version><d:InstructionName><r:String xml:lang="fr-FR">tooltip</r:String></d:InstructionName><d:InstructionText><d:LiteralText><d:Text xml:lang="fr-FR"><xhtml:p id="ftn1">Included principalities</xhtml:p></d:Text></d:LiteralText></d:InstructionText></d:Instruction></d:InterviewerInstructionScheme> <d:ControlConstructScheme> <r:Agency>fr.insee</r:Agency> - <r:ID>ControlConstructScheme-i6vwid</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>ControlConstructScheme-i6vwi0</r:ID> + <r:Version>1</r:Version> <d:Sequence> <r:Agency>fr.insee</r:Agency> - <r:ID>Sequence-i6vwid</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>Sequence-i6vwi0</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Questionnaire SIMPSONS</r:Content> </r:Label> @@ -143,26 +148,26 @@ <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p0ti5h</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Sequence</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> - <r:ID>d1e101</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>d1e119</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>IfThenElse</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6z12s2d</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Sequence</r:TypeOfObject> </d:ControlConstructReference> </d:Sequence> <d:Sequence> <r:Agency>fr.insee</r:Agency> <r:ID>j6p0ti5h</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">MODULE1</r:String> </d:ConstructName> @@ -172,33 +177,33 @@ <d:InterviewerInstructionReference> <r:Agency>fr.insee</r:Agency> <r:ID>d1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Instruction</r:TypeOfObject> </d:InterviewerInstructionReference> <d:TypeOfSequence controlledVocabularyID="INSEE-TOS-CL-1">module</d:TypeOfSequence> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p3dkx6-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p0np9q-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> - <r:ID>d1e42</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>d1e50</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>IfThenElse</r:TypeOfObject> </d:ControlConstructReference> </d:Sequence> <d:Sequence> <r:Agency>fr.insee</r:Agency> <r:ID>j6p0s7o5</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">MODULE11</r:String> </d:ConstructName> @@ -209,32 +214,32 @@ <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j3343qhx-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6q9h8tj-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334cyqb-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6z06z1e-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> </d:Sequence> <d:Sequence> <r:Agency>fr.insee</r:Agency> <r:ID>j3341528</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">MODULE2</r:String> </d:ConstructName> @@ -244,33 +249,33 @@ <d:InterviewerInstructionReference> <r:Agency>fr.insee</r:Agency> <r:ID>d2</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Instruction</r:TypeOfObject> </d:InterviewerInstructionReference> <d:TypeOfSequence controlledVocabularyID="INSEE-TOS-CL-1">module</d:TypeOfSequence> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j3343clt-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qdfhvw-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw5cqz-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> </d:Sequence> <d:Sequence> <r:Agency>fr.insee</r:Agency> <r:ID>j6qe0h9q</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">MODULE3</r:String> </d:ConstructName> @@ -281,38 +286,38 @@ <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>d12-SI</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>StatementItem</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> </d:Sequence> <d:Sequence> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw88h2</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">MODULE4</r:String> </d:ConstructName> @@ -323,26 +328,26 @@ <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qe237q</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Sequence</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qejudb</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Sequence</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qeh91y</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Sequence</r:TypeOfObject> </d:ControlConstructReference> </d:Sequence> <d:Sequence> <r:Agency>fr.insee</r:Agency> <r:ID>j6qe237q</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">MODULE41</r:String> </d:ConstructName> @@ -353,20 +358,20 @@ <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>ComputationItem</r:TypeOfObject> </d:ControlConstructReference> </d:Sequence> <d:Sequence> <r:Agency>fr.insee</r:Agency> <r:ID>j6qejudb</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">MODULE42</r:String> </d:ConstructName> @@ -377,14 +382,14 @@ <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> </d:Sequence> <d:Sequence> <r:Agency>fr.insee</r:Agency> <r:ID>j6qeh91y</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">MODULE43</r:String> </d:ConstructName> @@ -395,14 +400,14 @@ <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> </d:Sequence> <d:Sequence> <r:Agency>fr.insee</r:Agency> <r:ID>j6qfx9qe</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">MODULE5</r:String> </d:ConstructName> @@ -413,14 +418,14 @@ <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> </d:Sequence> <d:Sequence> <r:Agency>fr.insee</r:Agency> <r:ID>j6z12s2d</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">MODULE6</r:String> </d:ConstructName> @@ -431,21 +436,28 @@ <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6z0z3us-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionConstruct</r:TypeOfObject> </d:ControlConstructReference> </d:Sequence> <d:IfThenElse> <r:Agency>fr.insee</r:Agency> - <r:ID>d1e42</r:ID> - <r:Version>0.1.0</r:Version> - <d:TypeOfIfThenElse>hideable</d:TypeOfIfThenElse><d:IfCondition> + <r:ID>d1e50</r:ID> + <r:Version>1</r:Version> + <r:Label> + <r:Content xml:lang="fr-FR">A définir</r:Content> + </r:Label> + <r:Description> + <r:Content xml:lang="fr-FR"/> + </r:Description> + <d:TypeOfIfThenElse controlledVocabularyID="INSEE-TOITE-CL-1">hideable</d:TypeOfIfThenElse> + <d:IfCondition> <r:Command> <r:ProgramLanguage>xpath</r:ProgramLanguage> <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> - <r:ID>d1e42-IP-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>d1e50-IP-1</r:ID> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">READY</r:String> </r:ParameterName> @@ -454,52 +466,58 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p0np9q-QOP-jbgd3set</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> - <r:ID>d1e42-IP-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>d1e50-IP-1</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> - <r:CommandContent>not( d1e42-IP-1 != '1')</r:CommandContent> + <r:CommandContent>not( d1e50-IP-1!= '1') </r:CommandContent> </r:Command> </d:IfCondition> <d:ThenConstructReference> <r:Agency>fr.insee</r:Agency> - <r:ID>d1e42-THEN</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>d1e50-THEN</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Sequence</r:TypeOfObject> </d:ThenConstructReference> </d:IfThenElse> <d:Sequence> <r:Agency>fr.insee</r:Agency> - <r:ID>d1e42-THEN</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>d1e50-THEN</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR"/> </r:Label> - <d:TypeOfSequence controlledVocabularyID="INSEE-TOS-CL-1">hideable</d:TypeOfSequence> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p0s7o5</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Sequence</r:TypeOfObject> </d:ControlConstructReference> </d:Sequence> <d:IfThenElse> <r:Agency>fr.insee</r:Agency> - <r:ID>d1e101</r:ID> - <r:Version>0.1.0</r:Version> - <d:TypeOfIfThenElse>hideable</d:TypeOfIfThenElse><d:IfCondition> + <r:ID>d1e119</r:ID> + <r:Version>1</r:Version> + <r:Label> + <r:Content xml:lang="fr-FR">A définir</r:Content> + </r:Label> + <r:Description> + <r:Content xml:lang="fr-FR"/> + </r:Description> + <d:TypeOfIfThenElse controlledVocabularyID="INSEE-TOITE-CL-1">hideable</d:TypeOfIfThenElse> + <d:IfCondition> <r:Command> <r:ProgramLanguage>xpath</r:ProgramLanguage> <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> - <r:ID>d1e101-IP-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>d1e119-IP-1</r:ID> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">READY</r:String> </r:ParameterName> @@ -508,315 +526,314 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p0np9q-QOP-jbgd3set</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> - <r:ID>d1e101-IP-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>d1e119-IP-1</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> - <r:CommandContent>not( d1e101-IP-1 != '1')</r:CommandContent> + <r:CommandContent>not( d1e119-IP-1!= '1') </r:CommandContent> </r:Command> </d:IfCondition> <d:ThenConstructReference> <r:Agency>fr.insee</r:Agency> - <r:ID>d1e101-THEN</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>d1e119-THEN</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Sequence</r:TypeOfObject> </d:ThenConstructReference> </d:IfThenElse> <d:Sequence> <r:Agency>fr.insee</r:Agency> - <r:ID>d1e101-THEN</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>d1e119-THEN</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR"/> </r:Label> - <d:TypeOfSequence controlledVocabularyID="INSEE-TOS-CL-1">hideable</d:TypeOfSequence> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j3341528</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Sequence</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qe0h9q</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Sequence</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw88h2</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Sequence</r:TypeOfObject> </d:ControlConstructReference> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qfx9qe</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Sequence</r:TypeOfObject> </d:ControlConstructReference> </d:Sequence> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j6p3dkx6-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">COMMENT</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p3dkx6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j6p0np9q-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">READY</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p0np9q</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j3343qhx-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">PRODUCER</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j3343qhx</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j6q9h8tj-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">SEASON_NUMBER</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6q9h8tj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j334cyqb-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">DATEFIRST</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334cyqb</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j6z06z1e-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">AUDIENCE_SHARE</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6z06z1e</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j3343clt-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">CITY</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j3343clt</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j6qdfhvw-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">MAYOR</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qdfhvw</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw5cqz-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">STATE</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw5cqz</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">PET</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">ICE_FLAVOUR</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">NUCLEAR_CHARACTER</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">BIRTH_CHARACTER</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">CLOWNING</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">TRAVEL</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> <d:QuestionConstruct> <r:Agency>fr.insee</r:Agency> <r:ID>j6z0z3us-QC</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">SURVEY_COMMENT</r:String> </d:ConstructName> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6z0z3us</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> </d:QuestionConstruct> - <d:ComputationItem><d:TypeOfComputationItem>informational</d:TypeOfComputationItem> + <d:ComputationItem> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ConstructName> <r:String xml:lang="fr-FR">Total of percentages</r:String> </d:ConstructName> @@ -826,16 +843,17 @@ <d:InterviewerInstructionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-II-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Instruction</r:TypeOfObject> </d:InterviewerInstructionReference> + <d:TypeOfComputationItem controlledVocabularyID="INSEE-TOCI-CL-3">stumblingblock</d:TypeOfComputationItem> <r:CommandCode> <r:Command> <r:ProgramLanguage>xpath</r:ProgramLanguage> <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES11</r:String> </r:ParameterName> @@ -843,7 +861,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES21</r:String> </r:ParameterName> @@ -851,7 +869,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-3</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES31</r:String> </r:ParameterName> @@ -859,7 +877,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-4</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES41</r:String> </r:ParameterName> @@ -867,7 +885,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-5</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES51</r:String> </r:ParameterName> @@ -875,7 +893,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES61</r:String> </r:ParameterName> @@ -883,7 +901,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-7</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES71</r:String> </r:ParameterName> @@ -891,7 +909,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-8</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES81</r:String> </r:ParameterName> @@ -899,7 +917,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-9</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES91</r:String> </r:ParameterName> @@ -907,7 +925,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-10</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES101</r:String> </r:ParameterName> @@ -916,13 +934,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgde5yl</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -930,13 +948,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd2x2t</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -944,13 +962,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdjypz</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-3</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -958,13 +976,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdcftu</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-4</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -972,13 +990,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdiyfe</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-5</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -986,13 +1004,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdj1wd</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1000,13 +1018,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgddylk</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-7</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1014,13 +1032,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd3jj6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-8</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1028,13 +1046,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd4w3k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-9</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1042,27 +1060,27 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd4w4k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-CI-0-IP-10</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> <r:CommandContent>number(if (j4nwc63q-CI-0-IP-1='') then '0' else j4nwc63q-CI-0-IP-1) + number(if (j4nwc63q-CI-0-IP-2='') then '0' else j4nwc63q-CI-0-IP-2) + - number(if (j4nwc63q-CI-0-IP-3='') then '0' else j4nwc63q-CI-0-IP-3) + number(if (j4nwc63q-CI-0-IP-4='') then '0' else j4nwc63q-CI-0-IP-4) + number(if (j4nwc63q-CI-0-IP-5='') then '0' else j4nwc63q-CI-0-IP-5) + - number(if (j4nwc63q-CI-0-IP-6='') then '0' else j4nwc63q-CI-0-IP-6) + number(if (j4nwc63q-CI-0-IP-7='') then '0' else j4nwc63q-CI-0-IP-7) + number(if (j4nwc63q-CI-0-IP-8='') then '0' else j4nwc63q-CI-0-IP-8) + - number(if (j4nwc63q-CI-0-IP-9='') then '0' else j4nwc63q-CI-0-IP-9) + number(if (j4nwc63q-CI-0-IP-10='') then '0' else j4nwc63q-CI-0-IP-10) != 100 </r:CommandContent> + number(if (j4nwc63q-CI-0-IP-3='') then '0' else j4nwc63q-CI-0-IP-3)+ number(if (j4nwc63q-CI-0-IP-4='') then '0' else j4nwc63q-CI-0-IP-4)+ number(if (j4nwc63q-CI-0-IP-5='') then '0' else j4nwc63q-CI-0-IP-5)+ + number(if (j4nwc63q-CI-0-IP-6='') then '0' else j4nwc63q-CI-0-IP-6)+ number(if (j4nwc63q-CI-0-IP-7='') then '0' else j4nwc63q-CI-0-IP-7)+ number(if (j4nwc63q-CI-0-IP-8='') then '0' else j4nwc63q-CI-0-IP-8)+ + number(if (j4nwc63q-CI-0-IP-9='') then '0' else j4nwc63q-CI-0-IP-9)+ number(if (j4nwc63q-CI-0-IP-10='') then '0' else j4nwc63q-CI-0-IP-10)!= 100 </r:CommandContent> </r:Command> </r:CommandCode> - <!--<r:TypeOfComputationItem>error</r:TypeOfComputationItem>--></d:ComputationItem> + </d:ComputationItem> <d:StatementItem> <r:Agency>fr.insee</r:Agency> <r:ID>d12-SI</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:DisplayText> <d:LiteralText> <d:Text xml:lang="fr-FR"><xhtml:p><xhtml:b>Now we are going to know if you think that Jay is a gluton.</xhtml:b></xhtml:p></d:Text> @@ -1072,22 +1090,22 @@ </d:ControlConstructScheme> <d:QuestionScheme> <r:Agency>fr.insee</r:Agency> - <r:ID>QuestionScheme-i6vwid</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>QuestionScheme-i6vwi0</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">A définir</r:Content> </r:Label> <d:QuestionItem> <r:Agency>fr.insee</r:Agency> <r:ID>j6p3dkx6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:QuestionItemName> <r:String xml:lang="fr-FR">COMMENT</r:String> </d:QuestionItemName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p3dkx6-QOP-jbgdhaht</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">COMMENT</r:String> </r:ParameterName> @@ -1096,26 +1114,26 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p3dkx6-RDOP-jbgdhaht</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p3dkx6-QOP-jbgdhaht</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> <d:QuestionText> <d:LiteralText> - <d:Text xml:lang="fr-FR">Before starting, do you have any comments about the Simpsons family?</d:Text> + <d:Text xml:lang="fr-FR"><xhtml:p>Before starting, do you have any comments about the Simpsons<xhtml:br/> family?</xhtml:p></d:Text> </d:LiteralText> </d:QuestionText> <d:TextDomain maxLength="500"> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p3dkx6-RDOP-jbgdhaht</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TextRepresentation maxLength="500"/> </r:OutParameter> </d:TextDomain> @@ -1123,14 +1141,14 @@ <d:QuestionItem> <r:Agency>fr.insee</r:Agency> <r:ID>j6p0np9q</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:QuestionItemName> <r:String xml:lang="fr-FR">READY</r:String> </d:QuestionItemName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p0np9q-QOP-jbgd3set</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">READY</r:String> </r:ParameterName> @@ -1139,13 +1157,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p0np9q-RDOP-jbgd3set</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p0np9q-QOP-jbgd3set</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1158,14 +1176,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p0np9q-RDOP-jbgd3set</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -1175,33 +1193,35 @@ </r:OutParameter> <r:ResponseCardinality maximumResponses="1"/> </d:NominalDomain> - <d:ExternalAid><r:OtherMaterial> - <r:Agency>fr.insee</r:Agency> - <r:ID>j6p6my1d</r:ID> - <r:Version>0.1.0</r:Version> - <r:Description> - <r:Content> - <xhtml:div class="FlowControl" id="j6p6my1d"> - <xhtml:div class="Description">If you are not ready, please go to the end of the - questionnaire</xhtml:div> - <xhtml:div class="Expression">$READY != '1'</xhtml:div> - <xhtml:div class="IfTrue">j6z12s2d</xhtml:div> - </xhtml:div> - </r:Content> - </r:Description> - </r:OtherMaterial></d:ExternalAid> + <d:ExternalAid> + <r:OtherMaterial> + <r:Agency>fr.insee</r:Agency> + <r:ID>j6p6my1d</r:ID> + <r:Version>1</r:Version> + <r:Description> + <r:Content> + <xhtml:div class="FlowControl" id="j6p6my1d"> + <xhtml:div class="Description">If you are not ready, please go to the end of the + questionnaire</xhtml:div> + <xhtml:div class="Expression">$READY != '1'</xhtml:div> + <xhtml:div class="IfTrue">j6z12s2d</xhtml:div> + </xhtml:div> + </r:Content> + </r:Description> + </r:OtherMaterial> + </d:ExternalAid> </d:QuestionItem> <d:QuestionItem> <r:Agency>fr.insee</r:Agency> <r:ID>j3343qhx</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:QuestionItemName> <r:String xml:lang="fr-FR">PRODUCER</r:String> </d:QuestionItemName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j3343qhx-QOP-jbgd90cy</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PRODUCER</r:String> </r:ParameterName> @@ -1210,13 +1230,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j3343qhx-RDOP-jbgd90cy</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j3343qhx-QOP-jbgd90cy</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1229,7 +1249,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j3343qhx-RDOP-jbgd90cy</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TextRepresentation maxLength="30"/> </r:OutParameter> </d:TextDomain> @@ -1237,14 +1257,14 @@ <d:QuestionItem> <r:Agency>fr.insee</r:Agency> <r:ID>j6q9h8tj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:QuestionItemName> <r:String xml:lang="fr-FR">SEASON_NUMBER</r:String> </d:QuestionItemName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6q9h8tj-QOP-jbgdjy8h</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">SEASON_NUMBER</r:String> </r:ParameterName> @@ -1253,13 +1273,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6q9h8tj-RDOP-jbgdjy8h</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6q9h8tj-QOP-jbgdjy8h</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1277,21 +1297,21 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6q9h8tj-RDOP-jbgdjy8h</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> </d:QuestionItem> <d:QuestionItem> <r:Agency>fr.insee</r:Agency> <r:ID>j334cyqb</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:QuestionItemName> <r:String xml:lang="fr-FR">DATEFIRST</r:String> </d:QuestionItemName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j334cyqb-QOP-jbgdih2z</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">DATEFIRST</r:String> </r:ParameterName> @@ -1300,13 +1320,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334cyqb-RDOP-jbgdih2z</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334cyqb-QOP-jbgdih2z</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1317,17 +1337,17 @@ </d:QuestionText> <d:DateTimeDomainReference> <r:Agency>fr.insee</r:Agency> - <r:ID>INSEE-COMMUN-MNR-DateTimedate</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>INSEE-COMMUN-MNR-DateTimedate-YYYY-MM-DD</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>ManagedDateTimeRepresentation</r:TypeOfObject> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j334cyqb-RDOP-jbgdih2z</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:DateTimeRepresentationReference> <r:Agency>fr.insee</r:Agency> - <r:ID>INSEE-COMMUN-MNR-DateTimedate</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>INSEE-COMMUN-MNR-DateTimedate-YYYY-MM-DD</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>ManagedDateTimeRepresentation</r:TypeOfObject> </r:DateTimeRepresentationReference> </r:OutParameter> @@ -1335,21 +1355,21 @@ <d:InterviewerInstructionReference> <r:Agency>fr.insee</r:Agency> <r:ID>d11</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Instruction</r:TypeOfObject> </d:InterviewerInstructionReference> </d:QuestionItem> <d:QuestionItem> <r:Agency>fr.insee</r:Agency> <r:ID>j6z06z1e</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:QuestionItemName> <r:String xml:lang="fr-FR">AUDIENCE_SHARE</r:String> </d:QuestionItemName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6z06z1e-QOP-jbgddnrd</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">AUDIENCE_SHARE</r:String> </r:ParameterName> @@ -1358,20 +1378,20 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6z06z1e-RDOP-jbgddnrd</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6z06z1e-QOP-jbgddnrd</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> <d:QuestionText> <d:LiteralText> <d:Text xml:lang="fr-FR">In your opinion, how much is the part of audience share in US for the 2016 - season? </d:Text> + season?</d:Text> </d:LiteralText> </d:QuestionText> <d:NumericDomain decimalPositions="1"> @@ -1383,21 +1403,21 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6z06z1e-RDOP-jbgddnrd</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> </d:QuestionItem> <d:QuestionItem> <r:Agency>fr.insee</r:Agency> <r:ID>j3343clt</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:QuestionItemName> <r:String xml:lang="fr-FR">CITY</r:String> </d:QuestionItemName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j3343clt-QOP-jbgdjdkn</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">CITY</r:String> </r:ParameterName> @@ -1406,13 +1426,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j3343clt-RDOP-jbgdjdkn</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j3343clt-QOP-jbgdjdkn</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1421,47 +1441,47 @@ <d:Text xml:lang="fr-FR">In which city do the Simpsons reside?</d:Text> </d:LiteralText> </d:QuestionText> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV">radio-button</r:GenericOutputFormat> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334iumu</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j3343clt-RDOP-jbgdjdkn</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334iumu</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> </r:OutParameter> - <r:ResponseCardinality maximumResponses="1"/> + <r:ResponseCardinality minimumResponses="1" maximumResponses="1"/> </d:CodeDomain> <d:InterviewerInstructionReference> <r:Agency>fr.insee</r:Agency> <r:ID>d3</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Instruction</r:TypeOfObject> </d:InterviewerInstructionReference> </d:QuestionItem> <d:QuestionItem> <r:Agency>fr.insee</r:Agency> <r:ID>j6qdfhvw</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:QuestionItemName> <r:String xml:lang="fr-FR">MAYOR</r:String> </d:QuestionItemName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qdfhvw-QOP-jbgd8ghp</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">MAYOR</r:String> </r:ParameterName> @@ -1470,13 +1490,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qdfhvw-RDOP-jbgd8ghp</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qdfhvw-QOP-jbgd8ghp</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1485,23 +1505,23 @@ <d:Text xml:lang="fr-FR">Who is the Simpsons city mayor?</d:Text> </d:LiteralText> </d:QuestionText> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV">checkbox</r:GenericOutputFormat> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qdqoen</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qdfhvw-RDOP-jbgd8ghp</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qdqoen</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -1511,21 +1531,21 @@ <d:InterviewerInstructionReference> <r:Agency>fr.insee</r:Agency> <r:ID>d4</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Instruction</r:TypeOfObject> </d:InterviewerInstructionReference> </d:QuestionItem> <d:QuestionItem> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw5cqz</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:QuestionItemName> <r:String xml:lang="fr-FR">STATE</r:String> </d:QuestionItemName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw5cqz-QOP-jbgdkd7v</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">STATE</r:String> </r:ParameterName> @@ -1534,13 +1554,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw5cqz-RDOP-jbgdkd7v</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw5cqz-QOP-jbgdkd7v</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1549,23 +1569,23 @@ <d:Text xml:lang="fr-FR">In which state do The Simpsons reside?</d:Text> </d:LiteralText> </d:QuestionText> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV">drop-down-list</r:GenericOutputFormat> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwo00f</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw5cqz-RDOP-jbgdkd7v</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwo00f</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -1576,14 +1596,14 @@ <d:QuestionItem> <r:Agency>fr.insee</r:Agency> <r:ID>j6z0z3us</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:QuestionItemName> <r:String xml:lang="fr-FR">SURVEY_COMMENT</r:String> </d:QuestionItemName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6z0z3us-QOP-jbgd6m6e</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">SURVEY_COMMENT</r:String> </r:ParameterName> @@ -1592,13 +1612,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6z0z3us-RDOP-jbgd6m6e</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6z0z3us-QOP-jbgd6m6e</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1611,7 +1631,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6z0z3us-RDOP-jbgd6m6e</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TextRepresentation maxLength="255"/> </r:OutParameter> </d:TextDomain> @@ -1619,14 +1639,14 @@ <d:QuestionGrid> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:QuestionGridName> <r:String xml:lang="fr-FR">PET</r:String> </d:QuestionGridName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-QOP-jbgd8qmn</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PET1</r:String> </r:ParameterName> @@ -1634,7 +1654,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-QOP-jbgd60vl</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PET2</r:String> </r:ParameterName> @@ -1642,7 +1662,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-QOP-jbgda2jo</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PET3</r:String> </r:ParameterName> @@ -1650,7 +1670,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-QOP-jbgdfssy</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PET4</r:String> </r:ParameterName> @@ -1659,13 +1679,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-RDOP-jbgd8qmn</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-QOP-jbgd8qmn</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1673,13 +1693,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-RDOP-jbgd60vl</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-QOP-jbgd60vl</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1687,13 +1707,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-RDOP-jbgda2jo</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-QOP-jbgda2jo</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1701,13 +1721,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-RDOP-jbgdfssy</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-QOP-jbgdfssy</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1717,11 +1737,11 @@ </d:LiteralText> </d:QuestionText> <d:GridDimension displayCode="false" displayLabel="false" rank="1"> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j335cu3c</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </d:CodeDomain> @@ -1732,14 +1752,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-RDOP-jbgd8qmn</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -1760,14 +1780,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-RDOP-jbgd60vl</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -1788,14 +1808,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-RDOP-jbgda2jo</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -1816,14 +1836,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-RDOP-jbgdfssy</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -1843,21 +1863,21 @@ <d:InterviewerInstructionReference> <r:Agency>fr.insee</r:Agency> <r:ID>d5</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Instruction</r:TypeOfObject> </d:InterviewerInstructionReference> </d:QuestionGrid> <d:QuestionGrid> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:QuestionGridName> <r:String xml:lang="fr-FR">ICE_FLAVOUR</r:String> </d:QuestionGridName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-QOP-jbgdb3jx</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">ICE_FLAVOUR1</r:String> </r:ParameterName> @@ -1865,7 +1885,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-QOP-jbgdb61k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">ICE_FLAVOUR2</r:String> </r:ParameterName> @@ -1873,7 +1893,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-QOP-jbgdl3kc</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">ICE_FLAVOUR3</r:String> </r:ParameterName> @@ -1881,7 +1901,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-QOP-jbgdcobo</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">ICE_FLAVOUR4</r:String> </r:ParameterName> @@ -1890,13 +1910,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-RDOP-jbgdb3jx</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-QOP-jbgdb3jx</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1904,13 +1924,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-RDOP-jbgdb61k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-QOP-jbgdb61k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1918,13 +1938,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-RDOP-jbgdl3kc</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-QOP-jbgdl3kc</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1932,13 +1952,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-RDOP-jbgdcobo</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-QOP-jbgdcobo</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -1948,34 +1968,34 @@ </d:LiteralText> </d:QuestionText> <d:GridDimension displayCode="false" displayLabel="false" rank="1"> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2mvca</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </d:CodeDomain> </d:GridDimension> <d:StructuredMixedGridResponseDomain> <d:GridResponseDomainInMixed> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV">radio-button</r:GenericOutputFormat> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-RDOP-jbgdb3jx</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -1989,23 +2009,23 @@ </d:GridAttachment> </d:GridResponseDomainInMixed> <d:GridResponseDomainInMixed> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV">radio-button</r:GenericOutputFormat> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-RDOP-jbgdb61k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -2019,23 +2039,23 @@ </d:GridAttachment> </d:GridResponseDomainInMixed> <d:GridResponseDomainInMixed> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV">radio-button</r:GenericOutputFormat> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-RDOP-jbgdl3kc</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -2049,23 +2069,23 @@ </d:GridAttachment> </d:GridResponseDomainInMixed> <d:GridResponseDomainInMixed> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV">radio-button</r:GenericOutputFormat> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-RDOP-jbgdcobo</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -2083,14 +2103,14 @@ <d:QuestionGrid> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:QuestionGridName> <r:String xml:lang="fr-FR">NUCLEAR_CHARACTER</r:String> </d:QuestionGridName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-QOP-jbgd6p0k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">NUCLEAR_CHARACTER1</r:String> </r:ParameterName> @@ -2098,7 +2118,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-QOP-jbgd9ato</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">NUCLEAR_CHARACTER2</r:String> </r:ParameterName> @@ -2106,7 +2126,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-QOP-jbgd3e0p</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">NUCLEAR_CHARACTER3</r:String> </r:ParameterName> @@ -2114,7 +2134,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-QOP-jbgdkxne</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">NUCLEAR_CHARACTER4</r:String> </r:ParameterName> @@ -2123,13 +2143,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-RDOP-jbgd6p0k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-QOP-jbgd6p0k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2137,13 +2157,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-RDOP-jbgd9ato</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-QOP-jbgd9ato</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2151,13 +2171,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-RDOP-jbgd3e0p</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-QOP-jbgd3e0p</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2165,13 +2185,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-RDOP-jbgdkxne</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-QOP-jbgdkxne</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2181,34 +2201,34 @@ </d:LiteralText> </d:QuestionText> <d:GridDimension displayCode="false" displayLabel="false" rank="1"> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qeytgc</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </d:CodeDomain> </d:GridDimension> <d:StructuredMixedGridResponseDomain> <d:GridResponseDomainInMixed> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV">drop-down-list</r:GenericOutputFormat> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-RDOP-jbgd6p0k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -2222,23 +2242,23 @@ </d:GridAttachment> </d:GridResponseDomainInMixed> <d:GridResponseDomainInMixed> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV">drop-down-list</r:GenericOutputFormat> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-RDOP-jbgd9ato</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -2252,23 +2272,23 @@ </d:GridAttachment> </d:GridResponseDomainInMixed> <d:GridResponseDomainInMixed> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV">drop-down-list</r:GenericOutputFormat> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-RDOP-jbgd3e0p</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -2282,23 +2302,23 @@ </d:GridAttachment> </d:GridResponseDomainInMixed> <d:GridResponseDomainInMixed> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV">drop-down-list</r:GenericOutputFormat> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-RDOP-jbgdkxne</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -2316,14 +2336,14 @@ <d:QuestionGrid> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:QuestionGridName> <r:String xml:lang="fr-FR">BIRTH_CHARACTER</r:String> </d:QuestionGridName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QOP-jbgd7fr6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">BIRTH_CHARACTER1</r:String> </r:ParameterName> @@ -2331,7 +2351,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QOP-jbgd5e9f</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">BIRTH_CHARACTER2</r:String> </r:ParameterName> @@ -2339,7 +2359,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QOP-jbgd912x</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">BIRTH_CHARACTER3</r:String> </r:ParameterName> @@ -2347,7 +2367,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QOP-jbgd6bdy</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">BIRTH_CHARACTER4</r:String> </r:ParameterName> @@ -2355,7 +2375,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QOP-jbgddyry</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">BIRTH_CHARACTER5</r:String> </r:ParameterName> @@ -2364,13 +2384,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-RDOP-jbgd7fr6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QOP-jbgd7fr6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2378,13 +2398,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-RDOP-jbgd5e9f</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QOP-jbgd5e9f</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2392,13 +2412,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-RDOP-jbgd912x</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QOP-jbgd912x</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2406,13 +2426,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-RDOP-jbgd6bdy</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QOP-jbgd6bdy</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2420,13 +2440,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-RDOP-jbgddyry</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QOP-jbgddyry</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2436,34 +2456,34 @@ </d:LiteralText> </d:QuestionText> <d:GridDimension displayCode="false" displayLabel="false" rank="1"> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6z087mq</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </d:CodeDomain> </d:GridDimension> <d:StructuredMixedGridResponseDomain> <d:GridResponseDomainInMixed> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV">checkbox</r:GenericOutputFormat> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxricm</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-RDOP-jbgd7fr6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxricm</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -2477,23 +2497,23 @@ </d:GridAttachment> </d:GridResponseDomainInMixed> <d:GridResponseDomainInMixed> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV">checkbox</r:GenericOutputFormat> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxricm</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-RDOP-jbgd5e9f</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxricm</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -2507,23 +2527,23 @@ </d:GridAttachment> </d:GridResponseDomainInMixed> <d:GridResponseDomainInMixed> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV">checkbox</r:GenericOutputFormat> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxricm</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-RDOP-jbgd912x</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxricm</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -2537,23 +2557,23 @@ </d:GridAttachment> </d:GridResponseDomainInMixed> <d:GridResponseDomainInMixed> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV">checkbox</r:GenericOutputFormat> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxricm</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-RDOP-jbgd6bdy</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxricm</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -2567,23 +2587,23 @@ </d:GridAttachment> </d:GridResponseDomainInMixed> <d:GridResponseDomainInMixed> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV">checkbox</r:GenericOutputFormat> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxricm</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-RDOP-jbgddyry</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxricm</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -2601,14 +2621,14 @@ <d:QuestionGrid> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:QuestionGridName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES</r:String> </d:QuestionGridName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgde5yl</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES11</r:String> </r:ParameterName> @@ -2616,7 +2636,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd2x2t</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES21</r:String> </r:ParameterName> @@ -2624,7 +2644,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdjypz</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES31</r:String> </r:ParameterName> @@ -2632,7 +2652,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdcftu</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES41</r:String> </r:ParameterName> @@ -2640,7 +2660,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdiyfe</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES51</r:String> </r:ParameterName> @@ -2648,7 +2668,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdj1wd</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES61</r:String> </r:ParameterName> @@ -2656,7 +2676,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgddylk</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES71</r:String> </r:ParameterName> @@ -2664,7 +2684,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd3jj6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES81</r:String> </r:ParameterName> @@ -2672,7 +2692,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd4w3k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES91</r:String> </r:ParameterName> @@ -2680,7 +2700,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd4w4k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES101</r:String> </r:ParameterName> @@ -2689,13 +2709,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgde5yl</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgde5yl</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2703,13 +2723,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgd2x2t</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd2x2t</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2717,13 +2737,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgdjypz</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdjypz</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2731,13 +2751,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgdcftu</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdcftu</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2745,13 +2765,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgdiyfe</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdiyfe</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2759,13 +2779,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgdj1wd</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdj1wd</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2773,13 +2793,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgddylk</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgddylk</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2787,13 +2807,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgd3jj6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd3jj6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2801,13 +2821,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgd4w3k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd4w3k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -2815,38 +2835,38 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgd4w4k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd4w4k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> <d:QuestionText> <d:LiteralText> <d:Text xml:lang="fr-FR">Please, specify the percentage of Jay's expenses in the Kwik-E-Mart for each - product? </d:Text> + product?</d:Text> </d:LiteralText> </d:QuestionText> <d:GridDimension displayCode="false" displayLabel="false" rank="1"> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwh16i</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </d:CodeDomain> </d:GridDimension> <d:GridDimension displayCode="false" displayLabel="false" rank="2"> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-secondDimension-fakeCL-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </d:CodeDomain> @@ -2862,7 +2882,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgde5yl</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -2882,7 +2902,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgd2x2t</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -2902,7 +2922,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgdjypz</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -2922,7 +2942,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgdcftu</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -2942,7 +2962,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgdiyfe</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -2962,7 +2982,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgdj1wd</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -2982,7 +3002,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgddylk</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -3002,7 +3022,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgd3jj6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -3022,7 +3042,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgd4w3k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -3042,7 +3062,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-RDOP-jbgd4w4k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -3057,14 +3077,14 @@ <d:QuestionGrid> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:QuestionGridName> <r:String xml:lang="fr-FR">CLOWNING</r:String> </d:QuestionGridName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgd8tyr</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">CLOWNING11</r:String> </r:ParameterName> @@ -3072,7 +3092,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdep36</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">CLOWNING21</r:String> </r:ParameterName> @@ -3080,7 +3100,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdjjgi</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">CLOWNING31</r:String> </r:ParameterName> @@ -3088,7 +3108,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdgh6k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">CLOWNING41</r:String> </r:ParameterName> @@ -3096,7 +3116,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdit3o</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">CLOWNING12</r:String> </r:ParameterName> @@ -3104,7 +3124,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgd366k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">CLOWNING22</r:String> </r:ParameterName> @@ -3112,7 +3132,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdax06</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">CLOWNING32</r:String> </r:ParameterName> @@ -3120,7 +3140,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdfo1j</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">CLOWNING42</r:String> </r:ParameterName> @@ -3129,13 +3149,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-RDOP-jbgd8tyr</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgd8tyr</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3143,13 +3163,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-RDOP-jbgdep36</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdep36</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3157,13 +3177,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-RDOP-jbgdjjgi</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdjjgi</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3171,13 +3191,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-RDOP-jbgdgh6k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdgh6k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3185,13 +3205,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-RDOP-jbgdit3o</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdit3o</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3199,13 +3219,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-RDOP-jbgd366k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgd366k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3213,13 +3233,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-RDOP-jbgdax06</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdax06</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3227,60 +3247,60 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-RDOP-jbgdfo1j</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdfo1j</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> <d:QuestionText> <d:LiteralText> - <d:Text xml:lang="fr-FR">Who did these clownings and tell us what you remember? </d:Text> + <d:Text xml:lang="fr-FR">Who did these clownings and tell us what you remember?</d:Text> </d:LiteralText> </d:QuestionText> <d:GridDimension displayCode="false" displayLabel="false" rank="1"> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j77dav9b</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </d:CodeDomain> </d:GridDimension> <d:GridDimension displayCode="false" displayLabel="false" rank="2"> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-secondDimension-fakeCL-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </d:CodeDomain> </d:GridDimension> <d:StructuredMixedGridResponseDomain> <d:GridResponseDomainInMixed> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV">drop-down-list</r:GenericOutputFormat> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdyh6b5</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-RDOP-jbgd8tyr</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdyh6b5</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -3295,23 +3315,23 @@ </d:GridAttachment> </d:GridResponseDomainInMixed> <d:GridResponseDomainInMixed> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV">drop-down-list</r:GenericOutputFormat> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdyh6b5</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-RDOP-jbgdep36</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdyh6b5</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -3326,23 +3346,23 @@ </d:GridAttachment> </d:GridResponseDomainInMixed> <d:GridResponseDomainInMixed> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV">drop-down-list</r:GenericOutputFormat> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdyh6b5</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-RDOP-jbgdjjgi</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdyh6b5</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -3357,23 +3377,23 @@ </d:GridAttachment> </d:GridResponseDomainInMixed> <d:GridResponseDomainInMixed> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:GenericOutputFormat controlledVocabularyID="INSEE-GOF-CV">drop-down-list</r:GenericOutputFormat> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdyh6b5</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-RDOP-jbgdgh6k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdyh6b5</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </r:CodeRepresentation> @@ -3392,7 +3412,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-RDOP-jbgdit3o</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TextRepresentation maxLength="255"/> </r:OutParameter> </d:TextDomain> @@ -3408,7 +3428,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-RDOP-jbgd366k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TextRepresentation maxLength="255"/> </r:OutParameter> </d:TextDomain> @@ -3424,7 +3444,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-RDOP-jbgdax06</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TextRepresentation maxLength="255"/> </r:OutParameter> </d:TextDomain> @@ -3440,7 +3460,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-RDOP-jbgdfo1j</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TextRepresentation maxLength="255"/> </r:OutParameter> </d:TextDomain> @@ -3456,14 +3476,14 @@ <d:QuestionGrid> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:QuestionGridName> <r:String xml:lang="fr-FR">TRAVEL</r:String> </d:QuestionGridName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd92mb</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL11</r:String> </r:ParameterName> @@ -3471,7 +3491,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdgsat</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL21</r:String> </r:ParameterName> @@ -3479,7 +3499,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdaxk2</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL31</r:String> </r:ParameterName> @@ -3487,7 +3507,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd7myn</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL41</r:String> </r:ParameterName> @@ -3495,7 +3515,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdnxkt</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL12</r:String> </r:ParameterName> @@ -3503,7 +3523,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd3ef5</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL22</r:String> </r:ParameterName> @@ -3511,7 +3531,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd8p1v</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL32</r:String> </r:ParameterName> @@ -3519,7 +3539,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdgm0c</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL42</r:String> </r:ParameterName> @@ -3527,7 +3547,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdcppc</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL13</r:String> </r:ParameterName> @@ -3535,7 +3555,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd4cm6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL23</r:String> </r:ParameterName> @@ -3543,7 +3563,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdd2lo</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL33</r:String> </r:ParameterName> @@ -3551,7 +3571,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdo0ay</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL43</r:String> </r:ParameterName> @@ -3559,7 +3579,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd4r2a</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL14</r:String> </r:ParameterName> @@ -3567,7 +3587,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdkfpq</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL24</r:String> </r:ParameterName> @@ -3575,7 +3595,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd7u52</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL34</r:String> </r:ParameterName> @@ -3583,7 +3603,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdgfwl</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL44</r:String> </r:ParameterName> @@ -3591,7 +3611,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd9cff</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL15</r:String> </r:ParameterName> @@ -3599,7 +3619,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgddwsp</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL25</r:String> </r:ParameterName> @@ -3607,7 +3627,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdncn8</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL35</r:String> </r:ParameterName> @@ -3615,7 +3635,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdnz6b</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL45</r:String> </r:ParameterName> @@ -3623,7 +3643,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdiva0</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL16</r:String> </r:ParameterName> @@ -3631,7 +3651,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd7dqf</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL26</r:String> </r:ParameterName> @@ -3639,7 +3659,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdnous</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL36</r:String> </r:ParameterName> @@ -3647,7 +3667,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdkfcz</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">TRAVEL46</r:String> </r:ParameterName> @@ -3656,13 +3676,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd92mb</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd92mb</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3670,13 +3690,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdgsat</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdgsat</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3684,13 +3704,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdaxk2</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdaxk2</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3698,13 +3718,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd7myn</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd7myn</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3712,13 +3732,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdnxkt</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdnxkt</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3726,13 +3746,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd3ef5</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd3ef5</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3740,13 +3760,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd8p1v</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd8p1v</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3754,13 +3774,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdgm0c</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdgm0c</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3768,13 +3788,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdcppc</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdcppc</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3782,13 +3802,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd4cm6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd4cm6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3796,13 +3816,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdd2lo</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdd2lo</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3810,13 +3830,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdo0ay</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdo0ay</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3824,13 +3844,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd4r2a</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd4r2a</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3838,13 +3858,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdkfpq</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdkfpq</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3852,13 +3872,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd7u52</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd7u52</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3866,13 +3886,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdgfwl</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdgfwl</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3880,13 +3900,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd9cff</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd9cff</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3894,13 +3914,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgddwsp</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgddwsp</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3908,13 +3928,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdncn8</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdncn8</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3922,13 +3942,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdnz6b</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdnz6b</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3936,13 +3956,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdiva0</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdiva0</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3950,13 +3970,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd7dqf</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd7dqf</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3964,13 +3984,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdnous</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdnous</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -3978,38 +3998,38 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdkfcz</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdkfcz</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> <d:QuestionText> <d:LiteralText> <d:Text xml:lang="fr-FR">Which of the following means of transport were used by the hero and in which - country? </d:Text> + country?</d:Text> </d:LiteralText> </d:QuestionText> <d:GridDimension displayCode="false" displayLabel="false" rank="1"> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2kivg</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </d:CodeDomain> </d:GridDimension> <d:GridDimension displayCode="false" displayLabel="false" rank="2"> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbdye1wa</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </d:CodeDomain> @@ -4020,14 +4040,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd92mb</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4049,14 +4069,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdgsat</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4078,14 +4098,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdaxk2</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4107,14 +4127,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd7myn</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4136,14 +4156,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdnxkt</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4165,14 +4185,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd3ef5</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4194,14 +4214,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd8p1v</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4223,14 +4243,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdgm0c</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4252,14 +4272,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdcppc</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4281,14 +4301,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd4cm6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4310,14 +4330,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdd2lo</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4339,14 +4359,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdo0ay</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4368,14 +4388,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd4r2a</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4397,14 +4417,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdkfpq</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4426,14 +4446,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd7u52</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4455,14 +4475,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdgfwl</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4484,14 +4504,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd9cff</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4513,14 +4533,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgddwsp</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4542,14 +4562,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdncn8</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4571,14 +4591,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdnz6b</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4600,14 +4620,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdiva0</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4629,14 +4649,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgd7dqf</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4658,14 +4678,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdnous</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4687,14 +4707,14 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-RDOP-jbgdkfcz</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CodeRepresentation> <r:CodeSubsetInformation> <r:IncludedCode> <r:CodeReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Code</r:TypeOfObject> </r:CodeReference> </r:IncludedCode> @@ -4715,21 +4735,21 @@ <d:InterviewerInstructionReference> <r:Agency>fr.insee</r:Agency> <r:ID>d10</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Instruction</r:TypeOfObject> </d:InterviewerInstructionReference> </d:QuestionGrid> <d:QuestionGrid> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:QuestionGridName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS</r:String> </d:QuestionGridName> <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdl5jb</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS11</r:String> </r:ParameterName> @@ -4737,7 +4757,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd8lwo</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS21</r:String> </r:ParameterName> @@ -4745,7 +4765,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdbfag</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS31</r:String> </r:ParameterName> @@ -4753,7 +4773,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdlgja</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS41</r:String> </r:ParameterName> @@ -4761,7 +4781,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd745y</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS51</r:String> </r:ParameterName> @@ -4769,7 +4789,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdjkts</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS61</r:String> </r:ParameterName> @@ -4777,7 +4797,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdcax7</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS71</r:String> </r:ParameterName> @@ -4785,7 +4805,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdjye1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS81</r:String> </r:ParameterName> @@ -4793,7 +4813,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd5jet</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS91</r:String> </r:ParameterName> @@ -4801,7 +4821,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdjw90</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS101</r:String> </r:ParameterName> @@ -4809,7 +4829,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdfndq</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS12</r:String> </r:ParameterName> @@ -4817,7 +4837,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd7osi</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS22</r:String> </r:ParameterName> @@ -4825,7 +4845,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd7bnw</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS32</r:String> </r:ParameterName> @@ -4833,7 +4853,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd9k71</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS42</r:String> </r:ParameterName> @@ -4841,7 +4861,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdimks</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS52</r:String> </r:ParameterName> @@ -4849,7 +4869,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdjquz</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS62</r:String> </r:ParameterName> @@ -4857,7 +4877,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdd2w3</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS72</r:String> </r:ParameterName> @@ -4865,7 +4885,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdkosc</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS82</r:String> </r:ParameterName> @@ -4873,7 +4893,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdk0x4</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS92</r:String> </r:ParameterName> @@ -4881,7 +4901,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd2wgf</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS102</r:String> </r:ParameterName> @@ -4890,13 +4910,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdl5jb</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdl5jb</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -4904,13 +4924,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgd8lwo</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd8lwo</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -4918,13 +4938,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdbfag</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdbfag</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -4932,13 +4952,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdlgja</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdlgja</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -4946,13 +4966,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgd745y</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd745y</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -4960,13 +4980,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdjkts</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdjkts</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -4974,13 +4994,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdcax7</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdcax7</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -4988,13 +5008,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdjye1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdjye1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -5002,13 +5022,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgd5jet</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd5jet</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -5016,13 +5036,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdjw90</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdjw90</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -5030,13 +5050,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdfndq</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdfndq</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -5044,13 +5064,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgd7osi</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd7osi</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -5058,13 +5078,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgd7bnw</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd7bnw</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -5072,13 +5092,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgd9k71</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd9k71</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -5086,13 +5106,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdimks</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdimks</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -5100,13 +5120,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdjquz</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdjquz</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -5114,13 +5134,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdd2w3</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdd2w3</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -5128,13 +5148,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdkosc</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdkosc</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -5142,13 +5162,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdk0x4</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdk0x4</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -5156,13 +5176,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgd2wgf</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd2wgf</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -5175,11 +5195,11 @@ <d:Roster baseCodeValue="1" codeIterationValue="1" minimumRequired="1" maximumAllowed="10"/> </d:GridDimension> <d:GridDimension displayCode="false" displayLabel="false" rank="2"> - <d:CodeDomain displayCode="false"> + <d:CodeDomain> <r:CodeListReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-secondDimension-fakeCL-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>CodeList</r:TypeOfObject> </r:CodeListReference> </d:CodeDomain> @@ -5190,7 +5210,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdl5jb</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TextRepresentation maxLength="255"/> </r:OutParameter> </d:TextDomain> @@ -5206,7 +5226,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgd8lwo</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TextRepresentation maxLength="255"/> </r:OutParameter> </d:TextDomain> @@ -5222,7 +5242,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdbfag</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TextRepresentation maxLength="255"/> </r:OutParameter> </d:TextDomain> @@ -5238,7 +5258,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdlgja</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TextRepresentation maxLength="255"/> </r:OutParameter> </d:TextDomain> @@ -5254,7 +5274,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgd745y</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TextRepresentation maxLength="255"/> </r:OutParameter> </d:TextDomain> @@ -5270,7 +5290,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdjkts</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TextRepresentation maxLength="255"/> </r:OutParameter> </d:TextDomain> @@ -5286,7 +5306,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdcax7</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TextRepresentation maxLength="255"/> </r:OutParameter> </d:TextDomain> @@ -5302,7 +5322,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdjye1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TextRepresentation maxLength="255"/> </r:OutParameter> </d:TextDomain> @@ -5318,7 +5338,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgd5jet</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TextRepresentation maxLength="255"/> </r:OutParameter> </d:TextDomain> @@ -5334,7 +5354,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdjw90</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TextRepresentation maxLength="255"/> </r:OutParameter> </d:TextDomain> @@ -5355,7 +5375,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdfndq</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -5375,7 +5395,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgd7osi</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -5395,7 +5415,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgd7bnw</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -5415,7 +5435,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgd9k71</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -5435,7 +5455,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdimks</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -5455,7 +5475,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdjquz</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -5475,7 +5495,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdd2w3</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -5495,7 +5515,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdkosc</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -5515,7 +5535,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgdk0x4</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -5535,7 +5555,7 @@ <r:OutParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-RDOP-jbgd2wgf</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> </d:NumericDomain> <d:GridAttachment> @@ -5551,30 +5571,30 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-j334iumu</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">TOWN</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j334iumu--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j334iumu-1</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Springfield</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j334iumu-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j334iumu-2</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Shelbyville</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j334iumu-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j334iumu-3</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Seinfeld</r:Content> </r:Label> @@ -5583,38 +5603,38 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-j6qdqoen</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> - <r:Content xml:lang="fr-FR">MAYOR</r:Content> + <r:Content xml:lang="fr-FR">MAYOR </r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6qdqoen--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6qdqoen-1</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Constance Harm</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6qdqoen-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6qdqoen-2</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Timothy Lovejoy</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6qdqoen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6qdqoen-3</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Joe Quimby</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6qdqoen-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6qdqoen-4</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Poochie</r:Content> </r:Label> @@ -5623,110 +5643,110 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-j4nwo00f</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">State</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwo00f--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwo00f-1</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Washington</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwo00f-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwo00f-2</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Kentucky</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwo00f-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwo00f-3</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Ohio</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwo00f-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwo00f-4</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Maine</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwo00f-3</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwo00f-5</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">North Dakota</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwo00f-4</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwo00f-6</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Florida</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwo00f-5</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwo00f-7</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">North Takoma</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwo00f-6</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwo00f-8</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">California</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwo00f-7</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwo00f-9</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Texas</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwo00f-8</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwo00f-10</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Massachusetts</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwo00f-9</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwo00f-11</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Nevada</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwo00f-10</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwo00f-12</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Illinois</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwo00f-11</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwo00f-13</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Not in any state, you fool!</r:Content> </r:Label> @@ -5735,38 +5755,38 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-j335cu3c</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">ANIMALS</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j335cu3c--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j335cu3c-1</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Santa's Little Helper</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j335cu3c-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j335cu3c-2</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Snowball I</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j335cu3c-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j335cu3c-3</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Coltrane</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j335cu3c-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j335cu3c-4</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Mojo the Helper Monkey</r:Content> </r:Label> @@ -5775,38 +5795,38 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-j6p2mvca</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Flavours</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6p2mvca--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6p2mvca-1</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Vanilla</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6p2mvca-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6p2mvca-2</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Strawberry</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6p2mvca-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6p2mvca-3</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Apple</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6p2mvca-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6p2mvca-4</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Bacon</r:Content> </r:Label> @@ -5815,22 +5835,22 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-jbdxh138</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">YESNO</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdxh138--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdxh138-1</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Yes</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdxh138-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdxh138-2</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">No</r:Content> </r:Label> @@ -5839,38 +5859,38 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-j6qeytgc</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">NUCLEAR_CHARACTERS</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6qeytgc--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6qeytgc-1</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Charles Montgomery Burns</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6qeytgc-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6qeytgc-2</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Carl Carlson</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6qeytgc-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6qeytgc-3</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Otto Mann</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6qeytgc-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6qeytgc-4</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Carl Carlson</r:Content> </r:Label> @@ -5879,46 +5899,46 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-j6z087mq</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">BIRTH_CHARACTER</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6z087mq--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6z087mq-1</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Selma Bouvier</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6z087mq-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6z087mq-2</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Kent Brockman</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6z087mq-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6z087mq-3</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Milhouse Van Houten</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6z087mq-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6z087mq-4</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Nelson Muntz</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6z087mq-3</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6z087mq-5</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Crazy Cat Lady</r:Content> </r:Label> @@ -5927,46 +5947,46 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-jbdxricm</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">CITY_BIRTH</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdxricm--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdxricm-1</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Albuquerque</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdxricm-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdxricm-2</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Springfield</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdxricm-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdxricm-3</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Portland</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdxricm-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdxricm-4</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Shelbyville</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdxricm-3</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdxricm-5</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Dagstuhl</r:Content> </r:Label> @@ -5975,86 +5995,86 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-j4nwh16i</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Products</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwh16i--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwh16i-1</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Frozen products</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwh16i-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwh16i-2</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Ice creams</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwh16i-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwh16i-3</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Jasper Beardly</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwh16i-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwh16i-4</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Meat</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwh16i-3</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwh16i-5</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Bacon</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwh16i-4</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwh16i-6</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Pork chop</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwh16i-5</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwh16i-7</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Chicken</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwh16i-6</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwh16i-8</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Compote</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwh16i-7</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwh16i-9</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Powersauce</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwh16i-8</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwh16i-10</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Other</r:Content> </r:Label> @@ -6063,38 +6083,38 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-j77dav9b</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Clownings</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j77dav9b--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j77dav9b-1</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR"><xhtml:p><xhtml:b><xhtml:i>Break the windows of the whole city</xhtml:i></xhtml:b></xhtml:p></r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j77dav9b-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j77dav9b-2</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR"><xhtml:p><xhtml:b><xhtml:i>Loose the violin of his daughter playing poker</xhtml:i></xhtml:b></xhtml:p></r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j77dav9b-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j77dav9b-3</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR"><xhtml:p><xhtml:b><xhtml:i>Kill Mr Burns</xhtml:i></xhtml:b></xhtml:p></r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j77dav9b-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j77dav9b-4</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR"><xhtml:p><xhtml:b><xhtml:i>Leaving a mechanical object to control the nuclear power plant</xhtml:i></xhtml:b></xhtml:p></r:Content> </r:Label> @@ -6103,38 +6123,38 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-jbdyh6b5</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Clowning_Characters</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdyh6b5--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdyh6b5-1</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Jay</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdyh6b5-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdyh6b5-2</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Bart</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdyh6b5-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdyh6b5-3</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Krusty the clown</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdyh6b5-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdyh6b5-4</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Maggie</r:Content> </r:Label> @@ -6143,38 +6163,38 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-j6p2kivg</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Means of transport</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6p2kivg--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6p2kivg-1</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Car</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6p2kivg-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6p2kivg-2</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Bike</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6p2kivg-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6p2kivg-3</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Skateboard</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6p2kivg-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6p2kivg-4</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Plane</r:Content> </r:Label> @@ -6183,54 +6203,54 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-jbdye1wa</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Country</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdye1wa--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdye1wa-1</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Brazil</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdye1wa-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdye1wa-2</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Canada</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdye1wa-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdye1wa-3</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Japan</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdye1wa-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdye1wa-4</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">France</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdye1wa-3</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdye1wa-5</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR"><xhtml:p>Other country<xhtml:a href="#ftn1"/></xhtml:p></r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdye1wa-4</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdye1wa-6</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Other planet</r:Content> </r:Label> @@ -6239,14 +6259,14 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-j4nwc63q-secondDimension-fakeCL-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">FAKE-CODELIST-j4nwc63q-secondDimension-fakeCL-1</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwc63q-secondDimension-fakeCL-1--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwc63q-secondDimension-fakeCL-1-1</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Percentage</r:Content> </r:Label> @@ -6255,22 +6275,22 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-j4nw0rr6-secondDimension-fakeCL-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">FAKE-CODELIST-j4nw0rr6-secondDimension-fakeCL-1</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nw0rr6-secondDimension-fakeCL-1--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nw0rr6-secondDimension-fakeCL-1-1</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Clowning</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nw0rr6-secondDimension-fakeCL-1-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nw0rr6-secondDimension-fakeCL-1-2</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Remember?</r:Content> </r:Label> @@ -6279,22 +6299,22 @@ <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> <r:ID>CategoryScheme-j6qg8rc6-secondDimension-fakeCL-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">FAKE-CODELIST-j6qg8rc6-secondDimension-fakeCL-1</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6qg8rc6-secondDimension-fakeCL-1--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6qg8rc6-secondDimension-fakeCL-1-1</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Name</r:Content> </r:Label> </l:Category> <l:Category> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6qg8rc6-secondDimension-fakeCL-1-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6qg8rc6-secondDimension-fakeCL-1-2</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Age</r:Content> </r:Label> @@ -6302,15 +6322,15 @@ </l:CategoryScheme> <l:CategoryScheme> <r:Agency>fr.insee</r:Agency> - <r:ID>CategoryScheme-i6vwid</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CategoryScheme-i6vwi0</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">A définir</r:Content> </r:Label> <l:Category> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CA-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR"/> </r:Label> @@ -6319,14 +6339,14 @@ <l:CodeListScheme> <r:Agency>fr.insee</r:Agency> <r:ID>SIMPSONS-CLS</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:CodeListSchemeName> <r:String xml:lang="en-IE">SIMPSONS</r:String> </l:CodeListSchemeName> <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>j334iumu</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">TOWN</r:Content> </r:Label> @@ -6336,36 +6356,36 @@ </l:Level> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j334iumu--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j334iumu-1</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j334iumu--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j334iumu-1</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>00001</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j334iumu-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j334iumu-2</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j334iumu-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j334iumu-2</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>00002</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j334iumu-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j334iumu-3</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j334iumu-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j334iumu-3</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>00003</r:Value> @@ -6374,9 +6394,9 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>j6qdqoen</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> - <r:Content xml:lang="fr-FR">MAYOR</r:Content> + <r:Content xml:lang="fr-FR">MAYOR </r:Content> </r:Label> <l:HierarchyType>Regular</l:HierarchyType> <l:Level levelNumber="1"> @@ -6384,48 +6404,48 @@ </l:Level> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j6qdqoen--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j6qdqoen-1</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6qdqoen--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6qdqoen-1</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>1</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j6qdqoen-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j6qdqoen-2</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6qdqoen-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6qdqoen-2</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>2</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j6qdqoen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j6qdqoen-3</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6qdqoen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6qdqoen-3</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>3</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j6qdqoen-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j6qdqoen-4</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6qdqoen-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6qdqoen-4</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>4</r:Value> @@ -6434,7 +6454,7 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwo00f</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">State</r:Content> </r:Label> @@ -6444,156 +6464,156 @@ </l:Level> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwo00f--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j4nwo00f-1</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwo00f--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwo00f-1</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>1</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwo00f-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j4nwo00f-2</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwo00f-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwo00f-2</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>2</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwo00f-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j4nwo00f-3</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwo00f-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwo00f-3</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>3</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwo00f-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j4nwo00f-4</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwo00f-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwo00f-4</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>4</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwo00f-3</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j4nwo00f-5</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwo00f-3</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwo00f-5</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>5</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwo00f-4</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j4nwo00f-6</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwo00f-4</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwo00f-6</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>6</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwo00f-5</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j4nwo00f-7</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwo00f-5</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwo00f-7</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>7</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwo00f-6</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j4nwo00f-8</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwo00f-6</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwo00f-8</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>8</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwo00f-7</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j4nwo00f-9</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwo00f-7</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwo00f-9</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>9</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwo00f-8</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j4nwo00f-10</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwo00f-8</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwo00f-10</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>10</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwo00f-9</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j4nwo00f-11</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwo00f-9</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwo00f-11</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>11</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwo00f-10</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j4nwo00f-12</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwo00f-10</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwo00f-12</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>12</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwo00f-11</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j4nwo00f-13</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwo00f-11</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwo00f-13</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>13</r:Value> @@ -6602,7 +6622,7 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>j335cu3c</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">ANIMALS</r:Content> </r:Label> @@ -6612,48 +6632,48 @@ </l:Level> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j335cu3c--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j335cu3c-1</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j335cu3c--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j335cu3c-1</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>1</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j335cu3c-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j335cu3c-2</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j335cu3c-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j335cu3c-2</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>2</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j335cu3c-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j335cu3c-3</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j335cu3c-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j335cu3c-3</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>3</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j335cu3c-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j335cu3c-4</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j335cu3c-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j335cu3c-4</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>4</r:Value> @@ -6662,7 +6682,7 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2mvca</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Flavours</r:Content> </r:Label> @@ -6672,48 +6692,48 @@ </l:Level> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j6p2mvca--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j6p2mvca-1</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6p2mvca--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6p2mvca-1</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>1</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j6p2mvca-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j6p2mvca-2</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6p2mvca-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6p2mvca-2</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>2</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j6p2mvca-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j6p2mvca-3</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6p2mvca-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6p2mvca-3</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>3</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j6p2mvca-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j6p2mvca-4</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6p2mvca-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6p2mvca-4</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>4</r:Value> @@ -6722,7 +6742,7 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxh138</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">YESNO</r:Content> </r:Label> @@ -6732,24 +6752,24 @@ </l:Level> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>jbdxh138--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>jbdxh138-1</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdxh138--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdxh138-1</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>1</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>jbdxh138-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>jbdxh138-2</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdxh138-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdxh138-2</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>0</r:Value> @@ -6758,7 +6778,7 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>j6qeytgc</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">NUCLEAR_CHARACTERS</r:Content> </r:Label> @@ -6768,48 +6788,48 @@ </l:Level> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j6qeytgc--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j6qeytgc-1</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6qeytgc--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6qeytgc-1</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>1</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j6qeytgc-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j6qeytgc-2</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6qeytgc-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6qeytgc-2</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>2</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j6qeytgc-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j6qeytgc-3</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6qeytgc-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6qeytgc-3</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>3</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j6qeytgc-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j6qeytgc-4</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6qeytgc-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6qeytgc-4</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>4</r:Value> @@ -6818,7 +6838,7 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>j6z087mq</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">BIRTH_CHARACTER</r:Content> </r:Label> @@ -6828,60 +6848,60 @@ </l:Level> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j6z087mq--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j6z087mq-1</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6z087mq--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6z087mq-1</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>1</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j6z087mq-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j6z087mq-2</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6z087mq-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6z087mq-2</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>2</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j6z087mq-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j6z087mq-3</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6z087mq-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6z087mq-3</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>3</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j6z087mq-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j6z087mq-4</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6z087mq-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6z087mq-4</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>4</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j6z087mq-3</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j6z087mq-5</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6z087mq-3</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6z087mq-5</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>5</r:Value> @@ -6890,7 +6910,7 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxricm</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">CITY_BIRTH</r:Content> </r:Label> @@ -6900,60 +6920,60 @@ </l:Level> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>jbdxricm--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>jbdxricm-1</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdxricm--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdxricm-1</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>1</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>jbdxricm-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>jbdxricm-2</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdxricm-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdxricm-2</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>2</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>jbdxricm-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>jbdxricm-3</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdxricm-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdxricm-3</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>3</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>jbdxricm-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>jbdxricm-4</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdxricm-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdxricm-4</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>4</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>jbdxricm-3</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>jbdxricm-5</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdxricm-3</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdxricm-5</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>5</r:Value> @@ -6962,7 +6982,7 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwh16i</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Products</r:Content> </r:Label> @@ -6972,35 +6992,35 @@ </l:Level> <l:Code levelNumber="1" isDiscrete="false"> <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwh16i--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j4nwh16i-1</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwh16i--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwh16i-1</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>A</r:Value> <l:Code levelNumber="2" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwh16i-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j4nwh16i-2</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwh16i-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwh16i-2</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>A1</r:Value> </l:Code> <l:Code levelNumber="2" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwh16i-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j4nwh16i-3</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwh16i-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwh16i-3</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>A2</r:Value> @@ -7008,47 +7028,47 @@ </l:Code> <l:Code levelNumber="1" isDiscrete="false"> <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwh16i-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j4nwh16i-4</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwh16i-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwh16i-4</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>B</r:Value> <l:Code levelNumber="2" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwh16i-3</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j4nwh16i-5</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwh16i-3</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwh16i-5</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>B1</r:Value> </l:Code> <l:Code levelNumber="2" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwh16i-4</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j4nwh16i-6</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwh16i-4</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwh16i-6</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>B2</r:Value> </l:Code> <l:Code levelNumber="2" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwh16i-5</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j4nwh16i-7</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwh16i-5</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwh16i-7</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>B3</r:Value> @@ -7056,23 +7076,23 @@ </l:Code> <l:Code levelNumber="1" isDiscrete="false"> <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwh16i-6</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j4nwh16i-8</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwh16i-6</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwh16i-8</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>C</r:Value> <l:Code levelNumber="2" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwh16i-7</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j4nwh16i-9</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwh16i-7</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwh16i-9</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>C1</r:Value> @@ -7080,12 +7100,12 @@ </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwh16i-8</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j4nwh16i-10</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwh16i-8</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwh16i-10</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>D</r:Value> @@ -7094,7 +7114,7 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>j77dav9b</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Clownings</r:Content> </r:Label> @@ -7104,48 +7124,48 @@ </l:Level> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j77dav9b--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j77dav9b-1</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j77dav9b--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j77dav9b-1</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>1</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j77dav9b-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j77dav9b-2</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j77dav9b-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j77dav9b-2</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>2</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j77dav9b-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j77dav9b-3</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j77dav9b-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j77dav9b-3</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>3</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j77dav9b-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j77dav9b-4</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j77dav9b-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j77dav9b-4</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>4</r:Value> @@ -7154,7 +7174,7 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>jbdyh6b5</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Clowning_Characters</r:Content> </r:Label> @@ -7164,48 +7184,48 @@ </l:Level> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>jbdyh6b5--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>jbdyh6b5-1</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdyh6b5--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdyh6b5-1</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>1</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>jbdyh6b5-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>jbdyh6b5-2</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdyh6b5-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdyh6b5-2</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>2</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>jbdyh6b5-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>jbdyh6b5-3</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdyh6b5-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdyh6b5-3</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>3</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>jbdyh6b5-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>jbdyh6b5-4</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdyh6b5-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdyh6b5-4</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>4</r:Value> @@ -7214,7 +7234,7 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2kivg</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Means of transport</r:Content> </r:Label> @@ -7224,48 +7244,48 @@ </l:Level> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j6p2kivg--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j6p2kivg-1</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6p2kivg--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6p2kivg-1</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>1</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j6p2kivg-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j6p2kivg-2</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6p2kivg-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6p2kivg-2</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>2</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j6p2kivg-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j6p2kivg-3</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6p2kivg-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6p2kivg-3</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>3</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j6p2kivg-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j6p2kivg-4</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6p2kivg-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6p2kivg-4</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>4</r:Value> @@ -7274,7 +7294,7 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>jbdye1wa</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Country</r:Content> </r:Label> @@ -7284,72 +7304,72 @@ </l:Level> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>jbdye1wa--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>jbdye1wa-1</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdye1wa--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdye1wa-1</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>1</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>jbdye1wa-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>jbdye1wa-2</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdye1wa-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdye1wa-2</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>2</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>jbdye1wa-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>jbdye1wa-3</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdye1wa-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdye1wa-3</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>3</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>jbdye1wa-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>jbdye1wa-4</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdye1wa-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdye1wa-4</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>4</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>jbdye1wa-3</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>jbdye1wa-5</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdye1wa-3</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdye1wa-5</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>5</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>jbdye1wa-4</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>jbdye1wa-6</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-jbdye1wa-4</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-jbdye1wa-6</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>6</r:Value> @@ -7358,7 +7378,7 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-secondDimension-fakeCL-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">FAKE-CODELIST-j4nwc63q-secondDimension-fakeCL-1</r:Content> </r:Label> @@ -7368,12 +7388,12 @@ </l:Level> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwc63q-secondDimension-fakeCL-1--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j4nwc63q-secondDimension-fakeCL-1-1</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nwc63q-secondDimension-fakeCL-1--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nwc63q-secondDimension-fakeCL-1-1</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>1</r:Value> @@ -7382,7 +7402,7 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-secondDimension-fakeCL-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">FAKE-CODELIST-j4nw0rr6-secondDimension-fakeCL-1</r:Content> </r:Label> @@ -7392,24 +7412,24 @@ </l:Level> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j4nw0rr6-secondDimension-fakeCL-1--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j4nw0rr6-secondDimension-fakeCL-1-1</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nw0rr6-secondDimension-fakeCL-1--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nw0rr6-secondDimension-fakeCL-1-1</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>1</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j4nw0rr6-secondDimension-fakeCL-1-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j4nw0rr6-secondDimension-fakeCL-1-2</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j4nw0rr6-secondDimension-fakeCL-1-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j4nw0rr6-secondDimension-fakeCL-1-2</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>2</r:Value> @@ -7418,7 +7438,7 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-secondDimension-fakeCL-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">FAKE-CODELIST-j6qg8rc6-secondDimension-fakeCL-1</r:Content> </r:Label> @@ -7428,24 +7448,24 @@ </l:Level> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j6qg8rc6-secondDimension-fakeCL-1--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j6qg8rc6-secondDimension-fakeCL-1-1</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6qg8rc6-secondDimension-fakeCL-1--1</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6qg8rc6-secondDimension-fakeCL-1-1</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>1</r:Value> </l:Code> <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> - <r:ID>j6qg8rc6-secondDimension-fakeCL-1-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>j6qg8rc6-secondDimension-fakeCL-1-2</r:ID> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> - <r:ID>CA-j6qg8rc6-secondDimension-fakeCL-1-0</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>CA-j6qg8rc6-secondDimension-fakeCL-1-2</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>2</r:Value> @@ -7454,7 +7474,7 @@ <l:CodeList> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:CodeListName> <r:String xml:lang="fr-FR">Booleen</r:String> </l:CodeListName> @@ -7465,11 +7485,11 @@ <l:Code levelNumber="1" isDiscrete="true"> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:CategoryReference> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-COMMUN-CA-Booleen-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Category</r:TypeOfObject> </r:CategoryReference> <r:Value>1</r:Value> @@ -7478,231 +7498,348 @@ </l:CodeListScheme> <l:VariableScheme> <r:Agency>fr.insee</r:Agency> - <r:ID>VariableScheme-i6vwid</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>VariableScheme-i6vwi0</r:ID> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="fr-FR">Variable Scheme for the survey</r:Content> </r:Label> + <l:Variable> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbcggtca</r:ID> + <r:Version>1</r:Version> + <l:VariableName> + <r:String xml:lang="fr-FR">SUM_EXPENSES</r:String> + </l:VariableName> + <r:Label> + <r:Content xml:lang="fr-FR">SUM_EXPENSES label </r:Content> + </r:Label> + <r:OutParameter> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbcggtca-VROP</r:ID> + <r:Version>1</r:Version> + </r:OutParameter> + <l:VariableRepresentation> + <r:ProcessingInstructionReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbcggtca-GI</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>GenerationInstruction</r:TypeOfObject> + <r:Binding> + <r:SourceParameterReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbcggtca-GOP</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>OutParameter</r:TypeOfObject> + </r:SourceParameterReference> + <r:TargetParameterReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbcggtca-VROP</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>OutParameter</r:TypeOfObject> + </r:TargetParameterReference> + </r:Binding> + </r:ProcessingInstructionReference> + <r:NumericRepresentation/> + </l:VariableRepresentation> + </l:Variable> + <l:Variable> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbcggtex</r:ID> + <r:Version>1</r:Version> + <l:VariableName> + <r:String xml:lang="fr-FR">LAST_BROADCAST</r:String> + </l:VariableName> + <r:Label> + <r:Content xml:lang="fr-FR">LAST_BROADCAST label </r:Content> + </r:Label> + </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbcgfvir</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">COMMENT</r:String> </l:VariableName> <r:Label> - <r:Content xml:lang="fr-FR">COMMENT label</r:Content> + <r:Content xml:lang="fr-FR">COMMENT label </r:Content> </r:Label> <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p3dkx6-QOP-jbgdhaht</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p3dkx6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:TextRepresentation maxLength="500"/> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbcgm0ip</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">READY</r:String> </l:VariableName> <r:Label> - <r:Content xml:lang="fr-FR">READY label</r:Content> + <r:Content xml:lang="fr-FR">READY label </r:Content> </r:Label> <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p0np9q-QOP-jbgd3set</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p0np9q</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbcgf11f</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">PRODUCER</r:String> </l:VariableName> <r:Label> - <r:Content xml:lang="fr-FR">PRODUCER label</r:Content> + <r:Content xml:lang="fr-FR">PRODUCER label </r:Content> </r:Label> <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j3343qhx-QOP-jbgd90cy</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j3343qhx</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:TextRepresentation maxLength="30"/> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbcgcy2x</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">SEASON_NUMBER</r:String> </l:VariableName> <r:Label> - <r:Content xml:lang="fr-FR">SEASON_NUMBER label</r:Content> + <r:Content xml:lang="fr-FR">SEASON_NUMBER label </r:Content> </r:Label> <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6q9h8tj-QOP-jbgdjy8h</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6q9h8tj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:NumericRepresentation> + <r:NumberRange> + <r:Low isInclusive="true">0</r:Low> + <r:High isInclusive="true">99</r:High> + </r:NumberRange> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + </r:NumericRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbcgbg33</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">DATEFIRST</r:String> </l:VariableName> <r:Label> - <r:Content xml:lang="fr-FR">DATEFIRST label</r:Content> + <r:Content xml:lang="fr-FR">DATEFIRST label </r:Content> </r:Label> <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334cyqb-QOP-jbgdih2z</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334cyqb</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:DateTimeRepresentationReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-MNR-DateTimedate-YYYY-MM-DD</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>ManagedDateTimeRepresentation</r:TypeOfObject> + </r:DateTimeRepresentationReference> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbcgieyw</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">AUDIENCE_SHARE</r:String> </l:VariableName> <r:Label> - <r:Content xml:lang="fr-FR">AUDIENCE_SHARE label</r:Content> + <r:Content xml:lang="fr-FR">AUDIENCE_SHARE label </r:Content> </r:Label> <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6z06z1e-QOP-jbgddnrd</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6z06z1e</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:NumericRepresentation decimalPositions="1"> + <r:NumberRange> + <r:Low isInclusive="true">0</r:Low> + <r:High isInclusive="true">99</r:High> + </r:NumberRange> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + </r:NumericRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbcgasbh</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">CITY</r:String> </l:VariableName> <r:Label> - <r:Content xml:lang="fr-FR">CITY label</r:Content> + <r:Content xml:lang="fr-FR">CITY label </r:Content> </r:Label> <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j3343clt-QOP-jbgdjdkn</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j3343clt</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeListReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>j334iumu</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>CodeList</r:TypeOfObject> + </r:CodeListReference> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbcg9yr6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">MAYOR</r:String> </l:VariableName> <r:Label> - <r:Content xml:lang="fr-FR">MAYOR label</r:Content> + <r:Content xml:lang="fr-FR">MAYOR label </r:Content> </r:Label> <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qdfhvw-QOP-jbgd8ghp</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qdfhvw</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeListReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>j6qdqoen</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>CodeList</r:TypeOfObject> + </r:CodeListReference> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbcgpija</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">STATE</r:String> </l:VariableName> <r:Label> - <r:Content xml:lang="fr-FR">STATE label</r:Content> + <r:Content xml:lang="fr-FR">STATE label </r:Content> </r:Label> <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw5cqz-QOP-jbgdkd7v</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw5cqz</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeListReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>j4nwo00f</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>CodeList</r:TypeOfObject> + </r:CodeListReference> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxewlq</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">PET1</r:String> </l:VariableName> @@ -7712,21 +7849,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-QOP-jbgd8qmn</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxjmst</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">PET2</r:String> </l:VariableName> @@ -7736,21 +7886,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-QOP-jbgd60vl</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxjuay</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">PET3</r:String> </l:VariableName> @@ -7760,21 +7923,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-QOP-jbgda2jo</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxniuw</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">PET4</r:String> </l:VariableName> @@ -7784,21 +7960,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov-QOP-jbgdfssy</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j334akov</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxtl1d</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">ICE_FLAVOUR1</r:String> </l:VariableName> @@ -7808,21 +7997,30 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-QOP-jbgdb3jx</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeListReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbdxh138</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>CodeList</r:TypeOfObject> + </r:CodeListReference> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxvai9</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">ICE_FLAVOUR2</r:String> </l:VariableName> @@ -7832,21 +8030,30 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-QOP-jbgdb61k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeListReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbdxh138</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>CodeList</r:TypeOfObject> + </r:CodeListReference> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxpltw</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">ICE_FLAVOUR3</r:String> </l:VariableName> @@ -7856,21 +8063,30 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-QOP-jbgdl3kc</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeListReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbdxh138</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>CodeList</r:TypeOfObject> + </r:CodeListReference> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxzx2x</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">ICE_FLAVOUR4</r:String> </l:VariableName> @@ -7880,21 +8096,30 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81-QOP-jbgdcobo</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p29i81</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeListReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbdxh138</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>CodeList</r:TypeOfObject> + </r:CodeListReference> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdy4nhp</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">NUCLEAR_CHARACTER1</r:String> </l:VariableName> @@ -7904,21 +8129,30 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-QOP-jbgd6p0k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeListReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbdxh138</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>CodeList</r:TypeOfObject> + </r:CodeListReference> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxtanu</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">NUCLEAR_CHARACTER2</r:String> </l:VariableName> @@ -7928,21 +8162,30 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-QOP-jbgd9ato</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeListReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbdxh138</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>CodeList</r:TypeOfObject> + </r:CodeListReference> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdy25if</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">NUCLEAR_CHARACTER3</r:String> </l:VariableName> @@ -7952,21 +8195,30 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-QOP-jbgd3e0p</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeListReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbdxh138</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>CodeList</r:TypeOfObject> + </r:CodeListReference> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxvta8</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">NUCLEAR_CHARACTER4</r:String> </l:VariableName> @@ -7976,21 +8228,30 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga-QOP-jbgdkxne</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qefnga</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeListReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbdxh138</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>CodeList</r:TypeOfObject> + </r:CodeListReference> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdy3nh7</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">BIRTH_CHARACTER1</r:String> </l:VariableName> @@ -8000,21 +8261,30 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QOP-jbgd7fr6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeListReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbdxricm</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>CodeList</r:TypeOfObject> + </r:CodeListReference> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdy6lk3</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">BIRTH_CHARACTER2</r:String> </l:VariableName> @@ -8024,21 +8294,30 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QOP-jbgd5e9f</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeListReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbdxricm</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>CodeList</r:TypeOfObject> + </r:CodeListReference> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdxsby0</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">BIRTH_CHARACTER3</r:String> </l:VariableName> @@ -8048,21 +8327,30 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QOP-jbgd912x</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeListReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbdxricm</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>CodeList</r:TypeOfObject> + </r:CodeListReference> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdy7sra</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">BIRTH_CHARACTER4</r:String> </l:VariableName> @@ -8072,21 +8360,30 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QOP-jbgd6bdy</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeListReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbdxricm</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>CodeList</r:TypeOfObject> + </r:CodeListReference> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbdy2wyl</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">BIRTH_CHARACTER5</r:String> </l:VariableName> @@ -8096,21 +8393,30 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g-QOP-jbgddyry</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6yzoc6g</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeListReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbdxricm</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>CodeList</r:TypeOfObject> + </r:CodeListReference> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdnfk7</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES11</r:String> </l:VariableName> @@ -8120,28 +8426,30 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgde5yl</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation><d:NumericDomain decimalPositions="1"><r:MeasurementUnit>%</r:MeasurementUnit><r:NumberRange> - <r:Low isInclusive="true">0</r:Low> - <r:High isInclusive="true">100</r:High> - </r:NumberRange><r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode><r:OutParameter isArray="false"> - <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwc63q-RDOP-jbgde5yl</r:ID> - <r:Version>0.1.0</r:Version> - </r:OutParameter></d:NumericDomain></l:VariableRepresentation> + <l:VariableRepresentation> + <r:NumericRepresentation decimalPositions="1"> + <r:MeasurementUnit>%</r:MeasurementUnit> + <r:NumberRange> + <r:Low isInclusive="true">0</r:Low> + <r:High isInclusive="true">100</r:High> + </r:NumberRange> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + </r:NumericRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdje4w</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES21</r:String> </l:VariableName> @@ -8151,28 +8459,30 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd2x2t</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation><d:NumericDomain decimalPositions="1"><r:MeasurementUnit>%</r:MeasurementUnit><r:NumberRange> - <r:Low isInclusive="true">0</r:Low> - <r:High isInclusive="true">100</r:High> - </r:NumberRange><r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode><r:OutParameter isArray="false"> - <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwc63q-RDOP-jbgd2x2t</r:ID> - <r:Version>0.1.0</r:Version> - </r:OutParameter></d:NumericDomain></l:VariableRepresentation> + <l:VariableRepresentation> + <r:NumericRepresentation decimalPositions="1"> + <r:MeasurementUnit>%</r:MeasurementUnit> + <r:NumberRange> + <r:Low isInclusive="true">0</r:Low> + <r:High isInclusive="true">100</r:High> + </r:NumberRange> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + </r:NumericRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdlth7</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES31</r:String> </l:VariableName> @@ -8182,28 +8492,30 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdjypz</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation><d:NumericDomain decimalPositions="1"><r:MeasurementUnit>%</r:MeasurementUnit><r:NumberRange> - <r:Low isInclusive="true">0</r:Low> - <r:High isInclusive="true">100</r:High> - </r:NumberRange><r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode><r:OutParameter isArray="false"> - <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwc63q-RDOP-jbgdjypz</r:ID> - <r:Version>0.1.0</r:Version> - </r:OutParameter></d:NumericDomain></l:VariableRepresentation> + <l:VariableRepresentation> + <r:NumericRepresentation decimalPositions="1"> + <r:MeasurementUnit>%</r:MeasurementUnit> + <r:NumberRange> + <r:Low isInclusive="true">0</r:Low> + <r:High isInclusive="true">100</r:High> + </r:NumberRange> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + </r:NumericRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdelbl</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES41</r:String> </l:VariableName> @@ -8213,28 +8525,30 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdcftu</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation><d:NumericDomain decimalPositions="1"><r:MeasurementUnit>%</r:MeasurementUnit><r:NumberRange> - <r:Low isInclusive="true">0</r:Low> - <r:High isInclusive="true">100</r:High> - </r:NumberRange><r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode><r:OutParameter isArray="false"> - <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwc63q-RDOP-jbgdcftu</r:ID> - <r:Version>0.1.0</r:Version> - </r:OutParameter></d:NumericDomain></l:VariableRepresentation> + <l:VariableRepresentation> + <r:NumericRepresentation decimalPositions="1"> + <r:MeasurementUnit>%</r:MeasurementUnit> + <r:NumberRange> + <r:Low isInclusive="true">0</r:Low> + <r:High isInclusive="true">100</r:High> + </r:NumberRange> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + </r:NumericRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd95jq</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES51</r:String> </l:VariableName> @@ -8244,28 +8558,30 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdiyfe</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation><d:NumericDomain decimalPositions="1"><r:MeasurementUnit>%</r:MeasurementUnit><r:NumberRange> - <r:Low isInclusive="true">0</r:Low> - <r:High isInclusive="true">100</r:High> - </r:NumberRange><r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode><r:OutParameter isArray="false"> - <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwc63q-RDOP-jbgdiyfe</r:ID> - <r:Version>0.1.0</r:Version> - </r:OutParameter></d:NumericDomain></l:VariableRepresentation> + <l:VariableRepresentation> + <r:NumericRepresentation decimalPositions="1"> + <r:MeasurementUnit>%</r:MeasurementUnit> + <r:NumberRange> + <r:Low isInclusive="true">0</r:Low> + <r:High isInclusive="true">100</r:High> + </r:NumberRange> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + </r:NumericRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdadd9</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES61</r:String> </l:VariableName> @@ -8275,28 +8591,30 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdj1wd</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation><d:NumericDomain decimalPositions="1"><r:MeasurementUnit>%</r:MeasurementUnit><r:NumberRange> - <r:Low isInclusive="true">0</r:Low> - <r:High isInclusive="true">100</r:High> - </r:NumberRange><r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode><r:OutParameter isArray="false"> - <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwc63q-RDOP-jbgdj1wd</r:ID> - <r:Version>0.1.0</r:Version> - </r:OutParameter></d:NumericDomain></l:VariableRepresentation> + <l:VariableRepresentation> + <r:NumericRepresentation decimalPositions="1"> + <r:MeasurementUnit>%</r:MeasurementUnit> + <r:NumberRange> + <r:Low isInclusive="true">0</r:Low> + <r:High isInclusive="true">100</r:High> + </r:NumberRange> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + </r:NumericRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdlwzk</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES71</r:String> </l:VariableName> @@ -8306,28 +8624,30 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgddylk</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation><d:NumericDomain decimalPositions="1"><r:MeasurementUnit>%</r:MeasurementUnit><r:NumberRange> - <r:Low isInclusive="true">0</r:Low> - <r:High isInclusive="true">100</r:High> - </r:NumberRange><r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode><r:OutParameter isArray="false"> - <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwc63q-RDOP-jbgddylk</r:ID> - <r:Version>0.1.0</r:Version> - </r:OutParameter></d:NumericDomain></l:VariableRepresentation> + <l:VariableRepresentation> + <r:NumericRepresentation decimalPositions="1"> + <r:MeasurementUnit>%</r:MeasurementUnit> + <r:NumberRange> + <r:Low isInclusive="true">0</r:Low> + <r:High isInclusive="true">100</r:High> + </r:NumberRange> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + </r:NumericRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdfz77</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES81</r:String> </l:VariableName> @@ -8337,28 +8657,30 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd3jj6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation><d:NumericDomain decimalPositions="1"><r:MeasurementUnit>%</r:MeasurementUnit><r:NumberRange> - <r:Low isInclusive="true">0</r:Low> - <r:High isInclusive="true">100</r:High> - </r:NumberRange><r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode><r:OutParameter isArray="false"> - <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwc63q-RDOP-jbgd3jj6</r:ID> - <r:Version>0.1.0</r:Version> - </r:OutParameter></d:NumericDomain></l:VariableRepresentation> + <l:VariableRepresentation> + <r:NumericRepresentation decimalPositions="1"> + <r:MeasurementUnit>%</r:MeasurementUnit> + <r:NumberRange> + <r:Low isInclusive="true">0</r:Low> + <r:High isInclusive="true">100</r:High> + </r:NumberRange> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + </r:NumericRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdepx6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES91</r:String> </l:VariableName> @@ -8368,28 +8690,30 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd4w3k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation><d:NumericDomain decimalPositions="1"><r:MeasurementUnit>%</r:MeasurementUnit><r:NumberRange> - <r:Low isInclusive="true">0</r:Low> - <r:High isInclusive="true">100</r:High> - </r:NumberRange><r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode><r:OutParameter isArray="false"> - <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwc63q-RDOP-jbgd4w3k</r:ID> - <r:Version>0.1.0</r:Version> - </r:OutParameter></d:NumericDomain></l:VariableRepresentation> + <l:VariableRepresentation> + <r:NumericRepresentation decimalPositions="1"> + <r:MeasurementUnit>%</r:MeasurementUnit> + <r:NumberRange> + <r:Low isInclusive="true">0</r:Low> + <r:High isInclusive="true">100</r:High> + </r:NumberRange> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + </r:NumericRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdepx7</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES101</r:String> </l:VariableName> @@ -8399,28 +8723,30 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd4w4k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation><d:NumericDomain decimalPositions="1"><r:MeasurementUnit>%</r:MeasurementUnit><r:NumberRange> - <r:Low isInclusive="true">0</r:Low> - <r:High isInclusive="true">100</r:High> - </r:NumberRange><r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode><r:OutParameter isArray="false"> - <r:Agency>fr.insee</r:Agency> - <r:ID>j4nwc63q-RDOP-jbgd4w4k</r:ID> - <r:Version>0.1.0</r:Version> - </r:OutParameter></d:NumericDomain></l:VariableRepresentation> + <l:VariableRepresentation> + <r:NumericRepresentation decimalPositions="1"> + <r:MeasurementUnit>%</r:MeasurementUnit> + <r:NumberRange> + <r:Low isInclusive="true">0</r:Low> + <r:High isInclusive="true">100</r:High> + </r:NumberRange> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + </r:NumericRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd9vqv</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">CLOWNING11</r:String> </l:VariableName> @@ -8430,45 +8756,63 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgd8tyr</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeListReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbdyh6b5</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>CodeList</r:TypeOfObject> + </r:CodeListReference> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgden0i</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">CLOWNING21</r:String> </l:VariableName> <r:Label> - <r:Content xml:lang="fr-FR">Loose the violin of his daughter playing poker-Clowning </r:Content> + <r:Content xml:lang="fr-FR">Loose the violin of his daughter playing poker-Clowning</r:Content> </r:Label> <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdep36</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeListReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbdyh6b5</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>CodeList</r:TypeOfObject> + </r:CodeListReference> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdndju</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">CLOWNING31</r:String> </l:VariableName> @@ -8478,21 +8822,30 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdjjgi</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeListReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbdyh6b5</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>CodeList</r:TypeOfObject> + </r:CodeListReference> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdfwg9</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">CLOWNING41</r:String> </l:VariableName> @@ -8502,21 +8855,30 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdgh6k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeListReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbdyh6b5</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>CodeList</r:TypeOfObject> + </r:CodeListReference> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdd3ky</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">CLOWNING12</r:String> </l:VariableName> @@ -8526,45 +8888,49 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdit3o</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:TextRepresentation maxLength="255"/> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdm9lm</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">CLOWNING22</r:String> </l:VariableName> <r:Label> - <r:Content xml:lang="fr-FR">Loose the violin of his daughter playing poker-Remember? </r:Content> + <r:Content xml:lang="fr-FR">Loose the violin of his daughter playing poker-Remember?</r:Content> </r:Label> <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgd366k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:TextRepresentation maxLength="255"/> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdcdhv</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">CLOWNING32</r:String> </l:VariableName> @@ -8574,21 +8940,23 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdax06</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:TextRepresentation maxLength="255"/> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdjlit</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">CLOWNING42</r:String> </l:VariableName> @@ -8598,21 +8966,23 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6-QOP-jbgdfo1j</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nw0rr6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:TextRepresentation maxLength="255"/> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd1zxu</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL11</r:String> </l:VariableName> @@ -8622,21 +8992,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd92mb</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd8lfs</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL21</r:String> </l:VariableName> @@ -8646,21 +9029,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdgsat</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd56qo</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL31</r:String> </l:VariableName> @@ -8670,21 +9066,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdaxk2</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd4wu8</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL41</r:String> </l:VariableName> @@ -8694,21 +9103,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd7myn</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdak6h</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL12</r:String> </l:VariableName> @@ -8718,21 +9140,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdnxkt</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdmsy4</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL22</r:String> </l:VariableName> @@ -8742,21 +9177,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd3ef5</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd2zlu</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL32</r:String> </l:VariableName> @@ -8766,21 +9214,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd8p1v</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd6v73</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL42</r:String> </l:VariableName> @@ -8790,21 +9251,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdgm0c</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdf5fg</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL13</r:String> </l:VariableName> @@ -8814,21 +9288,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdcppc</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd2xg0</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL23</r:String> </l:VariableName> @@ -8838,21 +9325,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd4cm6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdc06l</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL33</r:String> </l:VariableName> @@ -8862,21 +9362,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdd2lo</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdb8i9</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL43</r:String> </l:VariableName> @@ -8886,21 +9399,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdo0ay</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdhzve</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL14</r:String> </l:VariableName> @@ -8910,21 +9436,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd4r2a</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd93ks</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL24</r:String> </l:VariableName> @@ -8934,21 +9473,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdkfpq</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdfw7h</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL34</r:String> </l:VariableName> @@ -8958,21 +9510,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd7u52</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdfavn</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL44</r:String> </l:VariableName> @@ -8982,21 +9547,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdgfwl</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdc199</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL15</r:String> </l:VariableName> @@ -9006,21 +9584,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd9cff</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdfqph</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL25</r:String> </l:VariableName> @@ -9030,21 +9621,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgddwsp</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd8r0n</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL35</r:String> </l:VariableName> @@ -9054,21 +9658,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdncn8</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd3aqk</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL45</r:String> </l:VariableName> @@ -9078,21 +9695,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdnz6b</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdltql</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL16</r:String> </l:VariableName> @@ -9102,21 +9732,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdiva0</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd9um3</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL26</r:String> </l:VariableName> @@ -9126,21 +9769,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgd7dqf</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgddj7v</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL36</r:String> </l:VariableName> @@ -9150,21 +9806,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdnous</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdb4ym</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">TRAVEL46</r:String> </l:VariableName> @@ -9174,21 +9843,34 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj-QOP-jbgdkfcz</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6p2lwuj</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:CodeRepresentation> + <r:CodeSubsetInformation> + <r:IncludedCode> + <r:CodeReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>INSEE-COMMUN-CL-Booleen-1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Code</r:TypeOfObject> + </r:CodeReference> + </r:IncludedCode> + </r:CodeSubsetInformation> + </r:CodeRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd3fkz</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS11</r:String> </l:VariableName> @@ -9198,21 +9880,23 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdl5jb</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:TextRepresentation maxLength="255"/> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdf2md</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS21</r:String> </l:VariableName> @@ -9222,21 +9906,23 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd8lwo</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:TextRepresentation maxLength="255"/> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdfle1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS31</r:String> </l:VariableName> @@ -9246,21 +9932,23 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdbfag</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:TextRepresentation maxLength="255"/> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdix8x</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS41</r:String> </l:VariableName> @@ -9270,21 +9958,23 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdlgja</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:TextRepresentation maxLength="255"/> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd782k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS51</r:String> </l:VariableName> @@ -9294,21 +9984,23 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd745y</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:TextRepresentation maxLength="255"/> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd68rf</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS61</r:String> </l:VariableName> @@ -9318,21 +10010,23 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdjkts</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:TextRepresentation maxLength="255"/> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdfoj4</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS71</r:String> </l:VariableName> @@ -9342,21 +10036,23 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdcax7</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:TextRepresentation maxLength="255"/> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdb116</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS81</r:String> </l:VariableName> @@ -9366,21 +10062,23 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdjye1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:TextRepresentation maxLength="255"/> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd7w5p</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS91</r:String> </l:VariableName> @@ -9390,21 +10088,23 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd5jet</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:TextRepresentation maxLength="255"/> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd8rj2</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS101</r:String> </l:VariableName> @@ -9414,21 +10114,23 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdjw90</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:TextRepresentation maxLength="255"/> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdidnp</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS12</r:String> </l:VariableName> @@ -9438,21 +10140,29 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdfndq</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:NumericRepresentation> + <r:NumberRange> + <r:Low isInclusive="true">0</r:Low> + <r:High isInclusive="true">120</r:High> + </r:NumberRange> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + </r:NumericRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd47wz</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS22</r:String> </l:VariableName> @@ -9462,21 +10172,29 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd7osi</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:NumericRepresentation> + <r:NumberRange> + <r:Low isInclusive="true">0</r:Low> + <r:High isInclusive="true">120</r:High> + </r:NumberRange> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + </r:NumericRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdj2nn</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS32</r:String> </l:VariableName> @@ -9486,21 +10204,29 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd7bnw</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:NumericRepresentation> + <r:NumberRange> + <r:Low isInclusive="true">0</r:Low> + <r:High isInclusive="true">120</r:High> + </r:NumberRange> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + </r:NumericRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd2ipx</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS42</r:String> </l:VariableName> @@ -9510,21 +10236,29 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd9k71</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:NumericRepresentation> + <r:NumberRange> + <r:Low isInclusive="true">0</r:Low> + <r:High isInclusive="true">120</r:High> + </r:NumberRange> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + </r:NumericRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd4pe3</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS52</r:String> </l:VariableName> @@ -9534,21 +10268,29 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdimks</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:NumericRepresentation> + <r:NumberRange> + <r:Low isInclusive="true">0</r:Low> + <r:High isInclusive="true">120</r:High> + </r:NumberRange> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + </r:NumericRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdjgb1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS62</r:String> </l:VariableName> @@ -9558,21 +10300,29 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdjquz</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:NumericRepresentation> + <r:NumberRange> + <r:Low isInclusive="true">0</r:Low> + <r:High isInclusive="true">120</r:High> + </r:NumberRange> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + </r:NumericRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdb5c1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS72</r:String> </l:VariableName> @@ -9582,21 +10332,29 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdd2w3</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:NumericRepresentation> + <r:NumberRange> + <r:Low isInclusive="true">0</r:Low> + <r:High isInclusive="true">120</r:High> + </r:NumberRange> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + </r:NumericRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdju9y</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS82</r:String> </l:VariableName> @@ -9606,21 +10364,29 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdkosc</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:NumericRepresentation> + <r:NumberRange> + <r:Low isInclusive="true">0</r:Low> + <r:High isInclusive="true">120</r:High> + </r:NumberRange> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + </r:NumericRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdatyx</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS92</r:String> </l:VariableName> @@ -9630,21 +10396,29 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgdk0x4</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:NumericRepresentation> + <r:NumberRange> + <r:Low isInclusive="true">0</r:Low> + <r:High isInclusive="true">120</r:High> + </r:NumberRange> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + </r:NumericRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdi1dt</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">FAVOURITE_CHARACTERS102</r:String> </l:VariableName> @@ -9654,96 +10428,193 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6-QOP-jbgd2wgf</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6qg8rc6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionGrid</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> + <l:VariableRepresentation> + <r:NumericRepresentation> + <r:NumberRange> + <r:Low isInclusive="true">0</r:Low> + <r:High isInclusive="true">120</r:High> + </r:NumberRange> + <r:NumericTypeCode controlledVocabularyID="INSEE-CIS-NTC-CV">Decimal</r:NumericTypeCode> + </r:NumericRepresentation> + </l:VariableRepresentation> </l:Variable> <l:Variable> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggt4x</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <l:VariableName> <r:String xml:lang="fr-FR">SURVEY_COMMENT</r:String> </l:VariableName> <r:Label> - <r:Content xml:lang="fr-FR">SURVEY_COMMENT label</r:Content> + <r:Content xml:lang="fr-FR">SURVEY_COMMENT label </r:Content> </r:Label> <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6z0z3us-QOP-jbgd6m6e</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:QuestionReference> <r:Agency>fr.insee</r:Agency> <r:ID>j6z0z3us</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionItem</r:TypeOfObject> </r:QuestionReference> - <l:VariableRepresentation/> - </l:Variable> - <l:Variable> - <r:Agency>fr.insee</r:Agency> - <r:ID>jbcggtca</r:ID> - <r:Version>0.1.0</r:Version> - <l:VariableName> - <r:String xml:lang="fr-FR">SUM_EXPENSES</r:String> - </l:VariableName> - <r:Label> - <r:Content xml:lang="fr-FR">SUM_EXPENSES label</r:Content> - </r:Label> - <r:OutParameter> - <r:Agency>fr.insee</r:Agency> - <r:ID>jbcggtca-VROP</r:ID> - <r:Version>0.1.0</r:Version> - </r:OutParameter> <l:VariableRepresentation> - <r:ProcessingInstructionReference> - <r:Agency>fr.insee</r:Agency> - <r:ID>jbcggtca-GI</r:ID> - <r:Version>0.1.0</r:Version> - <r:TypeOfObject>GenerationInstruction</r:TypeOfObject> - <r:Binding> - <r:SourceParameterReference> - <r:Agency>fr.insee</r:Agency> - <r:ID>jbcggtca-GOP</r:ID> - <r:Version>0.1.0</r:Version> - <r:TypeOfObject>OutParameter</r:TypeOfObject> - </r:SourceParameterReference> - <r:TargetParameterReference> - <r:Agency>fr.insee</r:Agency> - <r:ID>jbcggtca-VROP</r:ID> - <r:Version>0.1.0</r:Version> - <r:TypeOfObject>OutParameter</r:TypeOfObject> - </r:TargetParameterReference> - </r:Binding> - </r:ProcessingInstructionReference> - <r:NumericRepresentation/> + <r:TextRepresentation maxLength="255"/> </l:VariableRepresentation> </l:Variable> - <l:Variable> - <r:Agency>fr.insee</r:Agency> - <r:ID>jbcggtex</r:ID> - <r:Version>0.1.0</r:Version> - <l:VariableName> - <r:String xml:lang="fr-FR">LAST_BROADCAST</r:String> - </l:VariableName> - <r:Label> - <r:Content xml:lang="fr-FR">LAST_BROADCAST label</r:Content> - </r:Label> - </l:Variable> + <l:VariableGroup> + <r:Agency>fr.insee</r:Agency> + <r:ID>j6qg8rc6-gp</r:ID> + <r:Version>1</r:Version> + <r:BasedOnObject> + <r:BasedOnReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>j6qg8rc6</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>QuestionGrid</r:TypeOfObject> + </r:BasedOnReference> + </r:BasedOnObject> + <l:TypeOfVariableGroup>TableLoop</l:TypeOfVariableGroup> + <l:VariableGroupName> + <r:String>FAVOURITE_CHARACTERS</r:String> + </l:VariableGroupName> + <r:VariableReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbgd3fkz</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Variable</r:TypeOfObject> + </r:VariableReference> + <r:VariableReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbgdf2md</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Variable</r:TypeOfObject> + </r:VariableReference> + <r:VariableReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbgdfle1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Variable</r:TypeOfObject> + </r:VariableReference> + <r:VariableReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbgdix8x</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Variable</r:TypeOfObject> + </r:VariableReference> + <r:VariableReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbgd782k</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Variable</r:TypeOfObject> + </r:VariableReference> + <r:VariableReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbgd68rf</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Variable</r:TypeOfObject> + </r:VariableReference> + <r:VariableReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbgdfoj4</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Variable</r:TypeOfObject> + </r:VariableReference> + <r:VariableReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbgdb116</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Variable</r:TypeOfObject> + </r:VariableReference> + <r:VariableReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbgd7w5p</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Variable</r:TypeOfObject> + </r:VariableReference> + <r:VariableReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbgd8rj2</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Variable</r:TypeOfObject> + </r:VariableReference> + <r:VariableReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbgdidnp</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Variable</r:TypeOfObject> + </r:VariableReference> + <r:VariableReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbgd47wz</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Variable</r:TypeOfObject> + </r:VariableReference> + <r:VariableReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbgdj2nn</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Variable</r:TypeOfObject> + </r:VariableReference> + <r:VariableReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbgd2ipx</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Variable</r:TypeOfObject> + </r:VariableReference> + <r:VariableReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbgd4pe3</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Variable</r:TypeOfObject> + </r:VariableReference> + <r:VariableReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbgdjgb1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Variable</r:TypeOfObject> + </r:VariableReference> + <r:VariableReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbgdb5c1</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Variable</r:TypeOfObject> + </r:VariableReference> + <r:VariableReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbgdju9y</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Variable</r:TypeOfObject> + </r:VariableReference> + <r:VariableReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbgdatyx</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Variable</r:TypeOfObject> + </r:VariableReference> + <r:VariableReference> + <r:Agency>fr.insee</r:Agency> + <r:ID>jbgdi1dt</r:ID> + <r:Version>1</r:Version> + <r:TypeOfObject>Variable</r:TypeOfObject> + </r:VariableReference> + </l:VariableGroup> </l:VariableScheme> <d:ProcessingInstructionScheme> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-SIMPSONS-PIS-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <d:ProcessingInstructionSchemeName> <r:String xml:lang="en-IE">SIMPSONS</r:String> </d:ProcessingInstructionSchemeName> @@ -9753,66 +10624,66 @@ <d:GenerationInstruction> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-GI</r:ID> - <r:Version>0.1.0</r:Version> - <d:SourceQuestion><!--Not implemented.--></d:SourceQuestion> + <r:Version>1</r:Version> + <!--<d:SourceQuestion>Not implemented.</d:SourceQuestion>--> <d:SourceVariable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdnfk7</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </d:SourceVariable> <d:SourceVariable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdje4w</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </d:SourceVariable> <d:SourceVariable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdlth7</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </d:SourceVariable> <d:SourceVariable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdelbl</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </d:SourceVariable> <d:SourceVariable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgd95jq</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </d:SourceVariable> <d:SourceVariable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdadd9</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </d:SourceVariable> <d:SourceVariable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdlwzk</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </d:SourceVariable> <d:SourceVariable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdfz77</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </d:SourceVariable> <d:SourceVariable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdepx6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </d:SourceVariable> <d:SourceVariable> <r:Agency>fr.insee</r:Agency> <r:ID>jbgdepx7</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>Variable</r:TypeOfObject> </d:SourceVariable> <r:CommandCode> @@ -9821,7 +10692,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES11</r:String> </r:ParameterName> @@ -9829,7 +10700,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES21</r:String> </r:ParameterName> @@ -9837,7 +10708,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-3</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES31</r:String> </r:ParameterName> @@ -9845,7 +10716,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-4</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES41</r:String> </r:ParameterName> @@ -9853,7 +10724,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-5</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES51</r:String> </r:ParameterName> @@ -9861,7 +10732,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES61</r:String> </r:ParameterName> @@ -9869,7 +10740,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-7</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES71</r:String> </r:ParameterName> @@ -9877,7 +10748,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-8</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES81</r:String> </r:ParameterName> @@ -9885,7 +10756,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-9</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES91</r:String> </r:ParameterName> @@ -9893,7 +10764,7 @@ <r:InParameter isArray="false"> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-10</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:ParameterName> <r:String xml:lang="fr-FR">PERCENTAGE_EXPENSES101</r:String> </r:ParameterName> @@ -9901,19 +10772,19 @@ <r:OutParameter> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-GOP</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> </r:OutParameter> <r:Binding> <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgde5yl</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-1</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -9921,13 +10792,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd2x2t</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-2</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -9935,13 +10806,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdjypz</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-3</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -9949,13 +10820,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdcftu</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-4</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -9963,13 +10834,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdiyfe</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-5</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -9977,13 +10848,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgdj1wd</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -9991,13 +10862,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgddylk</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-7</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -10005,13 +10876,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd3jj6</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-8</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -10019,13 +10890,13 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd4w3k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-9</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> @@ -10033,26 +10904,26 @@ <r:SourceParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>j4nwc63q-QOP-jbgd4w4k</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>OutParameter</r:TypeOfObject> </r:SourceParameterReference> <r:TargetParameterReference> <r:Agency>fr.insee</r:Agency> <r:ID>jbcggtca-IP-10</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:TypeOfObject>InParameter</r:TypeOfObject> </r:TargetParameterReference> </r:Binding> - <r:CommandContent>number(if (jbcggtca-IP-1='') then '0' else jbcggtca-IP-1) + number(if (jbcggtca-IP-2='') then '0' else jbcggtca-IP-2) + number(if (jbcggtca-IP-3='') then '0' else jbcggtca-IP-3) + - number(if (jbcggtca-IP-4='') then '0' else jbcggtca-IP-4) + number(if (jbcggtca-IP-5='') then '0' else jbcggtca-IP-5) + number(if (jbcggtca-IP-6='') then '0' else jbcggtca-IP-6) + - number(if (jbcggtca-IP-7='') then '0' else jbcggtca-IP-7) + number(if (jbcggtca-IP-8='') then '0' else jbcggtca-IP-8) + number(if (jbcggtca-IP-9='') then '0' else jbcggtca-IP-9) + - number(if (jbcggtca-IP-10='') then '0' else jbcggtca-IP-10) </r:CommandContent> + <r:CommandContent>number(if (jbcggtca-IP-1='') then '0' else jbcggtca-IP-1) + number(if (jbcggtca-IP-2='') then '0' else jbcggtca-IP-2) + number(if (jbcggtca-IP-3='') then '0' else jbcggtca-IP-3)+ + number(if (jbcggtca-IP-4='') then '0' else jbcggtca-IP-4)+ number(if (jbcggtca-IP-5='') then '0' else jbcggtca-IP-5)+ number(if (jbcggtca-IP-6='') then '0' else jbcggtca-IP-6)+ + number(if (jbcggtca-IP-7='') then '0' else jbcggtca-IP-7)+ number(if (jbcggtca-IP-8='') then '0' else jbcggtca-IP-8)+ number(if (jbcggtca-IP-9='') then '0' else jbcggtca-IP-9)+ + number(if (jbcggtca-IP-10='') then '0' else jbcggtca-IP-10)</r:CommandContent> </r:Command> </r:CommandCode> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> - <r:ID>Sequence-i6vwid</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>Sequence-i6vwi0</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Sequence</r:TypeOfObject> </d:ControlConstructReference> </d:GenerationInstruction> @@ -10060,7 +10931,7 @@ <r:ManagedRepresentationScheme> <r:Agency>fr.insee</r:Agency> <r:ID>INSEE-SIMPSONS-MRS</r:ID> - <r:Version>0.1.0</r:Version> + <r:Version>1</r:Version> <r:Label> <r:Content xml:lang="en-IE">Liste de formats numériques et dates de l'enquête</r:Content> @@ -10068,58 +10939,67 @@ </r:Label> <r:ManagedDateTimeRepresentation> <r:Agency>fr.insee</r:Agency> - <r:ID>INSEE-COMMUN-MNR-DateTimedate</r:ID> - <r:Version>0.1.0</r:Version> - <r:DateFieldFormat>jj/mm/aaaa</r:DateFieldFormat> + <r:ID>INSEE-COMMUN-MNR-DateTimedate-YYYY-MM-DD</r:ID> + <r:Version>1</r:Version> + <r:DateFieldFormat>YYYY-MM-DD</r:DateFieldFormat> <r:DateTypeCode controlledVocabularyID="INSEE-DTC-CV">date</r:DateTypeCode> + <r:Range> + <r:MinimumValue included="true">1900-01-01</r:MinimumValue> + <r:MaximumValue included="true">format-date(current-date(),'[Y0001]-[M01]-[D01]')</r:MaximumValue> + </r:Range> </r:ManagedDateTimeRepresentation> </r:ManagedRepresentationScheme> - </g:ResourcePackage><s:StudyUnit> + </g:ResourcePackage> + <s:StudyUnit> <r:Agency>fr.insee</r:Agency> - <r:ID>StudyUnit-i6vwid</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>StudyUnit-i6vwi0</r:ID> + <r:Version>1</r:Version> <r:ExPostEvaluation/> <d:DataCollection> <r:Agency>fr.insee</r:Agency> - <r:ID>DataCollection-i6vwid</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>DataCollection-i6vwi0</r:ID> + <r:Version>1</r:Version> <r:QuestionSchemeReference> <r:Agency>fr.insee</r:Agency> - <r:ID>QuestionScheme-i6vwid</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>QuestionScheme-i6vwi0</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>QuestionScheme</r:TypeOfObject> </r:QuestionSchemeReference> <r:ControlConstructSchemeReference> <r:Agency>fr.insee</r:Agency> - <r:ID>ControlConstructScheme-i6vwid</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>ControlConstructScheme-i6vwi0</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>ControlConstructScheme</r:TypeOfObject> </r:ControlConstructSchemeReference> <r:InterviewerInstructionSchemeReference> <r:Agency>fr.insee</r:Agency> - <r:ID>InterviewerInstructionScheme-i6vwid</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>InterviewerInstructionScheme-i6vwi0</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>InterviewerInstructionScheme</r:TypeOfObject> </r:InterviewerInstructionSchemeReference> <d:InstrumentScheme xml:lang="fr-FR"> <r:Agency>fr.insee</r:Agency> - <r:ID>InstrumentScheme-i6vwid</r:ID> - <r:Version>0.1.0</r:Version> - <d:Instrument> + <r:ID>InstrumentScheme-i6vwi0</r:ID> + <r:Version>1</r:Version> + <d:Instrument xmlns:pogues="http://xml.insee.fr/schema/applis/pogues" xmlns:pr="ddi:ddiprofile:3_3" xmlns:c="ddi:conceptualcomponent:3_3" xmlns:cm="ddi:comparative:3_3"> <r:Agency>fr.insee</r:Agency> - <r:ID>Instrument-i6vwid</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>Instrument-i6vwi0</r:ID> + <r:Version>1</r:Version> + <d:InstrumentName> + <r:String>SIMPSONS</r:String> + </d:InstrumentName> <r:Label> <r:Content xml:lang="fr-FR">Questionnaire SIMPSONS questionnaire</r:Content> </r:Label> <d:TypeOfInstrument>A définir</d:TypeOfInstrument> <d:ControlConstructReference> <r:Agency>fr.insee</r:Agency> - <r:ID>Sequence-i6vwid</r:ID> - <r:Version>0.1.0</r:Version> + <r:ID>Sequence-i6vwi0</r:ID> + <r:Version>1</r:Version> <r:TypeOfObject>Sequence</r:TypeOfObject> </d:ControlConstructReference> </d:Instrument> </d:InstrumentScheme> </d:DataCollection> - </s:StudyUnit></DDIInstance> \ No newline at end of file + </s:StudyUnit> +</DDIInstance> \ No newline at end of file diff --git a/src/test/resources/ddi-to-xform/out.xhtml b/src/test/resources/ddi-to-xform/out.xhtml index 8d6c66010..f402439f6 100644 --- a/src/test/resources/ddi-to-xform/out.xhtml +++ b/src/test/resources/ddi-to-xform/out.xhtml @@ -22,13 +22,13 @@ <j6p0ti5h-d1/> <COMMENT/> <READY/> - <d1e42-THEN> + <d1e50-THEN> <j6p0s7o5/> <PRODUCER/> <SEASON_NUMBER/> <DATEFIRST/> <AUDIENCE_SHARE/> - </d1e42-THEN> + </d1e50-THEN> </j6p0ti5h> <j3341528> <j3341528-d2/> @@ -44,29 +44,29 @@ <PET4/> <d12-SI/> <j6p29i81/> - <j6p29i81-j6p2mvca--1/> - <j6p29i81-j6p2mvca-0/> <j6p29i81-j6p2mvca-1/> <j6p29i81-j6p2mvca-2/> + <j6p29i81-j6p2mvca-3/> + <j6p29i81-j6p2mvca-4/> <ICE_FLAVOUR1/> <ICE_FLAVOUR2/> <ICE_FLAVOUR3/> <ICE_FLAVOUR4/> <j6qefnga/> - <j6qefnga-j6qeytgc--1/> - <j6qefnga-j6qeytgc-0/> <j6qefnga-j6qeytgc-1/> <j6qefnga-j6qeytgc-2/> + <j6qefnga-j6qeytgc-3/> + <j6qefnga-j6qeytgc-4/> <NUCLEAR_CHARACTER1/> <NUCLEAR_CHARACTER2/> <NUCLEAR_CHARACTER3/> <NUCLEAR_CHARACTER4/> <j6yzoc6g/> - <j6yzoc6g-j6z087mq--1/> - <j6yzoc6g-j6z087mq-0/> <j6yzoc6g-j6z087mq-1/> <j6yzoc6g-j6z087mq-2/> <j6yzoc6g-j6z087mq-3/> + <j6yzoc6g-j6z087mq-4/> + <j6yzoc6g-j6z087mq-5/> <BIRTH_CHARACTER1/> <BIRTH_CHARACTER2/> <BIRTH_CHARACTER3/> @@ -77,8 +77,6 @@ <j6qe237q/> <j4nwc63q/> <j4nwc63q-j4nwh16i-Header-1/> - <j4nwc63q-j4nwh16i--1/> - <j4nwc63q-j4nwh16i-0/> <j4nwc63q-j4nwh16i-1/> <j4nwc63q-j4nwh16i-2/> <j4nwc63q-j4nwh16i-3/> @@ -87,7 +85,9 @@ <j4nwc63q-j4nwh16i-6/> <j4nwc63q-j4nwh16i-7/> <j4nwc63q-j4nwh16i-8/> - <j4nwc63q-j4nwc63q-secondDimension-fakeCL-1--1/> + <j4nwc63q-j4nwh16i-9/> + <j4nwc63q-j4nwh16i-10/> + <j4nwc63q-j4nwc63q-secondDimension-fakeCL-1-1/> <PERCENTAGE_EXPENSES11/> <PERCENTAGE_EXPENSES21/> <PERCENTAGE_EXPENSES31/> @@ -102,12 +102,12 @@ <j6qejudb/> <j4nw0rr6/> <j4nw0rr6-j77dav9b-Header-1/> - <j4nw0rr6-j77dav9b--1/> - <j4nw0rr6-j77dav9b-0/> <j4nw0rr6-j77dav9b-1/> <j4nw0rr6-j77dav9b-2/> - <j4nw0rr6-j4nw0rr6-secondDimension-fakeCL-1--1/> - <j4nw0rr6-j4nw0rr6-secondDimension-fakeCL-1-0/> + <j4nw0rr6-j77dav9b-3/> + <j4nw0rr6-j77dav9b-4/> + <j4nw0rr6-j4nw0rr6-secondDimension-fakeCL-1-1/> + <j4nw0rr6-j4nw0rr6-secondDimension-fakeCL-1-2/> <CLOWNING11/> <CLOWNING21/> <CLOWNING31/> @@ -119,16 +119,16 @@ <j6qeh91y/> <j6p2lwuj/> <j6p2lwuj-j6p2kivg-Header-1/> - <j6p2lwuj-j6p2kivg--1/> - <j6p2lwuj-j6p2kivg-0/> <j6p2lwuj-j6p2kivg-1/> <j6p2lwuj-j6p2kivg-2/> - <j6p2lwuj-jbdye1wa--1/> - <j6p2lwuj-jbdye1wa-0/> + <j6p2lwuj-j6p2kivg-3/> + <j6p2lwuj-j6p2kivg-4/> <j6p2lwuj-jbdye1wa-1/> <j6p2lwuj-jbdye1wa-2/> <j6p2lwuj-jbdye1wa-3/> <j6p2lwuj-jbdye1wa-4/> + <j6p2lwuj-jbdye1wa-5/> + <j6p2lwuj-jbdye1wa-6/> <TRAVEL11/> <TRAVEL21/> <TRAVEL31/> @@ -156,10 +156,10 @@ </j4nw88h2> <j6qfx9qe> <j6qg8rc6/> - <j6qg8rc6-j6qg8rc6-secondDimension-fakeCL-1--1/> - <j6qg8rc6-j6qg8rc6-secondDimension-fakeCL-1-0/> - <j6qg8rc6-Container> - <j6qg8rc6> + <j6qg8rc6-j6qg8rc6-secondDimension-fakeCL-1-1/> + <j6qg8rc6-j6qg8rc6-secondDimension-fakeCL-1-2/> + <FAVOURITE_CHARACTERS-Container> + <FAVOURITE_CHARACTERS> <FAVOURITE_CHARACTERS11/> <FAVOURITE_CHARACTERS21/> <FAVOURITE_CHARACTERS31/> @@ -180,10 +180,10 @@ <FAVOURITE_CHARACTERS82/> <FAVOURITE_CHARACTERS92/> <FAVOURITE_CHARACTERS102/> - </j6qg8rc6> - </j6qg8rc6-Container> - <j6qg8rc6-Count>1</j6qg8rc6-Count> - <j6qg8rc6-AddLine/> + </FAVOURITE_CHARACTERS> + </FAVOURITE_CHARACTERS-Container> + <FAVOURITE_CHARACTERS-Count>1</FAVOURITE_CHARACTERS-Count> + <FAVOURITE_CHARACTERS-AddLine/> </j6qfx9qe> <j6z12s2d> <SURVEY_COMMENT/> @@ -202,7 +202,7 @@ </xf:instance> <xf:instance id="fr-form-loop-model"> <LoopModels> - <j6qg8rc6> + <FAVOURITE_CHARACTERS> <FAVOURITE_CHARACTERS11/> <FAVOURITE_CHARACTERS21/> <FAVOURITE_CHARACTERS31/> @@ -223,7 +223,7 @@ <FAVOURITE_CHARACTERS82/> <FAVOURITE_CHARACTERS92/> <FAVOURITE_CHARACTERS102/> - </j6qg8rc6> + </FAVOURITE_CHARACTERS> </LoopModels> </xf:instance> <xf:bind id="fr-form-instance-binds" ref="instance('fr-form-instance')"> @@ -237,10 +237,10 @@ <xf:bind id="j6p0ti5h-d1-bind" name="j6p0ti5h-d1" ref="j6p0ti5h-d1"/> <xf:bind id="COMMENT-bind" name="COMMENT" ref="COMMENT"/> <xf:bind id="READY-bind" name="READY" ref="READY"/> - <xf:bind id="d1e42-THEN-bind" - name="d1e42-THEN" - ref="d1e42-THEN" - relevant="not( //READY != '1')"> + <xf:bind id="d1e50-THEN-bind" + name="d1e50-THEN" + ref="d1e50-THEN" + relevant="not( //READY!= '1') "> <xf:bind id="j6p0s7o5-bind" name="j6p0s7o5" ref="j6p0s7o5"/> <xf:bind id="PRODUCER-bind" name="PRODUCER" ref="PRODUCER"/> <xf:bind id="SEASON_NUMBER-bind" name="SEASON_NUMBER" ref="SEASON_NUMBER"> @@ -249,7 +249,9 @@ <xf:bind id="DATEFIRST-bind" name="DATEFIRST" ref="DATEFIRST" - type="xf:date"/> + type="xf:date"> + <xf:constraint value="if (string(.) != '' and . castable as xs:date) then (. >= xs:date('1900-01-01') and . <= xs:date('2019-09-24')) else (string(.) = '')"/> + </xf:bind> <xf:bind id="AUDIENCE_SHARE-bind" name="AUDIENCE_SHARE" ref="AUDIENCE_SHARE"> <xf:constraint value="if(. castable as xs:float) then (xs:float(.)<=99.0 and xs:float(.)>=0.0 and matches(.,'^(0|[1-9]|[1-8][0-9]{1}|9[0-8])(\.[0-9]{1,1})?$|^99(\.[0-0])?$')) else (.='')"/> </xf:bind> @@ -258,16 +260,16 @@ <xf:bind id="j3341528-bind" name="j3341528" ref="j3341528" - relevant="not( //READY != '1')"> + relevant="not( //READY!= '1') "> <xf:bind id="j3341528-d2-bind" name="j3341528-d2" ref="j3341528-d2"/> - <xf:bind id="CITY-bind" name="CITY" ref="CITY"/> + <xf:bind id="CITY-bind" name="CITY" ref="CITY" required="true()"/> <xf:bind id="MAYOR-bind" name="MAYOR" ref="MAYOR"/> <xf:bind id="STATE-bind" name="STATE" ref="STATE"/> </xf:bind> <xf:bind id="j6qe0h9q-bind" name="j6qe0h9q" ref="j6qe0h9q" - relevant="not( //READY != '1')"> + relevant="not( //READY!= '1') "> <xf:bind id="j334akov-bind" name="j334akov" ref="j334akov"/> <xf:bind id="PET1-bind" name="PET1" ref="PET1"/> <xf:bind id="PET2-bind" name="PET2" ref="PET2"/> @@ -275,35 +277,35 @@ <xf:bind id="PET4-bind" name="PET4" ref="PET4"/> <xf:bind id="d12-SI-bind" name="d12-SI" ref="d12-SI"/> <xf:bind id="j6p29i81-bind" name="j6p29i81" ref="j6p29i81"/> - <xf:bind id="j6p29i81-j6p2mvca--1-bind" - name="j6p29i81-j6p2mvca--1" - ref="j6p29i81-j6p2mvca--1"/> - <xf:bind id="j6p29i81-j6p2mvca-0-bind" - name="j6p29i81-j6p2mvca-0" - ref="j6p29i81-j6p2mvca-0"/> <xf:bind id="j6p29i81-j6p2mvca-1-bind" name="j6p29i81-j6p2mvca-1" ref="j6p29i81-j6p2mvca-1"/> <xf:bind id="j6p29i81-j6p2mvca-2-bind" name="j6p29i81-j6p2mvca-2" ref="j6p29i81-j6p2mvca-2"/> + <xf:bind id="j6p29i81-j6p2mvca-3-bind" + name="j6p29i81-j6p2mvca-3" + ref="j6p29i81-j6p2mvca-3"/> + <xf:bind id="j6p29i81-j6p2mvca-4-bind" + name="j6p29i81-j6p2mvca-4" + ref="j6p29i81-j6p2mvca-4"/> <xf:bind id="ICE_FLAVOUR1-bind" name="ICE_FLAVOUR1" ref="ICE_FLAVOUR1"/> <xf:bind id="ICE_FLAVOUR2-bind" name="ICE_FLAVOUR2" ref="ICE_FLAVOUR2"/> <xf:bind id="ICE_FLAVOUR3-bind" name="ICE_FLAVOUR3" ref="ICE_FLAVOUR3"/> <xf:bind id="ICE_FLAVOUR4-bind" name="ICE_FLAVOUR4" ref="ICE_FLAVOUR4"/> <xf:bind id="j6qefnga-bind" name="j6qefnga" ref="j6qefnga"/> - <xf:bind id="j6qefnga-j6qeytgc--1-bind" - name="j6qefnga-j6qeytgc--1" - ref="j6qefnga-j6qeytgc--1"/> - <xf:bind id="j6qefnga-j6qeytgc-0-bind" - name="j6qefnga-j6qeytgc-0" - ref="j6qefnga-j6qeytgc-0"/> <xf:bind id="j6qefnga-j6qeytgc-1-bind" name="j6qefnga-j6qeytgc-1" ref="j6qefnga-j6qeytgc-1"/> <xf:bind id="j6qefnga-j6qeytgc-2-bind" name="j6qefnga-j6qeytgc-2" ref="j6qefnga-j6qeytgc-2"/> + <xf:bind id="j6qefnga-j6qeytgc-3-bind" + name="j6qefnga-j6qeytgc-3" + ref="j6qefnga-j6qeytgc-3"/> + <xf:bind id="j6qefnga-j6qeytgc-4-bind" + name="j6qefnga-j6qeytgc-4" + ref="j6qefnga-j6qeytgc-4"/> <xf:bind id="NUCLEAR_CHARACTER1-bind" name="NUCLEAR_CHARACTER1" ref="NUCLEAR_CHARACTER1"/> @@ -317,12 +319,6 @@ name="NUCLEAR_CHARACTER4" ref="NUCLEAR_CHARACTER4"/> <xf:bind id="j6yzoc6g-bind" name="j6yzoc6g" ref="j6yzoc6g"/> - <xf:bind id="j6yzoc6g-j6z087mq--1-bind" - name="j6yzoc6g-j6z087mq--1" - ref="j6yzoc6g-j6z087mq--1"/> - <xf:bind id="j6yzoc6g-j6z087mq-0-bind" - name="j6yzoc6g-j6z087mq-0" - ref="j6yzoc6g-j6z087mq-0"/> <xf:bind id="j6yzoc6g-j6z087mq-1-bind" name="j6yzoc6g-j6z087mq-1" ref="j6yzoc6g-j6z087mq-1"/> @@ -332,6 +328,12 @@ <xf:bind id="j6yzoc6g-j6z087mq-3-bind" name="j6yzoc6g-j6z087mq-3" ref="j6yzoc6g-j6z087mq-3"/> + <xf:bind id="j6yzoc6g-j6z087mq-4-bind" + name="j6yzoc6g-j6z087mq-4" + ref="j6yzoc6g-j6z087mq-4"/> + <xf:bind id="j6yzoc6g-j6z087mq-5-bind" + name="j6yzoc6g-j6z087mq-5" + ref="j6yzoc6g-j6z087mq-5"/> <xf:bind id="BIRTH_CHARACTER1-bind" name="BIRTH_CHARACTER1" ref="BIRTH_CHARACTER1"/> @@ -351,18 +353,12 @@ <xf:bind id="j4nw88h2-bind" name="j4nw88h2" ref="j4nw88h2" - relevant="not( //READY != '1')"> + relevant="not( //READY!= '1') "> <xf:bind id="j6qe237q-bind" name="j6qe237q" ref="j6qe237q"/> <xf:bind id="j4nwc63q-bind" name="j4nwc63q" ref="j4nwc63q"/> <xf:bind id="j4nwc63q-j4nwh16i-Header-1-bind" name="j4nwc63q-j4nwh16i-Header-1" ref="j4nwc63q-j4nwh16i-Header-1"/> - <xf:bind id="j4nwc63q-j4nwh16i--1-bind" - name="j4nwc63q-j4nwh16i--1" - ref="j4nwc63q-j4nwh16i--1"/> - <xf:bind id="j4nwc63q-j4nwh16i-0-bind" - name="j4nwc63q-j4nwh16i-0" - ref="j4nwc63q-j4nwh16i-0"/> <xf:bind id="j4nwc63q-j4nwh16i-1-bind" name="j4nwc63q-j4nwh16i-1" ref="j4nwc63q-j4nwh16i-1"/> @@ -387,9 +383,15 @@ <xf:bind id="j4nwc63q-j4nwh16i-8-bind" name="j4nwc63q-j4nwh16i-8" ref="j4nwc63q-j4nwh16i-8"/> - <xf:bind id="j4nwc63q-j4nwc63q-secondDimension-fakeCL-1--1-bind" - name="j4nwc63q-j4nwc63q-secondDimension-fakeCL-1--1" - ref="j4nwc63q-j4nwc63q-secondDimension-fakeCL-1--1"/> + <xf:bind id="j4nwc63q-j4nwh16i-9-bind" + name="j4nwc63q-j4nwh16i-9" + ref="j4nwc63q-j4nwh16i-9"/> + <xf:bind id="j4nwc63q-j4nwh16i-10-bind" + name="j4nwc63q-j4nwh16i-10" + ref="j4nwc63q-j4nwh16i-10"/> + <xf:bind id="j4nwc63q-j4nwc63q-secondDimension-fakeCL-1-1-bind" + name="j4nwc63q-j4nwc63q-secondDimension-fakeCL-1-1" + ref="j4nwc63q-j4nwc63q-secondDimension-fakeCL-1-1"/> <xf:bind id="PERCENTAGE_EXPENSES11-bind" name="PERCENTAGE_EXPENSES11" ref="PERCENTAGE_EXPENSES11"> @@ -441,32 +443,32 @@ <xf:constraint value="if(. castable as xs:float) then (xs:float(.)<=100.0 and xs:float(.)>=0.0 and matches(.,'^(0|[1-9][0-9]{0,1})(\.[0-9]{1,1})?$|^100(\.[0-0])?$')) else (.='')"/> </xf:bind> <xf:bind id="j4nwc63q-CI-0-bind" name="j4nwc63q-CI-0" ref="j4nwc63q-CI-0"> - <xf:constraint level="warning" - value="not(number(if (//PERCENTAGE_EXPENSES11='') then '0' else //PERCENTAGE_EXPENSES11) + number(if (//PERCENTAGE_EXPENSES21='') then '0' else //PERCENTAGE_EXPENSES21) + number(if (//PERCENTAGE_EXPENSES31='') then '0' else //PERCENTAGE_EXPENSES31) + number(if (//PERCENTAGE_EXPENSES41='') then '0' else //PERCENTAGE_EXPENSES41) + number(if (//PERCENTAGE_EXPENSES51='') then '0' else //PERCENTAGE_EXPENSES51) + number(if (//PERCENTAGE_EXPENSES61='') then '0' else //PERCENTAGE_EXPENSES61) + number(if (//PERCENTAGE_EXPENSES71='') then '0' else //PERCENTAGE_EXPENSES71) + number(if (//PERCENTAGE_EXPENSES81='') then '0' else //PERCENTAGE_EXPENSES81) + number(if (//PERCENTAGE_EXPENSES91='') then '0' else //PERCENTAGE_EXPENSES91) + number(if (//PERCENTAGE_EXPENSES101='') then '0' else //PERCENTAGE_EXPENSES101) != 100)"/> + <xf:constraint level="error" + value="not(number(if (//PERCENTAGE_EXPENSES11='') then '0' else //PERCENTAGE_EXPENSES11) + number(if (//PERCENTAGE_EXPENSES21='') then '0' else //PERCENTAGE_EXPENSES21) + number(if (//PERCENTAGE_EXPENSES31='') then '0' else //PERCENTAGE_EXPENSES31)+ number(if (//PERCENTAGE_EXPENSES41='') then '0' else //PERCENTAGE_EXPENSES41)+ number(if (//PERCENTAGE_EXPENSES51='') then '0' else //PERCENTAGE_EXPENSES51)+ number(if (//PERCENTAGE_EXPENSES61='') then '0' else //PERCENTAGE_EXPENSES61)+ number(if (//PERCENTAGE_EXPENSES71='') then '0' else //PERCENTAGE_EXPENSES71)+ number(if (//PERCENTAGE_EXPENSES81='') then '0' else //PERCENTAGE_EXPENSES81)+ number(if (//PERCENTAGE_EXPENSES91='') then '0' else //PERCENTAGE_EXPENSES91)+ number(if (//PERCENTAGE_EXPENSES101='') then '0' else //PERCENTAGE_EXPENSES101)!= 100)"/> </xf:bind> <xf:bind id="j6qejudb-bind" name="j6qejudb" ref="j6qejudb"/> <xf:bind id="j4nw0rr6-bind" name="j4nw0rr6" ref="j4nw0rr6"/> <xf:bind id="j4nw0rr6-j77dav9b-Header-1-bind" name="j4nw0rr6-j77dav9b-Header-1" ref="j4nw0rr6-j77dav9b-Header-1"/> - <xf:bind id="j4nw0rr6-j77dav9b--1-bind" - name="j4nw0rr6-j77dav9b--1" - ref="j4nw0rr6-j77dav9b--1"/> - <xf:bind id="j4nw0rr6-j77dav9b-0-bind" - name="j4nw0rr6-j77dav9b-0" - ref="j4nw0rr6-j77dav9b-0"/> <xf:bind id="j4nw0rr6-j77dav9b-1-bind" name="j4nw0rr6-j77dav9b-1" ref="j4nw0rr6-j77dav9b-1"/> <xf:bind id="j4nw0rr6-j77dav9b-2-bind" name="j4nw0rr6-j77dav9b-2" ref="j4nw0rr6-j77dav9b-2"/> - <xf:bind id="j4nw0rr6-j4nw0rr6-secondDimension-fakeCL-1--1-bind" - name="j4nw0rr6-j4nw0rr6-secondDimension-fakeCL-1--1" - ref="j4nw0rr6-j4nw0rr6-secondDimension-fakeCL-1--1"/> - <xf:bind id="j4nw0rr6-j4nw0rr6-secondDimension-fakeCL-1-0-bind" - name="j4nw0rr6-j4nw0rr6-secondDimension-fakeCL-1-0" - ref="j4nw0rr6-j4nw0rr6-secondDimension-fakeCL-1-0"/> + <xf:bind id="j4nw0rr6-j77dav9b-3-bind" + name="j4nw0rr6-j77dav9b-3" + ref="j4nw0rr6-j77dav9b-3"/> + <xf:bind id="j4nw0rr6-j77dav9b-4-bind" + name="j4nw0rr6-j77dav9b-4" + ref="j4nw0rr6-j77dav9b-4"/> + <xf:bind id="j4nw0rr6-j4nw0rr6-secondDimension-fakeCL-1-1-bind" + name="j4nw0rr6-j4nw0rr6-secondDimension-fakeCL-1-1" + ref="j4nw0rr6-j4nw0rr6-secondDimension-fakeCL-1-1"/> + <xf:bind id="j4nw0rr6-j4nw0rr6-secondDimension-fakeCL-1-2-bind" + name="j4nw0rr6-j4nw0rr6-secondDimension-fakeCL-1-2" + ref="j4nw0rr6-j4nw0rr6-secondDimension-fakeCL-1-2"/> <xf:bind id="CLOWNING11-bind" name="CLOWNING11" ref="CLOWNING11"/> <xf:bind id="CLOWNING21-bind" name="CLOWNING21" ref="CLOWNING21"/> <xf:bind id="CLOWNING31-bind" name="CLOWNING31" ref="CLOWNING31"/> @@ -480,24 +482,18 @@ <xf:bind id="j6p2lwuj-j6p2kivg-Header-1-bind" name="j6p2lwuj-j6p2kivg-Header-1" ref="j6p2lwuj-j6p2kivg-Header-1"/> - <xf:bind id="j6p2lwuj-j6p2kivg--1-bind" - name="j6p2lwuj-j6p2kivg--1" - ref="j6p2lwuj-j6p2kivg--1"/> - <xf:bind id="j6p2lwuj-j6p2kivg-0-bind" - name="j6p2lwuj-j6p2kivg-0" - ref="j6p2lwuj-j6p2kivg-0"/> <xf:bind id="j6p2lwuj-j6p2kivg-1-bind" name="j6p2lwuj-j6p2kivg-1" ref="j6p2lwuj-j6p2kivg-1"/> <xf:bind id="j6p2lwuj-j6p2kivg-2-bind" name="j6p2lwuj-j6p2kivg-2" ref="j6p2lwuj-j6p2kivg-2"/> - <xf:bind id="j6p2lwuj-jbdye1wa--1-bind" - name="j6p2lwuj-jbdye1wa--1" - ref="j6p2lwuj-jbdye1wa--1"/> - <xf:bind id="j6p2lwuj-jbdye1wa-0-bind" - name="j6p2lwuj-jbdye1wa-0" - ref="j6p2lwuj-jbdye1wa-0"/> + <xf:bind id="j6p2lwuj-j6p2kivg-3-bind" + name="j6p2lwuj-j6p2kivg-3" + ref="j6p2lwuj-j6p2kivg-3"/> + <xf:bind id="j6p2lwuj-j6p2kivg-4-bind" + name="j6p2lwuj-j6p2kivg-4" + ref="j6p2lwuj-j6p2kivg-4"/> <xf:bind id="j6p2lwuj-jbdye1wa-1-bind" name="j6p2lwuj-jbdye1wa-1" ref="j6p2lwuj-jbdye1wa-1"/> @@ -510,6 +506,12 @@ <xf:bind id="j6p2lwuj-jbdye1wa-4-bind" name="j6p2lwuj-jbdye1wa-4" ref="j6p2lwuj-jbdye1wa-4"/> + <xf:bind id="j6p2lwuj-jbdye1wa-5-bind" + name="j6p2lwuj-jbdye1wa-5" + ref="j6p2lwuj-jbdye1wa-5"/> + <xf:bind id="j6p2lwuj-jbdye1wa-6-bind" + name="j6p2lwuj-jbdye1wa-6" + ref="j6p2lwuj-jbdye1wa-6"/> <xf:bind id="TRAVEL11-bind" name="TRAVEL11" ref="TRAVEL11"/> <xf:bind id="TRAVEL21-bind" name="TRAVEL21" ref="TRAVEL21"/> <xf:bind id="TRAVEL31-bind" name="TRAVEL31" ref="TRAVEL31"/> @@ -538,17 +540,17 @@ <xf:bind id="j6qfx9qe-bind" name="j6qfx9qe" ref="j6qfx9qe" - relevant="not( //READY != '1')"> + relevant="not( //READY!= '1') "> <xf:bind id="j6qg8rc6-bind" name="j6qg8rc6" ref="j6qg8rc6"/> - <xf:bind id="j6qg8rc6-j6qg8rc6-secondDimension-fakeCL-1--1-bind" - name="j6qg8rc6-j6qg8rc6-secondDimension-fakeCL-1--1" - ref="j6qg8rc6-j6qg8rc6-secondDimension-fakeCL-1--1"/> - <xf:bind id="j6qg8rc6-j6qg8rc6-secondDimension-fakeCL-1-0-bind" - name="j6qg8rc6-j6qg8rc6-secondDimension-fakeCL-1-0" - ref="j6qg8rc6-j6qg8rc6-secondDimension-fakeCL-1-0"/> - <xf:bind id="j6qg8rc6-Container-bind" - name="j6qg8rc6-Container" - nodeset="j6qg8rc6-Container/j6qg8rc6"> + <xf:bind id="j6qg8rc6-j6qg8rc6-secondDimension-fakeCL-1-1-bind" + name="j6qg8rc6-j6qg8rc6-secondDimension-fakeCL-1-1" + ref="j6qg8rc6-j6qg8rc6-secondDimension-fakeCL-1-1"/> + <xf:bind id="j6qg8rc6-j6qg8rc6-secondDimension-fakeCL-1-2-bind" + name="j6qg8rc6-j6qg8rc6-secondDimension-fakeCL-1-2" + ref="j6qg8rc6-j6qg8rc6-secondDimension-fakeCL-1-2"/> + <xf:bind id="FAVOURITE_CHARACTERS-Container-bind" + name="FAVOURITE_CHARACTERS-Container" + nodeset="FAVOURITE_CHARACTERS-Container/FAVOURITE_CHARACTERS"> <xf:bind id="FAVOURITE_CHARACTERS11-bind" name="FAVOURITE_CHARACTERS11" ref="FAVOURITE_CHARACTERS11"/> @@ -630,9 +632,9 @@ <xf:constraint value="if(. castable as xs:integer) then (xs:integer(.)<=120 and xs:integer(.)>=0) else (.='')"/> </xf:bind> </xf:bind> - <xf:bind id="j6qg8rc6-addline-bind" - ref="j6qg8rc6-AddLine" - relevant="count(instance('fr-form-instance')//j6qg8rc6) < 10"/> + <xf:bind id="FAVOURITE_CHARACTERS-addline-bind" + ref="FAVOURITE_CHARACTERS-AddLine" + relevant="count(instance('fr-form-instance')//FAVOURITE_CHARACTERS) < 10"/> </xf:bind> <xf:bind id="j6z12s2d-bind" name="j6z12s2d" ref="j6z12s2d"> <xf:bind id="SURVEY_COMMENT-bind" name="SURVEY_COMMENT" ref="SURVEY_COMMENT"/> @@ -640,7 +642,7 @@ <xf:bind id="SUM_EXPENSES-bind" name="SUM_EXPENSES" ref="SUM_EXPENSES" - calculate="number(if (//PERCENTAGE_EXPENSES11='') then '0' else //PERCENTAGE_EXPENSES11) + number(if (//PERCENTAGE_EXPENSES21='') then '0' else //PERCENTAGE_EXPENSES21) + number(if (//PERCENTAGE_EXPENSES31='') then '0' else //PERCENTAGE_EXPENSES31) + number(if (//PERCENTAGE_EXPENSES41='') then '0' else //PERCENTAGE_EXPENSES41) + number(if (//PERCENTAGE_EXPENSES51='') then '0' else //PERCENTAGE_EXPENSES51) + number(if (//PERCENTAGE_EXPENSES61='') then '0' else //PERCENTAGE_EXPENSES61) + number(if (//PERCENTAGE_EXPENSES71='') then '0' else //PERCENTAGE_EXPENSES71) + number(if (//PERCENTAGE_EXPENSES81='') then '0' else //PERCENTAGE_EXPENSES81) + number(if (//PERCENTAGE_EXPENSES91='') then '0' else //PERCENTAGE_EXPENSES91) + number(if (//PERCENTAGE_EXPENSES101='') then '0' else //PERCENTAGE_EXPENSES101) "/> + calculate="number(if (//PERCENTAGE_EXPENSES11='') then '0' else //PERCENTAGE_EXPENSES11) + number(if (//PERCENTAGE_EXPENSES21='') then '0' else //PERCENTAGE_EXPENSES21) + number(if (//PERCENTAGE_EXPENSES31='') then '0' else //PERCENTAGE_EXPENSES31)+ number(if (//PERCENTAGE_EXPENSES41='') then '0' else //PERCENTAGE_EXPENSES41)+ number(if (//PERCENTAGE_EXPENSES51='') then '0' else //PERCENTAGE_EXPENSES51)+ number(if (//PERCENTAGE_EXPENSES61='') then '0' else //PERCENTAGE_EXPENSES61)+ number(if (//PERCENTAGE_EXPENSES71='') then '0' else //PERCENTAGE_EXPENSES71)+ number(if (//PERCENTAGE_EXPENSES81='') then '0' else //PERCENTAGE_EXPENSES81)+ number(if (//PERCENTAGE_EXPENSES91='') then '0' else //PERCENTAGE_EXPENSES91)+ number(if (//PERCENTAGE_EXPENSES101='') then '0' else //PERCENTAGE_EXPENSES101)"/> <xf:bind id="end-bind" name="end" ref="End"> <xf:bind id="generic-end-text-bind" name="generic-end-text" @@ -653,8 +655,8 @@ </xf:bind> <xf:instance id="fr-form-metadata" xxf:readonly="true"> <metadata> - <application-name>Sequence-i6vwid</application-name> - <form-name>Sequence-i6vwid</form-name> + <application-name>Sequence-i6vwi0</application-name> + <form-name>Sequence-i6vwi0</form-name> <title xml:lang="fr">Questionnaire SIMPSONS Questionnaire SIMPSONS @@ -678,10 +680,10 @@ - + - + @@ -690,7 +692,7 @@ 1 - + @@ -702,12 +704,12 @@ Vous devez saisir un nombre entier compris entre 0 et 99 - + Date au format JJ/MM/AAAA - Entrez une date valide + Entrez une date valide postérieure à 1 Janvier 1900 et antérieure à 24 Septembre 2019 - + Vous devez utiliser le point comme séparateur de décimale, sans espace, et saisir un nombre compris entre 0.0 et 99.0 (avec au plus 1 chiffre derrière le séparateur ".") @@ -809,7 +811,7 @@ - + @@ -836,23 +838,23 @@ - + - - - - - - - + - + + + + + + + @@ -896,18 +898,18 @@ - - - - - - - + + + + + + + @@ -951,21 +953,21 @@ - - - - - - - + - + - + + + + + + + @@ -1083,42 +1085,42 @@ - + - - - - - - - + - + - + - + - + - + - + - + - + + + + + + + - + Vous devez utiliser le point comme séparateur de décimale, sans espace, et saisir un nombre compris entre 0.0 et 100.0 (avec au plus 1 chiffre derrière le séparateur ".") @@ -1150,33 +1152,33 @@ Vous devez utiliser le point comme séparateur de décimale, sans espace, et saisir un nombre compris entre 0.0 et 100.0 (avec au plus 1 chiffre derrière le séparateur ".") - The sum of percentages is: ¤jbcggtca-GOP¤ %. The total of percentages must be equal to 100%. + The sum of percentages is: ¤jbcggtca-GOP¤ %. The total of percentages must be equal to 100%. - + - - - - - - - + - + - + + + + + + + - - + + - + @@ -1257,39 +1259,39 @@ - + - - - - - - - + - + - - - - - - + + + + + + - + - + - + - + + + + + + + - + @@ -1612,12 +1614,12 @@ You shall type an integer number between 0 and 99 - + Date in JJ/MM/AAAA format - Type a valid date + Type a valid date after 1 January 1900 and before 24 September 2019 - + You shall use point as decimal separator, with no spaces, and type a number between 0.0 and 99.0 (with at most 1 digit behind the "." separator) @@ -1719,7 +1721,7 @@ - + @@ -1746,23 +1748,23 @@ - + - - - - - - - + - + + + + + + + @@ -1806,18 +1808,18 @@ - - - - - - - + + + + + + + @@ -1861,21 +1863,21 @@ - - - - - - - + - + - + + + + + + + @@ -1993,42 +1995,42 @@ - + - - - - - - - + - + - + - + - + - + - + - + - + + + + + + + - + You shall use point as decimal separator, with no spaces, and type a number between 0.0 and 100.0 (with at most 1 digit behind the "." separator) @@ -2060,33 +2062,33 @@ You shall use point as decimal separator, with no spaces, and type a number between 0.0 and 100.0 (with at most 1 digit behind the "." separator) - The sum of percentages is: ¤jbcggtca-GOP¤ %. The total of percentages must be equal to 100%. + The sum of percentages is: ¤jbcggtca-GOP¤ %. The total of percentages must be equal to 100%. - + - - - - - - - + - + - + + + + + + + - - + + - + @@ -2167,39 +2169,39 @@ - + - - - - - - - + - + - - - - - - + + + + + + - + - + - + - + + + + + + + - + @@ -710,7 +712,7 @@ - Vous devez utiliser le point comme séparateur de décimale, sans espace, et saisir un nombre compris entre 0.0 et 99.0 (avec au plus 1 chiffre derrière le séparateur ".") + Vous devez utiliser le caractère "," comme séparateur de décimale, sans espace, et saisir un nombre compris entre 0,0 et 99,0 (avec au plus 1 chiffre derrière le séparateur ",") @@ -811,7 +813,7 @@ - + @@ -838,7 +840,7 @@ - + @@ -1122,34 +1124,34 @@ - Vous devez utiliser le point comme séparateur de décimale, sans espace, et saisir un nombre compris entre 0.0 et 100.0 (avec au plus 1 chiffre derrière le séparateur ".") + Vous devez utiliser le caractère "," comme séparateur de décimale, sans espace, et saisir un nombre compris entre 0,0 et 100,0 (avec au plus 1 chiffre derrière le séparateur ",") - Vous devez utiliser le point comme séparateur de décimale, sans espace, et saisir un nombre compris entre 0.0 et 100.0 (avec au plus 1 chiffre derrière le séparateur ".") + Vous devez utiliser le caractère "," comme séparateur de décimale, sans espace, et saisir un nombre compris entre 0,0 et 100,0 (avec au plus 1 chiffre derrière le séparateur ",") - Vous devez utiliser le point comme séparateur de décimale, sans espace, et saisir un nombre compris entre 0.0 et 100.0 (avec au plus 1 chiffre derrière le séparateur ".") + Vous devez utiliser le caractère "," comme séparateur de décimale, sans espace, et saisir un nombre compris entre 0,0 et 100,0 (avec au plus 1 chiffre derrière le séparateur ",") - Vous devez utiliser le point comme séparateur de décimale, sans espace, et saisir un nombre compris entre 0.0 et 100.0 (avec au plus 1 chiffre derrière le séparateur ".") + Vous devez utiliser le caractère "," comme séparateur de décimale, sans espace, et saisir un nombre compris entre 0,0 et 100,0 (avec au plus 1 chiffre derrière le séparateur ",") - Vous devez utiliser le point comme séparateur de décimale, sans espace, et saisir un nombre compris entre 0.0 et 100.0 (avec au plus 1 chiffre derrière le séparateur ".") + Vous devez utiliser le caractère "," comme séparateur de décimale, sans espace, et saisir un nombre compris entre 0,0 et 100,0 (avec au plus 1 chiffre derrière le séparateur ",") - Vous devez utiliser le point comme séparateur de décimale, sans espace, et saisir un nombre compris entre 0.0 et 100.0 (avec au plus 1 chiffre derrière le séparateur ".") + Vous devez utiliser le caractère "," comme séparateur de décimale, sans espace, et saisir un nombre compris entre 0,0 et 100,0 (avec au plus 1 chiffre derrière le séparateur ",") - Vous devez utiliser le point comme séparateur de décimale, sans espace, et saisir un nombre compris entre 0.0 et 100.0 (avec au plus 1 chiffre derrière le séparateur ".") + Vous devez utiliser le caractère "," comme séparateur de décimale, sans espace, et saisir un nombre compris entre 0,0 et 100,0 (avec au plus 1 chiffre derrière le séparateur ",") - Vous devez utiliser le point comme séparateur de décimale, sans espace, et saisir un nombre compris entre 0.0 et 100.0 (avec au plus 1 chiffre derrière le séparateur ".") + Vous devez utiliser le caractère "," comme séparateur de décimale, sans espace, et saisir un nombre compris entre 0,0 et 100,0 (avec au plus 1 chiffre derrière le séparateur ",") - Vous devez utiliser le point comme séparateur de décimale, sans espace, et saisir un nombre compris entre 0.0 et 100.0 (avec au plus 1 chiffre derrière le séparateur ".") + Vous devez utiliser le caractère "," comme séparateur de décimale, sans espace, et saisir un nombre compris entre 0,0 et 100,0 (avec au plus 1 chiffre derrière le séparateur ",") - Vous devez utiliser le point comme séparateur de décimale, sans espace, et saisir un nombre compris entre 0.0 et 100.0 (avec au plus 1 chiffre derrière le séparateur ".") + Vous devez utiliser le caractère "," comme séparateur de décimale, sans espace, et saisir un nombre compris entre 0,0 et 100,0 (avec au plus 1 chiffre derrière le séparateur ",") The sum of percentages is: ¤jbcggtca-GOP¤ %. The total of percentages must be equal to 100%. @@ -1162,16 +1164,16 @@ - + - + - + - + @@ -1287,7 +1289,7 @@ - + @@ -1448,7 +1450,6 @@ - @@ -1590,7 +1591,7 @@ - + @@ -1620,7 +1621,7 @@ - You shall use point as decimal separator, with no spaces, and type a number between 0.0 and 99.0 (with at most 1 digit behind the "." separator) + You shall use "," character as decimal separator, with no spaces, and type a number between 0,0 and 99,0 (with at most 1 digit behind the "," separator) @@ -1721,7 +1722,7 @@ - + @@ -1748,7 +1749,7 @@ - + @@ -2032,34 +2033,34 @@ - You shall use point as decimal separator, with no spaces, and type a number between 0.0 and 100.0 (with at most 1 digit behind the "." separator) + You shall use "," character as decimal separator, with no spaces, and type a number between 0,0 and 100,0 (with at most 1 digit behind the "," separator) - You shall use point as decimal separator, with no spaces, and type a number between 0.0 and 100.0 (with at most 1 digit behind the "." separator) + You shall use "," character as decimal separator, with no spaces, and type a number between 0,0 and 100,0 (with at most 1 digit behind the "," separator) - You shall use point as decimal separator, with no spaces, and type a number between 0.0 and 100.0 (with at most 1 digit behind the "." separator) + You shall use "," character as decimal separator, with no spaces, and type a number between 0,0 and 100,0 (with at most 1 digit behind the "," separator) - You shall use point as decimal separator, with no spaces, and type a number between 0.0 and 100.0 (with at most 1 digit behind the "." separator) + You shall use "," character as decimal separator, with no spaces, and type a number between 0,0 and 100,0 (with at most 1 digit behind the "," separator) - You shall use point as decimal separator, with no spaces, and type a number between 0.0 and 100.0 (with at most 1 digit behind the "." separator) + You shall use "," character as decimal separator, with no spaces, and type a number between 0,0 and 100,0 (with at most 1 digit behind the "," separator) - You shall use point as decimal separator, with no spaces, and type a number between 0.0 and 100.0 (with at most 1 digit behind the "." separator) + You shall use "," character as decimal separator, with no spaces, and type a number between 0,0 and 100,0 (with at most 1 digit behind the "," separator) - You shall use point as decimal separator, with no spaces, and type a number between 0.0 and 100.0 (with at most 1 digit behind the "." separator) + You shall use "," character as decimal separator, with no spaces, and type a number between 0,0 and 100,0 (with at most 1 digit behind the "," separator) - You shall use point as decimal separator, with no spaces, and type a number between 0.0 and 100.0 (with at most 1 digit behind the "." separator) + You shall use "," character as decimal separator, with no spaces, and type a number between 0,0 and 100,0 (with at most 1 digit behind the "," separator) - You shall use point as decimal separator, with no spaces, and type a number between 0.0 and 100.0 (with at most 1 digit behind the "." separator) + You shall use "," character as decimal separator, with no spaces, and type a number between 0,0 and 100,0 (with at most 1 digit behind the "," separator) - You shall use point as decimal separator, with no spaces, and type a number between 0.0 and 100.0 (with at most 1 digit behind the "." separator) + You shall use "," character as decimal separator, with no spaces, and type a number between 0,0 and 100,0 (with at most 1 digit behind the "," separator) The sum of percentages is: ¤jbcggtca-GOP¤ %. The total of percentages must be equal to 100%. @@ -2072,16 +2073,16 @@ - + - + - + - + @@ -2197,7 +2198,7 @@ - + @@ -2358,7 +2359,6 @@ - @@ -2595,19 +2595,19 @@ - - + + - + origin="instance('fr-form-loop-model')/FAVOURITE_CHARACTERS-Container/FAVOURITE_CHARACTERS"/> + - + + value="count(instance('fr-form-instance')//FAVOURITE_CHARACTERS-Container/FAVOURITE_CHARACTERS)"/> - + - - + + - - + + - + @@ -3338,17 +3345,19 @@ - + - + % @@ -3362,17 +3371,19 @@ - + - + % @@ -3394,17 +3405,19 @@ - + - + % @@ -3418,17 +3431,19 @@ - + - + % @@ -3442,17 +3457,19 @@ - + - + % @@ -3474,17 +3491,19 @@ - + - + % @@ -3498,17 +3517,19 @@ - + - + % @@ -4149,9 +4170,9 @@ - - + + - + - + @@ -4182,14 +4206,17 @@ xxf:maxlength="255"/> - + - + @@ -4202,14 +4229,17 @@ xxf:maxlength="255"/> - + - + @@ -4222,14 +4252,17 @@ xxf:maxlength="255"/> - + - + @@ -4242,14 +4275,17 @@ xxf:maxlength="255"/> - + - + @@ -4262,14 +4298,17 @@ xxf:maxlength="255"/> - + - + @@ -4282,14 +4321,17 @@ xxf:maxlength="255"/> - + - + @@ -4302,14 +4344,17 @@ xxf:maxlength="255"/> - + - + @@ -4322,14 +4367,17 @@ xxf:maxlength="255"/> - + - + @@ -4342,14 +4390,17 @@ xxf:maxlength="255"/> - + - + @@ -4359,14 +4410,14 @@ bind="FAVOURITE_CHARACTERS-addline-bind"> - - + value="number(instance('fr-form-instance')//FAVOURITE_CHARACTERS-Count) +1"/> + + From b0ab6715f4078fb93f787c5b4f05efb7cb925870 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Laporte?= Date: Wed, 25 Sep 2019 09:40:11 +0200 Subject: [PATCH 156/439] ddi2odt : Update in.xml for test --- src/test/resources/ddi-to-odt/in.xml | 4390 ++++++++++++++++---------- 1 file changed, 2635 insertions(+), 1755 deletions(-) diff --git a/src/test/resources/ddi-to-odt/in.xml b/src/test/resources/ddi-to-odt/in.xml index 43c0c1a62..fb76627a4 100644 --- a/src/test/resources/ddi-to-odt/in.xml +++ b/src/test/resources/ddi-to-odt/in.xml @@ -1,49 +1,54 @@ -fr.inseeINSEE-i6vwid0.1.0 + + fr.insee + INSEE-i6vwi0 + 1 + Questionnaire SIMPSONS - + + fr.insee - RessourcePackage-i6vwid - 0.1.0 + RessourcePackage-i6vwi0 + 1 fr.insee - InterviewerInstructionScheme-i6vwid - 0.1.0 + InterviewerInstructionScheme-i6vwi0 + 1 A définir fr.insee d1 - 0.1.0 + 1 comment - We're going to test your knowledge about the simpsons series.Welcome in the simspons world! + We're going to test your knowledge about the simpsons series.Welcome in the simspons world! fr.insee d11 - 0.1.0 + 1 comment For your information, the date of the last broadcast was on - øLAST_BROADCASTø + ¤LAST_BROADCAST¤ fr.insee d2 - 0.1.0 + 1 comment @@ -56,7 +61,7 @@ fr.insee d3 - 0.1.0 + 1 instruction @@ -69,7 +74,7 @@ fr.insee d4 - 0.1.0 + 1 instruction @@ -82,7 +87,7 @@ fr.insee d5 - 0.1.0 + 1 instruction @@ -95,20 +100,20 @@ fr.insee j4nwc63q-CI-0-II-0 - 0.1.0 + 1 warning The sum of percentages is: ¤jbcggtca-GOP¤ %. The total of - percentages must be equal to 100%. + percentages must be equal to 100%. fr.insee jbcggtca-GOP - 0.1.0 + 1 OutParameter @@ -117,25 +122,25 @@ fr.insee d10 - 0.1.0 + 1 instruction - Several answers possible: check off all the relevant boxes + Several answers possible: check off all the relevant boxes - fr.inseeFTN-INSTRUCTION-10.1.0tooltipIncluded principalities + fr.inseeFTN-INSTRUCTION-11tooltipIncluded principalities fr.insee - ControlConstructScheme-i6vwid - 0.1.0 + ControlConstructScheme-i6vwi0 + 1 fr.insee - Sequence-i6vwid - 0.1.0 + Sequence-i6vwi0 + 1 Questionnaire SIMPSONS @@ -143,26 +148,26 @@ fr.insee j6p0ti5h - 0.1.0 + 1 Sequence fr.insee - d1e101 - 0.1.0 + d1e119 + 1 IfThenElse fr.insee j6z12s2d - 0.1.0 + 1 Sequence fr.insee j6p0ti5h - 0.1.0 + 1 MODULE1 @@ -172,33 +177,33 @@ fr.insee d1 - 0.1.0 + 1 Instruction module fr.insee j6p3dkx6-QC - 0.1.0 + 1 QuestionConstruct fr.insee j6p0np9q-QC - 0.1.0 + 1 QuestionConstruct fr.insee - d1e42 - 0.1.0 + d1e50 + 1 IfThenElse fr.insee j6p0s7o5 - 0.1.0 + 1 MODULE11 @@ -209,32 +214,32 @@ fr.insee j3343qhx-QC - 0.1.0 + 1 QuestionConstruct fr.insee j6q9h8tj-QC - 0.1.0 + 1 QuestionConstruct fr.insee j334cyqb-QC - 0.1.0 + 1 QuestionConstruct fr.insee j6z06z1e-QC - 0.1.0 + 1 QuestionConstruct fr.insee j3341528 - 0.1.0 + 1 MODULE2 @@ -244,33 +249,33 @@ fr.insee d2 - 0.1.0 + 1 Instruction module fr.insee j3343clt-QC - 0.1.0 + 1 QuestionConstruct fr.insee j6qdfhvw-QC - 0.1.0 + 1 QuestionConstruct fr.insee j4nw5cqz-QC - 0.1.0 + 1 QuestionConstruct fr.insee j6qe0h9q - 0.1.0 + 1 MODULE3 @@ -281,38 +286,38 @@ fr.insee j334akov-QC - 0.1.0 + 1 QuestionConstruct fr.insee d12-SI - 0.1.0 + 1 StatementItem fr.insee j6p29i81-QC - 0.1.0 + 1 QuestionConstruct fr.insee j6qefnga-QC - 0.1.0 + 1 QuestionConstruct fr.insee j6yzoc6g-QC - 0.1.0 + 1 QuestionConstruct fr.insee j4nw88h2 - 0.1.0 + 1 MODULE4 @@ -323,26 +328,26 @@ fr.insee j6qe237q - 0.1.0 + 1 Sequence fr.insee j6qejudb - 0.1.0 + 1 Sequence fr.insee j6qeh91y - 0.1.0 + 1 Sequence fr.insee j6qe237q - 0.1.0 + 1 MODULE41 @@ -353,20 +358,20 @@ fr.insee j4nwc63q-QC - 0.1.0 + 1 QuestionConstruct fr.insee j4nwc63q-CI-0 - 0.1.0 + 1 ComputationItem fr.insee j6qejudb - 0.1.0 + 1 MODULE42 @@ -377,14 +382,14 @@ fr.insee j4nw0rr6-QC - 0.1.0 + 1 QuestionConstruct fr.insee j6qeh91y - 0.1.0 + 1 MODULE43 @@ -395,14 +400,14 @@ fr.insee j6p2lwuj-QC - 0.1.0 + 1 QuestionConstruct fr.insee j6qfx9qe - 0.1.0 + 1 MODULE5 @@ -413,14 +418,14 @@ fr.insee j6qg8rc6-QC - 0.1.0 + 1 QuestionConstruct fr.insee j6z12s2d - 0.1.0 + 1 MODULE6 @@ -431,21 +436,28 @@ fr.insee j6z0z3us-QC - 0.1.0 + 1 QuestionConstruct fr.insee - d1e42 - 0.1.0 - hideable + d1e50 + 1 + + A définir + + + + + hideable + xpath fr.insee - d1e42-IP-1 - 0.1.0 + d1e50-IP-1 + 1 READY @@ -454,52 +466,58 @@ fr.insee j6p0np9q-QOP-jbgd3set - 0.1.0 + 1 OutParameter fr.insee - d1e42-IP-1 - 0.1.0 + d1e50-IP-1 + 1 InParameter - not( d1e42-IP-1 != '1') + not( d1e50-IP-1!= '1') fr.insee - d1e42-THEN - 0.1.0 + d1e50-THEN + 1 Sequence fr.insee - d1e42-THEN - 0.1.0 + d1e50-THEN + 1 - hideable fr.insee j6p0s7o5 - 0.1.0 + 1 Sequence fr.insee - d1e101 - 0.1.0 - hideable + d1e119 + 1 + + A définir + + + + + hideable + xpath fr.insee - d1e101-IP-1 - 0.1.0 + d1e119-IP-1 + 1 READY @@ -508,315 +526,314 @@ fr.insee j6p0np9q-QOP-jbgd3set - 0.1.0 + 1 OutParameter fr.insee - d1e101-IP-1 - 0.1.0 + d1e119-IP-1 + 1 InParameter - not( d1e101-IP-1 != '1') + not( d1e119-IP-1!= '1') fr.insee - d1e101-THEN - 0.1.0 + d1e119-THEN + 1 Sequence fr.insee - d1e101-THEN - 0.1.0 + d1e119-THEN + 1 - hideable fr.insee j3341528 - 0.1.0 + 1 Sequence fr.insee j6qe0h9q - 0.1.0 + 1 Sequence fr.insee j4nw88h2 - 0.1.0 + 1 Sequence fr.insee j6qfx9qe - 0.1.0 + 1 Sequence fr.insee j6p3dkx6-QC - 0.1.0 + 1 COMMENT fr.insee j6p3dkx6 - 0.1.0 + 1 QuestionItem fr.insee j6p0np9q-QC - 0.1.0 + 1 READY fr.insee j6p0np9q - 0.1.0 + 1 QuestionItem fr.insee j3343qhx-QC - 0.1.0 + 1 PRODUCER fr.insee j3343qhx - 0.1.0 + 1 QuestionItem fr.insee j6q9h8tj-QC - 0.1.0 + 1 SEASON_NUMBER fr.insee j6q9h8tj - 0.1.0 + 1 QuestionItem fr.insee j334cyqb-QC - 0.1.0 + 1 DATEFIRST fr.insee j334cyqb - 0.1.0 + 1 QuestionItem fr.insee j6z06z1e-QC - 0.1.0 + 1 AUDIENCE_SHARE fr.insee j6z06z1e - 0.1.0 + 1 QuestionItem fr.insee j3343clt-QC - 0.1.0 + 1 CITY fr.insee j3343clt - 0.1.0 + 1 QuestionItem fr.insee j6qdfhvw-QC - 0.1.0 + 1 MAYOR fr.insee j6qdfhvw - 0.1.0 + 1 QuestionItem fr.insee j4nw5cqz-QC - 0.1.0 + 1 STATE fr.insee j4nw5cqz - 0.1.0 + 1 QuestionItem fr.insee j334akov-QC - 0.1.0 + 1 PET fr.insee j334akov - 0.1.0 + 1 QuestionGrid fr.insee j6p29i81-QC - 0.1.0 + 1 ICE_FLAVOUR fr.insee j6p29i81 - 0.1.0 + 1 QuestionGrid fr.insee j6qefnga-QC - 0.1.0 + 1 NUCLEAR_CHARACTER fr.insee j6qefnga - 0.1.0 + 1 QuestionGrid fr.insee j6yzoc6g-QC - 0.1.0 + 1 BIRTH_CHARACTER fr.insee j6yzoc6g - 0.1.0 + 1 QuestionGrid fr.insee j4nwc63q-QC - 0.1.0 + 1 PERCENTAGE_EXPENSES fr.insee j4nwc63q - 0.1.0 + 1 QuestionGrid fr.insee j4nw0rr6-QC - 0.1.0 + 1 CLOWNING fr.insee j4nw0rr6 - 0.1.0 + 1 QuestionGrid fr.insee j6p2lwuj-QC - 0.1.0 + 1 TRAVEL fr.insee j6p2lwuj - 0.1.0 + 1 QuestionGrid fr.insee j6qg8rc6-QC - 0.1.0 + 1 FAVOURITE_CHARACTERS fr.insee j6qg8rc6 - 0.1.0 + 1 QuestionGrid fr.insee j6z0z3us-QC - 0.1.0 + 1 SURVEY_COMMENT fr.insee j6z0z3us - 0.1.0 + 1 QuestionItem - informational + fr.insee j4nwc63q-CI-0 - 0.1.0 + 1 Total of percentages @@ -826,16 +843,17 @@ fr.insee j4nwc63q-CI-0-II-0 - 0.1.0 + 1 Instruction + stumblingblock xpath fr.insee j4nwc63q-CI-0-IP-1 - 0.1.0 + 1 PERCENTAGE_EXPENSES11 @@ -843,7 +861,7 @@ fr.insee j4nwc63q-CI-0-IP-2 - 0.1.0 + 1 PERCENTAGE_EXPENSES21 @@ -851,7 +869,7 @@ fr.insee j4nwc63q-CI-0-IP-3 - 0.1.0 + 1 PERCENTAGE_EXPENSES31 @@ -859,7 +877,7 @@ fr.insee j4nwc63q-CI-0-IP-4 - 0.1.0 + 1 PERCENTAGE_EXPENSES41 @@ -867,7 +885,7 @@ fr.insee j4nwc63q-CI-0-IP-5 - 0.1.0 + 1 PERCENTAGE_EXPENSES51 @@ -875,7 +893,7 @@ fr.insee j4nwc63q-CI-0-IP-6 - 0.1.0 + 1 PERCENTAGE_EXPENSES61 @@ -883,7 +901,7 @@ fr.insee j4nwc63q-CI-0-IP-7 - 0.1.0 + 1 PERCENTAGE_EXPENSES71 @@ -891,7 +909,7 @@ fr.insee j4nwc63q-CI-0-IP-8 - 0.1.0 + 1 PERCENTAGE_EXPENSES81 @@ -899,7 +917,7 @@ fr.insee j4nwc63q-CI-0-IP-9 - 0.1.0 + 1 PERCENTAGE_EXPENSES91 @@ -907,7 +925,7 @@ fr.insee j4nwc63q-CI-0-IP-10 - 0.1.0 + 1 PERCENTAGE_EXPENSES101 @@ -916,13 +934,13 @@ fr.insee j4nwc63q-QOP-jbgde5yl - 0.1.0 + 1 OutParameter fr.insee j4nwc63q-CI-0-IP-1 - 0.1.0 + 1 InParameter @@ -930,13 +948,13 @@ fr.insee j4nwc63q-QOP-jbgd2x2t - 0.1.0 + 1 OutParameter fr.insee j4nwc63q-CI-0-IP-2 - 0.1.0 + 1 InParameter @@ -944,13 +962,13 @@ fr.insee j4nwc63q-QOP-jbgdjypz - 0.1.0 + 1 OutParameter fr.insee j4nwc63q-CI-0-IP-3 - 0.1.0 + 1 InParameter @@ -958,13 +976,13 @@ fr.insee j4nwc63q-QOP-jbgdcftu - 0.1.0 + 1 OutParameter fr.insee j4nwc63q-CI-0-IP-4 - 0.1.0 + 1 InParameter @@ -972,13 +990,13 @@ fr.insee j4nwc63q-QOP-jbgdiyfe - 0.1.0 + 1 OutParameter fr.insee j4nwc63q-CI-0-IP-5 - 0.1.0 + 1 InParameter @@ -986,13 +1004,13 @@ fr.insee j4nwc63q-QOP-jbgdj1wd - 0.1.0 + 1 OutParameter fr.insee j4nwc63q-CI-0-IP-6 - 0.1.0 + 1 InParameter @@ -1000,13 +1018,13 @@ fr.insee j4nwc63q-QOP-jbgddylk - 0.1.0 + 1 OutParameter fr.insee j4nwc63q-CI-0-IP-7 - 0.1.0 + 1 InParameter @@ -1014,13 +1032,13 @@ fr.insee j4nwc63q-QOP-jbgd3jj6 - 0.1.0 + 1 OutParameter fr.insee j4nwc63q-CI-0-IP-8 - 0.1.0 + 1 InParameter @@ -1028,13 +1046,13 @@ fr.insee j4nwc63q-QOP-jbgd4w3k - 0.1.0 + 1 OutParameter fr.insee j4nwc63q-CI-0-IP-9 - 0.1.0 + 1 InParameter @@ -1042,27 +1060,27 @@ fr.insee j4nwc63q-QOP-jbgd4w4k - 0.1.0 + 1 OutParameter fr.insee j4nwc63q-CI-0-IP-10 - 0.1.0 + 1 InParameter number(if (j4nwc63q-CI-0-IP-1='') then '0' else j4nwc63q-CI-0-IP-1) + number(if (j4nwc63q-CI-0-IP-2='') then '0' else j4nwc63q-CI-0-IP-2) + - number(if (j4nwc63q-CI-0-IP-3='') then '0' else j4nwc63q-CI-0-IP-3) + number(if (j4nwc63q-CI-0-IP-4='') then '0' else j4nwc63q-CI-0-IP-4) + number(if (j4nwc63q-CI-0-IP-5='') then '0' else j4nwc63q-CI-0-IP-5) + - number(if (j4nwc63q-CI-0-IP-6='') then '0' else j4nwc63q-CI-0-IP-6) + number(if (j4nwc63q-CI-0-IP-7='') then '0' else j4nwc63q-CI-0-IP-7) + number(if (j4nwc63q-CI-0-IP-8='') then '0' else j4nwc63q-CI-0-IP-8) + - number(if (j4nwc63q-CI-0-IP-9='') then '0' else j4nwc63q-CI-0-IP-9) + number(if (j4nwc63q-CI-0-IP-10='') then '0' else j4nwc63q-CI-0-IP-10) != 100 + number(if (j4nwc63q-CI-0-IP-3='') then '0' else j4nwc63q-CI-0-IP-3)+ number(if (j4nwc63q-CI-0-IP-4='') then '0' else j4nwc63q-CI-0-IP-4)+ number(if (j4nwc63q-CI-0-IP-5='') then '0' else j4nwc63q-CI-0-IP-5)+ + number(if (j4nwc63q-CI-0-IP-6='') then '0' else j4nwc63q-CI-0-IP-6)+ number(if (j4nwc63q-CI-0-IP-7='') then '0' else j4nwc63q-CI-0-IP-7)+ number(if (j4nwc63q-CI-0-IP-8='') then '0' else j4nwc63q-CI-0-IP-8)+ + number(if (j4nwc63q-CI-0-IP-9='') then '0' else j4nwc63q-CI-0-IP-9)+ number(if (j4nwc63q-CI-0-IP-10='') then '0' else j4nwc63q-CI-0-IP-10)!= 100 - + fr.insee d12-SI - 0.1.0 + 1 Now we are going to know if you think that Jay is a gluton. @@ -1072,22 +1090,22 @@ fr.insee - QuestionScheme-i6vwid - 0.1.0 + QuestionScheme-i6vwi0 + 1 A définir fr.insee j6p3dkx6 - 0.1.0 + 1 COMMENT fr.insee j6p3dkx6-QOP-jbgdhaht - 0.1.0 + 1 COMMENT @@ -1096,26 +1114,26 @@ fr.insee j6p3dkx6-RDOP-jbgdhaht - 0.1.0 + 1 OutParameter fr.insee j6p3dkx6-QOP-jbgdhaht - 0.1.0 + 1 OutParameter - Before starting, do you have any comments about the Simpsons family? + Before starting, do you have any comments about the Simpsons family? fr.insee j6p3dkx6-RDOP-jbgdhaht - 0.1.0 + 1 @@ -1123,14 +1141,14 @@ fr.insee j6p0np9q - 0.1.0 + 1 READY fr.insee j6p0np9q-QOP-jbgd3set - 0.1.0 + 1 READY @@ -1139,13 +1157,13 @@ fr.insee j6p0np9q-RDOP-jbgd3set - 0.1.0 + 1 OutParameter fr.insee j6p0np9q-QOP-jbgd3set - 0.1.0 + 1 OutParameter @@ -1158,14 +1176,14 @@ fr.insee j6p0np9q-RDOP-jbgd3set - 0.1.0 + 1 fr.insee INSEE-COMMUN-CL-Booleen-1 - 0.1.0 + 1 Code @@ -1175,33 +1193,35 @@ - - fr.insee - j6p6my1d - 0.1.0 - - - - If you are not ready, please go to the end of the - questionnaire - $READY != '1' - j6z12s2d - - - - + + + fr.insee + j6p6my1d + 1 + + + + If you are not ready, please go to the end of the + questionnaire + $READY != '1' + j6z12s2d + + + + + fr.insee j3343qhx - 0.1.0 + 1 PRODUCER fr.insee j3343qhx-QOP-jbgd90cy - 0.1.0 + 1 PRODUCER @@ -1210,13 +1230,13 @@ fr.insee j3343qhx-RDOP-jbgd90cy - 0.1.0 + 1 OutParameter fr.insee j3343qhx-QOP-jbgd90cy - 0.1.0 + 1 OutParameter @@ -1229,7 +1249,7 @@ fr.insee j3343qhx-RDOP-jbgd90cy - 0.1.0 + 1 @@ -1237,14 +1257,14 @@ fr.insee j6q9h8tj - 0.1.0 + 1 SEASON_NUMBER fr.insee j6q9h8tj-QOP-jbgdjy8h - 0.1.0 + 1 SEASON_NUMBER @@ -1253,13 +1273,13 @@ fr.insee j6q9h8tj-RDOP-jbgdjy8h - 0.1.0 + 1 OutParameter fr.insee j6q9h8tj-QOP-jbgdjy8h - 0.1.0 + 1 OutParameter @@ -1277,21 +1297,21 @@ fr.insee j6q9h8tj-RDOP-jbgdjy8h - 0.1.0 + 1 fr.insee j334cyqb - 0.1.0 + 1 DATEFIRST fr.insee j334cyqb-QOP-jbgdih2z - 0.1.0 + 1 DATEFIRST @@ -1300,13 +1320,13 @@ fr.insee j334cyqb-RDOP-jbgdih2z - 0.1.0 + 1 OutParameter fr.insee j334cyqb-QOP-jbgdih2z - 0.1.0 + 1 OutParameter @@ -1317,17 +1337,17 @@ fr.insee - INSEE-COMMUN-MNR-DateTimedate - 0.1.0 + INSEE-COMMUN-MNR-DateTimedate-YYYY-MM-DD + 1 ManagedDateTimeRepresentation fr.insee j334cyqb-RDOP-jbgdih2z - 0.1.0 + 1 fr.insee - INSEE-COMMUN-MNR-DateTimedate - 0.1.0 + INSEE-COMMUN-MNR-DateTimedate-YYYY-MM-DD + 1 ManagedDateTimeRepresentation @@ -1335,21 +1355,21 @@ fr.insee d11 - 0.1.0 + 1 Instruction fr.insee j6z06z1e - 0.1.0 + 1 AUDIENCE_SHARE fr.insee j6z06z1e-QOP-jbgddnrd - 0.1.0 + 1 AUDIENCE_SHARE @@ -1358,20 +1378,20 @@ fr.insee j6z06z1e-RDOP-jbgddnrd - 0.1.0 + 1 OutParameter fr.insee j6z06z1e-QOP-jbgddnrd - 0.1.0 + 1 OutParameter In your opinion, how much is the part of audience share in US for the 2016 - season? + season? @@ -1383,21 +1403,21 @@ fr.insee j6z06z1e-RDOP-jbgddnrd - 0.1.0 + 1 fr.insee j3343clt - 0.1.0 + 1 CITY fr.insee j3343clt-QOP-jbgdjdkn - 0.1.0 + 1 CITY @@ -1406,13 +1426,13 @@ fr.insee j3343clt-RDOP-jbgdjdkn - 0.1.0 + 1 OutParameter fr.insee j3343clt-QOP-jbgdjdkn - 0.1.0 + 1 OutParameter @@ -1421,47 +1441,47 @@ In which city do the Simpsons reside? - + radio-button fr.insee j334iumu - 0.1.0 + 1 CodeList fr.insee j3343clt-RDOP-jbgdjdkn - 0.1.0 + 1 fr.insee j334iumu - 0.1.0 + 1 CodeList - + fr.insee d3 - 0.1.0 + 1 Instruction fr.insee j6qdfhvw - 0.1.0 + 1 MAYOR fr.insee j6qdfhvw-QOP-jbgd8ghp - 0.1.0 + 1 MAYOR @@ -1470,13 +1490,13 @@ fr.insee j6qdfhvw-RDOP-jbgd8ghp - 0.1.0 + 1 OutParameter fr.insee j6qdfhvw-QOP-jbgd8ghp - 0.1.0 + 1 OutParameter @@ -1485,23 +1505,23 @@ Who is the Simpsons city mayor? - + checkbox fr.insee j6qdqoen - 0.1.0 + 1 CodeList fr.insee j6qdfhvw-RDOP-jbgd8ghp - 0.1.0 + 1 fr.insee j6qdqoen - 0.1.0 + 1 CodeList @@ -1511,21 +1531,21 @@ fr.insee d4 - 0.1.0 + 1 Instruction fr.insee j4nw5cqz - 0.1.0 + 1 STATE fr.insee j4nw5cqz-QOP-jbgdkd7v - 0.1.0 + 1 STATE @@ -1534,13 +1554,13 @@ fr.insee j4nw5cqz-RDOP-jbgdkd7v - 0.1.0 + 1 OutParameter fr.insee j4nw5cqz-QOP-jbgdkd7v - 0.1.0 + 1 OutParameter @@ -1549,23 +1569,23 @@ In which state do The Simpsons reside? - + drop-down-list fr.insee j4nwo00f - 0.1.0 + 1 CodeList fr.insee j4nw5cqz-RDOP-jbgdkd7v - 0.1.0 + 1 fr.insee j4nwo00f - 0.1.0 + 1 CodeList @@ -1576,14 +1596,14 @@ fr.insee j6z0z3us - 0.1.0 + 1 SURVEY_COMMENT fr.insee j6z0z3us-QOP-jbgd6m6e - 0.1.0 + 1 SURVEY_COMMENT @@ -1592,13 +1612,13 @@ fr.insee j6z0z3us-RDOP-jbgd6m6e - 0.1.0 + 1 OutParameter fr.insee j6z0z3us-QOP-jbgd6m6e - 0.1.0 + 1 OutParameter @@ -1611,7 +1631,7 @@ fr.insee j6z0z3us-RDOP-jbgd6m6e - 0.1.0 + 1 @@ -1619,14 +1639,14 @@ fr.insee j334akov - 0.1.0 + 1 PET fr.insee j334akov-QOP-jbgd8qmn - 0.1.0 + 1 PET1 @@ -1634,7 +1654,7 @@ fr.insee j334akov-QOP-jbgd60vl - 0.1.0 + 1 PET2 @@ -1642,7 +1662,7 @@ fr.insee j334akov-QOP-jbgda2jo - 0.1.0 + 1 PET3 @@ -1650,7 +1670,7 @@ fr.insee j334akov-QOP-jbgdfssy - 0.1.0 + 1 PET4 @@ -1659,13 +1679,13 @@ fr.insee j334akov-RDOP-jbgd8qmn - 0.1.0 + 1 OutParameter fr.insee j334akov-QOP-jbgd8qmn - 0.1.0 + 1 OutParameter @@ -1673,13 +1693,13 @@ fr.insee j334akov-RDOP-jbgd60vl - 0.1.0 + 1 OutParameter fr.insee j334akov-QOP-jbgd60vl - 0.1.0 + 1 OutParameter @@ -1687,13 +1707,13 @@ fr.insee j334akov-RDOP-jbgda2jo - 0.1.0 + 1 OutParameter fr.insee j334akov-QOP-jbgda2jo - 0.1.0 + 1 OutParameter @@ -1701,13 +1721,13 @@ fr.insee j334akov-RDOP-jbgdfssy - 0.1.0 + 1 OutParameter fr.insee j334akov-QOP-jbgdfssy - 0.1.0 + 1 OutParameter @@ -1717,11 +1737,11 @@ - + fr.insee j335cu3c - 0.1.0 + 1 CodeList @@ -1732,14 +1752,14 @@ fr.insee j334akov-RDOP-jbgd8qmn - 0.1.0 + 1 fr.insee INSEE-COMMUN-CL-Booleen-1 - 0.1.0 + 1 Code @@ -1760,14 +1780,14 @@ fr.insee j334akov-RDOP-jbgd60vl - 0.1.0 + 1 fr.insee INSEE-COMMUN-CL-Booleen-1 - 0.1.0 + 1 Code @@ -1788,14 +1808,14 @@ fr.insee j334akov-RDOP-jbgda2jo - 0.1.0 + 1 fr.insee INSEE-COMMUN-CL-Booleen-1 - 0.1.0 + 1 Code @@ -1816,14 +1836,14 @@ fr.insee j334akov-RDOP-jbgdfssy - 0.1.0 + 1 fr.insee INSEE-COMMUN-CL-Booleen-1 - 0.1.0 + 1 Code @@ -1843,21 +1863,21 @@ fr.insee d5 - 0.1.0 + 1 Instruction fr.insee j6p29i81 - 0.1.0 + 1 ICE_FLAVOUR fr.insee j6p29i81-QOP-jbgdb3jx - 0.1.0 + 1 ICE_FLAVOUR1 @@ -1865,7 +1885,7 @@ fr.insee j6p29i81-QOP-jbgdb61k - 0.1.0 + 1 ICE_FLAVOUR2 @@ -1873,7 +1893,7 @@ fr.insee j6p29i81-QOP-jbgdl3kc - 0.1.0 + 1 ICE_FLAVOUR3 @@ -1881,7 +1901,7 @@ fr.insee j6p29i81-QOP-jbgdcobo - 0.1.0 + 1 ICE_FLAVOUR4 @@ -1890,13 +1910,13 @@ fr.insee j6p29i81-RDOP-jbgdb3jx - 0.1.0 + 1 OutParameter fr.insee j6p29i81-QOP-jbgdb3jx - 0.1.0 + 1 OutParameter @@ -1904,13 +1924,13 @@ fr.insee j6p29i81-RDOP-jbgdb61k - 0.1.0 + 1 OutParameter fr.insee j6p29i81-QOP-jbgdb61k - 0.1.0 + 1 OutParameter @@ -1918,13 +1938,13 @@ fr.insee j6p29i81-RDOP-jbgdl3kc - 0.1.0 + 1 OutParameter fr.insee j6p29i81-QOP-jbgdl3kc - 0.1.0 + 1 OutParameter @@ -1932,13 +1952,13 @@ fr.insee j6p29i81-RDOP-jbgdcobo - 0.1.0 + 1 OutParameter fr.insee j6p29i81-QOP-jbgdcobo - 0.1.0 + 1 OutParameter @@ -1948,34 +1968,34 @@ - + fr.insee j6p2mvca - 0.1.0 + 1 CodeList - + radio-button fr.insee jbdxh138 - 0.1.0 + 1 CodeList fr.insee j6p29i81-RDOP-jbgdb3jx - 0.1.0 + 1 fr.insee jbdxh138 - 0.1.0 + 1 CodeList @@ -1989,23 +2009,23 @@ - + radio-button fr.insee jbdxh138 - 0.1.0 + 1 CodeList fr.insee j6p29i81-RDOP-jbgdb61k - 0.1.0 + 1 fr.insee jbdxh138 - 0.1.0 + 1 CodeList @@ -2019,23 +2039,23 @@ - + radio-button fr.insee jbdxh138 - 0.1.0 + 1 CodeList fr.insee j6p29i81-RDOP-jbgdl3kc - 0.1.0 + 1 fr.insee jbdxh138 - 0.1.0 + 1 CodeList @@ -2049,23 +2069,23 @@ - + radio-button fr.insee jbdxh138 - 0.1.0 + 1 CodeList fr.insee j6p29i81-RDOP-jbgdcobo - 0.1.0 + 1 fr.insee jbdxh138 - 0.1.0 + 1 CodeList @@ -2083,14 +2103,14 @@ fr.insee j6qefnga - 0.1.0 + 1 NUCLEAR_CHARACTER fr.insee j6qefnga-QOP-jbgd6p0k - 0.1.0 + 1 NUCLEAR_CHARACTER1 @@ -2098,7 +2118,7 @@ fr.insee j6qefnga-QOP-jbgd9ato - 0.1.0 + 1 NUCLEAR_CHARACTER2 @@ -2106,7 +2126,7 @@ fr.insee j6qefnga-QOP-jbgd3e0p - 0.1.0 + 1 NUCLEAR_CHARACTER3 @@ -2114,7 +2134,7 @@ fr.insee j6qefnga-QOP-jbgdkxne - 0.1.0 + 1 NUCLEAR_CHARACTER4 @@ -2123,13 +2143,13 @@ fr.insee j6qefnga-RDOP-jbgd6p0k - 0.1.0 + 1 OutParameter fr.insee j6qefnga-QOP-jbgd6p0k - 0.1.0 + 1 OutParameter @@ -2137,13 +2157,13 @@ fr.insee j6qefnga-RDOP-jbgd9ato - 0.1.0 + 1 OutParameter fr.insee j6qefnga-QOP-jbgd9ato - 0.1.0 + 1 OutParameter @@ -2151,13 +2171,13 @@ fr.insee j6qefnga-RDOP-jbgd3e0p - 0.1.0 + 1 OutParameter fr.insee j6qefnga-QOP-jbgd3e0p - 0.1.0 + 1 OutParameter @@ -2165,13 +2185,13 @@ fr.insee j6qefnga-RDOP-jbgdkxne - 0.1.0 + 1 OutParameter fr.insee j6qefnga-QOP-jbgdkxne - 0.1.0 + 1 OutParameter @@ -2181,34 +2201,34 @@ - + fr.insee j6qeytgc - 0.1.0 + 1 CodeList - + drop-down-list fr.insee jbdxh138 - 0.1.0 + 1 CodeList fr.insee j6qefnga-RDOP-jbgd6p0k - 0.1.0 + 1 fr.insee jbdxh138 - 0.1.0 + 1 CodeList @@ -2222,23 +2242,23 @@ - + drop-down-list fr.insee jbdxh138 - 0.1.0 + 1 CodeList fr.insee j6qefnga-RDOP-jbgd9ato - 0.1.0 + 1 fr.insee jbdxh138 - 0.1.0 + 1 CodeList @@ -2252,23 +2272,23 @@ - + drop-down-list fr.insee jbdxh138 - 0.1.0 + 1 CodeList fr.insee j6qefnga-RDOP-jbgd3e0p - 0.1.0 + 1 fr.insee jbdxh138 - 0.1.0 + 1 CodeList @@ -2282,23 +2302,23 @@ - + drop-down-list fr.insee jbdxh138 - 0.1.0 + 1 CodeList fr.insee j6qefnga-RDOP-jbgdkxne - 0.1.0 + 1 fr.insee jbdxh138 - 0.1.0 + 1 CodeList @@ -2316,14 +2336,14 @@ fr.insee j6yzoc6g - 0.1.0 + 1 BIRTH_CHARACTER fr.insee j6yzoc6g-QOP-jbgd7fr6 - 0.1.0 + 1 BIRTH_CHARACTER1 @@ -2331,7 +2351,7 @@ fr.insee j6yzoc6g-QOP-jbgd5e9f - 0.1.0 + 1 BIRTH_CHARACTER2 @@ -2339,7 +2359,7 @@ fr.insee j6yzoc6g-QOP-jbgd912x - 0.1.0 + 1 BIRTH_CHARACTER3 @@ -2347,7 +2367,7 @@ fr.insee j6yzoc6g-QOP-jbgd6bdy - 0.1.0 + 1 BIRTH_CHARACTER4 @@ -2355,7 +2375,7 @@ fr.insee j6yzoc6g-QOP-jbgddyry - 0.1.0 + 1 BIRTH_CHARACTER5 @@ -2364,13 +2384,13 @@ fr.insee j6yzoc6g-RDOP-jbgd7fr6 - 0.1.0 + 1 OutParameter fr.insee j6yzoc6g-QOP-jbgd7fr6 - 0.1.0 + 1 OutParameter @@ -2378,13 +2398,13 @@ fr.insee j6yzoc6g-RDOP-jbgd5e9f - 0.1.0 + 1 OutParameter fr.insee j6yzoc6g-QOP-jbgd5e9f - 0.1.0 + 1 OutParameter @@ -2392,13 +2412,13 @@ fr.insee j6yzoc6g-RDOP-jbgd912x - 0.1.0 + 1 OutParameter fr.insee j6yzoc6g-QOP-jbgd912x - 0.1.0 + 1 OutParameter @@ -2406,13 +2426,13 @@ fr.insee j6yzoc6g-RDOP-jbgd6bdy - 0.1.0 + 1 OutParameter fr.insee j6yzoc6g-QOP-jbgd6bdy - 0.1.0 + 1 OutParameter @@ -2420,13 +2440,13 @@ fr.insee j6yzoc6g-RDOP-jbgddyry - 0.1.0 + 1 OutParameter fr.insee j6yzoc6g-QOP-jbgddyry - 0.1.0 + 1 OutParameter @@ -2436,34 +2456,34 @@ - + fr.insee j6z087mq - 0.1.0 + 1 CodeList - + checkbox fr.insee jbdxricm - 0.1.0 + 1 CodeList fr.insee j6yzoc6g-RDOP-jbgd7fr6 - 0.1.0 + 1 fr.insee jbdxricm - 0.1.0 + 1 CodeList @@ -2477,23 +2497,23 @@ - + checkbox fr.insee jbdxricm - 0.1.0 + 1 CodeList fr.insee j6yzoc6g-RDOP-jbgd5e9f - 0.1.0 + 1 fr.insee jbdxricm - 0.1.0 + 1 CodeList @@ -2507,23 +2527,23 @@ - + checkbox fr.insee jbdxricm - 0.1.0 + 1 CodeList fr.insee j6yzoc6g-RDOP-jbgd912x - 0.1.0 + 1 fr.insee jbdxricm - 0.1.0 + 1 CodeList @@ -2537,23 +2557,23 @@ - + checkbox fr.insee jbdxricm - 0.1.0 + 1 CodeList fr.insee j6yzoc6g-RDOP-jbgd6bdy - 0.1.0 + 1 fr.insee jbdxricm - 0.1.0 + 1 CodeList @@ -2567,23 +2587,23 @@ - + checkbox fr.insee jbdxricm - 0.1.0 + 1 CodeList fr.insee j6yzoc6g-RDOP-jbgddyry - 0.1.0 + 1 fr.insee jbdxricm - 0.1.0 + 1 CodeList @@ -2601,14 +2621,14 @@ fr.insee j4nwc63q - 0.1.0 + 1 PERCENTAGE_EXPENSES fr.insee j4nwc63q-QOP-jbgde5yl - 0.1.0 + 1 PERCENTAGE_EXPENSES11 @@ -2616,7 +2636,7 @@ fr.insee j4nwc63q-QOP-jbgd2x2t - 0.1.0 + 1 PERCENTAGE_EXPENSES21 @@ -2624,7 +2644,7 @@ fr.insee j4nwc63q-QOP-jbgdjypz - 0.1.0 + 1 PERCENTAGE_EXPENSES31 @@ -2632,7 +2652,7 @@ fr.insee j4nwc63q-QOP-jbgdcftu - 0.1.0 + 1 PERCENTAGE_EXPENSES41 @@ -2640,7 +2660,7 @@ fr.insee j4nwc63q-QOP-jbgdiyfe - 0.1.0 + 1 PERCENTAGE_EXPENSES51 @@ -2648,7 +2668,7 @@ fr.insee j4nwc63q-QOP-jbgdj1wd - 0.1.0 + 1 PERCENTAGE_EXPENSES61 @@ -2656,7 +2676,7 @@ fr.insee j4nwc63q-QOP-jbgddylk - 0.1.0 + 1 PERCENTAGE_EXPENSES71 @@ -2664,7 +2684,7 @@ fr.insee j4nwc63q-QOP-jbgd3jj6 - 0.1.0 + 1 PERCENTAGE_EXPENSES81 @@ -2672,7 +2692,7 @@ fr.insee j4nwc63q-QOP-jbgd4w3k - 0.1.0 + 1 PERCENTAGE_EXPENSES91 @@ -2680,7 +2700,7 @@ fr.insee j4nwc63q-QOP-jbgd4w4k - 0.1.0 + 1 PERCENTAGE_EXPENSES101 @@ -2689,13 +2709,13 @@ fr.insee j4nwc63q-RDOP-jbgde5yl - 0.1.0 + 1 OutParameter fr.insee j4nwc63q-QOP-jbgde5yl - 0.1.0 + 1 OutParameter @@ -2703,13 +2723,13 @@ fr.insee j4nwc63q-RDOP-jbgd2x2t - 0.1.0 + 1 OutParameter fr.insee j4nwc63q-QOP-jbgd2x2t - 0.1.0 + 1 OutParameter @@ -2717,13 +2737,13 @@ fr.insee j4nwc63q-RDOP-jbgdjypz - 0.1.0 + 1 OutParameter fr.insee j4nwc63q-QOP-jbgdjypz - 0.1.0 + 1 OutParameter @@ -2731,13 +2751,13 @@ fr.insee j4nwc63q-RDOP-jbgdcftu - 0.1.0 + 1 OutParameter fr.insee j4nwc63q-QOP-jbgdcftu - 0.1.0 + 1 OutParameter @@ -2745,13 +2765,13 @@ fr.insee j4nwc63q-RDOP-jbgdiyfe - 0.1.0 + 1 OutParameter fr.insee j4nwc63q-QOP-jbgdiyfe - 0.1.0 + 1 OutParameter @@ -2759,13 +2779,13 @@ fr.insee j4nwc63q-RDOP-jbgdj1wd - 0.1.0 + 1 OutParameter fr.insee j4nwc63q-QOP-jbgdj1wd - 0.1.0 + 1 OutParameter @@ -2773,13 +2793,13 @@ fr.insee j4nwc63q-RDOP-jbgddylk - 0.1.0 + 1 OutParameter fr.insee j4nwc63q-QOP-jbgddylk - 0.1.0 + 1 OutParameter @@ -2787,13 +2807,13 @@ fr.insee j4nwc63q-RDOP-jbgd3jj6 - 0.1.0 + 1 OutParameter fr.insee j4nwc63q-QOP-jbgd3jj6 - 0.1.0 + 1 OutParameter @@ -2801,13 +2821,13 @@ fr.insee j4nwc63q-RDOP-jbgd4w3k - 0.1.0 + 1 OutParameter fr.insee j4nwc63q-QOP-jbgd4w3k - 0.1.0 + 1 OutParameter @@ -2815,38 +2835,38 @@ fr.insee j4nwc63q-RDOP-jbgd4w4k - 0.1.0 + 1 OutParameter fr.insee j4nwc63q-QOP-jbgd4w4k - 0.1.0 + 1 OutParameter Please, specify the percentage of Jay's expenses in the Kwik-E-Mart for each - product? + product? - + fr.insee j4nwh16i - 0.1.0 + 1 CodeList - + fr.insee j4nwc63q-secondDimension-fakeCL-1 - 0.1.0 + 1 CodeList @@ -2862,7 +2882,7 @@ fr.insee j4nwc63q-RDOP-jbgde5yl - 0.1.0 + 1 @@ -2882,7 +2902,7 @@ fr.insee j4nwc63q-RDOP-jbgd2x2t - 0.1.0 + 1 @@ -2902,7 +2922,7 @@ fr.insee j4nwc63q-RDOP-jbgdjypz - 0.1.0 + 1 @@ -2922,7 +2942,7 @@ fr.insee j4nwc63q-RDOP-jbgdcftu - 0.1.0 + 1 @@ -2942,7 +2962,7 @@ fr.insee j4nwc63q-RDOP-jbgdiyfe - 0.1.0 + 1 @@ -2962,7 +2982,7 @@ fr.insee j4nwc63q-RDOP-jbgdj1wd - 0.1.0 + 1 @@ -2982,7 +3002,7 @@ fr.insee j4nwc63q-RDOP-jbgddylk - 0.1.0 + 1 @@ -3002,7 +3022,7 @@ fr.insee j4nwc63q-RDOP-jbgd3jj6 - 0.1.0 + 1 @@ -3022,7 +3042,7 @@ fr.insee j4nwc63q-RDOP-jbgd4w3k - 0.1.0 + 1 @@ -3042,7 +3062,7 @@ fr.insee j4nwc63q-RDOP-jbgd4w4k - 0.1.0 + 1 @@ -3057,14 +3077,14 @@ fr.insee j4nw0rr6 - 0.1.0 + 1 CLOWNING fr.insee j4nw0rr6-QOP-jbgd8tyr - 0.1.0 + 1 CLOWNING11 @@ -3072,7 +3092,7 @@ fr.insee j4nw0rr6-QOP-jbgdep36 - 0.1.0 + 1 CLOWNING21 @@ -3080,7 +3100,7 @@ fr.insee j4nw0rr6-QOP-jbgdjjgi - 0.1.0 + 1 CLOWNING31 @@ -3088,7 +3108,7 @@ fr.insee j4nw0rr6-QOP-jbgdgh6k - 0.1.0 + 1 CLOWNING41 @@ -3096,7 +3116,7 @@ fr.insee j4nw0rr6-QOP-jbgdit3o - 0.1.0 + 1 CLOWNING12 @@ -3104,7 +3124,7 @@ fr.insee j4nw0rr6-QOP-jbgd366k - 0.1.0 + 1 CLOWNING22 @@ -3112,7 +3132,7 @@ fr.insee j4nw0rr6-QOP-jbgdax06 - 0.1.0 + 1 CLOWNING32 @@ -3120,7 +3140,7 @@ fr.insee j4nw0rr6-QOP-jbgdfo1j - 0.1.0 + 1 CLOWNING42 @@ -3129,13 +3149,13 @@ fr.insee j4nw0rr6-RDOP-jbgd8tyr - 0.1.0 + 1 OutParameter fr.insee j4nw0rr6-QOP-jbgd8tyr - 0.1.0 + 1 OutParameter @@ -3143,13 +3163,13 @@ fr.insee j4nw0rr6-RDOP-jbgdep36 - 0.1.0 + 1 OutParameter fr.insee j4nw0rr6-QOP-jbgdep36 - 0.1.0 + 1 OutParameter @@ -3157,13 +3177,13 @@ fr.insee j4nw0rr6-RDOP-jbgdjjgi - 0.1.0 + 1 OutParameter fr.insee j4nw0rr6-QOP-jbgdjjgi - 0.1.0 + 1 OutParameter @@ -3171,13 +3191,13 @@ fr.insee j4nw0rr6-RDOP-jbgdgh6k - 0.1.0 + 1 OutParameter fr.insee j4nw0rr6-QOP-jbgdgh6k - 0.1.0 + 1 OutParameter @@ -3185,13 +3205,13 @@ fr.insee j4nw0rr6-RDOP-jbgdit3o - 0.1.0 + 1 OutParameter fr.insee j4nw0rr6-QOP-jbgdit3o - 0.1.0 + 1 OutParameter @@ -3199,13 +3219,13 @@ fr.insee j4nw0rr6-RDOP-jbgd366k - 0.1.0 + 1 OutParameter fr.insee j4nw0rr6-QOP-jbgd366k - 0.1.0 + 1 OutParameter @@ -3213,13 +3233,13 @@ fr.insee j4nw0rr6-RDOP-jbgdax06 - 0.1.0 + 1 OutParameter fr.insee j4nw0rr6-QOP-jbgdax06 - 0.1.0 + 1 OutParameter @@ -3227,60 +3247,60 @@ fr.insee j4nw0rr6-RDOP-jbgdfo1j - 0.1.0 + 1 OutParameter fr.insee j4nw0rr6-QOP-jbgdfo1j - 0.1.0 + 1 OutParameter - Who did these clownings and tell us what you remember? + Who did these clownings and tell us what you remember? - + fr.insee j77dav9b - 0.1.0 + 1 CodeList - + fr.insee j4nw0rr6-secondDimension-fakeCL-1 - 0.1.0 + 1 CodeList - + drop-down-list fr.insee jbdyh6b5 - 0.1.0 + 1 CodeList fr.insee j4nw0rr6-RDOP-jbgd8tyr - 0.1.0 + 1 fr.insee jbdyh6b5 - 0.1.0 + 1 CodeList @@ -3295,23 +3315,23 @@ - + drop-down-list fr.insee jbdyh6b5 - 0.1.0 + 1 CodeList fr.insee j4nw0rr6-RDOP-jbgdep36 - 0.1.0 + 1 fr.insee jbdyh6b5 - 0.1.0 + 1 CodeList @@ -3326,23 +3346,23 @@ - + drop-down-list fr.insee jbdyh6b5 - 0.1.0 + 1 CodeList fr.insee j4nw0rr6-RDOP-jbgdjjgi - 0.1.0 + 1 fr.insee jbdyh6b5 - 0.1.0 + 1 CodeList @@ -3357,23 +3377,23 @@ - + drop-down-list fr.insee jbdyh6b5 - 0.1.0 + 1 CodeList fr.insee j4nw0rr6-RDOP-jbgdgh6k - 0.1.0 + 1 fr.insee jbdyh6b5 - 0.1.0 + 1 CodeList @@ -3392,7 +3412,7 @@ fr.insee j4nw0rr6-RDOP-jbgdit3o - 0.1.0 + 1 @@ -3408,7 +3428,7 @@ fr.insee j4nw0rr6-RDOP-jbgd366k - 0.1.0 + 1 @@ -3424,7 +3444,7 @@ fr.insee j4nw0rr6-RDOP-jbgdax06 - 0.1.0 + 1 @@ -3440,7 +3460,7 @@ fr.insee j4nw0rr6-RDOP-jbgdfo1j - 0.1.0 + 1 @@ -3456,14 +3476,14 @@ fr.insee j6p2lwuj - 0.1.0 + 1 TRAVEL fr.insee j6p2lwuj-QOP-jbgd92mb - 0.1.0 + 1 TRAVEL11 @@ -3471,7 +3491,7 @@ fr.insee j6p2lwuj-QOP-jbgdgsat - 0.1.0 + 1 TRAVEL21 @@ -3479,7 +3499,7 @@ fr.insee j6p2lwuj-QOP-jbgdaxk2 - 0.1.0 + 1 TRAVEL31 @@ -3487,7 +3507,7 @@ fr.insee j6p2lwuj-QOP-jbgd7myn - 0.1.0 + 1 TRAVEL41 @@ -3495,7 +3515,7 @@ fr.insee j6p2lwuj-QOP-jbgdnxkt - 0.1.0 + 1 TRAVEL12 @@ -3503,7 +3523,7 @@ fr.insee j6p2lwuj-QOP-jbgd3ef5 - 0.1.0 + 1 TRAVEL22 @@ -3511,7 +3531,7 @@ fr.insee j6p2lwuj-QOP-jbgd8p1v - 0.1.0 + 1 TRAVEL32 @@ -3519,7 +3539,7 @@ fr.insee j6p2lwuj-QOP-jbgdgm0c - 0.1.0 + 1 TRAVEL42 @@ -3527,7 +3547,7 @@ fr.insee j6p2lwuj-QOP-jbgdcppc - 0.1.0 + 1 TRAVEL13 @@ -3535,7 +3555,7 @@ fr.insee j6p2lwuj-QOP-jbgd4cm6 - 0.1.0 + 1 TRAVEL23 @@ -3543,7 +3563,7 @@ fr.insee j6p2lwuj-QOP-jbgdd2lo - 0.1.0 + 1 TRAVEL33 @@ -3551,7 +3571,7 @@ fr.insee j6p2lwuj-QOP-jbgdo0ay - 0.1.0 + 1 TRAVEL43 @@ -3559,7 +3579,7 @@ fr.insee j6p2lwuj-QOP-jbgd4r2a - 0.1.0 + 1 TRAVEL14 @@ -3567,7 +3587,7 @@ fr.insee j6p2lwuj-QOP-jbgdkfpq - 0.1.0 + 1 TRAVEL24 @@ -3575,7 +3595,7 @@ fr.insee j6p2lwuj-QOP-jbgd7u52 - 0.1.0 + 1 TRAVEL34 @@ -3583,7 +3603,7 @@ fr.insee j6p2lwuj-QOP-jbgdgfwl - 0.1.0 + 1 TRAVEL44 @@ -3591,7 +3611,7 @@ fr.insee j6p2lwuj-QOP-jbgd9cff - 0.1.0 + 1 TRAVEL15 @@ -3599,7 +3619,7 @@ fr.insee j6p2lwuj-QOP-jbgddwsp - 0.1.0 + 1 TRAVEL25 @@ -3607,7 +3627,7 @@ fr.insee j6p2lwuj-QOP-jbgdncn8 - 0.1.0 + 1 TRAVEL35 @@ -3615,7 +3635,7 @@ fr.insee j6p2lwuj-QOP-jbgdnz6b - 0.1.0 + 1 TRAVEL45 @@ -3623,7 +3643,7 @@ fr.insee j6p2lwuj-QOP-jbgdiva0 - 0.1.0 + 1 TRAVEL16 @@ -3631,7 +3651,7 @@ fr.insee j6p2lwuj-QOP-jbgd7dqf - 0.1.0 + 1 TRAVEL26 @@ -3639,7 +3659,7 @@ fr.insee j6p2lwuj-QOP-jbgdnous - 0.1.0 + 1 TRAVEL36 @@ -3647,7 +3667,7 @@ fr.insee j6p2lwuj-QOP-jbgdkfcz - 0.1.0 + 1 TRAVEL46 @@ -3656,13 +3676,13 @@ fr.insee j6p2lwuj-RDOP-jbgd92mb - 0.1.0 + 1 OutParameter fr.insee j6p2lwuj-QOP-jbgd92mb - 0.1.0 + 1 OutParameter @@ -3670,13 +3690,13 @@ fr.insee j6p2lwuj-RDOP-jbgdgsat - 0.1.0 + 1 OutParameter fr.insee j6p2lwuj-QOP-jbgdgsat - 0.1.0 + 1 OutParameter @@ -3684,13 +3704,13 @@ fr.insee j6p2lwuj-RDOP-jbgdaxk2 - 0.1.0 + 1 OutParameter fr.insee j6p2lwuj-QOP-jbgdaxk2 - 0.1.0 + 1 OutParameter @@ -3698,13 +3718,13 @@ fr.insee j6p2lwuj-RDOP-jbgd7myn - 0.1.0 + 1 OutParameter fr.insee j6p2lwuj-QOP-jbgd7myn - 0.1.0 + 1 OutParameter @@ -3712,13 +3732,13 @@ fr.insee j6p2lwuj-RDOP-jbgdnxkt - 0.1.0 + 1 OutParameter fr.insee j6p2lwuj-QOP-jbgdnxkt - 0.1.0 + 1 OutParameter @@ -3726,13 +3746,13 @@ fr.insee j6p2lwuj-RDOP-jbgd3ef5 - 0.1.0 + 1 OutParameter fr.insee j6p2lwuj-QOP-jbgd3ef5 - 0.1.0 + 1 OutParameter @@ -3740,13 +3760,13 @@ fr.insee j6p2lwuj-RDOP-jbgd8p1v - 0.1.0 + 1 OutParameter fr.insee j6p2lwuj-QOP-jbgd8p1v - 0.1.0 + 1 OutParameter @@ -3754,13 +3774,13 @@ fr.insee j6p2lwuj-RDOP-jbgdgm0c - 0.1.0 + 1 OutParameter fr.insee j6p2lwuj-QOP-jbgdgm0c - 0.1.0 + 1 OutParameter @@ -3768,13 +3788,13 @@ fr.insee j6p2lwuj-RDOP-jbgdcppc - 0.1.0 + 1 OutParameter fr.insee j6p2lwuj-QOP-jbgdcppc - 0.1.0 + 1 OutParameter @@ -3782,13 +3802,13 @@ fr.insee j6p2lwuj-RDOP-jbgd4cm6 - 0.1.0 + 1 OutParameter fr.insee j6p2lwuj-QOP-jbgd4cm6 - 0.1.0 + 1 OutParameter @@ -3796,13 +3816,13 @@ fr.insee j6p2lwuj-RDOP-jbgdd2lo - 0.1.0 + 1 OutParameter fr.insee j6p2lwuj-QOP-jbgdd2lo - 0.1.0 + 1 OutParameter @@ -3810,13 +3830,13 @@ fr.insee j6p2lwuj-RDOP-jbgdo0ay - 0.1.0 + 1 OutParameter fr.insee j6p2lwuj-QOP-jbgdo0ay - 0.1.0 + 1 OutParameter @@ -3824,13 +3844,13 @@ fr.insee j6p2lwuj-RDOP-jbgd4r2a - 0.1.0 + 1 OutParameter fr.insee j6p2lwuj-QOP-jbgd4r2a - 0.1.0 + 1 OutParameter @@ -3838,13 +3858,13 @@ fr.insee j6p2lwuj-RDOP-jbgdkfpq - 0.1.0 + 1 OutParameter fr.insee j6p2lwuj-QOP-jbgdkfpq - 0.1.0 + 1 OutParameter @@ -3852,13 +3872,13 @@ fr.insee j6p2lwuj-RDOP-jbgd7u52 - 0.1.0 + 1 OutParameter fr.insee j6p2lwuj-QOP-jbgd7u52 - 0.1.0 + 1 OutParameter @@ -3866,13 +3886,13 @@ fr.insee j6p2lwuj-RDOP-jbgdgfwl - 0.1.0 + 1 OutParameter fr.insee j6p2lwuj-QOP-jbgdgfwl - 0.1.0 + 1 OutParameter @@ -3880,13 +3900,13 @@ fr.insee j6p2lwuj-RDOP-jbgd9cff - 0.1.0 + 1 OutParameter fr.insee j6p2lwuj-QOP-jbgd9cff - 0.1.0 + 1 OutParameter @@ -3894,13 +3914,13 @@ fr.insee j6p2lwuj-RDOP-jbgddwsp - 0.1.0 + 1 OutParameter fr.insee j6p2lwuj-QOP-jbgddwsp - 0.1.0 + 1 OutParameter @@ -3908,13 +3928,13 @@ fr.insee j6p2lwuj-RDOP-jbgdncn8 - 0.1.0 + 1 OutParameter fr.insee j6p2lwuj-QOP-jbgdncn8 - 0.1.0 + 1 OutParameter @@ -3922,13 +3942,13 @@ fr.insee j6p2lwuj-RDOP-jbgdnz6b - 0.1.0 + 1 OutParameter fr.insee j6p2lwuj-QOP-jbgdnz6b - 0.1.0 + 1 OutParameter @@ -3936,13 +3956,13 @@ fr.insee j6p2lwuj-RDOP-jbgdiva0 - 0.1.0 + 1 OutParameter fr.insee j6p2lwuj-QOP-jbgdiva0 - 0.1.0 + 1 OutParameter @@ -3950,13 +3970,13 @@ fr.insee j6p2lwuj-RDOP-jbgd7dqf - 0.1.0 + 1 OutParameter fr.insee j6p2lwuj-QOP-jbgd7dqf - 0.1.0 + 1 OutParameter @@ -3964,13 +3984,13 @@ fr.insee j6p2lwuj-RDOP-jbgdnous - 0.1.0 + 1 OutParameter fr.insee j6p2lwuj-QOP-jbgdnous - 0.1.0 + 1 OutParameter @@ -3978,38 +3998,38 @@ fr.insee j6p2lwuj-RDOP-jbgdkfcz - 0.1.0 + 1 OutParameter fr.insee j6p2lwuj-QOP-jbgdkfcz - 0.1.0 + 1 OutParameter Which of the following means of transport were used by the hero and in which - country? + country? - + fr.insee j6p2kivg - 0.1.0 + 1 CodeList - + fr.insee jbdye1wa - 0.1.0 + 1 CodeList @@ -4020,14 +4040,14 @@ fr.insee j6p2lwuj-RDOP-jbgd92mb - 0.1.0 + 1 fr.insee INSEE-COMMUN-CL-Booleen-1 - 0.1.0 + 1 Code @@ -4049,14 +4069,14 @@ fr.insee j6p2lwuj-RDOP-jbgdgsat - 0.1.0 + 1 fr.insee INSEE-COMMUN-CL-Booleen-1 - 0.1.0 + 1 Code @@ -4078,14 +4098,14 @@ fr.insee j6p2lwuj-RDOP-jbgdaxk2 - 0.1.0 + 1 fr.insee INSEE-COMMUN-CL-Booleen-1 - 0.1.0 + 1 Code @@ -4107,14 +4127,14 @@ fr.insee j6p2lwuj-RDOP-jbgd7myn - 0.1.0 + 1 fr.insee INSEE-COMMUN-CL-Booleen-1 - 0.1.0 + 1 Code @@ -4136,14 +4156,14 @@ fr.insee j6p2lwuj-RDOP-jbgdnxkt - 0.1.0 + 1 fr.insee INSEE-COMMUN-CL-Booleen-1 - 0.1.0 + 1 Code @@ -4165,14 +4185,14 @@ fr.insee j6p2lwuj-RDOP-jbgd3ef5 - 0.1.0 + 1 fr.insee INSEE-COMMUN-CL-Booleen-1 - 0.1.0 + 1 Code @@ -4194,14 +4214,14 @@ fr.insee j6p2lwuj-RDOP-jbgd8p1v - 0.1.0 + 1 fr.insee INSEE-COMMUN-CL-Booleen-1 - 0.1.0 + 1 Code @@ -4223,14 +4243,14 @@ fr.insee j6p2lwuj-RDOP-jbgdgm0c - 0.1.0 + 1 fr.insee INSEE-COMMUN-CL-Booleen-1 - 0.1.0 + 1 Code @@ -4252,14 +4272,14 @@ fr.insee j6p2lwuj-RDOP-jbgdcppc - 0.1.0 + 1 fr.insee INSEE-COMMUN-CL-Booleen-1 - 0.1.0 + 1 Code @@ -4281,14 +4301,14 @@ fr.insee j6p2lwuj-RDOP-jbgd4cm6 - 0.1.0 + 1 fr.insee INSEE-COMMUN-CL-Booleen-1 - 0.1.0 + 1 Code @@ -4310,14 +4330,14 @@ fr.insee j6p2lwuj-RDOP-jbgdd2lo - 0.1.0 + 1 fr.insee INSEE-COMMUN-CL-Booleen-1 - 0.1.0 + 1 Code @@ -4339,14 +4359,14 @@ fr.insee j6p2lwuj-RDOP-jbgdo0ay - 0.1.0 + 1 fr.insee INSEE-COMMUN-CL-Booleen-1 - 0.1.0 + 1 Code @@ -4368,14 +4388,14 @@ fr.insee j6p2lwuj-RDOP-jbgd4r2a - 0.1.0 + 1 fr.insee INSEE-COMMUN-CL-Booleen-1 - 0.1.0 + 1 Code @@ -4397,14 +4417,14 @@ fr.insee j6p2lwuj-RDOP-jbgdkfpq - 0.1.0 + 1 fr.insee INSEE-COMMUN-CL-Booleen-1 - 0.1.0 + 1 Code @@ -4426,14 +4446,14 @@ fr.insee j6p2lwuj-RDOP-jbgd7u52 - 0.1.0 + 1 fr.insee INSEE-COMMUN-CL-Booleen-1 - 0.1.0 + 1 Code @@ -4455,14 +4475,14 @@ fr.insee j6p2lwuj-RDOP-jbgdgfwl - 0.1.0 + 1 fr.insee INSEE-COMMUN-CL-Booleen-1 - 0.1.0 + 1 Code @@ -4484,14 +4504,14 @@ fr.insee j6p2lwuj-RDOP-jbgd9cff - 0.1.0 + 1 fr.insee INSEE-COMMUN-CL-Booleen-1 - 0.1.0 + 1 Code @@ -4513,14 +4533,14 @@ fr.insee j6p2lwuj-RDOP-jbgddwsp - 0.1.0 + 1 fr.insee INSEE-COMMUN-CL-Booleen-1 - 0.1.0 + 1 Code @@ -4542,14 +4562,14 @@ fr.insee j6p2lwuj-RDOP-jbgdncn8 - 0.1.0 + 1 fr.insee INSEE-COMMUN-CL-Booleen-1 - 0.1.0 + 1 Code @@ -4571,14 +4591,14 @@ fr.insee j6p2lwuj-RDOP-jbgdnz6b - 0.1.0 + 1 fr.insee INSEE-COMMUN-CL-Booleen-1 - 0.1.0 + 1 Code @@ -4600,14 +4620,14 @@ fr.insee j6p2lwuj-RDOP-jbgdiva0 - 0.1.0 + 1 fr.insee INSEE-COMMUN-CL-Booleen-1 - 0.1.0 + 1 Code @@ -4629,14 +4649,14 @@ fr.insee j6p2lwuj-RDOP-jbgd7dqf - 0.1.0 + 1 fr.insee INSEE-COMMUN-CL-Booleen-1 - 0.1.0 + 1 Code @@ -4658,14 +4678,14 @@ fr.insee j6p2lwuj-RDOP-jbgdnous - 0.1.0 + 1 fr.insee INSEE-COMMUN-CL-Booleen-1 - 0.1.0 + 1 Code @@ -4687,14 +4707,14 @@ fr.insee j6p2lwuj-RDOP-jbgdkfcz - 0.1.0 + 1 fr.insee INSEE-COMMUN-CL-Booleen-1 - 0.1.0 + 1 Code @@ -4715,21 +4735,21 @@ fr.insee d10 - 0.1.0 + 1 Instruction fr.insee j6qg8rc6 - 0.1.0 + 1 FAVOURITE_CHARACTERS fr.insee j6qg8rc6-QOP-jbgdl5jb - 0.1.0 + 1 FAVOURITE_CHARACTERS11 @@ -4737,7 +4757,7 @@ fr.insee j6qg8rc6-QOP-jbgd8lwo - 0.1.0 + 1 FAVOURITE_CHARACTERS21 @@ -4745,7 +4765,7 @@ fr.insee j6qg8rc6-QOP-jbgdbfag - 0.1.0 + 1 FAVOURITE_CHARACTERS31 @@ -4753,7 +4773,7 @@ fr.insee j6qg8rc6-QOP-jbgdlgja - 0.1.0 + 1 FAVOURITE_CHARACTERS41 @@ -4761,7 +4781,7 @@ fr.insee j6qg8rc6-QOP-jbgd745y - 0.1.0 + 1 FAVOURITE_CHARACTERS51 @@ -4769,7 +4789,7 @@ fr.insee j6qg8rc6-QOP-jbgdjkts - 0.1.0 + 1 FAVOURITE_CHARACTERS61 @@ -4777,7 +4797,7 @@ fr.insee j6qg8rc6-QOP-jbgdcax7 - 0.1.0 + 1 FAVOURITE_CHARACTERS71 @@ -4785,7 +4805,7 @@ fr.insee j6qg8rc6-QOP-jbgdjye1 - 0.1.0 + 1 FAVOURITE_CHARACTERS81 @@ -4793,7 +4813,7 @@ fr.insee j6qg8rc6-QOP-jbgd5jet - 0.1.0 + 1 FAVOURITE_CHARACTERS91 @@ -4801,7 +4821,7 @@ fr.insee j6qg8rc6-QOP-jbgdjw90 - 0.1.0 + 1 FAVOURITE_CHARACTERS101 @@ -4809,7 +4829,7 @@ fr.insee j6qg8rc6-QOP-jbgdfndq - 0.1.0 + 1 FAVOURITE_CHARACTERS12 @@ -4817,7 +4837,7 @@ fr.insee j6qg8rc6-QOP-jbgd7osi - 0.1.0 + 1 FAVOURITE_CHARACTERS22 @@ -4825,7 +4845,7 @@ fr.insee j6qg8rc6-QOP-jbgd7bnw - 0.1.0 + 1 FAVOURITE_CHARACTERS32 @@ -4833,7 +4853,7 @@ fr.insee j6qg8rc6-QOP-jbgd9k71 - 0.1.0 + 1 FAVOURITE_CHARACTERS42 @@ -4841,7 +4861,7 @@ fr.insee j6qg8rc6-QOP-jbgdimks - 0.1.0 + 1 FAVOURITE_CHARACTERS52 @@ -4849,7 +4869,7 @@ fr.insee j6qg8rc6-QOP-jbgdjquz - 0.1.0 + 1 FAVOURITE_CHARACTERS62 @@ -4857,7 +4877,7 @@ fr.insee j6qg8rc6-QOP-jbgdd2w3 - 0.1.0 + 1 FAVOURITE_CHARACTERS72 @@ -4865,7 +4885,7 @@ fr.insee j6qg8rc6-QOP-jbgdkosc - 0.1.0 + 1 FAVOURITE_CHARACTERS82 @@ -4873,7 +4893,7 @@ fr.insee j6qg8rc6-QOP-jbgdk0x4 - 0.1.0 + 1 FAVOURITE_CHARACTERS92 @@ -4881,7 +4901,7 @@ fr.insee j6qg8rc6-QOP-jbgd2wgf - 0.1.0 + 1 FAVOURITE_CHARACTERS102 @@ -4890,13 +4910,13 @@ fr.insee j6qg8rc6-RDOP-jbgdl5jb - 0.1.0 + 1 OutParameter fr.insee j6qg8rc6-QOP-jbgdl5jb - 0.1.0 + 1 OutParameter @@ -4904,13 +4924,13 @@ fr.insee j6qg8rc6-RDOP-jbgd8lwo - 0.1.0 + 1 OutParameter fr.insee j6qg8rc6-QOP-jbgd8lwo - 0.1.0 + 1 OutParameter @@ -4918,13 +4938,13 @@ fr.insee j6qg8rc6-RDOP-jbgdbfag - 0.1.0 + 1 OutParameter fr.insee j6qg8rc6-QOP-jbgdbfag - 0.1.0 + 1 OutParameter @@ -4932,13 +4952,13 @@ fr.insee j6qg8rc6-RDOP-jbgdlgja - 0.1.0 + 1 OutParameter fr.insee j6qg8rc6-QOP-jbgdlgja - 0.1.0 + 1 OutParameter @@ -4946,13 +4966,13 @@ fr.insee j6qg8rc6-RDOP-jbgd745y - 0.1.0 + 1 OutParameter fr.insee j6qg8rc6-QOP-jbgd745y - 0.1.0 + 1 OutParameter @@ -4960,13 +4980,13 @@ fr.insee j6qg8rc6-RDOP-jbgdjkts - 0.1.0 + 1 OutParameter fr.insee j6qg8rc6-QOP-jbgdjkts - 0.1.0 + 1 OutParameter @@ -4974,13 +4994,13 @@ fr.insee j6qg8rc6-RDOP-jbgdcax7 - 0.1.0 + 1 OutParameter fr.insee j6qg8rc6-QOP-jbgdcax7 - 0.1.0 + 1 OutParameter @@ -4988,13 +5008,13 @@ fr.insee j6qg8rc6-RDOP-jbgdjye1 - 0.1.0 + 1 OutParameter fr.insee j6qg8rc6-QOP-jbgdjye1 - 0.1.0 + 1 OutParameter @@ -5002,13 +5022,13 @@ fr.insee j6qg8rc6-RDOP-jbgd5jet - 0.1.0 + 1 OutParameter fr.insee j6qg8rc6-QOP-jbgd5jet - 0.1.0 + 1 OutParameter @@ -5016,13 +5036,13 @@ fr.insee j6qg8rc6-RDOP-jbgdjw90 - 0.1.0 + 1 OutParameter fr.insee j6qg8rc6-QOP-jbgdjw90 - 0.1.0 + 1 OutParameter @@ -5030,13 +5050,13 @@ fr.insee j6qg8rc6-RDOP-jbgdfndq - 0.1.0 + 1 OutParameter fr.insee j6qg8rc6-QOP-jbgdfndq - 0.1.0 + 1 OutParameter @@ -5044,13 +5064,13 @@ fr.insee j6qg8rc6-RDOP-jbgd7osi - 0.1.0 + 1 OutParameter fr.insee j6qg8rc6-QOP-jbgd7osi - 0.1.0 + 1 OutParameter @@ -5058,13 +5078,13 @@ fr.insee j6qg8rc6-RDOP-jbgd7bnw - 0.1.0 + 1 OutParameter fr.insee j6qg8rc6-QOP-jbgd7bnw - 0.1.0 + 1 OutParameter @@ -5072,13 +5092,13 @@ fr.insee j6qg8rc6-RDOP-jbgd9k71 - 0.1.0 + 1 OutParameter fr.insee j6qg8rc6-QOP-jbgd9k71 - 0.1.0 + 1 OutParameter @@ -5086,13 +5106,13 @@ fr.insee j6qg8rc6-RDOP-jbgdimks - 0.1.0 + 1 OutParameter fr.insee j6qg8rc6-QOP-jbgdimks - 0.1.0 + 1 OutParameter @@ -5100,13 +5120,13 @@ fr.insee j6qg8rc6-RDOP-jbgdjquz - 0.1.0 + 1 OutParameter fr.insee j6qg8rc6-QOP-jbgdjquz - 0.1.0 + 1 OutParameter @@ -5114,13 +5134,13 @@ fr.insee j6qg8rc6-RDOP-jbgdd2w3 - 0.1.0 + 1 OutParameter fr.insee j6qg8rc6-QOP-jbgdd2w3 - 0.1.0 + 1 OutParameter @@ -5128,13 +5148,13 @@ fr.insee j6qg8rc6-RDOP-jbgdkosc - 0.1.0 + 1 OutParameter fr.insee j6qg8rc6-QOP-jbgdkosc - 0.1.0 + 1 OutParameter @@ -5142,13 +5162,13 @@ fr.insee j6qg8rc6-RDOP-jbgdk0x4 - 0.1.0 + 1 OutParameter fr.insee j6qg8rc6-QOP-jbgdk0x4 - 0.1.0 + 1 OutParameter @@ -5156,13 +5176,13 @@ fr.insee j6qg8rc6-RDOP-jbgd2wgf - 0.1.0 + 1 OutParameter fr.insee j6qg8rc6-QOP-jbgd2wgf - 0.1.0 + 1 OutParameter @@ -5175,11 +5195,11 @@ - + fr.insee j6qg8rc6-secondDimension-fakeCL-1 - 0.1.0 + 1 CodeList @@ -5190,7 +5210,7 @@ fr.insee j6qg8rc6-RDOP-jbgdl5jb - 0.1.0 + 1 @@ -5206,7 +5226,7 @@ fr.insee j6qg8rc6-RDOP-jbgd8lwo - 0.1.0 + 1 @@ -5222,7 +5242,7 @@ fr.insee j6qg8rc6-RDOP-jbgdbfag - 0.1.0 + 1 @@ -5238,7 +5258,7 @@ fr.insee j6qg8rc6-RDOP-jbgdlgja - 0.1.0 + 1 @@ -5254,7 +5274,7 @@ fr.insee j6qg8rc6-RDOP-jbgd745y - 0.1.0 + 1 @@ -5270,7 +5290,7 @@ fr.insee j6qg8rc6-RDOP-jbgdjkts - 0.1.0 + 1 @@ -5286,7 +5306,7 @@ fr.insee j6qg8rc6-RDOP-jbgdcax7 - 0.1.0 + 1 @@ -5302,7 +5322,7 @@ fr.insee j6qg8rc6-RDOP-jbgdjye1 - 0.1.0 + 1 @@ -5318,7 +5338,7 @@ fr.insee j6qg8rc6-RDOP-jbgd5jet - 0.1.0 + 1 @@ -5334,7 +5354,7 @@ fr.insee j6qg8rc6-RDOP-jbgdjw90 - 0.1.0 + 1 @@ -5355,7 +5375,7 @@ fr.insee j6qg8rc6-RDOP-jbgdfndq - 0.1.0 + 1 @@ -5375,7 +5395,7 @@ fr.insee j6qg8rc6-RDOP-jbgd7osi - 0.1.0 + 1 @@ -5395,7 +5415,7 @@ fr.insee j6qg8rc6-RDOP-jbgd7bnw - 0.1.0 + 1 @@ -5415,7 +5435,7 @@ fr.insee j6qg8rc6-RDOP-jbgd9k71 - 0.1.0 + 1 @@ -5435,7 +5455,7 @@ fr.insee j6qg8rc6-RDOP-jbgdimks - 0.1.0 + 1 @@ -5455,7 +5475,7 @@ fr.insee j6qg8rc6-RDOP-jbgdjquz - 0.1.0 + 1 @@ -5475,7 +5495,7 @@ fr.insee j6qg8rc6-RDOP-jbgdd2w3 - 0.1.0 + 1 @@ -5495,7 +5515,7 @@ fr.insee j6qg8rc6-RDOP-jbgdkosc - 0.1.0 + 1 @@ -5515,7 +5535,7 @@ fr.insee j6qg8rc6-RDOP-jbgdk0x4 - 0.1.0 + 1 @@ -5535,7 +5555,7 @@ fr.insee j6qg8rc6-RDOP-jbgd2wgf - 0.1.0 + 1 @@ -5551,30 +5571,30 @@ fr.insee CategoryScheme-j334iumu - 0.1.0 + 1 TOWN fr.insee - CA-j334iumu--1 - 0.1.0 + CA-j334iumu-1 + 1 Springfield fr.insee - CA-j334iumu-0 - 0.1.0 + CA-j334iumu-2 + 1 Shelbyville fr.insee - CA-j334iumu-1 - 0.1.0 + CA-j334iumu-3 + 1 Seinfeld @@ -5583,38 +5603,38 @@ fr.insee CategoryScheme-j6qdqoen - 0.1.0 + 1 - MAYOR + MAYOR fr.insee - CA-j6qdqoen--1 - 0.1.0 + CA-j6qdqoen-1 + 1 Constance Harm fr.insee - CA-j6qdqoen-0 - 0.1.0 + CA-j6qdqoen-2 + 1 Timothy Lovejoy fr.insee - CA-j6qdqoen-1 - 0.1.0 + CA-j6qdqoen-3 + 1 Joe Quimby fr.insee - CA-j6qdqoen-2 - 0.1.0 + CA-j6qdqoen-4 + 1 Poochie @@ -5623,110 +5643,110 @@ fr.insee CategoryScheme-j4nwo00f - 0.1.0 + 1 State fr.insee - CA-j4nwo00f--1 - 0.1.0 + CA-j4nwo00f-1 + 1 Washington fr.insee - CA-j4nwo00f-0 - 0.1.0 + CA-j4nwo00f-2 + 1 Kentucky fr.insee - CA-j4nwo00f-1 - 0.1.0 + CA-j4nwo00f-3 + 1 Ohio fr.insee - CA-j4nwo00f-2 - 0.1.0 + CA-j4nwo00f-4 + 1 Maine fr.insee - CA-j4nwo00f-3 - 0.1.0 + CA-j4nwo00f-5 + 1 North Dakota fr.insee - CA-j4nwo00f-4 - 0.1.0 + CA-j4nwo00f-6 + 1 Florida fr.insee - CA-j4nwo00f-5 - 0.1.0 + CA-j4nwo00f-7 + 1 North Takoma fr.insee - CA-j4nwo00f-6 - 0.1.0 + CA-j4nwo00f-8 + 1 California fr.insee - CA-j4nwo00f-7 - 0.1.0 + CA-j4nwo00f-9 + 1 Texas fr.insee - CA-j4nwo00f-8 - 0.1.0 + CA-j4nwo00f-10 + 1 Massachusetts fr.insee - CA-j4nwo00f-9 - 0.1.0 + CA-j4nwo00f-11 + 1 Nevada fr.insee - CA-j4nwo00f-10 - 0.1.0 + CA-j4nwo00f-12 + 1 Illinois fr.insee - CA-j4nwo00f-11 - 0.1.0 + CA-j4nwo00f-13 + 1 Not in any state, you fool! @@ -5735,38 +5755,38 @@ fr.insee CategoryScheme-j335cu3c - 0.1.0 + 1 ANIMALS fr.insee - CA-j335cu3c--1 - 0.1.0 + CA-j335cu3c-1 + 1 Santa's Little Helper fr.insee - CA-j335cu3c-0 - 0.1.0 + CA-j335cu3c-2 + 1 Snowball I fr.insee - CA-j335cu3c-1 - 0.1.0 + CA-j335cu3c-3 + 1 Coltrane fr.insee - CA-j335cu3c-2 - 0.1.0 + CA-j335cu3c-4 + 1 Mojo the Helper Monkey @@ -5775,38 +5795,38 @@ fr.insee CategoryScheme-j6p2mvca - 0.1.0 + 1 Flavours fr.insee - CA-j6p2mvca--1 - 0.1.0 + CA-j6p2mvca-1 + 1 Vanilla fr.insee - CA-j6p2mvca-0 - 0.1.0 + CA-j6p2mvca-2 + 1 Strawberry fr.insee - CA-j6p2mvca-1 - 0.1.0 + CA-j6p2mvca-3 + 1 Apple fr.insee - CA-j6p2mvca-2 - 0.1.0 + CA-j6p2mvca-4 + 1 Bacon @@ -5815,22 +5835,22 @@ fr.insee CategoryScheme-jbdxh138 - 0.1.0 + 1 YESNO fr.insee - CA-jbdxh138--1 - 0.1.0 + CA-jbdxh138-1 + 1 Yes fr.insee - CA-jbdxh138-0 - 0.1.0 + CA-jbdxh138-2 + 1 No @@ -5839,38 +5859,38 @@ fr.insee CategoryScheme-j6qeytgc - 0.1.0 + 1 NUCLEAR_CHARACTERS fr.insee - CA-j6qeytgc--1 - 0.1.0 + CA-j6qeytgc-1 + 1 Charles Montgomery Burns fr.insee - CA-j6qeytgc-0 - 0.1.0 + CA-j6qeytgc-2 + 1 Carl Carlson fr.insee - CA-j6qeytgc-1 - 0.1.0 + CA-j6qeytgc-3 + 1 Otto Mann fr.insee - CA-j6qeytgc-2 - 0.1.0 + CA-j6qeytgc-4 + 1 Carl Carlson @@ -5879,46 +5899,46 @@ fr.insee CategoryScheme-j6z087mq - 0.1.0 + 1 BIRTH_CHARACTER fr.insee - CA-j6z087mq--1 - 0.1.0 + CA-j6z087mq-1 + 1 Selma Bouvier fr.insee - CA-j6z087mq-0 - 0.1.0 + CA-j6z087mq-2 + 1 Kent Brockman fr.insee - CA-j6z087mq-1 - 0.1.0 + CA-j6z087mq-3 + 1 Milhouse Van Houten fr.insee - CA-j6z087mq-2 - 0.1.0 + CA-j6z087mq-4 + 1 Nelson Muntz fr.insee - CA-j6z087mq-3 - 0.1.0 + CA-j6z087mq-5 + 1 Crazy Cat Lady @@ -5927,46 +5947,46 @@ fr.insee CategoryScheme-jbdxricm - 0.1.0 + 1 CITY_BIRTH fr.insee - CA-jbdxricm--1 - 0.1.0 + CA-jbdxricm-1 + 1 Albuquerque fr.insee - CA-jbdxricm-0 - 0.1.0 + CA-jbdxricm-2 + 1 Springfield fr.insee - CA-jbdxricm-1 - 0.1.0 + CA-jbdxricm-3 + 1 Portland fr.insee - CA-jbdxricm-2 - 0.1.0 + CA-jbdxricm-4 + 1 Shelbyville fr.insee - CA-jbdxricm-3 - 0.1.0 + CA-jbdxricm-5 + 1 Dagstuhl @@ -5975,86 +5995,86 @@ fr.insee CategoryScheme-j4nwh16i - 0.1.0 + 1 Products fr.insee - CA-j4nwh16i--1 - 0.1.0 + CA-j4nwh16i-1 + 1 Frozen products fr.insee - CA-j4nwh16i-0 - 0.1.0 + CA-j4nwh16i-2 + 1 Ice creams fr.insee - CA-j4nwh16i-1 - 0.1.0 + CA-j4nwh16i-3 + 1 Jasper Beardly fr.insee - CA-j4nwh16i-2 - 0.1.0 + CA-j4nwh16i-4 + 1 Meat fr.insee - CA-j4nwh16i-3 - 0.1.0 + CA-j4nwh16i-5 + 1 Bacon fr.insee - CA-j4nwh16i-4 - 0.1.0 + CA-j4nwh16i-6 + 1 Pork chop fr.insee - CA-j4nwh16i-5 - 0.1.0 + CA-j4nwh16i-7 + 1 Chicken fr.insee - CA-j4nwh16i-6 - 0.1.0 + CA-j4nwh16i-8 + 1 Compote fr.insee - CA-j4nwh16i-7 - 0.1.0 + CA-j4nwh16i-9 + 1 Powersauce fr.insee - CA-j4nwh16i-8 - 0.1.0 + CA-j4nwh16i-10 + 1 Other @@ -6063,38 +6083,38 @@ fr.insee CategoryScheme-j77dav9b - 0.1.0 + 1 Clownings fr.insee - CA-j77dav9b--1 - 0.1.0 + CA-j77dav9b-1 + 1 Break the windows of the whole city fr.insee - CA-j77dav9b-0 - 0.1.0 + CA-j77dav9b-2 + 1 Loose the violin of his daughter playing poker fr.insee - CA-j77dav9b-1 - 0.1.0 + CA-j77dav9b-3 + 1 Kill Mr Burns fr.insee - CA-j77dav9b-2 - 0.1.0 + CA-j77dav9b-4 + 1 Leaving a mechanical object to control the nuclear power plant @@ -6103,38 +6123,38 @@ fr.insee CategoryScheme-jbdyh6b5 - 0.1.0 + 1 Clowning_Characters fr.insee - CA-jbdyh6b5--1 - 0.1.0 + CA-jbdyh6b5-1 + 1 Jay fr.insee - CA-jbdyh6b5-0 - 0.1.0 + CA-jbdyh6b5-2 + 1 Bart fr.insee - CA-jbdyh6b5-1 - 0.1.0 + CA-jbdyh6b5-3 + 1 Krusty the clown fr.insee - CA-jbdyh6b5-2 - 0.1.0 + CA-jbdyh6b5-4 + 1 Maggie @@ -6143,38 +6163,38 @@ fr.insee CategoryScheme-j6p2kivg - 0.1.0 + 1 Means of transport fr.insee - CA-j6p2kivg--1 - 0.1.0 + CA-j6p2kivg-1 + 1 Car fr.insee - CA-j6p2kivg-0 - 0.1.0 + CA-j6p2kivg-2 + 1 Bike fr.insee - CA-j6p2kivg-1 - 0.1.0 + CA-j6p2kivg-3 + 1 Skateboard fr.insee - CA-j6p2kivg-2 - 0.1.0 + CA-j6p2kivg-4 + 1 Plane @@ -6183,54 +6203,54 @@ fr.insee CategoryScheme-jbdye1wa - 0.1.0 + 1 Country fr.insee - CA-jbdye1wa--1 - 0.1.0 + CA-jbdye1wa-1 + 1 Brazil fr.insee - CA-jbdye1wa-0 - 0.1.0 + CA-jbdye1wa-2 + 1 Canada fr.insee - CA-jbdye1wa-1 - 0.1.0 + CA-jbdye1wa-3 + 1 Japan fr.insee - CA-jbdye1wa-2 - 0.1.0 + CA-jbdye1wa-4 + 1 France fr.insee - CA-jbdye1wa-3 - 0.1.0 + CA-jbdye1wa-5 + 1 Other country fr.insee - CA-jbdye1wa-4 - 0.1.0 + CA-jbdye1wa-6 + 1 Other planet @@ -6239,14 +6259,14 @@ fr.insee CategoryScheme-j4nwc63q-secondDimension-fakeCL-1 - 0.1.0 + 1 FAKE-CODELIST-j4nwc63q-secondDimension-fakeCL-1 fr.insee - CA-j4nwc63q-secondDimension-fakeCL-1--1 - 0.1.0 + CA-j4nwc63q-secondDimension-fakeCL-1-1 + 1 Percentage @@ -6255,22 +6275,22 @@ fr.insee CategoryScheme-j4nw0rr6-secondDimension-fakeCL-1 - 0.1.0 + 1 FAKE-CODELIST-j4nw0rr6-secondDimension-fakeCL-1 fr.insee - CA-j4nw0rr6-secondDimension-fakeCL-1--1 - 0.1.0 + CA-j4nw0rr6-secondDimension-fakeCL-1-1 + 1 Clowning fr.insee - CA-j4nw0rr6-secondDimension-fakeCL-1-0 - 0.1.0 + CA-j4nw0rr6-secondDimension-fakeCL-1-2 + 1 Remember? @@ -6279,22 +6299,22 @@ fr.insee CategoryScheme-j6qg8rc6-secondDimension-fakeCL-1 - 0.1.0 + 1 FAKE-CODELIST-j6qg8rc6-secondDimension-fakeCL-1 fr.insee - CA-j6qg8rc6-secondDimension-fakeCL-1--1 - 0.1.0 + CA-j6qg8rc6-secondDimension-fakeCL-1-1 + 1 Name fr.insee - CA-j6qg8rc6-secondDimension-fakeCL-1-0 - 0.1.0 + CA-j6qg8rc6-secondDimension-fakeCL-1-2 + 1 Age @@ -6302,15 +6322,15 @@ fr.insee - CategoryScheme-i6vwid - 0.1.0 + CategoryScheme-i6vwi0 + 1 A définir fr.insee INSEE-COMMUN-CA-Booleen-1 - 0.1.0 + 1 @@ -6319,14 +6339,14 @@ fr.insee SIMPSONS-CLS - 0.1.0 + 1 SIMPSONS fr.insee j334iumu - 0.1.0 + 1 TOWN @@ -6336,36 +6356,36 @@ fr.insee - j334iumu--1 - 0.1.0 + j334iumu-1 + 1 fr.insee - CA-j334iumu--1 - 0.1.0 + CA-j334iumu-1 + 1 Category 00001 fr.insee - j334iumu-0 - 0.1.0 + j334iumu-2 + 1 fr.insee - CA-j334iumu-0 - 0.1.0 + CA-j334iumu-2 + 1 Category 00002 fr.insee - j334iumu-1 - 0.1.0 + j334iumu-3 + 1 fr.insee - CA-j334iumu-1 - 0.1.0 + CA-j334iumu-3 + 1 Category 00003 @@ -6374,9 +6394,9 @@ fr.insee j6qdqoen - 0.1.0 + 1 - MAYOR + MAYOR Regular @@ -6384,48 +6404,48 @@ fr.insee - j6qdqoen--1 - 0.1.0 + j6qdqoen-1 + 1 fr.insee - CA-j6qdqoen--1 - 0.1.0 + CA-j6qdqoen-1 + 1 Category 1 fr.insee - j6qdqoen-0 - 0.1.0 + j6qdqoen-2 + 1 fr.insee - CA-j6qdqoen-0 - 0.1.0 + CA-j6qdqoen-2 + 1 Category 2 fr.insee - j6qdqoen-1 - 0.1.0 + j6qdqoen-3 + 1 fr.insee - CA-j6qdqoen-1 - 0.1.0 + CA-j6qdqoen-3 + 1 Category 3 fr.insee - j6qdqoen-2 - 0.1.0 + j6qdqoen-4 + 1 fr.insee - CA-j6qdqoen-2 - 0.1.0 + CA-j6qdqoen-4 + 1 Category 4 @@ -6434,7 +6454,7 @@ fr.insee j4nwo00f - 0.1.0 + 1 State @@ -6444,156 +6464,156 @@ fr.insee - j4nwo00f--1 - 0.1.0 + j4nwo00f-1 + 1 fr.insee - CA-j4nwo00f--1 - 0.1.0 + CA-j4nwo00f-1 + 1 Category 1 fr.insee - j4nwo00f-0 - 0.1.0 + j4nwo00f-2 + 1 fr.insee - CA-j4nwo00f-0 - 0.1.0 + CA-j4nwo00f-2 + 1 Category 2 fr.insee - j4nwo00f-1 - 0.1.0 + j4nwo00f-3 + 1 fr.insee - CA-j4nwo00f-1 - 0.1.0 + CA-j4nwo00f-3 + 1 Category 3 fr.insee - j4nwo00f-2 - 0.1.0 + j4nwo00f-4 + 1 fr.insee - CA-j4nwo00f-2 - 0.1.0 + CA-j4nwo00f-4 + 1 Category 4 fr.insee - j4nwo00f-3 - 0.1.0 + j4nwo00f-5 + 1 fr.insee - CA-j4nwo00f-3 - 0.1.0 + CA-j4nwo00f-5 + 1 Category 5 fr.insee - j4nwo00f-4 - 0.1.0 + j4nwo00f-6 + 1 fr.insee - CA-j4nwo00f-4 - 0.1.0 + CA-j4nwo00f-6 + 1 Category 6 fr.insee - j4nwo00f-5 - 0.1.0 + j4nwo00f-7 + 1 fr.insee - CA-j4nwo00f-5 - 0.1.0 + CA-j4nwo00f-7 + 1 Category 7 fr.insee - j4nwo00f-6 - 0.1.0 + j4nwo00f-8 + 1 fr.insee - CA-j4nwo00f-6 - 0.1.0 + CA-j4nwo00f-8 + 1 Category 8 fr.insee - j4nwo00f-7 - 0.1.0 + j4nwo00f-9 + 1 fr.insee - CA-j4nwo00f-7 - 0.1.0 + CA-j4nwo00f-9 + 1 Category 9 fr.insee - j4nwo00f-8 - 0.1.0 + j4nwo00f-10 + 1 fr.insee - CA-j4nwo00f-8 - 0.1.0 + CA-j4nwo00f-10 + 1 Category 10 fr.insee - j4nwo00f-9 - 0.1.0 + j4nwo00f-11 + 1 fr.insee - CA-j4nwo00f-9 - 0.1.0 + CA-j4nwo00f-11 + 1 Category 11 fr.insee - j4nwo00f-10 - 0.1.0 + j4nwo00f-12 + 1 fr.insee - CA-j4nwo00f-10 - 0.1.0 + CA-j4nwo00f-12 + 1 Category 12 fr.insee - j4nwo00f-11 - 0.1.0 + j4nwo00f-13 + 1 fr.insee - CA-j4nwo00f-11 - 0.1.0 + CA-j4nwo00f-13 + 1 Category 13 @@ -6602,7 +6622,7 @@ fr.insee j335cu3c - 0.1.0 + 1 ANIMALS @@ -6612,48 +6632,48 @@ fr.insee - j335cu3c--1 - 0.1.0 + j335cu3c-1 + 1 fr.insee - CA-j335cu3c--1 - 0.1.0 + CA-j335cu3c-1 + 1 Category 1 fr.insee - j335cu3c-0 - 0.1.0 + j335cu3c-2 + 1 fr.insee - CA-j335cu3c-0 - 0.1.0 + CA-j335cu3c-2 + 1 Category 2 fr.insee - j335cu3c-1 - 0.1.0 + j335cu3c-3 + 1 fr.insee - CA-j335cu3c-1 - 0.1.0 + CA-j335cu3c-3 + 1 Category 3 fr.insee - j335cu3c-2 - 0.1.0 + j335cu3c-4 + 1 fr.insee - CA-j335cu3c-2 - 0.1.0 + CA-j335cu3c-4 + 1 Category 4 @@ -6662,7 +6682,7 @@ fr.insee j6p2mvca - 0.1.0 + 1 Flavours @@ -6672,48 +6692,48 @@ fr.insee - j6p2mvca--1 - 0.1.0 + j6p2mvca-1 + 1 fr.insee - CA-j6p2mvca--1 - 0.1.0 + CA-j6p2mvca-1 + 1 Category 1 fr.insee - j6p2mvca-0 - 0.1.0 + j6p2mvca-2 + 1 fr.insee - CA-j6p2mvca-0 - 0.1.0 + CA-j6p2mvca-2 + 1 Category 2 fr.insee - j6p2mvca-1 - 0.1.0 + j6p2mvca-3 + 1 fr.insee - CA-j6p2mvca-1 - 0.1.0 + CA-j6p2mvca-3 + 1 Category 3 fr.insee - j6p2mvca-2 - 0.1.0 + j6p2mvca-4 + 1 fr.insee - CA-j6p2mvca-2 - 0.1.0 + CA-j6p2mvca-4 + 1 Category 4 @@ -6722,7 +6742,7 @@ fr.insee jbdxh138 - 0.1.0 + 1 YESNO @@ -6732,24 +6752,24 @@ fr.insee - jbdxh138--1 - 0.1.0 + jbdxh138-1 + 1 fr.insee - CA-jbdxh138--1 - 0.1.0 + CA-jbdxh138-1 + 1 Category 1 fr.insee - jbdxh138-0 - 0.1.0 + jbdxh138-2 + 1 fr.insee - CA-jbdxh138-0 - 0.1.0 + CA-jbdxh138-2 + 1 Category 0 @@ -6758,7 +6778,7 @@ fr.insee j6qeytgc - 0.1.0 + 1 NUCLEAR_CHARACTERS @@ -6768,48 +6788,48 @@ fr.insee - j6qeytgc--1 - 0.1.0 + j6qeytgc-1 + 1 fr.insee - CA-j6qeytgc--1 - 0.1.0 + CA-j6qeytgc-1 + 1 Category 1 fr.insee - j6qeytgc-0 - 0.1.0 + j6qeytgc-2 + 1 fr.insee - CA-j6qeytgc-0 - 0.1.0 + CA-j6qeytgc-2 + 1 Category 2 fr.insee - j6qeytgc-1 - 0.1.0 + j6qeytgc-3 + 1 fr.insee - CA-j6qeytgc-1 - 0.1.0 + CA-j6qeytgc-3 + 1 Category 3 fr.insee - j6qeytgc-2 - 0.1.0 + j6qeytgc-4 + 1 fr.insee - CA-j6qeytgc-2 - 0.1.0 + CA-j6qeytgc-4 + 1 Category 4 @@ -6818,7 +6838,7 @@ fr.insee j6z087mq - 0.1.0 + 1 BIRTH_CHARACTER @@ -6828,60 +6848,60 @@ fr.insee - j6z087mq--1 - 0.1.0 + j6z087mq-1 + 1 fr.insee - CA-j6z087mq--1 - 0.1.0 + CA-j6z087mq-1 + 1 Category 1 fr.insee - j6z087mq-0 - 0.1.0 + j6z087mq-2 + 1 fr.insee - CA-j6z087mq-0 - 0.1.0 + CA-j6z087mq-2 + 1 Category 2 fr.insee - j6z087mq-1 - 0.1.0 + j6z087mq-3 + 1 fr.insee - CA-j6z087mq-1 - 0.1.0 + CA-j6z087mq-3 + 1 Category 3 fr.insee - j6z087mq-2 - 0.1.0 + j6z087mq-4 + 1 fr.insee - CA-j6z087mq-2 - 0.1.0 + CA-j6z087mq-4 + 1 Category 4 fr.insee - j6z087mq-3 - 0.1.0 + j6z087mq-5 + 1 fr.insee - CA-j6z087mq-3 - 0.1.0 + CA-j6z087mq-5 + 1 Category 5 @@ -6890,7 +6910,7 @@ fr.insee jbdxricm - 0.1.0 + 1 CITY_BIRTH @@ -6900,60 +6920,60 @@ fr.insee - jbdxricm--1 - 0.1.0 + jbdxricm-1 + 1 fr.insee - CA-jbdxricm--1 - 0.1.0 + CA-jbdxricm-1 + 1 Category 1 fr.insee - jbdxricm-0 - 0.1.0 + jbdxricm-2 + 1 fr.insee - CA-jbdxricm-0 - 0.1.0 + CA-jbdxricm-2 + 1 Category 2 fr.insee - jbdxricm-1 - 0.1.0 + jbdxricm-3 + 1 fr.insee - CA-jbdxricm-1 - 0.1.0 + CA-jbdxricm-3 + 1 Category 3 fr.insee - jbdxricm-2 - 0.1.0 + jbdxricm-4 + 1 fr.insee - CA-jbdxricm-2 - 0.1.0 + CA-jbdxricm-4 + 1 Category 4 fr.insee - jbdxricm-3 - 0.1.0 + jbdxricm-5 + 1 fr.insee - CA-jbdxricm-3 - 0.1.0 + CA-jbdxricm-5 + 1 Category 5 @@ -6962,7 +6982,7 @@ fr.insee j4nwh16i - 0.1.0 + 1 Products @@ -6972,35 +6992,35 @@ fr.insee - j4nwh16i--1 - 0.1.0 + j4nwh16i-1 + 1 fr.insee - CA-j4nwh16i--1 - 0.1.0 + CA-j4nwh16i-1 + 1 Category A fr.insee - j4nwh16i-0 - 0.1.0 + j4nwh16i-2 + 1 fr.insee - CA-j4nwh16i-0 - 0.1.0 + CA-j4nwh16i-2 + 1 Category A1 fr.insee - j4nwh16i-1 - 0.1.0 + j4nwh16i-3 + 1 fr.insee - CA-j4nwh16i-1 - 0.1.0 + CA-j4nwh16i-3 + 1 Category A2 @@ -7008,47 +7028,47 @@ fr.insee - j4nwh16i-2 - 0.1.0 + j4nwh16i-4 + 1 fr.insee - CA-j4nwh16i-2 - 0.1.0 + CA-j4nwh16i-4 + 1 Category B fr.insee - j4nwh16i-3 - 0.1.0 + j4nwh16i-5 + 1 fr.insee - CA-j4nwh16i-3 - 0.1.0 + CA-j4nwh16i-5 + 1 Category B1 fr.insee - j4nwh16i-4 - 0.1.0 + j4nwh16i-6 + 1 fr.insee - CA-j4nwh16i-4 - 0.1.0 + CA-j4nwh16i-6 + 1 Category B2 fr.insee - j4nwh16i-5 - 0.1.0 + j4nwh16i-7 + 1 fr.insee - CA-j4nwh16i-5 - 0.1.0 + CA-j4nwh16i-7 + 1 Category B3 @@ -7056,23 +7076,23 @@ fr.insee - j4nwh16i-6 - 0.1.0 + j4nwh16i-8 + 1 fr.insee - CA-j4nwh16i-6 - 0.1.0 + CA-j4nwh16i-8 + 1 Category C fr.insee - j4nwh16i-7 - 0.1.0 + j4nwh16i-9 + 1 fr.insee - CA-j4nwh16i-7 - 0.1.0 + CA-j4nwh16i-9 + 1 Category C1 @@ -7080,12 +7100,12 @@ fr.insee - j4nwh16i-8 - 0.1.0 + j4nwh16i-10 + 1 fr.insee - CA-j4nwh16i-8 - 0.1.0 + CA-j4nwh16i-10 + 1 Category D @@ -7094,7 +7114,7 @@ fr.insee j77dav9b - 0.1.0 + 1 Clownings @@ -7104,48 +7124,48 @@ fr.insee - j77dav9b--1 - 0.1.0 + j77dav9b-1 + 1 fr.insee - CA-j77dav9b--1 - 0.1.0 + CA-j77dav9b-1 + 1 Category 1 fr.insee - j77dav9b-0 - 0.1.0 + j77dav9b-2 + 1 fr.insee - CA-j77dav9b-0 - 0.1.0 + CA-j77dav9b-2 + 1 Category 2 fr.insee - j77dav9b-1 - 0.1.0 + j77dav9b-3 + 1 fr.insee - CA-j77dav9b-1 - 0.1.0 + CA-j77dav9b-3 + 1 Category 3 fr.insee - j77dav9b-2 - 0.1.0 + j77dav9b-4 + 1 fr.insee - CA-j77dav9b-2 - 0.1.0 + CA-j77dav9b-4 + 1 Category 4 @@ -7154,7 +7174,7 @@ fr.insee jbdyh6b5 - 0.1.0 + 1 Clowning_Characters @@ -7164,48 +7184,48 @@ fr.insee - jbdyh6b5--1 - 0.1.0 + jbdyh6b5-1 + 1 fr.insee - CA-jbdyh6b5--1 - 0.1.0 + CA-jbdyh6b5-1 + 1 Category 1 fr.insee - jbdyh6b5-0 - 0.1.0 + jbdyh6b5-2 + 1 fr.insee - CA-jbdyh6b5-0 - 0.1.0 + CA-jbdyh6b5-2 + 1 Category 2 fr.insee - jbdyh6b5-1 - 0.1.0 + jbdyh6b5-3 + 1 fr.insee - CA-jbdyh6b5-1 - 0.1.0 + CA-jbdyh6b5-3 + 1 Category 3 fr.insee - jbdyh6b5-2 - 0.1.0 + jbdyh6b5-4 + 1 fr.insee - CA-jbdyh6b5-2 - 0.1.0 + CA-jbdyh6b5-4 + 1 Category 4 @@ -7214,7 +7234,7 @@ fr.insee j6p2kivg - 0.1.0 + 1 Means of transport @@ -7224,48 +7244,48 @@ fr.insee - j6p2kivg--1 - 0.1.0 + j6p2kivg-1 + 1 fr.insee - CA-j6p2kivg--1 - 0.1.0 + CA-j6p2kivg-1 + 1 Category 1 fr.insee - j6p2kivg-0 - 0.1.0 + j6p2kivg-2 + 1 fr.insee - CA-j6p2kivg-0 - 0.1.0 + CA-j6p2kivg-2 + 1 Category 2 fr.insee - j6p2kivg-1 - 0.1.0 + j6p2kivg-3 + 1 fr.insee - CA-j6p2kivg-1 - 0.1.0 + CA-j6p2kivg-3 + 1 Category 3 fr.insee - j6p2kivg-2 - 0.1.0 + j6p2kivg-4 + 1 fr.insee - CA-j6p2kivg-2 - 0.1.0 + CA-j6p2kivg-4 + 1 Category 4 @@ -7274,7 +7294,7 @@ fr.insee jbdye1wa - 0.1.0 + 1 Country @@ -7284,72 +7304,72 @@ fr.insee - jbdye1wa--1 - 0.1.0 + jbdye1wa-1 + 1 fr.insee - CA-jbdye1wa--1 - 0.1.0 + CA-jbdye1wa-1 + 1 Category 1 fr.insee - jbdye1wa-0 - 0.1.0 + jbdye1wa-2 + 1 fr.insee - CA-jbdye1wa-0 - 0.1.0 + CA-jbdye1wa-2 + 1 Category 2 fr.insee - jbdye1wa-1 - 0.1.0 + jbdye1wa-3 + 1 fr.insee - CA-jbdye1wa-1 - 0.1.0 + CA-jbdye1wa-3 + 1 Category 3 fr.insee - jbdye1wa-2 - 0.1.0 + jbdye1wa-4 + 1 fr.insee - CA-jbdye1wa-2 - 0.1.0 + CA-jbdye1wa-4 + 1 Category 4 fr.insee - jbdye1wa-3 - 0.1.0 + jbdye1wa-5 + 1 fr.insee - CA-jbdye1wa-3 - 0.1.0 + CA-jbdye1wa-5 + 1 Category 5 fr.insee - jbdye1wa-4 - 0.1.0 + jbdye1wa-6 + 1 fr.insee - CA-jbdye1wa-4 - 0.1.0 + CA-jbdye1wa-6 + 1 Category 6 @@ -7358,7 +7378,7 @@ fr.insee j4nwc63q-secondDimension-fakeCL-1 - 0.1.0 + 1 FAKE-CODELIST-j4nwc63q-secondDimension-fakeCL-1 @@ -7368,12 +7388,12 @@ fr.insee - j4nwc63q-secondDimension-fakeCL-1--1 - 0.1.0 + j4nwc63q-secondDimension-fakeCL-1-1 + 1 fr.insee - CA-j4nwc63q-secondDimension-fakeCL-1--1 - 0.1.0 + CA-j4nwc63q-secondDimension-fakeCL-1-1 + 1 Category 1 @@ -7382,7 +7402,7 @@ fr.insee j4nw0rr6-secondDimension-fakeCL-1 - 0.1.0 + 1 FAKE-CODELIST-j4nw0rr6-secondDimension-fakeCL-1 @@ -7392,24 +7412,24 @@ fr.insee - j4nw0rr6-secondDimension-fakeCL-1--1 - 0.1.0 + j4nw0rr6-secondDimension-fakeCL-1-1 + 1 fr.insee - CA-j4nw0rr6-secondDimension-fakeCL-1--1 - 0.1.0 + CA-j4nw0rr6-secondDimension-fakeCL-1-1 + 1 Category 1 fr.insee - j4nw0rr6-secondDimension-fakeCL-1-0 - 0.1.0 + j4nw0rr6-secondDimension-fakeCL-1-2 + 1 fr.insee - CA-j4nw0rr6-secondDimension-fakeCL-1-0 - 0.1.0 + CA-j4nw0rr6-secondDimension-fakeCL-1-2 + 1 Category 2 @@ -7418,7 +7438,7 @@ fr.insee j6qg8rc6-secondDimension-fakeCL-1 - 0.1.0 + 1 FAKE-CODELIST-j6qg8rc6-secondDimension-fakeCL-1 @@ -7428,24 +7448,24 @@ fr.insee - j6qg8rc6-secondDimension-fakeCL-1--1 - 0.1.0 + j6qg8rc6-secondDimension-fakeCL-1-1 + 1 fr.insee - CA-j6qg8rc6-secondDimension-fakeCL-1--1 - 0.1.0 + CA-j6qg8rc6-secondDimension-fakeCL-1-1 + 1 Category 1 fr.insee - j6qg8rc6-secondDimension-fakeCL-1-0 - 0.1.0 + j6qg8rc6-secondDimension-fakeCL-1-2 + 1 fr.insee - CA-j6qg8rc6-secondDimension-fakeCL-1-0 - 0.1.0 + CA-j6qg8rc6-secondDimension-fakeCL-1-2 + 1 Category 2 @@ -7454,7 +7474,7 @@ fr.insee INSEE-COMMUN-CL-Booleen - 0.1.0 + 1 Booleen @@ -7465,11 +7485,11 @@ fr.insee INSEE-COMMUN-CL-Booleen-1 - 0.1.0 + 1 fr.insee INSEE-COMMUN-CA-Booleen-1 - 0.1.0 + 1 Category 1 @@ -7478,231 +7498,348 @@ fr.insee - VariableScheme-i6vwid - 0.1.0 + VariableScheme-i6vwi0 + 1 Variable Scheme for the survey + + fr.insee + jbcggtca + 1 + + SUM_EXPENSES + + + SUM_EXPENSES label + + + fr.insee + jbcggtca-VROP + 1 + + + + fr.insee + jbcggtca-GI + 1 + GenerationInstruction + + + fr.insee + jbcggtca-GOP + 1 + OutParameter + + + fr.insee + jbcggtca-VROP + 1 + OutParameter + + + + + + + + fr.insee + jbcggtex + 1 + + LAST_BROADCAST + + + LAST_BROADCAST label + + fr.insee jbcgfvir - 0.1.0 + 1 COMMENT - COMMENT label + COMMENT label fr.insee j6p3dkx6-QOP-jbgdhaht - 0.1.0 + 1 OutParameter fr.insee j6p3dkx6 - 0.1.0 + 1 QuestionItem - + + + fr.insee jbcgm0ip - 0.1.0 + 1 READY - READY label + READY label fr.insee j6p0np9q-QOP-jbgd3set - 0.1.0 + 1 OutParameter fr.insee j6p0np9q - 0.1.0 + 1 QuestionItem - + + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 1 + Code + + + + + fr.insee jbcgf11f - 0.1.0 + 1 PRODUCER - PRODUCER label + PRODUCER label fr.insee j3343qhx-QOP-jbgd90cy - 0.1.0 + 1 OutParameter fr.insee j3343qhx - 0.1.0 + 1 QuestionItem - + + + fr.insee jbcgcy2x - 0.1.0 + 1 SEASON_NUMBER - SEASON_NUMBER label + SEASON_NUMBER label fr.insee j6q9h8tj-QOP-jbgdjy8h - 0.1.0 + 1 OutParameter fr.insee j6q9h8tj - 0.1.0 + 1 QuestionItem - + + + + 0 + 99 + + Decimal + + fr.insee jbcgbg33 - 0.1.0 + 1 DATEFIRST - DATEFIRST label + DATEFIRST label fr.insee j334cyqb-QOP-jbgdih2z - 0.1.0 + 1 OutParameter fr.insee j334cyqb - 0.1.0 + 1 QuestionItem - + + + fr.insee + INSEE-COMMUN-MNR-DateTimedate-YYYY-MM-DD + 1 + ManagedDateTimeRepresentation + + fr.insee jbcgieyw - 0.1.0 + 1 AUDIENCE_SHARE - AUDIENCE_SHARE label + AUDIENCE_SHARE label fr.insee j6z06z1e-QOP-jbgddnrd - 0.1.0 + 1 OutParameter fr.insee j6z06z1e - 0.1.0 + 1 QuestionItem - + + + + 0 + 99 + + Decimal + + fr.insee jbcgasbh - 0.1.0 + 1 CITY - CITY label + CITY label fr.insee j3343clt-QOP-jbgdjdkn - 0.1.0 + 1 OutParameter fr.insee j3343clt - 0.1.0 + 1 QuestionItem - + + + + fr.insee + j334iumu + 1 + CodeList + + + fr.insee jbcg9yr6 - 0.1.0 + 1 MAYOR - MAYOR label + MAYOR label fr.insee j6qdfhvw-QOP-jbgd8ghp - 0.1.0 + 1 OutParameter fr.insee j6qdfhvw - 0.1.0 + 1 QuestionItem - + + + + fr.insee + j6qdqoen + 1 + CodeList + + + fr.insee jbcgpija - 0.1.0 + 1 STATE - STATE label + STATE label fr.insee j4nw5cqz-QOP-jbgdkd7v - 0.1.0 + 1 OutParameter fr.insee j4nw5cqz - 0.1.0 + 1 QuestionItem - + + + + fr.insee + j4nwo00f + 1 + CodeList + + + fr.insee jbdxewlq - 0.1.0 + 1 PET1 @@ -7712,21 +7849,34 @@ fr.insee j334akov-QOP-jbgd8qmn - 0.1.0 + 1 OutParameter fr.insee j334akov - 0.1.0 + 1 QuestionGrid - + + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 1 + Code + + + + + fr.insee jbdxjmst - 0.1.0 + 1 PET2 @@ -7736,21 +7886,34 @@ fr.insee j334akov-QOP-jbgd60vl - 0.1.0 + 1 OutParameter fr.insee j334akov - 0.1.0 + 1 QuestionGrid - + + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 1 + Code + + + + + fr.insee jbdxjuay - 0.1.0 + 1 PET3 @@ -7760,21 +7923,34 @@ fr.insee j334akov-QOP-jbgda2jo - 0.1.0 + 1 OutParameter fr.insee j334akov - 0.1.0 + 1 QuestionGrid - + + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 1 + Code + + + + + fr.insee jbdxniuw - 0.1.0 + 1 PET4 @@ -7784,21 +7960,34 @@ fr.insee j334akov-QOP-jbgdfssy - 0.1.0 + 1 OutParameter fr.insee j334akov - 0.1.0 + 1 QuestionGrid - + + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 1 + Code + + + + + fr.insee jbdxtl1d - 0.1.0 + 1 ICE_FLAVOUR1 @@ -7808,21 +7997,30 @@ fr.insee j6p29i81-QOP-jbgdb3jx - 0.1.0 + 1 OutParameter fr.insee j6p29i81 - 0.1.0 + 1 QuestionGrid - + + + + fr.insee + jbdxh138 + 1 + CodeList + + + fr.insee jbdxvai9 - 0.1.0 + 1 ICE_FLAVOUR2 @@ -7832,21 +8030,30 @@ fr.insee j6p29i81-QOP-jbgdb61k - 0.1.0 + 1 OutParameter fr.insee j6p29i81 - 0.1.0 + 1 QuestionGrid - + + + + fr.insee + jbdxh138 + 1 + CodeList + + + fr.insee jbdxpltw - 0.1.0 + 1 ICE_FLAVOUR3 @@ -7856,21 +8063,30 @@ fr.insee j6p29i81-QOP-jbgdl3kc - 0.1.0 + 1 OutParameter fr.insee j6p29i81 - 0.1.0 + 1 QuestionGrid - + + + + fr.insee + jbdxh138 + 1 + CodeList + + + fr.insee jbdxzx2x - 0.1.0 + 1 ICE_FLAVOUR4 @@ -7880,21 +8096,30 @@ fr.insee j6p29i81-QOP-jbgdcobo - 0.1.0 + 1 OutParameter fr.insee j6p29i81 - 0.1.0 + 1 QuestionGrid - + + + + fr.insee + jbdxh138 + 1 + CodeList + + + fr.insee jbdy4nhp - 0.1.0 + 1 NUCLEAR_CHARACTER1 @@ -7904,21 +8129,30 @@ fr.insee j6qefnga-QOP-jbgd6p0k - 0.1.0 + 1 OutParameter fr.insee j6qefnga - 0.1.0 + 1 QuestionGrid - + + + + fr.insee + jbdxh138 + 1 + CodeList + + + fr.insee jbdxtanu - 0.1.0 + 1 NUCLEAR_CHARACTER2 @@ -7928,21 +8162,30 @@ fr.insee j6qefnga-QOP-jbgd9ato - 0.1.0 + 1 OutParameter fr.insee j6qefnga - 0.1.0 + 1 QuestionGrid - + + + + fr.insee + jbdxh138 + 1 + CodeList + + + fr.insee jbdy25if - 0.1.0 + 1 NUCLEAR_CHARACTER3 @@ -7952,21 +8195,30 @@ fr.insee j6qefnga-QOP-jbgd3e0p - 0.1.0 + 1 OutParameter fr.insee j6qefnga - 0.1.0 + 1 QuestionGrid - + + + + fr.insee + jbdxh138 + 1 + CodeList + + + fr.insee jbdxvta8 - 0.1.0 + 1 NUCLEAR_CHARACTER4 @@ -7976,21 +8228,30 @@ fr.insee j6qefnga-QOP-jbgdkxne - 0.1.0 + 1 OutParameter fr.insee j6qefnga - 0.1.0 + 1 QuestionGrid - + + + + fr.insee + jbdxh138 + 1 + CodeList + + + fr.insee jbdy3nh7 - 0.1.0 + 1 BIRTH_CHARACTER1 @@ -8000,21 +8261,30 @@ fr.insee j6yzoc6g-QOP-jbgd7fr6 - 0.1.0 + 1 OutParameter fr.insee j6yzoc6g - 0.1.0 + 1 QuestionGrid - + + + + fr.insee + jbdxricm + 1 + CodeList + + + fr.insee jbdy6lk3 - 0.1.0 + 1 BIRTH_CHARACTER2 @@ -8024,21 +8294,30 @@ fr.insee j6yzoc6g-QOP-jbgd5e9f - 0.1.0 + 1 OutParameter fr.insee j6yzoc6g - 0.1.0 + 1 QuestionGrid - + + + + fr.insee + jbdxricm + 1 + CodeList + + + fr.insee jbdxsby0 - 0.1.0 + 1 BIRTH_CHARACTER3 @@ -8048,21 +8327,30 @@ fr.insee j6yzoc6g-QOP-jbgd912x - 0.1.0 + 1 OutParameter fr.insee j6yzoc6g - 0.1.0 + 1 QuestionGrid - + + + + fr.insee + jbdxricm + 1 + CodeList + + + fr.insee jbdy7sra - 0.1.0 + 1 BIRTH_CHARACTER4 @@ -8072,21 +8360,30 @@ fr.insee j6yzoc6g-QOP-jbgd6bdy - 0.1.0 + 1 OutParameter fr.insee j6yzoc6g - 0.1.0 + 1 QuestionGrid - + + + + fr.insee + jbdxricm + 1 + CodeList + + + fr.insee jbdy2wyl - 0.1.0 + 1 BIRTH_CHARACTER5 @@ -8096,21 +8393,30 @@ fr.insee j6yzoc6g-QOP-jbgddyry - 0.1.0 + 1 OutParameter fr.insee j6yzoc6g - 0.1.0 + 1 QuestionGrid - + + + + fr.insee + jbdxricm + 1 + CodeList + + + fr.insee jbgdnfk7 - 0.1.0 + 1 PERCENTAGE_EXPENSES11 @@ -8120,28 +8426,30 @@ fr.insee j4nwc63q-QOP-jbgde5yl - 0.1.0 + 1 OutParameter fr.insee j4nwc63q - 0.1.0 + 1 QuestionGrid - % - 0 - 100 - Decimal - fr.insee - j4nwc63q-RDOP-jbgde5yl - 0.1.0 - + + + % + + 0 + 100 + + Decimal + + fr.insee jbgdje4w - 0.1.0 + 1 PERCENTAGE_EXPENSES21 @@ -8151,28 +8459,30 @@ fr.insee j4nwc63q-QOP-jbgd2x2t - 0.1.0 + 1 OutParameter fr.insee j4nwc63q - 0.1.0 + 1 QuestionGrid - % - 0 - 100 - Decimal - fr.insee - j4nwc63q-RDOP-jbgd2x2t - 0.1.0 - + + + % + + 0 + 100 + + Decimal + + fr.insee jbgdlth7 - 0.1.0 + 1 PERCENTAGE_EXPENSES31 @@ -8182,28 +8492,30 @@ fr.insee j4nwc63q-QOP-jbgdjypz - 0.1.0 + 1 OutParameter fr.insee j4nwc63q - 0.1.0 + 1 QuestionGrid - % - 0 - 100 - Decimal - fr.insee - j4nwc63q-RDOP-jbgdjypz - 0.1.0 - + + + % + + 0 + 100 + + Decimal + + fr.insee jbgdelbl - 0.1.0 + 1 PERCENTAGE_EXPENSES41 @@ -8213,28 +8525,30 @@ fr.insee j4nwc63q-QOP-jbgdcftu - 0.1.0 + 1 OutParameter fr.insee j4nwc63q - 0.1.0 + 1 QuestionGrid - % - 0 - 100 - Decimal - fr.insee - j4nwc63q-RDOP-jbgdcftu - 0.1.0 - + + + % + + 0 + 100 + + Decimal + + fr.insee jbgd95jq - 0.1.0 + 1 PERCENTAGE_EXPENSES51 @@ -8244,28 +8558,30 @@ fr.insee j4nwc63q-QOP-jbgdiyfe - 0.1.0 + 1 OutParameter fr.insee j4nwc63q - 0.1.0 + 1 QuestionGrid - % - 0 - 100 - Decimal - fr.insee - j4nwc63q-RDOP-jbgdiyfe - 0.1.0 - + + + % + + 0 + 100 + + Decimal + + fr.insee jbgdadd9 - 0.1.0 + 1 PERCENTAGE_EXPENSES61 @@ -8275,28 +8591,30 @@ fr.insee j4nwc63q-QOP-jbgdj1wd - 0.1.0 + 1 OutParameter fr.insee j4nwc63q - 0.1.0 + 1 QuestionGrid - % - 0 - 100 - Decimal - fr.insee - j4nwc63q-RDOP-jbgdj1wd - 0.1.0 - + + + % + + 0 + 100 + + Decimal + + fr.insee jbgdlwzk - 0.1.0 + 1 PERCENTAGE_EXPENSES71 @@ -8306,28 +8624,30 @@ fr.insee j4nwc63q-QOP-jbgddylk - 0.1.0 + 1 OutParameter fr.insee j4nwc63q - 0.1.0 + 1 QuestionGrid - % - 0 - 100 - Decimal - fr.insee - j4nwc63q-RDOP-jbgddylk - 0.1.0 - + + + % + + 0 + 100 + + Decimal + + fr.insee jbgdfz77 - 0.1.0 + 1 PERCENTAGE_EXPENSES81 @@ -8337,28 +8657,30 @@ fr.insee j4nwc63q-QOP-jbgd3jj6 - 0.1.0 + 1 OutParameter fr.insee j4nwc63q - 0.1.0 + 1 QuestionGrid - % - 0 - 100 - Decimal - fr.insee - j4nwc63q-RDOP-jbgd3jj6 - 0.1.0 - + + + % + + 0 + 100 + + Decimal + + fr.insee jbgdepx6 - 0.1.0 + 1 PERCENTAGE_EXPENSES91 @@ -8368,28 +8690,30 @@ fr.insee j4nwc63q-QOP-jbgd4w3k - 0.1.0 + 1 OutParameter fr.insee j4nwc63q - 0.1.0 + 1 QuestionGrid - % - 0 - 100 - Decimal - fr.insee - j4nwc63q-RDOP-jbgd4w3k - 0.1.0 - + + + % + + 0 + 100 + + Decimal + + fr.insee jbgdepx7 - 0.1.0 + 1 PERCENTAGE_EXPENSES101 @@ -8399,28 +8723,30 @@ fr.insee j4nwc63q-QOP-jbgd4w4k - 0.1.0 + 1 OutParameter fr.insee j4nwc63q - 0.1.0 + 1 QuestionGrid - % - 0 - 100 - Decimal - fr.insee - j4nwc63q-RDOP-jbgd4w4k - 0.1.0 - + + + % + + 0 + 100 + + Decimal + + fr.insee jbgd9vqv - 0.1.0 + 1 CLOWNING11 @@ -8430,45 +8756,63 @@ fr.insee j4nw0rr6-QOP-jbgd8tyr - 0.1.0 + 1 OutParameter fr.insee j4nw0rr6 - 0.1.0 + 1 QuestionGrid - + + + + fr.insee + jbdyh6b5 + 1 + CodeList + + + fr.insee jbgden0i - 0.1.0 + 1 CLOWNING21 - Loose the violin of his daughter playing poker-Clowning + Loose the violin of his daughter playing poker-Clowning fr.insee j4nw0rr6-QOP-jbgdep36 - 0.1.0 + 1 OutParameter fr.insee j4nw0rr6 - 0.1.0 + 1 QuestionGrid - + + + + fr.insee + jbdyh6b5 + 1 + CodeList + + + fr.insee jbgdndju - 0.1.0 + 1 CLOWNING31 @@ -8478,21 +8822,30 @@ fr.insee j4nw0rr6-QOP-jbgdjjgi - 0.1.0 + 1 OutParameter fr.insee j4nw0rr6 - 0.1.0 + 1 QuestionGrid - + + + + fr.insee + jbdyh6b5 + 1 + CodeList + + + fr.insee jbgdfwg9 - 0.1.0 + 1 CLOWNING41 @@ -8502,21 +8855,30 @@ fr.insee j4nw0rr6-QOP-jbgdgh6k - 0.1.0 + 1 OutParameter fr.insee j4nw0rr6 - 0.1.0 + 1 QuestionGrid - + + + + fr.insee + jbdyh6b5 + 1 + CodeList + + + fr.insee jbgdd3ky - 0.1.0 + 1 CLOWNING12 @@ -8526,45 +8888,49 @@ fr.insee j4nw0rr6-QOP-jbgdit3o - 0.1.0 + 1 OutParameter fr.insee j4nw0rr6 - 0.1.0 + 1 QuestionGrid - + + + fr.insee jbgdm9lm - 0.1.0 + 1 CLOWNING22 - Loose the violin of his daughter playing poker-Remember? + Loose the violin of his daughter playing poker-Remember? fr.insee j4nw0rr6-QOP-jbgd366k - 0.1.0 + 1 OutParameter fr.insee j4nw0rr6 - 0.1.0 + 1 QuestionGrid - + + + fr.insee jbgdcdhv - 0.1.0 + 1 CLOWNING32 @@ -8574,21 +8940,23 @@ fr.insee j4nw0rr6-QOP-jbgdax06 - 0.1.0 + 1 OutParameter fr.insee j4nw0rr6 - 0.1.0 + 1 QuestionGrid - + + + fr.insee jbgdjlit - 0.1.0 + 1 CLOWNING42 @@ -8598,21 +8966,23 @@ fr.insee j4nw0rr6-QOP-jbgdfo1j - 0.1.0 + 1 OutParameter fr.insee j4nw0rr6 - 0.1.0 + 1 QuestionGrid - + + + fr.insee jbgd1zxu - 0.1.0 + 1 TRAVEL11 @@ -8622,21 +8992,34 @@ fr.insee j6p2lwuj-QOP-jbgd92mb - 0.1.0 + 1 OutParameter fr.insee j6p2lwuj - 0.1.0 + 1 QuestionGrid - + + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 1 + Code + + + + + fr.insee jbgd8lfs - 0.1.0 + 1 TRAVEL21 @@ -8646,21 +9029,34 @@ fr.insee j6p2lwuj-QOP-jbgdgsat - 0.1.0 + 1 OutParameter fr.insee j6p2lwuj - 0.1.0 + 1 QuestionGrid - + + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 1 + Code + + + + + fr.insee jbgd56qo - 0.1.0 + 1 TRAVEL31 @@ -8670,21 +9066,34 @@ fr.insee j6p2lwuj-QOP-jbgdaxk2 - 0.1.0 + 1 OutParameter fr.insee j6p2lwuj - 0.1.0 + 1 QuestionGrid - + + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 1 + Code + + + + + fr.insee jbgd4wu8 - 0.1.0 + 1 TRAVEL41 @@ -8694,21 +9103,34 @@ fr.insee j6p2lwuj-QOP-jbgd7myn - 0.1.0 + 1 OutParameter fr.insee j6p2lwuj - 0.1.0 + 1 QuestionGrid - + + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 1 + Code + + + + + fr.insee jbgdak6h - 0.1.0 + 1 TRAVEL12 @@ -8718,21 +9140,34 @@ fr.insee j6p2lwuj-QOP-jbgdnxkt - 0.1.0 + 1 OutParameter fr.insee j6p2lwuj - 0.1.0 + 1 QuestionGrid - + + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 1 + Code + + + + + fr.insee jbgdmsy4 - 0.1.0 + 1 TRAVEL22 @@ -8742,21 +9177,34 @@ fr.insee j6p2lwuj-QOP-jbgd3ef5 - 0.1.0 + 1 OutParameter fr.insee j6p2lwuj - 0.1.0 + 1 QuestionGrid - + + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 1 + Code + + + + + fr.insee jbgd2zlu - 0.1.0 + 1 TRAVEL32 @@ -8766,21 +9214,34 @@ fr.insee j6p2lwuj-QOP-jbgd8p1v - 0.1.0 + 1 OutParameter fr.insee j6p2lwuj - 0.1.0 + 1 QuestionGrid - + + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 1 + Code + + + + + fr.insee jbgd6v73 - 0.1.0 + 1 TRAVEL42 @@ -8790,21 +9251,34 @@ fr.insee j6p2lwuj-QOP-jbgdgm0c - 0.1.0 + 1 OutParameter fr.insee j6p2lwuj - 0.1.0 + 1 QuestionGrid - + + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 1 + Code + + + + + fr.insee jbgdf5fg - 0.1.0 + 1 TRAVEL13 @@ -8814,21 +9288,34 @@ fr.insee j6p2lwuj-QOP-jbgdcppc - 0.1.0 + 1 OutParameter fr.insee j6p2lwuj - 0.1.0 + 1 QuestionGrid - + + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 1 + Code + + + + + fr.insee jbgd2xg0 - 0.1.0 + 1 TRAVEL23 @@ -8838,21 +9325,34 @@ fr.insee j6p2lwuj-QOP-jbgd4cm6 - 0.1.0 + 1 OutParameter fr.insee j6p2lwuj - 0.1.0 + 1 QuestionGrid - + + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 1 + Code + + + + + fr.insee jbgdc06l - 0.1.0 + 1 TRAVEL33 @@ -8862,21 +9362,34 @@ fr.insee j6p2lwuj-QOP-jbgdd2lo - 0.1.0 + 1 OutParameter fr.insee j6p2lwuj - 0.1.0 + 1 QuestionGrid - + + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 1 + Code + + + + + fr.insee jbgdb8i9 - 0.1.0 + 1 TRAVEL43 @@ -8886,21 +9399,34 @@ fr.insee j6p2lwuj-QOP-jbgdo0ay - 0.1.0 + 1 OutParameter fr.insee j6p2lwuj - 0.1.0 + 1 QuestionGrid - + + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 1 + Code + + + + + fr.insee jbgdhzve - 0.1.0 + 1 TRAVEL14 @@ -8910,21 +9436,34 @@ fr.insee j6p2lwuj-QOP-jbgd4r2a - 0.1.0 + 1 OutParameter fr.insee j6p2lwuj - 0.1.0 + 1 QuestionGrid - + + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 1 + Code + + + + + fr.insee jbgd93ks - 0.1.0 + 1 TRAVEL24 @@ -8934,21 +9473,34 @@ fr.insee j6p2lwuj-QOP-jbgdkfpq - 0.1.0 + 1 OutParameter fr.insee j6p2lwuj - 0.1.0 + 1 QuestionGrid - + + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 1 + Code + + + + + fr.insee jbgdfw7h - 0.1.0 + 1 TRAVEL34 @@ -8958,21 +9510,34 @@ fr.insee j6p2lwuj-QOP-jbgd7u52 - 0.1.0 + 1 OutParameter fr.insee j6p2lwuj - 0.1.0 + 1 QuestionGrid - + + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 1 + Code + + + + + fr.insee jbgdfavn - 0.1.0 + 1 TRAVEL44 @@ -8982,21 +9547,34 @@ fr.insee j6p2lwuj-QOP-jbgdgfwl - 0.1.0 + 1 OutParameter fr.insee j6p2lwuj - 0.1.0 + 1 QuestionGrid - + + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 1 + Code + + + + + fr.insee jbgdc199 - 0.1.0 + 1 TRAVEL15 @@ -9006,21 +9584,34 @@ fr.insee j6p2lwuj-QOP-jbgd9cff - 0.1.0 + 1 OutParameter fr.insee j6p2lwuj - 0.1.0 + 1 QuestionGrid - + + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 1 + Code + + + + + fr.insee jbgdfqph - 0.1.0 + 1 TRAVEL25 @@ -9030,21 +9621,34 @@ fr.insee j6p2lwuj-QOP-jbgddwsp - 0.1.0 + 1 OutParameter fr.insee j6p2lwuj - 0.1.0 + 1 QuestionGrid - + + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 1 + Code + + + + + fr.insee jbgd8r0n - 0.1.0 + 1 TRAVEL35 @@ -9054,21 +9658,34 @@ fr.insee j6p2lwuj-QOP-jbgdncn8 - 0.1.0 + 1 OutParameter fr.insee j6p2lwuj - 0.1.0 + 1 QuestionGrid - + + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 1 + Code + + + + + fr.insee jbgd3aqk - 0.1.0 + 1 TRAVEL45 @@ -9078,21 +9695,34 @@ fr.insee j6p2lwuj-QOP-jbgdnz6b - 0.1.0 + 1 OutParameter fr.insee j6p2lwuj - 0.1.0 + 1 QuestionGrid - + + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 1 + Code + + + + + fr.insee jbgdltql - 0.1.0 + 1 TRAVEL16 @@ -9102,21 +9732,34 @@ fr.insee j6p2lwuj-QOP-jbgdiva0 - 0.1.0 + 1 OutParameter fr.insee j6p2lwuj - 0.1.0 + 1 QuestionGrid - + + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 1 + Code + + + + + fr.insee jbgd9um3 - 0.1.0 + 1 TRAVEL26 @@ -9126,21 +9769,34 @@ fr.insee j6p2lwuj-QOP-jbgd7dqf - 0.1.0 + 1 OutParameter fr.insee j6p2lwuj - 0.1.0 + 1 QuestionGrid - + + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 1 + Code + + + + + fr.insee jbgddj7v - 0.1.0 + 1 TRAVEL36 @@ -9150,21 +9806,34 @@ fr.insee j6p2lwuj-QOP-jbgdnous - 0.1.0 + 1 OutParameter fr.insee j6p2lwuj - 0.1.0 + 1 QuestionGrid - + + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 1 + Code + + + + + fr.insee jbgdb4ym - 0.1.0 + 1 TRAVEL46 @@ -9174,21 +9843,34 @@ fr.insee j6p2lwuj-QOP-jbgdkfcz - 0.1.0 + 1 OutParameter fr.insee j6p2lwuj - 0.1.0 + 1 QuestionGrid - + + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 1 + Code + + + + + fr.insee jbgd3fkz - 0.1.0 + 1 FAVOURITE_CHARACTERS11 @@ -9198,21 +9880,23 @@ fr.insee j6qg8rc6-QOP-jbgdl5jb - 0.1.0 + 1 OutParameter fr.insee j6qg8rc6 - 0.1.0 + 1 QuestionGrid - + + + fr.insee jbgdf2md - 0.1.0 + 1 FAVOURITE_CHARACTERS21 @@ -9222,21 +9906,23 @@ fr.insee j6qg8rc6-QOP-jbgd8lwo - 0.1.0 + 1 OutParameter fr.insee j6qg8rc6 - 0.1.0 + 1 QuestionGrid - + + + fr.insee jbgdfle1 - 0.1.0 + 1 FAVOURITE_CHARACTERS31 @@ -9246,21 +9932,23 @@ fr.insee j6qg8rc6-QOP-jbgdbfag - 0.1.0 + 1 OutParameter fr.insee j6qg8rc6 - 0.1.0 + 1 QuestionGrid - + + + fr.insee jbgdix8x - 0.1.0 + 1 FAVOURITE_CHARACTERS41 @@ -9270,21 +9958,23 @@ fr.insee j6qg8rc6-QOP-jbgdlgja - 0.1.0 + 1 OutParameter fr.insee j6qg8rc6 - 0.1.0 + 1 QuestionGrid - + + + fr.insee jbgd782k - 0.1.0 + 1 FAVOURITE_CHARACTERS51 @@ -9294,21 +9984,23 @@ fr.insee j6qg8rc6-QOP-jbgd745y - 0.1.0 + 1 OutParameter fr.insee j6qg8rc6 - 0.1.0 + 1 QuestionGrid - + + + fr.insee jbgd68rf - 0.1.0 + 1 FAVOURITE_CHARACTERS61 @@ -9318,21 +10010,23 @@ fr.insee j6qg8rc6-QOP-jbgdjkts - 0.1.0 + 1 OutParameter fr.insee j6qg8rc6 - 0.1.0 + 1 QuestionGrid - + + + fr.insee jbgdfoj4 - 0.1.0 + 1 FAVOURITE_CHARACTERS71 @@ -9342,21 +10036,23 @@ fr.insee j6qg8rc6-QOP-jbgdcax7 - 0.1.0 + 1 OutParameter fr.insee j6qg8rc6 - 0.1.0 + 1 QuestionGrid - + + + fr.insee jbgdb116 - 0.1.0 + 1 FAVOURITE_CHARACTERS81 @@ -9366,21 +10062,23 @@ fr.insee j6qg8rc6-QOP-jbgdjye1 - 0.1.0 + 1 OutParameter fr.insee j6qg8rc6 - 0.1.0 + 1 QuestionGrid - + + + fr.insee jbgd7w5p - 0.1.0 + 1 FAVOURITE_CHARACTERS91 @@ -9390,21 +10088,23 @@ fr.insee j6qg8rc6-QOP-jbgd5jet - 0.1.0 + 1 OutParameter fr.insee j6qg8rc6 - 0.1.0 + 1 QuestionGrid - + + + fr.insee jbgd8rj2 - 0.1.0 + 1 FAVOURITE_CHARACTERS101 @@ -9414,21 +10114,23 @@ fr.insee j6qg8rc6-QOP-jbgdjw90 - 0.1.0 + 1 OutParameter fr.insee j6qg8rc6 - 0.1.0 + 1 QuestionGrid - + + + fr.insee jbgdidnp - 0.1.0 + 1 FAVOURITE_CHARACTERS12 @@ -9438,21 +10140,29 @@ fr.insee j6qg8rc6-QOP-jbgdfndq - 0.1.0 + 1 OutParameter fr.insee j6qg8rc6 - 0.1.0 + 1 QuestionGrid - + + + + 0 + 120 + + Decimal + + fr.insee jbgd47wz - 0.1.0 + 1 FAVOURITE_CHARACTERS22 @@ -9462,21 +10172,29 @@ fr.insee j6qg8rc6-QOP-jbgd7osi - 0.1.0 + 1 OutParameter fr.insee j6qg8rc6 - 0.1.0 + 1 QuestionGrid - + + + + 0 + 120 + + Decimal + + fr.insee jbgdj2nn - 0.1.0 + 1 FAVOURITE_CHARACTERS32 @@ -9486,21 +10204,29 @@ fr.insee j6qg8rc6-QOP-jbgd7bnw - 0.1.0 + 1 OutParameter fr.insee j6qg8rc6 - 0.1.0 + 1 QuestionGrid - + + + + 0 + 120 + + Decimal + + fr.insee jbgd2ipx - 0.1.0 + 1 FAVOURITE_CHARACTERS42 @@ -9510,21 +10236,29 @@ fr.insee j6qg8rc6-QOP-jbgd9k71 - 0.1.0 + 1 OutParameter fr.insee j6qg8rc6 - 0.1.0 + 1 QuestionGrid - + + + + 0 + 120 + + Decimal + + fr.insee jbgd4pe3 - 0.1.0 + 1 FAVOURITE_CHARACTERS52 @@ -9534,21 +10268,29 @@ fr.insee j6qg8rc6-QOP-jbgdimks - 0.1.0 + 1 OutParameter fr.insee j6qg8rc6 - 0.1.0 + 1 QuestionGrid - + + + + 0 + 120 + + Decimal + + fr.insee jbgdjgb1 - 0.1.0 + 1 FAVOURITE_CHARACTERS62 @@ -9558,21 +10300,29 @@ fr.insee j6qg8rc6-QOP-jbgdjquz - 0.1.0 + 1 OutParameter fr.insee j6qg8rc6 - 0.1.0 + 1 QuestionGrid - + + + + 0 + 120 + + Decimal + + fr.insee jbgdb5c1 - 0.1.0 + 1 FAVOURITE_CHARACTERS72 @@ -9582,21 +10332,29 @@ fr.insee j6qg8rc6-QOP-jbgdd2w3 - 0.1.0 + 1 OutParameter fr.insee j6qg8rc6 - 0.1.0 + 1 QuestionGrid - + + + + 0 + 120 + + Decimal + + fr.insee jbgdju9y - 0.1.0 + 1 FAVOURITE_CHARACTERS82 @@ -9606,21 +10364,29 @@ fr.insee j6qg8rc6-QOP-jbgdkosc - 0.1.0 + 1 OutParameter fr.insee j6qg8rc6 - 0.1.0 + 1 QuestionGrid - + + + + 0 + 120 + + Decimal + + fr.insee jbgdatyx - 0.1.0 + 1 FAVOURITE_CHARACTERS92 @@ -9630,21 +10396,29 @@ fr.insee j6qg8rc6-QOP-jbgdk0x4 - 0.1.0 + 1 OutParameter fr.insee j6qg8rc6 - 0.1.0 + 1 QuestionGrid - + + + + 0 + 120 + + Decimal + + fr.insee jbgdi1dt - 0.1.0 + 1 FAVOURITE_CHARACTERS102 @@ -9654,96 +10428,193 @@ fr.insee j6qg8rc6-QOP-jbgd2wgf - 0.1.0 + 1 OutParameter fr.insee j6qg8rc6 - 0.1.0 + 1 QuestionGrid - + + + + 0 + 120 + + Decimal + + fr.insee jbcggt4x - 0.1.0 + 1 SURVEY_COMMENT - SURVEY_COMMENT label + SURVEY_COMMENT label fr.insee j6z0z3us-QOP-jbgd6m6e - 0.1.0 + 1 OutParameter fr.insee j6z0z3us - 0.1.0 + 1 QuestionItem - - - - fr.insee - jbcggtca - 0.1.0 - - SUM_EXPENSES - - - SUM_EXPENSES label - - - fr.insee - jbcggtca-VROP - 0.1.0 - - - fr.insee - jbcggtca-GI - 0.1.0 - GenerationInstruction - - - fr.insee - jbcggtca-GOP - 0.1.0 - OutParameter - - - fr.insee - jbcggtca-VROP - 0.1.0 - OutParameter - - - - + - - fr.insee - jbcggtex - 0.1.0 - - LAST_BROADCAST - - - LAST_BROADCAST label - - + + fr.insee + j6qg8rc6-gp + 1 + + + fr.insee + j6qg8rc6 + 1 + QuestionGrid + + + TableLoop + + FAVOURITE_CHARACTERS + + + fr.insee + jbgd3fkz + 1 + Variable + + + fr.insee + jbgdf2md + 1 + Variable + + + fr.insee + jbgdfle1 + 1 + Variable + + + fr.insee + jbgdix8x + 1 + Variable + + + fr.insee + jbgd782k + 1 + Variable + + + fr.insee + jbgd68rf + 1 + Variable + + + fr.insee + jbgdfoj4 + 1 + Variable + + + fr.insee + jbgdb116 + 1 + Variable + + + fr.insee + jbgd7w5p + 1 + Variable + + + fr.insee + jbgd8rj2 + 1 + Variable + + + fr.insee + jbgdidnp + 1 + Variable + + + fr.insee + jbgd47wz + 1 + Variable + + + fr.insee + jbgdj2nn + 1 + Variable + + + fr.insee + jbgd2ipx + 1 + Variable + + + fr.insee + jbgd4pe3 + 1 + Variable + + + fr.insee + jbgdjgb1 + 1 + Variable + + + fr.insee + jbgdb5c1 + 1 + Variable + + + fr.insee + jbgdju9y + 1 + Variable + + + fr.insee + jbgdatyx + 1 + Variable + + + fr.insee + jbgdi1dt + 1 + Variable + + fr.insee INSEE-SIMPSONS-PIS-1 - 0.1.0 + 1 SIMPSONS @@ -9753,66 +10624,66 @@ fr.insee jbcggtca-GI - 0.1.0 - + 1 + fr.insee jbgdnfk7 - 0.1.0 + 1 Variable fr.insee jbgdje4w - 0.1.0 + 1 Variable fr.insee jbgdlth7 - 0.1.0 + 1 Variable fr.insee jbgdelbl - 0.1.0 + 1 Variable fr.insee jbgd95jq - 0.1.0 + 1 Variable fr.insee jbgdadd9 - 0.1.0 + 1 Variable fr.insee jbgdlwzk - 0.1.0 + 1 Variable fr.insee jbgdfz77 - 0.1.0 + 1 Variable fr.insee jbgdepx6 - 0.1.0 + 1 Variable fr.insee jbgdepx7 - 0.1.0 + 1 Variable @@ -9821,7 +10692,7 @@ fr.insee jbcggtca-IP-1 - 0.1.0 + 1 PERCENTAGE_EXPENSES11 @@ -9829,7 +10700,7 @@ fr.insee jbcggtca-IP-2 - 0.1.0 + 1 PERCENTAGE_EXPENSES21 @@ -9837,7 +10708,7 @@ fr.insee jbcggtca-IP-3 - 0.1.0 + 1 PERCENTAGE_EXPENSES31 @@ -9845,7 +10716,7 @@ fr.insee jbcggtca-IP-4 - 0.1.0 + 1 PERCENTAGE_EXPENSES41 @@ -9853,7 +10724,7 @@ fr.insee jbcggtca-IP-5 - 0.1.0 + 1 PERCENTAGE_EXPENSES51 @@ -9861,7 +10732,7 @@ fr.insee jbcggtca-IP-6 - 0.1.0 + 1 PERCENTAGE_EXPENSES61 @@ -9869,7 +10740,7 @@ fr.insee jbcggtca-IP-7 - 0.1.0 + 1 PERCENTAGE_EXPENSES71 @@ -9877,7 +10748,7 @@ fr.insee jbcggtca-IP-8 - 0.1.0 + 1 PERCENTAGE_EXPENSES81 @@ -9885,7 +10756,7 @@ fr.insee jbcggtca-IP-9 - 0.1.0 + 1 PERCENTAGE_EXPENSES91 @@ -9893,7 +10764,7 @@ fr.insee jbcggtca-IP-10 - 0.1.0 + 1 PERCENTAGE_EXPENSES101 @@ -9901,19 +10772,19 @@ fr.insee jbcggtca-GOP - 0.1.0 + 1 fr.insee j4nwc63q-QOP-jbgde5yl - 0.1.0 + 1 OutParameter fr.insee jbcggtca-IP-1 - 0.1.0 + 1 InParameter @@ -9921,13 +10792,13 @@ fr.insee j4nwc63q-QOP-jbgd2x2t - 0.1.0 + 1 OutParameter fr.insee jbcggtca-IP-2 - 0.1.0 + 1 InParameter @@ -9935,13 +10806,13 @@ fr.insee j4nwc63q-QOP-jbgdjypz - 0.1.0 + 1 OutParameter fr.insee jbcggtca-IP-3 - 0.1.0 + 1 InParameter @@ -9949,13 +10820,13 @@ fr.insee j4nwc63q-QOP-jbgdcftu - 0.1.0 + 1 OutParameter fr.insee jbcggtca-IP-4 - 0.1.0 + 1 InParameter @@ -9963,13 +10834,13 @@ fr.insee j4nwc63q-QOP-jbgdiyfe - 0.1.0 + 1 OutParameter fr.insee jbcggtca-IP-5 - 0.1.0 + 1 InParameter @@ -9977,13 +10848,13 @@ fr.insee j4nwc63q-QOP-jbgdj1wd - 0.1.0 + 1 OutParameter fr.insee jbcggtca-IP-6 - 0.1.0 + 1 InParameter @@ -9991,13 +10862,13 @@ fr.insee j4nwc63q-QOP-jbgddylk - 0.1.0 + 1 OutParameter fr.insee jbcggtca-IP-7 - 0.1.0 + 1 InParameter @@ -10005,13 +10876,13 @@ fr.insee j4nwc63q-QOP-jbgd3jj6 - 0.1.0 + 1 OutParameter fr.insee jbcggtca-IP-8 - 0.1.0 + 1 InParameter @@ -10019,13 +10890,13 @@ fr.insee j4nwc63q-QOP-jbgd4w3k - 0.1.0 + 1 OutParameter fr.insee jbcggtca-IP-9 - 0.1.0 + 1 InParameter @@ -10033,26 +10904,26 @@ fr.insee j4nwc63q-QOP-jbgd4w4k - 0.1.0 + 1 OutParameter fr.insee jbcggtca-IP-10 - 0.1.0 + 1 InParameter - number(if (jbcggtca-IP-1='') then '0' else jbcggtca-IP-1) + number(if (jbcggtca-IP-2='') then '0' else jbcggtca-IP-2) + number(if (jbcggtca-IP-3='') then '0' else jbcggtca-IP-3) + - number(if (jbcggtca-IP-4='') then '0' else jbcggtca-IP-4) + number(if (jbcggtca-IP-5='') then '0' else jbcggtca-IP-5) + number(if (jbcggtca-IP-6='') then '0' else jbcggtca-IP-6) + - number(if (jbcggtca-IP-7='') then '0' else jbcggtca-IP-7) + number(if (jbcggtca-IP-8='') then '0' else jbcggtca-IP-8) + number(if (jbcggtca-IP-9='') then '0' else jbcggtca-IP-9) + - number(if (jbcggtca-IP-10='') then '0' else jbcggtca-IP-10) + number(if (jbcggtca-IP-1='') then '0' else jbcggtca-IP-1) + number(if (jbcggtca-IP-2='') then '0' else jbcggtca-IP-2) + number(if (jbcggtca-IP-3='') then '0' else jbcggtca-IP-3)+ + number(if (jbcggtca-IP-4='') then '0' else jbcggtca-IP-4)+ number(if (jbcggtca-IP-5='') then '0' else jbcggtca-IP-5)+ number(if (jbcggtca-IP-6='') then '0' else jbcggtca-IP-6)+ + number(if (jbcggtca-IP-7='') then '0' else jbcggtca-IP-7)+ number(if (jbcggtca-IP-8='') then '0' else jbcggtca-IP-8)+ number(if (jbcggtca-IP-9='') then '0' else jbcggtca-IP-9)+ + number(if (jbcggtca-IP-10='') then '0' else jbcggtca-IP-10) fr.insee - Sequence-i6vwid - 0.1.0 + Sequence-i6vwi0 + 1 Sequence @@ -10060,7 +10931,7 @@ fr.insee INSEE-SIMPSONS-MRS - 0.1.0 + 1 Liste de formats numériques et dates de l'enquête @@ -10068,58 +10939,67 @@ fr.insee - INSEE-COMMUN-MNR-DateTimedate - 0.1.0 - jj/mm/aaaa + INSEE-COMMUN-MNR-DateTimedate-YYYY-MM-DD + 1 + YYYY-MM-DD date + + 1900-01-01 + format-date(current-date(),'[Y0001]-[M01]-[D01]') + - + + fr.insee - StudyUnit-i6vwid - 0.1.0 + StudyUnit-i6vwi0 + 1 fr.insee - DataCollection-i6vwid - 0.1.0 + DataCollection-i6vwi0 + 1 fr.insee - QuestionScheme-i6vwid - 0.1.0 + QuestionScheme-i6vwi0 + 1 QuestionScheme fr.insee - ControlConstructScheme-i6vwid - 0.1.0 + ControlConstructScheme-i6vwi0 + 1 ControlConstructScheme fr.insee - InterviewerInstructionScheme-i6vwid - 0.1.0 + InterviewerInstructionScheme-i6vwi0 + 1 InterviewerInstructionScheme fr.insee - InstrumentScheme-i6vwid - 0.1.0 - + InstrumentScheme-i6vwi0 + 1 + fr.insee - Instrument-i6vwid - 0.1.0 + Instrument-i6vwi0 + 1 + + SIMPSONS + Questionnaire SIMPSONS questionnaire A définir fr.insee - Sequence-i6vwid - 0.1.0 + Sequence-i6vwi0 + 1 Sequence - \ No newline at end of file + + \ No newline at end of file From addaa1085b25aa541445f764e323756a0932ee4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Laporte?= Date: Wed, 25 Sep 2019 09:43:41 +0200 Subject: [PATCH 157/439] ddi2odt : color of nameOfVariable --- src/main/resources/xslt/outputs/odt/office-styles.xsl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/resources/xslt/outputs/odt/office-styles.xsl b/src/main/resources/xslt/outputs/odt/office-styles.xsl index 598be4df9..5edce01cf 100644 --- a/src/main/resources/xslt/outputs/odt/office-styles.xsl +++ b/src/main/resources/xslt/outputs/odt/office-styles.xsl @@ -46,6 +46,10 @@ + + + + module @@ -72,89 +127,6 @@ - - - fr - - - default - - test - - - - false - - - false - true - - false - false - false - - 7 - - , - - - - - false - - - false - true - - - 0 - 1 - - - - 12 - - - - - - 14 - -
- - manual - - - module - - - ouvertureCOL - - - - - - false - - - false - true - - - - - - false - - - false - true - - From fc4c6acef59b25157fb72ed45e5ae3ae1e929dfd Mon Sep 17 00:00:00 2001 From: BulotF Date: Mon, 30 Sep 2019 14:01:08 +0200 Subject: [PATCH 170/439] ddi32 to ddi33 - simplify numeric in formulas - create questionnaire VariableGroup --- .../resources/xslt/util/ddi/ddi32toddi33.xsl | 148 +++++++++++++++++- 1 file changed, 146 insertions(+), 2 deletions(-) diff --git a/src/main/resources/xslt/util/ddi/ddi32toddi33.xsl b/src/main/resources/xslt/util/ddi/ddi32toddi33.xsl index 6d7793b66..6fcac309f 100644 --- a/src/main/resources/xslt/util/ddi/ddi32toddi33.xsl +++ b/src/main/resources/xslt/util/ddi/ddi32toddi33.xsl @@ -8,6 +8,9 @@ exclude-result-prefixes="xs d32 r32 l32 g32 s32 xsl xd" version="2.0"> + + + root template : DDIInstance with DDI 3.3 namespaces @@ -124,6 +127,117 @@ + + Add VariableGroup "questionnaire" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + https://ddi-alliance.atlassian.net/browse/DDILIFE-3532 @@ -185,8 +299,7 @@ - - + https://ddi-alliance.atlassian.net/projects/DDILIFE/issues/DDILIFE-3590 @@ -198,4 +311,35 @@ + + Simplify numeric formulas + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 07614b0aba443e4138c1a76afb1562eb1acaf73a Mon Sep 17 00:00:00 2001 From: BulotF Date: Mon, 30 Sep 2019 15:03:38 +0200 Subject: [PATCH 171/439] Update ddi32toddi33.xsl --- src/main/resources/xslt/util/ddi/ddi32toddi33.xsl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/xslt/util/ddi/ddi32toddi33.xsl b/src/main/resources/xslt/util/ddi/ddi32toddi33.xsl index 6fcac309f..b015f3f27 100644 --- a/src/main/resources/xslt/util/ddi/ddi32toddi33.xsl +++ b/src/main/resources/xslt/util/ddi/ddi32toddi33.xsl @@ -180,7 +180,7 @@ - + From e048328acaf4a69b147cd04eddc60a4fe2a2b493 Mon Sep 17 00:00:00 2001 From: BulotF Date: Mon, 30 Sep 2019 15:04:08 +0200 Subject: [PATCH 172/439] Update dereferencing.xsl use Questionnaire VariableGroup to select useful variables --- .../resources/xslt/util/ddi/dereferencing.xsl | 63 +++++++++++++------ 1 file changed, 45 insertions(+), 18 deletions(-) diff --git a/src/main/resources/xslt/util/ddi/dereferencing.xsl b/src/main/resources/xslt/util/ddi/dereferencing.xsl index bf2cee70e..4ce786752 100644 --- a/src/main/resources/xslt/util/ddi/dereferencing.xsl +++ b/src/main/resources/xslt/util/ddi/dereferencing.xsl @@ -21,14 +21,14 @@ version="2.0"> - + The output folder in which the dereferenced files (one for each main sequence) are generated. - + @@ -132,7 +132,7 @@ - + @@ -244,13 +244,24 @@ xmlns:c="ddi:conceptualcomponent:3_3" xmlns:cm="ddi:comparative:3_3"> - + + + - - + + + + + + + + + + + @@ -356,14 +367,22 @@ Template for template Sequence + - + - - - - - + + + + + + + + + + + + @@ -374,9 +393,17 @@ - + - + + + + + + + + @@ -391,7 +418,7 @@ - + @@ -405,9 +432,9 @@ - + - + From 2a9b01b9887e3741d8b3b886fb0b350f87c3ec6a Mon Sep 17 00:00:00 2001 From: BulotF Date: Mon, 30 Sep 2019 15:35:42 +0200 Subject: [PATCH 173/439] Update source-fixed.xsl VariableRepresentation may be empty for external variables --- src/main/resources/xslt/inputs/ddi/source-fixed.xsl | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/resources/xslt/inputs/ddi/source-fixed.xsl b/src/main/resources/xslt/inputs/ddi/source-fixed.xsl index 8b42771e4..948e0e2d3 100644 --- a/src/main/resources/xslt/inputs/ddi/source-fixed.xsl +++ b/src/main/resources/xslt/inputs/ddi/source-fixed.xsl @@ -1200,7 +1200,10 @@ - + + + + From 36e7b736a38743163ea7214b67cb41e4f9098132 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Laporte?= Date: Mon, 30 Sep 2019 15:40:59 +0200 Subject: [PATCH 174/439] Correct minor changes --- src/main/resources/xslt/outputs/odt/models.xsl | 16 +++------------- .../resources/xslt/outputs/odt/office-styles.xsl | 2 +- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/src/main/resources/xslt/outputs/odt/models.xsl b/src/main/resources/xslt/outputs/odt/models.xsl index ff9717882..0ae1ffac2 100644 --- a/src/main/resources/xslt/outputs/odt/models.xsl +++ b/src/main/resources/xslt/outputs/odt/models.xsl @@ -265,9 +265,9 @@ - + - + @@ -290,7 +290,7 @@ - + @@ -298,13 +298,6 @@ - - - - - - - @@ -327,9 +320,6 @@ - - - diff --git a/src/main/resources/xslt/outputs/odt/office-styles.xsl b/src/main/resources/xslt/outputs/odt/office-styles.xsl index 5edce01cf..c1eccdf5d 100644 --- a/src/main/resources/xslt/outputs/odt/office-styles.xsl +++ b/src/main/resources/xslt/outputs/odt/office-styles.xsl @@ -47,7 +47,7 @@ - + - + - + - + - + - + - - - - - - - + + + + + + + Template de racine, on applique les templates de tous les enfants @@ -40,24 +34,25 @@ - + - + - - * + + + * - + - + - - + + @@ -69,13 +64,13 @@ - + - + - + @@ -84,8 +79,8 @@ - + - - + + \ No newline at end of file diff --git a/src/main/resources/xslt/util/fr/edit-patron.xsl b/src/main/resources/xslt/util/fr/edit-patron.xsl index 6b4d3f1e1..0df715cab 100644 --- a/src/main/resources/xslt/util/fr/edit-patron.xsl +++ b/src/main/resources/xslt/util/fr/edit-patron.xsl @@ -1,81 +1,77 @@ - - - - + + + + - + - - + + - - - - + + + + - + - + - - - + + + - - + + - - + + - + - - - - - + + + + + - + - + - + - + - + - - + + - + - + - - - - + + + - - - - - +--> + + + + + + - + - + Template de base pour tous les éléments et tous les attributs, on recopie @@ -102,31 +98,29 @@ - + - + - - - - - - + + + + - + - + - - + + @@ -135,99 +129,93 @@ - - + + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + \ No newline at end of file diff --git a/src/main/resources/xslt/util/fr/end/end-business.xsl b/src/main/resources/xslt/util/fr/end/end-business.xsl deleted file mode 100644 index 57f530b75..000000000 --- a/src/main/resources/xslt/util/fr/end/end-business.xsl +++ /dev/null @@ -1,347 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Template de base pour tous les éléments et tous les attributs, on recopie - simplement en sortie - - - - - - - - - - - - - - - - - - - - - - non - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Vous êtes arrivé à la fin du questionnaire. - - - - - Si vous avez terminé de renseigner votre questionnaire, vous pouvez : - - -  transmettre à nos services vos réponses en cliquant ci-dessous sur le bouton : - - - - Si vous avez terminé de renseigner votre questionnaire, - pour le transmettre à nos services, merci de cliquer ci-dessous sur le bouton : "Envoyer". - - Une fois le questionnaire envoyé : - - - vous ne pourrez plus modifier vos réponses ; - - vous pourrez télécharger le récapitulatif de vos réponses au format pdf. - - - - - - - - - - - - - - - Une fois transmis il vous sera possible d'expédier à nouveau celui-ci si une modification des réponses vous semble nécessaire. - Attention : si vous rouvrez un questionnaire après nous l’avoir transmis, que ce soit pour le modifier ou simplement - le consulter, veillez à nous le transmettre à nouveau (bouton "Envoyer" ci-dessus). - -  ne pas transmettre le questionnaire et revenir dès à présent sur vos réponses en cliquant sur le bouton :  - "Retour" en bas à droite ou revenir plus tard sur vos réponses en cliquant sur le lien : "Fermer le questionnaire" et en vous authentifiant à nouveau. - - - Dans ce cas-là, vos données seront enregistrées mais le questionnaire ne sera pas envoyé à . - - - - - Si vous souhaitez y apporter des modifications, vous pouvez : - - revenir dessus dès à présent en cliquant sur le bouton "Retour" ; - - ou plus tard en cliquant sur le bouton "Fermer le questionnaire" et en vous authentifiant à nouveau. - Dans les deux cas, vos données seront enregistrées mais le questionnaire ne sera pas - envoyé à . - - - - Fermer le questionnaire - - - - - - - - - - - - CONFIRMER VOTRE ENVOI - - - - Il vous sera possible d'expédier à nouveau celui-ci si une modification des réponses vous semble nécessaire. - - - Votre réponse est définitive et vous souhaitez l'envoyer. - - - - Je confirme l'envoi - - - - - - - - - - Ne pas envoyer - - - - - - - - - - - - - - - - - - - Souhaitez-vous retourner sur votre questionnaire et compléter votre réponse ? - - - - - - - - - - - - - - - - - - Télécharger le récapitulatif de vos - réponses au format PDF. - - - La Statistique publique vous remercie de votre collaboration à - cette enquête. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/resources/xslt/util/fr/end/end-household.xsl b/src/main/resources/xslt/util/fr/end/end-household.xsl deleted file mode 100644 index dcacf1c00..000000000 --- a/src/main/resources/xslt/util/fr/end/end-household.xsl +++ /dev/null @@ -1,199 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Template de base pour tous les éléments et tous les attributs, on recopie - simplement en sortie - - - - - - - - - - - - - - - - - - - - - non - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Vous êtes arrivé à la fin du questionnaire. - - Merci de cliquer sur le bouton "Envoyer" pour le transmettre à l'Insee. - Après envoi, vous ne pourrez plus modifier vos réponses  en ligne. - Pour toute modification,  cliquer sur le bouton "Retour". - - - - - - - - - - - - - - - - - - - - - - - - - - L'Insee vous remercie de votre collaboration à cette enquête. - - - Télécharger la preuve de votre participation à l'enquête . - - - Pour quitter l’enquête, cliquer sur le bouton "Déconnexion" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/resources/xslt/util/fr/generic-questions/generic-questions-business.xsl b/src/main/resources/xslt/util/fr/generic-questions/generic-questions-business.xsl deleted file mode 100644 index f64177340..000000000 --- a/src/main/resources/xslt/util/fr/generic-questions/generic-questions-business.xsl +++ /dev/null @@ -1,194 +0,0 @@ - - - - - - - - - - - - - - - - - - - - Template de base pour tous les éléments et tous les attributs, on recopie - simplement en sortie - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Le nombre d'heures doit être compris entre 0 et 99. - - - Le nombre de minutes doit être compris entre 0 et 59. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - heures - - - - minutes - - - - - - - - - - diff --git a/src/main/resources/xslt/util/fr/generic-questions/generic-questions-household.xsl b/src/main/resources/xslt/util/fr/generic-questions/generic-questions-household.xsl deleted file mode 100644 index e66ee0d64..000000000 --- a/src/main/resources/xslt/util/fr/generic-questions/generic-questions-household.xsl +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - - - - - - - Generic template for all elements : copy all the elements or attributes, one by one - - - - - - - - - - - Add elements to the main instance - - - - - - - - - - - - - - Add elements to the corresponding bind - - - - - - - - - - - - - - - Add elements to french resources - - - - - - - - - - - - - - - - - - Add the new page - - - - - - - - - - - - Add elements into the body - - - - - - - - - - - - - - - - diff --git a/src/main/resources/xslt/util/fr/identification.xsl b/src/main/resources/xslt/util/fr/identification.xsl index f45ce1557..b4aadaff9 100644 --- a/src/main/resources/xslt/util/fr/identification.xsl +++ b/src/main/resources/xslt/util/fr/identification.xsl @@ -4,7 +4,7 @@ xmlns:fr="http://orbeon.org/oxf/xml/form-runner" xmlns:xxf="http://orbeon.org/oxf/xml/xforms" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:xs="http://www.w3.org/2001/XMLSchema"> - + diff --git a/src/main/resources/xslt/util/fr/insert-end.xsl b/src/main/resources/xslt/util/fr/insert-end.xsl index c6a33a9f4..cb8f09179 100644 --- a/src/main/resources/xslt/util/fr/insert-end.xsl +++ b/src/main/resources/xslt/util/fr/insert-end.xsl @@ -1,73 +1,74 @@ - - - - - + + + + + + + - + - - - - - + + + + + - + - + - + - + - + - - - - - - + + + + + + - - + + - - + + - + - - - + + - - - + + + + + - + - + Template de base pour tous les éléments et tous les attributs, on recopie @@ -76,41 +77,39 @@ - + - + - + - + - + - + - + non - + - + - + - + - + @@ -120,35 +119,35 @@ - + - + - - + + - + - + - + - + - + - + - + - + @@ -157,32 +156,42 @@ - Si vous avez terminé de renseigner votre questionnaire, vous pouvez : + Si vous avez terminé de renseigner  + votre questionnaire, vous pouvez : -  transmettre à nos services vos réponses en cliquant ci-dessous sur le bouton : +  transmettre à nos services  + vos réponses en cliquant ci-dessous sur le bouton : - Si vous avez terminé de renseigner votre questionnaire, - pour le transmettre à nos services, merci de cliquer ci-dessous sur le bouton : "Envoyer". + + Si vous avez terminé de renseigner  + votre questionnaire, + pour le transmettre à nos services, merci de cliquer ci-dessous sur le bouton : "Envoyer". + Une fois le questionnaire envoyé : - - vous ne pourrez plus modifier vos réponses ; - - vous pourrez télécharger le récapitulatif de vos réponses au format pdf. + + - vous ne pourrez  + plus modifier vos réponses +  ; + + + - vous pourrez télécharger le  + récapitulatif de vos réponses au format pdf + . + - + - - - + + + @@ -192,20 +201,38 @@ Attention : si vous rouvrez un questionnaire après nous l’avoir transmis, que ce soit pour le modifier ou simplement le consulter, veillez à nous le transmettre à nouveau (bouton "Envoyer" ci-dessus). -  ne pas transmettre le questionnaire et revenir dès à présent sur vos réponses en cliquant sur le bouton :  +  ne pas transmettre le questionnaire et revenir dès à présent  + sur vos réponses en cliquant sur le bouton :  "Retour" en bas à droite ou revenir plus tard sur vos réponses en cliquant sur le lien : "Fermer le questionnaire" et en vous authentifiant à nouveau. - Dans ce cas-là, vos données seront enregistrées mais le questionnaire ne sera pas envoyé à . + Dans ce cas-là, vos données seront enregistrées mais +   + + le questionnaire ne sera pas envoyé à +   + + . + - Si vous souhaitez y apporter des modifications, vous pouvez : + Si vous souhaitez y apporter des modifications + , vous pouvez : + - revenir dessus dès à présent en cliquant sur le bouton "Retour" ; - ou plus tard en cliquant sur le bouton "Fermer le questionnaire" et en vous authentifiant à nouveau. - Dans les deux cas, vos données seront enregistrées mais le questionnaire ne sera pas - envoyé à . + + Dans les deux cas, vos données seront enregistrées mais +   + + le questionnaire ne sera pas + envoyé à + + + . + @@ -217,43 +244,55 @@ - + Vous êtes arrivé à la fin du questionnaire. - Merci de cliquer sur le bouton "Envoyer" pour le transmettre à l'Insee. - Après envoi, vous ne pourrez plus modifier vos réponses  en ligne. - Pour toute modification,  cliquer sur le bouton "Retour". + + Merci de  + cliquer +  sur le bouton " + Envoyer + " pour le transmettre à l'Insee. + + + Après envoi, vous ne pourrez  + plus modifier vos réponses +   en ligne. + + + Pour toute modification,   + cliquer +  sur le bouton " + Retour + ". + - + - - - - - - - + + + + + + + - + - + - + @@ -261,36 +300,28 @@ - Il vous sera possible d'expédier à nouveau celui-ci si une modification des réponses vous semble nécessaire. + Il vous sera possible d'expédier à nouveau celui-ci si une modification des réponses vous semble nécessaire. - Votre réponse est définitive et vous souhaitez l'envoyer. + Votre réponse est définitive et vous souhaitez l'envoyer. Je confirme l'envoi - - - - - + + + + + Ne pas envoyer - - - + + + @@ -299,60 +330,65 @@ - + - + L'Insee vous remercie de votre collaboration à cette enquête. - Télécharger la preuve de votre participation à l'enquête . + Télécharger la preuve de votre participation à l'enquête + . + - Pour quitter l’enquête, cliquer sur le bouton "Déconnexion" + Pour quitter l’enquête,  + cliquer +  sur le bouton " + Déconnexion + " - + - - - + + + + - + - + - Souhaitez-vous retourner sur votre questionnaire et compléter votre réponse ? + + Souhaitez-vous retourner sur votre questionnaire et compléter votre réponse ? + - - + + - - - + + + - - - - + + + + Télécharger le récapitulatif de vos - réponses au format PDF. + réponses au format PDF + . + La Statistique publique vous remercie de votre collaboration à @@ -364,95 +400,100 @@ Aidez-nous à améliorer notre site en répondant à notre enquête de satisfaction ! - + - - + + + - + - + - - + + - + - + - + - - - - - - - - - - + + + + + + + + + + + + + + + + + - + - + - + - + - + - - + + - + - + - - - + + + - + - + - + + + + - + + + + - - - - - - - - - + - - + + \ No newline at end of file diff --git a/src/main/resources/xslt/util/fr/insert-generic-questions.xsl b/src/main/resources/xslt/util/fr/insert-generic-questions.xsl index 543495add..cf4dba430 100644 --- a/src/main/resources/xslt/util/fr/insert-generic-questions.xsl +++ b/src/main/resources/xslt/util/fr/insert-generic-questions.xsl @@ -1,70 +1,67 @@ - - - - - - - + + + + + + + - + - - - - - + + + + + + - + - + - + - + - + - - + + - - + + - + - - + + - + - + - + - + Template de base pour tous les éléments et tous les attributs, on recopie @@ -73,10 +70,10 @@ - + - + Add elements to the main instance @@ -86,47 +83,55 @@ + - - + + - + - - - + + + - - + + - + + - - - + + + - - + + - - + + + + + + + + - + Add elements to the corresponding bind @@ -136,27 +141,27 @@ - + - - + + - + - + - + - + - + @@ -164,31 +169,36 @@ - - + + - + - + - + - + - + + + + + + - + - + Add elements to french resources @@ -198,37 +208,37 @@ - + - + @@ -247,28 +257,28 @@ - + - - + + @@ -287,13 +297,19 @@ - + + + + + + + - + Add the new page @@ -301,30 +317,30 @@ - + - - + + - + - + - + - + Add elements into the body @@ -334,49 +350,44 @@ - + - - + + - - + + - - + + - - + + - + - - + + - - + + heures - - + + minutes - - + + @@ -385,41 +396,43 @@ - - + + - + - - + + - - + + heures - - + + minutes - - + + + + + + + + - + - + \ No newline at end of file diff --git a/src/main/resources/xslt/util/fr/insert-welcome.xsl b/src/main/resources/xslt/util/fr/insert-welcome.xsl index 0567ac288..032d96214 100644 --- a/src/main/resources/xslt/util/fr/insert-welcome.xsl +++ b/src/main/resources/xslt/util/fr/insert-welcome.xsl @@ -1,105 +1,112 @@ - - - + + + + + - + - + - + - + - - - + + + - - + + - - + + - + - - - - - + + + + + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - + - + Template de base pour tous les éléments et tous les attributs, on recopie @@ -108,41 +115,41 @@ - + - + - - - - + + + + - - - - - - - + + + + + + + - + - - - - - - - + + + + + + + - + @@ -151,10 +158,10 @@ @@ -170,16 +177,16 @@ <div class="frame"><p>Cette enquête - + , à <b><span style="text-decoration:underline">caractère obligatoire</span></b>, est reconnue d'<b> - + </b>.</p><p>Merci de répondre avant le : <b>øDATE_RETOUR_SOUHAITEEø</b></p></div> - + @@ -211,7 +218,7 @@ <p>Lorsque vous quitterez ce questionnaire, privilégiez la fermeture par le bouton <b>Déconnexion</b> afin d'éviter d'éventuels problèmes de navigation ultérieurs.</p> <p><b>Veuillez utiliser les boutons <button class="btn txt" type="button" style="cursor: default;" tabIndex="-1">Retour </button> et <button class="btn txt" type="button" style="cursor: default;" tabIndex="-1">Enregistrer et continuer </button> pour naviguer dans le questionnaire</b> et non pas les boutons "Précédent" et "Suivant" de votre - navigateur.</p><p> + navigateur.</p><p></div> @@ -225,8 +232,7 @@ <div class="frame"><p>Vu l'avis favorable du Conseil national de l'information statistique, cette enquête - + , reconnue d’intérêt général et de qualité statistique, est obligatoire @@ -234,63 +240,62 @@ , en application de la <a href=" - + " target="_blank">loi n° 51-711 du 7 juin 1951</a> sur l’obligation, la coordination et le secret en matière de statistiques. - + </p><p>Visa n° - - - + + + du - + , valable pour l'année - + - + - Arrêté en date du - + - Arrêté en cours de parution .</p><p>Les réponses à ce questionnaire sont protégées par le secret statistique et destinées à - + . Le <a href=" - + " target="_blank">règlement général 2016/679 du 27 avril 2016 sur la protection des données (RGPD)</a> ainsi que la <a href=" - + " target="_blank">loi n° 78-17 du 6 janvier 1978 relative à l'informatique, aux fichiers et aux libertés</a>, s'appliquent à la présente enquête. Les droits des personnes, rappelés dans la lettre-avis, peuvent être exercés auprès de - + .</p></div> <div class="frame"><p>Vu l'avis favorable du Conseil national de l'information statistique, cette enquête - + , reconnue d'<b> - + , est obligatoire, </b>en application de la <a href=" - + " target="_blank">loi n° 51-711 du 7 juin 1951 modifiée</a> sur l’obligation, la coordination et le secret en matière de statistiques. est reconnue d'<b> - + </b> sans avoir de caractère obligatoire, en application de la <a href=" - + " target="_blank">loi n° 51-711 du 7 juin 1951 modifiée</a> sur l’obligation, la coordination et le secret en matière de statistiques. @@ -299,164 +304,150 @@ dans le cadre des mesures de simplification pour les entreprises. </p><p>Visa n° - - - + + + du - + , + valable pour l'année - + .</p><p>Les réponses à ce questionnaire sont protégées par le secret statistique et destinées à - - .</p> - + + </p> + <p>Le <a href=" - + " target="_blank">règlement général 2016/679 du 27 avril 2016</a> sur la protection des données (RGPD) ainsi que la <a href=" - + " target="_blank">loi n°78-17 du 6 janvier 1978 modifiée</a> relative à l'informatique, aux fichiers et aux libertés s'appliquent à la présente enquête pour les données à caractère personnel. Ces droits, rappelés dans la lettre-avis, peuvent être exercés auprès de - + .</p> .</div> - + - - - + + + - + - + - - - - + + + + - + - + - + - - + + - - + + - - + + - - + + - + - + - - + + - + - - + + - + - + - + - + - + - + - - - + + + concat('round((',$new-loop-number,'-2'))" /> - + - + - + - + - + - + - - - + + \ No newline at end of file diff --git a/src/main/resources/xslt/util/fr/patron/patron-business.xsl b/src/main/resources/xslt/util/fr/patron/patron-business.xsl deleted file mode 100644 index 28be1c9a0..000000000 --- a/src/main/resources/xslt/util/fr/patron/patron-business.xsl +++ /dev/null @@ -1,174 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Template de base pour tous les éléments et tous les attributs, on recopie - simplement en sortie - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/resources/xslt/util/fr/patron/patron-household.xsl b/src/main/resources/xslt/util/fr/patron/patron-household.xsl deleted file mode 100644 index de6ae7f38..000000000 --- a/src/main/resources/xslt/util/fr/patron/patron-household.xsl +++ /dev/null @@ -1,169 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Template de base pour tous les éléments et tous les attributs, on recopie - simplement en sortie - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/resources/xslt/util/fr/welcome/welcome-business.xsl b/src/main/resources/xslt/util/fr/welcome/welcome-business.xsl deleted file mode 100644 index 603f39489..000000000 --- a/src/main/resources/xslt/util/fr/welcome/welcome-business.xsl +++ /dev/null @@ -1,348 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Template de base pour tous les éléments et tous les attributs, on recopie - simplement en sortie - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/resources/xslt/util/fr/welcome/welcome-household.xsl b/src/main/resources/xslt/util/fr/welcome/welcome-household.xsl deleted file mode 100644 index 67e0db631..000000000 --- a/src/main/resources/xslt/util/fr/welcome/welcome-household.xsl +++ /dev/null @@ -1,330 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Template de base pour tous les éléments et tous les attributs, on recopie - simplement en sortie - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/resources/xslt/util/pdf/insert-end-questions.xsl b/src/main/resources/xslt/util/pdf/insert-end-questions.xsl index 2eb624fb5..eed20b0bc 100644 --- a/src/main/resources/xslt/util/pdf/insert-end-questions.xsl +++ b/src/main/resources/xslt/util/pdf/insert-end-questions.xsl @@ -1,117 +1,111 @@ - - - - - - + + + + + + This stylesheet inserts the end questions according to the parameters - + The properties file used by the stylesheet. It's on a transformation level. - - + + - + - + The properties and parameters files are charged as xml trees. - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - + - - + + Root template. - + - + Default template for every element and every attribute, simply coying to the output file. @@ -119,34 +113,32 @@ - + - + - + - + - + - - - - + + - + - + \ No newline at end of file From d8acbb6d18d1ca1750e43d636206e526981e2c67 Mon Sep 17 00:00:00 2001 From: Laurent Caouissin Date: Mon, 30 Sep 2019 16:47:31 +0200 Subject: [PATCH 181/439] Eno params : split ddi PreProcessings - create 3 steps (dereferencing, cleaning, titling) --- .../DDICleaningPreprocessor.java | 77 +++++-------------- .../DDIDereferencingPreprocessor.java | 54 ++++--------- .../preprocessing/DDIMappingPreprocessor.java | 15 +++- .../preprocessing/DDITitlingPreprocessor.java | 75 ++++-------------- 4 files changed, 64 insertions(+), 157 deletions(-) diff --git a/src/main/java/fr/insee/eno/preprocessing/DDICleaningPreprocessor.java b/src/main/java/fr/insee/eno/preprocessing/DDICleaningPreprocessor.java index 29e3a14a1..6628e2317 100644 --- a/src/main/java/fr/insee/eno/preprocessing/DDICleaningPreprocessor.java +++ b/src/main/java/fr/insee/eno/preprocessing/DDICleaningPreprocessor.java @@ -9,63 +9,36 @@ import org.apache.commons.io.FilenameUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import fr.insee.eno.Constants; +import fr.insee.eno.parameters.PreProcessing; import fr.insee.eno.transform.xsl.XslTransformation; /** * A DDI specific preprocessor. */ +@Service public class DDICleaningPreprocessor implements Preprocessor { private static final Logger logger = LoggerFactory.getLogger(DDICleaningPreprocessor.class); - // FIXME Inject ! - private static XslTransformation saxonService = new XslTransformation(); + @Autowired + private XslTransformation saxonService; @Override public File process(File inputFile, byte[] parametersFile, String survey, String in2out) throws Exception { logger.info("DDIPreprocessing Target : START"); - - String sUB_TEMP_FOLDER = Constants.sUB_TEMP_FOLDER(survey); - // ----- Dereferencing - logger.debug("Dereferencing : -Input : " + inputFile + " -Output : " + Constants.tEMP_NULL_TMP(sUB_TEMP_FOLDER) - + " -Stylesheet : " + Constants.UTIL_DDI_DEREFERENCING_XSL + " -Parameters : " + sUB_TEMP_FOLDER); - - InputStream isDDI_DEREFERENCING_XSL = Constants.getInputStreamFromPath(Constants.DDI_DEREFERENCING_XSL); - InputStream isInputFile = FileUtils.openInputStream(inputFile); - OutputStream osTEMP_NULL_TMP = FileUtils.openOutputStream(Constants.tEMP_NULL_TMP(sUB_TEMP_FOLDER)); - saxonService.transformDereferencing(isInputFile, isDDI_DEREFERENCING_XSL, osTEMP_NULL_TMP, - Constants.sUB_TEMP_FOLDER_FILE(survey)); // FIXME 4th param - // should be a - // parameters file - // (?!!?). - isInputFile.close(); - isDDI_DEREFERENCING_XSL.close(); - osTEMP_NULL_TMP.close(); - // ----- Cleaning - logger.debug("Cleaning target"); - File f = Constants.sUB_TEMP_FOLDER_FILE(survey); - File[] matchCleaningInput = f.listFiles(new FilenameFilter() { - - @Override - public boolean accept(File dir, String name) { - return !name.startsWith("null"); - } - }); - String cleaningInput = null; - String cleaningOutput = null; - - logger.debug("Searching matching files in : " + sUB_TEMP_FOLDER); - for (File file : matchCleaningInput) { - cleaningInput = file.getAbsolutePath(); - logger.debug("Found : " + cleaningInput); - } - + + String cleaningOutput=null; + String cleaningInput = inputFile.getAbsolutePath(); cleaningOutput = FilenameUtils.removeExtension(cleaningInput) + Constants.CLEANED_EXTENSION; + logger.debug("Cleaned output file to be created : " + cleaningOutput); logger.debug("Cleaning : -Input : " + cleaningInput + " -Output : " + cleaningOutput + " -Stylesheet : " + Constants.UTIL_DDI_CLEANING_XSL); + InputStream isCleaningIn = FileUtils.openInputStream(new File(cleaningInput)); OutputStream osCleaning = FileUtils.openOutputStream(new File(cleaningOutput)); InputStream isUTIL_DDI_CLEANING_XSL = Constants.getInputStreamFromPath(Constants.UTIL_DDI_CLEANING_XSL); @@ -75,26 +48,14 @@ public boolean accept(File dir, String name) { isCleaningIn.close(); isUTIL_DDI_CLEANING_XSL.close(); osCleaning.close(); - // ----- Titling - // titlinginput = cleaningoutput - - String outputTitling = null; - - outputTitling = FilenameUtils.removeExtension(cleaningInput) + Constants.FINAL_EXTENSION; - - logger.debug("Titling : -Input : " + cleaningOutput + " -Output : " + outputTitling + " -Stylesheet : " - + Constants.UTIL_DDI_TITLING_XSL + " -Parameters : " - + (parametersFile == null ? "Default parameters" : "Provided parameters")); - - InputStream isCleaningTitling = FileUtils.openInputStream(new File(cleaningOutput)); - InputStream isUTIL_DDI_TITLING_XSL = Constants.getInputStreamFromPath(Constants.UTIL_DDI_TITLING_XSL); - OutputStream osTitling = FileUtils.openOutputStream(new File(outputTitling)); - saxonService.transformTitling(isCleaningTitling, isUTIL_DDI_TITLING_XSL, osTitling, parametersFile); - isCleaningTitling.close(); - isUTIL_DDI_TITLING_XSL.close(); - osTitling.close(); - logger.debug("DDIPreprocessing : END"); - return new File(outputTitling); + + logger.debug("DDIPreprocessing Cleaning: END"); + return new File(cleaningOutput); } + + public String toString() { + return PreProcessing.DDI_CLEANING.name(); + } + } diff --git a/src/main/java/fr/insee/eno/preprocessing/DDIDereferencingPreprocessor.java b/src/main/java/fr/insee/eno/preprocessing/DDIDereferencingPreprocessor.java index 84d45fb04..f47a5b173 100644 --- a/src/main/java/fr/insee/eno/preprocessing/DDIDereferencingPreprocessor.java +++ b/src/main/java/fr/insee/eno/preprocessing/DDIDereferencingPreprocessor.java @@ -9,19 +9,23 @@ import org.apache.commons.io.FilenameUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import fr.insee.eno.Constants; +import fr.insee.eno.parameters.PreProcessing; import fr.insee.eno.transform.xsl.XslTransformation; /** * A DDI specific preprocessor. */ +@Service public class DDIDereferencingPreprocessor implements Preprocessor { private static final Logger logger = LoggerFactory.getLogger(DDIDereferencingPreprocessor.class); - // FIXME Inject ! - private static XslTransformation saxonService = new XslTransformation(); + @Autowired + private XslTransformation saxonService; @Override public File process(File inputFile, byte[] parametersFile, String survey, String in2out) throws Exception { @@ -53,48 +57,22 @@ public boolean accept(File dir, String name) { return !name.startsWith("null"); } }); + String cleaningInput = null; - String cleaningOutput = null; - + logger.debug("Searching matching files in : " + sUB_TEMP_FOLDER); for (File file : matchCleaningInput) { cleaningInput = file.getAbsolutePath(); logger.debug("Found : " + cleaningInput); } - - cleaningOutput = FilenameUtils.removeExtension(cleaningInput) + Constants.CLEANED_EXTENSION; - logger.debug("Cleaned output file to be created : " + cleaningOutput); - logger.debug("Cleaning : -Input : " + cleaningInput + " -Output : " + cleaningOutput + " -Stylesheet : " - + Constants.UTIL_DDI_CLEANING_XSL); - InputStream isCleaningIn = FileUtils.openInputStream(new File(cleaningInput)); - OutputStream osCleaning = FileUtils.openOutputStream(new File(cleaningOutput)); - InputStream isUTIL_DDI_CLEANING_XSL = Constants.getInputStreamFromPath(Constants.UTIL_DDI_CLEANING_XSL); - - saxonService.transformCleaning(isCleaningIn, isUTIL_DDI_CLEANING_XSL, osCleaning, in2out); - - isCleaningIn.close(); - isUTIL_DDI_CLEANING_XSL.close(); - osCleaning.close(); - // ----- Titling - // titlinginput = cleaningoutput - - String outputTitling = null; - - outputTitling = FilenameUtils.removeExtension(cleaningInput) + Constants.FINAL_EXTENSION; - - logger.debug("Titling : -Input : " + cleaningOutput + " -Output : " + outputTitling + " -Stylesheet : " - + Constants.UTIL_DDI_TITLING_XSL + " -Parameters : " - + (parametersFile == null ? "Default parameters" : "Provided parameters")); - - InputStream isCleaningTitling = FileUtils.openInputStream(new File(cleaningOutput)); - InputStream isUTIL_DDI_TITLING_XSL = Constants.getInputStreamFromPath(Constants.UTIL_DDI_TITLING_XSL); - OutputStream osTitling = FileUtils.openOutputStream(new File(outputTitling)); - saxonService.transformTitling(isCleaningTitling, isUTIL_DDI_TITLING_XSL, osTitling, parametersFile); - isCleaningTitling.close(); - isUTIL_DDI_TITLING_XSL.close(); - osTitling.close(); - logger.debug("DDIPreprocessing : END"); - return new File(outputTitling); + + logger.debug("DDIPreprocessing Dereferencing : END"); + return new File(cleaningInput); } + + public String toString() { + return PreProcessing.DDI_DEREFERENCING.name(); + } + } diff --git a/src/main/java/fr/insee/eno/preprocessing/DDIMappingPreprocessor.java b/src/main/java/fr/insee/eno/preprocessing/DDIMappingPreprocessor.java index fa4bf6b36..2afd00379 100644 --- a/src/main/java/fr/insee/eno/preprocessing/DDIMappingPreprocessor.java +++ b/src/main/java/fr/insee/eno/preprocessing/DDIMappingPreprocessor.java @@ -7,23 +7,29 @@ import org.apache.commons.io.FileUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; +import org.springframework.stereotype.Service; import fr.insee.eno.Constants; +import fr.insee.eno.parameters.PreProcessing; import fr.insee.eno.transform.xsl.XslTransformation; /** * A DDI specific preprocessor. */ +@Service public class DDIMappingPreprocessor implements Preprocessor { private static final Logger logger = LoggerFactory.getLogger(DDIMappingPreprocessor.class); - // FIXME Inject ! - private static XslTransformation saxonService = new XslTransformation(); + @Autowired + private XslTransformation saxonService; @Override public File process(File inputFile, byte[] parametersFile, String survey, String in2out) throws Exception { logger.info("DDIPreprocessing Target : START"); + System.out.println(saxonService); String sUB_TEMP_FOLDER = Constants.tEMP_DDI_FOLDER(Constants.sUB_TEMP_FOLDER(survey)); @@ -44,5 +50,10 @@ public File process(File inputFile, byte[] parametersFile, String survey, String return mappingFile; } + + public String toString() { + return PreProcessing.DDI_MAPPING.name(); + } + } diff --git a/src/main/java/fr/insee/eno/preprocessing/DDITitlingPreprocessor.java b/src/main/java/fr/insee/eno/preprocessing/DDITitlingPreprocessor.java index 8ab76c6b1..7c3a5d0fb 100644 --- a/src/main/java/fr/insee/eno/preprocessing/DDITitlingPreprocessor.java +++ b/src/main/java/fr/insee/eno/preprocessing/DDITitlingPreprocessor.java @@ -1,100 +1,57 @@ package fr.insee.eno.preprocessing; import java.io.File; -import java.io.FilenameFilter; import java.io.InputStream; import java.io.OutputStream; import org.apache.commons.io.FileUtils; -import org.apache.commons.io.FilenameUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import fr.insee.eno.Constants; +import fr.insee.eno.parameters.PreProcessing; import fr.insee.eno.transform.xsl.XslTransformation; /** * A DDI specific preprocessor. */ +@Service public class DDITitlingPreprocessor implements Preprocessor { private static final Logger logger = LoggerFactory.getLogger(DDITitlingPreprocessor.class); - // FIXME Inject ! - private static XslTransformation saxonService = new XslTransformation(); + @Autowired + private XslTransformation saxonService; @Override public File process(File inputFile, byte[] parametersFile, String survey, String in2out) throws Exception { logger.info("DDIPreprocessing Target : START"); - String sUB_TEMP_FOLDER = Constants.sUB_TEMP_FOLDER(survey); - // ----- Dereferencing - logger.debug("Dereferencing : -Input : " + inputFile + " -Output : " + Constants.tEMP_NULL_TMP(sUB_TEMP_FOLDER) - + " -Stylesheet : " + Constants.UTIL_DDI_DEREFERENCING_XSL + " -Parameters : " + sUB_TEMP_FOLDER); - - InputStream isDDI_DEREFERENCING_XSL = Constants.getInputStreamFromPath(Constants.DDI_DEREFERENCING_XSL); - InputStream isInputFile = FileUtils.openInputStream(inputFile); - OutputStream osTEMP_NULL_TMP = FileUtils.openOutputStream(Constants.tEMP_NULL_TMP(sUB_TEMP_FOLDER)); - saxonService.transformDereferencing(isInputFile, isDDI_DEREFERENCING_XSL, osTEMP_NULL_TMP, - Constants.sUB_TEMP_FOLDER_FILE(survey)); // FIXME 4th param - // should be a - // parameters file - // (?!!?). - isInputFile.close(); - isDDI_DEREFERENCING_XSL.close(); - osTEMP_NULL_TMP.close(); - // ----- Cleaning - logger.debug("Cleaning target"); - File f = Constants.sUB_TEMP_FOLDER_FILE(survey); - File[] matchCleaningInput = f.listFiles(new FilenameFilter() { - - @Override - public boolean accept(File dir, String name) { - return !name.startsWith("null"); - } - }); - String cleaningInput = null; - String cleaningOutput = null; - - logger.debug("Searching matching files in : " + sUB_TEMP_FOLDER); - for (File file : matchCleaningInput) { - cleaningInput = file.getAbsolutePath(); - logger.debug("Found : " + cleaningInput); - } - - cleaningOutput = FilenameUtils.removeExtension(cleaningInput) + Constants.CLEANED_EXTENSION; - logger.debug("Cleaned output file to be created : " + cleaningOutput); - logger.debug("Cleaning : -Input : " + cleaningInput + " -Output : " + cleaningOutput + " -Stylesheet : " - + Constants.UTIL_DDI_CLEANING_XSL); - InputStream isCleaningIn = FileUtils.openInputStream(new File(cleaningInput)); - OutputStream osCleaning = FileUtils.openOutputStream(new File(cleaningOutput)); - InputStream isUTIL_DDI_CLEANING_XSL = Constants.getInputStreamFromPath(Constants.UTIL_DDI_CLEANING_XSL); - - saxonService.transformCleaning(isCleaningIn, isUTIL_DDI_CLEANING_XSL, osCleaning, in2out); - - isCleaningIn.close(); - isUTIL_DDI_CLEANING_XSL.close(); - osCleaning.close(); - // ----- Titling - // titlinginput = cleaningoutput - String outputTitling = null; + String titlingInput = inputFile.getAbsolutePath(); - outputTitling = FilenameUtils.removeExtension(cleaningInput) + Constants.FINAL_EXTENSION; + outputTitling = titlingInput.replace(Constants.CLEANED_EXTENSION, Constants.FINAL_EXTENSION); - logger.debug("Titling : -Input : " + cleaningOutput + " -Output : " + outputTitling + " -Stylesheet : " + logger.debug("Titling : -Input : " + titlingInput + " -Output : " + outputTitling + " -Stylesheet : " + Constants.UTIL_DDI_TITLING_XSL + " -Parameters : " + (parametersFile == null ? "Default parameters" : "Provided parameters")); - InputStream isCleaningTitling = FileUtils.openInputStream(new File(cleaningOutput)); + InputStream isCleaningTitling = FileUtils.openInputStream(new File(titlingInput)); InputStream isUTIL_DDI_TITLING_XSL = Constants.getInputStreamFromPath(Constants.UTIL_DDI_TITLING_XSL); OutputStream osTitling = FileUtils.openOutputStream(new File(outputTitling)); saxonService.transformTitling(isCleaningTitling, isUTIL_DDI_TITLING_XSL, osTitling, parametersFile); + isCleaningTitling.close(); isUTIL_DDI_TITLING_XSL.close(); osTitling.close(); - logger.debug("DDIPreprocessing : END"); + logger.debug("DDIPreprocessing titling: END"); return new File(outputTitling); } + + public String toString() { + return PreProcessing.DDI_TITLING.name(); + } } From 467fdacd4eaee0a9d61337682b48a611380d6843 Mon Sep 17 00:00:00 2001 From: Laurent Caouissin Date: Mon, 30 Sep 2019 16:51:42 +0200 Subject: [PATCH 182/439] Eno params : add spring :leaves: --- pom.xml | 26 +- .../java/fr/insee/eno/ApplicationContext.java | 10 + .../insee/eno/generation/DDI2FRGenerator.java | 20 +- .../insee/eno/generation/DDI2JSGenerator.java | 7 +- .../eno/generation/DDI2ODTGenerator.java | 7 +- .../eno/generation/DDI2PDFGenerator.java | 7 +- .../generation/DDI2PoguesXMLGenerator.java | 11 +- .../generation/PoguesXML2DDIGenerator.java | 7 +- .../pipeline/PipeLineGeneratorImpl.java | 158 ++++++--- .../eno/postprocessing/NoopPostprocessor.java | 2 + .../eno/postprocessing/Postprocessor.java | 2 + .../fr/FRBrowsingPostprocessor.java | 17 +- .../fr/FREditPatronPostprocessor.java | 19 +- .../fr/FRFixAdherencePostprocessor.java | 16 +- .../fr/FRIdentificationPostprocessor.java | 17 +- .../fr/FRInsertEndPostprocessor.java | 17 +- ...FRInsertGenericQuestionsPostprocessor.java | 17 +- .../fr/FRInsertWelcomePostprocessor.java | 17 +- .../fr/FRModeleColtranePostprocessor.java | 17 +- .../fr/FRSpecificTreatmentPostprocessor.java | 19 +- .../JSExternalizeVariablesPostprocessor.java | 16 +- .../js/JSSortComponentsPostprocessor.java | 16 +- .../PDFEditStructurePagesPostprocessor.java | 16 +- ...FInsertAccompanyingMailsPostprocessor.java | 16 +- .../pdf/PDFInsertCoverPagePostprocessor.java | 16 +- .../PDFInsertEndQuestionPostprocessor.java | 16 +- .../pdf/PDFMailingPostprocessor.java | 16 +- .../PDFSpecificTreatmentPostprocessor.java | 62 ++-- .../pdf/PDFTableColumnPostprocessorFake.java | 10 +- .../eno/preprocessing/DDIPreprocessor.java | 7 +- .../preprocessing/PoguesXMLPreprocessor.java | 10 +- .../PoguesXMLPreprocessorGoToTreatment.java | 13 +- .../insee/eno/preprocessing/Preprocessor.java | 1 + .../eno/transform/xsl/XslTransformation.java | 299 +++++++++--------- 34 files changed, 627 insertions(+), 300 deletions(-) create mode 100644 src/main/java/fr/insee/eno/ApplicationContext.java diff --git a/pom.xml b/pom.xml index 6b14b93ec..07733bb1f 100644 --- a/pom.xml +++ b/pom.xml @@ -51,6 +51,7 @@ 2.5 9.7.0-8 2.2 + 5.1.5.RELEASE 3.0.1 3.0.0 UTF-8 @@ -88,13 +89,34 @@ ${fop.version} - + org.slf4j slf4j-api 1.7.25 + + + org.springframework + spring-core + ${spring.version} + + + + org.springframework + spring-context + ${spring.version} + + + + org.springframework + spring-test + ${spring.version} + test + + + org.apache.commons @@ -132,8 +154,6 @@ 2.6.0 - - diff --git a/src/main/java/fr/insee/eno/ApplicationContext.java b/src/main/java/fr/insee/eno/ApplicationContext.java new file mode 100644 index 000000000..bcec2106d --- /dev/null +++ b/src/main/java/fr/insee/eno/ApplicationContext.java @@ -0,0 +1,10 @@ +package fr.insee.eno; + +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Configuration; + +@Configuration +@ComponentScan(basePackages = {"fr.insee.eno"}) +public class ApplicationContext { + +} diff --git a/src/main/java/fr/insee/eno/generation/DDI2FRGenerator.java b/src/main/java/fr/insee/eno/generation/DDI2FRGenerator.java index 6f853caaf..d3693c9e0 100644 --- a/src/main/java/fr/insee/eno/generation/DDI2FRGenerator.java +++ b/src/main/java/fr/insee/eno/generation/DDI2FRGenerator.java @@ -8,18 +8,21 @@ import org.apache.commons.io.FilenameUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import fr.insee.eno.Constants; import fr.insee.eno.transform.xsl.XslParameters; import fr.insee.eno.transform.xsl.XslTransformation; +@Service public class DDI2FRGenerator implements Generator { private static final Logger logger = LoggerFactory.getLogger(DDI2FRGenerator.class); - // FIXME Inject ! - private static XslTransformation saxonService = new XslTransformation(); + @Autowired + private XslTransformation saxonService; @Override public File generate(File finalInput, byte[] parameters, String surveyName) throws Exception { @@ -49,18 +52,7 @@ public File generate(File finalInput, byte[] parameters, String surveyName) thro isFinalInput.close(); osOutputBasicForm.close(); - String outputForm = Constants.TEMP_FOLDER_PATH + "/" + surveyName + "/" + formNameFolder + "/form/form.xhtml"; - - InputStream isOutputBasicFormPath = FileUtils.openInputStream(new File(outputBasicFormPath)); - OutputStream osOutputForm = FileUtils.openOutputStream(new File(outputForm)); - InputStream isBROWSING_TEMPLATE_XSL = Constants.getInputStreamFromPath(Constants.UTIL_FR_BROWSING_XSL); - saxonService.transformBrowsingDDI2FR(isOutputBasicFormPath, osOutputForm, isBROWSING_TEMPLATE_XSL, - Constants.LABEL_FOLDER); - isOutputBasicFormPath.close(); - osOutputForm.close(); - isBROWSING_TEMPLATE_XSL.close(); - - return new File(outputForm); + return new File(outputBasicFormPath); } /** diff --git a/src/main/java/fr/insee/eno/generation/DDI2JSGenerator.java b/src/main/java/fr/insee/eno/generation/DDI2JSGenerator.java index 5daca617c..a73ce1d2c 100644 --- a/src/main/java/fr/insee/eno/generation/DDI2JSGenerator.java +++ b/src/main/java/fr/insee/eno/generation/DDI2JSGenerator.java @@ -8,17 +8,20 @@ import org.apache.commons.io.FilenameUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import fr.insee.eno.Constants; import fr.insee.eno.transform.xsl.XslParameters; import fr.insee.eno.transform.xsl.XslTransformation; +@Service public class DDI2JSGenerator implements Generator { private static final Logger logger = LoggerFactory.getLogger(DDI2JSGenerator.class); - // FIXME Inject ! - private static XslTransformation saxonService = new XslTransformation(); + @Autowired + private XslTransformation saxonService; @Override public File generate(File finalInput, byte[] parameters, String surveyName) throws Exception { diff --git a/src/main/java/fr/insee/eno/generation/DDI2ODTGenerator.java b/src/main/java/fr/insee/eno/generation/DDI2ODTGenerator.java index df3071916..4a29d26bb 100644 --- a/src/main/java/fr/insee/eno/generation/DDI2ODTGenerator.java +++ b/src/main/java/fr/insee/eno/generation/DDI2ODTGenerator.java @@ -8,17 +8,20 @@ import org.apache.commons.io.FilenameUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import fr.insee.eno.Constants; import fr.insee.eno.transform.xsl.XslParameters; import fr.insee.eno.transform.xsl.XslTransformation; +@Service public class DDI2ODTGenerator implements Generator { private static final Logger logger = LoggerFactory.getLogger(DDI2ODTGenerator.class); - // FIXME Inject ! - private static XslTransformation saxonService = new XslTransformation(); + @Autowired + private XslTransformation saxonService; @Override public File generate(File finalInput, byte[] parameters, String surveyName) throws Exception { diff --git a/src/main/java/fr/insee/eno/generation/DDI2PDFGenerator.java b/src/main/java/fr/insee/eno/generation/DDI2PDFGenerator.java index 37db8093f..515be9162 100644 --- a/src/main/java/fr/insee/eno/generation/DDI2PDFGenerator.java +++ b/src/main/java/fr/insee/eno/generation/DDI2PDFGenerator.java @@ -8,17 +8,20 @@ import org.apache.commons.io.FilenameUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import fr.insee.eno.Constants; import fr.insee.eno.transform.xsl.XslParameters; import fr.insee.eno.transform.xsl.XslTransformation; +@Service public class DDI2PDFGenerator implements Generator { private static final Logger logger = LoggerFactory.getLogger(DDI2PDFGenerator.class); - // FIXME Inject ! - private static XslTransformation saxonService = new XslTransformation(); + @Autowired + private XslTransformation saxonService; @Override public File generate(File finalInput, byte[] parameters, String surveyName) throws Exception { diff --git a/src/main/java/fr/insee/eno/generation/DDI2PoguesXMLGenerator.java b/src/main/java/fr/insee/eno/generation/DDI2PoguesXMLGenerator.java index f50ccee93..da8e88634 100644 --- a/src/main/java/fr/insee/eno/generation/DDI2PoguesXMLGenerator.java +++ b/src/main/java/fr/insee/eno/generation/DDI2PoguesXMLGenerator.java @@ -1,24 +1,23 @@ package fr.insee.eno.generation; import java.io.File; -import java.io.InputStream; -import java.io.OutputStream; -import org.apache.commons.io.FileUtils; import org.apache.commons.io.FilenameUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; -import fr.insee.eno.Constants; import fr.insee.eno.transform.xsl.XslParameters; import fr.insee.eno.transform.xsl.XslTransformation; +@Service public class DDI2PoguesXMLGenerator implements Generator { private static final Logger logger = LoggerFactory.getLogger(DDI2PoguesXMLGenerator.class); - // FIXME Inject ! - private static XslTransformation saxonService = new XslTransformation(); + @Autowired + private XslTransformation saxonService; @Override public File generate(File finalInput, byte[] parameters, String surveyName) throws Exception { diff --git a/src/main/java/fr/insee/eno/generation/PoguesXML2DDIGenerator.java b/src/main/java/fr/insee/eno/generation/PoguesXML2DDIGenerator.java index a11f44483..7e2477f7d 100644 --- a/src/main/java/fr/insee/eno/generation/PoguesXML2DDIGenerator.java +++ b/src/main/java/fr/insee/eno/generation/PoguesXML2DDIGenerator.java @@ -8,17 +8,20 @@ import org.apache.commons.io.FilenameUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import fr.insee.eno.Constants; import fr.insee.eno.transform.xsl.XslParameters; import fr.insee.eno.transform.xsl.XslTransformation; +@Service public class PoguesXML2DDIGenerator implements Generator { private static final Logger logger = LoggerFactory.getLogger(PoguesXML2DDIGenerator.class); - // FIXME Inject ! - private static XslTransformation saxonService = new XslTransformation(); + @Autowired + private XslTransformation saxonService; @Override public File generate(File finalInput, byte[] parameters, String surveyName) throws Exception { diff --git a/src/main/java/fr/insee/eno/params/pipeline/PipeLineGeneratorImpl.java b/src/main/java/fr/insee/eno/params/pipeline/PipeLineGeneratorImpl.java index 241f2b142..38a29a1e2 100644 --- a/src/main/java/fr/insee/eno/params/pipeline/PipeLineGeneratorImpl.java +++ b/src/main/java/fr/insee/eno/params/pipeline/PipeLineGeneratorImpl.java @@ -1,10 +1,13 @@ package fr.insee.eno.params.pipeline; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import fr.insee.eno.GenerationService; import fr.insee.eno.generation.DDI2FRGenerator; @@ -21,7 +24,7 @@ import fr.insee.eno.parameters.PreProcessing; import fr.insee.eno.postprocessing.NoopPostprocessor; import fr.insee.eno.postprocessing.Postprocessor; -import fr.insee.eno.postprocessing.ddi.DDIPostprocessor; +import fr.insee.eno.postprocessing.ddi.DDIMarkdown2XhtmlPostprocessor; import fr.insee.eno.postprocessing.fr.FRBrowsingPostprocessor; import fr.insee.eno.postprocessing.fr.FREditPatronPostprocessor; import fr.insee.eno.postprocessing.fr.FRFixAdherencePostprocessor; @@ -47,20 +50,90 @@ import fr.insee.eno.preprocessing.PoguesXMLPreprocessorGoToTreatment; import fr.insee.eno.preprocessing.Preprocessor; +@Service public class PipeLineGeneratorImpl implements PipelineGenerator { - private static final Logger logger = LoggerFactory.getLogger(PipeLineGeneratorImpl.class); + private static final Logger LOGGER = LoggerFactory.getLogger(PipeLineGeneratorImpl.class); + + // In2Out Generator + @Autowired + DDI2FRGenerator ddi2frGenerator; + @Autowired + DDI2JSGenerator ddi2jsGenerator; + @Autowired + DDI2ODTGenerator ddi2odtGenerator; + @Autowired + DDI2PDFGenerator ddi2pdfGenerator; + @Autowired + DDI2PoguesXMLGenerator ddi2poguesXmlGenerator; + @Autowired + PoguesXML2DDIGenerator poguesXml2ddiGenerator; + + // PreProcessing + @Autowired + DDIDereferencingPreprocessor ddiDereferencing; + @Autowired + DDICleaningPreprocessor ddiCleaning; + @Autowired + DDITitlingPreprocessor ddiTitling; + @Autowired + DDIMappingPreprocessor ddiMapping; + @Autowired + PoguesXMLPreprocessorGoToTreatment poguesXmlGoTo; + + // PostProcessing + @Autowired + DDIMarkdown2XhtmlPostprocessor ddiMW2XHTML; + @Autowired + FRBrowsingPostprocessor frBrowsing; + @Autowired + FREditPatronPostprocessor frEditPatron; + @Autowired + FRFixAdherencePostprocessor frFixAdherence; + @Autowired + FRIdentificationPostprocessor frIdentification; + @Autowired + FRInsertEndPostprocessor frInsertEnd; + @Autowired + FRInsertGenericQuestionsPostprocessor frInsertGenericQuestions; + @Autowired + FRInsertWelcomePostprocessor frInsertWelcome; + @Autowired + FRModeleColtranePostprocessor frModeleColtrane; + @Autowired + FRSpecificTreatmentPostprocessor frSpecificTreatment; + @Autowired + PDFEditStructurePagesPostprocessor pdfEditStructurePages; + @Autowired + PDFInsertAccompanyingMailsPostprocessor pdfInsertAccompanyingMails; + @Autowired + PDFInsertCoverPagePostprocessor pdfInsertCoverPage; + @Autowired + PDFInsertEndQuestionPostprocessor pdfInsertEndQuestion; + @Autowired + PDFMailingPostprocessor pdfMailing; + @Autowired + PDFSpecificTreatmentPostprocessor pdfSpecificTreatment; + @Autowired + PDFTableColumnPostprocessorFake pdfTableColumn; + @Autowired + JSExternalizeVariablesPostprocessor jsExternalizeVariables; + @Autowired + JSSortComponentsPostprocessor jsSortComponents; + @Autowired + NoopPostprocessor noop; + @Override public GenerationService setPipeLine(Pipeline pipeline) throws Exception { - + LOGGER.info("Creating new pipeline..."); Preprocessor[] preprocessors = setPreProcessors(pipeline.getPreProcessing()); Generator generator = setGenerator(pipeline.getInFormat(), pipeline.getOutFormat()); Postprocessor[] postprocessors = setPostProcessors(pipeline.getPostProcessing()); - logger.info("PreProccesings : "+preprocessors.length); - logger.info("Core generation : "+generator.in2out()); - logger.info("PostProccesings : "+postprocessors.length); + LOGGER.info("PreProccesings : "+Arrays.toString(preprocessors)); + LOGGER.info("Core generation : "+generator.in2out()); + LOGGER.info("PostProccesings : "+Arrays.toString(postprocessors)); return new GenerationService(preprocessors, generator, postprocessors); } @@ -87,10 +160,6 @@ public Preprocessor[] setPreProcessors(List preProcessings) { } return preprocessors.toArray(new Preprocessor[preprocessors.size()]); } - - - - @Override public Generator setGenerator(InFormat inFormat, OutFormat outFormat) { @@ -104,26 +173,26 @@ public Generator setGenerator(InFormat inFormat, OutFormat outFormat) { generator=null; //TODO : add new IdentityGenerator() break; case FR: - generator = new DDI2FRGenerator(); + generator = ddi2frGenerator; break; case JS: - generator = new DDI2JSGenerator(); + generator = ddi2jsGenerator; break; case ODT: - generator = new DDI2ODTGenerator(); + generator = ddi2odtGenerator; break; case PDF: - generator = new DDI2PDFGenerator(); + generator = ddi2pdfGenerator; break; case POGUES_XML: - generator = new DDI2PoguesXMLGenerator(); + generator = ddi2poguesXmlGenerator; break; } break; case POGUES_XML: switch (outFormat) { case DDI: - generator = new PoguesXML2DDIGenerator(); + generator = poguesXml2ddiGenerator; break; default: generator=null; //TODO : add new IdentityGenerator() @@ -141,73 +210,70 @@ public Postprocessor getPostPorcessor(PostProcessing postProcessing) { Postprocessor postprocessor = null; switch (postProcessing) { case DDI_MARKDOWN_TO_XHTML: - postprocessor = new DDIPostprocessor(); + postprocessor = ddiMW2XHTML; break; case FR_BROWSING: - postprocessor = new FRBrowsingPostprocessor(); + postprocessor = frBrowsing; break; case FR_EDIT_PATRON: - postprocessor = new FREditPatronPostprocessor(); + postprocessor = frEditPatron; break; case FR_FIX_ADHERENCE: - postprocessor = new FRFixAdherencePostprocessor(); + postprocessor = frFixAdherence; break; case FR_IDENTIFICATION: - postprocessor = new FRIdentificationPostprocessor(); + postprocessor = frIdentification; break; case FR_INSERT_END: - postprocessor = new FRInsertEndPostprocessor(); + postprocessor = frInsertEnd; break; case FR_INSERT_GENERIC_QUESTIONS: - postprocessor = new FRInsertGenericQuestionsPostprocessor(); + postprocessor = frInsertGenericQuestions; break; case FR_INSERT_WELCOME: - postprocessor = new FRInsertWelcomePostprocessor(); + postprocessor = frInsertWelcome; break; case FR_MODELE_COLTRANE: - postprocessor = new FRModeleColtranePostprocessor(); + postprocessor = frModeleColtrane; break; case FR_SPECIFIC_TREATMENT: - postprocessor = new FRSpecificTreatmentPostprocessor(); + postprocessor = frSpecificTreatment; break; case PDF_EDIT_STRUCTURE_PAGES: - postprocessor = new PDFEditStructurePagesPostprocessor(); + postprocessor = pdfEditStructurePages; break; case PDF_INSERT_ACCOMPANYING_MAILS: - postprocessor = new PDFInsertAccompanyingMailsPostprocessor(); + postprocessor = pdfInsertAccompanyingMails; break; case PDF_INSERT_COVER_PAGE: - postprocessor = new PDFInsertCoverPagePostprocessor(); + postprocessor = pdfInsertCoverPage; break; case PDF_INSERT_END_QUESTION: - postprocessor = new PDFInsertEndQuestionPostprocessor(); + postprocessor = pdfInsertEndQuestion; break; case PDF_MAILING: - postprocessor = new PDFMailingPostprocessor(); + postprocessor = pdfMailing; break; case PDF_SPECIFIC_TREATMENT: - postprocessor = new PDFSpecificTreatmentPostprocessor(); + postprocessor = pdfSpecificTreatment; break; case PDF_TABLE_COLUMN: - postprocessor = new PDFTableColumnPostprocessorFake(); + postprocessor = pdfTableColumn; break; case JS_EXTERNALIZE_VARIABLES: - postprocessor = new JSExternalizeVariablesPostprocessor(); + postprocessor = jsExternalizeVariables; break; case JS_SORT_COMPONENTS: - postprocessor = new JSSortComponentsPostprocessor(); + postprocessor = jsSortComponents; break; case JS_SPECIFIC_TREATMENT: - postprocessor = new NoopPostprocessor(); + postprocessor = noop; break; case DDI_SPECIFIC_TREATMENT: - postprocessor = new NoopPostprocessor(); + postprocessor = noop; break; case ODT_SPECIFIC_TREATMENT: - postprocessor = new NoopPostprocessor(); - break; - case NONE: - postprocessor = new NoopPostprocessor(); + postprocessor = noop; break; } return postprocessor; @@ -218,19 +284,19 @@ public Preprocessor getPrePorcessor(PreProcessing preProcessing) { Preprocessor preprocessor = null; switch (preProcessing) { case DDI_DEREFERENCING: - preprocessor = new DDIDereferencingPreprocessor(); + preprocessor = ddiDereferencing; break; case DDI_CLEANING: - preprocessor = new DDICleaningPreprocessor(); + preprocessor = ddiCleaning; break; case DDI_TITLING: - preprocessor = new DDITitlingPreprocessor(); + preprocessor = ddiTitling; break; case DDI_MAPPING: - preprocessor = new DDIMappingPreprocessor(); + preprocessor = ddiMapping; break; case POGUES_XML_GOTO_2_ITE: - preprocessor = new PoguesXMLPreprocessorGoToTreatment(); + preprocessor = poguesXmlGoTo; break; case POGUES_XML_SUPPRESSION_GOTO: break; diff --git a/src/main/java/fr/insee/eno/postprocessing/NoopPostprocessor.java b/src/main/java/fr/insee/eno/postprocessing/NoopPostprocessor.java index d7fa0fb73..946ee2186 100644 --- a/src/main/java/fr/insee/eno/postprocessing/NoopPostprocessor.java +++ b/src/main/java/fr/insee/eno/postprocessing/NoopPostprocessor.java @@ -4,10 +4,12 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; /** * No-op postprocessor. */ +@Service public class NoopPostprocessor implements Postprocessor { private static final Logger logger = LoggerFactory.getLogger(NoopPostprocessor.class); diff --git a/src/main/java/fr/insee/eno/postprocessing/Postprocessor.java b/src/main/java/fr/insee/eno/postprocessing/Postprocessor.java index 533d4416e..5e26c6820 100644 --- a/src/main/java/fr/insee/eno/postprocessing/Postprocessor.java +++ b/src/main/java/fr/insee/eno/postprocessing/Postprocessor.java @@ -17,4 +17,6 @@ default File process(File input, byte[] parametersFile, byte[] metadata, String default File process(File input, byte[] parametersFile, byte[] metadata, byte[] specificTreatmentXsl, String survey) throws Exception{ return this.process(input,parametersFile,metadata,survey); } + + public String toString(); } diff --git a/src/main/java/fr/insee/eno/postprocessing/fr/FRBrowsingPostprocessor.java b/src/main/java/fr/insee/eno/postprocessing/fr/FRBrowsingPostprocessor.java index 6d234ead5..094c65184 100644 --- a/src/main/java/fr/insee/eno/postprocessing/fr/FRBrowsingPostprocessor.java +++ b/src/main/java/fr/insee/eno/postprocessing/fr/FRBrowsingPostprocessor.java @@ -7,22 +7,28 @@ import org.apache.commons.io.FileUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import fr.insee.eno.Constants; +import fr.insee.eno.parameters.PostProcessing; import fr.insee.eno.postprocessing.Postprocessor; import fr.insee.eno.transform.xsl.XslTransformation; +@Service public class FRBrowsingPostprocessor implements Postprocessor { private static final Logger logger = LoggerFactory.getLogger(FRBrowsingPostprocessor.class); - // FIXME Inject ! - private static XslTransformation saxonService = new XslTransformation(); + @Autowired + private XslTransformation saxonService; @Override public File process(File input, byte[] parameters, String survey) throws Exception { - File outputForFRFile = new File(input.getParent(),"form"+Constants.BROWSING_FR_EXTENSION); + File outputForFRFile = new File(input.getParent(), + Constants.BASE_NAME_FORM_FILE + + Constants.BROWSING_FR_EXTENSION); logger.debug("Output folder for basic-form : " + outputForFRFile.getAbsolutePath()); @@ -40,6 +46,11 @@ public File process(File input, byte[] parameters, String survey) throws Excepti return outputForFRFile; } + + @Override + public String toString() { + return PostProcessing.FR_BROWSING.name(); + } } diff --git a/src/main/java/fr/insee/eno/postprocessing/fr/FREditPatronPostprocessor.java b/src/main/java/fr/insee/eno/postprocessing/fr/FREditPatronPostprocessor.java index 1e661b5a7..cd86c56f3 100644 --- a/src/main/java/fr/insee/eno/postprocessing/fr/FREditPatronPostprocessor.java +++ b/src/main/java/fr/insee/eno/postprocessing/fr/FREditPatronPostprocessor.java @@ -7,17 +7,21 @@ import org.apache.commons.io.FileUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import fr.insee.eno.Constants; +import fr.insee.eno.parameters.PostProcessing; import fr.insee.eno.postprocessing.Postprocessor; import fr.insee.eno.transform.xsl.XslTransformation; +@Service public class FREditPatronPostprocessor implements Postprocessor { private static final Logger logger = LoggerFactory.getLogger(FREditPatronPostprocessor.class); - // FIXME Inject ! - private static XslTransformation saxonService = new XslTransformation(); + @Autowired + private XslTransformation saxonService; @Override @@ -27,7 +31,9 @@ public File process(File input, byte[] parameters, String survey) throws Excepti @Override public File process(File input, byte[] parameters, byte[] metadata, String survey) throws Exception { - File outputForFRFile = new File(input.getParent(),"form"+Constants.EDIT_PATRON_FR_EXTENSION); + File outputForFRFile = new File(input.getParent(), + Constants.BASE_NAME_FORM_FILE + + Constants.EDIT_PATRON_FR_EXTENSION); logger.debug("Output folder for basic-form : " + outputForFRFile.getAbsolutePath()); @@ -35,8 +41,6 @@ public File process(File input, byte[] parameters, byte[] metadata, String surve InputStream inputStream = FileUtils.openInputStream(input); OutputStream outputStream = FileUtils.openOutputStream(outputForFRFile); - - System.out.println(outputForFRFile.getAbsolutePath()); saxonService.transformWithMetadata(inputStream, outputStream, FO_XSL, parameters, metadata); inputStream.close(); @@ -45,4 +49,9 @@ public File process(File input, byte[] parameters, byte[] metadata, String surve logger.info("End of EditPatron post-processing " + outputForFRFile.getAbsolutePath()); return outputForFRFile; } + + @Override + public String toString() { + return PostProcessing.FR_EDIT_PATRON.name(); + } } diff --git a/src/main/java/fr/insee/eno/postprocessing/fr/FRFixAdherencePostprocessor.java b/src/main/java/fr/insee/eno/postprocessing/fr/FRFixAdherencePostprocessor.java index 160fe1196..d2cd3a35c 100644 --- a/src/main/java/fr/insee/eno/postprocessing/fr/FRFixAdherencePostprocessor.java +++ b/src/main/java/fr/insee/eno/postprocessing/fr/FRFixAdherencePostprocessor.java @@ -7,23 +7,29 @@ import org.apache.commons.io.FileUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import fr.insee.eno.Constants; +import fr.insee.eno.parameters.PostProcessing; import fr.insee.eno.postprocessing.Postprocessor; import fr.insee.eno.transform.xsl.XslTransformation; +@Service public class FRFixAdherencePostprocessor implements Postprocessor { private static final Logger logger = LoggerFactory.getLogger(FRFixAdherencePostprocessor.class); - // FIXME Inject ! - private static XslTransformation saxonService = new XslTransformation(); + @Autowired + private XslTransformation saxonService; @Override public File process(File input, byte[] parameters, String survey) throws Exception { - File outputForFRFile = new File(input.getParent(),"form"+Constants.FIX_ADHERENCE_FR_EXTENSION); + File outputForFRFile = new File(input.getParent(), + Constants.BASE_NAME_FORM_FILE + + Constants.FIX_ADHERENCE_FR_EXTENSION); logger.debug("Output folder for basic-form : " + outputForFRFile.getAbsolutePath()); @@ -43,4 +49,8 @@ public File process(File input, byte[] parameters, String survey) throws Excepti return outputForFRFile; } + @Override + public String toString() { + return PostProcessing.FR_FIX_ADHERENCE.name(); + } } diff --git a/src/main/java/fr/insee/eno/postprocessing/fr/FRIdentificationPostprocessor.java b/src/main/java/fr/insee/eno/postprocessing/fr/FRIdentificationPostprocessor.java index e6df3c124..742bfc787 100644 --- a/src/main/java/fr/insee/eno/postprocessing/fr/FRIdentificationPostprocessor.java +++ b/src/main/java/fr/insee/eno/postprocessing/fr/FRIdentificationPostprocessor.java @@ -7,22 +7,28 @@ import org.apache.commons.io.FileUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import fr.insee.eno.Constants; +import fr.insee.eno.parameters.PostProcessing; import fr.insee.eno.postprocessing.Postprocessor; import fr.insee.eno.transform.xsl.XslTransformation; +@Service public class FRIdentificationPostprocessor implements Postprocessor { private static final Logger logger = LoggerFactory.getLogger(FRIdentificationPostprocessor.class); - // FIXME Inject ! - private static XslTransformation saxonService = new XslTransformation(); + @Autowired + private XslTransformation saxonService; @Override public File process(File input, byte[] parameters, String survey) throws Exception { - File outputForFRFile = new File(input.getParent(),"form"+Constants.IDENTIFICATION_FR_EXTENSION); + File outputForFRFile = new File(input.getParent(), + Constants.BASE_NAME_FORM_FILE + + Constants.IDENTIFICATION_FR_EXTENSION); logger.debug("Output folder for basic-form : " + outputForFRFile.getAbsolutePath()); @@ -40,4 +46,9 @@ public File process(File input, byte[] parameters, String survey) throws Excepti return outputForFRFile; } + + @Override + public String toString() { + return PostProcessing.FR_IDENTIFICATION.name(); + } } diff --git a/src/main/java/fr/insee/eno/postprocessing/fr/FRInsertEndPostprocessor.java b/src/main/java/fr/insee/eno/postprocessing/fr/FRInsertEndPostprocessor.java index ea7f62b52..367004cca 100644 --- a/src/main/java/fr/insee/eno/postprocessing/fr/FRInsertEndPostprocessor.java +++ b/src/main/java/fr/insee/eno/postprocessing/fr/FRInsertEndPostprocessor.java @@ -7,17 +7,21 @@ import org.apache.commons.io.FileUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import fr.insee.eno.Constants; +import fr.insee.eno.parameters.PostProcessing; import fr.insee.eno.postprocessing.Postprocessor; import fr.insee.eno.transform.xsl.XslTransformation; +@Service public class FRInsertEndPostprocessor implements Postprocessor { private static final Logger logger = LoggerFactory.getLogger(FRInsertEndPostprocessor.class); - // FIXME Inject ! - private static XslTransformation saxonService = new XslTransformation(); + @Autowired + private XslTransformation saxonService; @Override public File process(File input, byte[] parameters, String survey) throws Exception { @@ -27,7 +31,9 @@ public File process(File input, byte[] parameters, String survey) throws Excepti @Override public File process(File input, byte[] parameters, byte[] metadata, String survey) throws Exception { - File outputForFRFile = new File(input.getParent(),"form"+Constants.INSERT_END_FR_EXTENSION); + File outputForFRFile = new File(input.getParent(), + Constants.BASE_NAME_FORM_FILE + + Constants.INSERT_END_FR_EXTENSION); logger.debug("Output folder for basic-form : " + outputForFRFile.getAbsolutePath()); @@ -45,5 +51,10 @@ public File process(File input, byte[] parameters, byte[] metadata, String surve return outputForFRFile; } + + @Override + public String toString() { + return PostProcessing.FR_INSERT_END.name(); + } } diff --git a/src/main/java/fr/insee/eno/postprocessing/fr/FRInsertGenericQuestionsPostprocessor.java b/src/main/java/fr/insee/eno/postprocessing/fr/FRInsertGenericQuestionsPostprocessor.java index d7a3c2965..ee5ddb4d3 100644 --- a/src/main/java/fr/insee/eno/postprocessing/fr/FRInsertGenericQuestionsPostprocessor.java +++ b/src/main/java/fr/insee/eno/postprocessing/fr/FRInsertGenericQuestionsPostprocessor.java @@ -7,22 +7,28 @@ import org.apache.commons.io.FileUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import fr.insee.eno.Constants; +import fr.insee.eno.parameters.PostProcessing; import fr.insee.eno.postprocessing.Postprocessor; import fr.insee.eno.transform.xsl.XslTransformation; +@Service public class FRInsertGenericQuestionsPostprocessor implements Postprocessor { private static final Logger logger = LoggerFactory.getLogger(FRInsertGenericQuestionsPostprocessor.class); - // FIXME Inject ! - private static XslTransformation saxonService = new XslTransformation(); + @Autowired + private XslTransformation saxonService; @Override public File process(File input, byte[] parameters, String surveyName) throws Exception { - File outputForFRFile = new File(input.getParent(),"form"+Constants.INSERT_GENERIC_QUESTIONS_FR_EXTENSION); + File outputForFRFile = new File(input.getParent(), + Constants.BASE_NAME_FORM_FILE + + Constants.INSERT_GENERIC_QUESTIONS_FR_EXTENSION); logger.debug("Output folder for basic-form : " + outputForFRFile.getAbsolutePath()); @@ -39,5 +45,10 @@ public File process(File input, byte[] parameters, String surveyName) throws Exc return outputForFRFile; } + + @Override + public String toString() { + return PostProcessing.FR_INSERT_GENERIC_QUESTIONS.name(); + } } diff --git a/src/main/java/fr/insee/eno/postprocessing/fr/FRInsertWelcomePostprocessor.java b/src/main/java/fr/insee/eno/postprocessing/fr/FRInsertWelcomePostprocessor.java index 021b14a1d..03b229385 100644 --- a/src/main/java/fr/insee/eno/postprocessing/fr/FRInsertWelcomePostprocessor.java +++ b/src/main/java/fr/insee/eno/postprocessing/fr/FRInsertWelcomePostprocessor.java @@ -7,17 +7,21 @@ import org.apache.commons.io.FileUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import fr.insee.eno.Constants; +import fr.insee.eno.parameters.PostProcessing; import fr.insee.eno.postprocessing.Postprocessor; import fr.insee.eno.transform.xsl.XslTransformation; +@Service public class FRInsertWelcomePostprocessor implements Postprocessor { private static final Logger logger = LoggerFactory.getLogger(FRInsertWelcomePostprocessor.class); - // FIXME Inject ! - private static XslTransformation saxonService = new XslTransformation(); + @Autowired + private XslTransformation saxonService; @Override public File process(File input, byte[] parameters, String survey) throws Exception { @@ -27,7 +31,9 @@ public File process(File input, byte[] parameters, String survey) throws Excepti @Override public File process(File input, byte[] parameters, byte[] metadata, String survey) throws Exception { - File outputForFRFile = new File(input.getParent(),"form"+Constants.INSERT_WELCOME_FR_EXTENSION); + File outputForFRFile = new File(input.getParent(), + Constants.BASE_NAME_FORM_FILE + + Constants.INSERT_WELCOME_FR_EXTENSION); logger.debug("Output folder for basic-form : " + outputForFRFile.getAbsolutePath()); @@ -45,5 +51,10 @@ public File process(File input, byte[] parameters, byte[] metadata, String surve return outputForFRFile; } + + @Override + public String toString() { + return PostProcessing.FR_INSERT_WELCOME.name(); + } } diff --git a/src/main/java/fr/insee/eno/postprocessing/fr/FRModeleColtranePostprocessor.java b/src/main/java/fr/insee/eno/postprocessing/fr/FRModeleColtranePostprocessor.java index 3f706e3cd..7172f113b 100644 --- a/src/main/java/fr/insee/eno/postprocessing/fr/FRModeleColtranePostprocessor.java +++ b/src/main/java/fr/insee/eno/postprocessing/fr/FRModeleColtranePostprocessor.java @@ -7,23 +7,29 @@ import org.apache.commons.io.FileUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import fr.insee.eno.Constants; +import fr.insee.eno.parameters.PostProcessing; import fr.insee.eno.postprocessing.Postprocessor; import fr.insee.eno.transform.xsl.XslTransformation; +@Service public class FRModeleColtranePostprocessor implements Postprocessor { private static final Logger logger = LoggerFactory.getLogger(FRModeleColtranePostprocessor.class); - // FIXME Inject ! - private static XslTransformation saxonService = new XslTransformation(); + @Autowired + private XslTransformation saxonService; @Override public File process(File input, byte[] parameters, String survey) throws Exception { - File outputForFRFile = new File(input.getParent(),"form"+Constants.MODELE_COLTRANE_FR_EXTENSION); + File outputForFRFile = new File(input.getParent(), + Constants.BASE_NAME_FORM_FILE + + Constants.MODELE_COLTRANE_FR_EXTENSION); logger.debug("Output folder for basic-form : " + outputForFRFile.getAbsolutePath()); @@ -49,5 +55,10 @@ public File process(File input, byte[] parameters, String survey) throws Excepti return outputForFRFile; } + + @Override + public String toString() { + return PostProcessing.FR_MODELE_COLTRANE.name(); + } } diff --git a/src/main/java/fr/insee/eno/postprocessing/fr/FRSpecificTreatmentPostprocessor.java b/src/main/java/fr/insee/eno/postprocessing/fr/FRSpecificTreatmentPostprocessor.java index 970ef073e..98d9ef530 100644 --- a/src/main/java/fr/insee/eno/postprocessing/fr/FRSpecificTreatmentPostprocessor.java +++ b/src/main/java/fr/insee/eno/postprocessing/fr/FRSpecificTreatmentPostprocessor.java @@ -8,17 +8,21 @@ import org.apache.commons.io.FileUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import fr.insee.eno.Constants; +import fr.insee.eno.parameters.PostProcessing; import fr.insee.eno.postprocessing.Postprocessor; import fr.insee.eno.transform.xsl.XslTransformation; +@Service public class FRSpecificTreatmentPostprocessor implements Postprocessor { private static final Logger logger = LoggerFactory.getLogger(FRSpecificTreatmentPostprocessor.class); - // FIXME Inject ! - private static XslTransformation saxonService = new XslTransformation(); + @Autowired + private XslTransformation saxonService; @Override public File process(File input, byte[] parameters, String survey) throws Exception { @@ -32,7 +36,9 @@ public File process(File input, byte[] parametersFile, byte[] metadata, String s @Override public File process(File input, byte[] parametersFile, byte[] metadata, byte[] specificTreatmentXsl, String survey) throws Exception { - File outputForFRFile = new File(input.getParent(),"form"+Constants.SPECIFIC_TREATMENT_FR_EXTENSION); + File outputForFRFile = new File(input.getParent(), + Constants.BASE_NAME_FORM_FILE + + Constants.SPECIFIC_TREATMENT_FR_EXTENSION); logger.debug("Output folder for basic-form : " + outputForFRFile.getAbsolutePath()); @@ -42,7 +48,7 @@ public File process(File input, byte[] parametersFile, byte[] metadata, byte[] s specificTreatmentXslIS = new ByteArrayInputStream(specificTreatmentXsl); InputStream inputStream = FileUtils.openInputStream(input); OutputStream outputStream = FileUtils.openOutputStream(outputForFRFile); - saxonService.transformWithSpecificTreatment(inputStream, outputStream, specificTreatmentXslIS, parametersFile); + saxonService.transformWithFRSpecificTreatment(inputStream, outputStream, specificTreatmentXslIS, parametersFile); inputStream.close(); outputStream.close(); @@ -57,5 +63,10 @@ public File process(File input, byte[] parametersFile, byte[] metadata, byte[] s return outputForFRFile; } + + @Override + public String toString() { + return PostProcessing.FR_SPECIFIC_TREATMENT.name(); + } } diff --git a/src/main/java/fr/insee/eno/postprocessing/js/JSExternalizeVariablesPostprocessor.java b/src/main/java/fr/insee/eno/postprocessing/js/JSExternalizeVariablesPostprocessor.java index 5620772fa..a87039a7e 100644 --- a/src/main/java/fr/insee/eno/postprocessing/js/JSExternalizeVariablesPostprocessor.java +++ b/src/main/java/fr/insee/eno/postprocessing/js/JSExternalizeVariablesPostprocessor.java @@ -7,25 +7,31 @@ import org.apache.commons.io.FileUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import fr.insee.eno.Constants; +import fr.insee.eno.parameters.PostProcessing; import fr.insee.eno.postprocessing.Postprocessor; import fr.insee.eno.transform.xsl.XslTransformation; /** * Customization of JS postprocessor. */ +@Service public class JSExternalizeVariablesPostprocessor implements Postprocessor { private static final Logger logger = LoggerFactory.getLogger(JSExternalizeVariablesPostprocessor.class); - // FIXME Inject ! - private static XslTransformation saxonService = new XslTransformation(); + @Autowired + private XslTransformation saxonService; @Override public File process(File input, byte[] parameters, String surveyName) throws Exception { - File outputForJSFile = new File(input.getParent(),"form"+Constants.FINAL_JS_EXTENSION); + File outputForJSFile = new File(input.getParent(), + Constants.BASE_NAME_FORM_FILE + + Constants.FINAL_JS_EXTENSION); logger.debug("Output folder for basic-form : " + outputForJSFile.getAbsolutePath()); InputStream JS_XSL = Constants.getInputStreamFromPath(Constants.TRANSFORMATIONS_EXTERNALIZE_VARIABLES_JS); @@ -40,5 +46,9 @@ public File process(File input, byte[] parameters, String surveyName) throws Exc return outputForJSFile; } + + public String toString() { + return PostProcessing.JS_EXTERNALIZE_VARIABLES.name(); + } } diff --git a/src/main/java/fr/insee/eno/postprocessing/js/JSSortComponentsPostprocessor.java b/src/main/java/fr/insee/eno/postprocessing/js/JSSortComponentsPostprocessor.java index 93254e991..fcc79500b 100644 --- a/src/main/java/fr/insee/eno/postprocessing/js/JSSortComponentsPostprocessor.java +++ b/src/main/java/fr/insee/eno/postprocessing/js/JSSortComponentsPostprocessor.java @@ -7,25 +7,31 @@ import org.apache.commons.io.FileUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import fr.insee.eno.Constants; +import fr.insee.eno.parameters.PostProcessing; import fr.insee.eno.postprocessing.Postprocessor; import fr.insee.eno.transform.xsl.XslTransformation; /** * Customization of JS postprocessor. */ +@Service public class JSSortComponentsPostprocessor implements Postprocessor { private static final Logger logger = LoggerFactory.getLogger(JSSortComponentsPostprocessor.class); - // FIXME Inject ! - private static XslTransformation saxonService = new XslTransformation(); + @Autowired + private XslTransformation saxonService; @Override public File process(File input, byte[] parameters, String surveyName) throws Exception { - File outputForJSFile = new File(input.getParent(),"form"+Constants.SORT_COMPONENTS_JS_EXTENSION); + File outputForJSFile = new File(input.getParent(), + Constants.BASE_NAME_FORM_FILE + + Constants.SORT_COMPONENTS_JS_EXTENSION); logger.debug("Output folder for basic-form : " + outputForJSFile.getAbsolutePath()); InputStream JS_XSL = Constants.getInputStreamFromPath(Constants.TRANSFORMATIONS_SORT_COMPONENTS_JS); @@ -41,5 +47,9 @@ public File process(File input, byte[] parameters, String surveyName) throws Exc return outputForJSFile; } + + public String toString() { + return PostProcessing.JS_SORT_COMPONENTS.name(); + } } diff --git a/src/main/java/fr/insee/eno/postprocessing/pdf/PDFEditStructurePagesPostprocessor.java b/src/main/java/fr/insee/eno/postprocessing/pdf/PDFEditStructurePagesPostprocessor.java index d2c2ce25a..ce66bb251 100644 --- a/src/main/java/fr/insee/eno/postprocessing/pdf/PDFEditStructurePagesPostprocessor.java +++ b/src/main/java/fr/insee/eno/postprocessing/pdf/PDFEditStructurePagesPostprocessor.java @@ -8,23 +8,29 @@ import org.apache.commons.io.FilenameUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import fr.insee.eno.Constants; +import fr.insee.eno.parameters.PostProcessing; import fr.insee.eno.postprocessing.Postprocessor; import fr.insee.eno.transform.xsl.XslTransformation; +@Service public class PDFEditStructurePagesPostprocessor implements Postprocessor { private static final Logger logger = LoggerFactory.getLogger(PDFEditStructurePagesPostprocessor.class); - // FIXME Inject ! - private static XslTransformation saxonService = new XslTransformation(); + @Autowired + private XslTransformation saxonService; @Override public File process(File input, byte[] parameters, String survey) throws Exception { - File outputForFOFile = new File(input.getParent(),"form"+Constants.EDIT_STRUCTURE_FO_EXTENSION); + File outputForFOFile = new File(input.getParent(), + Constants.BASE_NAME_FORM_FILE + + Constants.EDIT_STRUCTURE_FO_EXTENSION); logger.debug("Output folder for basic-form : " + outputForFOFile.getAbsolutePath()); String surveyName = survey; @@ -47,5 +53,9 @@ public File process(File input, byte[] parameters, String survey) throws Excepti private String getFormName(File input) { return FilenameUtils.getBaseName(input.getParentFile().getParent()); } + + public String toString() { + return PostProcessing.PDF_EDIT_STRUCTURE_PAGES.name(); + } } diff --git a/src/main/java/fr/insee/eno/postprocessing/pdf/PDFInsertAccompanyingMailsPostprocessor.java b/src/main/java/fr/insee/eno/postprocessing/pdf/PDFInsertAccompanyingMailsPostprocessor.java index 8a66d22e4..98e623f0c 100644 --- a/src/main/java/fr/insee/eno/postprocessing/pdf/PDFInsertAccompanyingMailsPostprocessor.java +++ b/src/main/java/fr/insee/eno/postprocessing/pdf/PDFInsertAccompanyingMailsPostprocessor.java @@ -8,22 +8,28 @@ import org.apache.commons.io.FilenameUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import fr.insee.eno.Constants; +import fr.insee.eno.parameters.PostProcessing; import fr.insee.eno.postprocessing.Postprocessor; import fr.insee.eno.transform.xsl.XslTransformation; +@Service public class PDFInsertAccompanyingMailsPostprocessor implements Postprocessor { private static final Logger logger = LoggerFactory.getLogger(PDFInsertAccompanyingMailsPostprocessor.class); - // FIXME Inject ! - private static XslTransformation saxonService = new XslTransformation(); + @Autowired + private XslTransformation saxonService; @Override public File process(File input, byte[] parameters, String survey) throws Exception { - File outputForFOFile = new File(input.getParent(),"form"+Constants.FINAL_PDF_EXTENSION); + File outputForFOFile = new File(input.getParent(), + Constants.BASE_NAME_FORM_FILE + + Constants.FINAL_PDF_EXTENSION); logger.debug("Output folder for basic-form : " + outputForFOFile.getAbsolutePath()); String surveyName = survey; @@ -47,5 +53,9 @@ public File process(File input, byte[] parameters, String survey) throws Excepti private String getFormName(File input) { return FilenameUtils.getBaseName(input.getParentFile().getParent()); } + + public String toString() { + return PostProcessing.PDF_INSERT_ACCOMPANYING_MAILS.name(); + } } diff --git a/src/main/java/fr/insee/eno/postprocessing/pdf/PDFInsertCoverPagePostprocessor.java b/src/main/java/fr/insee/eno/postprocessing/pdf/PDFInsertCoverPagePostprocessor.java index 3b86dfa28..7956ea72e 100644 --- a/src/main/java/fr/insee/eno/postprocessing/pdf/PDFInsertCoverPagePostprocessor.java +++ b/src/main/java/fr/insee/eno/postprocessing/pdf/PDFInsertCoverPagePostprocessor.java @@ -8,22 +8,28 @@ import org.apache.commons.io.FilenameUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import fr.insee.eno.Constants; +import fr.insee.eno.parameters.PostProcessing; import fr.insee.eno.postprocessing.Postprocessor; import fr.insee.eno.transform.xsl.XslTransformation; +@Service public class PDFInsertCoverPagePostprocessor implements Postprocessor { private static final Logger logger = LoggerFactory.getLogger(PDFInsertCoverPagePostprocessor.class); - // FIXME Inject ! - private static XslTransformation saxonService = new XslTransformation(); + @Autowired + private XslTransformation saxonService; @Override public File process(File input, byte[] parameters, String survey) throws Exception { - File outputForFOFile = new File(input.getParent(),"form"+Constants.COVER_PAGE_FO_EXTENSION); + File outputForFOFile = new File(input.getParent(), + Constants.BASE_NAME_FORM_FILE + + Constants.COVER_PAGE_FO_EXTENSION); logger.debug("Output folder for basic-form : " + outputForFOFile.getAbsolutePath()); String surveyName = survey; String formName = getFormName(input); @@ -46,5 +52,9 @@ public File process(File input, byte[] parameters, String survey) throws Excepti private String getFormName(File input) { return FilenameUtils.getBaseName(input.getParentFile().getParent()); } + + public String toString() { + return PostProcessing.PDF_INSERT_COVER_PAGE.name(); + } } diff --git a/src/main/java/fr/insee/eno/postprocessing/pdf/PDFInsertEndQuestionPostprocessor.java b/src/main/java/fr/insee/eno/postprocessing/pdf/PDFInsertEndQuestionPostprocessor.java index c6ee235f0..b5d115f91 100644 --- a/src/main/java/fr/insee/eno/postprocessing/pdf/PDFInsertEndQuestionPostprocessor.java +++ b/src/main/java/fr/insee/eno/postprocessing/pdf/PDFInsertEndQuestionPostprocessor.java @@ -8,22 +8,28 @@ import org.apache.commons.io.FilenameUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import fr.insee.eno.Constants; +import fr.insee.eno.parameters.PostProcessing; import fr.insee.eno.postprocessing.Postprocessor; import fr.insee.eno.transform.xsl.XslTransformation; +@Service public class PDFInsertEndQuestionPostprocessor implements Postprocessor { private static final Logger logger = LoggerFactory.getLogger(PDFInsertEndQuestionPostprocessor.class); - // FIXME Inject ! - private static XslTransformation saxonService = new XslTransformation(); + @Autowired + private XslTransformation saxonService; @Override public File process(File input, byte[] parameters, String survey) throws Exception { - File outputForFOFile = new File(input.getParent(),"form"+Constants.END_QUESTION_FO_EXTENSION); + File outputForFOFile = new File(input.getParent(), + Constants.BASE_NAME_FORM_FILE + + Constants.END_QUESTION_FO_EXTENSION); logger.debug("Output folder for basic-form : " + outputForFOFile.getAbsolutePath()); String surveyName = survey; @@ -47,5 +53,9 @@ public File process(File input, byte[] parameters, String survey) throws Excepti private String getFormName(File input) { return FilenameUtils.getBaseName(input.getParentFile().getParent()); } + + public String toString() { + return PostProcessing.PDF_INSERT_END_QUESTION.name(); + } } diff --git a/src/main/java/fr/insee/eno/postprocessing/pdf/PDFMailingPostprocessor.java b/src/main/java/fr/insee/eno/postprocessing/pdf/PDFMailingPostprocessor.java index 949aa33f3..09095ad03 100644 --- a/src/main/java/fr/insee/eno/postprocessing/pdf/PDFMailingPostprocessor.java +++ b/src/main/java/fr/insee/eno/postprocessing/pdf/PDFMailingPostprocessor.java @@ -6,25 +6,31 @@ import org.apache.commons.io.FileUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import fr.insee.eno.Constants; +import fr.insee.eno.parameters.PostProcessing; import fr.insee.eno.postprocessing.Postprocessor; import fr.insee.eno.transform.xsl.XslTransformation; /** * Customization of FO postprocessor. */ +@Service public class PDFMailingPostprocessor implements Postprocessor { private static final Logger logger = LoggerFactory.getLogger(PDFMailingPostprocessor.class); - // FIXME Inject ! - private static XslTransformation saxonService = new XslTransformation(); + @Autowired + private XslTransformation saxonService; @Override public File process(File input, byte[] parameters, String surveyName) throws Exception { - File outputForFOFile = new File(input.getParent(),"form"+Constants.MAILING_FO_EXTENSION); + File outputForFOFile = new File(input.getParent(), + Constants.BASE_NAME_FORM_FILE + + Constants.MAILING_FO_EXTENSION); logger.debug("Output folder for basic-form : " + outputForFOFile.getAbsolutePath()); InputStream FO_XSL = Constants.getInputStreamFromPath(Constants.TRANSFORMATIONS_CUSTOMIZATION_FO_4PDF_2); @@ -36,5 +42,9 @@ public File process(File input, byte[] parameters, String surveyName) throws Exc return outputForFOFile; } + + public String toString() { + return PostProcessing.PDF_MAILING.name(); + } } diff --git a/src/main/java/fr/insee/eno/postprocessing/pdf/PDFSpecificTreatmentPostprocessor.java b/src/main/java/fr/insee/eno/postprocessing/pdf/PDFSpecificTreatmentPostprocessor.java index 753a09d4c..4f3a4c426 100644 --- a/src/main/java/fr/insee/eno/postprocessing/pdf/PDFSpecificTreatmentPostprocessor.java +++ b/src/main/java/fr/insee/eno/postprocessing/pdf/PDFSpecificTreatmentPostprocessor.java @@ -1,5 +1,6 @@ package fr.insee.eno.postprocessing.pdf; +import java.io.ByteArrayInputStream; import java.io.File; import java.io.InputStream; import java.io.OutputStream; @@ -7,43 +8,64 @@ import org.apache.commons.io.FileUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import fr.insee.eno.Constants; +import fr.insee.eno.parameters.PostProcessing; import fr.insee.eno.postprocessing.Postprocessor; import fr.insee.eno.transform.xsl.XslTransformation; +@Service public class PDFSpecificTreatmentPostprocessor implements Postprocessor { private static final Logger logger = LoggerFactory.getLogger(PDFSpecificTreatmentPostprocessor.class); - // FIXME Inject ! - private static XslTransformation saxonService = new XslTransformation(); + @Autowired + private XslTransformation saxonService; @Override public File process(File input, byte[] parameters, String survey) throws Exception { + return this.process(input, parameters, null, null, survey); + } - File outputForFOFile = new File(input.getParent(),"form"+Constants.SPECIFIC_TREAT_PDF_EXTENSION); + @Override + public File process(File input, byte[] parametersFile, byte[] metadata, String survey) throws Exception { + return this.process(input, parametersFile, metadata, null, survey); + } + + @Override + public File process(File input, byte[] parametersFile, byte[] metadata, byte[] specificTreatmentXsl, String survey) throws Exception { + + File outputForFOFile = new File(input.getParent(), + Constants.BASE_NAME_FORM_FILE + + Constants.SPECIFIC_TREAT_PDF_EXTENSION); logger.debug("Output folder for basic-form : " + outputForFOFile.getAbsolutePath()); - String sUB_TEMP_FOLDER = Constants.sUB_TEMP_FOLDER(survey); - - InputStream FO_XSL = Constants - .getInputStreamFromPath(sUB_TEMP_FOLDER + Constants.TRANSFORMATIONS_SPECIF_TREATMENT_FO_4PDF); - - //FIXME ajouter la verrue en parametre, si elle est nulle faire ça : - if (FO_XSL == null) { - FO_XSL = Constants.getInputStreamFromPath(Constants.TRANSFORMATIONS_SPECIF_TREATMENT_FO_4PDF); + InputStream specificTreatmentXslIS = null; + + if(specificTreatmentXsl!=null) { + specificTreatmentXslIS = new ByteArrayInputStream(specificTreatmentXsl); + InputStream inputStream = FileUtils.openInputStream(input); + OutputStream outputStream = FileUtils.openOutputStream(outputForFOFile); + saxonService.transformWithPDFSpecificTreatment(inputStream, outputStream, specificTreatmentXslIS, parametersFile); + + inputStream.close(); + outputStream.close(); + specificTreatmentXslIS.close(); + } - - InputStream inputStream = FileUtils.openInputStream(input); - OutputStream outputStream = FileUtils.openOutputStream(outputForFOFile); - saxonService.transformFOToStep2FO(inputStream, outputStream, FO_XSL); - inputStream.close(); - outputStream.close(); - FO_XSL.close(); - logger.info("End of SpecificTreatment post-processing " + outputForFOFile.getAbsolutePath()); - + else { + logger.info("Not specific treatment in params : simply copying this file" + input.getAbsolutePath()); + FileUtils.copyFile(input, outputForFOFile); + } + logger.info("End of specific treatment post-processing " + outputForFOFile.getAbsolutePath()); + return outputForFOFile; } + + public String toString() { + return PostProcessing.PDF_SPECIFIC_TREATMENT.name(); + } } diff --git a/src/main/java/fr/insee/eno/postprocessing/pdf/PDFTableColumnPostprocessorFake.java b/src/main/java/fr/insee/eno/postprocessing/pdf/PDFTableColumnPostprocessorFake.java index 552d0ae36..742cd3cd8 100644 --- a/src/main/java/fr/insee/eno/postprocessing/pdf/PDFTableColumnPostprocessorFake.java +++ b/src/main/java/fr/insee/eno/postprocessing/pdf/PDFTableColumnPostprocessorFake.java @@ -5,13 +5,16 @@ import org.apache.commons.io.FileUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; import fr.insee.eno.Constants; +import fr.insee.eno.parameters.PostProcessing; import fr.insee.eno.postprocessing.Postprocessor; /** * PDF postprocessor. */ +@Service public class PDFTableColumnPostprocessorFake implements Postprocessor { private static final Logger logger = LoggerFactory.getLogger(PDFTableColumnPostprocessorFake.class); @@ -19,7 +22,9 @@ public class PDFTableColumnPostprocessorFake implements Postprocessor { @Override public File process(File input, byte[] parameters, String survey) throws Exception { - File outputForFOFile = new File(input.getParent(),"form"+Constants.TABLE_COL_SIZE_PDF_EXTENSION); + File outputForFOFile = new File(input.getParent(), + Constants.BASE_NAME_FORM_FILE + + Constants.TABLE_COL_SIZE_PDF_EXTENSION); logger.debug("Output folder for basic-form : " + outputForFOFile.getAbsolutePath()); FileUtils.copyFile(input, outputForFOFile); @@ -29,4 +34,7 @@ public File process(File input, byte[] parameters, String survey) throws Excepti } + public String toString() { + return PostProcessing.PDF_TABLE_COLUMN.name(); + } } diff --git a/src/main/java/fr/insee/eno/preprocessing/DDIPreprocessor.java b/src/main/java/fr/insee/eno/preprocessing/DDIPreprocessor.java index 6abef196e..37fbcdb8b 100644 --- a/src/main/java/fr/insee/eno/preprocessing/DDIPreprocessor.java +++ b/src/main/java/fr/insee/eno/preprocessing/DDIPreprocessor.java @@ -9,6 +9,8 @@ import org.apache.commons.io.FilenameUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import fr.insee.eno.Constants; import fr.insee.eno.transform.xsl.XslTransformation; @@ -16,12 +18,13 @@ /** * A DDI specific preprocessor. */ +@Service public class DDIPreprocessor implements Preprocessor { private static final Logger logger = LoggerFactory.getLogger(DDIPreprocessor.class); - // FIXME Inject ! - private static XslTransformation saxonService = new XslTransformation(); + @Autowired + private XslTransformation saxonService; @Override public File process(File inputFile, byte[] parametersFile, String survey, String in2out) throws Exception { diff --git a/src/main/java/fr/insee/eno/preprocessing/PoguesXMLPreprocessor.java b/src/main/java/fr/insee/eno/preprocessing/PoguesXMLPreprocessor.java index 5d085bded..2dafbaa66 100644 --- a/src/main/java/fr/insee/eno/preprocessing/PoguesXMLPreprocessor.java +++ b/src/main/java/fr/insee/eno/preprocessing/PoguesXMLPreprocessor.java @@ -8,8 +8,12 @@ import org.apache.commons.io.FilenameUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import fr.insee.eno.Constants; +import fr.insee.eno.parameters.PostProcessing; +import fr.insee.eno.parameters.PreProcessing; import fr.insee.eno.transform.xsl.XslTransformation; /** @@ -17,12 +21,13 @@ * See PoguesXMLPreprocessorGoToTreatment for new implementation * A PoguesXML specific preprocessor. */ +@Service public class PoguesXMLPreprocessor implements Preprocessor { private static final Logger logger = LoggerFactory.getLogger(PoguesXMLPreprocessor.class); - // FIXME Inject ! - private static XslTransformation saxonService = new XslTransformation(); + @Autowired + private XslTransformation saxonService; @Override public File process(File inputFile, byte[] parametersFile, String surveyName, String in2out) throws Exception { @@ -67,5 +72,4 @@ public File process(File inputFile, byte[] parametersFile, String surveyName, St logger.debug("PoguesXMLPreprocessing : END"); return new File(outputPreprocessMergeITE); } - } diff --git a/src/main/java/fr/insee/eno/preprocessing/PoguesXMLPreprocessorGoToTreatment.java b/src/main/java/fr/insee/eno/preprocessing/PoguesXMLPreprocessorGoToTreatment.java index 369457f23..2f68e7c9d 100644 --- a/src/main/java/fr/insee/eno/preprocessing/PoguesXMLPreprocessorGoToTreatment.java +++ b/src/main/java/fr/insee/eno/preprocessing/PoguesXMLPreprocessorGoToTreatment.java @@ -8,19 +8,23 @@ import org.apache.commons.io.FilenameUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import fr.insee.eno.Constants; +import fr.insee.eno.parameters.PreProcessing; import fr.insee.eno.transform.xsl.XslTransformation; /** * A PoguesXML specific preprocessor : other goto2ite (rc version). */ +@Service public class PoguesXMLPreprocessorGoToTreatment implements Preprocessor { private static final Logger logger = LoggerFactory.getLogger(PoguesXMLPreprocessorGoToTreatment.class); - // FIXME Inject ! - private static XslTransformation saxonService = new XslTransformation(); + @Autowired + private XslTransformation saxonService; @Override public File process(File inputFile, byte[] parametersFile, String surveyName, String in2out) throws Exception { @@ -50,5 +54,10 @@ public File process(File inputFile, byte[] parametersFile, String surveyName, St return new File(outputPreprocessGOT2ITE); } + + public String toString() { + return PreProcessing.POGUES_XML_GOTO_2_ITE.name(); + } + } diff --git a/src/main/java/fr/insee/eno/preprocessing/Preprocessor.java b/src/main/java/fr/insee/eno/preprocessing/Preprocessor.java index ad56e4cd6..e9ff04c9a 100644 --- a/src/main/java/fr/insee/eno/preprocessing/Preprocessor.java +++ b/src/main/java/fr/insee/eno/preprocessing/Preprocessor.java @@ -23,4 +23,5 @@ public interface Preprocessor { */ public File process(File inputFile, byte[] parameters, String survey, String in2out) throws Exception; + public String toString(); } diff --git a/src/main/java/fr/insee/eno/transform/xsl/XslTransformation.java b/src/main/java/fr/insee/eno/transform/xsl/XslTransformation.java index ab7a679f1..53777bf06 100644 --- a/src/main/java/fr/insee/eno/transform/xsl/XslTransformation.java +++ b/src/main/java/fr/insee/eno/transform/xsl/XslTransformation.java @@ -2,7 +2,6 @@ import java.io.ByteArrayInputStream; import java.io.File; -import java.io.FileInputStream; import java.io.InputStream; import java.io.OutputStream; import java.net.URI; @@ -15,6 +14,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; import fr.insee.eno.Constants; @@ -24,42 +24,36 @@ * @author gerose * */ +@Service public class XslTransformation { - final static Logger logger = LoggerFactory.getLogger(XslTransformation.class); + final static Logger LOGGER = LoggerFactory.getLogger(XslTransformation.class); /** * Main Saxon transformation method * - * @param transformer - * : The defined transformer with his embedded parameters (defined in - * the other methods of this class) - * @param xmlInput - * : The input xml file where the XSLT will be applied - * @param xmlOutput - * : The output xml file after the transformation - * @throws Exception - * : Mainly if the input/output files path are incorrect + * @param transformer : The defined transformer with his embedded parameters + * (defined in the other methods of this class) + * @param xmlInput : The input xml file where the XSLT will be applied + * @param xmlOutput : The output xml file after the transformation + * @throws Exception : Mainly if the input/output files path are incorrect */ public void xslTransform(Transformer transformer, InputStream xmlInput, OutputStream xmlOutput) throws Exception { - logger.debug("Starting xsl transformation -Input : " + xmlInput + " -Output : " + xmlOutput); + LOGGER.debug("Starting xsl transformation -Input : " + xmlInput + " -Output : " + xmlOutput); transformer.transform(new StreamSource(xmlInput), new StreamResult(xmlOutput)); } /** * Basic Transformer initialization without parameters * - * @param input - * : the input xml file - * @param xslSheet - * : the xsl stylesheet that will be used - * @param output - * : the xml output that will be created - * @throws Exception - * : if the factory couldn't be found or if the paths are incorrect + * @param input : the input xml file + * @param xslSheet : the xsl stylesheet that will be used + * @param output : the xml output that will be created + * @throws Exception : if the factory couldn't be found or if the paths are + * incorrect */ public void transform(InputStream input, InputStream xslSheet, OutputStream output) throws Exception { - logger.debug("Using the basic transformer"); + LOGGER.debug("Using the basic transformer"); TransformerFactory tFactory = new net.sf.saxon.TransformerFactoryImpl(); tFactory.setURIResolver(new ClasspathURIResolver()); Transformer transformer = tFactory.newTransformer(new StreamSource(xslSheet)); @@ -71,16 +65,12 @@ public void transform(InputStream input, InputStream xslSheet, OutputStream outp /** * Basic Transformer initialization with config in2out properties file * - * @param input - * : the input xml file - * @param xslSheet - * : the xsl stylesheet that will be used - * @param output - * : the xml output that will be created - * @param in2out - * : the in2out information for config file - * @throws Exception - * : if the factory couldn't be found or if the paths are incorrect + * @param input : the input xml file + * @param xslSheet : the xsl stylesheet that will be used + * @param output : the xml output that will be created + * @param in2out : the in2out information for config file + * @throws Exception : if the factory couldn't be found or if the paths are + * incorrect */ public void transformCleaning(InputStream input, InputStream xslSheet, OutputStream output, String in2out) throws Exception { @@ -97,7 +87,7 @@ public void transformCleaning(InputStream input, InputStream xslSheet, OutputStr if (in2out == "ddi2js") { default_properties_file = Constants.CONFIG_DDI2JS; } - logger.debug("Using the basic transformer"); + LOGGER.debug("Using the basic transformer"); TransformerFactory tFactory = new net.sf.saxon.TransformerFactoryImpl(); tFactory.setURIResolver(new ClasspathURIResolver()); Transformer transformer = tFactory.newTransformer(new StreamSource(xslSheet)); @@ -110,20 +100,16 @@ public void transformCleaning(InputStream input, InputStream xslSheet, OutputStr /** * Incorporation Transformer initialization with its parameters * - * @param input - * : the input xml file - * @param xslSheet - * : the xsl stylesheet that will be used - * @param output - * : the xml output that will be created - * @param generatedFileParameter - * : Incorporation xsl parameter - * @throws Exception - * : if the factory couldn't be found or if the paths are incorrect + * @param input : the input xml file + * @param xslSheet : the xsl stylesheet that will be used + * @param output : the xml output that will be created + * @param generatedFileParameter : Incorporation xsl parameter + * @throws Exception : if the factory couldn't be found or if the paths are + * incorrect */ public void transformIncorporation(InputStream input, InputStream xslSheet, OutputStream output, File generatedFileParameter) throws Exception { - logger.debug("Using the incorporation transformer"); + LOGGER.debug("Using the incorporation transformer"); TransformerFactory tFactory = new net.sf.saxon.TransformerFactoryImpl(); Transformer transformer = tFactory.newTransformer(new StreamSource(xslSheet)); @@ -135,20 +121,16 @@ public void transformIncorporation(InputStream input, InputStream xslSheet, Outp /** * Markdown to XHTML with its parameters * - * @param input - * : the input xml file - * @param xslSheet - * : the xsl stylesheet that will be used - * @param output - * : the xml output that will be created - * @param outputFolderParameter - * : Markdown to XHTML xsl parameter - * @throws Exception - * : if the factory couldn't be found or if the paths are incorrect + * @param input : the input xml file + * @param xslSheet : the xsl stylesheet that will be used + * @param output : the xml output that will be created + * @param outputFolderParameter : Markdown to XHTML xsl parameter + * @throws Exception : if the factory couldn't be found or if the paths are + * incorrect */ public void transformMw2XHTML(InputStream input, InputStream xslSheet, OutputStream output, File outputFolderParameter) throws Exception { - logger.debug("Using the Markdown to XHTML transformer"); + LOGGER.debug("Using the Markdown to XHTML transformer"); TransformerFactory tFactory = new net.sf.saxon.TransformerFactoryImpl(); Transformer transformer = tFactory.newTransformer(new StreamSource(xslSheet)); @@ -160,20 +142,16 @@ public void transformMw2XHTML(InputStream input, InputStream xslSheet, OutputStr /** * TweakXhtmlForDdi with its parameters * - * @param input - * : the input xml file - * @param xslSheet - * : the xsl stylesheet that will be used - * @param output - * : the xml output that will be created - * @param outputFolderParameter - * : TweakXhtmlForDdi xsl parameter - * @throws Exception - * : if the factory couldn't be found or if the paths are incorrect + * @param input : the input xml file + * @param xslSheet : the xsl stylesheet that will be used + * @param output : the xml output that will be created + * @param outputFolderParameter : TweakXhtmlForDdi xsl parameter + * @throws Exception : if the factory couldn't be found or if the paths are + * incorrect */ public void transformTweakXhtmlForDdi(InputStream input, InputStream xslSheet, OutputStream output, File outputFolderParameter) throws Exception { - logger.debug("Using the TweakXhtmlForDdi transformer"); + LOGGER.debug("Using the TweakXhtmlForDdi transformer"); TransformerFactory tFactory = new net.sf.saxon.TransformerFactoryImpl(); Transformer transformer = tFactory.newTransformer(new StreamSource(xslSheet)); @@ -185,20 +163,16 @@ public void transformTweakXhtmlForDdi(InputStream input, InputStream xslSheet, O /** * Dereferencing Transformer initialization with its parameters * - * @param input - * : the input xml file - * @param xslSheet - * : the xsl stylesheet that will be used - * @param output - * : the xml output that will be created - * @param outputFolderParameter - * : Dereferencing xsl parameter - * @throws Exception - * : if the factory couldn't be found or if the paths are incorrect + * @param input : the input xml file + * @param xslSheet : the xsl stylesheet that will be used + * @param output : the xml output that will be created + * @param outputFolderParameter : Dereferencing xsl parameter + * @throws Exception : if the factory couldn't be found or if the paths are + * incorrect */ public void transformDereferencing(InputStream input, InputStream xslSheet, OutputStream output, File outputFolderParameter) throws Exception { - logger.debug("Using the dereferencing transformer"); + LOGGER.debug("Using the dereferencing transformer"); TransformerFactory tFactory = new net.sf.saxon.TransformerFactoryImpl(); Transformer transformer = tFactory.newTransformer(new StreamSource(xslSheet)); @@ -206,16 +180,16 @@ public void transformDereferencing(InputStream input, InputStream xslSheet, Outp transformer.setParameter(XslParameters.DEREFERENCING_OUTPUT_FOLDER, outputFolderParameter); xslTransform(transformer, input, output); } - - public void transformMapping(InputStream input, InputStream xslSheet, OutputStream output, - byte[] parameters) throws Exception { + + public void transformMapping(InputStream input, InputStream xslSheet, OutputStream output, byte[] parameters) + throws Exception { InputStream parametersIS = null; - logger.debug("Using the Mapping transformer"); + LOGGER.debug("Using the Mapping transformer"); TransformerFactory tFactory = new net.sf.saxon.TransformerFactoryImpl(); Transformer transformer = tFactory.newTransformer(new StreamSource(xslSheet)); transformer.setErrorListener(new EnoErrorListener()); - transformer.setParameter(XslParameters.IN2OUT_PARAMETERS_FILE, Constants.PARAMETERS); + transformer.setParameter(XslParameters.IN2OUT_PARAMETERS_FILE, Constants.PARAMETERS_DEFAULT); if (parameters != null) { parametersIS = new ByteArrayInputStream(parameters); Source source = new StreamSource(parametersIS); @@ -230,21 +204,17 @@ public void transformMapping(InputStream input, InputStream xslSheet, OutputStre /** * Titling Transformer initialization with its parameters * - * @param input - * : the input xml file - * @param xslSheet - * : the xsl stylesheet that will be used - * @param output - * : the xml output that will be created - * @param parametersFile - * : Titling xsl parameter - * @throws Exception - * : if the factory couldn't be found or if the paths are incorrect + * @param input : the input xml file + * @param xslSheet : the xsl stylesheet that will be used + * @param output : the xml output that will be created + * @param parametersFile : Titling xsl parameter + * @throws Exception : if the factory couldn't be found or if the paths are + * incorrect */ public void transformTitling(InputStream input, InputStream xslSheet, OutputStream output, byte[] parameters) throws Exception { InputStream parametersIS = null; - logger.debug("Using the titling transformer"); + LOGGER.debug("Using the titling transformer"); TransformerFactory tFactory = new net.sf.saxon.TransformerFactoryImpl(); Transformer transformer = tFactory.newTransformer(new StreamSource(xslSheet)); transformer.setErrorListener(new EnoErrorListener()); @@ -269,15 +239,15 @@ private void transformIn2Out(InputStream inputFile, OutputStream outputFile, Inp Transformer transformer = tFactory.newTransformer(new StreamSource(xslSheet)); transformer.setErrorListener(new EnoErrorListener()); transformer.setParameter(XslParameters.IN2OUT_PROPERTIES_FILE, propertiesFile); - transformer.setParameter(XslParameters.IN2OUT_PARAMETERS_FILE, Constants.PARAMETERS); + transformer.setParameter(XslParameters.IN2OUT_PARAMETERS_FILE, Constants.PARAMETERS_DEFAULT); if (parameters != null) { - logger.info("Using specifics parameters"); + LOGGER.info("Using specifics parameters"); parametersIS = new ByteArrayInputStream(parameters); Source source = new StreamSource(parametersIS); transformer.setParameter(XslParameters.IN2OUT_PARAMETERS_NODE, source); } transformer.setParameter(XslParameters.IN2OUT_LABELS_FOLDER, Constants.LABELS_FOLDER); - logger.debug(String.format("Transformer parameters are: %s, %s", + LOGGER.debug(String.format("Transformer parameters are: %s, %s", transformer.getParameter(XslParameters.IN2OUT_PROPERTIES_FILE), transformer.getParameter(XslParameters.IN2OUT_PARAMETERS_FILE), transformer.getParameter(XslParameters.IN2OUT_LABELS_FOLDER))); @@ -289,37 +259,37 @@ private void transformIn2Out(InputStream inputFile, OutputStream outputFile, Inp public void transformDDI2FR(InputStream inputFile, OutputStream outputFile, InputStream xslSheet, byte[] parameters) throws Exception { - logger.info("Producing a basic XForms from the DDI spec"); + LOGGER.info("Producing a basic XForms from the DDI spec"); transformIn2Out(inputFile, outputFile, xslSheet, parameters, Constants.CONFIG_DDI2FR); } public void transformDDI2ODT(InputStream inputFile, OutputStream outputFile, InputStream xslSheet, byte[] parameters) throws Exception { - logger.info("Producing a basic ODT from the DDI spec"); + LOGGER.info("Producing a basic ODT from the DDI spec"); transformIn2Out(inputFile, outputFile, xslSheet, parameters, Constants.CONFIG_DDI2ODT); } public void transformDDI2PDF(InputStream inputFile, OutputStream outputFile, InputStream xslSheet, byte[] parameters) throws Exception { - logger.info("Producing a basic PDF (Fo) from the DDI spec"); + LOGGER.info("Producing a basic PDF (Fo) from the DDI spec"); transformIn2Out(inputFile, outputFile, xslSheet, parameters, Constants.CONFIG_DDI2PDF); } - public void transformDDI2JS(InputStream inputFile, OutputStream outputFile, InputStream xslSheet, - byte[] parameters) throws Exception { - logger.info("Producing a JS (xml file) from the DDI spec"); + public void transformDDI2JS(InputStream inputFile, OutputStream outputFile, InputStream xslSheet, byte[] parameters) + throws Exception { + LOGGER.info("Producing a JS (xml file) from the DDI spec"); transformIn2Out(inputFile, outputFile, xslSheet, parameters, Constants.CONFIG_DDI2JS); } - + public void transformPoguesXML2DDI(InputStream inputFile, OutputStream outputFile, InputStream xslSheet, byte[] parameters) throws Exception { - logger.info("Producing a basic DDI from the PoguesXML spec"); + LOGGER.info("Producing a basic DDI from the PoguesXML spec"); transformIn2Out(inputFile, outputFile, xslSheet, parameters, Constants.CONFIG_POGUES_XML2DDI); } @@ -331,45 +301,45 @@ private void transformBrowsingin2Out(InputStream inputFile, OutputStream outputF Transformer transformer = tFactory.newTransformer(new StreamSource(xslSheet)); transformer.setErrorListener(new EnoErrorListener()); transformer.setParameter(XslParameters.IN2OUT_LABELS_FOLDER, Constants.LABELS_FOLDER); - logger.debug(String.format("Transformer parameter is: %s", + LOGGER.debug(String.format("Transformer parameter is: %s", transformer.getParameter(XslParameters.IN2OUT_LABELS_FOLDER))); xslTransform(transformer, inputFile, outputFile); } public void transformBrowsingDDI2FR(InputStream inputFile, OutputStream outputFile, InputStream xslSheet, File labelFolder) throws Exception { - logger.info("Include the navigation elements into the XForms questionnaire"); + LOGGER.info("Include the navigation elements into the XForms questionnaire"); transformBrowsingin2Out(inputFile, outputFile, xslSheet, labelFolder); } public void transformBrowsingDDI2ODT(InputStream inputFile, OutputStream outputFile, InputStream xslSheet, File labelFolder) throws Exception { - logger.info("Include the navigation elements into the ODT questionnaire"); + LOGGER.info("Include the navigation elements into the ODT questionnaire"); transformBrowsingin2Out(inputFile, outputFile, xslSheet, labelFolder); } - + public void transformBrowsingDDI2JS(InputStream inputFile, OutputStream outputFile, InputStream xslSheet, File labelFolder) throws Exception { - logger.info("Include the navigation elements into the JS questionnaire"); + LOGGER.info("Include the navigation elements into the JS questionnaire"); transformBrowsingin2Out(inputFile, outputFile, xslSheet, labelFolder); } public void transformFOToStep1FO(InputStream inputFile, OutputStream outputFile, InputStream xslSheet) throws Exception { - logger.info("Producing a custom FO (PDF) from the FO with conditioning variables"); + LOGGER.info("Producing a custom FO (PDF) from the FO with conditioning variables"); TransformerFactory tFactory = new net.sf.saxon.TransformerFactoryImpl(); tFactory.setURIResolver(new ClasspathURIResolver()); Transformer transformer = tFactory.newTransformer(new StreamSource(xslSheet)); transformer.setErrorListener(new EnoErrorListener()); transformer.setParameter(XslParameters.IN2OUT_PROPERTIES_FILE, Constants.CONFIG_DDI2PDF); - logger.debug(String.format("FO Transformer parameters file is: %s", + LOGGER.debug(String.format("FO Transformer parameters file is: %s", transformer.getParameter(Constants.CONFIG_DDI2PDF))); xslTransform(transformer, inputFile, outputFile); } public void transformFOToStep2FO(InputStream inputFile, OutputStream outputFile, InputStream xslSheet) throws Exception { - logger.info("Producing a specific treatment FO from survey's parameters"); + LOGGER.info("Producing a specific treatment FO from survey's parameters"); TransformerFactory tFactory = new net.sf.saxon.TransformerFactoryImpl(); tFactory.setURIResolver(new ClasspathURIResolver()); Transformer transformer = tFactory.newTransformer(new StreamSource(xslSheet)); @@ -382,7 +352,7 @@ public void transformFOToStep4FO(InputStream inputFile, OutputStream outputFile, String surveyName, String formName, byte[] parameters) throws Exception { InputStream parametersIS = null; - logger.info("Inserting generic pages in the FO from survey's parameters"); + LOGGER.info("Inserting generic pages in the FO from survey's parameters"); TransformerFactory tFactory = new net.sf.saxon.TransformerFactoryImpl(); tFactory.setURIResolver(new ClasspathURIResolver()); Transformer transformer = tFactory.newTransformer(new StreamSource(xslSheet)); @@ -390,7 +360,7 @@ public void transformFOToStep4FO(InputStream inputFile, OutputStream outputFile, transformer.setParameter(XslParameters.IN2OUT_SURVEY_NAME, surveyName); transformer.setParameter(XslParameters.IN2OUT_FORM_NAME, formName); transformer.setParameter(XslParameters.IN2OUT_PROPERTIES_FILE, Constants.CONFIG_DDI2PDF); - transformer.setParameter(XslParameters.IN2OUT_PARAMETERS_FILE, Constants.PARAMETERS); + transformer.setParameter(XslParameters.IN2OUT_PARAMETERS_FILE, Constants.PARAMETERS_DEFAULT); if (parameters != null) { parametersIS = new ByteArrayInputStream(parameters); Source source = new StreamSource(parametersIS); @@ -401,53 +371,76 @@ public void transformFOToStep4FO(InputStream inputFile, OutputStream outputFile, parametersIS.close(); } } - + /* POST transformations */ // FR - - public void transformBrowsingFr(InputStream inputFile, OutputStream outputFile, InputStream xslSheet) throws Exception { - logger.info("Post-processing browing for FR transformation."); + + public void transformBrowsingFr(InputStream inputFile, OutputStream outputFile, InputStream xslSheet) + throws Exception { + LOGGER.info("Post-processing browsing for FR transformation."); TransformerFactory tFactory = new net.sf.saxon.TransformerFactoryImpl(); tFactory.setURIResolver(new ClasspathURIResolver()); Transformer transformer = tFactory.newTransformer(new StreamSource(xslSheet)); transformer.setErrorListener(new EnoErrorListener()); transformer.setParameter(XslParameters.IN2OUT_LABELS_FOLDER, Constants.LABELS_FOLDER); - logger.debug(String.format("Transformer parameter is: %s", + LOGGER.debug(String.format("Transformer parameter is: %s", transformer.getParameter(XslParameters.IN2OUT_LABELS_FOLDER))); xslTransform(transformer, inputFile, outputFile); } - - public void transformModelColtraneFr(InputStream inputFile, OutputStream outputFile, InputStream xslSheet, InputStream mappingFile) throws Exception { - logger.info("Post-processing for FR transformation with mapping.xml file."); + + public void transformModelColtraneFr(InputStream inputFile, OutputStream outputFile, InputStream xslSheet, + InputStream mappingFile) throws Exception { + LOGGER.info("Post-processing for FR transformation with mapping.xml file."); TransformerFactory tFactory = new net.sf.saxon.TransformerFactoryImpl(); tFactory.setURIResolver(new ClasspathURIResolver()); Transformer transformer = tFactory.newTransformer(new StreamSource(xslSheet)); transformer.setErrorListener(new EnoErrorListener()); + transformer.setParameter(XslParameters.IN2OUT_MAPPING_FILE, Constants.MAPPING_DEFAULT); if (mappingFile != null) { Source source = new StreamSource(mappingFile); transformer.setParameter(XslParameters.IN2OUT_MAPPING_FILE_NODE, source); } - logger.debug(String.format("Transformer parameter is: %s", + LOGGER.debug(String.format("Transformer parameter is: %s", transformer.getParameter(XslParameters.IN2OUT_MAPPING_FILE_NODE))); xslTransform(transformer, inputFile, outputFile); - - + } - - public void transformWithMetadonnee(InputStream inputFile, OutputStream outputFile, InputStream xslSheet, byte[] parameters, InputStream metadonnees) - throws Exception { + + public void transformWithMetadata(InputStream inputFile, OutputStream outputFile, InputStream xslSheet, + byte[] parameters, byte[] metadata) throws Exception { InputStream parametersIS = null; - logger.info("Post-processing for FR transformation with parameter file and metadonnee file"); + InputStream metadataIS = null; + LOGGER.info("Post-processing for FR transformation with parameter file and metadata file"); TransformerFactory tFactory = new net.sf.saxon.TransformerFactoryImpl(); tFactory.setURIResolver(new ClasspathURIResolver()); Transformer transformer = tFactory.newTransformer(new StreamSource(xslSheet)); transformer.setParameter(XslParameters.IN2OUT_PROPERTIES_FILE, Constants.CONFIG_DDI2FR); - transformer.setParameter(XslParameters.IN2OUT_PARAMETERS_FILE, Constants.PARAMETERS); - transformer.setParameter(XslParameters.IN2OUT_METADONNEE_FILE, Constants.METADONNEES); - if (metadonnees != null) { - Source source = new StreamSource(metadonnees); - transformer.setParameter(XslParameters.IN2OUT_METADONNEE_NODE, source); + transformer.setParameter(XslParameters.IN2OUT_PARAMETERS_FILE, Constants.PARAMETERS_DEFAULT); + transformer.setParameter(XslParameters.IN2OUT_METADATA_FILE, Constants.METADATA_DEFAULT); + if (metadata != null) { + metadataIS = new ByteArrayInputStream(metadata); + Source source = new StreamSource(metadataIS); + transformer.setParameter(XslParameters.IN2OUT_METADATA_NODE, source); + } + if (parameters != null) { + parametersIS = new ByteArrayInputStream(parameters); + Source source = new StreamSource(parametersIS); + transformer.setParameter(XslParameters.IN2OUT_PARAMETERS_NODE, source); } + transformer.setErrorListener(new EnoErrorListener()); + xslTransform(transformer, inputFile, outputFile); + } + + public void transformWithFRSpecificTreatment(InputStream inputFile, OutputStream outputFile, + InputStream specificTreatmentXsl, byte[] parameters) throws Exception { + InputStream parametersIS = null; + LOGGER.info("Specific treatment as post-processing for FR transformation with parameter file"); + TransformerFactory tFactory = new net.sf.saxon.TransformerFactoryImpl(); + tFactory.setURIResolver(new ClasspathURIResolver()); + Transformer transformer = tFactory.newTransformer(new StreamSource(specificTreatmentXsl)); + transformer.setParameter(XslParameters.IN2OUT_PROPERTIES_FILE, Constants.CONFIG_DDI2FR); + transformer.setParameter(XslParameters.IN2OUT_PARAMETERS_FILE, Constants.PARAMETERS_DEFAULT); + if (parameters != null) { parametersIS = new ByteArrayInputStream(parameters); Source source = new StreamSource(parametersIS); @@ -457,15 +450,34 @@ public void transformWithMetadonnee(InputStream inputFile, OutputStream outputFi xslTransform(transformer, inputFile, outputFile); } - public void transformFRToFRSimplePost(InputStream inputFile, OutputStream outputFile, InputStream xslSheet, byte[] parameters) - throws Exception { + public void transformWithPDFSpecificTreatment(InputStream inputFile, OutputStream outputFile, + InputStream specificTreatmentXsl, byte[] parameters) throws Exception { InputStream parametersIS = null; - logger.info("Post-processing for FR transformation with parameter file"); + LOGGER.info("Specific treatment as post-processing for PDF transformation with parameter file"); + TransformerFactory tFactory = new net.sf.saxon.TransformerFactoryImpl(); + tFactory.setURIResolver(new ClasspathURIResolver()); + Transformer transformer = tFactory.newTransformer(new StreamSource(specificTreatmentXsl)); + transformer.setParameter(XslParameters.IN2OUT_PROPERTIES_FILE, Constants.CONFIG_DDI2PDF); + transformer.setParameter(XslParameters.IN2OUT_PARAMETERS_FILE, Constants.PARAMETERS_DEFAULT); + + if (parameters != null) { + parametersIS = new ByteArrayInputStream(parameters); + Source source = new StreamSource(parametersIS); + transformer.setParameter(XslParameters.IN2OUT_PARAMETERS_NODE, source); + } + transformer.setErrorListener(new EnoErrorListener()); + xslTransform(transformer, inputFile, outputFile); + } + + public void transformFRToFRSimplePost(InputStream inputFile, OutputStream outputFile, InputStream xslSheet, + byte[] parameters) throws Exception { + InputStream parametersIS = null; + LOGGER.info("Post-processing for FR transformation with parameter file"); TransformerFactory tFactory = new net.sf.saxon.TransformerFactoryImpl(); tFactory.setURIResolver(new ClasspathURIResolver()); Transformer transformer = tFactory.newTransformer(new StreamSource(xslSheet)); transformer.setParameter(XslParameters.IN2OUT_PROPERTIES_FILE, Constants.CONFIG_DDI2FR); - transformer.setParameter(XslParameters.IN2OUT_PARAMETERS_FILE, Constants.PARAMETERS); + transformer.setParameter(XslParameters.IN2OUT_PARAMETERS_FILE, Constants.PARAMETERS_DEFAULT); if (parameters != null) { parametersIS = new ByteArrayInputStream(parameters); Source source = new StreamSource(parametersIS); @@ -474,22 +486,21 @@ public void transformFRToFRSimplePost(InputStream inputFile, OutputStream output transformer.setErrorListener(new EnoErrorListener()); xslTransform(transformer, inputFile, outputFile); } - - public void transformSimple(InputStream inputFile, OutputStream outputFile, InputStream xslSheet) - throws Exception { - logger.info("Simple post-processing for FR transformation"); + + public void transformSimple(InputStream inputFile, OutputStream outputFile, InputStream xslSheet) throws Exception { + LOGGER.info("Simple post-processing for FR transformation"); TransformerFactory tFactory = new net.sf.saxon.TransformerFactoryImpl(); tFactory.setURIResolver(new ClasspathURIResolver()); Transformer transformer = tFactory.newTransformer(new StreamSource(xslSheet)); transformer.setErrorListener(new EnoErrorListener()); xslTransform(transformer, inputFile, outputFile); } - + // JS - + public void transformJSToJSPost(InputStream inputFile, OutputStream outputFile, InputStream xslSheet) throws Exception { - logger.info("Post-processing for JS transformation"); + LOGGER.info("Post-processing for JS transformation"); TransformerFactory tFactory = new net.sf.saxon.TransformerFactoryImpl(); tFactory.setURIResolver(new ClasspathURIResolver()); Transformer transformer = tFactory.newTransformer(new StreamSource(xslSheet)); From 2586b4d8482c64f567be05dc07df5e68c1983ab7 Mon Sep 17 00:00:00 2001 From: Laurent Caouissin Date: Mon, 30 Sep 2019 16:52:09 +0200 Subject: [PATCH 183/439] ddi2fr : change xpath to model --- src/main/resources/xslt/outputs/fr/models.xsl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/xslt/outputs/fr/models.xsl b/src/main/resources/xslt/outputs/fr/models.xsl index fe89594c0..94f082ec0 100644 --- a/src/main/resources/xslt/outputs/fr/models.xsl +++ b/src/main/resources/xslt/outputs/fr/models.xsl @@ -10,7 +10,7 @@ - + From cf13c25e1699b7015f5405ed36170622ffa3819c Mon Sep 17 00:00:00 2001 From: Laurent Caouissin Date: Mon, 30 Sep 2019 16:53:07 +0200 Subject: [PATCH 184/439] Eno params : update xml params in xml file --- src/main/resources/config/ddi2fr.xml | 11 +++++++---- src/main/resources/params/default/parameters.xml | 4 ++-- .../xslt/transformations/ddi2fr/ddi2fr-fixed.xsl | 6 +++--- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/main/resources/config/ddi2fr.xml b/src/main/resources/config/ddi2fr.xml index bf317d1dd..35cf50836 100644 --- a/src/main/resources/config/ddi2fr.xml +++ b/src/main/resources/config/ddi2fr.xml @@ -1,4 +1,4 @@ - + @@ -8,15 +8,18 @@ img + + img + modifier.png + pdf.png + ¤ ¤ - - 7 - + 7 https://www.legifrance.gouv.fr/affichTexte.do?cidTexte=JORFTEXT000000886460 https://www.legifrance.gouv.fr/affichTexte.do?cidTexte=JORFTEXT000000888573 diff --git a/src/main/resources/params/default/parameters.xml b/src/main/resources/params/default/parameters.xml index 96d0f49c4..59d47f981 100644 --- a/src/main/resources/params/default/parameters.xml +++ b/src/main/resources/params/default/parameters.xml @@ -3,11 +3,11 @@ ddi fr - + + ddi-mapping ddi-dereferencing ddi-cleaning ddi-titling - ddi-mapping fr-insert-generic-questions fr-browsing diff --git a/src/main/resources/xslt/transformations/ddi2fr/ddi2fr-fixed.xsl b/src/main/resources/xslt/transformations/ddi2fr/ddi2fr-fixed.xsl index f9cb225fd..245b86617 100644 --- a/src/main/resources/xslt/transformations/ddi2fr/ddi2fr-fixed.xsl +++ b/src/main/resources/xslt/transformations/ddi2fr/ddi2fr-fixed.xsl @@ -73,7 +73,7 @@ Boolean to hide numeric example. - + @@ -507,13 +507,13 @@ - + - + From e6976892de4b1aa6488b025726ef1db47178d90a Mon Sep 17 00:00:00 2001 From: BulotF Date: Mon, 30 Sep 2019 17:17:51 +0200 Subject: [PATCH 185/439] bug with space characters in formulas --- src/main/resources/xslt/outputs/fr/models.xsl | 29 +++++++++---------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/src/main/resources/xslt/outputs/fr/models.xsl b/src/main/resources/xslt/outputs/fr/models.xsl index c2f74cb34..c1b5cec29 100644 --- a/src/main/resources/xslt/outputs/fr/models.xsl +++ b/src/main/resources/xslt/outputs/fr/models.xsl @@ -358,7 +358,7 @@ - + @@ -374,7 +374,7 @@ - + @@ -391,7 +391,7 @@ - + @@ -419,7 +419,7 @@ - + @@ -432,7 +432,7 @@ - + @@ -480,7 +480,7 @@ - + @@ -497,7 +497,7 @@ - + @@ -554,7 +554,7 @@ - + @@ -571,7 +571,7 @@ - + @@ -881,7 +881,7 @@ - + @@ -898,7 +898,7 @@ - + @@ -1087,7 +1087,7 @@ - + @@ -1104,7 +1104,7 @@ - + @@ -2868,7 +2868,7 @@ - + @@ -2915,7 +2915,6 @@ - From b91f6064892833bae4e1bcc1bdbdfe021a516364 Mon Sep 17 00:00:00 2001 From: BulotF Date: Mon, 30 Sep 2019 17:19:09 +0200 Subject: [PATCH 186/439] Update source-fixed.xsl Questionnaire VariableGroup do not lead to get-business-ancestors content --- src/main/resources/xslt/inputs/ddi/source-fixed.xsl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/xslt/inputs/ddi/source-fixed.xsl b/src/main/resources/xslt/inputs/ddi/source-fixed.xsl index 948e0e2d3..6c86dce88 100644 --- a/src/main/resources/xslt/inputs/ddi/source-fixed.xsl +++ b/src/main/resources/xslt/inputs/ddi/source-fixed.xsl @@ -1146,19 +1146,19 @@ - + - + - + From 176aa2df69d48b650a843d03096a232afe43d324 Mon Sep 17 00:00:00 2001 From: BulotF Date: Mon, 30 Sep 2019 17:19:49 +0200 Subject: [PATCH 187/439] comment on ddi32toddi33 temp-folder use --- src/main/resources/xslt/util/ddi/ddi32toddi33.xsl | 3 +++ src/main/resources/xslt/util/ddi/dereferencing.xsl | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/resources/xslt/util/ddi/ddi32toddi33.xsl b/src/main/resources/xslt/util/ddi/ddi32toddi33.xsl index b015f3f27..7b651cf38 100644 --- a/src/main/resources/xslt/util/ddi/ddi32toddi33.xsl +++ b/src/main/resources/xslt/util/ddi/ddi32toddi33.xsl @@ -8,6 +8,9 @@ exclude-result-prefixes="xs d32 r32 l32 g32 s32 xsl xd" version="2.0"> + + + diff --git a/src/main/resources/xslt/util/ddi/dereferencing.xsl b/src/main/resources/xslt/util/ddi/dereferencing.xsl index 4ce786752..af4756ac7 100644 --- a/src/main/resources/xslt/util/ddi/dereferencing.xsl +++ b/src/main/resources/xslt/util/ddi/dereferencing.xsl @@ -252,11 +252,9 @@ - - From 3fc0672bd20cc7168a82594c9a0be338456806c2 Mon Sep 17 00:00:00 2001 From: BulotF Date: Tue, 1 Oct 2019 10:26:15 +0200 Subject: [PATCH 188/439] Update out.xhtml --- src/test/resources/ddi-to-xform/out.xhtml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/test/resources/ddi-to-xform/out.xhtml b/src/test/resources/ddi-to-xform/out.xhtml index 9bbc2ab41..bf6adbf20 100644 --- a/src/test/resources/ddi-to-xform/out.xhtml +++ b/src/test/resources/ddi-to-xform/out.xhtml @@ -242,7 +242,7 @@ + relevant="not( instance('fr-form-instance')//READY!= '1')"> @@ -262,7 +262,7 @@ + relevant="not( instance('fr-form-instance')//READY!= '1')"> @@ -271,7 +271,7 @@ + relevant="not( instance('fr-form-instance')//READY!= '1')"> @@ -355,7 +355,7 @@ + relevant="not( instance('fr-form-instance')//READY!= '1')"> + value="not((if (instance('fr-form-instance')//PERCENTAGE_EXPENSES11/string()='') then 0 else instance('fr-form-instance')//PERCENTAGE_EXPENSES11) + (if (instance('fr-form-instance')//PERCENTAGE_EXPENSES21/string()='') then 0 else instance('fr-form-instance')//PERCENTAGE_EXPENSES21) + (if (instance('fr-form-instance')//PERCENTAGE_EXPENSES31/string()='') then 0 else instance('fr-form-instance')//PERCENTAGE_EXPENSES31)+ (if (instance('fr-form-instance')//PERCENTAGE_EXPENSES41/string()='') then 0 else instance('fr-form-instance')//PERCENTAGE_EXPENSES41)+ (if (instance('fr-form-instance')//PERCENTAGE_EXPENSES51/string()='') then 0 else instance('fr-form-instance')//PERCENTAGE_EXPENSES51)+ (if (instance('fr-form-instance')//PERCENTAGE_EXPENSES61/string()='') then 0 else instance('fr-form-instance')//PERCENTAGE_EXPENSES61)+ (if (instance('fr-form-instance')//PERCENTAGE_EXPENSES71/string()='') then 0 else instance('fr-form-instance')//PERCENTAGE_EXPENSES71)+ (if (instance('fr-form-instance')//PERCENTAGE_EXPENSES81/string()='') then 0 else instance('fr-form-instance')//PERCENTAGE_EXPENSES81)+ (if (instance('fr-form-instance')//PERCENTAGE_EXPENSES91/string()='') then 0 else instance('fr-form-instance')//PERCENTAGE_EXPENSES91)+ (if (instance('fr-form-instance')//PERCENTAGE_EXPENSES101/string()='') then 0 else instance('fr-form-instance')//PERCENTAGE_EXPENSES101)!= 100)"/> @@ -542,7 +542,7 @@ + relevant="not( instance('fr-form-instance')//READY!= '1')"> + calculate="(if (instance('fr-form-instance')//PERCENTAGE_EXPENSES11/string()='') then 0 else instance('fr-form-instance')//PERCENTAGE_EXPENSES11) + (if (instance('fr-form-instance')//PERCENTAGE_EXPENSES21/string()='') then 0 else instance('fr-form-instance')//PERCENTAGE_EXPENSES21) + (if (instance('fr-form-instance')//PERCENTAGE_EXPENSES31/string()='') then 0 else instance('fr-form-instance')//PERCENTAGE_EXPENSES31)+ (if (instance('fr-form-instance')//PERCENTAGE_EXPENSES41/string()='') then 0 else instance('fr-form-instance')//PERCENTAGE_EXPENSES41)+ (if (instance('fr-form-instance')//PERCENTAGE_EXPENSES51/string()='') then 0 else instance('fr-form-instance')//PERCENTAGE_EXPENSES51)+ (if (instance('fr-form-instance')//PERCENTAGE_EXPENSES61/string()='') then 0 else instance('fr-form-instance')//PERCENTAGE_EXPENSES61)+ (if (instance('fr-form-instance')//PERCENTAGE_EXPENSES71/string()='') then 0 else instance('fr-form-instance')//PERCENTAGE_EXPENSES71)+ (if (instance('fr-form-instance')//PERCENTAGE_EXPENSES81/string()='') then 0 else instance('fr-form-instance')//PERCENTAGE_EXPENSES81)+ (if (instance('fr-form-instance')//PERCENTAGE_EXPENSES91/string()='') then 0 else instance('fr-form-instance')//PERCENTAGE_EXPENSES91)+ (if (instance('fr-form-instance')//PERCENTAGE_EXPENSES101/string()='') then 0 else instance('fr-form-instance')//PERCENTAGE_EXPENSES101)"/> Date: Tue, 1 Oct 2019 11:10:35 +0200 Subject: [PATCH 189/439] poguesXml2ddi : update preprocessing for test --- .../fr/insee/eno/test/TestPoguesXMLToDDI.java | 4 +-- src/test/resources/pogues-xml-to-ddi/out.xml | 28 +++++++++---------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/test/java/fr/insee/eno/test/TestPoguesXMLToDDI.java b/src/test/java/fr/insee/eno/test/TestPoguesXMLToDDI.java index 19c768482..05904de03 100644 --- a/src/test/java/fr/insee/eno/test/TestPoguesXMLToDDI.java +++ b/src/test/java/fr/insee/eno/test/TestPoguesXMLToDDI.java @@ -10,7 +10,7 @@ import fr.insee.eno.GenerationService; import fr.insee.eno.generation.PoguesXML2DDIGenerator; import fr.insee.eno.postprocessing.DDIPostprocessor; -import fr.insee.eno.preprocessing.PoguesXMLPreprocessor; +import fr.insee.eno.preprocessing.PoguesXMLPreprocessorGoToTreatment; public class TestPoguesXMLToDDI { @@ -20,7 +20,7 @@ public class TestPoguesXMLToDDI { public void simpleDiffTest() { try { String basePath = "src/test/resources/pogues-xml-to-ddi"; - GenerationService genService = new GenerationService(new PoguesXMLPreprocessor(), + GenerationService genService = new GenerationService(new PoguesXMLPreprocessorGoToTreatment(), new PoguesXML2DDIGenerator(), new DDIPostprocessor()); File in = new File(String.format("%s/in.xml", basePath)); File outputFile = genService.generateQuestionnaire(in, "xml-pogues-2-ddi-test"); diff --git a/src/test/resources/pogues-xml-to-ddi/out.xml b/src/test/resources/pogues-xml-to-ddi/out.xml index fb76627a4..f64add963 100644 --- a/src/test/resources/pogues-xml-to-ddi/out.xml +++ b/src/test/resources/pogues-xml-to-ddi/out.xml @@ -153,7 +153,7 @@ fr.insee - d1e119 + j6p6my1d-a-j6p0ti5h 1 IfThenElse @@ -195,7 +195,7 @@ fr.insee - d1e50 + j6p6my1d-a-j6p0np9q 1 IfThenElse @@ -442,7 +442,7 @@ fr.insee - d1e50 + j6p6my1d-a-j6p0np9q 1 A définir @@ -456,7 +456,7 @@ xpath fr.insee - d1e50-IP-1 + j6p6my1d-a-j6p0np9q-IP-1 1 READY @@ -471,24 +471,24 @@ fr.insee - d1e50-IP-1 + j6p6my1d-a-j6p0np9q-IP-1 1 InParameter - not( d1e50-IP-1!= '1') + not(j6p6my1d-a-j6p0np9q-IP-1!= '1') fr.insee - d1e50-THEN + j6p6my1d-a-j6p0np9q-THEN 1 Sequence fr.insee - d1e50-THEN + j6p6my1d-a-j6p0np9q-THEN 1 @@ -502,7 +502,7 @@ fr.insee - d1e119 + j6p6my1d-a-j6p0ti5h 1 A définir @@ -516,7 +516,7 @@ xpath fr.insee - d1e119-IP-1 + j6p6my1d-a-j6p0ti5h-IP-1 1 READY @@ -531,24 +531,24 @@ fr.insee - d1e119-IP-1 + j6p6my1d-a-j6p0ti5h-IP-1 1 InParameter - not( d1e119-IP-1!= '1') + not(j6p6my1d-a-j6p0ti5h-IP-1!= '1') fr.insee - d1e119-THEN + j6p6my1d-a-j6p0ti5h-THEN 1 Sequence fr.insee - d1e119-THEN + j6p6my1d-a-j6p0ti5h-THEN 1 From 4e31c2217670baa20973c2707de6633e220eebe4 Mon Sep 17 00:00:00 2001 From: BulotF Date: Tue, 1 Oct 2019 11:34:45 +0200 Subject: [PATCH 190/439] simplify numerci formulas --- .../xslt/inputs/pogues-xml/source-fixed.xsl | 63 +++++++++---------- 1 file changed, 28 insertions(+), 35 deletions(-) diff --git a/src/main/resources/xslt/inputs/pogues-xml/source-fixed.xsl b/src/main/resources/xslt/inputs/pogues-xml/source-fixed.xsl index 8938dbcad..1b223e8c4 100644 --- a/src/main/resources/xslt/inputs/pogues-xml/source-fixed.xsl +++ b/src/main/resources/xslt/inputs/pogues-xml/source-fixed.xsl @@ -83,7 +83,7 @@ - + @@ -98,7 +98,7 @@ - + @@ -106,7 +106,7 @@ - + @@ -118,7 +118,7 @@ - + @@ -126,7 +126,7 @@ - + @@ -135,7 +135,7 @@ - + @@ -162,17 +162,17 @@ - + - + @@ -198,9 +198,9 @@ - + - + @@ -210,7 +210,7 @@ - + @@ -225,19 +225,19 @@ - + - - + + - + @@ -247,15 +247,15 @@ - + - + - + @@ -268,7 +268,7 @@ /> - + @@ -285,34 +285,27 @@ - + - - + + - - - - - - - - - + + - - + + Multi Variables references in ConditionnalText (coming from FailMessage) are not supported. - + From a5cef03f5ecec2c60fbe5ebb51e5b6b0174d3900 Mon Sep 17 00:00:00 2001 From: BulotF Date: Tue, 1 Oct 2019 11:50:29 +0200 Subject: [PATCH 191/439] factorize complex formulas --- src/main/resources/xslt/outputs/fr/models.xsl | 100 ++++++++---------- 1 file changed, 42 insertions(+), 58 deletions(-) diff --git a/src/main/resources/xslt/outputs/fr/models.xsl b/src/main/resources/xslt/outputs/fr/models.xsl index c1b5cec29..2456ae798 100644 --- a/src/main/resources/xslt/outputs/fr/models.xsl +++ b/src/main/resources/xslt/outputs/fr/models.xsl @@ -2950,9 +2950,9 @@ - + - + @@ -2965,7 +2965,17 @@ - + + + + + + + + + + + @@ -2973,40 +2983,38 @@ - - - - + + + - + - - - - - - - - - + + + + - + + + + + @@ -3014,46 +3022,22 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + From a4e090cdcc8bbc2b5c385bbf61352382189d42c2 Mon Sep 17 00:00:00 2001 From: BulotF Date: Tue, 1 Oct 2019 11:59:57 +0200 Subject: [PATCH 192/439] Update pogues2ddi out.xml --- src/test/resources/pogues-xml-to-ddi/out.xml | 21 ++++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/src/test/resources/pogues-xml-to-ddi/out.xml b/src/test/resources/pogues-xml-to-ddi/out.xml index f64add963..438f5cd0d 100644 --- a/src/test/resources/pogues-xml-to-ddi/out.xml +++ b/src/test/resources/pogues-xml-to-ddi/out.xml @@ -132,7 +132,7 @@ - fr.inseeFTN-INSTRUCTION-11tooltipIncluded principalities + fr.inseeFTN-INSTRUCTION-11tooltipIncluded principalities fr.insee ControlConstructScheme-i6vwi0 @@ -1070,10 +1070,10 @@ InParameter - number(if (j4nwc63q-CI-0-IP-1='') then '0' else j4nwc63q-CI-0-IP-1) + number(if (j4nwc63q-CI-0-IP-2='') then '0' else j4nwc63q-CI-0-IP-2) + - number(if (j4nwc63q-CI-0-IP-3='') then '0' else j4nwc63q-CI-0-IP-3)+ number(if (j4nwc63q-CI-0-IP-4='') then '0' else j4nwc63q-CI-0-IP-4)+ number(if (j4nwc63q-CI-0-IP-5='') then '0' else j4nwc63q-CI-0-IP-5)+ - number(if (j4nwc63q-CI-0-IP-6='') then '0' else j4nwc63q-CI-0-IP-6)+ number(if (j4nwc63q-CI-0-IP-7='') then '0' else j4nwc63q-CI-0-IP-7)+ number(if (j4nwc63q-CI-0-IP-8='') then '0' else j4nwc63q-CI-0-IP-8)+ - number(if (j4nwc63q-CI-0-IP-9='') then '0' else j4nwc63q-CI-0-IP-9)+ number(if (j4nwc63q-CI-0-IP-10='') then '0' else j4nwc63q-CI-0-IP-10)!= 100 + j4nwc63q-CI-0-IP-1 + j4nwc63q-CI-0-IP-2 + + j4nwc63q-CI-0-IP-3+ j4nwc63q-CI-0-IP-4+ j4nwc63q-CI-0-IP-5+ + j4nwc63q-CI-0-IP-6+ j4nwc63q-CI-0-IP-7+ j4nwc63q-CI-0-IP-8+ + j4nwc63q-CI-0-IP-9+ j4nwc63q-CI-0-IP-10!= 100 @@ -10625,8 +10625,7 @@ fr.insee jbcggtca-GI 1 - - + fr.insee jbgdnfk7 1 @@ -10914,10 +10913,10 @@ InParameter - number(if (jbcggtca-IP-1='') then '0' else jbcggtca-IP-1) + number(if (jbcggtca-IP-2='') then '0' else jbcggtca-IP-2) + number(if (jbcggtca-IP-3='') then '0' else jbcggtca-IP-3)+ - number(if (jbcggtca-IP-4='') then '0' else jbcggtca-IP-4)+ number(if (jbcggtca-IP-5='') then '0' else jbcggtca-IP-5)+ number(if (jbcggtca-IP-6='') then '0' else jbcggtca-IP-6)+ - number(if (jbcggtca-IP-7='') then '0' else jbcggtca-IP-7)+ number(if (jbcggtca-IP-8='') then '0' else jbcggtca-IP-8)+ number(if (jbcggtca-IP-9='') then '0' else jbcggtca-IP-9)+ - number(if (jbcggtca-IP-10='') then '0' else jbcggtca-IP-10) + jbcggtca-IP-1 + jbcggtca-IP-2 + jbcggtca-IP-3+ + jbcggtca-IP-4+ jbcggtca-IP-5+ jbcggtca-IP-6+ + jbcggtca-IP-7+ jbcggtca-IP-8+ jbcggtca-IP-9+ + jbcggtca-IP-10 From 8b3b0227777dc2416973d2c39ab2435778b4b6a1 Mon Sep 17 00:00:00 2001 From: Laurent Caouissin Date: Wed, 2 Oct 2019 12:14:04 +0200 Subject: [PATCH 193/439] Eno : params : undo spring --- .../java/fr/insee/eno/ApplicationContext.java | 10 - src/main/java/fr/insee/eno/Constants.java | 202 +++++++++--------- .../insee/eno/generation/DDI2FRGenerator.java | 7 +- .../insee/eno/generation/DDI2JSGenerator.java | 6 +- .../eno/generation/DDI2ODTGenerator.java | 6 +- .../eno/generation/DDI2PDFGenerator.java | 6 +- .../generation/DDI2PoguesXMLGenerator.java | 6 +- .../fr/insee/eno/generation/Generator.java | 4 +- .../generation/PoguesXML2DDIGenerator.java | 6 +- .../pipeline/PipeLineGeneratorImpl.java | 124 +++++------ .../eno/postprocessing/DDIPostprocessor.java | 4 +- .../eno/postprocessing/NoopPostprocessor.java | 2 - .../ddi/DDIMarkdown2XhtmlPostprocessor.java | 6 +- .../fr/FRBrowsingPostprocessor.java | 6 +- .../fr/FREditPatronPostprocessor.java | 7 +- .../fr/FRFixAdherencePostprocessor.java | 6 +- .../fr/FRIdentificationPostprocessor.java | 6 +- .../fr/FRInsertEndPostprocessor.java | 6 +- ...FRInsertGenericQuestionsPostprocessor.java | 6 +- .../fr/FRInsertWelcomePostprocessor.java | 6 +- .../fr/FRModeleColtranePostprocessor.java | 6 +- .../fr/FRSpecificTreatmentPostprocessor.java | 6 +- .../JSExternalizeVariablesPostprocessor.java | 6 +- .../js/JSSortComponentsPostprocessor.java | 6 +- .../PDFEditStructurePagesPostprocessor.java | 6 +- ...FInsertAccompanyingMailsPostprocessor.java | 6 +- .../pdf/PDFInsertCoverPagePostprocessor.java | 6 +- .../PDFInsertEndQuestionPostprocessor.java | 6 +- .../pdf/PDFMailingPostprocessor.java | 6 +- .../PDFSpecificTreatmentPostprocessor.java | 6 +- .../pdf/PDFTableColumnPostprocessorFake.java | 2 - .../DDICleaningPreprocessor.java | 7 +- .../DDIDereferencingPreprocessor.java | 7 +- .../preprocessing/DDIMappingPreprocessor.java | 7 +- .../eno/preprocessing/DDIPreprocessor.java | 9 +- .../preprocessing/DDITitlingPreprocessor.java | 6 +- .../preprocessing/PoguesXMLPreprocessor.java | 8 +- .../PoguesXMLPreprocessorGoToTreatment.java | 6 +- .../eno/transform/xsl/XslTransformation.java | 2 - 39 files changed, 197 insertions(+), 349 deletions(-) delete mode 100644 src/main/java/fr/insee/eno/ApplicationContext.java diff --git a/src/main/java/fr/insee/eno/ApplicationContext.java b/src/main/java/fr/insee/eno/ApplicationContext.java deleted file mode 100644 index bcec2106d..000000000 --- a/src/main/java/fr/insee/eno/ApplicationContext.java +++ /dev/null @@ -1,10 +0,0 @@ -package fr.insee.eno; - -import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.Configuration; - -@Configuration -@ComponentScan(basePackages = {"fr.insee.eno"}) -public class ApplicationContext { - -} diff --git a/src/main/java/fr/insee/eno/Constants.java b/src/main/java/fr/insee/eno/Constants.java index 456550ff1..45943769b 100644 --- a/src/main/java/fr/insee/eno/Constants.java +++ b/src/main/java/fr/insee/eno/Constants.java @@ -17,16 +17,16 @@ * */ public final class Constants { - - + + private static final Logger logger = LoggerFactory.getLogger(Constants.class); private Constants() { } - + // ---------- Core resources: references to XSL, XML, etc. resources used to generate a questionnaire - + // ----- Folders public static final String UTIL_FOLDER_PATH = "/xslt/util"; public static final String PARAMS_DEFAULT_FOLDER_PATH = "/params/default"; @@ -36,14 +36,14 @@ private Constants() { public static final String INPUTS_FOLDER = "/xslt/inputs"; public static final File LABEL_FOLDER = getFileFromUrl(Constants.class.getResource("/lang/fr")); public static final File PARAMETERS_DEFAULT_XML = getFileFromUrl(Constants.class.getResource(PARAMS_DEFAULT_FOLDER_PATH+"/parameters.xml")); - - + + // Params : schema - public static final File ENO_PARAMETERS_XSD = getFileFromUrl(Constants.class.getResource(PARAMS_SCHEMAS_FOLDER_PATH+"/ENOParameters.xsd")); - + public static final URL ENO_PARAMETERS_XSD = Constants.class.getResource(PARAMS_SCHEMAS_FOLDER_PATH+"/ENOParameters.xsd"); + // ----- Ref public static final String PARAMETERS_XML = "parameters.xml"; - + // ----- XSL Parameters path public static final String CONFIG_DDI2FR = CONFIG_FOLDER + "/ddi2fr.xml"; public static final String CONFIG_DDI2ODT = CONFIG_FOLDER + "/ddi2odt.xml"; @@ -54,8 +54,8 @@ private Constants() { public static final String METADATA_DEFAULT = PARAMS_DEFAULT_FOLDER_PATH + "/metadata.xml"; public static final String MAPPING_DEFAULT = PARAMS_DEFAULT_FOLDER_PATH + "/mapping.xml"; public static final String LABELS_FOLDER = "/lang/fr/"; - - + + // ----- Files public static final String DDI_DEREFERENCING_XSL = UTIL_FOLDER_PATH + "/ddi/dereferencing.xsl"; public static final String PARAMETERS_FILE = "/" + PARAMETERS_XML; @@ -70,13 +70,13 @@ private Constants() { public static final String UTIL_FODS_PREFORMATTING_XSL = UTIL_FOLDER_PATH + "/fods/preformatting.xsl"; public static final String UTIL_XSL_INCORPORATION_XSL = UTIL_FOLDER_PATH + "/xsl/incorporation.xsl"; public static final String UTIL_DDI_DEREFERENCING_XSL = UTIL_FOLDER_PATH + "/ddi/dereferencing.xsl"; - - -// public static final String PROPERTIES_FILE_FR = CONFIG_FOLDER + "/ddi2fr.xml"; -// public static final String PROPERTIES_FILE_ODT = CONFIG_FOLDER + "/ddi2odt.xml"; -// public static final String PROPERTIES_FILE_PDF = CONFIG_FOLDER + "/ddi2pdf.xml"; -// public static final String PROPERTIES_FILE_DDI = CONFIG_FOLDER + "/pogues-xml2ddi.xml"; - + + + // public static final String PROPERTIES_FILE_FR = CONFIG_FOLDER + "/ddi2fr.xml"; + // public static final String PROPERTIES_FILE_ODT = CONFIG_FOLDER + "/ddi2odt.xml"; + // public static final String PROPERTIES_FILE_PDF = CONFIG_FOLDER + "/ddi2pdf.xml"; + // public static final String PROPERTIES_FILE_DDI = CONFIG_FOLDER + "/pogues-xml2ddi.xml"; + // ---------- XSL generation public static final String TRANSFORMATIONS_DDI2FR_DDI2FR_XSL = TRANSFORMATIONS_FOLDER + "/ddi2fr/ddi2fr.xsl"; public static final String TRANSFORMATIONS_DDI2ODT_DDI2ODT_XSL = TRANSFORMATIONS_FOLDER + "/ddi2odt/ddi2odt.xsl"; @@ -84,25 +84,25 @@ private Constants() { public static final String TRANSFORMATIONS_POGUES_XML2DDI_POGUES_XML2DDI_XSL = TRANSFORMATIONS_FOLDER + "/pogues-xml2ddi/pogues-xml2ddi.xsl"; public static final String TRANSFORMATIONS_DDI2POGUES_XML_XSL = TRANSFORMATIONS_FOLDER + "/ddi2pogues-xml/ddi2pogues-xml.xsl"; public static final String TRANSFORMATIONS_DDI2JS_DDI2JS_XSL = TRANSFORMATIONS_FOLDER + "/ddi2js/ddi2js.xsl"; - + public static final String TRANSFORMATIONS_DDI2FR_DRIVERS_FODS = TRANSFORMATIONS_FOLDER + "/ddi2fr/drivers.fods"; public static final String TRANSFORMATIONS_DDI2ODT_DRIVERS_FODS = TRANSFORMATIONS_FOLDER + "/ddi2odt/drivers.fods"; public static final String TRANSFORMATIONS_DDI2PDF_DRIVERS_FODS = TRANSFORMATIONS_FOLDER + "/ddi2pdf/drivers.fods"; public static final String TRANSFORMATIONS_POGUES_XML2DDI_DRIVERS_FODS = TRANSFORMATIONS_FOLDER + "/pogues-xml2ddi/drivers.fods"; public static final String TRANSFORMATIONS_DDI2JS_DRIVERS_FODS = TRANSFORMATIONS_FOLDER + "/ddi2js/drivers.fods"; - + public static final String TRANSFORMATIONS_DDI2FR_FUNCTIONS_FODS = TRANSFORMATIONS_FOLDER + "/ddi2fr/functions.fods"; public static final String TRANSFORMATIONS_DDI2ODT_FUNCTIONS_FODS = TRANSFORMATIONS_FOLDER + "/ddi2odt/functions.fods"; public static final String TRANSFORMATIONS_DDI2PDF_FUNCTIONS_FODS = TRANSFORMATIONS_FOLDER + "/ddi2pdf/functions.fods"; public static final String TRANSFORMATIONS_POGUES_XML2DDI_FUNCTIONS_FODS = TRANSFORMATIONS_FOLDER + "/pogues-xml2ddi/functions.fods"; public static final String TRANSFORMATIONS_DDI2JS_FUNCTIONS_FODS = TRANSFORMATIONS_FOLDER + "/ddi2js/functions.fods"; - + public static final String TRANSFORMATIONS_DDI2FR_FUNCTIONS_XSL = TRANSFORMATIONS_FOLDER + "/ddi2fr/functions.xsl"; public static final String TRANSFORMATIONS_DDI2ODT_FUNCTIONS_XSL = TRANSFORMATIONS_FOLDER + "/ddi2odt/functions.xsl"; public static final String TRANSFORMATIONS_DDI2PDF_FUNCTIONS_XSL = TRANSFORMATIONS_FOLDER + "/ddi2pdf/functions.xsl"; public static final String TRANSFORMATIONS_POGUES_XML2DDI_FUNCTIONS_XSL = TRANSFORMATIONS_FOLDER + "/pogues-xml2ddi/functions.xsl"; public static final String TRANSFORMATIONS_DDI2JS_FUNCTIONS_XSL = TRANSFORMATIONS_FOLDER + "/ddi2js/functions.xsl"; - + public static final String TRANSFORMATIONS_DDI2FR_TREE_NAVIGATION_FODS = TRANSFORMATIONS_FOLDER + "/ddi2fr/tree-navigation.fods"; public static final String TRANSFORMATIONS_DDI2ODT_TREE_NAVIGATION_FODS = TRANSFORMATIONS_FOLDER + "/ddi2odt/tree-navigation.fods"; public static final String TRANSFORMATIONS_DDI2PDF_TREE_NAVIGATION_FODS = TRANSFORMATIONS_FOLDER + "/ddi2pdf/tree-navigation.fods"; @@ -113,29 +113,29 @@ private Constants() { public static final String TRANSFORMATIONS_DDI2PDF_TREE_NAVIGATION_XSL = TRANSFORMATIONS_FOLDER + "/ddi2pdf/tree-navigation.xsl"; public static final String TRANSFORMATIONS_POGUES_XML2DDI_TREE_NAVIGATION_XSL = TRANSFORMATIONS_FOLDER + "/pogues-xml2ddi/tree-navigation.xsl"; public static final String TRANSFORMATIONS_DDI2JS_TREE_NAVIGATION_XSL = TRANSFORMATIONS_FOLDER + "/ddi2js/tree-navigation.xsl"; - + public static final String TRANSFORMATIONS_DDI2FR_DDI2FR_FIXED_XSL = TRANSFORMATIONS_FOLDER + "/ddi2fr/ddi2fr-fixed.xsl"; public static final String TRANSFORMATIONS_DDI2ODT_DDI2ODT_FIXED_XSL = TRANSFORMATIONS_FOLDER + "/ddi2odt/ddi2odt-fixed.xsl"; public static final String TRANSFORMATIONS_DDI2PDF_DDI2PDF_FIXED_XSL = TRANSFORMATIONS_FOLDER + "/ddi2pdf/ddi2pdf-fixed.xsl"; public static final String TRANSFORMATIONS_DDI2JS_DDI2JS_FIXED_XSL = TRANSFORMATIONS_FOLDER + "/ddi2js/ddi2js-fixed.xsl"; public static final String TRANSFORMATIONS_POGUES_XML2DDI_POGUES_XML2DDI_FIXED_XSL = TRANSFORMATIONS_FOLDER + "/pogues-xml2ddi/pogues-xml2ddi-fixed.xsl"; - + // ---------- public static final String INPUTS_DDI_FUNCTIONS_FODS = INPUTS_FOLDER + "/ddi/functions.fods"; public static final String INPUTS_DDI_FUNCTIONS_XSL = INPUTS_FOLDER + "/ddi/functions.xsl"; public static final String INPUTS_DDI_TEMPLATES_FODS = INPUTS_FOLDER + "/ddi/templates.fods"; public static final String INPUTS_DDI_TEMPLATES_XSL = INPUTS_FOLDER + "/ddi/templates.xsl"; - + public static final String INPUTS_POGUES_XML_FUNCTIONS_FODS = INPUTS_FOLDER + "/pogues-xml/functions.fods"; public static final String INPUTS_POGUES_XML_FUNCTIONS_XSL = INPUTS_FOLDER + "/pogues-xml/functions.xsl"; public static final String INPUTS_POGUES_XML_TEMPLATES_FODS = INPUTS_FOLDER + "/pogues-xml/templates.fods"; public static final String INPUTS_POGUES_XML_TEMPLATES_XSL = INPUTS_FOLDER + "/pogues-xml/templates.xsl"; - + public static final String INPUTS_DDI_SOURCE_FIXED_XSL = INPUTS_FOLDER + "/ddi/source-fixed.xsl"; public static final String INPUTS_POGUES_XML_SOURCE_FIXED_XSL = INPUTS_FOLDER + "/pogues-xml/source-fixed.xsl"; public static final String FODS_2_XML_XSL = TRANSFORMATIONS_FOLDER + "/fods2xml.xsl"; public static final String XML_2_XSL_XSL = TRANSFORMATIONS_FOLDER + "/xml2xsl.xsl"; - + // ---------- Post-processing files public static final String OUPUTS_FOLDER = "/xslt/outputs/pdf"; public static final String POST_PROCESSING_FOLDER_PDF = "/xslt/util/pdf"; @@ -162,16 +162,16 @@ private Constants() { public static final String UTIL_FR_INSERT_WELCOME_XSL = POST_PROCESSING_FOLDER_FR + "/insert-welcome.xsl"; public static final String UTIL_FR_MODELE_COLTRANE_XSL = POST_PROCESSING_FOLDER_FR + "/modele-coltrane.xsl"; public static final String UTIL_FR_SPECIFIC_TREATMENT_XSL = POST_PROCESSING_FOLDER_FR + "/fr-specific-treatment.xsl"; - + // ---------- Temporary file system - + // ----- Folders //public static final String TEMP_FOLDER_PATH = "/target/eno"; public static final String TEMP_FOLDER_PATH = System.getProperty("java.io.tmpdir") + "/eno"; - - + + public static final File TEMP_FOLDER = getFileOrDirectoryFromPath(TEMP_FOLDER_PATH); - + public static final File TEMP_FILE_PARAMS(String file) { return getFileOrDirectoryFromPath(TEMP_FOLDER_PATH +"/"+file); } @@ -179,12 +179,12 @@ public static final File TEMP_FILE_PARAMS(String file) { public static File sUB_TEMP_FOLDER_FILE (String survey){ return getFileOrDirectoryFromPath(TEMP_FOLDER_PATH + "/"+survey); } - + public static String sUB_TEMP_FOLDER (String survey){ return TEMP_FOLDER_PATH + "/"+survey; } - - + + // ----- Files //public static final File TEMP_NULL_TMP = getFileOrDirectoryFromPath(SUB_TEMP_FOLDER + "/null.tmp"); public static File tEMP_NULL_TMP (String sUB_TEMP_FOLDER){ @@ -194,22 +194,22 @@ public static File tEMP_MAPPING_TMP (String sUB_TEMP_FOLDER){ return getFileOrDirectoryFromPath(sUB_TEMP_FOLDER + "/mapping.xml"); } public static final File TEMP_PREFORMATE_TMP = getFileOrDirectoryFromPath(TEMP_FOLDER_PATH + "/temp/preformate.tmp"); -// public static File tEMP_PREFORMATE_TMP (String sUB_TEMP_FOLDER) { -// return getFileOrDirectoryFromPath(sUB_TEMP_FOLDER + "/preformate.tmp"); -// } + // public static File tEMP_PREFORMATE_TMP (String sUB_TEMP_FOLDER) { + // return getFileOrDirectoryFromPath(sUB_TEMP_FOLDER + "/preformate.tmp"); + // } public static final File TEMP_XML_TMP = getFileOrDirectoryFromPath(TEMP_FOLDER_PATH + "/temp/xml.tmp"); -// public static File tEMP_XML_TMP (String sUB_TEMP_FOLDER){ -// return getFileOrDirectoryFromPath(sUB_TEMP_FOLDER + "/xml.tmp"); -// } + // public static File tEMP_XML_TMP (String sUB_TEMP_FOLDER){ + // return getFileOrDirectoryFromPath(sUB_TEMP_FOLDER + "/xml.tmp"); + // } public static final File TEMP_TEMP_TMP = getFileOrDirectoryFromPath(TEMP_FOLDER_PATH + "/temp/temp.tmp"); -// public static File tEMP_TEMP_TMP(String sUB_TEMP_FOLDER){ -// return getFileOrDirectoryFromPath(sUB_TEMP_FOLDER + "/temp.tmp"); -// } + // public static File tEMP_TEMP_TMP(String sUB_TEMP_FOLDER){ + // return getFileOrDirectoryFromPath(sUB_TEMP_FOLDER + "/temp.tmp"); + // } public static final File TEMP_TEMP_BIS_TMP = getFileOrDirectoryFromPath(TEMP_FOLDER_PATH + "/temp/temp-bis.tmp"); -// public static File tEMP_TEMP_BIS_TMP(String sUB_TEMP_FOLDER){ -// return getFileOrDirectoryFromPath(sUB_TEMP_FOLDER + "/temp-bis.tmp"); -// } - + // public static File tEMP_TEMP_BIS_TMP(String sUB_TEMP_FOLDER){ + // return getFileOrDirectoryFromPath(sUB_TEMP_FOLDER + "/temp-bis.tmp"); + // } + // Those files holds the XSL generated from FODS ; they will be then copied to resource directory when packaging to JAR public static final File TRANSFORMATIONS_DDI2FR_DDI2FR_XSL_TMP = getFileOrDirectoryFromPath(TEMP_FOLDER_PATH + "/ddi2fr/ddi2fr.xsl"); public static final File TRANSFORMATIONS_DDI2ODT_DDI2ODT_XSL_TMP = getFileOrDirectoryFromPath(TEMP_FOLDER_PATH + "/ddi2odt/ddi2odt.xsl"); @@ -231,15 +231,15 @@ public static File tEMP_MAPPING_TMP (String sUB_TEMP_FOLDER){ public static final File TRANSFORMATIONS_DDI2PDF_TREE_NAVIGATION_XSL_TMP = getFileOrDirectoryFromPath(TEMP_FOLDER_PATH + "/ddi2pdf/tree-navigation.xsl"); public static final File TRANSFORMATIONS_POGUES_XML2DDI_TREE_NAVIGATION_XSL_TMP = getFileOrDirectoryFromPath(TEMP_FOLDER_PATH + "/pogues-xml2ddi/tree-navigation.xsl"); public static final File TRANSFORMATIONS_DDI2JS_TREE_NAVIGATION_XSL_TMP = getFileOrDirectoryFromPath(TEMP_FOLDER_PATH + "/ddi2js/tree-navigation.xsl"); - + public static final File INPUTS_DDI_FUNCTIONS_XSL_TMP = getFileOrDirectoryFromPath(TEMP_FOLDER_PATH + "/ddi/functions.xsl"); public static final File INPUTS_DDI_TEMPLATES_XSL_TMP = getFileOrDirectoryFromPath(TEMP_FOLDER_PATH + "/ddi/templates.xsl"); public static final File INPUTS_DDI_SOURCE_XSL_TMP = getFileOrDirectoryFromPath(TEMP_FOLDER_PATH + "/ddi/source.xsl"); - + public static final File INPUTS_POGUES_XML_FUNCTIONS_XSL_TMP = getFileOrDirectoryFromPath(TEMP_FOLDER_PATH + "/pogues-xml/functions.xsl"); public static final File INPUTS_POGUES_XML_TEMPLATES_XSL_TMP = getFileOrDirectoryFromPath(TEMP_FOLDER_PATH + "/pogues-xml/templates.xsl"); public static final File INPUTS_POGUES_XML_SOURCE_XSL_TMP = getFileOrDirectoryFromPath(TEMP_FOLDER_PATH + "/pogues-xml/source.xsl"); - + // ---------- Utilies /** Generic file getter from classpath * @return the file or null when not found. @@ -253,48 +253,48 @@ public static InputStream getInputStreamFromPath(String path) { return null; } } - - + + /** Generic getter for files or directories */ private static File getFileOrDirectoryFromPath(String path) { return Paths.get(path).toFile(); } - + @SuppressWarnings("finally") public static File getFileFromUrl(URL url) { File file = null; - try { - file = new File(url.toURI()); - } catch (URISyntaxException e) { - file = new File(url.getPath()); - } finally { - return file; - } + try { + file = new File(url.toURI()); + } catch (URISyntaxException e) { + file = new File(url.getPath()); + } finally { + return file; + } } - + // TODO Under this comment are the legacy references to files and directories that eventually will be deleted. // ----------------------------------------------- // // Root folder of the project : must be filled // FIXME use a dynamic path -// public static final String ROOT_FOLDER = "D:/arkn1q/Mes Documents/eclipse_workspace/Eno"; -// -// public static final String QUESTIONNAIRE_FOLDER = ROOT_FOLDER + "/questionnaires"; -// public static final String TEMP_TEST_FOLDER = TEMP_FOLDER_PATH + "/nonRegressionTest"; + // public static final String ROOT_FOLDER = "D:/arkn1q/Mes Documents/eclipse_workspace/Eno"; + // + // public static final String QUESTIONNAIRE_FOLDER = ROOT_FOLDER + "/questionnaires"; + // public static final String TEMP_TEST_FOLDER = TEMP_FOLDER_PATH + "/nonRegressionTest"; /********************************************************/ /******************* ENOPreprocessing *******************/ /********************************************************/ - + ////// INCORPORATION TARGET //// Temporary files used in INCORPORATION //// Xsl stylesheets used in INCORPORATION - + /********************************************************/ /******************* DDIPreprocessing *******************/ @@ -302,7 +302,7 @@ public static File getFileFromUrl(URL url) { //// Plugin Conf public static final String PDF_PLUGIN_XML_CONF = "src/main/resources/config/plugins-conf.xml"; public static final File PDF_PLUGIN_XML_CONF_FILE = getFileFromUrl(Constants.class.getResource(CONFIG_FOLDER + "/plugins-conf.xml")); - + /********************************************************/ @@ -316,7 +316,7 @@ public String oLD_TEMP_NULL_TMP2(String sUB_TEMP_FOLDER){ } //// Xsl stylesheets used in DDIPreprocessing - + // public static final String BASE_NAME_FORM_FILE = "/form"; @@ -326,7 +326,7 @@ public String oLD_TEMP_NULL_TMP2(String sUB_TEMP_FOLDER){ public static final String FINAL_EXTENSION = "-final.tmp"; public static final String TEMP_EXTENSION = "-temp.xml"; public static final String FINAL_DDI_EXTENSION = "-final.xml"; - + // PDF public static final String ACCOMPANYING_MAILS_FO_EXTENSION = "-accompanying-mails.fo"; public static final String COVER_PAGE_FO_EXTENSION = "-cover-page.fo"; @@ -337,11 +337,11 @@ public String oLD_TEMP_NULL_TMP2(String sUB_TEMP_FOLDER){ public static final String FINAL_PDF_EXTENSION = "-final-out.fo"; //public static final String CUSTOM_FO_EXTENSION = "-out.fo"; public static final String MAILING_FO_EXTENSION = "-mailing-vtl.fo"; - + // JS public static final String SORT_COMPONENTS_JS_EXTENSION = "-sorted.xml"; public static final String FINAL_JS_EXTENSION = "-lunatic.xml"; - + // FR public static final String BROWSING_FR_EXTENSION = "-browsing.xhtml"; public static final String EDIT_PATRON_FR_EXTENSION = "-edit-patron.xhtml"; @@ -353,35 +353,35 @@ public String oLD_TEMP_NULL_TMP2(String sUB_TEMP_FOLDER){ public static final String MODELE_COLTRANE_FR_EXTENSION = "-modele-coltrane.xhtml"; public static final String SPECIFIC_TREATMENT_FR_EXTENSION = "-specific-treatment.xhtml"; // JS - + //public static final String TEMP_XFORMS_FOLDER = SUB_TEMP_FOLDER + "/xforms"; - public static String tEMP_XFORMS_FOLDER (String sUB_TEMP_FOLDER){ - return sUB_TEMP_FOLDER + "/xforms"; - } - //public static final String TEMP_ODT_FOLDER = SUB_TEMP_FOLDER + "/odt"; - public static String tEMP_ODT_FOLDER(String sUB_TEMP_FOLDER){ - return sUB_TEMP_FOLDER + "/odt"; - } - - //public static final String TEMP_PDF_FOLDER = SUB_TEMP_FOLDER + "/js"; - public static String tEMP_JS_FOLDER(String sUB_TEMP_FOLDER){ - return sUB_TEMP_FOLDER+ "/js"; - } - - public static String tEMP_PDF_FOLDER(String sUB_TEMP_FOLDER){ - return sUB_TEMP_FOLDER+ "/pdf"; - } - //public static final String TEMP_DDI_FOLDER = SUB_TEMP_FOLDER + "/ddi"; - public static String tEMP_DDI_FOLDER(String sUB_TEMP_FOLDER){ - return sUB_TEMP_FOLDER + "/ddi"; - } - //public static final String TEMP_POGUES_XML_FOLDER = SUB_TEMP_FOLDER + "/pogues-xml"; - public static String tEMP_POGUES_XML_FOLDER(String sUB_TEMP_FOLDER){ - return sUB_TEMP_FOLDER + "/pogues-xml"; - } + public static String tEMP_XFORMS_FOLDER (String sUB_TEMP_FOLDER){ + return sUB_TEMP_FOLDER + "/xforms"; + } + //public static final String TEMP_ODT_FOLDER = SUB_TEMP_FOLDER + "/odt"; + public static String tEMP_ODT_FOLDER(String sUB_TEMP_FOLDER){ + return sUB_TEMP_FOLDER + "/odt"; + } + + //public static final String TEMP_PDF_FOLDER = SUB_TEMP_FOLDER + "/js"; + public static String tEMP_JS_FOLDER(String sUB_TEMP_FOLDER){ + return sUB_TEMP_FOLDER+ "/js"; + } + + public static String tEMP_PDF_FOLDER(String sUB_TEMP_FOLDER){ + return sUB_TEMP_FOLDER+ "/pdf"; + } + //public static final String TEMP_DDI_FOLDER = SUB_TEMP_FOLDER + "/ddi"; + public static String tEMP_DDI_FOLDER(String sUB_TEMP_FOLDER){ + return sUB_TEMP_FOLDER + "/ddi"; + } + //public static final String TEMP_POGUES_XML_FOLDER = SUB_TEMP_FOLDER + "/pogues-xml"; + public static String tEMP_POGUES_XML_FOLDER(String sUB_TEMP_FOLDER){ + return sUB_TEMP_FOLDER + "/pogues-xml"; + } public static final String BASIC_FORM_TMP_FILENAME = "basic-form.tmp"; - - - + + + } diff --git a/src/main/java/fr/insee/eno/generation/DDI2FRGenerator.java b/src/main/java/fr/insee/eno/generation/DDI2FRGenerator.java index d3693c9e0..f05ccb858 100644 --- a/src/main/java/fr/insee/eno/generation/DDI2FRGenerator.java +++ b/src/main/java/fr/insee/eno/generation/DDI2FRGenerator.java @@ -8,21 +8,16 @@ import org.apache.commons.io.FilenameUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import fr.insee.eno.Constants; import fr.insee.eno.transform.xsl.XslParameters; import fr.insee.eno.transform.xsl.XslTransformation; -@Service public class DDI2FRGenerator implements Generator { - private static final Logger logger = LoggerFactory.getLogger(DDI2FRGenerator.class); - @Autowired - private XslTransformation saxonService; + private XslTransformation saxonService = new XslTransformation(); @Override public File generate(File finalInput, byte[] parameters, String surveyName) throws Exception { diff --git a/src/main/java/fr/insee/eno/generation/DDI2JSGenerator.java b/src/main/java/fr/insee/eno/generation/DDI2JSGenerator.java index a73ce1d2c..6f9b2b66e 100644 --- a/src/main/java/fr/insee/eno/generation/DDI2JSGenerator.java +++ b/src/main/java/fr/insee/eno/generation/DDI2JSGenerator.java @@ -8,20 +8,16 @@ import org.apache.commons.io.FilenameUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import fr.insee.eno.Constants; import fr.insee.eno.transform.xsl.XslParameters; import fr.insee.eno.transform.xsl.XslTransformation; -@Service public class DDI2JSGenerator implements Generator { private static final Logger logger = LoggerFactory.getLogger(DDI2JSGenerator.class); - @Autowired - private XslTransformation saxonService; + private XslTransformation saxonService = new XslTransformation(); @Override public File generate(File finalInput, byte[] parameters, String surveyName) throws Exception { diff --git a/src/main/java/fr/insee/eno/generation/DDI2ODTGenerator.java b/src/main/java/fr/insee/eno/generation/DDI2ODTGenerator.java index 4a29d26bb..6a4d4ced3 100644 --- a/src/main/java/fr/insee/eno/generation/DDI2ODTGenerator.java +++ b/src/main/java/fr/insee/eno/generation/DDI2ODTGenerator.java @@ -8,20 +8,16 @@ import org.apache.commons.io.FilenameUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import fr.insee.eno.Constants; import fr.insee.eno.transform.xsl.XslParameters; import fr.insee.eno.transform.xsl.XslTransformation; -@Service public class DDI2ODTGenerator implements Generator { private static final Logger logger = LoggerFactory.getLogger(DDI2ODTGenerator.class); - @Autowired - private XslTransformation saxonService; + private XslTransformation saxonService = new XslTransformation(); @Override public File generate(File finalInput, byte[] parameters, String surveyName) throws Exception { diff --git a/src/main/java/fr/insee/eno/generation/DDI2PDFGenerator.java b/src/main/java/fr/insee/eno/generation/DDI2PDFGenerator.java index 515be9162..e18de6746 100644 --- a/src/main/java/fr/insee/eno/generation/DDI2PDFGenerator.java +++ b/src/main/java/fr/insee/eno/generation/DDI2PDFGenerator.java @@ -8,20 +8,16 @@ import org.apache.commons.io.FilenameUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import fr.insee.eno.Constants; import fr.insee.eno.transform.xsl.XslParameters; import fr.insee.eno.transform.xsl.XslTransformation; -@Service public class DDI2PDFGenerator implements Generator { private static final Logger logger = LoggerFactory.getLogger(DDI2PDFGenerator.class); - @Autowired - private XslTransformation saxonService; + private XslTransformation saxonService = new XslTransformation(); @Override public File generate(File finalInput, byte[] parameters, String surveyName) throws Exception { diff --git a/src/main/java/fr/insee/eno/generation/DDI2PoguesXMLGenerator.java b/src/main/java/fr/insee/eno/generation/DDI2PoguesXMLGenerator.java index da8e88634..679d1e53e 100644 --- a/src/main/java/fr/insee/eno/generation/DDI2PoguesXMLGenerator.java +++ b/src/main/java/fr/insee/eno/generation/DDI2PoguesXMLGenerator.java @@ -5,19 +5,15 @@ import org.apache.commons.io.FilenameUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import fr.insee.eno.transform.xsl.XslParameters; import fr.insee.eno.transform.xsl.XslTransformation; -@Service public class DDI2PoguesXMLGenerator implements Generator { private static final Logger logger = LoggerFactory.getLogger(DDI2PoguesXMLGenerator.class); - @Autowired - private XslTransformation saxonService; + private XslTransformation saxonService = new XslTransformation(); @Override public File generate(File finalInput, byte[] parameters, String surveyName) throws Exception { diff --git a/src/main/java/fr/insee/eno/generation/Generator.java b/src/main/java/fr/insee/eno/generation/Generator.java index d61ee1775..a8c17e459 100644 --- a/src/main/java/fr/insee/eno/generation/Generator.java +++ b/src/main/java/fr/insee/eno/generation/Generator.java @@ -30,9 +30,7 @@ public interface Generator { * This method return in2out implementation * * @return the in2out implementation - * @throws Exception - * Generic exception */ - public String in2out() throws Exception; + public String in2out() ; } diff --git a/src/main/java/fr/insee/eno/generation/PoguesXML2DDIGenerator.java b/src/main/java/fr/insee/eno/generation/PoguesXML2DDIGenerator.java index 7e2477f7d..ed14dc511 100644 --- a/src/main/java/fr/insee/eno/generation/PoguesXML2DDIGenerator.java +++ b/src/main/java/fr/insee/eno/generation/PoguesXML2DDIGenerator.java @@ -8,20 +8,16 @@ import org.apache.commons.io.FilenameUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import fr.insee.eno.Constants; import fr.insee.eno.transform.xsl.XslParameters; import fr.insee.eno.transform.xsl.XslTransformation; -@Service public class PoguesXML2DDIGenerator implements Generator { private static final Logger logger = LoggerFactory.getLogger(PoguesXML2DDIGenerator.class); - @Autowired - private XslTransformation saxonService; + private XslTransformation saxonService = new XslTransformation(); @Override public File generate(File finalInput, byte[] parameters, String surveyName) throws Exception { diff --git a/src/main/java/fr/insee/eno/params/pipeline/PipeLineGeneratorImpl.java b/src/main/java/fr/insee/eno/params/pipeline/PipeLineGeneratorImpl.java index 38a29a1e2..f298b8742 100644 --- a/src/main/java/fr/insee/eno/params/pipeline/PipeLineGeneratorImpl.java +++ b/src/main/java/fr/insee/eno/params/pipeline/PipeLineGeneratorImpl.java @@ -6,8 +6,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import fr.insee.eno.GenerationService; import fr.insee.eno.generation.DDI2FRGenerator; @@ -50,78 +48,74 @@ import fr.insee.eno.preprocessing.PoguesXMLPreprocessorGoToTreatment; import fr.insee.eno.preprocessing.Preprocessor; -@Service public class PipeLineGeneratorImpl implements PipelineGenerator { private static final Logger LOGGER = LoggerFactory.getLogger(PipeLineGeneratorImpl.class); // In2Out Generator - @Autowired - DDI2FRGenerator ddi2frGenerator; - @Autowired - DDI2JSGenerator ddi2jsGenerator; - @Autowired - DDI2ODTGenerator ddi2odtGenerator; - @Autowired - DDI2PDFGenerator ddi2pdfGenerator; - @Autowired - DDI2PoguesXMLGenerator ddi2poguesXmlGenerator; - @Autowired - PoguesXML2DDIGenerator poguesXml2ddiGenerator; + private DDI2FRGenerator ddi2frGenerator = new DDI2FRGenerator(); + + private DDI2JSGenerator ddi2jsGenerator = new DDI2JSGenerator(); + + private DDI2ODTGenerator ddi2odtGenerator = new DDI2ODTGenerator(); + + private DDI2PDFGenerator ddi2pdfGenerator = new DDI2PDFGenerator(); + + private DDI2PoguesXMLGenerator ddi2poguesXmlGenerator = new DDI2PoguesXMLGenerator(); + + private PoguesXML2DDIGenerator poguesXml2ddiGenerator = new PoguesXML2DDIGenerator(); // PreProcessing - @Autowired - DDIDereferencingPreprocessor ddiDereferencing; - @Autowired - DDICleaningPreprocessor ddiCleaning; - @Autowired - DDITitlingPreprocessor ddiTitling; - @Autowired - DDIMappingPreprocessor ddiMapping; - @Autowired - PoguesXMLPreprocessorGoToTreatment poguesXmlGoTo; + private DDIDereferencingPreprocessor ddiDereferencing = new DDIDereferencingPreprocessor(); + + private DDICleaningPreprocessor ddiCleaning = new DDICleaningPreprocessor(); + + private DDITitlingPreprocessor ddiTitling = new DDITitlingPreprocessor(); + + private DDIMappingPreprocessor ddiMapping = new DDIMappingPreprocessor(); + + private PoguesXMLPreprocessorGoToTreatment poguesXmlGoTo = new PoguesXMLPreprocessorGoToTreatment(); // PostProcessing - @Autowired - DDIMarkdown2XhtmlPostprocessor ddiMW2XHTML; - @Autowired - FRBrowsingPostprocessor frBrowsing; - @Autowired - FREditPatronPostprocessor frEditPatron; - @Autowired - FRFixAdherencePostprocessor frFixAdherence; - @Autowired - FRIdentificationPostprocessor frIdentification; - @Autowired - FRInsertEndPostprocessor frInsertEnd; - @Autowired - FRInsertGenericQuestionsPostprocessor frInsertGenericQuestions; - @Autowired - FRInsertWelcomePostprocessor frInsertWelcome; - @Autowired - FRModeleColtranePostprocessor frModeleColtrane; - @Autowired - FRSpecificTreatmentPostprocessor frSpecificTreatment; - @Autowired - PDFEditStructurePagesPostprocessor pdfEditStructurePages; - @Autowired - PDFInsertAccompanyingMailsPostprocessor pdfInsertAccompanyingMails; - @Autowired - PDFInsertCoverPagePostprocessor pdfInsertCoverPage; - @Autowired - PDFInsertEndQuestionPostprocessor pdfInsertEndQuestion; - @Autowired - PDFMailingPostprocessor pdfMailing; - @Autowired - PDFSpecificTreatmentPostprocessor pdfSpecificTreatment; - @Autowired - PDFTableColumnPostprocessorFake pdfTableColumn; - @Autowired - JSExternalizeVariablesPostprocessor jsExternalizeVariables; - @Autowired - JSSortComponentsPostprocessor jsSortComponents; - @Autowired - NoopPostprocessor noop; + private DDIMarkdown2XhtmlPostprocessor ddiMW2XHTML = new DDIMarkdown2XhtmlPostprocessor(); + + private FRBrowsingPostprocessor frBrowsing = new FRBrowsingPostprocessor(); + + private FREditPatronPostprocessor frEditPatron = new FREditPatronPostprocessor(); + + private FRFixAdherencePostprocessor frFixAdherence = new FRFixAdherencePostprocessor(); + + private FRIdentificationPostprocessor frIdentification = new FRIdentificationPostprocessor(); + + private FRInsertEndPostprocessor frInsertEnd = new FRInsertEndPostprocessor(); + + private FRInsertGenericQuestionsPostprocessor frInsertGenericQuestions = new FRInsertGenericQuestionsPostprocessor(); + + private FRInsertWelcomePostprocessor frInsertWelcome = new FRInsertWelcomePostprocessor(); + + private FRModeleColtranePostprocessor frModeleColtrane = new FRModeleColtranePostprocessor(); + + private FRSpecificTreatmentPostprocessor frSpecificTreatment = new FRSpecificTreatmentPostprocessor(); + + private PDFEditStructurePagesPostprocessor pdfEditStructurePages = new PDFEditStructurePagesPostprocessor(); + + private PDFInsertAccompanyingMailsPostprocessor pdfInsertAccompanyingMails = new PDFInsertAccompanyingMailsPostprocessor(); + + private PDFInsertCoverPagePostprocessor pdfInsertCoverPage = new PDFInsertCoverPagePostprocessor(); + + private PDFInsertEndQuestionPostprocessor pdfInsertEndQuestion = new PDFInsertEndQuestionPostprocessor(); + + private PDFMailingPostprocessor pdfMailing = new PDFMailingPostprocessor(); + + private PDFSpecificTreatmentPostprocessor pdfSpecificTreatment = new PDFSpecificTreatmentPostprocessor(); + + private PDFTableColumnPostprocessorFake pdfTableColumn = new PDFTableColumnPostprocessorFake(); + + private JSExternalizeVariablesPostprocessor jsExternalizeVariables = new JSExternalizeVariablesPostprocessor(); + + private JSSortComponentsPostprocessor jsSortComponents = new JSSortComponentsPostprocessor(); + + private NoopPostprocessor noop = new NoopPostprocessor(); @Override diff --git a/src/main/java/fr/insee/eno/postprocessing/DDIPostprocessor.java b/src/main/java/fr/insee/eno/postprocessing/DDIPostprocessor.java index 60f554508..c2a7151ee 100644 --- a/src/main/java/fr/insee/eno/postprocessing/DDIPostprocessor.java +++ b/src/main/java/fr/insee/eno/postprocessing/DDIPostprocessor.java @@ -25,7 +25,7 @@ public class DDIPostprocessor implements Postprocessor { @Override public File process(File input, byte[] parameters, String survey) throws Exception { - logger.info("DDIPostprocessor Target : START"); + logger.info("DDIMarkdown2XhtmlPostprocessor Target : START"); String mw2xhtmlOutput = FilenameUtils.removeExtension(input.getPath()) + Constants.MW_EXTENSION; // ----- mw2xhtml logger.debug("Markdown to XHTML : -Input : " + input + " -Output : " + mw2xhtmlOutput + " -Stylesheet : " @@ -60,7 +60,7 @@ public File process(File input, byte[] parameters, String survey) throws Excepti isUTIL_DDI_TWEAK_XHTML_FOR_DDI_XSL.close(); osTweakXhtmlForDdi.close(); - logger.debug("DDIPostprocessor : END"); + logger.debug("DDIMarkdown2XhtmlPostprocessor : END"); return new File(outputTweakXhtmlForDdi); } diff --git a/src/main/java/fr/insee/eno/postprocessing/NoopPostprocessor.java b/src/main/java/fr/insee/eno/postprocessing/NoopPostprocessor.java index 946ee2186..d7fa0fb73 100644 --- a/src/main/java/fr/insee/eno/postprocessing/NoopPostprocessor.java +++ b/src/main/java/fr/insee/eno/postprocessing/NoopPostprocessor.java @@ -4,12 +4,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Service; /** * No-op postprocessor. */ -@Service public class NoopPostprocessor implements Postprocessor { private static final Logger logger = LoggerFactory.getLogger(NoopPostprocessor.class); diff --git a/src/main/java/fr/insee/eno/postprocessing/ddi/DDIMarkdown2XhtmlPostprocessor.java b/src/main/java/fr/insee/eno/postprocessing/ddi/DDIMarkdown2XhtmlPostprocessor.java index 82b21877e..9ce614a9f 100644 --- a/src/main/java/fr/insee/eno/postprocessing/ddi/DDIMarkdown2XhtmlPostprocessor.java +++ b/src/main/java/fr/insee/eno/postprocessing/ddi/DDIMarkdown2XhtmlPostprocessor.java @@ -8,8 +8,6 @@ import org.apache.commons.io.FilenameUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import fr.insee.eno.Constants; import fr.insee.eno.postprocessing.Postprocessor; @@ -18,13 +16,11 @@ /** * DDI postprocessor. */ -@Service public class DDIMarkdown2XhtmlPostprocessor implements Postprocessor { private static final Logger logger = LoggerFactory.getLogger(DDIMarkdown2XhtmlPostprocessor.class); - @Autowired - private XslTransformation saxonService; + private XslTransformation saxonService = new XslTransformation(); @Override public File process(File input, byte[] parameters, String survey) throws Exception { diff --git a/src/main/java/fr/insee/eno/postprocessing/fr/FRBrowsingPostprocessor.java b/src/main/java/fr/insee/eno/postprocessing/fr/FRBrowsingPostprocessor.java index 094c65184..6bc996173 100644 --- a/src/main/java/fr/insee/eno/postprocessing/fr/FRBrowsingPostprocessor.java +++ b/src/main/java/fr/insee/eno/postprocessing/fr/FRBrowsingPostprocessor.java @@ -7,21 +7,17 @@ import org.apache.commons.io.FileUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import fr.insee.eno.Constants; import fr.insee.eno.parameters.PostProcessing; import fr.insee.eno.postprocessing.Postprocessor; import fr.insee.eno.transform.xsl.XslTransformation; -@Service public class FRBrowsingPostprocessor implements Postprocessor { private static final Logger logger = LoggerFactory.getLogger(FRBrowsingPostprocessor.class); - @Autowired - private XslTransformation saxonService; + private XslTransformation saxonService = new XslTransformation();; @Override public File process(File input, byte[] parameters, String survey) throws Exception { diff --git a/src/main/java/fr/insee/eno/postprocessing/fr/FREditPatronPostprocessor.java b/src/main/java/fr/insee/eno/postprocessing/fr/FREditPatronPostprocessor.java index cd86c56f3..0d493893a 100644 --- a/src/main/java/fr/insee/eno/postprocessing/fr/FREditPatronPostprocessor.java +++ b/src/main/java/fr/insee/eno/postprocessing/fr/FREditPatronPostprocessor.java @@ -7,22 +7,17 @@ import org.apache.commons.io.FileUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import fr.insee.eno.Constants; import fr.insee.eno.parameters.PostProcessing; import fr.insee.eno.postprocessing.Postprocessor; import fr.insee.eno.transform.xsl.XslTransformation; -@Service public class FREditPatronPostprocessor implements Postprocessor { private static final Logger logger = LoggerFactory.getLogger(FREditPatronPostprocessor.class); - @Autowired - private XslTransformation saxonService; - + private XslTransformation saxonService = new XslTransformation(); @Override public File process(File input, byte[] parameters, String survey) throws Exception { diff --git a/src/main/java/fr/insee/eno/postprocessing/fr/FRFixAdherencePostprocessor.java b/src/main/java/fr/insee/eno/postprocessing/fr/FRFixAdherencePostprocessor.java index d2cd3a35c..7623cf9e4 100644 --- a/src/main/java/fr/insee/eno/postprocessing/fr/FRFixAdherencePostprocessor.java +++ b/src/main/java/fr/insee/eno/postprocessing/fr/FRFixAdherencePostprocessor.java @@ -7,21 +7,17 @@ import org.apache.commons.io.FileUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import fr.insee.eno.Constants; import fr.insee.eno.parameters.PostProcessing; import fr.insee.eno.postprocessing.Postprocessor; import fr.insee.eno.transform.xsl.XslTransformation; -@Service public class FRFixAdherencePostprocessor implements Postprocessor { private static final Logger logger = LoggerFactory.getLogger(FRFixAdherencePostprocessor.class); - @Autowired - private XslTransformation saxonService; + private XslTransformation saxonService = new XslTransformation(); @Override public File process(File input, byte[] parameters, String survey) throws Exception { diff --git a/src/main/java/fr/insee/eno/postprocessing/fr/FRIdentificationPostprocessor.java b/src/main/java/fr/insee/eno/postprocessing/fr/FRIdentificationPostprocessor.java index 742bfc787..b56cc3f01 100644 --- a/src/main/java/fr/insee/eno/postprocessing/fr/FRIdentificationPostprocessor.java +++ b/src/main/java/fr/insee/eno/postprocessing/fr/FRIdentificationPostprocessor.java @@ -7,21 +7,17 @@ import org.apache.commons.io.FileUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import fr.insee.eno.Constants; import fr.insee.eno.parameters.PostProcessing; import fr.insee.eno.postprocessing.Postprocessor; import fr.insee.eno.transform.xsl.XslTransformation; -@Service public class FRIdentificationPostprocessor implements Postprocessor { private static final Logger logger = LoggerFactory.getLogger(FRIdentificationPostprocessor.class); - @Autowired - private XslTransformation saxonService; + private XslTransformation saxonService = new XslTransformation(); @Override public File process(File input, byte[] parameters, String survey) throws Exception { diff --git a/src/main/java/fr/insee/eno/postprocessing/fr/FRInsertEndPostprocessor.java b/src/main/java/fr/insee/eno/postprocessing/fr/FRInsertEndPostprocessor.java index 367004cca..70679a2ac 100644 --- a/src/main/java/fr/insee/eno/postprocessing/fr/FRInsertEndPostprocessor.java +++ b/src/main/java/fr/insee/eno/postprocessing/fr/FRInsertEndPostprocessor.java @@ -7,21 +7,17 @@ import org.apache.commons.io.FileUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import fr.insee.eno.Constants; import fr.insee.eno.parameters.PostProcessing; import fr.insee.eno.postprocessing.Postprocessor; import fr.insee.eno.transform.xsl.XslTransformation; -@Service public class FRInsertEndPostprocessor implements Postprocessor { private static final Logger logger = LoggerFactory.getLogger(FRInsertEndPostprocessor.class); - @Autowired - private XslTransformation saxonService; + private XslTransformation saxonService = new XslTransformation(); @Override public File process(File input, byte[] parameters, String survey) throws Exception { diff --git a/src/main/java/fr/insee/eno/postprocessing/fr/FRInsertGenericQuestionsPostprocessor.java b/src/main/java/fr/insee/eno/postprocessing/fr/FRInsertGenericQuestionsPostprocessor.java index ee5ddb4d3..a791cd8fd 100644 --- a/src/main/java/fr/insee/eno/postprocessing/fr/FRInsertGenericQuestionsPostprocessor.java +++ b/src/main/java/fr/insee/eno/postprocessing/fr/FRInsertGenericQuestionsPostprocessor.java @@ -7,21 +7,17 @@ import org.apache.commons.io.FileUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import fr.insee.eno.Constants; import fr.insee.eno.parameters.PostProcessing; import fr.insee.eno.postprocessing.Postprocessor; import fr.insee.eno.transform.xsl.XslTransformation; -@Service public class FRInsertGenericQuestionsPostprocessor implements Postprocessor { private static final Logger logger = LoggerFactory.getLogger(FRInsertGenericQuestionsPostprocessor.class); - @Autowired - private XslTransformation saxonService; + private XslTransformation saxonService = new XslTransformation(); @Override public File process(File input, byte[] parameters, String surveyName) throws Exception { diff --git a/src/main/java/fr/insee/eno/postprocessing/fr/FRInsertWelcomePostprocessor.java b/src/main/java/fr/insee/eno/postprocessing/fr/FRInsertWelcomePostprocessor.java index 03b229385..c11de4d44 100644 --- a/src/main/java/fr/insee/eno/postprocessing/fr/FRInsertWelcomePostprocessor.java +++ b/src/main/java/fr/insee/eno/postprocessing/fr/FRInsertWelcomePostprocessor.java @@ -7,21 +7,17 @@ import org.apache.commons.io.FileUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import fr.insee.eno.Constants; import fr.insee.eno.parameters.PostProcessing; import fr.insee.eno.postprocessing.Postprocessor; import fr.insee.eno.transform.xsl.XslTransformation; -@Service public class FRInsertWelcomePostprocessor implements Postprocessor { private static final Logger logger = LoggerFactory.getLogger(FRInsertWelcomePostprocessor.class); - @Autowired - private XslTransformation saxonService; + private XslTransformation saxonService = new XslTransformation(); @Override public File process(File input, byte[] parameters, String survey) throws Exception { diff --git a/src/main/java/fr/insee/eno/postprocessing/fr/FRModeleColtranePostprocessor.java b/src/main/java/fr/insee/eno/postprocessing/fr/FRModeleColtranePostprocessor.java index 7172f113b..35ec7ab3a 100644 --- a/src/main/java/fr/insee/eno/postprocessing/fr/FRModeleColtranePostprocessor.java +++ b/src/main/java/fr/insee/eno/postprocessing/fr/FRModeleColtranePostprocessor.java @@ -7,21 +7,17 @@ import org.apache.commons.io.FileUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import fr.insee.eno.Constants; import fr.insee.eno.parameters.PostProcessing; import fr.insee.eno.postprocessing.Postprocessor; import fr.insee.eno.transform.xsl.XslTransformation; -@Service public class FRModeleColtranePostprocessor implements Postprocessor { private static final Logger logger = LoggerFactory.getLogger(FRModeleColtranePostprocessor.class); - @Autowired - private XslTransformation saxonService; + private XslTransformation saxonService = new XslTransformation(); @Override public File process(File input, byte[] parameters, String survey) throws Exception { diff --git a/src/main/java/fr/insee/eno/postprocessing/fr/FRSpecificTreatmentPostprocessor.java b/src/main/java/fr/insee/eno/postprocessing/fr/FRSpecificTreatmentPostprocessor.java index 98d9ef530..f55f0237d 100644 --- a/src/main/java/fr/insee/eno/postprocessing/fr/FRSpecificTreatmentPostprocessor.java +++ b/src/main/java/fr/insee/eno/postprocessing/fr/FRSpecificTreatmentPostprocessor.java @@ -8,21 +8,17 @@ import org.apache.commons.io.FileUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import fr.insee.eno.Constants; import fr.insee.eno.parameters.PostProcessing; import fr.insee.eno.postprocessing.Postprocessor; import fr.insee.eno.transform.xsl.XslTransformation; -@Service public class FRSpecificTreatmentPostprocessor implements Postprocessor { private static final Logger logger = LoggerFactory.getLogger(FRSpecificTreatmentPostprocessor.class); - @Autowired - private XslTransformation saxonService; + private XslTransformation saxonService = new XslTransformation(); @Override public File process(File input, byte[] parameters, String survey) throws Exception { diff --git a/src/main/java/fr/insee/eno/postprocessing/js/JSExternalizeVariablesPostprocessor.java b/src/main/java/fr/insee/eno/postprocessing/js/JSExternalizeVariablesPostprocessor.java index a87039a7e..2c7aba717 100644 --- a/src/main/java/fr/insee/eno/postprocessing/js/JSExternalizeVariablesPostprocessor.java +++ b/src/main/java/fr/insee/eno/postprocessing/js/JSExternalizeVariablesPostprocessor.java @@ -7,8 +7,6 @@ import org.apache.commons.io.FileUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import fr.insee.eno.Constants; import fr.insee.eno.parameters.PostProcessing; @@ -18,13 +16,11 @@ /** * Customization of JS postprocessor. */ -@Service public class JSExternalizeVariablesPostprocessor implements Postprocessor { private static final Logger logger = LoggerFactory.getLogger(JSExternalizeVariablesPostprocessor.class); - @Autowired - private XslTransformation saxonService; + private XslTransformation saxonService = new XslTransformation(); @Override public File process(File input, byte[] parameters, String surveyName) throws Exception { diff --git a/src/main/java/fr/insee/eno/postprocessing/js/JSSortComponentsPostprocessor.java b/src/main/java/fr/insee/eno/postprocessing/js/JSSortComponentsPostprocessor.java index fcc79500b..18198cf18 100644 --- a/src/main/java/fr/insee/eno/postprocessing/js/JSSortComponentsPostprocessor.java +++ b/src/main/java/fr/insee/eno/postprocessing/js/JSSortComponentsPostprocessor.java @@ -7,8 +7,6 @@ import org.apache.commons.io.FileUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import fr.insee.eno.Constants; import fr.insee.eno.parameters.PostProcessing; @@ -18,13 +16,11 @@ /** * Customization of JS postprocessor. */ -@Service public class JSSortComponentsPostprocessor implements Postprocessor { private static final Logger logger = LoggerFactory.getLogger(JSSortComponentsPostprocessor.class); - @Autowired - private XslTransformation saxonService; + private XslTransformation saxonService = new XslTransformation(); @Override public File process(File input, byte[] parameters, String surveyName) throws Exception { diff --git a/src/main/java/fr/insee/eno/postprocessing/pdf/PDFEditStructurePagesPostprocessor.java b/src/main/java/fr/insee/eno/postprocessing/pdf/PDFEditStructurePagesPostprocessor.java index ce66bb251..283eef7fc 100644 --- a/src/main/java/fr/insee/eno/postprocessing/pdf/PDFEditStructurePagesPostprocessor.java +++ b/src/main/java/fr/insee/eno/postprocessing/pdf/PDFEditStructurePagesPostprocessor.java @@ -8,21 +8,17 @@ import org.apache.commons.io.FilenameUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import fr.insee.eno.Constants; import fr.insee.eno.parameters.PostProcessing; import fr.insee.eno.postprocessing.Postprocessor; import fr.insee.eno.transform.xsl.XslTransformation; -@Service public class PDFEditStructurePagesPostprocessor implements Postprocessor { private static final Logger logger = LoggerFactory.getLogger(PDFEditStructurePagesPostprocessor.class); - @Autowired - private XslTransformation saxonService; + private XslTransformation saxonService = new XslTransformation(); @Override public File process(File input, byte[] parameters, String survey) throws Exception { diff --git a/src/main/java/fr/insee/eno/postprocessing/pdf/PDFInsertAccompanyingMailsPostprocessor.java b/src/main/java/fr/insee/eno/postprocessing/pdf/PDFInsertAccompanyingMailsPostprocessor.java index 98e623f0c..8f91f1966 100644 --- a/src/main/java/fr/insee/eno/postprocessing/pdf/PDFInsertAccompanyingMailsPostprocessor.java +++ b/src/main/java/fr/insee/eno/postprocessing/pdf/PDFInsertAccompanyingMailsPostprocessor.java @@ -8,21 +8,17 @@ import org.apache.commons.io.FilenameUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import fr.insee.eno.Constants; import fr.insee.eno.parameters.PostProcessing; import fr.insee.eno.postprocessing.Postprocessor; import fr.insee.eno.transform.xsl.XslTransformation; -@Service public class PDFInsertAccompanyingMailsPostprocessor implements Postprocessor { private static final Logger logger = LoggerFactory.getLogger(PDFInsertAccompanyingMailsPostprocessor.class); - @Autowired - private XslTransformation saxonService; + private XslTransformation saxonService = new XslTransformation(); @Override public File process(File input, byte[] parameters, String survey) throws Exception { diff --git a/src/main/java/fr/insee/eno/postprocessing/pdf/PDFInsertCoverPagePostprocessor.java b/src/main/java/fr/insee/eno/postprocessing/pdf/PDFInsertCoverPagePostprocessor.java index 7956ea72e..0a9246db2 100644 --- a/src/main/java/fr/insee/eno/postprocessing/pdf/PDFInsertCoverPagePostprocessor.java +++ b/src/main/java/fr/insee/eno/postprocessing/pdf/PDFInsertCoverPagePostprocessor.java @@ -8,21 +8,17 @@ import org.apache.commons.io.FilenameUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import fr.insee.eno.Constants; import fr.insee.eno.parameters.PostProcessing; import fr.insee.eno.postprocessing.Postprocessor; import fr.insee.eno.transform.xsl.XslTransformation; -@Service public class PDFInsertCoverPagePostprocessor implements Postprocessor { private static final Logger logger = LoggerFactory.getLogger(PDFInsertCoverPagePostprocessor.class); - @Autowired - private XslTransformation saxonService; + private XslTransformation saxonService = new XslTransformation(); @Override public File process(File input, byte[] parameters, String survey) throws Exception { diff --git a/src/main/java/fr/insee/eno/postprocessing/pdf/PDFInsertEndQuestionPostprocessor.java b/src/main/java/fr/insee/eno/postprocessing/pdf/PDFInsertEndQuestionPostprocessor.java index b5d115f91..d869a6e91 100644 --- a/src/main/java/fr/insee/eno/postprocessing/pdf/PDFInsertEndQuestionPostprocessor.java +++ b/src/main/java/fr/insee/eno/postprocessing/pdf/PDFInsertEndQuestionPostprocessor.java @@ -8,21 +8,17 @@ import org.apache.commons.io.FilenameUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import fr.insee.eno.Constants; import fr.insee.eno.parameters.PostProcessing; import fr.insee.eno.postprocessing.Postprocessor; import fr.insee.eno.transform.xsl.XslTransformation; -@Service public class PDFInsertEndQuestionPostprocessor implements Postprocessor { private static final Logger logger = LoggerFactory.getLogger(PDFInsertEndQuestionPostprocessor.class); - @Autowired - private XslTransformation saxonService; + private XslTransformation saxonService = new XslTransformation(); @Override public File process(File input, byte[] parameters, String survey) throws Exception { diff --git a/src/main/java/fr/insee/eno/postprocessing/pdf/PDFMailingPostprocessor.java b/src/main/java/fr/insee/eno/postprocessing/pdf/PDFMailingPostprocessor.java index 09095ad03..36dfadd21 100644 --- a/src/main/java/fr/insee/eno/postprocessing/pdf/PDFMailingPostprocessor.java +++ b/src/main/java/fr/insee/eno/postprocessing/pdf/PDFMailingPostprocessor.java @@ -6,8 +6,6 @@ import org.apache.commons.io.FileUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import fr.insee.eno.Constants; import fr.insee.eno.parameters.PostProcessing; @@ -17,13 +15,11 @@ /** * Customization of FO postprocessor. */ -@Service public class PDFMailingPostprocessor implements Postprocessor { private static final Logger logger = LoggerFactory.getLogger(PDFMailingPostprocessor.class); - @Autowired - private XslTransformation saxonService; + private XslTransformation saxonService = new XslTransformation(); @Override public File process(File input, byte[] parameters, String surveyName) throws Exception { diff --git a/src/main/java/fr/insee/eno/postprocessing/pdf/PDFSpecificTreatmentPostprocessor.java b/src/main/java/fr/insee/eno/postprocessing/pdf/PDFSpecificTreatmentPostprocessor.java index 4f3a4c426..63db943f7 100644 --- a/src/main/java/fr/insee/eno/postprocessing/pdf/PDFSpecificTreatmentPostprocessor.java +++ b/src/main/java/fr/insee/eno/postprocessing/pdf/PDFSpecificTreatmentPostprocessor.java @@ -8,21 +8,17 @@ import org.apache.commons.io.FileUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import fr.insee.eno.Constants; import fr.insee.eno.parameters.PostProcessing; import fr.insee.eno.postprocessing.Postprocessor; import fr.insee.eno.transform.xsl.XslTransformation; -@Service public class PDFSpecificTreatmentPostprocessor implements Postprocessor { private static final Logger logger = LoggerFactory.getLogger(PDFSpecificTreatmentPostprocessor.class); - @Autowired - private XslTransformation saxonService; + private XslTransformation saxonService = new XslTransformation(); @Override public File process(File input, byte[] parameters, String survey) throws Exception { diff --git a/src/main/java/fr/insee/eno/postprocessing/pdf/PDFTableColumnPostprocessorFake.java b/src/main/java/fr/insee/eno/postprocessing/pdf/PDFTableColumnPostprocessorFake.java index 742cd3cd8..4d0f25d49 100644 --- a/src/main/java/fr/insee/eno/postprocessing/pdf/PDFTableColumnPostprocessorFake.java +++ b/src/main/java/fr/insee/eno/postprocessing/pdf/PDFTableColumnPostprocessorFake.java @@ -5,7 +5,6 @@ import org.apache.commons.io.FileUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Service; import fr.insee.eno.Constants; import fr.insee.eno.parameters.PostProcessing; @@ -14,7 +13,6 @@ /** * PDF postprocessor. */ -@Service public class PDFTableColumnPostprocessorFake implements Postprocessor { private static final Logger logger = LoggerFactory.getLogger(PDFTableColumnPostprocessorFake.class); diff --git a/src/main/java/fr/insee/eno/preprocessing/DDICleaningPreprocessor.java b/src/main/java/fr/insee/eno/preprocessing/DDICleaningPreprocessor.java index 6628e2317..1a06e6abc 100644 --- a/src/main/java/fr/insee/eno/preprocessing/DDICleaningPreprocessor.java +++ b/src/main/java/fr/insee/eno/preprocessing/DDICleaningPreprocessor.java @@ -1,7 +1,6 @@ package fr.insee.eno.preprocessing; import java.io.File; -import java.io.FilenameFilter; import java.io.InputStream; import java.io.OutputStream; @@ -9,8 +8,6 @@ import org.apache.commons.io.FilenameUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import fr.insee.eno.Constants; import fr.insee.eno.parameters.PreProcessing; @@ -19,13 +16,11 @@ /** * A DDI specific preprocessor. */ -@Service public class DDICleaningPreprocessor implements Preprocessor { private static final Logger logger = LoggerFactory.getLogger(DDICleaningPreprocessor.class); - @Autowired - private XslTransformation saxonService; + private XslTransformation saxonService = new XslTransformation(); @Override public File process(File inputFile, byte[] parametersFile, String survey, String in2out) throws Exception { diff --git a/src/main/java/fr/insee/eno/preprocessing/DDIDereferencingPreprocessor.java b/src/main/java/fr/insee/eno/preprocessing/DDIDereferencingPreprocessor.java index f47a5b173..2f196e8c3 100644 --- a/src/main/java/fr/insee/eno/preprocessing/DDIDereferencingPreprocessor.java +++ b/src/main/java/fr/insee/eno/preprocessing/DDIDereferencingPreprocessor.java @@ -6,11 +6,8 @@ import java.io.OutputStream; import org.apache.commons.io.FileUtils; -import org.apache.commons.io.FilenameUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import fr.insee.eno.Constants; import fr.insee.eno.parameters.PreProcessing; @@ -19,13 +16,11 @@ /** * A DDI specific preprocessor. */ -@Service public class DDIDereferencingPreprocessor implements Preprocessor { private static final Logger logger = LoggerFactory.getLogger(DDIDereferencingPreprocessor.class); - @Autowired - private XslTransformation saxonService; + private XslTransformation saxonService = new XslTransformation(); @Override public File process(File inputFile, byte[] parametersFile, String survey, String in2out) throws Exception { diff --git a/src/main/java/fr/insee/eno/preprocessing/DDIMappingPreprocessor.java b/src/main/java/fr/insee/eno/preprocessing/DDIMappingPreprocessor.java index 2afd00379..7aeee282d 100644 --- a/src/main/java/fr/insee/eno/preprocessing/DDIMappingPreprocessor.java +++ b/src/main/java/fr/insee/eno/preprocessing/DDIMappingPreprocessor.java @@ -7,9 +7,6 @@ import org.apache.commons.io.FileUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; -import org.springframework.stereotype.Service; import fr.insee.eno.Constants; import fr.insee.eno.parameters.PreProcessing; @@ -18,13 +15,11 @@ /** * A DDI specific preprocessor. */ -@Service public class DDIMappingPreprocessor implements Preprocessor { private static final Logger logger = LoggerFactory.getLogger(DDIMappingPreprocessor.class); - @Autowired - private XslTransformation saxonService; + private XslTransformation saxonService = new XslTransformation(); @Override public File process(File inputFile, byte[] parametersFile, String survey, String in2out) throws Exception { diff --git a/src/main/java/fr/insee/eno/preprocessing/DDIPreprocessor.java b/src/main/java/fr/insee/eno/preprocessing/DDIPreprocessor.java index 37fbcdb8b..e76ce5e16 100644 --- a/src/main/java/fr/insee/eno/preprocessing/DDIPreprocessor.java +++ b/src/main/java/fr/insee/eno/preprocessing/DDIPreprocessor.java @@ -9,8 +9,6 @@ import org.apache.commons.io.FilenameUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import fr.insee.eno.Constants; import fr.insee.eno.transform.xsl.XslTransformation; @@ -18,13 +16,11 @@ /** * A DDI specific preprocessor. */ -@Service public class DDIPreprocessor implements Preprocessor { private static final Logger logger = LoggerFactory.getLogger(DDIPreprocessor.class); - @Autowired - private XslTransformation saxonService; + private XslTransformation saxonService = new XslTransformation(); @Override public File process(File inputFile, byte[] parametersFile, String survey, String in2out) throws Exception { @@ -38,6 +34,9 @@ public File process(File inputFile, byte[] parametersFile, String survey, String InputStream isDDI_DEREFERENCING_XSL = Constants.getInputStreamFromPath(Constants.DDI_DEREFERENCING_XSL); InputStream isInputFile = FileUtils.openInputStream(inputFile); OutputStream osTEMP_NULL_TMP = FileUtils.openOutputStream(Constants.tEMP_NULL_TMP(sUB_TEMP_FOLDER)); + if(saxonService==null) { + saxonService=new XslTransformation(); + } saxonService.transformDereferencing(isInputFile, isDDI_DEREFERENCING_XSL, osTEMP_NULL_TMP, Constants.sUB_TEMP_FOLDER_FILE(survey)); // FIXME 4th param // should be a diff --git a/src/main/java/fr/insee/eno/preprocessing/DDITitlingPreprocessor.java b/src/main/java/fr/insee/eno/preprocessing/DDITitlingPreprocessor.java index 7c3a5d0fb..5cfa283fd 100644 --- a/src/main/java/fr/insee/eno/preprocessing/DDITitlingPreprocessor.java +++ b/src/main/java/fr/insee/eno/preprocessing/DDITitlingPreprocessor.java @@ -7,8 +7,6 @@ import org.apache.commons.io.FileUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import fr.insee.eno.Constants; import fr.insee.eno.parameters.PreProcessing; @@ -17,13 +15,11 @@ /** * A DDI specific preprocessor. */ -@Service public class DDITitlingPreprocessor implements Preprocessor { private static final Logger logger = LoggerFactory.getLogger(DDITitlingPreprocessor.class); - @Autowired - private XslTransformation saxonService; + private XslTransformation saxonService = new XslTransformation(); @Override public File process(File inputFile, byte[] parametersFile, String survey, String in2out) throws Exception { diff --git a/src/main/java/fr/insee/eno/preprocessing/PoguesXMLPreprocessor.java b/src/main/java/fr/insee/eno/preprocessing/PoguesXMLPreprocessor.java index 2dafbaa66..94d076eb2 100644 --- a/src/main/java/fr/insee/eno/preprocessing/PoguesXMLPreprocessor.java +++ b/src/main/java/fr/insee/eno/preprocessing/PoguesXMLPreprocessor.java @@ -8,12 +8,8 @@ import org.apache.commons.io.FilenameUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import fr.insee.eno.Constants; -import fr.insee.eno.parameters.PostProcessing; -import fr.insee.eno.parameters.PreProcessing; import fr.insee.eno.transform.xsl.XslTransformation; /** @@ -21,13 +17,11 @@ * See PoguesXMLPreprocessorGoToTreatment for new implementation * A PoguesXML specific preprocessor. */ -@Service public class PoguesXMLPreprocessor implements Preprocessor { private static final Logger logger = LoggerFactory.getLogger(PoguesXMLPreprocessor.class); - @Autowired - private XslTransformation saxonService; + private XslTransformation saxonService = new XslTransformation(); @Override public File process(File inputFile, byte[] parametersFile, String surveyName, String in2out) throws Exception { diff --git a/src/main/java/fr/insee/eno/preprocessing/PoguesXMLPreprocessorGoToTreatment.java b/src/main/java/fr/insee/eno/preprocessing/PoguesXMLPreprocessorGoToTreatment.java index 2f68e7c9d..e2f41052a 100644 --- a/src/main/java/fr/insee/eno/preprocessing/PoguesXMLPreprocessorGoToTreatment.java +++ b/src/main/java/fr/insee/eno/preprocessing/PoguesXMLPreprocessorGoToTreatment.java @@ -8,8 +8,6 @@ import org.apache.commons.io.FilenameUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import fr.insee.eno.Constants; import fr.insee.eno.parameters.PreProcessing; @@ -18,13 +16,11 @@ /** * A PoguesXML specific preprocessor : other goto2ite (rc version). */ -@Service public class PoguesXMLPreprocessorGoToTreatment implements Preprocessor { private static final Logger logger = LoggerFactory.getLogger(PoguesXMLPreprocessorGoToTreatment.class); - @Autowired - private XslTransformation saxonService; + private XslTransformation saxonService = new XslTransformation(); @Override public File process(File inputFile, byte[] parametersFile, String surveyName, String in2out) throws Exception { diff --git a/src/main/java/fr/insee/eno/transform/xsl/XslTransformation.java b/src/main/java/fr/insee/eno/transform/xsl/XslTransformation.java index 53777bf06..b0018cd40 100644 --- a/src/main/java/fr/insee/eno/transform/xsl/XslTransformation.java +++ b/src/main/java/fr/insee/eno/transform/xsl/XslTransformation.java @@ -14,7 +14,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Service; import fr.insee.eno.Constants; @@ -24,7 +23,6 @@ * @author gerose * */ -@Service public class XslTransformation { final static Logger LOGGER = LoggerFactory.getLogger(XslTransformation.class); From a6a4cb7968e7726859dde4371b7a7724e0e0c2e4 Mon Sep 17 00:00:00 2001 From: Laurent Caouissin Date: Wed, 2 Oct 2019 12:15:29 +0200 Subject: [PATCH 194/439] Eno params : update GenerationService - add metada - add specificTreatment --- .../java/fr/insee/eno/GenerationService.java | 61 +++++++++++++++---- 1 file changed, 48 insertions(+), 13 deletions(-) diff --git a/src/main/java/fr/insee/eno/GenerationService.java b/src/main/java/fr/insee/eno/GenerationService.java index 5195f33f5..e08b6ac06 100644 --- a/src/main/java/fr/insee/eno/GenerationService.java +++ b/src/main/java/fr/insee/eno/GenerationService.java @@ -4,10 +4,14 @@ import java.io.File; import java.io.IOException; import java.io.InputStream; +import java.util.Arrays; +import org.apache.commons.io.FilenameUtils; +import org.apache.commons.io.IOUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.google.common.io.Files; import com.google.inject.Inject; import fr.insee.eno.generation.Generator; @@ -28,6 +32,8 @@ public class GenerationService { private final Postprocessor[] postprocessors; private byte[] parameters; + private byte[] metadata; + private byte[] specificTreatment; @Inject public GenerationService(final Preprocessor[] preprocessors, final Generator generator, @@ -64,6 +70,7 @@ public GenerationService(final Preprocessor preprocessor, final Generator genera * bim */ public File generateQuestionnaire(File inputFile, String surveyName) throws Exception { + logger.info(this.toString()); logger.info("Generating questionnaire for: " + surveyName); String tempFolder = System.getProperty("java.io.tmpdir") + "/" + surveyName; @@ -89,31 +96,51 @@ public File generateQuestionnaire(File inputFile, String surveyName) throws Exce } File generatedForm = this.generator.generate(preprocessResultFileName, parameters, surveyName); - - File outputForm = this.postprocessors[0].process(generatedForm, parameters, surveyName); + File outputForm = this.postprocessors[0].process(generatedForm, parameters, metadata, specificTreatment, surveyName); for (int i = 1; i < postprocessors.length; i++) { - outputForm = this.postprocessors[i].process(outputForm, parameters, surveyName); + outputForm = this.postprocessors[i].process(outputForm, parameters, metadata, specificTreatment,surveyName); + } + File finalForm = new File(outputForm.getParent()+Constants.BASE_NAME_FORM_FILE+"."+FilenameUtils.getExtension(outputForm.getAbsolutePath())); + if(!finalForm.equals(outputForm)) { + Files.move(outputForm, finalForm); } - logger.debug("Path to generated questionnaire: " + outputForm.getAbsolutePath()); + logger.debug("Path to generated questionnaire: " + finalForm.getAbsolutePath()); - return outputForm; + return finalForm; } + + + public void setParameters(ByteArrayOutputStream parametersBAOS) { + this.parameters = parametersBAOS.toByteArray(); + } public void setParameters(InputStream parametersIS) throws IOException { - - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - byte[] buf = new byte[1024]; - int n = 0; - while ((n = parametersIS.read(buf)) >= 0) { - baos.write(buf, 0, n); + if(parametersIS!=null) { + this.parameters = IOUtils.toByteArray(parametersIS); + } + } + + public void setMetadata(InputStream metadataIS) throws IOException { + if(metadataIS!=null) { + this.metadata = IOUtils.toByteArray(metadataIS); + } + } + + public void setSpecificTreatment(InputStream specificTreatmentIS) throws IOException { + if(specificTreatmentIS!=null) { + this.specificTreatment = IOUtils.toByteArray(specificTreatmentIS); } - this.parameters = baos.toByteArray(); - } public byte[] getParameters() { return parameters; } + public byte[] getMetadata() { + return metadata; + } + public byte[] getSpecificTreatment() { + return specificTreatment; + } /** * Clean the temp dir if it exists @@ -161,4 +188,12 @@ private void cleanTempFolder(File folder) throws IOException { } } + @Override + public String toString() { + return "GenerationService [preprocessors=" + Arrays.toString(preprocessors) + ", generator=" + generator.in2out() + + ", postprocessors=" + Arrays.toString(postprocessors) + "]"; + } + + + } From 72e78ce0e3361cdaf6cfc5337b879ebf73b11e8c Mon Sep 17 00:00:00 2001 From: Laurent Caouissin Date: Wed, 2 Oct 2019 12:27:51 +0200 Subject: [PATCH 195/439] Eno params : update validator --- .../validation/SchemaValidatorImpl.java | 10 +- .../eno/params/validation/Validator.java | 12 +- .../eno/params/validation/ValidatorImpl.java | 231 +++++++++--------- 3 files changed, 134 insertions(+), 119 deletions(-) diff --git a/src/main/java/fr/insee/eno/params/validation/SchemaValidatorImpl.java b/src/main/java/fr/insee/eno/params/validation/SchemaValidatorImpl.java index 0403a3bf6..4efac30a4 100644 --- a/src/main/java/fr/insee/eno/params/validation/SchemaValidatorImpl.java +++ b/src/main/java/fr/insee/eno/params/validation/SchemaValidatorImpl.java @@ -2,6 +2,7 @@ import java.io.InputStream; +import javax.annotation.PostConstruct; import javax.xml.XMLConstants; import javax.xml.transform.Source; import javax.xml.transform.Transformer; @@ -15,25 +16,24 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Service; import org.xml.sax.SAXException; import fr.insee.eno.Constants; -@Service public class SchemaValidatorImpl implements SchemaValidator { - + + private static final Logger LOGGER = LoggerFactory.getLogger(SchemaValidatorImpl.class); private Schema schema; private Validator validator; - public SchemaValidatorImpl() { + @PostConstruct + public void initSchemaValidator() { SchemaFactory sf = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI); try { schema = sf.newSchema(Constants.ENO_PARAMETERS_XSD); } catch (SAXException e) { - // TODO Auto-generated catch block e.printStackTrace(); } validator = schema.newValidator(); diff --git a/src/main/java/fr/insee/eno/params/validation/Validator.java b/src/main/java/fr/insee/eno/params/validation/Validator.java index 5022ba2b2..bb41cd428 100644 --- a/src/main/java/fr/insee/eno/params/validation/Validator.java +++ b/src/main/java/fr/insee/eno/params/validation/Validator.java @@ -1,11 +1,19 @@ package fr.insee.eno.params.validation; import fr.insee.eno.parameters.ENOParameters; +import fr.insee.eno.parameters.InFormat; +import fr.insee.eno.parameters.OutFormat; +import fr.insee.eno.parameters.Pipeline; public interface Validator { - boolean validate(byte[] parameters); + ValidationMessage validate(ENOParameters parametersType); + + ValidationMessage validateIn2Out(InFormat inFormat, OutFormat outFormat); + + ValidationMessage validatePreProcessings(Pipeline pipeline); + + ValidationMessage validatePostProcessings(Pipeline pipeline); - boolean validate(ENOParameters parametersType); } diff --git a/src/main/java/fr/insee/eno/params/validation/ValidatorImpl.java b/src/main/java/fr/insee/eno/params/validation/ValidatorImpl.java index 445298048..e46cb0efd 100644 --- a/src/main/java/fr/insee/eno/params/validation/ValidatorImpl.java +++ b/src/main/java/fr/insee/eno/params/validation/ValidatorImpl.java @@ -1,137 +1,144 @@ package fr.insee.eno.params.validation; +import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.List; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import fr.insee.eno.parameters.ENOParameters; import fr.insee.eno.parameters.InFormat; import fr.insee.eno.parameters.OutFormat; import fr.insee.eno.parameters.Pipeline; import fr.insee.eno.parameters.PostProcessing; import fr.insee.eno.parameters.PreProcessing; + public class ValidatorImpl implements Validator { + + private static final Logger LOGGER = LoggerFactory.getLogger(ValidatorImpl.class); - public static final List PRE_PROCESSING_DDI = Arrays.asList( - PreProcessing.DDI_DEREFERENCING, - PreProcessing.DDI_CLEANING, - PreProcessing.DDI_TITLING); - - public static final List PRE_PROCESSING_POGUES_XML_WITH_GOTO = Arrays.asList( - PreProcessing.POGUES_XML_GOTO_2_ITE); - - public static final List PRE_PROCESSING_POGUES_XML_WITHOUT_GOTO = Arrays.asList( - PreProcessing.POGUES_XML_SUPPRESSION_GOTO, - PreProcessing.POGUES_XML_TWEAK_TO_MERGE_EQUIVALENT_ITE); - - public static final List POST_PROCESSING_DDI = Arrays.asList( - PostProcessing.DDI_MARKDOWN_TO_XHTML); - - public static final List POST_PROCESSING_JS = Arrays.asList( - PostProcessing.JS_SORT_COMPONENTS, - PostProcessing.JS_EXTERNALIZE_VARIABLES); - - public static final List POST_PROCESSING_PDF = Arrays.asList( - PostProcessing.PDF_MAILING, - PostProcessing.PDF_TABLE_COLUMN, - PostProcessing.PDF_INSERT_END_QUESTION, - PostProcessing.PDF_EDIT_STRUCTURE_PAGES, - PostProcessing.PDF_INSERT_COVER_PAGE, - PostProcessing.PDF_INSERT_ACCOMPANYING_MAILS); + public static final PostProcessing[] POST_PROCESSINGS_FULL = PostProcessing.class.getEnumConstants(); + public static final PreProcessing[] PRE_PROCESSINGS_FULL = PreProcessing.class.getEnumConstants(); - public static final List POST_PROCESSING_FR = Arrays.asList( - PostProcessing.FR_INSERT_GENERIC_QUESTIONS, - PostProcessing.FR_BROWSING, - PostProcessing.FR_MODELE_COLTRANE, - PostProcessing.FR_EDIT_PATRON, - PostProcessing.FR_IDENTIFICATION, - PostProcessing.FR_INSERT_WELCOME, - PostProcessing.FR_INSERT_END, - PostProcessing.FR_FIX_ADHERENCE); - @Override - public boolean validate(byte[] parameters) { - // TODO Auto-generated method stub - return false; + public ValidationMessage validate(ENOParameters parametersType) { + Pipeline pipeline = parametersType.getPipeline(); + ValidationMessage validationIn2Out = validateIn2Out(pipeline.getInFormat(), pipeline.getOutFormat()); + ValidationMessage validationPreProcessings = validatePreProcessings(pipeline); + ValidationMessage validationPostProcessings = validatePostProcessings(pipeline); + + boolean isValid = validationIn2Out.isValid() + && validationPreProcessings.isValid() + && validationPostProcessings.isValid(); + String message = validationIn2Out.getMessage() +", "+ + validationPreProcessings.getMessage() +", "+ + validationPostProcessings.getMessage(); + + return new ValidationMessage(message,isValid); } @Override - public boolean validate(ENOParameters parametersType) { - Pipeline pipeline = parametersType.getPipeline(); - boolean isValid = - validateIn2Out(pipeline.getInFormat(), pipeline.getOutFormat()) - && validatePostProcessings(pipeline); - return false; - } - - public boolean validateIn2Out(InFormat inFormat, OutFormat outFormat) { - boolean isValid; - - switch (inFormat) { - case DDI: - isValid = !outFormat.equals(OutFormat.DDI); - break; - case POGUES_XML: - isValid = !outFormat.equals(OutFormat.POGUES_XML); - break; - default: - isValid=false; - break; - } - return isValid; + public ValidationMessage validateIn2Out(InFormat inFormat, OutFormat outFormat) { + boolean isValid = inFormat!=null && outFormat!=null; + String message = ""; + if(isValid) { + switch (inFormat) { + case DDI: + isValid = true; + break; + case POGUES_XML: + isValid = outFormat.equals(OutFormat.DDI) || outFormat.equals(OutFormat.POGUES_XML); + break; + case FR: + isValid = outFormat.equals(OutFormat.FR); + default: + isValid=false; + break; + } + message += isValid ? "" : "The combination (in:'"+inFormat.value()+"'/out:'"+ outFormat.value() +"')"+" format is not valid"; + } + else { + message = "One of In/Out format doesn't exist in Eno. "; + } + + message += isValid ? "The combination In/Out format is valid" : ""; + LOGGER.info(message); + return new ValidationMessage(message, isValid); } - - public boolean validatePreProcessings(InFormat inFormat, List preProcessings) { - boolean isValid; - switch (inFormat) { - case DDI: - isValid = - preProcessings.containsAll(PRE_PROCESSING_DDI) - && preProcessings.size()==PRE_PROCESSING_DDI.size(); - break; - case POGUES_XML: - isValid = - (preProcessings.containsAll(PRE_PROCESSING_POGUES_XML_WITH_GOTO) && preProcessings.size()==PRE_PROCESSING_POGUES_XML_WITH_GOTO.size()) - || - (preProcessings.containsAll(PRE_PROCESSING_POGUES_XML_WITHOUT_GOTO) && preProcessings.size()==PRE_PROCESSING_POGUES_XML_WITHOUT_GOTO.size()); - break; - default: - isValid=false; - break; + + @Override + public ValidationMessage validatePreProcessings(Pipeline pipeline) { + boolean isValid=true; + String message=""; + InFormat inFormat = pipeline.getInFormat(); + boolean preProcessingNeeded = pipeline.getPostProcessing().contains(PostProcessing.FR_MODELE_COLTRANE); + List preProcessings = pipeline.getPreProcessing(); + List preProcessingsCopy = new ArrayList<>(preProcessings); + + if(inFormat!=null) { + if(isValid) { + Collections.sort(preProcessingsCopy); + List preProcessingInFormat = Arrays.asList(Arrays.stream(PRE_PROCESSINGS_FULL).filter(p->p.value().contains(inFormat.value()+"-")).toArray(PreProcessing[]::new)); + + boolean order = preProcessingsCopy.equals(preProcessings); + boolean consistency = preProcessingInFormat.containsAll(preProcessingsCopy); + boolean mapping = preProcessingNeeded ? preProcessings.contains(PreProcessing.DDI_MAPPING):true; + + isValid = order && consistency && mapping; + + message += order ? "" : "PreProcessings are not in the right order. The right order should be : "+preProcessingsCopy; + message += consistency ? "" : "PreProcessings are not valid according to the InFormat ('"+inFormat.value()+"') "; + message += mapping ? "" : "The PostProcessing '"+PostProcessing.FR_MODELE_COLTRANE.value()+"', need the PreProcessing '"+PreProcessing.DDI_MAPPING.value()+"' "; + + } + else { + message+="One of PreProcessings doesn't exist in Eno."; + } + } + else { + isValid = false; + message+="The inFormat doesn't exist in Eno, validator can't check PreProcessings."; } - return isValid; + message += isValid ? "PreProcessing are valid" : ""; + LOGGER.info(message); + return new ValidationMessage(message, isValid); } - - public boolean validatePostProcessings(Pipeline pipeline) { - boolean isValid; - - OutFormat outFormat = pipeline.getOutFormat(); + + @Override + public ValidationMessage validatePostProcessings(Pipeline pipeline) { + boolean isValid = true; + String message=""; + OutFormat outFormat = pipeline.getOutFormat(); List postProcessings = pipeline.getPostProcessing(); - boolean specificTreatment = false; - switch (outFormat) { - case DDI: - isValid = postProcessings.containsAll(POST_PROCESSING_DDI) && postProcessings.size()==POST_PROCESSING_DDI.size(); - break; - case FR: - isValid = postProcessings.containsAll(POST_PROCESSING_FR) && postProcessings.size()==POST_PROCESSING_FR.size(); - break; - case PDF: - isValid = postProcessings.containsAll(POST_PROCESSING_PDF) && postProcessings.size()==POST_PROCESSING_PDF.size(); - break; - case JS: - isValid = postProcessings.containsAll(POST_PROCESSING_JS) && postProcessings.size()==POST_PROCESSING_JS.size(); - break; - case ODT: - isValid = postProcessings.isEmpty(); - break; - case POGUES_XML: - isValid = postProcessings.isEmpty(); - break; + List postProcessingsCopy = new ArrayList<>(postProcessings); + + if(outFormat!=null) { + if(isValid) { + + Collections.sort(postProcessingsCopy); + List postProcessingOutFormat = Arrays.asList(Arrays.stream(POST_PROCESSINGS_FULL).filter(p->p.value().contains(outFormat.value()+"-")).toArray(PostProcessing[]::new)); + + boolean order = postProcessingsCopy.equals(postProcessings); + boolean consistency = postProcessingOutFormat.containsAll(postProcessingsCopy); + + isValid = order && consistency; + + message += order ? "" : "PostProcessings are not in the right order. The order should be : "+postProcessingsCopy; + message += consistency ? "" : "PostProcessings are not valid according to the OutFormat ('"+outFormat.value()+"') "; + } + else { + message+="One of PostProcessings doesn't exist in Eno."; + } + } + else { + isValid = false; + message+="The outFormat doesn't exist in Eno, validator can't check PostProcessings."; } - return false; - } - - public boolean validateParams() { - return false; - } + message += isValid ? "PostProcessing are valid" : ""; + LOGGER.info(message); + return new ValidationMessage(message, isValid); + } } From e078ba88fbec20d42bc37731916c496feda5d215 Mon Sep 17 00:00:00 2001 From: Laurent Caouissin Date: Wed, 2 Oct 2019 17:13:30 +0200 Subject: [PATCH 196/439] Eno params : update Titling transformation --- .../java/fr/insee/eno/transform/xsl/XslTransformation.java | 4 ++-- src/main/resources/xslt/util/ddi/titling.xsl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/fr/insee/eno/transform/xsl/XslTransformation.java b/src/main/java/fr/insee/eno/transform/xsl/XslTransformation.java index b0018cd40..26042dbc7 100644 --- a/src/main/java/fr/insee/eno/transform/xsl/XslTransformation.java +++ b/src/main/java/fr/insee/eno/transform/xsl/XslTransformation.java @@ -214,10 +214,10 @@ public void transformTitling(InputStream input, InputStream xslSheet, OutputStre InputStream parametersIS = null; LOGGER.debug("Using the titling transformer"); TransformerFactory tFactory = new net.sf.saxon.TransformerFactoryImpl(); + tFactory.setURIResolver(new ClasspathURIResolver()); Transformer transformer = tFactory.newTransformer(new StreamSource(xslSheet)); transformer.setErrorListener(new EnoErrorListener()); - transformer.setParameter(XslParameters.TITLING_PARAMETERS_FILE, - new URI("classpath:" + Constants.PARAMETERS_XML)); + transformer.setParameter(XslParameters.IN2OUT_PARAMETERS_FILE, Constants.PARAMETERS_DEFAULT); if (parameters != null) { parametersIS = new ByteArrayInputStream(parameters); Source source = new StreamSource(parametersIS); diff --git a/src/main/resources/xslt/util/ddi/titling.xsl b/src/main/resources/xslt/util/ddi/titling.xsl index 45a3af257..75ec7ed0e 100644 --- a/src/main/resources/xslt/util/ddi/titling.xsl +++ b/src/main/resources/xslt/util/ddi/titling.xsl @@ -38,7 +38,7 @@ - + From 8da6b3b28eb4b50e3a7154a52922eb446337188f Mon Sep 17 00:00:00 2001 From: Laurent Caouissin Date: Wed, 2 Oct 2019 17:13:56 +0200 Subject: [PATCH 197/439] Eno params : add XslParameters --- .../java/fr/insee/eno/transform/xsl/XslParameters.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/fr/insee/eno/transform/xsl/XslParameters.java b/src/main/java/fr/insee/eno/transform/xsl/XslParameters.java index 4fb5ebfb4..b07204666 100644 --- a/src/main/java/fr/insee/eno/transform/xsl/XslParameters.java +++ b/src/main/java/fr/insee/eno/transform/xsl/XslParameters.java @@ -18,16 +18,17 @@ private XslParameters() { public static final String IN2OUT_PARAMETERS_NODE = "parameters-node"; public static final String IN2OUT_PROPERTIES_FILE = "properties-file"; public static final String IN2OUT_PROPERTIES_NODE = "properties-node"; - public static final String IN2OUT_METADONNEE_FILE = "metadonnee-file"; - public static final String IN2OUT_METADONNEE_NODE = "metadonnee-node"; + public static final String IN2OUT_METADATA_FILE = "metadata-file"; + public static final String IN2OUT_METADATA_NODE = "metadata-node"; public static final String CLEANED_EXTENSION = "-cleaned"; public static final String TITLED_EXTENSION = "-final"; public static final String DDI2PDF_STATIC_PAGES = "static-pages"; public static final String IN2OUT_LABELS_FOLDER = "labels-folder"; public static final String IN2OUT_SURVEY_NAME = "survey-name"; public static final String IN2OUT_FORM_NAME = "form-name"; + public static final String IN2OUT_MAPPING_FILE = "fichier-mapping"; public static final String IN2OUT_MAPPING_FILE_NODE = "fichier-mapping-node"; public static final String IN2OUT_CAMPAGNE = "campagne"; public static final String IN2OUT_MODELE = "model"; - + } From 7c16a73d9eb2550492ab33a806638301452746cc Mon Sep 17 00:00:00 2001 From: Laurent Caouissin Date: Wed, 2 Oct 2019 17:14:24 +0200 Subject: [PATCH 198/439] Eno params : add the modele-questionaire in the output --- src/main/resources/xslt/outputs/fr/models.xsl | 15 +++++++++++++-- src/main/resources/xslt/outputs/js/models.xsl | 11 ++++++++++- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/src/main/resources/xslt/outputs/fr/models.xsl b/src/main/resources/xslt/outputs/fr/models.xsl index 94f082ec0..ab27f1cf8 100644 --- a/src/main/resources/xslt/outputs/fr/models.xsl +++ b/src/main/resources/xslt/outputs/fr/models.xsl @@ -10,7 +10,16 @@ - + + + + + + + + + + @@ -57,7 +66,9 @@ - + + + diff --git a/src/main/resources/xslt/outputs/js/models.xsl b/src/main/resources/xslt/outputs/js/models.xsl index a0ab4d462..2292e10dc 100644 --- a/src/main/resources/xslt/outputs/js/models.xsl +++ b/src/main/resources/xslt/outputs/js/models.xsl @@ -27,7 +27,16 @@ - + + + + + + + + + + From 33941249373f20013f8f8787e45f7395faa4f685 Mon Sep 17 00:00:00 2001 From: Laurent Caouissin Date: Wed, 2 Oct 2019 17:15:10 +0200 Subject: [PATCH 199/439] Eno params : add module to valorize parameters --- .../eno/params/ValorizatorParameters.java | 18 +- .../eno/params/ValorizatorParametersImpl.java | 210 +++++++++++++++++- 2 files changed, 219 insertions(+), 9 deletions(-) diff --git a/src/main/java/fr/insee/eno/params/ValorizatorParameters.java b/src/main/java/fr/insee/eno/params/ValorizatorParameters.java index 8fba81621..87f9d5123 100644 --- a/src/main/java/fr/insee/eno/params/ValorizatorParameters.java +++ b/src/main/java/fr/insee/eno/params/ValorizatorParameters.java @@ -1,13 +1,25 @@ package fr.insee.eno.params; +import java.io.ByteArrayOutputStream; +import java.io.File; import java.io.InputStream; +import javax.xml.transform.stream.StreamSource; + import fr.insee.eno.parameters.ENOParameters; public interface ValorizatorParameters { + + ByteArrayOutputStream mergeParameters(ENOParameters enoParameters) throws Exception; - String setParameters(ENOParameters enoParameters); - - InputStream setparameters(ENOParameters enoParameters); + ENOParameters mergeEnoParameters(ENOParameters enoParameters) throws Exception; + + ENOParameters getParameters(StreamSource xmlStream) throws Exception; + ENOParameters getParameters(String xmlString) throws Exception; + + ENOParameters getParameters(InputStream inputStream) throws Exception; + + File mergeParameters(File enoParameters) throws Exception; + } diff --git a/src/main/java/fr/insee/eno/params/ValorizatorParametersImpl.java b/src/main/java/fr/insee/eno/params/ValorizatorParametersImpl.java index 3980e78f3..ca57ff33b 100644 --- a/src/main/java/fr/insee/eno/params/ValorizatorParametersImpl.java +++ b/src/main/java/fr/insee/eno/params/ValorizatorParametersImpl.java @@ -1,21 +1,219 @@ package fr.insee.eno.params; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.IOException; import java.io.InputStream; +import java.io.StringReader; +import java.io.UnsupportedEncodingException; +import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import javax.xml.bind.JAXBContext; +import javax.xml.bind.JAXBException; +import javax.xml.bind.Marshaller; +import javax.xml.bind.Unmarshaller; +import javax.xml.transform.stream.StreamSource; + +import org.apache.commons.io.FileUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import fr.insee.eno.Constants; import fr.insee.eno.parameters.ENOParameters; +import fr.insee.eno.parameters.LevelAbstract; +import fr.insee.eno.parameters.LevelQuestion; +import fr.insee.eno.parameters.LevelSequence; + public class ValorizatorParametersImpl implements ValorizatorParameters { + private static final Logger logger = LoggerFactory.getLogger(ValorizatorParametersImpl.class); + + + @Override + public ByteArrayOutputStream mergeParameters(ENOParameters enoParameters) throws JAXBException, IllegalArgumentException, IllegalAccessException, IOException { + ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(); + ENOParameters enoParametersFinal = mergeEnoParameters(enoParameters); + JAXBContext context = JAXBContext.newInstance(ENOParameters.class); + Marshaller jaxbMarshaller = context.createMarshaller(); + jaxbMarshaller.setProperty(Marshaller.JAXB_ENCODING, "UTF-8"); + jaxbMarshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true); + jaxbMarshaller.marshal(enoParametersFinal, byteArrayOutputStream); + + return byteArrayOutputStream; + } + + @Override + public File mergeParameters(File enoParameters) throws JAXBException, IllegalArgumentException, IllegalAccessException, IOException { + File output = Constants.TEMP_FILE_PARAMS("new-params.xml"); + InputStream paramsIS = FileUtils.openInputStream(enoParameters); + ENOParameters enoParms = getParameters(paramsIS); + ENOParameters enoParametersFinal = mergeEnoParameters(enoParms); + JAXBContext context = JAXBContext.newInstance(ENOParameters.class); + Marshaller jaxbMarshaller = context.createMarshaller(); + jaxbMarshaller.setProperty(Marshaller.JAXB_ENCODING, "UTF-8"); + jaxbMarshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true); + jaxbMarshaller.marshal(enoParametersFinal, output); + + return output; + } + @Override - public String setParameters(ENOParameters enoParameters) { - // TODO Auto-generated method stub - return null; + public ENOParameters mergeEnoParameters(ENOParameters enoParameters) throws JAXBException, IOException, IllegalArgumentException, IllegalAccessException { + logger.info("Merging eno Parameters"); + ENOParameters enoParametersDefault = getDefaultParameters(); + logger.info("Default parameters read"); + return mergeEnoParameters(enoParametersDefault, enoParameters); + } + + public T mergeEnoParameters(T enoParamsDefault, T newEnoParams) throws IllegalArgumentException, IllegalAccessException { + Class clazz = enoParamsDefault.getClass(); + logger.debug("Name of class "+clazz.getSimpleName()); + Object merged=null; + // List of known "Primitive" java Object and used in xsd model + List PRIMITIVE_JAVA_OBJECT = Arrays.asList("Long", "Long[]", "Integer", "Integer[]", "String", "String[]", "Boolean", "boolean[]", "ArrayList", "LinkedHashMap"); + + // if the class of the object is a Primitive or similar, or an Enumeration, we do a simple merge otherwise: + if(!(clazz.isPrimitive() || clazz.isEnum() || PRIMITIVE_JAVA_OBJECT.contains(clazz.getSimpleName()))){ + merged = enoParamsDefault; + // we recover each fields which constitutes the recovered object + + for (Field field : getAllFields(new ArrayList<>(), clazz)) { + field.setAccessible(true); + + Object enoParamsDefaultValue; + Object newEnoParamsValue; + // we recover the value of each + enoParamsDefaultValue = field.get(enoParamsDefault); + newEnoParamsValue = newEnoParams!=null ? field.get(newEnoParams) : null; + + // Recursive call except in the case of an ArrayList (if empty we keep default value) + if (enoParamsDefaultValue != null) { + String className = enoParamsDefaultValue.getClass().getSimpleName(); + if(className.equals("ArrayList")) { + if(newEnoParamsValue==null || ((ArrayList) newEnoParamsValue).isEmpty()) { + field.set(merged, enoParamsDefaultValue); + logger.debug("ArrayList : No overloaded, default value"); + } + else { + // Special case for LevelQuestion and LevelSequence + Class levelClass = ((ArrayList) newEnoParamsValue).get(0).getClass(); + if(levelClass.equals(LevelQuestion.class) || levelClass.equals(LevelSequence.class)) { + ArrayList mergedList = new ArrayList<>(); + for(LevelAbstract levelDefault : (ArrayList) enoParamsDefaultValue) { + int size = mergedList.size(); + for(LevelAbstract levelNew : (ArrayList) newEnoParamsValue) { + if(levelDefault.getName().equals(levelNew.getName())) { + mergedList.add(this.mergeEnoParameters(levelDefault, levelNew)); + } + } + if(mergedList.size()==size) { + mergedList.add(levelDefault); + } + } + field.set(merged, mergedList); + logger.debug("ArrayList : Special overloaded"); + } + else { + field.set(merged, newEnoParamsValue); + logger.debug("ArrayList : overloaded, new value"); + } + } + } + else { + // Recursive call + logger.debug("Merging... : recursive call"); + field.set(merged, this.mergeEnoParameters(enoParamsDefaultValue, newEnoParamsValue)); + } + } + } + } + else { + // merge simple: new value if it is not null, if not the default one + logger.debug("Merging... : values merged"); + merged = (newEnoParams != null) ? newEnoParams : enoParamsDefault; + } + return (T) merged; + } + + + public ENOParameters getDefaultParameters() throws JAXBException, IOException { + InputStream xmlParameters = Constants.getInputStreamFromPath(Constants.PARAMETERS_DEFAULT_XML); + StreamSource xml = new StreamSource(xmlParameters); + return this.getParameters(xml); } @Override - public InputStream setparameters(ENOParameters enoParameters) { - // TODO Auto-generated method stub - return null; + public ENOParameters getParameters(String xmlString) throws JAXBException, UnsupportedEncodingException { + + if ((xmlString == null) || (xmlString.length() == 0)) + return null; + StreamSource xml = new StreamSource(new StringReader(xmlString)); + + return this.getParameters(xml); } + + @Override + public ENOParameters getParameters(InputStream inputStream) throws JAXBException, UnsupportedEncodingException { + + if (inputStream == null) + return null; + + logger.debug("Preparing to translate from XML to java"); + + + + JAXBContext context = JAXBContext.newInstance(ENOParameters.class); + Unmarshaller unmarshaller = context.createUnmarshaller(); + unmarshaller.setListener(new UnmarshallLogger()); + + ENOParameters enoParameters = (ENOParameters) unmarshaller.unmarshal(inputStream); + + return enoParameters; + } + + @Override + public ENOParameters getParameters(StreamSource xmlStream) throws JAXBException, UnsupportedEncodingException { + + if (xmlStream == null) + return null; + + logger.debug("Preparing to translate from XML to java"); + + JAXBContext context = JAXBContext.newInstance(ENOParameters.class); + Unmarshaller unmarshaller = context.createUnmarshaller(); + unmarshaller.setListener(new UnmarshallLogger()); + + ENOParameters enoParameters = (ENOParameters) unmarshaller.unmarshal(xmlStream); + + return enoParameters; + } + + private class UnmarshallLogger extends Unmarshaller.Listener { + + @Override + public void beforeUnmarshal(Object target, Object parent) { + //LOGGER.debug("Before unmarshalling object " + target); + } + + @Override + public void afterUnmarshal(Object target, Object parent) { + //LOGGER.debug("After unmarshalling object " + target); + } + } + + public List getAllFields(List fields, Class type) { + fields.addAll(Arrays.asList(type.getDeclaredFields())); + + if (type.getSuperclass() != null) { + getAllFields(fields, type.getSuperclass()); + } + + return fields; + } + } From 51580f88d8b06afb5d27846997d96f58e5cafe64 Mon Sep 17 00:00:00 2001 From: Laurent Caouissin Date: Wed, 2 Oct 2019 17:15:43 +0200 Subject: [PATCH 200/439] Eno params : update paramters default --- src/main/resources/params/default/parameters.xml | 11 ++++++----- .../xslt/transformations/ddi2fr/ddi2fr-fixed.xsl | 4 ++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/main/resources/params/default/parameters.xml b/src/main/resources/params/default/parameters.xml index 59d47f981..da35cd512 100644 --- a/src/main/resources/params/default/parameters.xml +++ b/src/main/resources/params/default/parameters.xml @@ -26,6 +26,7 @@ fr + en @@ -33,7 +34,7 @@ - false + true true @@ -53,21 +54,21 @@ - 12 + 15 - 14 + 19
- manual + optical module diff --git a/src/main/resources/xslt/transformations/ddi2fr/ddi2fr-fixed.xsl b/src/main/resources/xslt/transformations/ddi2fr/ddi2fr-fixed.xsl index 245b86617..addfde0c2 100644 --- a/src/main/resources/xslt/transformations/ddi2fr/ddi2fr-fixed.xsl +++ b/src/main/resources/xslt/transformations/ddi2fr/ddi2fr-fixed.xsl @@ -489,8 +489,8 @@ - - + + From 09deec277c10ade2da383c51568a848f3a140716 Mon Sep 17 00:00:00 2001 From: Laurent Caouissin Date: Wed, 2 Oct 2019 17:16:10 +0200 Subject: [PATCH 201/439] Eno params : fix bug in accessing file in classpath --- src/main/java/fr/insee/eno/Constants.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/fr/insee/eno/Constants.java b/src/main/java/fr/insee/eno/Constants.java index 45943769b..5e2ac155f 100644 --- a/src/main/java/fr/insee/eno/Constants.java +++ b/src/main/java/fr/insee/eno/Constants.java @@ -35,7 +35,8 @@ private Constants() { public static final String CONFIG_FOLDER = "/config"; public static final String INPUTS_FOLDER = "/xslt/inputs"; public static final File LABEL_FOLDER = getFileFromUrl(Constants.class.getResource("/lang/fr")); - public static final File PARAMETERS_DEFAULT_XML = getFileFromUrl(Constants.class.getResource(PARAMS_DEFAULT_FOLDER_PATH+"/parameters.xml")); + public static final String PARAMETERS_DEFAULT_XML = PARAMS_DEFAULT_FOLDER_PATH+"/parameters.xml"; + // Params : schema From 3a1b051cc8f004539501eb1402d72421fce8ed9d Mon Sep 17 00:00:00 2001 From: Laurent Caouissin Date: Wed, 2 Oct 2019 17:16:29 +0200 Subject: [PATCH 202/439] Update SchemaValidatorImpl.java --- .../eno/params/validation/SchemaValidatorImpl.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/fr/insee/eno/params/validation/SchemaValidatorImpl.java b/src/main/java/fr/insee/eno/params/validation/SchemaValidatorImpl.java index 4efac30a4..e02bfb8cc 100644 --- a/src/main/java/fr/insee/eno/params/validation/SchemaValidatorImpl.java +++ b/src/main/java/fr/insee/eno/params/validation/SchemaValidatorImpl.java @@ -2,7 +2,6 @@ import java.io.InputStream; -import javax.annotation.PostConstruct; import javax.xml.XMLConstants; import javax.xml.transform.Source; import javax.xml.transform.Transformer; @@ -28,8 +27,7 @@ public class SchemaValidatorImpl implements SchemaValidator { private Schema schema; private Validator validator; - @PostConstruct - public void initSchemaValidator() { + public SchemaValidatorImpl() { SchemaFactory sf = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI); try { schema = sf.newSchema(Constants.ENO_PARAMETERS_XSD); @@ -37,16 +35,19 @@ public void initSchemaValidator() { e.printStackTrace(); } validator = schema.newValidator(); + } - + @Override public ValidationMessage validate(InputStream paramsIS) { + LOGGER.info("Validation of parameters file..."); boolean valid=false; String message=""; try { validateIS(paramsIS); valid=true; } catch (Exception e) { + e.printStackTrace(); message = e.getMessage(); LOGGER.error(message); } @@ -58,7 +59,7 @@ public ValidationMessage validate(InputStream paramsIS) { } public void validateIS(InputStream paramsIS) throws Exception { - validator.reset(); + validator.reset(); Source source = new StreamSource(paramsIS); source = toDOMSource(source); validator.validate(source); From 529af5bf80ef812a789f906ffe1547fb6d9852dc Mon Sep 17 00:00:00 2001 From: Laurent Caouissin Date: Wed, 2 Oct 2019 17:16:53 +0200 Subject: [PATCH 203/439] Eno params : add Exception for ENO params --- .../eno/params/exception/EnoParametersException.java | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 src/main/java/fr/insee/eno/params/exception/EnoParametersException.java diff --git a/src/main/java/fr/insee/eno/params/exception/EnoParametersException.java b/src/main/java/fr/insee/eno/params/exception/EnoParametersException.java new file mode 100644 index 000000000..e414ab50f --- /dev/null +++ b/src/main/java/fr/insee/eno/params/exception/EnoParametersException.java @@ -0,0 +1,9 @@ +package fr.insee.eno.params.exception; +public class EnoParametersException extends RuntimeException { + + private static final long serialVersionUID = 1L; + + public EnoParametersException(String message) { + super(message); + } +} \ No newline at end of file From 59819d01a57c2eeddcac1164598d72fa0ca4bd8d Mon Sep 17 00:00:00 2001 From: Laurent Caouissin Date: Wed, 2 Oct 2019 17:17:24 +0200 Subject: [PATCH 204/439] Eno params : create Parameterized Generation Service to replace GenerationService --- .../eno/ParameterizedGenerationService.java | 143 ++++++++++++++++++ 1 file changed, 143 insertions(+) create mode 100644 src/main/java/fr/insee/eno/ParameterizedGenerationService.java diff --git a/src/main/java/fr/insee/eno/ParameterizedGenerationService.java b/src/main/java/fr/insee/eno/ParameterizedGenerationService.java new file mode 100644 index 000000000..386e5a174 --- /dev/null +++ b/src/main/java/fr/insee/eno/ParameterizedGenerationService.java @@ -0,0 +1,143 @@ +package fr.insee.eno; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.InputStream; + +import org.apache.commons.io.FileUtils; +import org.apache.commons.io.IOUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import fr.insee.eno.parameters.ENOParameters; +import fr.insee.eno.parameters.Pipeline; +import fr.insee.eno.params.ValorizatorParameters; +import fr.insee.eno.params.ValorizatorParametersImpl; +import fr.insee.eno.params.exception.EnoParametersException; +import fr.insee.eno.params.pipeline.PipeLineGeneratorImpl; +import fr.insee.eno.params.pipeline.PipelineGenerator; +import fr.insee.eno.params.validation.SchemaValidator; +import fr.insee.eno.params.validation.SchemaValidatorImpl; +import fr.insee.eno.params.validation.ValidationMessage; +import fr.insee.eno.params.validation.Validator; +import fr.insee.eno.params.validation.ValidatorImpl; + +/** + * Orchestrates the whole generation process. + */ +public class ParameterizedGenerationService { + + private static final Logger LOGGER = LoggerFactory.getLogger(ParameterizedGenerationService.class); + + private PipelineGenerator pipelineGenerator = new PipeLineGeneratorImpl(); + + private ValorizatorParameters valorizatorParameters = new ValorizatorParametersImpl(); + + private Validator validator = new ValidatorImpl(); + + private SchemaValidator schemaValidator = new SchemaValidatorImpl(); + + public File generateQuestionnaire(File inputFile, ENOParameters params, InputStream metadata, InputStream specificTreatment) throws Exception{ + File output=null; + Pipeline pipeline = params.getPipeline(); + + ValidationMessage valid = validator.validate(params); + if(valid.isValid()) { + GenerationService generationService = pipelineGenerator.setPipeLine(pipeline); + ByteArrayOutputStream paramsFinal = valorizatorParameters.mergeParameters(params); + LOGGER.info("Setting paramaters to the pipeline."); + generationService.setParameters(paramsFinal); + LOGGER.info("Setting metadata to the pipeline."); + generationService.setMetadata(metadata); + LOGGER.info("Setting specific treamtment to the pipeline."); + generationService.setSpecificTreatment(specificTreatment); + String survey = params.getParameters().getCampagne(); + output = generationService.generateQuestionnaire(inputFile, survey); + paramsFinal.close(); + } + else { + LOGGER.error(valid.getMessage()); + throw new EnoParametersException(valid.getMessage()); + } + + return output; + + } + + public File generateQuestionnaire(File inputFile, InputStream params, InputStream metadata, InputStream specificTreatment) throws Exception { + LOGGER.info("Parameterized Generation of questionnaire -- STARTED --"); + File output=null; + + if(params!=null) { + byte[] paramsBytes = IOUtils.toByteArray(params); + + LOGGER.info("First validation ..."); + ValidationMessage validSchema = schemaValidator.validate(new ByteArrayInputStream(paramsBytes)); + + if(validSchema.isValid()) { + LOGGER.info(validSchema.getMessage()); + LOGGER.info("Parameters reading ..."); + ENOParameters enoParameters = null; + enoParameters = valorizatorParameters.getParameters(new ByteArrayInputStream(paramsBytes)); + LOGGER.info("Parameters read."); + + LOGGER.info("Second validation ..."); + ValidationMessage valid = validator.validate(enoParameters); + + if(valid.isValid()) { + LOGGER.info(valid.getMessage()); + Pipeline pipeline = enoParameters.getPipeline(); + GenerationService generationService = pipelineGenerator.setPipeLine(pipeline); + ByteArrayOutputStream paramsFinal = valorizatorParameters.mergeParameters(enoParameters); + LOGGER.info("Setting paramaters to the pipeline."); + generationService.setParameters(paramsFinal); + LOGGER.info("Setting metadata to the pipeline."); + generationService.setMetadata(metadata); + LOGGER.info("Setting specific treamtment to the pipeline."); + generationService.setSpecificTreatment(specificTreatment); + String survey = enoParameters.getParameters().getCampagne(); + output = generationService.generateQuestionnaire(inputFile, survey); + paramsFinal.close(); + } + else { + LOGGER.error(valid.getMessage()); + throw new EnoParametersException(valid.getMessage()); + } + } + else { + LOGGER.error(validSchema.getMessage()); + throw new EnoParametersException(validSchema.getMessage()); + } + } + else { + String error = getClass().getName() + " needs the parameters file."; + LOGGER.error(error); + throw new EnoParametersException(error); + } + + + LOGGER.info("Parameterized Generation of questionnaire -- FINISHED --"); + return output; + + } + + public File generateQuestionnaire(File inputFile, File params, File metadata, File specificTreatment) throws Exception{ + File output = null; + + InputStream parametersIS = null; + InputStream metadataIS = null; + InputStream specificTreatmentIS = null; + parametersIS = params!=null ? FileUtils.openInputStream(params):null; + metadataIS = metadata!=null ? FileUtils.openInputStream(metadata):null; + specificTreatmentIS = specificTreatment!=null ? FileUtils.openInputStream(specificTreatment):null; + output = generateQuestionnaire(inputFile, parametersIS, metadataIS, specificTreatmentIS); + + if(parametersIS!=null) {parametersIS.close();}; + if(metadataIS!=null) {metadataIS.close();}; + if(specificTreatmentIS!=null) {specificTreatmentIS.close();}; + + return output; + + } +} From 993b7bd954b927452c7493cbf089e2e8eb07cfed Mon Sep 17 00:00:00 2001 From: Laurent Caouissin Date: Wed, 2 Oct 2019 17:18:05 +0200 Subject: [PATCH 205/439] Eno params : update DummyTests --- .../fr/insee/eno/main/DummyTestDDI2FO.java | 20 +++++++++++------- .../fr/insee/eno/main/DummyTestDDI2JS.java | 11 ++++++++-- .../fr/insee/eno/main/DummyTestDDI2ODT.java | 16 ++++++++++---- .../fr/insee/eno/main/DummyTestDDI2PDF.java | 18 ++++++++++------ .../eno/main/DummyTestDDI2PDFExamples.java | 21 ++++++++++++------- .../insee/eno/main/DummyTestDDI2XForms.java | 16 ++++++++++---- .../fr/insee/eno/main/DummyTestFO2PDF.java | 2 +- .../eno/main/DummyTestPoguesXML2DDI.java | 12 ++++++++--- 8 files changed, 81 insertions(+), 35 deletions(-) diff --git a/src/test/java/fr/insee/eno/main/DummyTestDDI2FO.java b/src/test/java/fr/insee/eno/main/DummyTestDDI2FO.java index ecf989ef7..a112b6086 100644 --- a/src/test/java/fr/insee/eno/main/DummyTestDDI2FO.java +++ b/src/test/java/fr/insee/eno/main/DummyTestDDI2FO.java @@ -2,24 +2,30 @@ import java.io.File; +import org.junit.Test; + import fr.insee.eno.GenerationService; import fr.insee.eno.generation.DDI2PDFGenerator; +import fr.insee.eno.postprocessing.PDFEditStructurePagesPostprocessor; +import fr.insee.eno.postprocessing.PDFInsertAccompanyingMailsPostprocessor; +import fr.insee.eno.postprocessing.PDFInsertCoverPagePostprocessor; +import fr.insee.eno.postprocessing.PDFInsertEndQuestionPostprocessor; import fr.insee.eno.postprocessing.PDFMailingPostprocessor; import fr.insee.eno.postprocessing.PDFSpecificTreatmentPostprocessor; import fr.insee.eno.postprocessing.PDFTableColumnPostprocessorFake; -import fr.insee.eno.postprocessing.PDFInsertEndQuestionPostprocessor; -import fr.insee.eno.postprocessing.PDFEditStructurePagesPostprocessor; -import fr.insee.eno.postprocessing.PDFInsertCoverPagePostprocessor; -import fr.insee.eno.postprocessing.PDFInsertAccompanyingMailsPostprocessor; import fr.insee.eno.postprocessing.Postprocessor; import fr.insee.eno.preprocessing.DDIPreprocessor; public class DummyTestDDI2FO { - - public static void main(String[] args) { + private DDIPreprocessor ddiPreprocessor = new DDIPreprocessor(); + + private DDI2PDFGenerator ddi2pdf = new DDI2PDFGenerator(); + + @Test + public void mainTest() { String basePathDDI2FO = "src/test/resources/ddi-to-fo"; - GenerationService genServiceDDI2PDF = new GenerationService(new DDIPreprocessor(), new DDI2PDFGenerator(), + GenerationService genServiceDDI2PDF = new GenerationService(ddiPreprocessor, ddi2pdf, new Postprocessor[] {/*new NoopPostprocessor()*/ new PDFMailingPostprocessor(), new PDFTableColumnPostprocessorFake(), diff --git a/src/test/java/fr/insee/eno/main/DummyTestDDI2JS.java b/src/test/java/fr/insee/eno/main/DummyTestDDI2JS.java index 8a08030f4..513d18682 100644 --- a/src/test/java/fr/insee/eno/main/DummyTestDDI2JS.java +++ b/src/test/java/fr/insee/eno/main/DummyTestDDI2JS.java @@ -2,6 +2,8 @@ import java.io.File; +import org.junit.Test; + import fr.insee.eno.GenerationService; import fr.insee.eno.generation.DDI2JSGenerator; import fr.insee.eno.postprocessing.JSExternalizeVariablesPostprocessor; @@ -11,14 +13,19 @@ public class DummyTestDDI2JS { - public static void main(String[] args) { + private DDIPreprocessor ddiPreprocessor = new DDIPreprocessor(); + + private DDI2JSGenerator ddi2jsGenerator = new DDI2JSGenerator(); + + @Test + public void mainTest() { String basePathDDI2JS = "src/test/resources/ddi-to-js"; Postprocessor[] postprocessors = { new JSSortComponentsPostprocessor(), new JSExternalizeVariablesPostprocessor()}; - GenerationService genServiceDDI2JS = new GenerationService(new DDIPreprocessor(), new DDI2JSGenerator(),postprocessors); + GenerationService genServiceDDI2JS = new GenerationService(ddiPreprocessor, ddi2jsGenerator,postprocessors); File in = new File(String.format("%s/in.xml", basePathDDI2JS)); try { diff --git a/src/test/java/fr/insee/eno/main/DummyTestDDI2ODT.java b/src/test/java/fr/insee/eno/main/DummyTestDDI2ODT.java index 7c3bc8742..2273c6ba0 100644 --- a/src/test/java/fr/insee/eno/main/DummyTestDDI2ODT.java +++ b/src/test/java/fr/insee/eno/main/DummyTestDDI2ODT.java @@ -2,18 +2,26 @@ import java.io.File; +import org.junit.Test; + import fr.insee.eno.GenerationService; import fr.insee.eno.generation.DDI2ODTGenerator; import fr.insee.eno.postprocessing.NoopPostprocessor; import fr.insee.eno.preprocessing.DDIPreprocessor; public class DummyTestDDI2ODT { + + private DDIPreprocessor ddiPreprocessor = new DDIPreprocessor(); + + private DDI2ODTGenerator ddi2odtGenerator = new DDI2ODTGenerator(); + + private NoopPostprocessor noopPostprocessor = new NoopPostprocessor(); - public static void main(String[] args) { - + @Test + public void main() { + String basePathDDI2ODT = "src/test/resources/ddi-to-odt"; - GenerationService genServiceDDI2ODT = new GenerationService(new DDIPreprocessor(), new DDI2ODTGenerator(), - new NoopPostprocessor()); + GenerationService genServiceDDI2ODT = new GenerationService(ddiPreprocessor, ddi2odtGenerator, noopPostprocessor); File in = new File(String.format("%s/in.xml", basePathDDI2ODT)); try { diff --git a/src/test/java/fr/insee/eno/main/DummyTestDDI2PDF.java b/src/test/java/fr/insee/eno/main/DummyTestDDI2PDF.java index 6e68e2152..9045fd065 100644 --- a/src/test/java/fr/insee/eno/main/DummyTestDDI2PDF.java +++ b/src/test/java/fr/insee/eno/main/DummyTestDDI2PDF.java @@ -19,22 +19,28 @@ import org.apache.fop.apps.Fop; import org.apache.fop.apps.FopFactory; import org.apache.fop.apps.MimeConstants; +import org.junit.Test; import fr.insee.eno.GenerationService; import fr.insee.eno.generation.DDI2PDFGenerator; +import fr.insee.eno.postprocessing.PDFEditStructurePagesPostprocessor; +import fr.insee.eno.postprocessing.PDFInsertAccompanyingMailsPostprocessor; +import fr.insee.eno.postprocessing.PDFInsertCoverPagePostprocessor; +import fr.insee.eno.postprocessing.PDFInsertEndQuestionPostprocessor; import fr.insee.eno.postprocessing.PDFMailingPostprocessor; import fr.insee.eno.postprocessing.PDFSpecificTreatmentPostprocessor; import fr.insee.eno.postprocessing.PDFTableColumnPostprocessorFake; -import fr.insee.eno.postprocessing.PDFInsertEndQuestionPostprocessor; -import fr.insee.eno.postprocessing.PDFEditStructurePagesPostprocessor; -import fr.insee.eno.postprocessing.PDFInsertCoverPagePostprocessor; -import fr.insee.eno.postprocessing.PDFInsertAccompanyingMailsPostprocessor; import fr.insee.eno.postprocessing.Postprocessor; import fr.insee.eno.preprocessing.DDIPreprocessor; public class DummyTestDDI2PDF { + + private DDIPreprocessor ddiPreprocessor = new DDIPreprocessor(); + + private DDI2PDFGenerator ddi2pdfGenerator = new DDI2PDFGenerator(); - public static void main(String[] args) { + @Test + public void mainTest() { String basePathddi2PDF = "src/test/resources/ddi-to-pdf"; String basePathImg = "src/test/resources/examples/img/"; @@ -46,7 +52,7 @@ public static void main(String[] args) { new PDFSpecificTreatmentPostprocessor(), new PDFInsertCoverPagePostprocessor(), new PDFInsertAccompanyingMailsPostprocessor()}; - GenerationService genServiceDDI2PDF = new GenerationService(new DDIPreprocessor(), new DDI2PDFGenerator(), postprocessors); + GenerationService genServiceDDI2PDF = new GenerationService(ddiPreprocessor, ddi2pdfGenerator, postprocessors); File in = new File(String.format("%s/in.xml", basePathddi2PDF)); File xconf = new File(String.format("%s/fop.xconf", basePathddi2PDF)); diff --git a/src/test/java/fr/insee/eno/main/DummyTestDDI2PDFExamples.java b/src/test/java/fr/insee/eno/main/DummyTestDDI2PDFExamples.java index 5953d449c..b02be34fd 100644 --- a/src/test/java/fr/insee/eno/main/DummyTestDDI2PDFExamples.java +++ b/src/test/java/fr/insee/eno/main/DummyTestDDI2PDFExamples.java @@ -19,28 +19,33 @@ import org.apache.fop.apps.Fop; import org.apache.fop.apps.FopFactory; import org.apache.fop.apps.MimeConstants; +import org.junit.Test; import fr.insee.eno.GenerationService; import fr.insee.eno.generation.DDI2PDFGenerator; +import fr.insee.eno.postprocessing.PDFEditStructurePagesPostprocessor; +import fr.insee.eno.postprocessing.PDFInsertAccompanyingMailsPostprocessor; +import fr.insee.eno.postprocessing.PDFInsertCoverPagePostprocessor; +import fr.insee.eno.postprocessing.PDFInsertEndQuestionPostprocessor; import fr.insee.eno.postprocessing.PDFMailingPostprocessor; import fr.insee.eno.postprocessing.PDFSpecificTreatmentPostprocessor; import fr.insee.eno.postprocessing.PDFTableColumnPostprocessorFake; -import fr.insee.eno.postprocessing.PDFInsertEndQuestionPostprocessor; -import fr.insee.eno.postprocessing.PDFEditStructurePagesPostprocessor; -import fr.insee.eno.postprocessing.PDFInsertCoverPagePostprocessor; -import fr.insee.eno.postprocessing.PDFInsertAccompanyingMailsPostprocessor; import fr.insee.eno.postprocessing.Postprocessor; import fr.insee.eno.preprocessing.DDIPreprocessor; public class DummyTestDDI2PDFExamples { - public static void main(String[] args) { + private DDI2PDFGenerator generator = new DDI2PDFGenerator(); + + private DDIPreprocessor ddiPreprocessor = new DDIPreprocessor(); + + @Test + public void mainTest() { String basePathExamples = "src/test/resources/examples"; String basePathImg = "src/test/resources/examples/img/"; - DDI2PDFGenerator generator = new DDI2PDFGenerator(); - + File in = new File(String.format("%s/esa-ddi-v2.xml", basePathExamples)); File xconf = new File(String.format("%s/fop.xconf", basePathExamples)); // File paramFile = new File(String.format("%s/ddi2pdf.xml", basePathExamples)); @@ -52,7 +57,7 @@ public static void main(String[] args) { InputStream isXconf = new FileInputStream(xconf); URI imgFolderUri = new File(basePathImg).toURI(); - GenerationService genServiceDDI2PDF = new GenerationService(new DDIPreprocessor(), generator, + GenerationService genServiceDDI2PDF = new GenerationService(ddiPreprocessor, generator, new Postprocessor[] { new PDFMailingPostprocessor(), new PDFTableColumnPostprocessorFake(), diff --git a/src/test/java/fr/insee/eno/main/DummyTestDDI2XForms.java b/src/test/java/fr/insee/eno/main/DummyTestDDI2XForms.java index fb39e5891..b964aaa2b 100644 --- a/src/test/java/fr/insee/eno/main/DummyTestDDI2XForms.java +++ b/src/test/java/fr/insee/eno/main/DummyTestDDI2XForms.java @@ -2,6 +2,8 @@ import java.io.File; +import org.junit.Test; + import fr.insee.eno.GenerationService; import fr.insee.eno.generation.DDI2FRGenerator; import fr.insee.eno.postprocessing.NoopPostprocessor; @@ -9,12 +11,18 @@ public class DummyTestDDI2XForms { - public static void main(String[] args) { + private DDIPreprocessor ddiPreprocessor = new DDIPreprocessor(); + + private DDI2FRGenerator ddi2frGenerator = new DDI2FRGenerator(); + + private NoopPostprocessor noopPostprocessor = new NoopPostprocessor(); + + @Test + public void mainTest() { String basePathDDI2XFORMS = "src/test/resources/ddi-to-xform"; - GenerationService genServiceDDI2XFORMS = new GenerationService(new DDIPreprocessor(), new DDI2FRGenerator(), - new NoopPostprocessor()); - File in = new File(String.format("%s/in2.xml", basePathDDI2XFORMS)); + GenerationService genServiceDDI2XFORMS = new GenerationService(ddiPreprocessor, ddi2frGenerator, noopPostprocessor); + File in = new File(String.format("%s/in.xml", basePathDDI2XFORMS)); try { File output = genServiceDDI2XFORMS.generateQuestionnaire(in, "test"); diff --git a/src/test/java/fr/insee/eno/main/DummyTestFO2PDF.java b/src/test/java/fr/insee/eno/main/DummyTestFO2PDF.java index 17ab8ed4c..a3203fb36 100644 --- a/src/test/java/fr/insee/eno/main/DummyTestFO2PDF.java +++ b/src/test/java/fr/insee/eno/main/DummyTestFO2PDF.java @@ -21,7 +21,7 @@ public class DummyTestFO2PDF { - public static void main(String[] args) { + public void main(String[] args) { String basePathFO2PDF = "src/test/resources/fo-to-pdf"; File in = new File(String.format("%s/in.fo", basePathFO2PDF)); diff --git a/src/test/java/fr/insee/eno/main/DummyTestPoguesXML2DDI.java b/src/test/java/fr/insee/eno/main/DummyTestPoguesXML2DDI.java index 68ca5a9e9..b3ba5a72b 100644 --- a/src/test/java/fr/insee/eno/main/DummyTestPoguesXML2DDI.java +++ b/src/test/java/fr/insee/eno/main/DummyTestPoguesXML2DDI.java @@ -2,18 +2,24 @@ import java.io.File; +import org.junit.Test; + import fr.insee.eno.GenerationService; import fr.insee.eno.generation.PoguesXML2DDIGenerator; import fr.insee.eno.postprocessing.DDIPostprocessor; -import fr.insee.eno.preprocessing.PoguesXMLPreprocessor; import fr.insee.eno.preprocessing.PoguesXMLPreprocessorGoToTreatment; public class DummyTestPoguesXML2DDI { + + private PoguesXMLPreprocessorGoToTreatment poguesXMLPreprocessorGoToTreatment = new PoguesXMLPreprocessorGoToTreatment(); - public static void main(String[] args) { + private PoguesXML2DDIGenerator poguesXML2DDIGenerator = new PoguesXML2DDIGenerator(); + + @Test + public void mainTest() { String basePath = "src/test/resources/pogues-xml-to-ddi"; - GenerationService genService = new GenerationService(new PoguesXMLPreprocessorGoToTreatment(), new PoguesXML2DDIGenerator(), + GenerationService genService = new GenerationService(poguesXMLPreprocessorGoToTreatment, poguesXML2DDIGenerator, new DDIPostprocessor()); File in = new File(String.format("%s/in.xml", basePath)); try { From dfca5c16e322348d667c3dc55ae32423d2b2e813 Mon Sep 17 00:00:00 2001 From: Laurent Caouissin Date: Wed, 2 Oct 2019 17:18:27 +0200 Subject: [PATCH 206/439] Create TestValorizatorParametersImpl.java --- .../params/TestValorizatorParametersImpl.java | 221 ++++++++++++++++++ 1 file changed, 221 insertions(+) create mode 100644 src/test/java/fr/insee/eno/params/TestValorizatorParametersImpl.java diff --git a/src/test/java/fr/insee/eno/params/TestValorizatorParametersImpl.java b/src/test/java/fr/insee/eno/params/TestValorizatorParametersImpl.java new file mode 100644 index 000000000..94e6ef535 --- /dev/null +++ b/src/test/java/fr/insee/eno/params/TestValorizatorParametersImpl.java @@ -0,0 +1,221 @@ +package fr.insee.eno.params; + +import java.io.File; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.Arrays; + +import javax.xml.bind.JAXBContext; +import javax.xml.bind.JAXBException; +import javax.xml.bind.Marshaller; + +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.xmlunit.diff.Diff; + +import fr.insee.eno.Constants; +import fr.insee.eno.parameters.AccompanyingMail; +import fr.insee.eno.parameters.BrowsingEnum; +import fr.insee.eno.parameters.ENOParameters; +import fr.insee.eno.parameters.Format; +import fr.insee.eno.parameters.FrParameters; +import fr.insee.eno.parameters.GlobalNumerotation; +import fr.insee.eno.parameters.InFormat; +import fr.insee.eno.parameters.Language; +import fr.insee.eno.parameters.LevelEnum; +import fr.insee.eno.parameters.LevelQuestion; +import fr.insee.eno.parameters.NumerotationQuestion; +import fr.insee.eno.parameters.OutFormat; +import fr.insee.eno.parameters.Parameters; +import fr.insee.eno.parameters.Parameters.Languages; +import fr.insee.eno.parameters.PdfParameters; +import fr.insee.eno.parameters.PdfParameters.AccompanyingMails; +import fr.insee.eno.parameters.Pipeline; +import fr.insee.eno.parameters.PostProcessing; +import fr.insee.eno.parameters.StudyUnit; +import fr.insee.eno.parameters.Table; +import fr.insee.eno.parameters.Table.Row; +import fr.insee.eno.test.XMLDiff; + +public class TestValorizatorParametersImpl { + + private ValorizatorParametersImpl valorizatorParametersImpl; + private ENOParameters enoParameters; + + private XMLDiff xmlDiff = new XMLDiff(); + + @Before + public void setValorizator() { + valorizatorParametersImpl = new ValorizatorParametersImpl(); + } + + @Before + public void setEnoParameters() throws JAXBException, IOException { + enoParameters = new ENOParameters(); + + Pipeline pipeline = new Pipeline(); + pipeline.setInFormat(InFormat.DDI); + pipeline.setOutFormat(OutFormat.ODT); + pipeline.getPostProcessing().add(PostProcessing.DDI_MARKDOWN_TO_XHTML); + + enoParameters.setPipeline(pipeline); + Parameters parameters = new Parameters(); + parameters.setStudyUnit(StudyUnit.HOUSEHOLD); + + Languages languages = new Languages(); + languages.getLanguage().add(Language.DE); + languages.getLanguage().add(Language.FR); + languages.getLanguage().add(Language.EN); + parameters.setLanguages(languages); + + + PdfParameters pdfParameters = new PdfParameters(); + Table table = new Table(); + Row row = new Row(); + row.setDefaultSize(150); + table.setRow(row); + Format format = new Format(); + format.setOrientation(90); + pdfParameters.setTable(table); + pdfParameters.setFormat(format); + + AccompanyingMails accompanyingMails = new AccompanyingMails(); + + + accompanyingMails.getAccompanyingMail().add(AccompanyingMail.CNR_COL); + accompanyingMails.getAccompanyingMail().add(AccompanyingMail.MED_COL); + + pdfParameters.setAccompanyingMails(accompanyingMails); + + GlobalNumerotation globalNumerotation = new GlobalNumerotation(); + globalNumerotation.setBrowsing(BrowsingEnum.NO_NUMBER); + + NumerotationQuestion question = new NumerotationQuestion(); + LevelQuestion levelQuestion2 = new LevelQuestion(); + levelQuestion2.setPostNumQuest("%***%"); + levelQuestion2.setName(LevelEnum.SUBMODULE); + levelQuestion2.setPostNumParentQuest("yolyo"); + LevelQuestion levelQuestion = new LevelQuestion(); + levelQuestion.setPostNumQuest("%***%"); + levelQuestion.setName(LevelEnum.MODULE); + levelQuestion.setPostNumParentQuest("yolyo"); + question.getLevel().add(levelQuestion); + //question.getLevel().add(levelQuestion2); + + globalNumerotation.setQuestion(question); + parameters.setTitle(globalNumerotation); + parameters.setPdfParameters(pdfParameters); + + FrParameters frParameters = new FrParameters(); + frParameters.setLengthOfLongTable(56); + frParameters.setNumericExample(true); + + parameters.setFrParameters(frParameters); + + enoParameters.setParameters(parameters); + } + + @Test + public void testValorizationJavaParameters() { + try { + + ENOParameters defaultParams = valorizatorParametersImpl.getDefaultParameters(); + long debut = System.currentTimeMillis(); + ENOParameters enoParametersFinal = valorizatorParametersImpl.mergeEnoParameters( + defaultParams, + enoParameters); + System.out.println("Merging time : "+(System.currentTimeMillis()-debut)+" ms"); + ENOParameters enoParametersDefault = valorizatorParametersImpl.getDefaultParameters(); + + // Pipeline + Assert.assertEquals(InFormat.DDI, enoParametersFinal.getPipeline().getInFormat()); + Assert.assertEquals(OutFormat.ODT, enoParametersFinal.getPipeline().getOutFormat()); + //Default value + Assert.assertEquals(enoParametersDefault.getPipeline().getPreProcessing(), enoParametersFinal.getPipeline().getPreProcessing()); + // New value + Assert.assertEquals(Arrays.asList(PostProcessing.DDI_MARKDOWN_TO_XHTML), enoParametersFinal.getPipeline().getPostProcessing()); + + // Browsing + Assert.assertEquals(BrowsingEnum.NO_NUMBER, enoParametersFinal.getParameters().getTitle().getBrowsing()); + + //StudyUnit + Assert.assertEquals(StudyUnit.HOUSEHOLD, enoParametersFinal.getParameters().getStudyUnit()); + + + debut = System.currentTimeMillis(); + Path outPath = Paths.get(Constants.TEMP_FOLDER_PATH + "/parameters-new.xml"); + Files.deleteIfExists(outPath); + + JAXBContext context = JAXBContext.newInstance(ENOParameters.class); + Marshaller jaxbMarshaller = context.createMarshaller(); + jaxbMarshaller.setProperty(Marshaller.JAXB_ENCODING, "UTF-8"); + jaxbMarshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true); + + jaxbMarshaller.marshal(enoParametersFinal, outPath.toFile()); + System.out.println("Writing time : "+(System.currentTimeMillis()-debut)+" ms"); + System.out.println("Write output to "+outPath); + + } catch (NullPointerException e) { + e.printStackTrace(); + Assert.fail(); + } catch (Exception e) { + e.printStackTrace(); + System.out.println(e.getMessage()); + Assert.fail(); + } + } + + @Test + public void testValorizationXmlParameters() { + try { + String basePath = "src/test/resources/params/valorization"; + File in = new File(String.format("%s/parameters-input.xml", basePath)); + File outputFile = valorizatorParametersImpl.mergeParameters(in); + File expectedFile = new File(String.format("%s/parameters-expected.xml", basePath)); + Diff diff = xmlDiff.getDiff(outputFile,expectedFile); + + Assert.assertFalse(getDiffMessage(diff, basePath), diff.hasDifferences()); + + } catch (NullPointerException e) { + e.printStackTrace(); + Assert.fail(); + } catch (Exception e) { + e.printStackTrace(); + System.out.println(e.getMessage()); + Assert.fail(); + } + + } + + + + public void testReadingDefaultParameters() { + try { + ENOParameters enoParameters = valorizatorParametersImpl.getDefaultParameters(); + + Assert.assertEquals(enoParameters.getPipeline().getInFormat(), InFormat.DDI); + Assert.assertEquals(enoParameters.getPipeline().getOutFormat(), OutFormat.FR); + Assert.assertEquals(enoParameters.getPipeline().getOutFormat(), OutFormat.FR); + Assert.assertEquals(enoParameters.getParameters().getStudyUnit(), StudyUnit.DEFAULT); + + } catch (IOException e) { + e.printStackTrace(); + Assert.fail(); + } catch (NullPointerException e) { + e.printStackTrace(); + Assert.fail(); + } catch (Exception e) { + e.printStackTrace(); + System.out.println(e.getMessage()); + Assert.fail(); + } + } + + private String getDiffMessage(Diff diff, String path) { + return String.format("Transformed output for %s should match expected XML document:\n %s", path, + diff.toString()); + } +} From 3e65351d887c6f9f50ce838f16b2bfac1348104e Mon Sep 17 00:00:00 2001 From: Laurent Caouissin Date: Wed, 2 Oct 2019 17:19:01 +0200 Subject: [PATCH 207/439] Eno params : update simple tests --- .../java/fr/insee/eno/test/TestDDIToFO.java | 14 ++++++++----- .../java/fr/insee/eno/test/TestDDIToJS.java | 8 +++++-- .../java/fr/insee/eno/test/TestDDIToODT.java | 8 +++++-- .../fr/insee/eno/test/TestDDIToXForm.java | 11 +++++++--- .../fr/insee/eno/test/TestPoguesXMLToDDI.java | 13 ++++++++---- src/test/resources/ddi-to-fo/out.fo | 21 ++++++++++++------- src/test/resources/ddi-to-js/out.xml | 3 ++- 7 files changed, 54 insertions(+), 24 deletions(-) diff --git a/src/test/java/fr/insee/eno/test/TestDDIToFO.java b/src/test/java/fr/insee/eno/test/TestDDIToFO.java index 5e79799ae..6a7e7fa86 100644 --- a/src/test/java/fr/insee/eno/test/TestDDIToFO.java +++ b/src/test/java/fr/insee/eno/test/TestDDIToFO.java @@ -9,17 +9,21 @@ import fr.insee.eno.GenerationService; import fr.insee.eno.generation.DDI2PDFGenerator; +import fr.insee.eno.postprocessing.PDFEditStructurePagesPostprocessor; +import fr.insee.eno.postprocessing.PDFInsertAccompanyingMailsPostprocessor; +import fr.insee.eno.postprocessing.PDFInsertCoverPagePostprocessor; +import fr.insee.eno.postprocessing.PDFInsertEndQuestionPostprocessor; import fr.insee.eno.postprocessing.PDFMailingPostprocessor; import fr.insee.eno.postprocessing.PDFSpecificTreatmentPostprocessor; import fr.insee.eno.postprocessing.PDFTableColumnPostprocessorFake; -import fr.insee.eno.postprocessing.PDFInsertEndQuestionPostprocessor; -import fr.insee.eno.postprocessing.PDFEditStructurePagesPostprocessor; -import fr.insee.eno.postprocessing.PDFInsertCoverPagePostprocessor; -import fr.insee.eno.postprocessing.PDFInsertAccompanyingMailsPostprocessor; import fr.insee.eno.postprocessing.Postprocessor; import fr.insee.eno.preprocessing.DDIPreprocessor; public class TestDDIToFO { + + private DDIPreprocessor ddiPreprocessor = new DDIPreprocessor(); + + private DDI2PDFGenerator ddi2pdf = new DDI2PDFGenerator(); private XMLDiff xmlDiff = new XMLDiff(); @@ -31,7 +35,7 @@ public void simpleDiffTest() { Diff diff = null; // Without plugins - GenerationService genService = new GenerationService(new DDIPreprocessor(), new DDI2PDFGenerator(), + GenerationService genService = new GenerationService(ddiPreprocessor, ddi2pdf, new Postprocessor[] { new PDFMailingPostprocessor(), new PDFTableColumnPostprocessorFake(), diff --git a/src/test/java/fr/insee/eno/test/TestDDIToJS.java b/src/test/java/fr/insee/eno/test/TestDDIToJS.java index bb9e82087..85ac1ebb8 100644 --- a/src/test/java/fr/insee/eno/test/TestDDIToJS.java +++ b/src/test/java/fr/insee/eno/test/TestDDIToJS.java @@ -5,6 +5,7 @@ import org.junit.Assert; import org.junit.Test; +import org.springframework.beans.factory.annotation.Autowired; import org.xmlunit.diff.Diff; import fr.insee.eno.GenerationService; @@ -16,8 +17,11 @@ public class TestDDIToJS { + private DDIPreprocessor ddiPreprocessor = new DDIPreprocessor(); + + private DDI2JSGenerator ddi2js = new DDI2JSGenerator(); + private XMLDiff xmlDiff = new XMLDiff(); - @Test public void simpleDiffTest() { @@ -26,7 +30,7 @@ public void simpleDiffTest() { Postprocessor[] postprocessors = { new JSSortComponentsPostprocessor(), new JSExternalizeVariablesPostprocessor()}; - GenerationService genService = new GenerationService(new DDIPreprocessor(), new DDI2JSGenerator(),postprocessors); + GenerationService genService = new GenerationService(ddiPreprocessor, ddi2js,postprocessors); File in = new File(String.format("%s/in.xml", basePath)); File outputFile = genService.generateQuestionnaire(in, "ddi-2-js-test"); File expectedFile = new File(String.format("%s/out.xml", basePath)); diff --git a/src/test/java/fr/insee/eno/test/TestDDIToODT.java b/src/test/java/fr/insee/eno/test/TestDDIToODT.java index 6dac5d599..3a5c4b626 100644 --- a/src/test/java/fr/insee/eno/test/TestDDIToODT.java +++ b/src/test/java/fr/insee/eno/test/TestDDIToODT.java @@ -13,7 +13,11 @@ import fr.insee.eno.preprocessing.DDIPreprocessor; public class TestDDIToODT { - + + private DDIPreprocessor ddiPreprocessor = new DDIPreprocessor(); + + private DDI2ODTGenerator ddi2odt = new DDI2ODTGenerator(); + private XMLDiff xmlDiff = new XMLDiff(); @@ -21,7 +25,7 @@ public class TestDDIToODT { public void simpleDiffTest() { try { String basePath = "src/test/resources/ddi-to-odt"; - GenerationService genService = new GenerationService(new DDIPreprocessor(), new DDI2ODTGenerator(), + GenerationService genService = new GenerationService(ddiPreprocessor, ddi2odt, new NoopPostprocessor()); File in = new File(String.format("%s/in.xml", basePath)); File outputFile = genService.generateQuestionnaire(in, "ddi-2-odt-test"); diff --git a/src/test/java/fr/insee/eno/test/TestDDIToXForm.java b/src/test/java/fr/insee/eno/test/TestDDIToXForm.java index 4d5c24119..2e5bc34af 100644 --- a/src/test/java/fr/insee/eno/test/TestDDIToXForm.java +++ b/src/test/java/fr/insee/eno/test/TestDDIToXForm.java @@ -9,19 +9,24 @@ import fr.insee.eno.GenerationService; import fr.insee.eno.generation.DDI2FRGenerator; -import fr.insee.eno.postprocessing.NoopPostprocessor; +import fr.insee.eno.postprocessing.fr.FRBrowsingPostprocessor; import fr.insee.eno.preprocessing.DDIPreprocessor; public class TestDDIToXForm { + private DDIPreprocessor ddiPreprocessor = new DDIPreprocessor(); + + private DDI2FRGenerator ddi2fr = new DDI2FRGenerator(); + + private FRBrowsingPostprocessor frBrowsing = new FRBrowsingPostprocessor(); + private XMLDiff xmlDiff = new XMLDiff(); @Test public void simpleDiffTest() { try { String basePath = "src/test/resources/ddi-to-xform"; - GenerationService genService = new GenerationService(new DDIPreprocessor(), new DDI2FRGenerator(), - new NoopPostprocessor()); + GenerationService genService = new GenerationService(ddiPreprocessor,ddi2fr,frBrowsing); File in = new File(String.format("%s/in.xml", basePath)); File outputFile = genService.generateQuestionnaire(in, "ddi-2-fr-test"); File expectedFile = new File(String.format("%s/out.xhtml", basePath)); diff --git a/src/test/java/fr/insee/eno/test/TestPoguesXMLToDDI.java b/src/test/java/fr/insee/eno/test/TestPoguesXMLToDDI.java index 19c768482..e704edcf0 100644 --- a/src/test/java/fr/insee/eno/test/TestPoguesXMLToDDI.java +++ b/src/test/java/fr/insee/eno/test/TestPoguesXMLToDDI.java @@ -9,19 +9,24 @@ import fr.insee.eno.GenerationService; import fr.insee.eno.generation.PoguesXML2DDIGenerator; -import fr.insee.eno.postprocessing.DDIPostprocessor; -import fr.insee.eno.preprocessing.PoguesXMLPreprocessor; +import fr.insee.eno.postprocessing.ddi.DDIMarkdown2XhtmlPostprocessor; +import fr.insee.eno.preprocessing.PoguesXMLPreprocessorGoToTreatment; public class TestPoguesXMLToDDI { + private PoguesXMLPreprocessorGoToTreatment poguesXMLPreprocessorGoToTreatment = new PoguesXMLPreprocessorGoToTreatment(); + + private PoguesXML2DDIGenerator poguesXML2DDI = new PoguesXML2DDIGenerator(); + + private DDIMarkdown2XhtmlPostprocessor ddiMarkdown2XhtmlPostprocessor = new DDIMarkdown2XhtmlPostprocessor(); + private XMLDiff xmlDiff = new XMLDiff(); @Test public void simpleDiffTest() { try { String basePath = "src/test/resources/pogues-xml-to-ddi"; - GenerationService genService = new GenerationService(new PoguesXMLPreprocessor(), - new PoguesXML2DDIGenerator(), new DDIPostprocessor()); + GenerationService genService = new GenerationService(poguesXMLPreprocessorGoToTreatment, poguesXML2DDI, ddiMarkdown2XhtmlPostprocessor); File in = new File(String.format("%s/in.xml", basePath)); File outputFile = genService.generateQuestionnaire(in, "xml-pogues-2-ddi-test"); File expectedFile = new File(String.format("%s/out.xml", basePath)); diff --git a/src/test/resources/ddi-to-fo/out.fo b/src/test/resources/ddi-to-fo/out.fo index fecc335d2..3480fadfb 100644 --- a/src/test/resources/ddi-to-fo/out.fo +++ b/src/test/resources/ddi-to-fo/out.fo @@ -44,7 +44,8 @@ La position peut être définie par rapport au hautou bas de la zone concernée et gauche ou droite. Dans les zones before/after/start/end, les mesures se font par rapport au 0,0 de la zone concernée. - --> + I - Introduction + keep-with-next="always" + page-break-before="always">I - Introduction II - Simpsons' city + keep-with-next="always" + page-break-before="always">II - Simpsons' city III - Characters + keep-with-next="always" + page-break-before="always">III - Characters IV - General questions + keep-with-next="always" + page-break-before="always">IV - General questions V - Favourite characters + keep-with-next="always" + page-break-before="always">V - Favourite characters VI - Comment + keep-with-next="always" + page-break-before="always">VI - Comment + id="i6vwid" + modele="Instrument-i6vwid"> From aac1d214b45f571f828385ed10bfccc835e77b17 Mon Sep 17 00:00:00 2001 From: Laurent Caouissin Date: Thu, 3 Oct 2019 10:10:46 +0200 Subject: [PATCH 208/439] Pogues : update out expected --- .../params/in-to-out/household/form.xhtml | 8377 +++++++++++++++++ src/test/resources/pogues-xml-to-ddi/out.xml | 28 +- 2 files changed, 8391 insertions(+), 14 deletions(-) create mode 100644 src/test/resources/params/in-to-out/household/form.xhtml diff --git a/src/test/resources/params/in-to-out/household/form.xhtml b/src/test/resources/params/in-to-out/household/form.xhtml new file mode 100644 index 000000000..5fb390522 --- /dev/null +++ b/src/test/resources/params/in-to-out/household/form.xhtml @@ -0,0 +1,8377 @@ + + + + Enquête auprès des salariés de l’État en 2018 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + + non + non + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Sequence-ji4df4oc5 + Sequence-ji4df4oc5 + Enquête auprès des salariés de l’État en 2018 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + + + + 2 + + + + Merci de bien vouloir répondre à la question 1 + + + + Date au format Mois Année + Merci de renseigner le mois et l'année + + + 2019 + + + + 2018 + + + + 2017 + + + + 2016 + + + + 2015 + + + + 2014 + + + + 2013 + + + + 2012 + + + + 2011 + + + + 2010 + + + + 2009 + + + + 2008 + + + + 2007 + + + + 2006 + + + + 2005 + + + + 2004 + + + + 2003 + + + + 2002 + + + + 2001 + + + + 2000 + + + + 1999 + + + + 1998 + + + + 1997 + + + + 1996 + + + + 1995 + + + + 1994 + + + + 1993 + + + + 1992 + + + + 1991 + + + + 1990 + + + + 1989 + + + + 1988 + + + + 1987 + + + + 1986 + + + + 1985 + + + + 1984 + + + + 1983 + + + + 1982 + + + + 1981 + + + + 1980 + + + + 1979 + + + + 1978 + + + + 1977 + + + + 1976 + + + + 1975 + + + + 1974 + + + + 1973 + + + + 1972 + + + + 1971 + + + + 1970 + + + + 1969 + + + + 1968 + + + + 1967 + + + + 1966 + + + + 1965 + + + + 1964 + + + + 1963 + + + + 1962 + + + + 1961 + + + + 1960 + + + + 1959 + + + + 1958 + + + + 1957 + + + + 1956 + + + + 1955 + + + + 1954 + + + + 1953 + + + + 1952 + + + + 1951 + + + + 1950 + + + + + Date au format Mois Année + Merci de renseigner le mois et l'année + + + 1 + + + + 2 + + + + 3 + + + + 4 + + + + 5 + + + + 6 + + + + 7 + + + + 8 + + + + 9 + + + + 10 + + + + 11 + + + + 12 + + + + Merci de bien vouloir répondre à la question 2 + + + + + + 1 + + + + 2 + + + + 3 + + + + 4 + + + + 5 + + + + + + + + + + 2019 + + + + 2018 + + + + 2017 + + + + 2016 + + + + 2015 + + + + 2014 + + + + 2013 + + + + 2012 + + + + 2011 + + + + 2010 + + + + 2009 + + + + 2008 + + + + 2007 + + + + 2006 + + + + 2005 + + + + 2004 + + + + 2003 + + + + 2002 + + + + 2001 + + + + 2000 + + + + 1999 + + + + 1998 + + + + 1997 + + + + 1996 + + + + 1995 + + + + 1994 + + + + 1993 + + + + 1992 + + + + 1991 + + + + 1990 + + + + 1989 + + + + 1988 + + + + 1987 + + + + 1986 + + + + 1985 + + + + 1984 + + + + 1983 + + + + 1982 + + + + 1981 + + + + 1980 + + + + 1979 + + + + 1978 + + + + 1977 + + + + 1976 + + + + 1975 + + + + 1974 + + + + 1973 + + + + 1972 + + + + 1971 + + + + 1970 + + + + 1969 + + + + 1968 + + + + 1967 + + + + 1966 + + + + 1965 + + + + 1964 + + + + 1963 + + + + 1962 + + + + 1961 + + + + 1960 + + + + 1959 + + + + 1958 + + + + 1957 + + + + 1956 + + + + 1955 + + + + 1954 + + + + 1953 + + + + 1952 + + + + 1951 + + + + 1950 + + + + + + + DIP_AUC + + + + DIP_BRE + + + + DIP_CAP + + + + DIP_BAC + + + + DIP_BTS + + + + DIP_LIC + + + + DIP_MAST + + + + DIP_DOCT + + + + Merci de bien vouloir répondre à la question 5 + + + + + + + + + + + + + + + 2019 + + + + 2018 + + + + 2017 + + + + 2016 + + + + 2015 + + + + 2014 + + + + 2013 + + + + 2012 + + + + 2011 + + + + 2010 + + + + 2009 + + + + 2008 + + + + 2007 + + + + 2006 + + + + 2005 + + + + 2004 + + + + 2003 + + + + 2002 + + + + 2001 + + + + 2000 + + + + 1999 + + + + 1998 + + + + 1997 + + + + 1996 + + + + 1995 + + + + 1994 + + + + 1993 + + + + 1992 + + + + 1991 + + + + 1990 + + + + 1989 + + + + 1988 + + + + 1987 + + + + 1986 + + + + 1985 + + + + 1984 + + + + 1983 + + + + 1982 + + + + 1981 + + + + 1980 + + + + 1979 + + + + 1978 + + + + 1977 + + + + 1976 + + + + 1975 + + + + 1974 + + + + 1973 + + + + 1972 + + + + 1971 + + + + 1970 + + + + 1969 + + + + 1968 + + + + + + + 1 + + + + 2 + + + + + + Vous devez saisir un nombre entier compris entre 1 et 30 + + + + Vous devez saisir un nombre entier compris entre 0 et 60 + + + Vous devez saisir un nombre entier compris entre 0 et 11 + + + + + + + + + 1 + + + + 2 + + + + + + Vous devez saisir un nombre entier compris entre 1 et 50 + + + + Vous devez saisir un nombre entier compris entre 6 et 500 + + + + + + + + + + + + 2019 + + + + 2018 + + + + 2017 + + + + 2016 + + + + 2015 + + + + 2014 + + + + 2013 + + + + 2012 + + + + 2011 + + + + 2010 + + + + 2009 + + + + 2008 + + + + 2007 + + + + 2006 + + + + 2005 + + + + 2004 + + + + 2003 + + + + 2002 + + + + 2001 + + + + 2000 + + + + 1999 + + + + 1998 + + + + 1997 + + + + 1996 + + + + 1995 + + + + 1994 + + + + 1993 + + + + 1992 + + + + 1991 + + + + 1990 + + + + 1989 + + + + 1988 + + + + 1987 + + + + 1986 + + + + 1985 + + + + 1984 + + + + 1983 + + + + 1982 + + + + 1981 + + + + 1980 + + + + 1979 + + + + 1978 + + + + 1977 + + + + 1976 + + + + 1975 + + + + 1974 + + + + 1973 + + + + 1972 + + + + 1971 + + + + 1970 + + + + 1969 + + + + 1968 + + + + Votre année d'entrée dans la fonction publique ne peut pas être antérieure à ¤ji4lkkue-QOP-ji4m4qn9¤ (votre réponse sur l'année où vous avez commencé à exercer un emploi rémunéré). Merci de corriger l'une ou l'autre de ces deux dates (question 6 ou 13). + + + Merci de bien vouloir répondre à la question 13 + + + + + + 1 + + + + 2 + + + + 3 + + + + + + + 1 + + + + 2 + + + + 3 + + + + 4 + + + + + + + 1 + + + + 2 + + + + 3 + + + + Merci de bien vouloir répondre à la question 16 + + + + + + + 1 + + + + 2 + + + + Merci de bien vouloir répondre à la question 17 + + + + + + + + + 3 + + + + 2 + + + + 1 + + + + + + + + + + + 2019 + + + + 2018 + + + + 2017 + + + + 2016 + + + + 2015 + + + + 2014 + + + + 2013 + + + + 2012 + + + + 2011 + + + + 2010 + + + + 2009 + + + + 2008 + + + + 2007 + + + + 2006 + + + + 2005 + + + + 2004 + + + + 2003 + + + + 2002 + + + + 2001 + + + + 2000 + + + + 1999 + + + + 1998 + + + + 1997 + + + + 1996 + + + + 1995 + + + + 1994 + + + + 1993 + + + + 1992 + + + + 1991 + + + + 1990 + + + + 1989 + + + + 1988 + + + + 1987 + + + + 1986 + + + + 1985 + + + + 1984 + + + + 1983 + + + + 1982 + + + + 1981 + + + + 1980 + + + + 1979 + + + + 1978 + + + + 1977 + + + + 1976 + + + + 1975 + + + + 1974 + + + + 1973 + + + + 1972 + + + + 1971 + + + + 1970 + + + + 1969 + + + + 1968 + + + + L'année indiquée est antérieure à l'année où vous avez commencé à travailler dans la fonction publique ¤ji4ml7ax-QOP-ji4mrm8r¤. Merci de corriger l'une ou l'autre de ces deux dates (Questions 13 ou 19). + + + Merci de bien vouloir répondre à la question 19 + + + + + + 1 + + + + 2 + + + + 3 + + + + 4 + + + + + + + 1 + + + + 2 + + + + + + + + 01 + + + + 02 + + + + 03 + + + + 04 + + + + 05 + + + + 06 + + + + 07 + + + + 08 + + + + 09 + + + + 10 + + + + 11 + + + + 12 + + + + 13 + + + + 14 + + + + 15 + + + + 16 + + + + 17 + + + + 18 + + + + 19 + + + + 21 + + + + 22 + + + + 23 + + + + 24 + + + + 25 + + + + 26 + + + + 27 + + + + 28 + + + + 29 + + + + 2A + + + + 2B + + + + 30 + + + + 31 + + + + 32 + + + + 33 + + + + 34 + + + + 35 + + + + 36 + + + + 37 + + + + 38 + + + + 39 + + + + 40 + + + + 41 + + + + 42 + + + + 43 + + + + 44 + + + + 45 + + + + 46 + + + + 47 + + + + 48 + + + + 49 + + + + 50 + + + + 51 + + + + 52 + + + + 53 + + + + 54 + + + + 55 + + + + 56 + + + + 57 + + + + 58 + + + + 59 + + + + 60 + + + + 61 + + + + 62 + + + + 63 + + + + 64 + + + + 65 + + + + 66 + + + + 67 + + + + 68 + + + + 69 + + + + 70 + + + + 71 + + + + 72 + + + + 73 + + + + 74 + + + + 75 + + + + 76 + + + + 77 + + + + 78 + + + + 79 + + + + 80 + + + + 81 + + + + 82 + + + + 83 + + + + 84 + + + + 85 + + + + 86 + + + + 87 + + + + 88 + + + + 89 + + + + 90 + + + + 91 + + + + 92 + + + + 93 + + + + 94 + + + + 95 + + + + 971 + + + + 972 + + + + 973 + + + + 974 + + + + 976 + + + + + + + + + + + + + + + + 1 + + + + 2 + + + + 3 + + + + Merci de bien vouloir répondre à la question 23 + + + + + + 1 + + + + 2 + + + + + + + 1 + + + + 2 + + + + + + + 1 + + + + 2 + + + + + + + + Vous devez saisir un nombre entier compris entre 0 et 40 + + + + + Vous devez saisir un nombre entier compris entre 0 et 40 + + + Vous indiquez un nombre de changements souhaités supérieur au nombre de changements de département. Merci de bien vouloir corriger. + + + + Vous devez saisir un nombre entier compris entre 0 et 40 + + + Vous indiquez un nombre de changements liés au suivi de votre conjoint supérieur au nombre de changements de département. Merci de bien vouloir corriger. + + + + + + 1 + + + + 2 + + + + + + + + + + 1 + + + + + + 1 + + + + + + 1 + + + + + + 1 + + + + + + 1 + + + + + + + + + + + + + + 1 + + + + 2 + + + + + + + + + + 1 + + + + + + 1 + + + + + Vous devez saisir un nombre entier compris entre 0 et 45 + + + Vous devez saisir un nombre entier compris entre 0 et 11 + + + + + + 1 + + + + 2 + + + + 3 + + + + 4 + + + + 5 + + + + + + + + + + + + + + + + + + 1 + + + + 2 + + + + + + 1 + + + + 2 + + + + + + 1 + + + + 2 + + + + + + Vous devez saisir un nombre entier compris entre 0 et 45 + + + Vous devez saisir un nombre entier compris entre 0 et 11 + + + + + Vous devez saisir un nombre entier compris entre 0 et 45 + + + Vous devez saisir un nombre entier compris entre 0 et 11 + + + + + Vous devez saisir un nombre entier compris entre 0 et 45 + + + Vous devez saisir un nombre entier compris entre 0 et 11 + + + + + + + + + 1 + + + + 2 + + + + 3 + + + + Vous n'avez pas répondu à la question sur votre statut ou non d'enseignant. Elle conditionne la suite des questions posées, merci de bien vouloir y répondre. + + + + + + + + + + + + + 1 + + + + 2 + + + + Merci de bien vouloir répondre à la question 40. + + + + + + 1 + + + + 2 + + + + + + + + Vous devez saisir un nombre entier compris entre 0 et 50 + + + Vous devez saisir un nombre entier compris entre 0 et 59 + + + Merci de bien vouloir répondre à la question 43 + + + + Vous devez saisir un nombre entier compris entre 0 et 80 + + + Vous devez saisir un nombre entier compris entre 0 et 59 + + + Merci de bien vouloir répondre à la question 44 + + + + Vous devez saisir un nombre entier compris entre 0 et 80 + + + Vous devez saisir un nombre entier compris entre 0 et 59 + + + + + + + Vous devez utiliser le point comme séparateur de décimale, sans espace, et saisir un nombre compris entre 0.0 et 7.0 (avec au plus 1 chiffre derrière le séparateur ".") + + + Merci de répondre à la demi-journée près (par exemple 3 ou 3.5) + + + + Vous devez utiliser le point comme séparateur de décimale, sans espace, et saisir un nombre compris entre 0.0 et 60.0 (avec au plus 1 chiffre derrière le séparateur ".") + + + Merci de répondre à la demi-journée près (par exemple 5 ou 5.5) + + + + + + + + Vous devez saisir un nombre entier compris entre 0 et 80 + + + Vous devez saisir un nombre entier compris entre 0 et 59 + + + Merci de bien vouloir répondre à la question 40. + + + Merci de bien vouloir répondre à la question 48. + + + + Vous devez utiliser le point comme séparateur de décimale, sans espace, et saisir un nombre compris entre 0.5 et 7.0 (avec au plus 1 chiffre derrière le séparateur ".") + + + Merci de répondre à la demi-journée près (par exemple 3 ou 3.5) + + + Merci de bien vouloir répondre à la question 49 + + + + + + + Vous devez utiliser le point comme séparateur de décimale, sans espace, et saisir un nombre compris entre 0.0 et 200.0 (avec au plus 1 chiffre derrière le séparateur ".") + + + Merci de répondre à la demi-journée près (par exemple 25 ou 25.5) + + + Merci de bien vouloir répondre à la question 50, même approximativement. Si vous êtes enseignants-chercheurs ne tenez pas compte de ce message. + + + + Vous devez utiliser le point comme séparateur de décimale, sans espace, et saisir un nombre compris entre 0.0 et 80.0 (avec au plus 1 chiffre derrière le séparateur ".") + + + Le nombre de jours de RTT indiqué ne peut pas être supérieur à ¤jjfrm2qf-QOP-jjfrqs55¤ (votre réponse sur le nombre de jours de congés auquel vous avez droit au total). Merci de corriger l'une ou l'autre de vos réponses (question 50 ou 51). + + + Merci de répondre à la demi-journée près (par exemple 9 ou 9.5) + + + + Vous devez utiliser le point comme séparateur de décimale, sans espace, et saisir un nombre compris entre 0.0 et 200.0 (avec au plus 1 chiffre derrière le séparateur ".") + + + Vous indiquez avoir pris plus de jours de congés que ceux auxquels vous avez droit au total (¤jjfrm2qf-QOP-jjfrqs55¤ jours). Merci de corriger l'une ou l'autre de vos réponses (question 50 ou 52). + + + Merci de répondre à la demi-journée près (par exemple 22 ou 22.5) + + + Merci de bien vouloir répondre à la question 52, même approximativement + + + + Vous devez utiliser le point comme séparateur de décimale, sans espace, et saisir un nombre compris entre 0.0 et 99.0 (avec au plus 1 chiffre derrière le séparateur ".") + + + Vous indiquez avoir déposé plus de jours sur le CET que ceux auxquels vous avez droit au total (¤jjfrm2qf-QOP-jjfrqs55¤ jours). Merci de corriger l'une ou l'autre de vos réponses (question 50 ou 53). + + + Merci de répondre à la demi-journée près (par exemple 3 ou 3.5) + + + Vous indiquez avoir pris ¤jjfrzvhu-QOP-jjfs8u5a¤ jours de congé et avoir déposé ¤jjfs3b3c-QOP-jjfsgm0w¤ jours sur le CET en 2018. Merci de bien vouloir corriger la réponse à la question 52 ou 53 afin que le total ne dépasse pas le total de vos congés (¤jjfrm2qf-QOP-jjfrqs55¤ jours). + + + + Vous devez utiliser le point comme séparateur de décimale, sans espace, et saisir un nombre compris entre 0.0 et 300.0 (avec au plus 1 chiffre derrière le séparateur ".") + + + Merci de répondre à la demi-journée près (par exemple 3 ou 3.5) + + + + Vous devez utiliser le point comme séparateur de décimale, sans espace, et saisir un nombre compris entre 0.0 et 999.0 (avec au plus 1 chiffre derrière le séparateur ".") + + + Merci de répondre à la demi-journée près (par exemple 10 ou 10.5) + + + + Vous devez utiliser le point comme séparateur de décimale, sans espace, et saisir un nombre compris entre 0.0 et 99.0 (avec au plus 1 chiffre derrière le séparateur ".") + + + Merci de répondre à la demi-journée près (par exemple 4 ou 4.5) + + + + + + + Vous devez utiliser le point comme séparateur de décimale, sans espace, et saisir un nombre compris entre 0.0 et 365.0 (avec au plus 1 chiffre derrière le séparateur ".") + + + Merci de répondre à la demi-journée près (par exemple 3 ou 3.5) + + + Merci de bien vouloir répondre à la question 57, même approximativement + + + Vous indiquez avoir pris ¤jjfrzvhu-QOP-jjfs8u5a¤ jours de congés et eu ¤jjfsdz8f-QOP-jozfxq9v¤ jours d'absences. Merci de bien vouloir corriger la réponse à la question 52 ou 57 afin que le total ne dépasse pas 365 jours. + + + + + + + + + 1 + + + + 2 + + + + + + + + 1 + + + + 2 + + + + + + Vous devez saisir un nombre entier compris entre 0 et 45 + + + Vous devez saisir un nombre entier compris entre 0 et 11 + + + + + + + + + 1 + + + + 2 + + + + + + + + 1 + + + + 2 + + + + 3 + + + + + + + 1 + + + + 2 + + + + + + Vous devez saisir un nombre entier compris entre 1 et 25 + + + + Vous devez saisir un nombre entier compris entre 1960 et 2019 + + + + + Vous devez saisir un nombre entier compris entre 1960 et 2019 + + + L'année de naissance de votre enfant le plus âgé est postérieure à celle de votre enfant le plus jeune. Merci de bien vouloir corriger. + + + + + + 1 + + + + 2 + + + + 3 + + + + + + + + 660 + + + + 070 + + + + 208 + + + + 004 + + + + 400 + + + + 821 + + + + 043 + + + + 014 + + + + 330 + + + + 459 + + + + 900 + + + + 528 + + + + 077 + + + + 800 + + + + 038 + + + + 078 + + + + 453 + + + + 640 + + + + 666 + + + + 469 + + + + 039 + + + + 033 + + + + 002 + + + + 421 + + + + 284 + + + + 675 + + + + 073 + + + + 676 + + + + 257 + + + + 516 + + + + 093 + + + + 391 + + + + 508 + + + + 932 + + + + 006 + + + + 703 + + + + 068 + + + + 236 + + + + 328 + + + + 929 + + + + 696 + + + + 302 + + + + 404 + + + + 247 + + + + 306 + + + + 512 + + + + 720 + + + + 600 + + + + 480 + + + + 375 + + + + 318 + + + + 322 + + + + 031 + + + + 436 + + + + 034 + + + + 092 + + + + 448 + + + + 928 + + + + 008 + + + + 338 + + + + 456 + + + + 460 + + + + 015 + + + + 220 + + + + 641 + + + + 310 + + + + 500 + + + + 335 + + + + 011 + + + + 053 + + + + 334 + + + + 815 + + + + 032 + + + + 001 + + + + 314 + + + + 016 + + + + 252 + + + + 076 + + + + 276 + + + + 009 + + + + 473 + + + + 458 + + + + 416 + + + + 260 + + + + 496 + + + + 488 + + + + 452 + + + + 424 + + + + 064 + + + + 664 + + + + 700 + + + + 616 + + + + 612 + + + + 007 + + + + 017 + + + + 024 + + + + 624 + + + + 005 + + + + 272 + + + + 464 + + + + 732 + + + + 628 + + + + 927 + + + + 830 + + + + 079 + + + + 346 + + + + 083 + + + + 812 + + + + 451 + + + + 926 + + + + 636 + + + + 050 + + + + 051 + + + + 684 + + + + 395 + + + + 054 + + + + 604 + + + + 268 + + + + 216 + + + + 020 + + + + 055 + + + + 012 + + + + 743 + + + + 096 + + + + 701 + + + + 386 + + + + 667 + + + + 370 + + + + 232 + + + + 046 + + + + 204 + + + + 824 + + + + 462 + + + + 373 + + + + 228 + + + + 412 + + + + 823 + + + + 074 + + + + 040 + + + + 716 + + + + 097 + + + + 366 + + + + 389 + + + + 803 + + + + 003 + + + + 827 + + + + 804 + + + + 672 + + + + 432 + + + + 288 + + + + 240 + + + + 724 + + + + 026 + + + + 649 + + + + 350 + + + + 081 + + + + 662 + + + + 829 + + + + 625 + + + + 442 + + + + 801 + + + + 520 + + + + 504 + + + + 708 + + + + 060 + + + + 826 + + + + 449 + + + + 010 + + + + 023 + + + + 644 + + + + 931 + + + + 372 + + + + 066 + + + + 075 + + + + 324 + + + + 380 + + + + 465 + + + + 042 + + + + 467 + + + + 806 + + + + 428 + + + + 819 + + + + 311 + + + + 632 + + + + 035 + + + + 248 + + + + 094 + + + + 355 + + + + 037 + + + + 264 + + + + 706 + + + + 063 + + + + 091 + + + + 342 + + + + 224 + + + + 669 + + + + 388 + + + + 728 + + + + 030 + + + + 036 + + + + 492 + + + + 393 + + + + 608 + + + + 082 + + + + 736 + + + + 352 + + + + 244 + + + + 933 + + + + 061 + + + + 925 + + + + 680 + + + + 721 + + + + 702 + + + + 280 + + + + 817 + + + + 930 + + + + 472 + + + + 212 + + + + 052 + + + + 080 + + + + 822 + + + + 072 + + + + 524 + + + + 816 + + + + 045 + + + + 484 + + + + 690 + + + + 653 + + + + 095 + + + + 378 + + + + 382 + + + + + + + 1 + + + + 2 + + + + 3 + + + + + + + + 643 + + + + 660 + + + + 388 + + + + 070 + + + + 208 + + + + 004 + + + + 043 + + + + 014 + + + + 330 + + + + 470 + + + + 459 + + + + 478 + + + + 632 + + + + 528 + + + + 077 + + + + 474 + + + + 800 + + + + 038 + + + + 078 + + + + 453 + + + + 640 + + + + 666 + + + + 469 + + + + 002 + + + + 421 + + + + 284 + + + + 413 + + + + 675 + + + + 073 + + + + 516 + + + + 479 + + + + 093 + + + + 391 + + + + 508 + + + + 047 + + + + 703 + + + + 068 + + + + 236 + + + + 328 + + + + 331 + + + + 696 + + + + 302 + + + + 404 + + + + 021 + + + + 247 + + + + 022 + + + + 648 + + + + 512 + + + + 600 + + + + 480 + + + + 375 + + + + 031 + + + + 436 + + + + 272 + + + + 034 + + + + 092 + + + + 448 + + + + 477 + + + + 085 + + + + 008 + + + + 338 + + + + 460 + + + + 646 + + + + 015 + + + + 220 + + + + 428 + + + + 647 + + + + 500 + + + + 335 + + + + 011 + + + + 053 + + + + 400 + + + + 334 + + + + 815 + + + + 032 + + + + 001 + + + + 641 + + + + 314 + + + + 252 + + + + 076 + + + + 530 + + + + 276 + + + + 044 + + + + 013 + + + + 009 + + + + 473 + + + + 406 + + + + 458 + + + + 818 + + + + 416 + + + + 901 + + + + 310 + + + + 257 + + + + 488 + + + + 496 + + + + 452 + + + + 424 + + + + 740 + + + + 064 + + + + 356 + + + + 018 + + + + 373 + + + + 813 + + + + 019 + + + + 026 + + + + 463 + + + + 359 + + + + 809 + + + + 810 + + + + 805 + + + + 807 + + + + 529 + + + + 041 + + + + 802 + + + + 812 + + + + 820 + + + + 824 + + + + 808 + + + + 806 + + + + 531 + + + + 357 + + + + 454 + + + + 457 + + + + 461 + + + + 825 + + + + 664 + + + + 700 + + + + 616 + + + + 612 + + + + 017 + + + + 007 + + + + 024 + + + + 624 + + + + 005 + + + + 464 + + + + 732 + + + + 902 + + + + 628 + + + + 210 + + + + 830 + + + + 079 + + + + 346 + + + + 083 + + + + 090 + + + + 636 + + + + 050 + + + + 051 + + + + 684 + + + + 395 + + + + 054 + + + + 604 + + + + 268 + + + + 216 + + + + 020 + + + + 055 + + + + 012 + + + + 743 + + + + 096 + + + + 370 + + + + 025 + + + + 701 + + + + 386 + + + + 667 + + + + 232 + + + + 046 + + + + 204 + + + + 462 + + + + 228 + + + + 377 + + + + 412 + + + + 823 + + + + 074 + + + + 040 + + + + 716 + + + + 097 + + + + 471 + + + + 366 + + + + 676 + + + + 389 + + + + 803 + + + + 672 + + + + 432 + + + + 240 + + + + 288 + + + + 814 + + + + 028 + + + + 827 + + + + 804 + + + + 649 + + + + 350 + + + + 081 + + + + 662 + + + + 625 + + + + 442 + + + + 801 + + + + 520 + + + + 039 + + + + 033 + + + + 003 + + + + 016 + + + + 504 + + + + 708 + + + + 060 + + + + 826 + + + + 449 + + + + 010 + + + + 644 + + + + 405 + + + + 650 + + + + 322 + + + + 095 + + + + 724 + + + + 306 + + + + 728 + + + + 260 + + + + 042 + + + + 829 + + + + 456 + + + + 318 + + + + 720 + + + + 061 + + + + 372 + + + + 066 + + + + 006 + + + + 075 + + + + 324 + + + + 476 + + + + 380 + + + + 903 + + + + 475 + + + + 451 + + + + 904 + + + + 831 + + + + 467 + + + + 358 + + + + 465 + + + + 821 + + + + 819 + + + + 311 + + + + 035 + + + + 248 + + + + 094 + + + + 355 + + + + 037 + + + + 264 + + + + 706 + + + + 466 + + + + 063 + + + + 091 + + + + 342 + + + + 224 + + + + 669 + + + + 030 + + + + 036 + + + + 492 + + + + 029 + + + + 393 + + + + 608 + + + + 082 + + + + 736 + + + + 352 + + + + 244 + + + + 065 + + + + 084 + + + + 905 + + + + 532 + + + + 680 + + + + 721 + + + + 702 + + + + 280 + + + + 817 + + + + 086 + + + + 472 + + + + 212 + + + + 080 + + + + 052 + + + + 822 + + + + 089 + + + + 072 + + + + 642 + + + + 524 + + + + 816 + + + + 045 + + + + 484 + + + + 690 + + + + 811 + + + + 653 + + + + 378 + + + + 382 + + + + + + + 1 + + + + 2 + + + + 3 + + + + 4 + + + + + + + + + + + + + + + 1 + + + + 2 + + + + 3 + + + + + + 1 + + + + 2 + + + + 3 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + + + + + + + + + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + % + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + an(s) + + + + mois + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + mois + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + an(s) + + + + mois + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + an(s) + + + + mois + + + + + + + an(s) + + + + mois + + + + + + + an(s) + + + + mois + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + heure(s) + + + + + minute(s) + + + + + + + + + heure(s) + + + + + minute(s) + + + + + + + + heure(s) + + + + minute(s) + + + + + + + + + jour(s) + + + + + + + + + jour(s) + + + + + + + + + + + + + + + + + + + heure(s) + + + + + + minute(s) + + + + + + + + + + + + + jour(s) + + + + + + + + + + + + + + + + + + + + jour(s) + + + + + + + + + + + + + jour(s) + + + + + + + + + + + + + + + + jour(s) + + + + + + + + + + + + + + + + + jour(s) + + + + + + + + + + + + + + + jour(s) + + + + + + + + + jour(s) + + + + + + + + + jour(s) + + + + + + + + + + + + + + + + + + + jour(s) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + an(s) + + + + mois + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Vous êtes arrivé à la fin du questionnaire. + + + Merci de  + cliquer +  sur le bouton " + Envoyer + " pour le transmettre à l'Insee. + + + Après envoi, vous ne pourrez  + plus modifier vos réponses +   en ligne. + + + Pour toute modification,   + cliquer +  sur le bouton " + Retour + ". + + + + + + + + + + + + + + + + + + + + + + + + + + + L'Insee vous remercie de votre collaboration à cette enquête. + + + Télécharger la preuve de votre participation à l'enquête + . + + + + Pour quitter l’enquête,  + cliquer +  sur le bouton " + Déconnexion + " + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/test/resources/pogues-xml-to-ddi/out.xml b/src/test/resources/pogues-xml-to-ddi/out.xml index 7bb2e9a02..13441d2d6 100644 --- a/src/test/resources/pogues-xml-to-ddi/out.xml +++ b/src/test/resources/pogues-xml-to-ddi/out.xml @@ -153,7 +153,7 @@ fr.insee - d1e119 + j6p6my1d-a-j6p0ti5h 1 IfThenElse @@ -195,7 +195,7 @@ fr.insee - d1e50 + j6p6my1d-a-j6p0np9q 1 IfThenElse @@ -442,7 +442,7 @@ fr.insee - d1e50 + j6p6my1d-a-j6p0np9q 1 A définir @@ -455,7 +455,7 @@ xpath fr.insee - d1e50-IP-1 + j6p6my1d-a-j6p0np9q-IP-1 1 READY @@ -470,24 +470,24 @@ fr.insee - d1e50-IP-1 + j6p6my1d-a-j6p0np9q-IP-1 1 InParameter - not( d1e50-IP-1!= '1') + not(j6p6my1d-a-j6p0np9q-IP-1!= '1') fr.insee - d1e50-THEN + j6p6my1d-a-j6p0np9q-THEN 1 Sequence fr.insee - d1e50-THEN + j6p6my1d-a-j6p0np9q-THEN 1 @@ -502,7 +502,7 @@ fr.insee - d1e119 + j6p6my1d-a-j6p0ti5h 1 A définir @@ -515,7 +515,7 @@ xpath fr.insee - d1e119-IP-1 + j6p6my1d-a-j6p0ti5h-IP-1 1 READY @@ -530,24 +530,24 @@ fr.insee - d1e119-IP-1 + j6p6my1d-a-j6p0ti5h-IP-1 1 InParameter - not( d1e119-IP-1!= '1') + not(j6p6my1d-a-j6p0ti5h-IP-1!= '1') fr.insee - d1e119-THEN + j6p6my1d-a-j6p0ti5h-THEN 1 Sequence fr.insee - d1e119-THEN + j6p6my1d-a-j6p0ti5h-THEN 1 From c9c5448a82bd0ec4b4eeb63a7547e4c5f4dc3450 Mon Sep 17 00:00:00 2001 From: Laurent Caouissin Date: Thu, 3 Oct 2019 10:10:55 +0200 Subject: [PATCH 209/439] Update edit-patron.xsl --- .../resources/xslt/util/fr/edit-patron.xsl | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/resources/xslt/util/fr/edit-patron.xsl b/src/main/resources/xslt/util/fr/edit-patron.xsl index 0df715cab..bb36d9957 100644 --- a/src/main/resources/xslt/util/fr/edit-patron.xsl +++ b/src/main/resources/xslt/util/fr/edit-patron.xsl @@ -71,16 +71,16 @@ - - - + + + + + + + + + + From cef45f69044dc73595b43ebff0ae81debfb0855b Mon Sep 17 00:00:00 2001 From: Laurent Caouissin Date: Thu, 3 Oct 2019 10:47:28 +0200 Subject: [PATCH 210/439] Eno params : add files for test --- .../params/in-to-out/business/ddi.xml | 39648 ++++++++++++++++ .../params/in-to-out/business/form.xhtml | 11700 +++++ .../business/fr-specific-treatment.xsl | 107 + .../params/in-to-out/business/metadata.xml | 117 + .../params/in-to-out/business/params.xml | 81 + .../business/pdf-specific-treatment.xsl | 73 + .../params/in-to-out/household/ddi.xml | 29295 ++++++++++++ .../household/fr-specific-treatment.xsl | 130 + .../params/in-to-out/household/metadata.xml | 37 + .../params/in-to-out/household/params.xml | 132 + .../valorization/parameters-expected.xml | 101 + .../params/valorization/parameters-input.xml | 85 + 12 files changed, 81506 insertions(+) create mode 100644 src/test/resources/params/in-to-out/business/ddi.xml create mode 100644 src/test/resources/params/in-to-out/business/form.xhtml create mode 100644 src/test/resources/params/in-to-out/business/fr-specific-treatment.xsl create mode 100644 src/test/resources/params/in-to-out/business/metadata.xml create mode 100644 src/test/resources/params/in-to-out/business/params.xml create mode 100644 src/test/resources/params/in-to-out/business/pdf-specific-treatment.xsl create mode 100644 src/test/resources/params/in-to-out/household/ddi.xml create mode 100644 src/test/resources/params/in-to-out/household/fr-specific-treatment.xsl create mode 100644 src/test/resources/params/in-to-out/household/metadata.xml create mode 100644 src/test/resources/params/in-to-out/household/params.xml create mode 100644 src/test/resources/params/valorization/parameters-expected.xml create mode 100644 src/test/resources/params/valorization/parameters-input.xml diff --git a/src/test/resources/params/in-to-out/business/ddi.xml b/src/test/resources/params/in-to-out/business/ddi.xml new file mode 100644 index 000000000..49437fe8d --- /dev/null +++ b/src/test/resources/params/in-to-out/business/ddi.xml @@ -0,0 +1,39648 @@ + + + fr.insee + INSEE-jmuk1uzy2 + 1.0 + + + Situation des associations en 2018 + + + + fr.insee + RessourcePackage-jmuk1uzy2 + 1.0 + + fr.insee + InterviewerInstructionScheme-jmuk1uzy2 + 1.0 + + A définir + + + fr.insee + jrrlh7dt + 1.0 + + instruction + + + + + Comme cela vous a été indiqué sur la lettre que nous vous avons + adressée, nous vous invitons à répondre au questionnaire de l’enquête + nationale sur les associations.​Le monde associatif a + un poids conséquent dans l’économie mais est actuellement peu étudié par le + système statistique public. Cette enquête vise donc à mieux connaître le + tissu associatif français en 2018, en particulier son organisation, ses + activités, ses ressources et charges financières (cotisations, recettes + d’activités, subventions publiques, charges de personnel…) et ses ressources + humaines (salariés, bénévoles…).​Une notice + explicative détaillée, définissant les principaux concepts utilisés, est + jointe à ce questionnaire et accessible en ligne. Vous êtes invités à vous y + reporter en cas de doute sur la compréhension de certains termes. Tous les + termes suivis d’un astérisque ou d'une infobulle (pour le questionnaire web) + sont définis dans la notice + explicative.​Périmètre de réponse + :Les réponses attendues à ce questionnaire doivent + porter sur l’ensemble des activités de l’association désignée en haut à + gauche de cette page. Si votre association comporte plusieurs + établissements, les réponses doivent inclure les + données de l’ensemble de vos établissements. Si votre association est une + tête de réseau d’associations (fédération, union, + ligue, groupement, collectif, mouvement…), les réponses au questionnaire + doivent uniquement inclure les données de votre association et non pas les + données de l’ensemble des associations composant le + réseau.​Nous vous remercions pour votre + réponse. + + + + + + fr.insee + jrjcxhyb + 1.0 + + instruction + + + + + + (un seul choix) + + + + + + + fr.insee + jrjcryzn + 1.0 + + instruction + + + + + + Un seul choix possible + + + + + + + fr.insee + jrjdgnch + 1.0 + + instruction + + + + Le conseil d’administration d’une association se compose + des administrateurs de l’association. Le nombre d’administrateurs est fixé par + les statuts ou le règlement intérieur de l’association, tout comme la + périodicité de ses réunions. Ses principales attributions sont de définir les + orientations générales de l’association, de décider de la gestion du patrimoine + de l’association, d’autoriser le président à agir en justice et d’arrêter le + budget et les comptes annuels de l’association. + + + + + fr.insee + jrjcj7e6-CI-0-II-0 + 1.0 + + warning + + + + Les 9 premiers chiffres du numéro que vous avez renseigné + ne correspondent pas à un numéro Siren + + + + + fr.insee + jrjdhk1u-CI-0-II-0 + 1.0 + + warning + + + + Vous avez indiqué une valeur supérieure au nombre de + membres composant votre conseil d'administration. Merci de bien vouloir revoir + vos réponses. + + + + + fr.insee + jrjdnovb + 1.0 + + instruction + + + + Le bureau d’une association est l’organe exécutif de + l’association. Son rôle principal est de gérer au quotidien l’association et de + permettre son bon fonctionnement, notamment en appliquant les décisions votées + en assemblée générale ou par le conseil d’administration. Les membres du bureau + sont en général entre 3 et 6 et assurent au moins 3 rôles : président, + trésorier et secrétaire. Les statuts de l’association peuvent prévoir que le + conseil d’administration tienne lieu de bureau. + + + + + fr.insee + jrjdmxr3-CI-0-II-0 + 1.0 + + warning + + + + Vous avez indiqué une valeur supérieure au nombre de + membres composant votre bureau. Merci de bien vouloir revoir vos + réponses. + + + + + fr.insee + jrje2xqr + 1.0 + + instruction + + + + + + Un seul choix possible + + + + + + + fr.insee + jrkcsjie + 1.0 + + instruction + + + + + + Un seul choix possible + + + + + + + fr.insee + jrkci389 + 1.0 + + instruction + + + + + + Un seul choix possible + + + + + + + fr.insee + jrkd7a3w-CI-0-II-0 + 1.0 + + warning + + + + Vous indiquez avoir des adhérents autres, merci de bien + vouloir préciser de quels types d'adhérents il s'agit. + + + + + fr.insee + jrkcrrfa-CI-0-II-0 + 1.0 + + warning + + + + Vous indiquez ne pas avoir d'adhérents personnes + physiques à la question 1 mais vous avez renseigné un nombre d'adhérents + personnes physiques. Merci de bien vouloir revoir vos réponses. + + + + + fr.insee + jrkcrrfa-CI-1-II-1 + 1.0 + + warning + + + + Vous indiquez avoir des adhérents personnes physiques à + la question 1 mais vous n'avez pas renseigné le nombre d'adhérents personnes + physiques. Si vous ne connaissez pas le nombre exact, vous pouvez donner une + estimation. + + + + + fr.insee + jrkcrrfa-CI-2-II-2 + 1.0 + + warning + + + + Vous indiquez avoir des adhérents personnes physiques à + la question 1 mais vous avez renseigné 0 adhérent personnes physiques. Merci de + bien vouloir revoir vos réponses. Si vous ne connaissez pas le nombre exact, + vous pouvez donner une estimation. + + + + + fr.insee + jrkcrrfa-CI-3-II-3 + 1.0 + + warning + + + + Vous indiquez ne pas avoir d'adhérents associations à la + question 1 mais vous avez renseigné un nombre d'adhérents associations. Merci + de bien vouloir revoir vos réponses. + + + + + fr.insee + jrkcrrfa-CI-4-II-4 + 1.0 + + warning + + + + Vous indiquez avoir des adhérents associations à la + question 1 mais vous n'avez pas renseigné le nombre d'adhérents associations. + Si vous ne connaissez pas le nombre exact, vous pouvez donner une estimation. + + + + + + fr.insee + jrkcrrfa-CI-5-II-5 + 1.0 + + warning + + + + Vous indiquez avoir des adhérents associations à la + question 1 mais vous avez renseigné 0 adhérent associations. Merci de bien + vouloir revoir vos réponses. Si vous ne connaissez pas le nombre exact, vous + pouvez donner une estimation. + + + + + fr.insee + jrkcrrfa-CI-6-II-6 + 1.0 + + warning + + + + Vous indiquez ne pas avoir d'adhérents entreprises + privées à la question 1 mais vous avez renseigné le nombre d'adhérents + entreprises privées. Merci de bien vouloir revoir vos réponses. + + + + + fr.insee + jrkcrrfa-CI-7-II-7 + 1.0 + + warning + + + + Vous indiquez avoir des adhérents entreprises privées à + la question 1 mais vous n'avez pas renseigné le nombre d'adhérents entreprises + privées. Si vous ne connaissez pas le nombre exact, vous pouvez donner une + estimation. + + + + + fr.insee + jrkcrrfa-CI-8-II-8 + 1.0 + + warning + + + + Vous indiquez avoir des adhérents entreprises privées à + la question 1 mais vous avez renseigné 0 adhérent entreprises privées. Merci de + bien vouloir revoir vos réponses. Si vous ne connaissez pas le nombre exact, + vous pouvez donner une estimation. + + + + + fr.insee + jrkcrrfa-CI-9-II-9 + 1.0 + + warning + + + + Vous indiquez ne pas avoir d'adhérents collectivités + publiques à la question 1 mais vous avez renseigné un nombre d'adhérents + collectivités publiques. Merci de bien vouloir revoir vos réponses. + + + + + fr.insee + jrkcrrfa-CI-10-II-10 + 1.0 + + warning + + + + Vous indiquez avoir des adhérents collectivités publiques + à la question 1 mais vous n'avez pas renseigné le nombre d'adhérents + collectivités publiques. Si vous ne connaissez pas le nombre exact, vous pouvez + donner une estimation. + + + + + fr.insee + jrkcrrfa-CI-11-II-11 + 1.0 + + warning + + + + Vous indiquez avoir des adhérents collectivités publiques + à la question 1 mais vous avez renseigné 0 adhérent collectivités publiques. + Merci de bien vouloir revoir vos réponses. Si vous ne connaissez pas le nombre + exact, vous pouvez donner une estimation. + + + + + fr.insee + jrkcrrfa-CI-12-II-12 + 1.0 + + warning + + + + Vous indiquez ne pas avoir d'adhérents "autres" à la + question 1 mais vous avez renseigné un nombre d'adhérents "autres". Merci de + bien vouloir revoir vos réponses. + + + + + fr.insee + jrkcrrfa-CI-13-II-13 + 1.0 + + warning + + + + Vous indiquez avoir des adhérents "autres" à la question + 1 mais vous n'avez pas renseigné le nombre d'adhérents "autres". Si vous ne + connaissez pas le nombre exact, vous pouvez donner une estimation. + + + + + fr.insee + jrkcrrfa-CI-14-II-14 + 1.0 + + warning + + + + Vous indiquez avoir des adhérents "autres" à la question + 1 mais vous avez renseigné 0 adhérent "autres". Merci de bien vouloir revoir + vos réponses. Si vous ne connaissez pas le nombre exact, vous pouvez donner une + estimation. + + + + + fr.insee + jrqi3jr7 + 1.0 + + instruction + + + + + + (codez 1 dans la case correspondant à cette activité. Si une seule + activité ne vous paraît pas suffisante, vous pouvez indiquer jusqu’à 3 + activités en les classant par ordre d’importance, de 1 pour la plus + importante à 3 pour la moins importante). + + + + + + + fr.insee + jrqgfzes-CI-0-II-0 + 1.0 + + warning + + + + Merci d'indiquer trois domaines au maximum, en les + classant de 1 à 3 par ordre d'importance. + + + + + fr.insee + jrqgfzes-CI-1-II-1 + 1.0 + + warning + + + + Merci d'indiquer au moins un domaine d'activité. + + + + + + fr.insee + jseogy8a + 1.0 + + instruction + + + + + Personnes salariées rémunérées par l’association, en CDI ou en CDD, y + compris intermittents et contrats aidés. Sont exclus ici : les + intérimaires, les personnels mis à disposition non rémunérés par + l’association et les prestataires comme les micro-entrepreneurs. + + + + + + fr.insee + js0d53t6-CI-0-II-0 + 1.0 + + warning + + + + Vous indiquez avoir des salariés mais vous ne renseignez + pas le nombre d'heures de travail pour ces salariés. Si vous ne connaissez pas + le nombre exact, vous pouvez donner une estimation. + + + + + fr.insee + js0dpd65-CI-0-II-0 + 1.0 + + warning + + + + Vous indiquez ne pas avoir de salariés en contrat aidé + mais vous renseignez le nombre d'heures de travail de salariés en contrat aidé. + Merci de bien vouloir revoir vos réponses. + + + + + fr.insee + js0dpd65-CI-1-II-1 + 1.0 + + warning + + + + Vous indiquez avoir des salariés en contrat aidé mais + vous ne renseignez pas le nombre d'heures de travail pour ces salariés. Si vous + ne connaissez pas le nombre exact, vous pouvez donner une estimation. + + + + + fr.insee + js0dpd65-CI-2-II-2 + 1.0 + + warning + + + + Vous indiquez avoir des salariés en contrat aidé mais + vous renseignez 0 heure de travail pour ces salariés. Merci de bien vouloir + revoir vos réponses. + + + + + fr.insee + js0dpd65-CI-3-II-3 + 1.0 + + warning + + + + Vous indiquez ne pas avoir de salariés en CDI mais vous + renseignez le nombre d'heures de travail de salariés en CDI. Merci de bien + vouloir revoir vos réponses. + + + + + fr.insee + js0dpd65-CI-4-II-4 + 1.0 + + warning + + + + Vous indiquez avoir des salariés en CDI mais vous ne + renseignez pas le nombre d'heures de travail pour ces salariés. Si vous ne + connaissez pas le nombre exact, vous pouvez donner une estimation. + + + + + fr.insee + js0dpd65-CI-5-II-5 + 1.0 + + warning + + + + Vous indiquez avoir des salariés en CDI mais vous + renseignez 0 heure de travail pour ces salariés. Merci de bien vouloir revoir + vos réponses. + + + + + fr.insee + js0dpd65-CI-6-II-6 + 1.0 + + warning + + + + Vous indiquez ne pas avoir de salariés en CDD mais vous + renseignez le nombre d'heures de travail de salariés en CDD. Merci de bien + vouloir revoir vos réponses. + + + + + fr.insee + js0dpd65-CI-7-II-7 + 1.0 + + warning + + + + Vous indiquez avoir des salariés en CDD mais vous ne + renseignez pas le nombre d'heures de travail pour ces salariés. Si vous ne + connaissez pas le nombre exact, vous pouvez donner une estimation. + + + + + fr.insee + js0dpd65-CI-8-II-8 + 1.0 + + warning + + + + Vous indiquez avoir des salariés en CDD mais vous + renseignez 0 heure de travail pour ces salariés. Merci de bien vouloir revoir + vos réponses. + + + + + fr.insee + js0dpd65-CI-9-II-9 + 1.0 + + warning + + + + La somme des heures de travail rémunérées déclarées + (¤jskcp2py-GOP¤) est supérieure au total des heures de travail rémunérées + déclaré à la question 2 (¤js0d53t6-QOP-js0czgby¤). Merci de bien vouloir revoir + vos réponses. + + + + fr.insee + jskcp2py-GOP + 1.0 + OutParameter + + + + + fr.insee + js0d53t6-QOP-js0czgby + 1.0 + OutParameter + + + + + + fr.insee + jseoe9ig + 1.0 + + instruction + + + + + Personnes salariées rémunérées par l’association, en CDI ou en CDD, y + compris intermittents et contrats aidés.Sont exclus ici : les + intérimaires, les personnels mis à disposition non rémunérés par + l’association et les prestataires comme les micro-entrepreneurs. + + + + + + fr.insee + jseoi4yc-CI-0-II-0 + 1.0 + + warning + + + + Vous indiquez avoir des salariés au 31/12/2018 mais vous + ne renseignez pas avoir eu recours à l'emploi salarié au cours de l'année 2018. + Merci de bien vouloir revoir vos réponses. + + + + + fr.insee + jseoe6ty-CI-0-II-0 + 1.0 + + warning + + + + Vous indiquez avoir des salariés à la question précédente + mais n'indiquez aucun salarié à temps plein et aucun salarié à temps partiel. + Merci de bien vouloir revoir vos réponses. + + + + + fr.insee + jseoe6ty-CI-1-II-1 + 1.0 + + warning + + + + Vous indiquez ¤jseoe6ty-QOP-jvmg69sa¤ salariés à temps + plein et ¤jseoe6ty-QOP-jvmg5jhi¤ à temps partiel ce qui est supérieur au nombre + total des salariés de votre association (¤jseoi4yc-QOP-jseo0mfc¤). Merci de + bien vouloir revoir vos réponses. + + + + fr.insee + jseoi4yc-QOP-jseo0mfc + 1.0 + OutParameter + + + + + fr.insee + jseoe6ty-QOP-jvmg69sa + 1.0 + OutParameter + + + + + fr.insee + jseoe6ty-QOP-jvmg5jhi + 1.0 + OutParameter + + + + + + fr.insee + jseoe6ty-CI-2-II-2 + 1.0 + + warning + + + + Vous indiquez ¤jseoe6ty-QOP-jvmfqq19¤ salariés à temps + partiel réduit ce qui est supérieur au nombre de salariés à temps partiel + (¤jseoe6ty-QOP-jvmg5jhi¤). Merci de bien vouloir revoir vos réponses. + + + + fr.insee + jseoe6ty-QOP-jvmg5jhi + 1.0 + OutParameter + + + + + fr.insee + jseoe6ty-QOP-jvmfqq19 + 1.0 + OutParameter + + + + + + fr.insee + jseoe6ty-CI-3-II-3 + 1.0 + + warning + + + + Vous indiquez ¤jseoe6ty-QOP-jvmfqq19¤ salariés à temps + partiel réduit mais aucun salarié à temps partiel. Merci de bien vouloir revoir + vos réponses. + + + + fr.insee + jseoe6ty-QOP-jvmfqq19 + 1.0 + OutParameter + + + + + + fr.insee + jseoe6ty-CI-4-II-4 + 1.0 + + warning + + + + Vous indiquez ¤jseoe6ty-QOP-jvmg69sa¤ salariés à temps + plein et ¤jseoe6ty-QOP-jvmg5jhi¤ à temps partiel ce qui est inférieur au nombre + total des salariés de votre association (¤jseoi4yc-QOP-jseo0mfc¤). Merci de + bien vouloir revoir vos réponses. + + + + fr.insee + jseoi4yc-QOP-jseo0mfc + 1.0 + OutParameter + + + + + fr.insee + jseoe6ty-QOP-jvmg69sa + 1.0 + OutParameter + + + + + fr.insee + jseoe6ty-QOP-jvmg5jhi + 1.0 + OutParameter + + + + + + fr.insee + js0dx5bf + 1.0 + + instruction + + + + Les prestataires comme les micro-entrepreneurs ne doivent + pas être pris en compte ici. + + + + + fr.insee + js0dwvc2-CI-0-II-0 + 1.0 + + warning + + + + Vous indiquez ne pas avoir employé d'intérimaires mais + vous renseignez le nombre d'heures de travail pour cette catégorie de + personnel. Merci de bien vouloir revoir vos réponses. + + + + + fr.insee + js0dwvc2-CI-1-II-1 + 1.0 + + warning + + + + Vous indiquez avoir employé des intérimaires mais vous + renseignez 0 heure de travail pour cette catégorie de personnel. Merci de bien + vouloir revoir vos réponses. + + + + + fr.insee + js0dwvc2-CI-2-II-2 + 1.0 + + warning + + + + Vous indiquez avoir employé des intérimaires mais vous ne + renseignez pas le nombre d'heures de travail pour cette catégorie de personnel. + Si vous ne connaissez pas le nombre exact, vous pouvez donner une estimation. + + + + + + fr.insee + js0dwvc2-CI-3-II-3 + 1.0 + + warning + + + + Vous indiquez ne pas avoir de personnels mis à + disposition mais vous renseignez le nombre d'heures de travail pour cette + catégorie de personnel. Merci de bien vouloir revoir vos réponses. + + + + + fr.insee + js0dwvc2-CI-4-II-4 + 1.0 + + warning + + + + Vous indiquez avoir des personnels mis à disposition mais + vous ne renseignez pas le nombre d'heures de travail pour cette catégorie de + personnel. Si vous ne connaissez pas le nombre exact, vous pouvez donner une + estimation. + + + + + fr.insee + js0dwvc2-CI-5-II-5 + 1.0 + + warning + + + + Vous indiquez avoir des personnels mis à disposition mais + vous renseignez 0 heure de travail pour cette catégorie de personnel. Merci de + bien vouloir revoir vos réponses. + + + + + fr.insee + js0dwvc2-CI-6-II-6 + 1.0 + + warning + + + + Vous indiquez ne pas avoir de volontaires mais vous + renseignez le nombre d'heures de travail pour cette catégorie de personnel. + Merci de bien vouloir revoir vos réponses. + + + + + fr.insee + js0dwvc2-CI-7-II-7 + 1.0 + + warning + + + + Vous indiquez avoir des volontaires mais vous ne + renseignez pas le nombre d'heures de travail pour cette catégorie de personnel. + Si vous ne connaissez pas le nombre exact, vous pouvez donner une estimation. + + + + + + fr.insee + js0dwvc2-CI-8-II-8 + 1.0 + + warning + + + + Vous indiquez avoir des volontaires mais vous renseignez + 0 heure de travail pour cette catégorie de personnel. Merci de bien vouloir + revoir vos réponses. + + + + + fr.insee + js0dwvc2-CI-9-II-9 + 1.0 + + warning + + + + Vous indiquez ne pas avoir d'autres catégories de + personnels mais vous renseignez le nombre d'heures de travail pour cette + catégorie "autres". Merci de bien vouloir revoir vos réponses. + + + + + fr.insee + js0dwvc2-CI-10-II-10 + 1.0 + + warning + + + + Vous indiquez avoir d'autres catégories de personnels + mais vous ne renseignez pas le nombre d'heures de travail pour cette catégorie + ""autres"". Si vous ne connaissez pas le nombre exact, vous pouvez donner une + estimation. + + + + + fr.insee + js0dwvc2-CI-11-II-11 + 1.0 + + warning + + + + Vous indiquez avoir d'autres catégories de personnels + mais vous renseignez 0 heure de travail pour cette catégorie "autres". Merci de + bien vouloir revoir vos réponses. + + + + + fr.insee + js0dvdaw-CI-0-II-0 + 1.0 + + warning + + + + Merci de bien vouloir préciser quelles sont les autres catégories de personnels non mentionnées auparavant. + + + + + fr.insee + js0eelzf + 1.0 + + instruction + + + + Les bénévoles sont des personnes qui consacrent une + partie de leur temps, sans rémunération, à la vie de l’association. Le bénévole + peut faire partie des responsables de l’association (en tant que membre du + bureau par exemple), remplir des fonctions spécifiques (comptabilité, + ressources humaines…), ou intervenir « sur le terrain » en participant + directement à la mise en œuvre des activités auprès des bénéficiaires. + + + + + fr.insee + js0eh523-CI-0-II-0 + 1.0 + + warning + + + + Vous n’avez pas répondu à la question sur les bénévoles + qui est essentielle dans ce questionnaire. Il est préférable de le faire avant + de passer à la suite. + + + + + fr.insee + js0egvao-CI-0-II-0 + 1.0 + + warning + + + + Vous indiquez ¤js0egvao-QOP-js0en3v8¤ bénévoles + réguliers, ce qui est supérieur au nombre de bénévoles total + (¤js0eh523-QOP-js0e63o9¤). Merci de bien vouloir revoir vos réponses. + + + + fr.insee + js0eh523-QOP-js0e63o9 + 1.0 + OutParameter + + + + + fr.insee + js0egvao-QOP-js0en3v8 + 1.0 + OutParameter + + + + + + fr.insee + js0eg1cf-CI-0-II-0 + 1.0 + + warning + + + + Merci de bien vouloir renseigner le nombre d'heures + effectuées par les bénévoles de votre association. Vous pouvez donner une + estimation. + + + + + fr.insee + js0eg1cf-CI-1-II-1 + 1.0 + + warning + + + + Merci de bien vouloir renseigner le nombre d'heures + effectuées par les bénévoles réguliers de votre association. Vous pouvez donner + une estimation. + + + + + fr.insee + js0eg1cf-CI-2-II-2 + 1.0 + + warning + + + + Vous indiquez un nombre d'heure de travail des bénévoles + réguliers supérieur au nombre d'heure total de travail des bénévoles. Merci de + bien vouloir revoir vos réponses. + + + + + fr.insee + js0eg1cf-CI-3-II-3 + 1.0 + + warning + + + + Vous indiquez un nombre d'heures qui semble très élevé au + regard du nombre de bénévoles indiqué. Merci de bien vouloir vérifier et de + revoir vos réponses. + + + + + fr.insee + js0eg1cf-CI-4-II-4 + 1.0 + + warning + + + + Vous considérez que tous les bénévoles sont des bénévoles + réguliers, mais le nombre d’heures effectuées par des bénévoles réguliers est + différent du nombre d’heures effectuées par l’ensemble des bénévoles. Merci de + bien vouloir revoir vos réponses. + + + + + fr.insee + js0eg1cf-CI-5-II-5 + 1.0 + + warning + + + + Vous avez indiqué 0 bénévole régulier à la question 2 + mais vous renseignez un nombre d'heures consacré à votre association pour cette + catégorie de bénévole. Merci de bien vouloir revoir vos réponses. + + + + + fr.insee + js0f89di + 1.0 + + instruction + + + + Il est demandé de répondre pour l’année 2018. Toutefois, + si l’exercice comptable de votre association ne se termine pas habituellement + au 31 décembre (par exemple si l’exercice est calé sur l’année scolaire), il + vous est demandé de répondre sur le dernier exercice comptable connu de votre + association (la date de clôture est nécessairement comprise entre le 1er juin + 2018 et le 31 mai 2019). + + + + + fr.insee + junsenue-CI-0-II-0 + 1.0 + + warning + + + + La question porte sur votre exercice comptable 2018, en + conséquence la date de clôture devrait être comprise entre le 1er juin 2018 et + le 31 mai 2019. + + + + + fr.insee + junsih01-CI-0-II-0 + 1.0 + + warning + + + + Vous n'avez pas répondu à toutes les questions concernant + le dernier exercice comptable clos. Il est préférable de le faire avant de + passer à la suite. + + + + + fr.insee + junsih01-CI-1-II-1 + 1.0 + + warning + + + + La question porte sur votre exercice comptable 2018, la durée d’exercice devrait être supérieure ou égale au nombre de mois écoulés entre le 01/01/2019 et ¤junsenue-QOP-juns2o7l¤. + + + + + fr.insee + js0foe9d + 1.0 + + instruction + + + + Merci d’indiquer 0 pour les types de ressources n’ayant + pas concerné votre association en 2018. + + + + + fr.insee + js0f7q4i-CI-0-II-0 + 1.0 + + warning + + + + La somme des montants des différentes ressources + courantes (¤jskezenm-GOP¤) est supérieure au montant total des ressources + courantes (¤js0f7q4i-QOP-jvmftjzc¤). Merci de bien vouloir revoir votre + réponse. + + + + fr.insee + jskezenm-GOP + 1.0 + OutParameter + + + + + fr.insee + js0f7q4i-QOP-jvmftjzc + 1.0 + OutParameter + + + + + + fr.insee + js0f7q4i-CI-1-II-1 + 1.0 + + warning + + + + Vous indiquez ¤js0f7q4i-QOP-jvmfwzam¤ euros de recette + d'activité d'origine publique mais seulement ¤js0f7q4i-QOP-jvmg0bqq¤ euros de + recette d'activité totale (privée + publique). Merci de bien vouloir revoir + votre réponse. + + + + fr.insee + js0f7q4i-QOP-jvmg0bqq + 1.0 + OutParameter + + + + + fr.insee + js0f7q4i-QOP-jvmfwzam + 1.0 + OutParameter + + + + + + fr.insee + js0f7q4i-CI-2-II-2 + 1.0 + + warning + + + + Merci de bien vouloir préciser quelle est la nature des autres ressources non mentionnées auparavant. + + + + + fr.insee + js0ga2c4 + 1.0 + + instruction + + + + Les reçus fiscaux sont des documents délivrés par une + association d’intérêt général à ses donateurs et à ses adhérents afin qu'ils + puissent bénéficier d'un crédit d’impôt. + + + + + fr.insee + js0grp6u + 1.0 + + instruction + + + + + Ces deux notions ne doivent pas être confondues :Une + subvention publique est une aide financière attribuée par une personne + morale publique (État, collectivités territoriales, organismes publics, + Union Européenne…) pour un projet établi à l’initiative de l’association sur + une durée déterminée et sans contrepartie.​Les + recettes d’activité d’origine publique sont l’ensemble des recettes perçues + par l’association lors de la vente de marchandises ou la réalisation de + prestations de services auprès d’une personne morale publique (État, + collectivités territoriales, organismes publics, Union Européenne…). Elles + peuvent prendre la forme de commandes publiques, prix de journées, marchés + publics, délégations de service public, dotations et produits de + tarification…​Merci d’indiquer 0 pour les types de + ressources n’ayant pas concerné votre association en 2018. + + + + + + fr.insee + js0g28m1-CI-0-II-0 + 1.0 + + warning + + + + La somme des subventions publiques de la question 5 + (¤jsn6qqzh-GOP¤ euros) diffère du montant total des subventions publiques + indiqué dans la question 3 (¤js0f7q4i-QOP-jvmfvhj4¤ euros) + + + + fr.insee + jsn6qqzh-GOP + 1.0 + OutParameter + + + + + fr.insee + js0f7q4i-QOP-jvmfvhj4 + 1.0 + OutParameter + + + + + + fr.insee + js0g28m1-CI-1-II-1 + 1.0 + + warning + + + + La somme des recettes d'activités publiques de la + question 5 (¤jsn757cc-GOP¤ euros) diffère du montant total des recettes + d'activité d'origine publique indiqué dans la question 3 + (¤js0f7q4i-QOP-jvmfwzam¤ euros). + + + + fr.insee + jsn757cc-GOP + 1.0 + OutParameter + + + + + fr.insee + js0f7q4i-QOP-jvmfwzam + 1.0 + OutParameter + + + + + + fr.insee + js0g28m1-CI-2-II-2 + 1.0 + + warning + + + + Vous n'avez pas indiqué avoir de subventions publiques + dans la question 3 mais vous renseignez l'origine de ces subventions. Veuillez + revoir vos réponses. + + + + + fr.insee + js0g28m1-CI-3-II-3 + 1.0 + + warning + + + + Vous n'avez pas indiqué avoir de recettes d'activité + d'origine publique dans la question 3 mais vous renseignez l'origine de ces + recettes d'activités. Veuillez revoir vos réponses. + + + + + fr.insee + jvgc8k0y-CI-0-II-0 + 1.0 + + warning + + + + Merci de bien vouloir préciser quelle est la nature des + autres acteurs non-mentionnés auparavant. + + + + + fr.insee + jvgcdcjx-CI-0-II-0 + 1.0 + + warning + + + + Merci de bien vouloir préciser quelle est la nature des + autres acteurs non-mentionnés auparavant. + + + + + fr.insee + js0guqni + 1.0 + + instruction + + + + Il est demandé de répondre pour l’année 2018. Toutefois, + si l’exercice comptable de votre association ne se termine pas habituellement + au 31 décembre (par exemple si l’exercice est calé sur l’année scolaire), il + vous est demandé de répondre sur le dernier exercice comptable connu de votre + association (la date de clôture est nécessairement comprise entre le 1er juin + 2018 et le 31 mai 2019). + + + + + fr.insee + js0h422p + 1.0 + + instruction + + + + Merci d’indiquer 0 pour les types de ressources n’ayant + pas concerné votre association en 2018. + + + + + fr.insee + js0gv8ia-CI-0-II-0 + 1.0 + + warning + + + + Vous indiquez ¤jskgabwa-GOP¤ euros de charges et un total + de ¤js0gv8ia-QOP-jvmft97z¤ euros, soit un écart de plus de 10%. Merci de bien + vouloir revoir votre réponse. + + + + fr.insee + jskgabwa-GOP + 1.0 + OutParameter + + + + + fr.insee + js0gv8ia-QOP-jvmft97z + 1.0 + OutParameter + + + + + + fr.insee + js0gv8ia-CI-1-II-1 + 1.0 + + warning + + + + Vous indiquez ¤jskh90m6-GOP¤ euros d'autres charges et un + total de ¤js0gv8ia-QOP-jvmfre83¤, soit un écart de plus de 10%. Veuillez revoir + votre réponse. + + + + fr.insee + jskh90m6-GOP + 1.0 + OutParameter + + + + + fr.insee + js0gv8ia-QOP-jvmfre83 + 1.0 + OutParameter + + + + + + fr.insee + js0gv8ia-CI-2-II-2 + 1.0 + + warning + + + + Le total des charges (¤js0gv8ia-QOP-jvmft97z¤ euros) + diffère de plus de 20% du total des ressources (¤js0f7q4i-QOP-jvmftjzc¤ euros). + Veuillez revoir votre réponse. + + + + fr.insee + js0f7q4i-QOP-jvmftjzc + 1.0 + OutParameter + + + + + fr.insee + js0gv8ia-QOP-jvmft97z + 1.0 + OutParameter + + + + + + fr.insee + js0gv8ia-CI-3-II-3 + 1.0 + + warning + + + + Vous indiquez des ressources et aucune charge. Merci de + bien vouloir revoir vos réponses. + + + + + fr.insee + js1wc5aw + 1.0 + + instruction + + + + + + Plusieurs choix possibles + + + + + + + fr.insee + jt7bd92h + 1.0 + + instruction + + + + + + Plusieurs choix possibles + + + + + + + fr.insee + js1xdv2x + 1.0 + + instruction + + + + + Un réseau d’associations est un ensemble identifié, formellement ou + non, d’associations, chacune ayant une personnalité juridique propre. Les + réseaux peuvent prendre des dénominations diverses tels que « fédération », + « union », « groupement », « regroupement », « ligue », « collectif », « + mouvement »…. Leur rayonnement géographique peut être plus ou moins étendu : + international, national, régional, départemental.... L’association qui + coordonne l’activité de l’ensemble des associations membres du réseau est la + tête de réseau. + + + + + + fr.insee + js1xnjw7-CI-0-II-0 + 1.0 + + warning + + + + Vous n’avez pas répondu à cette question qui est + essentielle dans ce questionnaire. Merci de bien vouloir revoir votre + réponse. + + + + + fr.insee + js1xmypc-CI-0-II-0 + 1.0 + + warning + + + + Vous n’avez pas répondu à cette question qui est + essentielle dans ce questionnaire. Merci de bien vouloir revoir votre + réponse. + + + + + fr.insee + js1x9nsr-CI-0-II-0 + 1.0 + + warning + + + + Merci de préciser à quel réseau appartient votre + association. + + + + + fr.insee + js1wmyn8-CI-0-II-0 + 1.0 + + warning + + + + Merci de bien vouloir préciser quelle est la nature de cet autre partenaire non mentionné auparavant. + + + + + fr.insee + js1wqahn-CI-0-II-0 + 1.0 + + warning + + + + Merci de bien vouloir préciser quelle est la nature de cet autre partenaire non mentionné auparavant. + + + + + fr.insee + jt7bpuz6 + 1.0 + + instruction + + + + + + Plusieurs choix possibles + + + + + + + fr.insee + FTN-INSTRUCTION-1 + 1.0 + + tooltip + + + + + Une association pluri-établissements est une association + composée d’un établissement principal, appelé siège, et d’un ou plusieurs + établissement(s) secondaire(s). Tous les établissements de cette association + font partie de la même personnalité juridique, ils ont donc le même numéro + SIREN (numéro d’identification à 9 chiffres) mais un numéro SIRET spécifique + (numéro d’identification à 14 chiffres composé des 9 chiffres du SIREN suivi + d’un numéro interne de classement de 5 chiffres). + + + + + + fr.insee + FTN-INSTRUCTION-2 + 1.0 + + tooltip + + + + + Un réseau d’associations est un ensemble identifié, + formellement ou non, d’associations, chacune ayant une personnalité + juridique propre. Les réseaux peuvent prendre des dénominations diverses + telles que « fédération », « union », « groupement », « regroupement », «ligue », « collectif », « mouvement », … . Leur rayonnement géographique + peut être plus ou moins étendu : international, national, régional, + départemental, ... . L’association qui coordonne l’activité de l’ensemble + des associations membres du réseau est la tête de réseau. + + + + + + fr.insee + FTN-INSTRUCTION-3 + 1.0 + + tooltip + + + + + Les préfectures attribuent un numéro RNA (parfois appelé + numéro de dossier) à chaque association ayant effectué des démarches en + préfecture depuis 2007. Ce numéro est composé d’un W suivi de 9 chiffres. + Les associations créées avant 2007 et n’ayant pas réalisé de formalités + administratives depuis 2008 ne disposent pas de numéro RNA, de même que les + associations relevant du droit local (Bas-Rhin, Haut-Rhin, Moselle) et les + associations d’utilité publique relevant de la préfecture de police de + Paris. + + + + + + fr.insee + FTN-INSTRUCTION-4 + 1.0 + + tooltip + + + + + Si vous ne disposez que du nombre de salariés en équivalent + temps plein (ETP) dans votre association, vous pouvez obtenir une valeur + approchée du nombre d’heures souhaité dans le questionnaire en multipliant + le nombre de salariés en ETP par 1800 + + + + + + fr.insee + FTN-INSTRUCTION-5 + 1.0 + + tooltip + + + + + EHPAD : Établissement d’Hébergement pour Personnes Âgées + Dépendantes + + + + + + fr.insee + FTN-INSTRUCTION-6 + 1.0 + + tooltip + + + + + GIP : Groupement d’Intérêt Public + + + + + + fr.insee + FTN-INSTRUCTION-7 + 1.0 + + tooltip + + + + + CUI-CAE : Contrat unique d'insertion – contrat + d'accompagnement dans l'emploi + + + + + + fr.insee + FTN-INSTRUCTION-8 + 1.0 + + tooltip + + + + + CUI-CIE : Contrat unique d'insertion – contrat initiative + emploi + + + + + + fr.insee + FTN-INSTRUCTION-9 + 1.0 + + tooltip + + + + + PEC : Parcours emploi compétence + + + + + + fr.insee + FTN-INSTRUCTION-10 + 1.0 + + tooltip + + + + + IAE : Insertion par l’activité économique + + + + + + fr.insee + FTN-INSTRUCTION-11 + 1.0 + + tooltip + + + + + CDDI : Contrat à durée déterminée d’insertion + + + + + + fr.insee + FTN-INSTRUCTION-12 + 1.0 + + tooltip + + + + + Les intérimaires travaillant dans votre association sont + des salariés d’une agence d’intérim qui réalisent une mission au sein de + votre association. + + + + + + fr.insee + FTN-INSTRUCTION-13 + 1.0 + + tooltip + + + + + Les personnels mis à la disposition de votre association + autres que les intérimaires sont des personnels d’un organisme extérieur + (public ou privé, autre qu’une agence d’intérim), qui réalisent certaines + activités dans votre association, cette dernière bénéficiant de leurs + compétences sans les rémunérer directement. + + + + + + fr.insee + FTN-INSTRUCTION-14 + 1.0 + + tooltip + + + + + Les personnels mis à la disposition de votre association + dans le cadre du mécénat de compétences sont mis à disposition de + l’association gratuitement par une entreprise. Ces personnes interviennent + pour le compte de l’association sur leur temps de travail rémunéré par + l’entreprise. + + + + + + fr.insee + FTN-INSTRUCTION-15 + 1.0 + + tooltip + + + + + Les volontaires ne sont ni salariés, ni bénévoles. Ils + signent un contrat pour réaliser une mission d’intérêt général et + perçoivent, en contrepartie, une indemnité non assimilable à un salaire. Le + volontariat est dérogatoire au code du travail. + + + + + + fr.insee + FTN-INSTRUCTION-16 + 1.0 + + tooltip + + + + + Les cotisations perçues sont les contributions financières + que demandent la plupart des associations à leurs adhérents et qui leur + donnent un droit de vote aux AG. Les associations ne demandent pas + obligatoirement de cotisations à leurs adhérents. + + + + + + fr.insee + FTN-INSTRUCTION-17 + 1.0 + + tooltip + + + + + Les donations et legs sont des dons gratuits (des + « libéralités ») qui s’effectuent par un acte authentique (établi par un + notaire) ou sous seing privé. Les donations s’effectuent du vivant du + donateur, les legs s’effectuent par testament. + + + + + + fr.insee + FTN-INSTRUCTION-18 + 1.0 + + tooltip + + + + + Les recettes d’activité d’origine privée sont l’ensemble + des recettes perçues par l’association lors de la vente de marchandises ou + la réalisation de prestations de services auprès des particuliers ou de + personnes morales privées (entreprises, associations, …). Elles incluent les + sommes perçues lors de l’organisation de fêtes ou d’évènements (vente de + boissons, paiement d’une inscription à un tournoi sportif, …). + + + + + + fr.insee + FTN-INSTRUCTION-19 + 1.0 + + tooltip + + + + + Les recettes d’activité d’origine publique sont l’ensemble + des recettes perçues par l’association lors de la vente de marchandises ou + la réalisation de prestations de services auprès d’une personne morale + publique (État, collectivités territoriales, organismes publics, Union + Européenne, …). Elles peuvent prendre la forme de commandes publiques, prix + de journées, marchés publics, délégations de service public, dotations et + produits de tarification, … . Il est important de noter que les recettes + d’activités d’origine publique ne doivent pas être confondues avec les + subventions publiques. + + + + + + fr.insee + FTN-INSTRUCTION-20 + 1.0 + + tooltip + + + + + Les recettes d’activité d’origine publique sont l’ensemble + des recettes perçues par l’association lors de la vente de marchandises ou + la réalisation de prestations de services auprès d’une personne morale + publique (État, collectivités territoriales, organismes publics, Union + Européenne, …). Elles peuvent prendre la forme de commandes publiques, prix + de journées, marchés publics, délégations de service public, dotations et + produits de tarification, … . Il est important de noter que les recettes + d’activités d’origine publique ne doivent pas être confondues avec les + subventions publiques. + + + + + + fr.insee + FTN-INSTRUCTION-21 + 1.0 + + tooltip + + + + + Une subvention publique est une aide financière attribuée + par une personne morale publique (État, collectivités territoriales, + organismes publics, Union Européenne, …) pour un projet établi à + l’initiative de l’association sur une durée déterminée et sans contrepartie. + Il est important de noter que les subventions publiques ne doivent pas être + confondues avec les recettes d’activités d’origine publique. + + + + + + fr.insee + FTN-INSTRUCTION-22 + 1.0 + + tooltip + + + + + EPCI : Établissement Public de Coopération Intercommunale. + Les communautés de communes, communautés urbaines, communautés + d’agglomération, syndicats d’agglomération nouvelle, syndicats de communes + et les métropoles sont des EPCI. + + + + + + fr.insee + FTN-INSTRUCTION-23 + 1.0 + + tooltip + + + + + ARS : Agence régionale de santé + + + + + + fr.insee + FTN-INSTRUCTION-24 + 1.0 + + tooltip + + + + + DREAL : Direction régionale de l’environnement, de + l’aménagement et du logement. + + + + + + fr.insee + FTN-INSTRUCTION-25 + 1.0 + + tooltip + + + + + CNSA : Caisse Nationale de Solidarité pour + l’Autonomie + + + + + + fr.insee + FTN-INSTRUCTION-26 + 1.0 + + tooltip + + + + + EHPAD : Établissement d’Hébergement pour Personnes Âgées + Dépendantes + + + + + + fr.insee + FTN-INSTRUCTION-27 + 1.0 + + tooltip + + + + + GIP : Groupement d’Intérêt Public + + + + + + fr.insee + FTN-INSTRUCTION-28 + 1.0 + + tooltip + + + + + CUI-CAE : Contrat unique d'insertion – contrat + d'accompagnement dans l'emploi + + + + + + fr.insee + FTN-INSTRUCTION-29 + 1.0 + + tooltip + + + + + CUI-CIE : Contrat unique d'insertion – contrat initiative + emploi + + + + + + fr.insee + FTN-INSTRUCTION-30 + 1.0 + + tooltip + + + + + PEC : Parcours emploi compétence + + + + + + fr.insee + FTN-INSTRUCTION-31 + 1.0 + + tooltip + + + + + IAE : Insertion par l’activité économique + + + + + + fr.insee + FTN-INSTRUCTION-32 + 1.0 + + tooltip + + + + + CDDI : Contrat à durée déterminée d’insertion + + + + + + fr.insee + FTN-INSTRUCTION-33 + 1.0 + + tooltip + + + + + CUI-CAE : Contrat unique d'insertion – contrat + d'accompagnement dans l'emploi + + + + + + fr.insee + FTN-INSTRUCTION-34 + 1.0 + + tooltip + + + + + CUI-CIE : Contrat unique d'insertion – contrat initiative + emploi + + + + + + fr.insee + FTN-INSTRUCTION-35 + 1.0 + + tooltip + + + + + PEC : Parcours emploi compétence + + + + + + fr.insee + FTN-INSTRUCTION-36 + 1.0 + + tooltip + + + + + IAE : Insertion par l’activité économique + + + + + + fr.insee + FTN-INSTRUCTION-37 + 1.0 + + tooltip + + + + + CDDI : Contrat à durée déterminée d’insertion + + + + + + fr.insee + FTN-INSTRUCTION-38 + 1.0 + + tooltip + + + + + Les intérimaires travaillant dans votre association sont + des salariés d’une agence d’intérim qui réalisent une mission au sein de + votre association. + + + + + + fr.insee + FTN-INSTRUCTION-39 + 1.0 + + tooltip + + + + + Les personnels mis à la disposition de votre association + autres que les intérimaires sont des personnels d’un organisme extérieur + (public ou privé, autre qu’une agence d’intérim), qui réalisent certaines + activités dans votre association, cette dernière bénéficiant de leurs + compétences sans les rémunérer directement. + + + + + + fr.insee + FTN-INSTRUCTION-40 + 1.0 + + tooltip + + + + + Les personnels mis à la disposition de votre association + dans le cadre du mécénat de compétences sont mis à disposition de + l’association gratuitement par une entreprise. Ces personnes interviennent + pour le compte de l’association sur leur temps de travail rémunéré par + l’entreprise. + + + + + + fr.insee + FTN-INSTRUCTION-41 + 1.0 + + tooltip + + + + + Les volontaires ne sont ni salariés, ni bénévoles. Ils + signent un contrat pour réaliser une mission d’intérêt général et + perçoivent, en contrepartie, une indemnité non assimilable à un salaire. Le + volontariat est dérogatoire au code du travail. + + + + + + fr.insee + FTN-INSTRUCTION-42 + 1.0 + + tooltip + + + + + Les intérimaires travaillant dans votre association sont + des salariés d’une agence d’intérim qui réalisent une mission au sein de + votre association. + + + + + + fr.insee + FTN-INSTRUCTION-43 + 1.0 + + tooltip + + + + + Les personnels mis à la disposition de votre association + autres que les intérimaires sont des personnels d’un organisme extérieur + (public ou privé, autre qu’une agence d’intérim), qui réalisent certaines + activités dans votre association, cette dernière bénéficiant de leurs + compétences sans les rémunérer directement. + + + + + + fr.insee + FTN-INSTRUCTION-44 + 1.0 + + tooltip + + + + + Les personnels mis à la disposition de votre association + dans le cadre du mécénat de compétences sont mis à disposition de + l’association gratuitement par une entreprise. Ces personnes interviennent + pour le compte de l’association sur leur temps de travail rémunéré par + l’entreprise. + + + + + + fr.insee + FTN-INSTRUCTION-45 + 1.0 + + tooltip + + + + + Les volontaires ne sont ni salariés, ni bénévoles. Ils + signent un contrat pour réaliser une mission d’intérêt général et + perçoivent, en contrepartie, une indemnité non assimilable à un salaire. Le + volontariat est dérogatoire au code du travail. + + + + + + + fr.insee + ControlConstructScheme-jmuk1uzy2 + 1.0 + + fr.insee + Sequence-jmuk1uzy2 + 1.0 + + Situation des associations en 2018 + + template + + fr.insee + jqxw4jb4 + 1.0 + Sequence + + + fr.insee + juo1q2na-jrkd64v7-a-jqxw4jb4 + 1.0 + IfThenElse + + + + fr.insee + jqxw4jb4 + 1.0 + + MODULEI + + + L’identité de votre association + + + fr.insee + jrrlh7dt + 1.0 + Instruction + + module + + fr.insee + jqxvugxl-QC + 1.0 + QuestionConstruct + + + fr.insee + jqxvy8en-QC + 1.0 + QuestionConstruct + + + fr.insee + jrkd64v7-a-jqxvy8en + 1.0 + IfThenElse + + + fr.insee + juo1q2na-jrkd64v7-b-jqxx9cx9 + 1.0 + IfThenElse + + + + fr.insee + jrjda7oc + 1.0 + + ModuleII + + + Le mode de gouvernance et les dirigeants de votre + association + + module + + fr.insee + jrjd9qlh + 1.0 + Sequence + + + fr.insee + jrjdfwnv + 1.0 + Sequence + + + fr.insee + jrje3l54 + 1.0 + Sequence + + + fr.insee + jrjdwmig + 1.0 + Sequence + + + fr.insee + jrkcrjf5 + 1.0 + Sequence + + + + fr.insee + jrjd9qlh + 1.0 + + LECONSEILD + + + Le conseil d'administration + + + fr.insee + jrjdgnch + 1.0 + Instruction + + submodule + + fr.insee + jrjda2qx-QC + 1.0 + QuestionConstruct + + + fr.insee + jrqazhg5-a-jrjda2qx + 1.0 + IfThenElse + + + + fr.insee + jrjdfwnv + 1.0 + + LEBUREAU + + + Le bureau + + + fr.insee + jrjdnovb + 1.0 + Instruction + + submodule + + fr.insee + jrjdnoqo-QC + 1.0 + QuestionConstruct + + + fr.insee + jrqao9l2-a-jrjdnoqo + 1.0 + IfThenElse + + + + fr.insee + jrje3l54 + 1.0 + + LEPRSIDENT + + + Le président + + submodule + + fr.insee + jrjdtxvt-QC + 1.0 + QuestionConstruct + + + fr.insee + jrqeofdd-a-jrjdtxvt + 1.0 + IfThenElse + + + + fr.insee + jrjdwmig + 1.0 + + LETRSORIER + + + Le trésorier + + submodule + + fr.insee + jrjdypnr-QC + 1.0 + QuestionConstruct + + + fr.insee + jrqequ0z-a-jrjdypnr + 1.0 + IfThenElse + + + + fr.insee + jrkcrjf5 + 1.0 + + LESECRTAIR + + + Le secrétaire + + submodule + + fr.insee + jrkcsvme-QC + 1.0 + QuestionConstruct + + + fr.insee + jrqes3zn-a-jrkcsvme + 1.0 + IfThenElse + + + + fr.insee + jrkcqyr1 + 1.0 + + MODULEIII + + + Les adhérents de votre association + + module + + fr.insee + jrkctbou-QC + 1.0 + QuestionConstruct + + + fr.insee + jrqf8o1k-a-jrkctbou + 1.0 + IfThenElse + + + + fr.insee + jmuk2e5k + 1.0 + + MODULEIV + + + Domaines d'activités + + module + + fr.insee + jrqgfzes-QC + 1.0 + QuestionConstruct + + + fr.insee + jrqgfzes-CI-0 + 1.0 + ComputationItem + + + fr.insee + jrqgfzes-CI-1 + 1.0 + ComputationItem + + + fr.insee + jrkd4r0n-QC + 1.0 + QuestionConstruct + + + + fr.insee + jrrjezny + 1.0 + + MODULEV + + + Les salariés de votre association + + module + + fr.insee + jseoat5y-QC + 1.0 + QuestionConstruct + + + fr.insee + jski107k-a-jseoat5y + 1.0 + IfThenElse + + + + fr.insee + js0dur5c + 1.0 + + MODULEVI + + + Les personnels non-bénévoles non rémunérés directement + par votre association + + module + + fr.insee + js0dvdaw-QC + 1.0 + QuestionConstruct + + + fr.insee + js0dvdaw-CI-0 + 1.0 + ComputationItem + + + fr.insee + js4e110g-a-js0dvdaw + 1.0 + IfThenElse + + + + fr.insee + js0e7bpv + 1.0 + + MODULEVII + + + Les bénévoles + + + fr.insee + js0eelzf + 1.0 + Instruction + + module + + fr.insee + js0eh523-QC + 1.0 + QuestionConstruct + + + fr.insee + js0eh523-CI-0 + 1.0 + ComputationItem + + + fr.insee + js4egucr-a-js0eh523 + 1.0 + IfThenElse + + + + fr.insee + js0f3pie + 1.0 + + MODULEVIII + + + Les ressources de votre association en 2018 (ou dernier + exercice comptable connu) + + + fr.insee + js0f89di + 1.0 + Instruction + + module + + fr.insee + junsenue-QC + 1.0 + QuestionConstruct + + + fr.insee + junsenue-CI-0 + 1.0 + ComputationItem + + + fr.insee + junsih01-QC + 1.0 + QuestionConstruct + + + fr.insee + junsih01-CI-0 + 1.0 + ComputationItem + + + fr.insee + junsih01-CI-1 + 1.0 + ComputationItem + + + fr.insee + js0f7q4i-QC + 1.0 + QuestionConstruct + + + fr.insee + js0f7q4i-CI-0 + 1.0 + ComputationItem + + + fr.insee + js0f7q4i-CI-1 + 1.0 + ComputationItem + + + fr.insee + js0f7q4i-CI-2 + 1.0 + ComputationItem + + + fr.insee + js0g5z55-QC + 1.0 + QuestionConstruct + + + fr.insee + jvgdp5xz-a-js0g5z55 + 1.0 + IfThenElse + + + + fr.insee + js0gkmjz + 1.0 + + MODULEIX + + + Les charges de votre association en 2018 (ou dernier + exercice comptable connu) + + + fr.insee + js0guqni + 1.0 + Instruction + + module + + fr.insee + js0gv8ia-QC + 1.0 + QuestionConstruct + + + fr.insee + js0gv8ia-CI-0 + 1.0 + ComputationItem + + + fr.insee + js0gv8ia-CI-1 + 1.0 + ComputationItem + + + fr.insee + js0gv8ia-CI-2 + 1.0 + ComputationItem + + + fr.insee + js0gv8ia-CI-3 + 1.0 + ComputationItem + + + + fr.insee + js1w8kts + 1.0 + + MODULEX + + + Les locaux ou terrains mis à disposition de votre + association + + module + + fr.insee + js1vv7o0 + 1.0 + Sequence + + + fr.insee + js1wtg09 + 1.0 + Sequence + + + + fr.insee + js1vv7o0 + 1.0 + + LOCAUX + + + Les locaux mis à disposition de votre + association + + submodule + + fr.insee + js1vv01p-QC + 1.0 + QuestionConstruct + + + fr.insee + jskim1ra-a-js1vv01p + 1.0 + IfThenElse + + + + fr.insee + js1wtg09 + 1.0 + + TERRAINS + + + Les terrains mis à disposition de votre + association + + submodule + + fr.insee + js1wic46-QC + 1.0 + QuestionConstruct + + + fr.insee + jskj4cne-a-js1wic46 + 1.0 + IfThenElse + + + + fr.insee + js1xf53s + 1.0 + + MODULEXI + + + Votre association au sein de réseaux + + + fr.insee + js1xdv2x + 1.0 + Instruction + + module + + fr.insee + js1xblc8-QC + 1.0 + QuestionConstruct + + + fr.insee + jslulnjd-a-js1xblc8 + 1.0 + IfThenElse + + + + fr.insee + jqxywqlc + 1.0 + + MODULEXII + + + Temps réponse et commentaires + + module + + + fr.insee + jrkd64v7-a-jqxvy8en + 1.0 + + A définir + + + + + + + xpath + + fr.insee + jrkd64v7-a-jqxvy8en-IP-1 + 1.0 + + IDENT_ACTIVE + + + + + fr.insee + jqxvy8en-QOP-jqxw8s33 + 1.0 + OutParameter + + + fr.insee + jrkd64v7-a-jqxvy8en-IP-1 + 1.0 + InParameter + + + not(jrkd64v7-a-jqxvy8en-IP-1 = '1') + + + + fr.insee + jrkd64v7-a-jqxvy8en-THEN + 1.0 + Sequence + + + + fr.insee + jrkd64v7-a-jqxvy8en-THEN + 1.0 + + + + hideable + + fr.insee + jqxvz5q8-QC + 1.0 + QuestionConstruct + + + + fr.insee + juo1q2na-jrkd64v7-b-jqxx9cx9 + 1.0 + + A définir + + + + + + + xpath + + fr.insee + juo1q2na-jrkd64v7-b-jqxx9cx9-IP-1 + 1.0 + + IDENT_ACTIVE + + + + fr.insee + juo1q2na-jrkd64v7-b-jqxx9cx9-IP-2 + 1.0 + + IDENT_AN_CESSATION + + + + + fr.insee + jqxvy8en-QOP-jqxw8s33 + 1.0 + OutParameter + + + fr.insee + juo1q2na-jrkd64v7-b-jqxx9cx9-IP-1 + 1.0 + InParameter + + + + + fr.insee + jqxvz5q8-QOP-jqxwmhww + 1.0 + OutParameter + + + fr.insee + juo1q2na-jrkd64v7-b-jqxx9cx9-IP-2 + 1.0 + InParameter + + + not(juo1q2na-jrkd64v7-b-jqxx9cx9-IP-2!='' and number(if + (juo1q2na-jrkd64v7-b-jqxx9cx9-IP-2='') then '0' else + juo1q2na-jrkd64v7-b-jqxx9cx9-IP-2) < 2018) + + + + fr.insee + juo1q2na-jrkd64v7-b-jqxx9cx9-THEN + 1.0 + Sequence + + + + fr.insee + juo1q2na-jrkd64v7-b-jqxx9cx9-THEN + 1.0 + + + + hideable + + fr.insee + d1e01 + 1.0 + IfThenElse + + + fr.insee + jrke1qem-jsnbkxh8-jrke573w-jsnbkxh8-jsnbl8px-jsnbkxh8-b-jrjcj7e6 + 1.0 + IfThenElse + + + fr.insee + jqxxw4zn-QC + 1.0 + QuestionConstruct + + + fr.insee + jqxxgibj-QC + 1.0 + QuestionConstruct + + + fr.insee + jrqaoypv-a-jqxxgibj + 1.0 + IfThenElse + + + fr.insee + jqxxs2n2-QC + 1.0 + QuestionConstruct + + + fr.insee + jqxy6sxf-QC + 1.0 + QuestionConstruct + + + + fr.insee + jrke1qem-a-jqxx9cx9 + 1.0 + + A définir + + + + + + + xpath + + fr.insee + jrke1qem-a-jqxx9cx9-IP-1 + 1.0 + + IDENT_RNA + + + + + fr.insee + jqxx9cx9-QOP-jqxwwtmb + 1.0 + OutParameter + + + fr.insee + jrke1qem-a-jqxx9cx9-IP-1 + 1.0 + InParameter + + + not(jrke1qem-a-jqxx9cx9-IP-1 = '0' ) + + + + fr.insee + jrke1qem-a-jqxx9cx9-THEN + 1.0 + Sequence + + + + fr.insee + jrke1qem-a-jqxx9cx9-THEN + 1.0 + + + + hideable + + fr.insee + jtshlobr-a-jqxx9cx9 + 1.0 + IfThenElse + + + fr.insee + jrke573w-jtshlobr-b-jqxxtf4g + 1.0 + IfThenElse + + + + fr.insee + d1e01 + 1.0 + + A définir + + + + + + + xpath + + fr.insee + d1e01-IP-1 + 1.0 + + ECHANTILLON + + + + + fr.insee + ECHANTILLON + 1.0 + InParameter + + + fr.insee + d1e01-IP-1 + 1.0 + InParameter + + + not(d1e01-IP-1 = '1') + + + + fr.insee + d1e01-THEN + 1.0 + Sequence + + + + fr.insee + d1e01-THEN + 1.0 + + + + hideable + + fr.insee + jrjbj42t-SI + 1.0 + StatementItem + + + fr.insee + jqxx9cx9-QC + 1.0 + QuestionConstruct + + + fr.insee + jrke1qem-a-jqxx9cx9 + 1.0 + IfThenElse + + + + fr.insee + jtshlobr-a-jqxx9cx9 + 1.0 + + A définir + + + + + + + xpath + + fr.insee + jtshlobr-a-jqxx9cx9-IP-1 + 1.0 + + IDENT_NUM_RNA + + + + + fr.insee + IDENT_NUM_RNA + 1.0 + InParameter + + + fr.insee + jtshlobr-a-jqxx9cx9-IP-1 + 1.0 + InParameter + + + not(jtshlobr-a-jqxx9cx9-IP-1 = 'INCONNU') + + + + fr.insee + jtshlobr-a-jqxx9cx9-THEN + 1.0 + Sequence + + + + fr.insee + jtshlobr-a-jqxx9cx9-THEN + 1.0 + + + + hideable + + fr.insee + jqxxe71e-QC + 1.0 + QuestionConstruct + + + + fr.insee + jrke573w-jtshlobr-b-jqxxtf4g + 1.0 + + A définir + + + + + + + xpath + + fr.insee + jrke573w-jtshlobr-b-jqxxtf4g-IP-1 + 1.0 + + IDENT_NUM_RNA + + + + fr.insee + jrke573w-jtshlobr-b-jqxxtf4g-IP-2 + 1.0 + + IDENT_CONF_NUM_RNA + + + + + fr.insee + IDENT_NUM_RNA + 1.0 + InParameter + + + fr.insee + jrke573w-jtshlobr-b-jqxxtf4g-IP-1 + 1.0 + InParameter + + + + + fr.insee + jqxxe71e-QOP-jqxx8tum + 1.0 + OutParameter + + + fr.insee + jrke573w-jtshlobr-b-jqxxtf4g-IP-2 + 1.0 + InParameter + + + not((jrke573w-jtshlobr-b-jqxxtf4g-IP-2 = '1' or + jrke573w-jtshlobr-b-jqxxtf4g-IP-2 = '2') and not + ((jrke573w-jtshlobr-b-jqxxtf4g-IP-1 = 'INCONNU'))) + + + + fr.insee + jrke573w-jtshlobr-b-jqxxtf4g-THEN + 1.0 + Sequence + + + + fr.insee + jrke573w-jtshlobr-b-jqxxtf4g-THEN + 1.0 + + + + hideable + + fr.insee + jqxxtf4g-QC + 1.0 + QuestionConstruct + + + + fr.insee + jrke1qem-jsnbkxh8-jrke573w-jsnbkxh8-jsnbl8px-jsnbkxh8-b-jrjcj7e6 + 1.0 + + A définir + + + + + + + xpath + + fr.insee + jrke1qem-jsnbkxh8-jrke573w-jsnbkxh8-jsnbl8px-jsnbkxh8-b-jrjcj7e6-IP-1 + 1.0 + + IDENT_NUM_RNA + + + + fr.insee + jrke1qem-jsnbkxh8-jrke573w-jsnbkxh8-jsnbl8px-jsnbkxh8-b-jrjcj7e6-IP-2 + 1.0 + + ECHANTILLON + + + + fr.insee + jrke1qem-jsnbkxh8-jrke573w-jsnbkxh8-jsnbl8px-jsnbkxh8-b-jrjcj7e6-IP-3 + 1.0 + + IDENT_RNA + + + + fr.insee + jrke1qem-jsnbkxh8-jrke573w-jsnbkxh8-jsnbl8px-jsnbkxh8-b-jrjcj7e6-IP-4 + 1.0 + + IDENT_CONF_NUM_RNA + + + + + fr.insee + IDENT_NUM_RNA + 1.0 + InParameter + + + fr.insee + jrke1qem-jsnbkxh8-jrke573w-jsnbkxh8-jsnbl8px-jsnbkxh8-b-jrjcj7e6-IP-1 + 1.0 + InParameter + + + + + fr.insee + ECHANTILLON + 1.0 + InParameter + + + fr.insee + jrke1qem-jsnbkxh8-jrke573w-jsnbkxh8-jsnbl8px-jsnbkxh8-b-jrjcj7e6-IP-2 + 1.0 + InParameter + + + + + fr.insee + jqxx9cx9-QOP-jqxwwtmb + 1.0 + OutParameter + + + fr.insee + jrke1qem-jsnbkxh8-jrke573w-jsnbkxh8-jsnbl8px-jsnbkxh8-b-jrjcj7e6-IP-3 + 1.0 + InParameter + + + + + fr.insee + jqxxe71e-QOP-jqxx8tum + 1.0 + OutParameter + + + fr.insee + jrke1qem-jsnbkxh8-jrke573w-jsnbkxh8-jsnbl8px-jsnbkxh8-b-jrjcj7e6-IP-4 + 1.0 + InParameter + + + not(((jrke1qem-jsnbkxh8-jrke573w-jsnbkxh8-jsnbl8px-jsnbkxh8-b-jrjcj7e6-IP-3 + = '0' ) and not + ((jrke1qem-jsnbkxh8-jrke573w-jsnbkxh8-jsnbl8px-jsnbkxh8-b-jrjcj7e6-IP-2 = + '1'))) or + ((jrke1qem-jsnbkxh8-jrke573w-jsnbkxh8-jsnbl8px-jsnbkxh8-b-jrjcj7e6-IP-4 = '1' + or jrke1qem-jsnbkxh8-jrke573w-jsnbkxh8-jsnbl8px-jsnbkxh8-b-jrjcj7e6-IP-4 = '2') + and not ((jrke1qem-jsnbkxh8-jrke573w-jsnbkxh8-jsnbl8px-jsnbkxh8-b-jrjcj7e6-IP-1 + = 'INCONNU') or + (jrke1qem-jsnbkxh8-jrke573w-jsnbkxh8-jsnbl8px-jsnbkxh8-b-jrjcj7e6-IP-2 = '1'))) + or ((jrke1qem-jsnbkxh8-jrke573w-jsnbkxh8-jsnbl8px-jsnbkxh8-b-jrjcj7e6-IP-2 = + '2') and not + ((jrke1qem-jsnbkxh8-jrke573w-jsnbkxh8-jsnbl8px-jsnbkxh8-b-jrjcj7e6-IP-2 = + '1')))) + + + + fr.insee + jrke1qem-jsnbkxh8-jrke573w-jsnbkxh8-jsnbl8px-jsnbkxh8-b-jrjcj7e6-THEN + 1.0 + Sequence + + + + fr.insee + jrke1qem-jsnbkxh8-jrke573w-jsnbkxh8-jsnbl8px-jsnbkxh8-b-jrjcj7e6-THEN + 1.0 + + + + hideable + + fr.insee + jrjcf68f-SI + 1.0 + StatementItem + + + fr.insee + jrjcj7e6-QC + 1.0 + QuestionConstruct + + + fr.insee + jrjcj7e6-CI-0 + 1.0 + ComputationItem + + + + fr.insee + jrqaoypv-a-jqxxgibj + 1.0 + + A définir + + + + + + + xpath + + fr.insee + jrqaoypv-a-jqxxgibj-IP-1 + 1.0 + + IDENT_NIV_GEO + + + + + fr.insee + jqxxgibj-QOP-jqxxty1j + 1.0 + OutParameter + + + fr.insee + jrqaoypv-a-jqxxgibj-IP-1 + 1.0 + InParameter + + + not(jrqaoypv-a-jqxxgibj-IP-1 ='7') + + + + fr.insee + jrqaoypv-a-jqxxgibj-THEN + 1.0 + Sequence + + + + fr.insee + jrqaoypv-a-jqxxgibj-THEN + 1.0 + + + + hideable + + fr.insee + jqxxsed0-QC + 1.0 + QuestionConstruct + + + + fr.insee + juo1q2na-jrkd64v7-a-jqxw4jb4 + 1.0 + + A définir + + + + + + + xpath + + fr.insee + juo1q2na-jrkd64v7-a-jqxw4jb4-IP-1 + 1.0 + + IDENT_ACTIVE + + + + fr.insee + juo1q2na-jrkd64v7-a-jqxw4jb4-IP-2 + 1.0 + + IDENT_AN_CESSATION + + + + + fr.insee + jqxvy8en-QOP-jqxw8s33 + 1.0 + OutParameter + + + fr.insee + juo1q2na-jrkd64v7-a-jqxw4jb4-IP-1 + 1.0 + InParameter + + + + + fr.insee + jqxvz5q8-QOP-jqxwmhww + 1.0 + OutParameter + + + fr.insee + juo1q2na-jrkd64v7-a-jqxw4jb4-IP-2 + 1.0 + InParameter + + + not(juo1q2na-jrkd64v7-a-jqxw4jb4-IP-2!='' and number(if + (juo1q2na-jrkd64v7-a-jqxw4jb4-IP-2='') then '0' else + juo1q2na-jrkd64v7-a-jqxw4jb4-IP-2) < 2018) + + + + fr.insee + juo1q2na-jrkd64v7-a-jqxw4jb4-THEN + 1.0 + Sequence + + + + fr.insee + juo1q2na-jrkd64v7-a-jqxw4jb4-THEN + 1.0 + + + + hideable + + fr.insee + jrjda7oc + 1.0 + Sequence + + + fr.insee + jrkcqyr1 + 1.0 + Sequence + + + fr.insee + jmuk2e5k + 1.0 + Sequence + + + fr.insee + jrrjezny + 1.0 + Sequence + + + fr.insee + js0dur5c + 1.0 + Sequence + + + fr.insee + js0e7bpv + 1.0 + Sequence + + + fr.insee + js0f3pie + 1.0 + Sequence + + + fr.insee + js0gkmjz + 1.0 + Sequence + + + fr.insee + js1w8kts + 1.0 + Sequence + + + fr.insee + js1xf53s + 1.0 + Sequence + + + + fr.insee + jrqazhg5-a-jrjda2qx + 1.0 + + A définir + + + + + + + xpath + + fr.insee + jrqazhg5-a-jrjda2qx-IP-1 + 1.0 + + GOUV_CA_EXIST + + + + + fr.insee + jrjda2qx-QOP-jrjd9kim + 1.0 + OutParameter + + + fr.insee + jrqazhg5-a-jrjda2qx-IP-1 + 1.0 + InParameter + + + not(jrqazhg5-a-jrjda2qx-IP-1 = '0') + + + + fr.insee + jrqazhg5-a-jrjda2qx-THEN + 1.0 + Sequence + + + + fr.insee + jrqazhg5-a-jrjda2qx-THEN + 1.0 + + + + hideable + + fr.insee + jrjd54n7-QC + 1.0 + QuestionConstruct + + + fr.insee + jrjdhk1u-QC + 1.0 + QuestionConstruct + + + fr.insee + jrjdhk1u-CI-0 + 1.0 + ComputationItem + + + + fr.insee + jrqao9l2-a-jrjdnoqo + 1.0 + + A définir + + + + + + + xpath + + fr.insee + jrqao9l2-a-jrjdnoqo-IP-1 + 1.0 + + GOUV_BUREAU_EXIST + + + + + fr.insee + jrjdnoqo-QOP-jrjdpfju + 1.0 + OutParameter + + + fr.insee + jrqao9l2-a-jrjdnoqo-IP-1 + 1.0 + InParameter + + + not(jrqao9l2-a-jrjdnoqo-IP-1 = '0') + + + + fr.insee + jrqao9l2-a-jrjdnoqo-THEN + 1.0 + Sequence + + + + fr.insee + jrqao9l2-a-jrjdnoqo-THEN + 1.0 + + + + hideable + + fr.insee + jrjdgpya-QC + 1.0 + QuestionConstruct + + + fr.insee + jrjdmxr3-QC + 1.0 + QuestionConstruct + + + fr.insee + jrjdmxr3-CI-0 + 1.0 + ComputationItem + + + + fr.insee + jrqeofdd-a-jrjdtxvt + 1.0 + + A définir + + + + + + + xpath + + fr.insee + jrqeofdd-a-jrjdtxvt-IP-1 + 1.0 + + GOUV_PDT_EXIST + + + + + fr.insee + jrjdtxvt-QOP-jrjdxa3i + 1.0 + OutParameter + + + fr.insee + jrqeofdd-a-jrjdtxvt-IP-1 + 1.0 + InParameter + + + not(jrqeofdd-a-jrjdtxvt-IP-1 = '0' or jrqeofdd-a-jrjdtxvt-IP-1 = + '2') + + + + fr.insee + jrqeofdd-a-jrjdtxvt-THEN + 1.0 + Sequence + + + + fr.insee + jrqeofdd-a-jrjdtxvt-THEN + 1.0 + + + + hideable + + fr.insee + jrjdn5o5-QC + 1.0 + QuestionConstruct + + + fr.insee + jrje3unr-QC + 1.0 + QuestionConstruct + + + fr.insee + jrjds2dp-QC + 1.0 + QuestionConstruct + + + + fr.insee + jrqequ0z-a-jrjdypnr + 1.0 + + A définir + + + + + + + xpath + + fr.insee + jrqequ0z-a-jrjdypnr-IP-1 + 1.0 + + GOUV_TRESOR_EXIST + + + + + fr.insee + jrjdypnr-QOP-jrjehc9e + 1.0 + OutParameter + + + fr.insee + jrqequ0z-a-jrjdypnr-IP-1 + 1.0 + InParameter + + + not(jrqequ0z-a-jrjdypnr-IP-1 = '0') + + + + fr.insee + jrqequ0z-a-jrjdypnr-THEN + 1.0 + Sequence + + + + fr.insee + jrqequ0z-a-jrjdypnr-THEN + 1.0 + + + + hideable + + fr.insee + jrkcdydx-QC + 1.0 + QuestionConstruct + + + fr.insee + jrkcgkye-QC + 1.0 + QuestionConstruct + + + fr.insee + jrkccq4q-QC + 1.0 + QuestionConstruct + + + + fr.insee + jrqes3zn-a-jrkcsvme + 1.0 + + A définir + + + + + + + xpath + + fr.insee + jrqes3zn-a-jrkcsvme-IP-1 + 1.0 + + GOUV_SECRET_EXIST + + + + + fr.insee + jrkcsvme-QOP-jrkco2h6 + 1.0 + OutParameter + + + fr.insee + jrqes3zn-a-jrkcsvme-IP-1 + 1.0 + InParameter + + + not(jrqes3zn-a-jrkcsvme-IP-1 = '0') + + + + fr.insee + jrqes3zn-a-jrkcsvme-THEN + 1.0 + Sequence + + + + fr.insee + jrqes3zn-a-jrkcsvme-THEN + 1.0 + + + + hideable + + fr.insee + jrkcnb33-QC + 1.0 + QuestionConstruct + + + fr.insee + jrkcgtrt-QC + 1.0 + QuestionConstruct + + + fr.insee + jrkcxp0c-QC + 1.0 + QuestionConstruct + + + + fr.insee + jrqf8o1k-a-jrkctbou + 1.0 + + A définir + + + + + + + xpath + + fr.insee + jrqf8o1k-a-jrkctbou-IP-1 + 1.0 + + AD_PP + + + + fr.insee + jrqf8o1k-a-jrkctbou-IP-2 + 1.0 + + AD_ASSO + + + + fr.insee + jrqf8o1k-a-jrkctbou-IP-3 + 1.0 + + AD_ENTPRIV + + + + fr.insee + jrqf8o1k-a-jrkctbou-IP-4 + 1.0 + + AD_COLLPUB + + + + fr.insee + jrqf8o1k-a-jrkctbou-IP-5 + 1.0 + + AD_AUTRES + + + + + fr.insee + jrkctbou-QOP-jvmg5u30 + 1.0 + OutParameter + + + fr.insee + jrqf8o1k-a-jrkctbou-IP-1 + 1.0 + InParameter + + + + + fr.insee + jrkctbou-QOP-jvmg014v + 1.0 + OutParameter + + + fr.insee + jrqf8o1k-a-jrkctbou-IP-2 + 1.0 + InParameter + + + + + fr.insee + jrkctbou-QOP-jvmg13p6 + 1.0 + OutParameter + + + fr.insee + jrqf8o1k-a-jrkctbou-IP-3 + 1.0 + InParameter + + + + + fr.insee + jrkctbou-QOP-jvmfv25y + 1.0 + OutParameter + + + fr.insee + jrqf8o1k-a-jrkctbou-IP-4 + 1.0 + InParameter + + + + + fr.insee + jrkctbou-QOP-jvmfs5xd + 1.0 + OutParameter + + + fr.insee + jrqf8o1k-a-jrkctbou-IP-5 + 1.0 + InParameter + + + not(jrqf8o1k-a-jrkctbou-IP-1 = '0' and jrqf8o1k-a-jrkctbou-IP-2 + = '0' and jrqf8o1k-a-jrkctbou-IP-3 = '0' and jrqf8o1k-a-jrkctbou-IP-4 = '0' and + jrqf8o1k-a-jrkctbou-IP-5 = '0') + + + + fr.insee + jrqf8o1k-a-jrkctbou-THEN + 1.0 + Sequence + + + + fr.insee + jrqf8o1k-a-jrkctbou-THEN + 1.0 + + + + hideable + + fr.insee + jrqf6kqk-a-jrkctbou + 1.0 + IfThenElse + + + fr.insee + jrkcrrfa-QC + 1.0 + QuestionConstruct + + + fr.insee + jrkcrrfa-CI-0 + 1.0 + ComputationItem + + + fr.insee + jrkcrrfa-CI-1 + 1.0 + ComputationItem + + + fr.insee + jrkcrrfa-CI-2 + 1.0 + ComputationItem + + + fr.insee + jrkcrrfa-CI-3 + 1.0 + ComputationItem + + + fr.insee + jrkcrrfa-CI-4 + 1.0 + ComputationItem + + + fr.insee + jrkcrrfa-CI-5 + 1.0 + ComputationItem + + + fr.insee + jrkcrrfa-CI-6 + 1.0 + ComputationItem + + + fr.insee + jrkcrrfa-CI-7 + 1.0 + ComputationItem + + + fr.insee + jrkcrrfa-CI-8 + 1.0 + ComputationItem + + + fr.insee + jrkcrrfa-CI-9 + 1.0 + ComputationItem + + + fr.insee + jrkcrrfa-CI-10 + 1.0 + ComputationItem + + + fr.insee + jrkcrrfa-CI-11 + 1.0 + ComputationItem + + + fr.insee + jrkcrrfa-CI-12 + 1.0 + ComputationItem + + + fr.insee + jrkcrrfa-CI-13 + 1.0 + ComputationItem + + + fr.insee + jrkcrrfa-CI-14 + 1.0 + ComputationItem + + + + fr.insee + jrqf6kqk-a-jrkctbou + 1.0 + + A définir + + + + + + + xpath + + fr.insee + jrqf6kqk-a-jrkctbou-IP-1 + 1.0 + + AD_PP + + + + fr.insee + jrqf6kqk-a-jrkctbou-IP-2 + 1.0 + + AD_ASSO + + + + fr.insee + jrqf6kqk-a-jrkctbou-IP-3 + 1.0 + + AD_ENTPRIV + + + + fr.insee + jrqf6kqk-a-jrkctbou-IP-4 + 1.0 + + AD_COLLPUB + + + + fr.insee + jrqf6kqk-a-jrkctbou-IP-5 + 1.0 + + AD_AUTRES + + + + + fr.insee + jrkctbou-QOP-jvmg5u30 + 1.0 + OutParameter + + + fr.insee + jrqf6kqk-a-jrkctbou-IP-1 + 1.0 + InParameter + + + + + fr.insee + jrkctbou-QOP-jvmg014v + 1.0 + OutParameter + + + fr.insee + jrqf6kqk-a-jrkctbou-IP-2 + 1.0 + InParameter + + + + + fr.insee + jrkctbou-QOP-jvmg13p6 + 1.0 + OutParameter + + + fr.insee + jrqf6kqk-a-jrkctbou-IP-3 + 1.0 + InParameter + + + + + fr.insee + jrkctbou-QOP-jvmfv25y + 1.0 + OutParameter + + + fr.insee + jrqf6kqk-a-jrkctbou-IP-4 + 1.0 + InParameter + + + + + fr.insee + jrkctbou-QOP-jvmfs5xd + 1.0 + OutParameter + + + fr.insee + jrqf6kqk-a-jrkctbou-IP-5 + 1.0 + InParameter + + + not((jrqf6kqk-a-jrkctbou-IP-1 != '0' or jrqf6kqk-a-jrkctbou-IP-2 + != '0' or jrqf6kqk-a-jrkctbou-IP-3 != '0' or jrqf6kqk-a-jrkctbou-IP-4 != '0') and + jrqf6kqk-a-jrkctbou-IP-5 = '0') + + + + fr.insee + jrqf6kqk-a-jrkctbou-THEN + 1.0 + Sequence + + + + fr.insee + jrqf6kqk-a-jrkctbou-THEN + 1.0 + + + + hideable + + fr.insee + jrkd7a3w-QC + 1.0 + QuestionConstruct + + + fr.insee + jrkd7a3w-CI-0 + 1.0 + ComputationItem + + + + fr.insee + jski107k-a-jseoat5y + 1.0 + + A définir + + + + + + + xpath + + fr.insee + jski107k-a-jseoat5y-IP-1 + 1.0 + + SAL_EMP + + + + + fr.insee + jseoat5y-QOP-jseo51cx + 1.0 + OutParameter + + + fr.insee + jski107k-a-jseoat5y-IP-1 + 1.0 + InParameter + + + not(jski107k-a-jseoat5y-IP-1 = '0') + + + + fr.insee + jski107k-a-jseoat5y-THEN + 1.0 + Sequence + + + + fr.insee + jski107k-a-jseoat5y-THEN + 1.0 + + + + hideable + + fr.insee + js0d53t6-QC + 1.0 + QuestionConstruct + + + fr.insee + js0d53t6-CI-0 + 1.0 + ComputationItem + + + fr.insee + jski9scj-a-js0d53t6 + 1.0 + IfThenElse + + + + fr.insee + jski9scj-a-js0d53t6 + 1.0 + + A définir + + + + + + + xpath + + fr.insee + jski9scj-a-js0d53t6-IP-1 + 1.0 + + SAL_NB_H + + + + + fr.insee + js0d53t6-QOP-js0czgby + 1.0 + OutParameter + + + fr.insee + jski9scj-a-js0d53t6-IP-1 + 1.0 + InParameter + + + not(number(if (jski9scj-a-js0d53t6-IP-1='') then '0' else + jski9scj-a-js0d53t6-IP-1) = 0 and jski9scj-a-js0d53t6-IP-1!='') + + + + fr.insee + jski9scj-a-js0d53t6-THEN + 1.0 + Sequence + + + + fr.insee + jski9scj-a-js0d53t6-THEN + 1.0 + + + + hideable + + fr.insee + js0di1io-QC + 1.0 + QuestionConstruct + + + fr.insee + jski8d2y-a-js0di1io + 1.0 + IfThenElse + + + fr.insee + jseoi4yc-QC + 1.0 + QuestionConstruct + + + fr.insee + jseoi4yc-CI-0 + 1.0 + ComputationItem + + + fr.insee + jskicrkc-a-jseoi4yc + 1.0 + IfThenElse + + + + fr.insee + jski8d2y-a-js0di1io + 1.0 + + A définir + + + + + + + xpath + + fr.insee + jski8d2y-a-js0di1io-IP-1 + 1.0 + + SAL_CA + + + + fr.insee + jski8d2y-a-js0di1io-IP-2 + 1.0 + + SAL_CDI + + + + fr.insee + jski8d2y-a-js0di1io-IP-3 + 1.0 + + SAL_CDD + + + + + fr.insee + js0di1io-QOP-jvmfvkhi + 1.0 + OutParameter + + + fr.insee + jski8d2y-a-js0di1io-IP-1 + 1.0 + InParameter + + + + + fr.insee + js0di1io-QOP-jvmfwwbw + 1.0 + OutParameter + + + fr.insee + jski8d2y-a-js0di1io-IP-2 + 1.0 + InParameter + + + + + fr.insee + js0di1io-QOP-jvmfwqal + 1.0 + OutParameter + + + fr.insee + jski8d2y-a-js0di1io-IP-3 + 1.0 + InParameter + + + not(jski8d2y-a-js0di1io-IP-1 = '0' and jski8d2y-a-js0di1io-IP-2 + = '0' and jski8d2y-a-js0di1io-IP-3 = '0') + + + + fr.insee + jski8d2y-a-js0di1io-THEN + 1.0 + Sequence + + + + fr.insee + jski8d2y-a-js0di1io-THEN + 1.0 + + + + hideable + + fr.insee + js0dpd65-QC + 1.0 + QuestionConstruct + + + fr.insee + js0dpd65-CI-0 + 1.0 + ComputationItem + + + fr.insee + js0dpd65-CI-1 + 1.0 + ComputationItem + + + fr.insee + js0dpd65-CI-2 + 1.0 + ComputationItem + + + fr.insee + js0dpd65-CI-3 + 1.0 + ComputationItem + + + fr.insee + js0dpd65-CI-4 + 1.0 + ComputationItem + + + fr.insee + js0dpd65-CI-5 + 1.0 + ComputationItem + + + fr.insee + js0dpd65-CI-6 + 1.0 + ComputationItem + + + fr.insee + js0dpd65-CI-7 + 1.0 + ComputationItem + + + fr.insee + js0dpd65-CI-8 + 1.0 + ComputationItem + + + fr.insee + js0dpd65-CI-9 + 1.0 + ComputationItem + + + + fr.insee + jskicrkc-a-jseoi4yc + 1.0 + + A définir + + + + + + + xpath + + fr.insee + jskicrkc-a-jseoi4yc-IP-1 + 1.0 + + SAL_NB + + + + + fr.insee + jseoi4yc-QOP-jseo0mfc + 1.0 + OutParameter + + + fr.insee + jskicrkc-a-jseoi4yc-IP-1 + 1.0 + InParameter + + + not(number(if (jskicrkc-a-jseoi4yc-IP-1='') then '0' else + jskicrkc-a-jseoi4yc-IP-1) = 0 and jskicrkc-a-jseoi4yc-IP-1!='') + + + + fr.insee + jskicrkc-a-jseoi4yc-THEN + 1.0 + Sequence + + + + fr.insee + jskicrkc-a-jseoi4yc-THEN + 1.0 + + + + hideable + + fr.insee + jseoe6ty-QC + 1.0 + QuestionConstruct + + + fr.insee + jseoe6ty-CI-0 + 1.0 + ComputationItem + + + fr.insee + jseoe6ty-CI-1 + 1.0 + ComputationItem + + + fr.insee + jseoe6ty-CI-2 + 1.0 + ComputationItem + + + fr.insee + jseoe6ty-CI-3 + 1.0 + ComputationItem + + + fr.insee + jseoe6ty-CI-4 + 1.0 + ComputationItem + + + + fr.insee + js4e110g-a-js0dvdaw + 1.0 + + A définir + + + + + + + xpath + + fr.insee + js4e110g-a-js0dvdaw-IP-1 + 1.0 + + AUT_PERS_INTERIM + + + + fr.insee + js4e110g-a-js0dvdaw-IP-2 + 1.0 + + AUT_PERS_MAD + + + + fr.insee + js4e110g-a-js0dvdaw-IP-3 + 1.0 + + AUT_PERS_VOL + + + + fr.insee + js4e110g-a-js0dvdaw-IP-4 + 1.0 + + AUT_PERS_AUTRES + + + + + fr.insee + js0dvdaw-QOP-jvmg80aa + 1.0 + OutParameter + + + fr.insee + js4e110g-a-js0dvdaw-IP-1 + 1.0 + InParameter + + + + + fr.insee + js0dvdaw-QOP-jvmg0q44 + 1.0 + OutParameter + + + fr.insee + js4e110g-a-js0dvdaw-IP-2 + 1.0 + InParameter + + + + + fr.insee + js0dvdaw-QOP-jvmfv87q + 1.0 + OutParameter + + + fr.insee + js4e110g-a-js0dvdaw-IP-3 + 1.0 + InParameter + + + + + fr.insee + js0dvdaw-QOP-jvmfxlqr + 1.0 + OutParameter + + + fr.insee + js4e110g-a-js0dvdaw-IP-4 + 1.0 + InParameter + + + not(js4e110g-a-js0dvdaw-IP-1 = '0' and js4e110g-a-js0dvdaw-IP-2 + = '0' and js4e110g-a-js0dvdaw-IP-3 = '0' and js4e110g-a-js0dvdaw-IP-4 = '0') + + + + + fr.insee + js4e110g-a-js0dvdaw-THEN + 1.0 + Sequence + + + + fr.insee + js4e110g-a-js0dvdaw-THEN + 1.0 + + + + hideable + + fr.insee + js0dwvc2-QC + 1.0 + QuestionConstruct + + + fr.insee + js0dwvc2-CI-0 + 1.0 + ComputationItem + + + fr.insee + js0dwvc2-CI-1 + 1.0 + ComputationItem + + + fr.insee + js0dwvc2-CI-2 + 1.0 + ComputationItem + + + fr.insee + js0dwvc2-CI-3 + 1.0 + ComputationItem + + + fr.insee + js0dwvc2-CI-4 + 1.0 + ComputationItem + + + fr.insee + js0dwvc2-CI-5 + 1.0 + ComputationItem + + + fr.insee + js0dwvc2-CI-6 + 1.0 + ComputationItem + + + fr.insee + js0dwvc2-CI-7 + 1.0 + ComputationItem + + + fr.insee + js0dwvc2-CI-8 + 1.0 + ComputationItem + + + fr.insee + js0dwvc2-CI-9 + 1.0 + ComputationItem + + + fr.insee + js0dwvc2-CI-10 + 1.0 + ComputationItem + + + fr.insee + js0dwvc2-CI-11 + 1.0 + ComputationItem + + + + fr.insee + js4egucr-a-js0eh523 + 1.0 + + A définir + + + + + + + xpath + + fr.insee + js4egucr-a-js0eh523-IP-1 + 1.0 + + BENEV_NB + + + + + fr.insee + js0eh523-QOP-js0e63o9 + 1.0 + OutParameter + + + fr.insee + js4egucr-a-js0eh523-IP-1 + 1.0 + InParameter + + + not(number(if (js4egucr-a-js0eh523-IP-1='') then '0' else + js4egucr-a-js0eh523-IP-1) = 0 and js4egucr-a-js0eh523-IP-1!='') + + + + fr.insee + js4egucr-a-js0eh523-THEN + 1.0 + Sequence + + + + fr.insee + js4egucr-a-js0eh523-THEN + 1.0 + + + + hideable + + fr.insee + js0egvao-QC + 1.0 + QuestionConstruct + + + fr.insee + js0egvao-CI-0 + 1.0 + ComputationItem + + + fr.insee + js0eg1cf-QC + 1.0 + QuestionConstruct + + + fr.insee + js0eg1cf-CI-0 + 1.0 + ComputationItem + + + fr.insee + js0eg1cf-CI-1 + 1.0 + ComputationItem + + + fr.insee + js0eg1cf-CI-2 + 1.0 + ComputationItem + + + fr.insee + js0eg1cf-CI-3 + 1.0 + ComputationItem + + + fr.insee + js0eg1cf-CI-4 + 1.0 + ComputationItem + + + fr.insee + js0eg1cf-CI-5 + 1.0 + ComputationItem + + + fr.insee + js0en9yl-QC + 1.0 + QuestionConstruct + + + fr.insee + jskiehhi-a-js0en9yl + 1.0 + IfThenElse + + + fr.insee + js0ema6d-QC + 1.0 + QuestionConstruct + + + fr.insee + jskiwraj-a-js0ema6d + 1.0 + IfThenElse + + + fr.insee + jvgdoydj-jskiwraj-b-js0ezdnw + 1.0 + IfThenElse + + + + fr.insee + jskiehhi-a-js0en9yl + 1.0 + + A définir + + + + + + + xpath + + fr.insee + jskiehhi-a-js0en9yl-IP-1 + 1.0 + + BENEV_FORM + + + + + fr.insee + js0en9yl-QOP-js0elnnk + 1.0 + OutParameter + + + fr.insee + jskiehhi-a-js0en9yl-IP-1 + 1.0 + InParameter + + + not(jskiehhi-a-js0en9yl-IP-1 = '0') + + + + fr.insee + jskiehhi-a-js0en9yl-THEN + 1.0 + Sequence + + + + fr.insee + jskiehhi-a-js0en9yl-THEN + 1.0 + + + + hideable + + fr.insee + js0ef83m-QC + 1.0 + QuestionConstruct + + + fr.insee + jskifr2b-a-js0ef83m + 1.0 + IfThenElse + + + + fr.insee + jskifr2b-a-js0ef83m + 1.0 + + A définir + + + + + + + xpath + + fr.insee + jskifr2b-a-js0ef83m-IP-1 + 1.0 + + BENEV_FORM_CHARGES + + + + + fr.insee + js0ef83m-QOP-js0ep1yk + 1.0 + OutParameter + + + fr.insee + jskifr2b-a-js0ef83m-IP-1 + 1.0 + InParameter + + + not(jskifr2b-a-js0ef83m-IP-1 = '0') + + + + fr.insee + jskifr2b-a-js0ef83m-THEN + 1.0 + Sequence + + + + fr.insee + jskifr2b-a-js0ef83m-THEN + 1.0 + + + + hideable + + fr.insee + js0et52n-QC + 1.0 + QuestionConstruct + + + + fr.insee + jskiwraj-a-js0ema6d + 1.0 + + A définir + + + + + + + xpath + + fr.insee + jskiwraj-a-js0ema6d-IP-1 + 1.0 + + BENEV_REMB_FRAIS + + + + + fr.insee + js0ema6d-QOP-js0eoqcr + 1.0 + OutParameter + + + fr.insee + jskiwraj-a-js0ema6d-IP-1 + 1.0 + InParameter + + + not(jskiwraj-a-js0ema6d-IP-1 = '0') + + + + fr.insee + jskiwraj-a-js0ema6d-THEN + 1.0 + Sequence + + + + fr.insee + jskiwraj-a-js0ema6d-THEN + 1.0 + + + + hideable + + fr.insee + js0errla-QC + 1.0 + QuestionConstruct + + + + fr.insee + jvgdoydj-jskiwraj-b-js0ezdnw + 1.0 + + A définir + + + + + + + xpath + + fr.insee + jvgdoydj-jskiwraj-b-js0ezdnw-IP-1 + 1.0 + + SAL_EMP + + + + + fr.insee + jseoat5y-QOP-jseo51cx + 1.0 + OutParameter + + + fr.insee + jvgdoydj-jskiwraj-b-js0ezdnw-IP-1 + 1.0 + InParameter + + + not(jvgdoydj-jskiwraj-b-js0ezdnw-IP-1 = '0') + + + + fr.insee + jvgdoydj-jskiwraj-b-js0ezdnw-THEN + 1.0 + Sequence + + + + fr.insee + jvgdoydj-jskiwraj-b-js0ezdnw-THEN + 1.0 + + + + hideable + + fr.insee + js0ezdnw-QC + 1.0 + QuestionConstruct + + + + fr.insee + jvgdp5xz-a-js0g5z55 + 1.0 + + A définir + + + + + + + xpath + + fr.insee + jvgdp5xz-a-js0g5z55-IP-1 + 1.0 + + RESS_RECETTE_ACT_PUB + + + + fr.insee + jvgdp5xz-a-js0g5z55-IP-2 + 1.0 + + RESS_SUBV + + + + + fr.insee + js0f7q4i-QOP-jvmfwzam + 1.0 + OutParameter + + + fr.insee + jvgdp5xz-a-js0g5z55-IP-1 + 1.0 + InParameter + + + + + fr.insee + js0f7q4i-QOP-jvmfvhj4 + 1.0 + OutParameter + + + fr.insee + jvgdp5xz-a-js0g5z55-IP-2 + 1.0 + InParameter + + + not(number(if (jvgdp5xz-a-js0g5z55-IP-1='') then '0' else + jvgdp5xz-a-js0g5z55-IP-1) = 0 and jvgdp5xz-a-js0g5z55-IP-1!='' and number(if (jvgdp5xz-a-js0g5z55-IP-2='') then + '0' else jvgdp5xz-a-js0g5z55-IP-2) = 0 and jvgdp5xz-a-js0g5z55-IP-2!='') + + + + fr.insee + jvgdp5xz-a-js0g5z55-THEN + 1.0 + Sequence + + + + fr.insee + jvgdp5xz-a-js0g5z55-THEN + 1.0 + + + + hideable + + fr.insee + js0g28m1-QC + 1.0 + QuestionConstruct + + + fr.insee + js0g28m1-CI-0 + 1.0 + ComputationItem + + + fr.insee + js0g28m1-CI-1 + 1.0 + ComputationItem + + + fr.insee + js0g28m1-CI-2 + 1.0 + ComputationItem + + + fr.insee + js0g28m1-CI-3 + 1.0 + ComputationItem + + + fr.insee + jvgqtg7s-a-js0g28m1 + 1.0 + IfThenElse + + + fr.insee + d1e1 + 1.0 + IfThenElse + + + + fr.insee + jvgqtg7s-a-js0g28m1 + 1.0 + + A définir + + + + + + + xpath + + fr.insee + jvgqtg7s-a-js0g28m1-IP-1 + 1.0 + + RESS_SUBV_AUTRES + + + + + fr.insee + js0g28m1-QOP-jvmfwc9t + 1.0 + OutParameter + + + fr.insee + jvgqtg7s-a-js0g28m1-IP-1 + 1.0 + InParameter + + + not(number(if (jvgqtg7s-a-js0g28m1-IP-1='') then '0' else + jvgqtg7s-a-js0g28m1-IP-1)=0) + + + + fr.insee + jvgqtg7s-a-js0g28m1-THEN + 1.0 + Sequence + + + + fr.insee + jvgqtg7s-a-js0g28m1-THEN + 1.0 + + + + hideable + + fr.insee + jvgc8k0y-QC + 1.0 + QuestionConstruct + + + fr.insee + jvgc8k0y-CI-0 + 1.0 + ComputationItem + + + + fr.insee + d1e1 + 1.0 + + A définir + + + + + + + xpath + + fr.insee + d1e1-IP-1 + 1.0 + + RESS_REC_ACT_AUTRES + + + + + fr.insee + js0g28m1-QOP-jvmg3112 + 1.0 + OutParameter + + + fr.insee + d1e1-IP-1 + 1.0 + InParameter + + + not(number(if (d1e1-IP-1='') then '0' else + d1e1-IP-1)=0) + + + + fr.insee + d1e1-THEN + 1.0 + Sequence + + + + fr.insee + d1e1-THEN + 1.0 + + + + hideable + + fr.insee + jvgcdcjx-QC + 1.0 + QuestionConstruct + + + fr.insee + jvgcdcjx-CI-0 + 1.0 + ComputationItem + + + + fr.insee + jskim1ra-a-js1vv01p + 1.0 + + A définir + + + + + + + xpath + + fr.insee + jskim1ra-a-js1vv01p-IP-1 + 1.0 + + MAD_LOCAUX + + + + + fr.insee + js1vv01p-QOP-js1vzbye + 1.0 + OutParameter + + + fr.insee + jskim1ra-a-js1vv01p-IP-1 + 1.0 + InParameter + + + not(jskim1ra-a-js1vv01p-IP-1 = '0') + + + + fr.insee + jskim1ra-a-js1vv01p-THEN + 1.0 + Sequence + + + + fr.insee + jskim1ra-a-js1vv01p-THEN + 1.0 + + + + hideable + + fr.insee + js1w04zo-QC + 1.0 + QuestionConstruct + + + fr.insee + js1wasgx-QC + 1.0 + QuestionConstruct + + + fr.insee + jskiyz80-a-js1wasgx + 1.0 + IfThenElse + + + fr.insee + jskizmdn-jskiyz80-b-js1wc3wz + 1.0 + IfThenElse + + + fr.insee + js1wcxvg-QC + 1.0 + QuestionConstruct + + + fr.insee + js1wmyn8-QC + 1.0 + QuestionConstruct + + + fr.insee + js1wmyn8-CI-0 + 1.0 + ComputationItem + + + + fr.insee + jskiyz80-a-js1wasgx + 1.0 + + A définir + + + + + + + xpath + + fr.insee + jskiyz80-a-js1wasgx-IP-1 + 1.0 + + MAD_LOCAUX_DUREE_PREF + + + + + fr.insee + js1wasgx-QOP-js1w6zxa + 1.0 + OutParameter + + + fr.insee + jskiyz80-a-js1wasgx-IP-1 + 1.0 + InParameter + + + not(jskiyz80-a-js1wasgx-IP-1 = '2') + + + + fr.insee + jskiyz80-a-js1wasgx-THEN + 1.0 + Sequence + + + + fr.insee + jskiyz80-a-js1wasgx-THEN + 1.0 + + + + hideable + + fr.insee + js1wcjld-QC + 1.0 + QuestionConstruct + + + + fr.insee + jskizmdn-jskiyz80-b-js1wc3wz + 1.0 + + A définir + + + + + + + xpath + + fr.insee + jskizmdn-jskiyz80-b-js1wc3wz-IP-1 + 1.0 + + MAD_LOCAUX_DUREE_PREF + + + + + fr.insee + js1wasgx-QOP-js1w6zxa + 1.0 + OutParameter + + + fr.insee + jskizmdn-jskiyz80-b-js1wc3wz-IP-1 + 1.0 + InParameter + + + not((jskizmdn-jskiyz80-b-js1wc3wz-IP-1 = '1') and not + ((jskizmdn-jskiyz80-b-js1wc3wz-IP-1 = '2'))) + + + + fr.insee + jskizmdn-jskiyz80-b-js1wc3wz-THEN + 1.0 + Sequence + + + + fr.insee + jskizmdn-jskiyz80-b-js1wc3wz-THEN + 1.0 + + + + hideable + + fr.insee + js1wc3wz-QC + 1.0 + QuestionConstruct + + + + fr.insee + jskj4cne-a-js1wic46 + 1.0 + + A définir + + + + + + + xpath + + fr.insee + jskj4cne-a-js1wic46-IP-1 + 1.0 + + MAD_TERRAINS + + + + + fr.insee + js1wic46-QOP-js1wt5z4 + 1.0 + OutParameter + + + fr.insee + jskj4cne-a-js1wic46-IP-1 + 1.0 + InParameter + + + not(jskj4cne-a-js1wic46-IP-1 = '0') + + + + fr.insee + jskj4cne-a-js1wic46-THEN + 1.0 + Sequence + + + + fr.insee + jskj4cne-a-js1wic46-THEN + 1.0 + + + + hideable + + fr.insee + js1wwgqi-QC + 1.0 + QuestionConstruct + + + fr.insee + js1wx3qa-QC + 1.0 + QuestionConstruct + + + fr.insee + jskj4pm6-a-js1wx3qa + 1.0 + IfThenElse + + + fr.insee + jskj1bpl-jskj4pm6-b-js1x11dd + 1.0 + IfThenElse + + + fr.insee + js1wk2jf-QC + 1.0 + QuestionConstruct + + + fr.insee + js1wqahn-QC + 1.0 + QuestionConstruct + + + fr.insee + js1wqahn-CI-0 + 1.0 + ComputationItem + + + + fr.insee + jskj4pm6-a-js1wx3qa + 1.0 + + A définir + + + + + + + xpath + + fr.insee + jskj4pm6-a-js1wx3qa-IP-1 + 1.0 + + MAD_TERRAINS_DUREE_PREF + + + + + fr.insee + js1wx3qa-QOP-js1wsgt4 + 1.0 + OutParameter + + + fr.insee + jskj4pm6-a-js1wx3qa-IP-1 + 1.0 + InParameter + + + not(jskj4pm6-a-js1wx3qa-IP-1 = '2') + + + + fr.insee + jskj4pm6-a-js1wx3qa-THEN + 1.0 + Sequence + + + + fr.insee + jskj4pm6-a-js1wx3qa-THEN + 1.0 + + + + hideable + + fr.insee + js1wt9ts-QC + 1.0 + QuestionConstruct + + + + fr.insee + jskj1bpl-jskj4pm6-b-js1x11dd + 1.0 + + A définir + + + + + + + xpath + + fr.insee + jskj1bpl-jskj4pm6-b-js1x11dd-IP-1 + 1.0 + + MAD_TERRAINS_DUREE_PREF + + + + + fr.insee + js1wx3qa-QOP-js1wsgt4 + 1.0 + OutParameter + + + fr.insee + jskj1bpl-jskj4pm6-b-js1x11dd-IP-1 + 1.0 + InParameter + + + not((jskj1bpl-jskj4pm6-b-js1x11dd-IP-1 = '1') and not + ((jskj1bpl-jskj4pm6-b-js1x11dd-IP-1 = '2'))) + + + + fr.insee + jskj1bpl-jskj4pm6-b-js1x11dd-THEN + 1.0 + Sequence + + + + fr.insee + jskj1bpl-jskj4pm6-b-js1x11dd-THEN + 1.0 + + + + hideable + + fr.insee + js1x11dd-QC + 1.0 + QuestionConstruct + + + + fr.insee + jslulnjd-a-js1xblc8 + 1.0 + + A définir + + + + + + + xpath + + fr.insee + jslulnjd-a-js1xblc8-IP-1 + 1.0 + + RESEAU + + + + + fr.insee + js1xblc8-QOP-js1x70lq + 1.0 + OutParameter + + + fr.insee + jslulnjd-a-js1xblc8-IP-1 + 1.0 + InParameter + + + not(jslulnjd-a-js1xblc8-IP-1 = '0') + + + + fr.insee + jslulnjd-a-js1xblc8-THEN + 1.0 + Sequence + + + + fr.insee + jslulnjd-a-js1xblc8-THEN + 1.0 + + + + hideable + + fr.insee + js1xnjw7-QC + 1.0 + QuestionConstruct + + + fr.insee + js1xnjw7-CI-0 + 1.0 + ComputationItem + + + fr.insee + js1xmypc-QC + 1.0 + QuestionConstruct + + + fr.insee + js1xmypc-CI-0 + 1.0 + ComputationItem + + + fr.insee + js1x9nsr-QC + 1.0 + QuestionConstruct + + + fr.insee + js1x9nsr-CI-0 + 1.0 + ComputationItem + + + fr.insee + js1xpf9k-QC + 1.0 + QuestionConstruct + + + + fr.insee + jqxvugxl-QC + 1.0 + + IDENT_AN_CREATION + + + fr.insee + jqxvugxl + 1.0 + QuestionItem + + + + fr.insee + jqxvy8en-QC + 1.0 + + IDENT_ACTIVE + + + fr.insee + jqxvy8en + 1.0 + QuestionItem + + + + fr.insee + jqxvz5q8-QC + 1.0 + + IDENT_AN_CESSATION + + + fr.insee + jqxvz5q8 + 1.0 + QuestionItem + + + + fr.insee + jqxx9cx9-QC + 1.0 + + IDENT_RNA + + + fr.insee + jqxx9cx9 + 1.0 + QuestionItem + + + + fr.insee + jqxxe71e-QC + 1.0 + + IDENT_CONF_NUM_RNA + + + fr.insee + jqxxe71e + 1.0 + QuestionItem + + + + fr.insee + jqxxtf4g-QC + 1.0 + + IDENT_CORR_NUM_RNA + + + fr.insee + jqxxtf4g + 1.0 + QuestionItem + + + + fr.insee + jrjcj7e6-QC + 1.0 + + IDENT_NUM_SIREN + + + fr.insee + jrjcj7e6 + 1.0 + QuestionItem + + + + fr.insee + jqxxw4zn-QC + 1.0 + + IDENT_SUBV + + + fr.insee + jqxxw4zn + 1.0 + QuestionItem + + + + fr.insee + jqxxgibj-QC + 1.0 + + IDENT_NIV_GEO + + + fr.insee + jqxxgibj + 1.0 + QuestionItem + + + + fr.insee + jqxxsed0-QC + 1.0 + + IDENT_ACTIVITE_ETRG + + + fr.insee + jqxxsed0 + 1.0 + QuestionItem + + + + fr.insee + jqxxs2n2-QC + 1.0 + + IDENT_RESEAU + + + fr.insee + jqxxs2n2 + 1.0 + QuestionItem + + + + fr.insee + jqxy6sxf-QC + 1.0 + + IDENT_OBJET + + + fr.insee + jqxy6sxf + 1.0 + QuestionItem + + + + fr.insee + jrjda2qx-QC + 1.0 + + GOUV_CA_EXIST + + + fr.insee + jrjda2qx + 1.0 + QuestionItem + + + + fr.insee + jrjd54n7-QC + 1.0 + + GOUV_CA_NB + + + fr.insee + jrjd54n7 + 1.0 + QuestionItem + + + + fr.insee + jrjdhk1u-QC + 1.0 + + GOUV_CA_NB_F + + + fr.insee + jrjdhk1u + 1.0 + QuestionItem + + + + fr.insee + jrjdnoqo-QC + 1.0 + + GOUV_BUREAU_EXIST + + + fr.insee + jrjdnoqo + 1.0 + QuestionItem + + + + fr.insee + jrjdgpya-QC + 1.0 + + GOUV_BUREAU_NB + + + fr.insee + jrjdgpya + 1.0 + QuestionItem + + + + fr.insee + jrjdmxr3-QC + 1.0 + + GOUV_BUREAU_NB_F + + + fr.insee + jrjdmxr3 + 1.0 + QuestionItem + + + + fr.insee + jrjdtxvt-QC + 1.0 + + GOUV_PDT_EXIST + + + fr.insee + jrjdtxvt + 1.0 + QuestionItem + + + + fr.insee + jrjdn5o5-QC + 1.0 + + GOUV_PDT_SEXE + + + fr.insee + jrjdn5o5 + 1.0 + QuestionItem + + + + fr.insee + jrje3unr-QC + 1.0 + + GOUV_PDT_AGE + + + fr.insee + jrje3unr + 1.0 + QuestionItem + + + + fr.insee + jrjds2dp-QC + 1.0 + + GOUV_PDT_STATUT + + + fr.insee + jrjds2dp + 1.0 + QuestionItem + + + + fr.insee + jrjdypnr-QC + 1.0 + + GOUV_TRESOR_EXIST + + + fr.insee + jrjdypnr + 1.0 + QuestionItem + + + + fr.insee + jrkcdydx-QC + 1.0 + + GOUV_TRESOR_SEXE + + + fr.insee + jrkcdydx + 1.0 + QuestionItem + + + + fr.insee + jrkcgkye-QC + 1.0 + + GOUV_TRESOR_AGE + + + fr.insee + jrkcgkye + 1.0 + QuestionItem + + + + fr.insee + jrkccq4q-QC + 1.0 + + GOUV_TRESOR_STATUT + + + fr.insee + jrkccq4q + 1.0 + QuestionItem + + + + fr.insee + jrkcsvme-QC + 1.0 + + GOUV_SECRET_EXIST + + + fr.insee + jrkcsvme + 1.0 + QuestionItem + + + + fr.insee + jrkcnb33-QC + 1.0 + + GOUV_SECRET_SEXE + + + fr.insee + jrkcnb33 + 1.0 + QuestionItem + + + + fr.insee + jrkcgtrt-QC + 1.0 + + GOUV_SECRET_AGE + + + fr.insee + jrkcgtrt + 1.0 + QuestionItem + + + + fr.insee + jrkcxp0c-QC + 1.0 + + GOUV_SECRET_STATUT + + + fr.insee + jrkcxp0c + 1.0 + QuestionItem + + + + fr.insee + jrkctbou-QC + 1.0 + + AD_PP + + + fr.insee + jrkctbou + 1.0 + QuestionGrid + + + + fr.insee + jrkd7a3w-QC + 1.0 + + AD_AUTRES_P + + + fr.insee + jrkd7a3w + 1.0 + QuestionItem + + + + fr.insee + jrkcrrfa-QC + 1.0 + + AD_PP_NB + + + fr.insee + jrkcrrfa + 1.0 + QuestionGrid + + + + fr.insee + jrqgfzes-QC + 1.0 + + DOMAINES_ACT + + + fr.insee + jrqgfzes + 1.0 + QuestionGrid + + + + fr.insee + jrkd4r0n-QC + 1.0 + + DOM_P + + + fr.insee + jrkd4r0n + 1.0 + QuestionItem + + + + fr.insee + jseoat5y-QC + 1.0 + + SAL_EMP + + + fr.insee + jseoat5y + 1.0 + QuestionItem + + + + fr.insee + js0d53t6-QC + 1.0 + + SAL_NB_H + + + fr.insee + js0d53t6 + 1.0 + QuestionItem + + + + fr.insee + js0di1io-QC + 1.0 + + CA_CDI_CDD + + + fr.insee + js0di1io + 1.0 + QuestionGrid + + + + fr.insee + js0dpd65-QC + 1.0 + + SAL_CONTRAT + + + fr.insee + js0dpd65 + 1.0 + QuestionGrid + + + + fr.insee + jseoi4yc-QC + 1.0 + + SAL_NB + + + fr.insee + jseoi4yc + 1.0 + QuestionItem + + + + fr.insee + jseoe6ty-QC + 1.0 + + SAL_TPS + + + fr.insee + jseoe6ty + 1.0 + QuestionGrid + + + + fr.insee + js0dvdaw-QC + 1.0 + + AUT_PERS + + + fr.insee + js0dvdaw + 1.0 + QuestionGrid + + + + fr.insee + js0dwvc2-QC + 1.0 + + AUT_NB_H + + + fr.insee + js0dwvc2 + 1.0 + QuestionGrid + + + + fr.insee + js0eh523-QC + 1.0 + + BENEV_NB + + + fr.insee + js0eh523 + 1.0 + QuestionItem + + + + fr.insee + js0egvao-QC + 1.0 + + BENEV_REG_NB + + + fr.insee + js0egvao + 1.0 + QuestionItem + + + + fr.insee + js0eg1cf-QC + 1.0 + + BENEV_NB_H + + + fr.insee + js0eg1cf + 1.0 + QuestionGrid + + + + fr.insee + js0en9yl-QC + 1.0 + + BENEV_FORM + + + fr.insee + js0en9yl + 1.0 + QuestionItem + + + + fr.insee + js0ef83m-QC + 1.0 + + BENEV_FORM_CHARGES + + + fr.insee + js0ef83m + 1.0 + QuestionItem + + + + fr.insee + js0et52n-QC + 1.0 + + BENEV_FORM_MONTANT + + + fr.insee + js0et52n + 1.0 + QuestionItem + + + + fr.insee + js0ema6d-QC + 1.0 + + BENEV_REMB_FRAIS + + + fr.insee + js0ema6d + 1.0 + QuestionItem + + + + fr.insee + js0errla-QC + 1.0 + + BENEV_REMB_MONTANT + + + fr.insee + js0errla + 1.0 + QuestionItem + + + + fr.insee + js0ezdnw-QC + 1.0 + + BENEV_SAL_ENCADRANT + + + fr.insee + js0ezdnw + 1.0 + QuestionItem + + + + fr.insee + junsenue-QC + 1.0 + + RESS_DATE_CLOTURE + + + fr.insee + junsenue + 1.0 + QuestionItem + + + + fr.insee + junsih01-QC + 1.0 + + RESS_DUREE_EXERCICE + + + fr.insee + junsih01 + 1.0 + QuestionItem + + + + fr.insee + js0f7q4i-QC + 1.0 + + RESS_ + + + fr.insee + js0f7q4i + 1.0 + QuestionGrid + + + + fr.insee + js0g5z55-QC + 1.0 + + RESS_RECUS_FISC + + + fr.insee + js0g5z55 + 1.0 + QuestionItem + + + + fr.insee + js0g28m1-QC + 1.0 + + RESS_SUBV_REC + + + fr.insee + js0g28m1 + 1.0 + QuestionGrid + + + + fr.insee + jvgc8k0y-QC + 1.0 + + RESS_SUBV_AUTRES_P + + + fr.insee + jvgc8k0y + 1.0 + QuestionItem + + + + fr.insee + jvgcdcjx-QC + 1.0 + + RESS_REC_ACT_AUTRES_P + + + fr.insee + jvgcdcjx + 1.0 + QuestionItem + + + + fr.insee + js0gv8ia-QC + 1.0 + + CHARGES + + + fr.insee + js0gv8ia + 1.0 + QuestionGrid + + + + fr.insee + js1vv01p-QC + 1.0 + + MAD_LOCAUX + + + fr.insee + js1vv01p + 1.0 + QuestionItem + + + + fr.insee + js1w04zo-QC + 1.0 + + MAD_LOCAUX_EXCLU + + + fr.insee + js1w04zo + 1.0 + QuestionItem + + + + fr.insee + js1wasgx-QC + 1.0 + + MAD_LOCAUX_DUREE_PREF + + + fr.insee + js1wasgx + 1.0 + QuestionItem + + + + fr.insee + js1wcjld-QC + 1.0 + + MAD_LOCAUX_DUREE_JR + + + fr.insee + js1wcjld + 1.0 + QuestionItem + + + + fr.insee + js1wc3wz-QC + 1.0 + + MAD_LOCAUX_DUREE_H + + + fr.insee + js1wc3wz + 1.0 + QuestionItem + + + + fr.insee + js1wcxvg-QC + 1.0 + + MAD_LOCAUX_SURFACE + + + fr.insee + js1wcxvg + 1.0 + QuestionItem + + + + fr.insee + js1wmyn8-QC + 1.0 + + MAD_LOCAUX_ORIGINE + + + fr.insee + js1wmyn8 + 1.0 + QuestionGrid + + + + fr.insee + js1wic46-QC + 1.0 + + MAD_TERRAINS + + + fr.insee + js1wic46 + 1.0 + QuestionItem + + + + fr.insee + js1wwgqi-QC + 1.0 + + MAD_TERRAINS_EXCLU + + + fr.insee + js1wwgqi + 1.0 + QuestionItem + + + + fr.insee + js1wx3qa-QC + 1.0 + + MAD_TERRAINS_DUREE_PREF + + + fr.insee + js1wx3qa + 1.0 + QuestionItem + + + + fr.insee + js1wt9ts-QC + 1.0 + + MAD_TERRAINS_DUREE_JR + + + fr.insee + js1wt9ts + 1.0 + QuestionItem + + + + fr.insee + js1x11dd-QC + 1.0 + + MAD_TERRAINS_DUREE_H + + + fr.insee + js1x11dd + 1.0 + QuestionItem + + + + fr.insee + js1wk2jf-QC + 1.0 + + MAD_TERRAINS_SURFACE + + + fr.insee + js1wk2jf + 1.0 + QuestionItem + + + + fr.insee + js1wqahn-QC + 1.0 + + MAD_TERRAINS_ORIGINE + + + fr.insee + js1wqahn + 1.0 + QuestionGrid + + + + fr.insee + js1xblc8-QC + 1.0 + + RESEAU + + + fr.insee + js1xblc8 + 1.0 + QuestionItem + + + + fr.insee + js1xnjw7-QC + 1.0 + + RESEAU_TETE_NAT + + + fr.insee + js1xnjw7 + 1.0 + QuestionItem + + + + fr.insee + js1xmypc-QC + 1.0 + + RESEAU_TETE_AUTRE + + + fr.insee + js1xmypc + 1.0 + QuestionItem + + + + fr.insee + js1x9nsr-QC + 1.0 + + RESEAU_P + + + fr.insee + js1x9nsr + 1.0 + QuestionItem + + + + fr.insee + js1xpf9k-QC + 1.0 + + RESEAU_MOTIFS + + + fr.insee + js1xpf9k + 1.0 + QuestionGrid + + + + fr.insee + jrjcj7e6-CI-0 + 1.0 + + Contrôle du numéro Siren + + + Contrôle du numéro Siren + + + fr.insee + jrjcj7e6-CI-0-II-0 + 1.0 + Instruction + + + + xpath + + fr.insee + jrjcj7e6-CI-1-IP-1 + 1.0 + + IDENT_NUM_SIREN + + + + + fr.insee + jrjcj7e6-QOP-jrjcekc4 + 1.0 + OutParameter + + + fr.insee + jrjcj7e6-CI-1-IP-1 + 1.0 + InParameter + + + jrjcj7e6-CI-1-IP-1 != '' and jrjcj7e6-CI-1-IP-1 castable as + xs:integer and string-length(jrjcj7e6-CI-1-IP-1) = 9 and ((( + number(substring(jrjcj7e6-CI-1-IP-1,1,1)) + + number(substring(jrjcj7e6-CI-1-IP-1,2,1))*2 -(if + (number(substring(jrjcj7e6-CI-1-IP-1,2,1)) > 4) then 9 else 0) + + number(substring(jrjcj7e6-CI-1-IP-1,3,1)) + + number(substring(jrjcj7e6-CI-1-IP-1,4,1))*2 -(if + (number(substring(jrjcj7e6-CI-1-IP-1,4,1)) > 4) then 9 else 0) + + number(substring(jrjcj7e6-CI-1-IP-1,5,1)) + + number(substring(jrjcj7e6-CI-1-IP-1,6,1))*2 -(if + (number(substring(jrjcj7e6-CI-1-IP-1,6,1)) > 4) then 9 else 0) + + number(substring(jrjcj7e6-CI-1-IP-1,7,1)) + + number(substring(jrjcj7e6-CI-1-IP-1,8,1))*2 -(if + (number(substring(jrjcj7e6-CI-1-IP-1,8,1)) > 4) then 9 else 0) + + number(substring(jrjcj7e6-CI-1-IP-1,9,1)) ) mod 10) != 0) + + + + + + fr.insee + jrjdhk1u-CI-0 + 1.0 + + si GOUV_CA_NB > 0 et GOUV_CA_NB_F > + GOUV_CA_NB + + + si GOUV_CA_NB > 0 et GOUV_CA_NB_F > + GOUV_CA_NB + + + fr.insee + jrjdhk1u-CI-0-II-0 + 1.0 + Instruction + + + + xpath + + fr.insee + jrjdhk1u-CI-0-IP-1 + 1.0 + + GOUV_CA_NB + + + + fr.insee + jrjdhk1u-CI-0-IP-2 + 1.0 + + GOUV_CA_NB_F + + + + + fr.insee + jrjd54n7-QOP-jrjdm55e + 1.0 + OutParameter + + + fr.insee + jrjdhk1u-CI-0-IP-1 + 1.0 + InParameter + + + + + fr.insee + jrjdhk1u-QOP-jrjdnih8 + 1.0 + OutParameter + + + fr.insee + jrjdhk1u-CI-0-IP-2 + 1.0 + InParameter + + + number(if (jrjdhk1u-CI-0-IP-1='') then '0' else + jrjdhk1u-CI-0-IP-1) > 0 and number(if (jrjdhk1u-CI-0-IP-2='') then '0' else + jrjdhk1u-CI-0-IP-2) > number(if (jrjdhk1u-CI-0-IP-1='') then '0' else + jrjdhk1u-CI-0-IP-1) + + + + + + fr.insee + jrjdmxr3-CI-0 + 1.0 + + si GOUV_BUREAU_NB > 0 et GOUV_BUREAU_NB_F > + GOUV_BUREAU_NB + + + si GOUV_BUREAU_NB > 0 et GOUV_BUREAU_NB_F > + GOUV_BUREAU_NB + + + fr.insee + jrjdmxr3-CI-0-II-0 + 1.0 + Instruction + + + + xpath + + fr.insee + jrjdmxr3-CI-0-IP-1 + 1.0 + + GOUV_BUREAU_NB + + + + fr.insee + jrjdmxr3-CI-0-IP-2 + 1.0 + + GOUV_BUREAU_NB_F + + + + + fr.insee + jrjdgpya-QOP-jrjdvpg0 + 1.0 + OutParameter + + + fr.insee + jrjdmxr3-CI-0-IP-1 + 1.0 + InParameter + + + + + fr.insee + jrjdmxr3-QOP-jrjdugue + 1.0 + OutParameter + + + fr.insee + jrjdmxr3-CI-0-IP-2 + 1.0 + InParameter + + + number(if (jrjdmxr3-CI-0-IP-1='') then '0' else + jrjdmxr3-CI-0-IP-1) >0 and number(if (jrjdmxr3-CI-0-IP-2='') then '0' else + jrjdmxr3-CI-0-IP-2) > number(if (jrjdmxr3-CI-0-IP-1='') then '0' else + jrjdmxr3-CI-0-IP-1) + + + + + + fr.insee + jrkd7a3w-CI-0 + 1.0 + + si AD_AUTRES_P=vide et AD_AUTRES=1 + + + si AD_AUTRES_P=vide et AD_AUTRES=1 + + + fr.insee + jrkd7a3w-CI-0-II-0 + 1.0 + Instruction + + + + xpath + + fr.insee + jrkd7a3w-CI-0-IP-1 + 1.0 + + AD_AUTRES + + + + fr.insee + jrkd7a3w-CI-0-IP-2 + 1.0 + + AD_AUTRES_P + + + + + fr.insee + jrkctbou-QOP-jvmfs5xd + 1.0 + OutParameter + + + fr.insee + jrkd7a3w-CI-0-IP-1 + 1.0 + InParameter + + + + + fr.insee + jrkd7a3w-QOP-jrkd75hk + 1.0 + OutParameter + + + fr.insee + jrkd7a3w-CI-0-IP-2 + 1.0 + InParameter + + + jrkd7a3w-CI-0-IP-2 = '' and jrkd7a3w-CI-0-IP-1 = '1' + + + + + + + fr.insee + jrkcrrfa-CI-0 + 1.0 + + si AD_PP_NB>0 et AD_PP=0 + + + si AD_PP_NB>0 et AD_PP=0 + + + fr.insee + jrkcrrfa-CI-0-II-0 + 1.0 + Instruction + + + + xpath + + fr.insee + jrkcrrfa-CI-0-IP-1 + 1.0 + + AD_PP + + + + fr.insee + jrkcrrfa-CI-0-IP-2 + 1.0 + + AD_PP_NB + + + + + fr.insee + jrkctbou-QOP-jvmg5u30 + 1.0 + OutParameter + + + fr.insee + jrkcrrfa-CI-0-IP-1 + 1.0 + InParameter + + + + + fr.insee + jrkcrrfa-QOP-jvmg66ld + 1.0 + OutParameter + + + fr.insee + jrkcrrfa-CI-0-IP-2 + 1.0 + InParameter + + + number(if (jrkcrrfa-CI-0-IP-2='') then '0' else + jrkcrrfa-CI-0-IP-2) > 0 and jrkcrrfa-CI-0-IP-1 = '0' + + + + + + fr.insee + jrkcrrfa-CI-1 + 1.0 + + si AD_PP_NB=vide et AD_PP=1 + + + si AD_PP_NB=vide et AD_PP=1 + + + fr.insee + jrkcrrfa-CI-1-II-1 + 1.0 + Instruction + + + + xpath + + fr.insee + jrkcrrfa-CI-1-IP-1 + 1.0 + + AD_PP + + + + fr.insee + jrkcrrfa-CI-1-IP-2 + 1.0 + + AD_PP_NB + + + + + fr.insee + jrkctbou-QOP-jvmg5u30 + 1.0 + OutParameter + + + fr.insee + jrkcrrfa-CI-1-IP-1 + 1.0 + InParameter + + + + + fr.insee + jrkcrrfa-QOP-jvmg66ld + 1.0 + OutParameter + + + fr.insee + jrkcrrfa-CI-1-IP-2 + 1.0 + InParameter + + + jrkcrrfa-CI-1-IP-2='' and jrkcrrfa-CI-1-IP-1 = '1' + + + + + + fr.insee + jrkcrrfa-CI-2 + 1.0 + + si AD_PP_NB=0 et AD_PP=1 + + + si AD_PP_NB=0 et AD_PP=1 + + + fr.insee + jrkcrrfa-CI-2-II-2 + 1.0 + Instruction + + + + xpath + + fr.insee + jrkcrrfa-CI-2-IP-1 + 1.0 + + AD_PP + + + + fr.insee + jrkcrrfa-CI-2-IP-2 + 1.0 + + AD_PP_NB + + + + + fr.insee + jrkctbou-QOP-jvmg5u30 + 1.0 + OutParameter + + + fr.insee + jrkcrrfa-CI-2-IP-1 + 1.0 + InParameter + + + + + fr.insee + jrkcrrfa-QOP-jvmg66ld + 1.0 + OutParameter + + + fr.insee + jrkcrrfa-CI-2-IP-2 + 1.0 + InParameter + + + number(if (jrkcrrfa-CI-2-IP-2='') then '0' else + jrkcrrfa-CI-2-IP-2) = 0 and jrkcrrfa-CI-2-IP-2!='' and jrkcrrfa-CI-2-IP-1 = '1' + + + + + + fr.insee + jrkcrrfa-CI-3 + 1.0 + + si AD_ASSO_NB>0 et AD_ASSO=0 + + + si AD_ASSO_NB>0 et AD_ASSO=0 + + + fr.insee + jrkcrrfa-CI-3-II-3 + 1.0 + Instruction + + + + xpath + + fr.insee + jrkcrrfa-CI-3-IP-1 + 1.0 + + AD_ASSO + + + + fr.insee + jrkcrrfa-CI-3-IP-2 + 1.0 + + AD_ASSO_NB + + + + + fr.insee + jrkctbou-QOP-jvmg014v + 1.0 + OutParameter + + + fr.insee + jrkcrrfa-CI-3-IP-1 + 1.0 + InParameter + + + + + fr.insee + jrkcrrfa-QOP-jvmg1yny + 1.0 + OutParameter + + + fr.insee + jrkcrrfa-CI-3-IP-2 + 1.0 + InParameter + + + number(if (jrkcrrfa-CI-3-IP-2='') then '0' else + jrkcrrfa-CI-3-IP-2) > 0 and jrkcrrfa-CI-3-IP-1 = '0' + + + + + + fr.insee + jrkcrrfa-CI-4 + 1.0 + + si AD_ASSO_NB=vide et AD_ASSO=1 + + + si AD_ASSO_NB=vide et AD_ASSO=1 + + + fr.insee + jrkcrrfa-CI-4-II-4 + 1.0 + Instruction + + + + xpath + + fr.insee + jrkcrrfa-CI-4-IP-1 + 1.0 + + AD_ASSO + + + + fr.insee + jrkcrrfa-CI-4-IP-2 + 1.0 + + AD_ASSO_NB + + + + + fr.insee + jrkctbou-QOP-jvmg014v + 1.0 + OutParameter + + + fr.insee + jrkcrrfa-CI-4-IP-1 + 1.0 + InParameter + + + + + fr.insee + jrkcrrfa-QOP-jvmg1yny + 1.0 + OutParameter + + + fr.insee + jrkcrrfa-CI-4-IP-2 + 1.0 + InParameter + + + jrkcrrfa-CI-4-IP-2='' and jrkcrrfa-CI-4-IP-1 = '1' + + + + + + fr.insee + jrkcrrfa-CI-5 + 1.0 + + si AD_ASSO_NB=0 et AD_ASSO=1 + + + si AD_ASSO_NB=0 et AD_ASSO=1 + + + fr.insee + jrkcrrfa-CI-5-II-5 + 1.0 + Instruction + + + + xpath + + fr.insee + jrkcrrfa-CI-5-IP-1 + 1.0 + + AD_ASSO + + + + fr.insee + jrkcrrfa-CI-5-IP-2 + 1.0 + + AD_ASSO_NB + + + + + fr.insee + jrkctbou-QOP-jvmg014v + 1.0 + OutParameter + + + fr.insee + jrkcrrfa-CI-5-IP-1 + 1.0 + InParameter + + + + + fr.insee + jrkcrrfa-QOP-jvmg1yny + 1.0 + OutParameter + + + fr.insee + jrkcrrfa-CI-5-IP-2 + 1.0 + InParameter + + + number(if (jrkcrrfa-CI-5-IP-2='') then '0' else + jrkcrrfa-CI-5-IP-2) = 0 and jrkcrrfa-CI-5-IP-2!='' and jrkcrrfa-CI-5-IP-1 = '1' + + + + + + fr.insee + jrkcrrfa-CI-6 + 1.0 + + si AD_ENTPRIV_NB>0 et AD_ENTPRIV=0 + + + si AD_ENTPRIV_NB>0 et AD_ENTPRIV=0 + + + fr.insee + jrkcrrfa-CI-6-II-6 + 1.0 + Instruction + + + + xpath + + fr.insee + jrkcrrfa-CI-6-IP-1 + 1.0 + + AD_ENTPRIV + + + + fr.insee + jrkcrrfa-CI-6-IP-2 + 1.0 + + AD_ENTPRIV_NB + + + + + fr.insee + jrkctbou-QOP-jvmg13p6 + 1.0 + OutParameter + + + fr.insee + jrkcrrfa-CI-6-IP-1 + 1.0 + InParameter + + + + + fr.insee + jrkcrrfa-QOP-jvmg45de + 1.0 + OutParameter + + + fr.insee + jrkcrrfa-CI-6-IP-2 + 1.0 + InParameter + + + number(if (jrkcrrfa-CI-6-IP-2='') then '0' else + jrkcrrfa-CI-6-IP-2) > 0 and jrkcrrfa-CI-6-IP-1 = '0' + + + + + + fr.insee + jrkcrrfa-CI-7 + 1.0 + + si AD_ENTPRIV_NB=vide et AD_ENTPRIV=1 + + + si AD_ENTPRIV_NB=vide et AD_ENTPRIV=1 + + + fr.insee + jrkcrrfa-CI-7-II-7 + 1.0 + Instruction + + + + xpath + + fr.insee + jrkcrrfa-CI-7-IP-1 + 1.0 + + AD_ENTPRIV + + + + fr.insee + jrkcrrfa-CI-7-IP-2 + 1.0 + + AD_ENTPRIV_NB + + + + + fr.insee + jrkctbou-QOP-jvmg13p6 + 1.0 + OutParameter + + + fr.insee + jrkcrrfa-CI-7-IP-1 + 1.0 + InParameter + + + + + fr.insee + jrkcrrfa-QOP-jvmg45de + 1.0 + OutParameter + + + fr.insee + jrkcrrfa-CI-7-IP-2 + 1.0 + InParameter + + + jrkcrrfa-CI-7-IP-2='' and jrkcrrfa-CI-7-IP-1 = '1' + + + + + + fr.insee + jrkcrrfa-CI-8 + 1.0 + + si AD_ENTPRIV_NB=0 et AD_ENTPRIV=1 + + + si AD_ENTPRIV_NB=0 et AD_ENTPRIV=1 + + + fr.insee + jrkcrrfa-CI-8-II-8 + 1.0 + Instruction + + + + xpath + + fr.insee + jrkcrrfa-CI-8-IP-1 + 1.0 + + AD_ENTPRIV + + + + fr.insee + jrkcrrfa-CI-8-IP-2 + 1.0 + + AD_ENTPRIV_NB + + + + + fr.insee + jrkctbou-QOP-jvmg13p6 + 1.0 + OutParameter + + + fr.insee + jrkcrrfa-CI-8-IP-1 + 1.0 + InParameter + + + + + fr.insee + jrkcrrfa-QOP-jvmg45de + 1.0 + OutParameter + + + fr.insee + jrkcrrfa-CI-8-IP-2 + 1.0 + InParameter + + + number(if (jrkcrrfa-CI-8-IP-2='') then '0' else + jrkcrrfa-CI-8-IP-2) = 0 and jrkcrrfa-CI-8-IP-2!='' and jrkcrrfa-CI-8-IP-1 = '1' + + + + + + fr.insee + jrkcrrfa-CI-9 + 1.0 + + si AD_COLLPUB_NB>0 et AD_COLLPUB=0 + + + si AD_COLLPUB_NB>0 et AD_COLLPUB=0 + + + fr.insee + jrkcrrfa-CI-9-II-9 + 1.0 + Instruction + + + + xpath + + fr.insee + jrkcrrfa-CI-9-IP-1 + 1.0 + + AD_COLLPUB + + + + fr.insee + jrkcrrfa-CI-9-IP-2 + 1.0 + + AD_COLLPUB_NB + + + + + fr.insee + jrkctbou-QOP-jvmfv25y + 1.0 + OutParameter + + + fr.insee + jrkcrrfa-CI-9-IP-1 + 1.0 + InParameter + + + + + fr.insee + jrkcrrfa-QOP-jvmfw0za + 1.0 + OutParameter + + + fr.insee + jrkcrrfa-CI-9-IP-2 + 1.0 + InParameter + + + number(if (jrkcrrfa-CI-9-IP-2='') then '0' else + jrkcrrfa-CI-9-IP-2) > 0 and jrkcrrfa-CI-9-IP-1 = '0' + + + + + + fr.insee + jrkcrrfa-CI-10 + 1.0 + + si AD_COLLPUB_NB=vide et AD_COLLPUB=1 + + + si AD_COLLPUB_NB=vide et AD_COLLPUB=1 + + + fr.insee + jrkcrrfa-CI-10-II-10 + 1.0 + Instruction + + + + xpath + + fr.insee + jrkcrrfa-CI-10-IP-1 + 1.0 + + AD_COLLPUB + + + + fr.insee + jrkcrrfa-CI-10-IP-2 + 1.0 + + AD_COLLPUB_NB + + + + + fr.insee + jrkctbou-QOP-jvmfv25y + 1.0 + OutParameter + + + fr.insee + jrkcrrfa-CI-10-IP-1 + 1.0 + InParameter + + + + + fr.insee + jrkcrrfa-QOP-jvmfw0za + 1.0 + OutParameter + + + fr.insee + jrkcrrfa-CI-10-IP-2 + 1.0 + InParameter + + + jrkcrrfa-CI-10-IP-2='' and jrkcrrfa-CI-10-IP-1 = '1' + + + + + + fr.insee + jrkcrrfa-CI-11 + 1.0 + + si AD_COLLPUB_NB=0 et AD_COLLPUB=1 + + + si AD_COLLPUB_NB=0 et AD_COLLPUB=1 + + + fr.insee + jrkcrrfa-CI-11-II-11 + 1.0 + Instruction + + + + xpath + + fr.insee + jrkcrrfa-CI-11-IP-1 + 1.0 + + AD_COLLPUB + + + + fr.insee + jrkcrrfa-CI-11-IP-2 + 1.0 + + AD_COLLPUB_NB + + + + + fr.insee + jrkctbou-QOP-jvmfv25y + 1.0 + OutParameter + + + fr.insee + jrkcrrfa-CI-11-IP-1 + 1.0 + InParameter + + + + + fr.insee + jrkcrrfa-QOP-jvmfw0za + 1.0 + OutParameter + + + fr.insee + jrkcrrfa-CI-11-IP-2 + 1.0 + InParameter + + + number(if (jrkcrrfa-CI-11-IP-2='') then '0' else + jrkcrrfa-CI-11-IP-2) = 0 and jrkcrrfa-CI-11-IP-2!='' and jrkcrrfa-CI-11-IP-1 = '1' + + + + + + fr.insee + jrkcrrfa-CI-12 + 1.0 + + si AD_AUTRES_NB>0 et AD_AUTRES=0 + + + si AD_AUTRES_NB>0 et AD_AUTRES=0 + + + fr.insee + jrkcrrfa-CI-12-II-12 + 1.0 + Instruction + + + + xpath + + fr.insee + jrkcrrfa-CI-12-IP-1 + 1.0 + + AD_AUTRES + + + + fr.insee + jrkcrrfa-CI-12-IP-2 + 1.0 + + AD_AUTRES_NB + + + + + fr.insee + jrkctbou-QOP-jvmfs5xd + 1.0 + OutParameter + + + fr.insee + jrkcrrfa-CI-12-IP-1 + 1.0 + InParameter + + + + + fr.insee + jrkcrrfa-QOP-jvmg4fsj + 1.0 + OutParameter + + + fr.insee + jrkcrrfa-CI-12-IP-2 + 1.0 + InParameter + + + number(if (jrkcrrfa-CI-12-IP-2='') then '0' else + jrkcrrfa-CI-12-IP-2) > 0 and jrkcrrfa-CI-12-IP-1 = '0' + + + + + + fr.insee + jrkcrrfa-CI-13 + 1.0 + + si AD_AUTRES_NB=vide et AD_AUTRES=1 + + + si AD_AUTRES_NB=vide et AD_AUTRES=1 + + + fr.insee + jrkcrrfa-CI-13-II-13 + 1.0 + Instruction + + + + xpath + + fr.insee + jrkcrrfa-CI-13-IP-1 + 1.0 + + AD_AUTRES + + + + fr.insee + jrkcrrfa-CI-13-IP-2 + 1.0 + + AD_AUTRES_NB + + + + + fr.insee + jrkctbou-QOP-jvmfs5xd + 1.0 + OutParameter + + + fr.insee + jrkcrrfa-CI-13-IP-1 + 1.0 + InParameter + + + + + fr.insee + jrkcrrfa-QOP-jvmg4fsj + 1.0 + OutParameter + + + fr.insee + jrkcrrfa-CI-13-IP-2 + 1.0 + InParameter + + + jrkcrrfa-CI-13-IP-2='' and jrkcrrfa-CI-13-IP-1 = '1' + + + + + + fr.insee + jrkcrrfa-CI-14 + 1.0 + + si AD_AUTRES_NB=0 et AD_AUTRES=1 + + + si AD_AUTRES_NB=0 et AD_AUTRES=1 + + + fr.insee + jrkcrrfa-CI-14-II-14 + 1.0 + Instruction + + + + xpath + + fr.insee + jrkcrrfa-CI-14-IP-1 + 1.0 + + AD_AUTRES + + + + fr.insee + jrkcrrfa-CI-14-IP-2 + 1.0 + + AD_AUTRES_NB + + + + + fr.insee + jrkctbou-QOP-jvmfs5xd + 1.0 + OutParameter + + + fr.insee + jrkcrrfa-CI-14-IP-1 + 1.0 + InParameter + + + + + fr.insee + jrkcrrfa-QOP-jvmg4fsj + 1.0 + OutParameter + + + fr.insee + jrkcrrfa-CI-14-IP-2 + 1.0 + InParameter + + + number(if (jrkcrrfa-CI-14-IP-2='') then '0' else + jrkcrrfa-CI-14-IP-2) = 0 and jrkcrrfa-CI-14-IP-2!='' and jrkcrrfa-CI-14-IP-1 = '1' + + + + + + fr.insee + jrqgfzes-CI-0 + 1.0 + + si somme(DOM_CULT_BIBLIO->DOM_ENSEIG_RECH)>6 + + + + si somme(DOM_CULT_BIBLIO->DOM_ENSEIG_RECH)>6 + + + + fr.insee + jrqgfzes-CI-0-II-0 + 1.0 + Instruction + + + + xpath + + fr.insee + jrqgfzes-CI-0-IP-1 + 1.0 + + DOM_CULT_BIBLIO + + + + fr.insee + jrqgfzes-CI-0-IP-2 + 1.0 + + DOM_CULT_MUSEES + + + + fr.insee + jrqgfzes-CI-0-IP-3 + 1.0 + + DOM_CULT_SITES + + + + fr.insee + jrqgfzes-CI-0-IP-4 + 1.0 + + DOM_CULT_MJC + + + + fr.insee + jrqgfzes-CI-0-IP-5 + 1.0 + + DOM_ART_SPECT_CREA + + + + fr.insee + jrqgfzes-CI-0-IP-6 + 1.0 + + DOM_ART_SPECT_SOUTIEN + + + + fr.insee + jrqgfzes-CI-0-IP-7 + 1.0 + + DOM_ART_CREA + + + + fr.insee + jrqgfzes-CI-0-IP-8 + 1.0 + + DOM_ART_SPECT_SALLES + + + + fr.insee + jrqgfzes-CI-0-IP-9 + 1.0 + + DOM_LOISIRS_RECREA + + + + fr.insee + jrqgfzes-CI-0-IP-10 + 1.0 + + DOM_LOISIRS_COLO + + + + fr.insee + jrqgfzes-CI-0-IP-11 + 1.0 + + DOM_LOISIRS_AMICALES + + + + fr.insee + jrqgfzes-CI-0-IP-12 + 1.0 + + DOM_HEB_MED_PERS_AGEES + + + + fr.insee + jrqgfzes-CI-0-IP-13 + 1.0 + + DOM_HEB_MED_ENF_HAND + + + + fr.insee + jrqgfzes-CI-0-IP-14 + 1.0 + + DOM_HEB_MED_ADT_HAND + + + + fr.insee + jrqgfzes-CI-0-IP-15 + 1.0 + + DOM_HEB_SOC_HAND_MENT + + + + fr.insee + jrqgfzes-CI-0-IP-16 + 1.0 + + DOM_HEB_SOC_PERS_AGEES + + + + fr.insee + jrqgfzes-CI-0-IP-17 + 1.0 + + DOM_HEB_SOC_HAND_PHYS + + + + fr.insee + jrqgfzes-CI-0-IP-18 + 1.0 + + DOM_HEB_SOC_ENF_DIFF + + + + fr.insee + jrqgfzes-CI-0-IP-19 + 1.0 + + DOM_HEB_SOC_FOYERS + + + + fr.insee + jrqgfzes-CI-0-IP-20 + 1.0 + + DOM_HEB_SOC_AUTRES + + + + fr.insee + jrqgfzes-CI-0-IP-21 + 1.0 + + DOM_SANTE_HOP + + + + fr.insee + jrqgfzes-CI-0-IP-22 + 1.0 + + DOM_SANTE_MED + + + + fr.insee + jrqgfzes-CI-0-IP-23 + 1.0 + + DOM_SANTE_INF + + + + fr.insee + jrqgfzes-CI-0-IP-24 + 1.0 + + DOM_SANTE_REEDUC + + + + fr.insee + jrqgfzes-CI-0-IP-25 + 1.0 + + DOM_SANTE_RECHERCHE + + + + fr.insee + jrqgfzes-CI-0-IP-26 + 1.0 + + DOM_SANTE_AUTRES + + + + fr.insee + jrqgfzes-CI-0-IP-27 + 1.0 + + DOM_SPORT_CLUB + + + + fr.insee + jrqgfzes-CI-0-IP-28 + 1.0 + + DOM_SPORT_INSTALL + + + + fr.insee + jrqgfzes-CI-0-IP-29 + 1.0 + + DOM_SPORT_CHASSE + + + + fr.insee + jrqgfzes-CI-0-IP-30 + 1.0 + + DOM_SPORT_AUTRES + + + + fr.insee + jrqgfzes-CI-0-IP-31 + 1.0 + + DOM_CAUSES_POL + + + + fr.insee + jrqgfzes-CI-0-IP-32 + 1.0 + + DOM_CAUSES_CULT + + + + fr.insee + jrqgfzes-CI-0-IP-33 + 1.0 + + DOM_CAUSES_PATR + + + + fr.insee + jrqgfzes-CI-0-IP-34 + 1.0 + + DOM_CAUSES_PRO + + + + fr.insee + jrqgfzes-CI-0-IP-35 + 1.0 + + DOM_CAUSES_SYND + + + + fr.insee + jrqgfzes-CI-0-IP-36 + 1.0 + + DOM_CAUSES_ELEV_PAR + + + + fr.insee + jrqgfzes-CI-0-IP-37 + 1.0 + + DOM_CAUSES_ANC_COMB + + + + fr.insee + jrqgfzes-CI-0-IP-38 + 1.0 + + DOM_CAUSES_ENVIR + + + + fr.insee + jrqgfzes-CI-0-IP-39 + 1.0 + + DOM_CAUSES_CONSO + + + + fr.insee + jrqgfzes-CI-0-IP-40 + 1.0 + + DOM_CAUSES_LOGEMENT + + + + fr.insee + jrqgfzes-CI-0-IP-41 + 1.0 + + DOM_CAUSES_HUMA + + + + fr.insee + jrqgfzes-CI-0-IP-42 + 1.0 + + DOM_CAUSES_AUTRES + + + + fr.insee + jrqgfzes-CI-0-IP-43 + 1.0 + + DOM_ECO_DEV_LOCAL + + + + fr.insee + jrqgfzes-CI-0-IP-44 + 1.0 + + DOM_ECO_TOURISME + + + + fr.insee + jrqgfzes-CI-0-IP-45 + 1.0 + + DOM_ECO_GRPT_EMPL + + + + fr.insee + jrqgfzes-CI-0-IP-46 + 1.0 + + DOM_ECO_SUPPORT + + + + fr.insee + jrqgfzes-CI-0-IP-47 + 1.0 + + DOM_ECO_AMAP + + + + fr.insee + jrqgfzes-CI-0-IP-48 + 1.0 + + DOM_ECO_SECURITE + + + + fr.insee + jrqgfzes-CI-0-IP-49 + 1.0 + + DOM_SOCIAL_EMPLOI + + + + fr.insee + jrqgfzes-CI-0-IP-50 + 1.0 + + DOM_SOCIAL_AGE_HAND + + + + fr.insee + jrqgfzes-CI-0-IP-51 + 1.0 + + DOM_SOCIAL_CAT + + + + fr.insee + jrqgfzes-CI-0-IP-52 + 1.0 + + DOM_SOCIAL_JEUNES_ENF + + + + fr.insee + jrqgfzes-CI-0-IP-53 + 1.0 + + DOM_SOCIAL_ENF_HAND + + + + fr.insee + jrqgfzes-CI-0-IP-54 + 1.0 + + DOM_SOCIAL_ENF_ADO + + + + fr.insee + jrqgfzes-CI-0-IP-55 + 1.0 + + DOM_SOCIAL_LOGEMENT + + + + fr.insee + jrqgfzes-CI-0-IP-56 + 1.0 + + DOM_SOCIAL_AIDE_DOM + + + + fr.insee + jrqgfzes-CI-0-IP-57 + 1.0 + + DOM_SOCIAL_AIDE_MIG + + + + fr.insee + jrqgfzes-CI-0-IP-58 + 1.0 + + DOM_SOCIAL_CARITATIF + + + + fr.insee + jrqgfzes-CI-0-IP-59 + 1.0 + + DOM_ENSEIG_PRIM + + + + fr.insee + jrqgfzes-CI-0-IP-60 + 1.0 + + DOM_ENSEIG_SECOND + + + + fr.insee + jrqgfzes-CI-0-IP-61 + 1.0 + + DOM_ENSEIG_SUP + + + + fr.insee + jrqgfzes-CI-0-IP-62 + 1.0 + + DOM_ENSEIG_CULT + + + + fr.insee + jrqgfzes-CI-0-IP-63 + 1.0 + + DOM_ENSEIG_FORM_CONT + + + + fr.insee + jrqgfzes-CI-0-IP-64 + 1.0 + + DOM_ENSEIG_AUTRES + + + + fr.insee + jrqgfzes-CI-0-IP-65 + 1.0 + + DOM_ENSEIG_RECH + + + + + fr.insee + jrqgfzes-QOP-jvmg6vzp + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-0-IP-1 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmfww0r + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-0-IP-2 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmfzk08 + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-0-IP-3 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmg7p6r + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-0-IP-4 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmg4u0d + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-0-IP-5 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmg4n0f + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-0-IP-6 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmfr831 + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-0-IP-7 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmg069o + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-0-IP-8 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmfxjux + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-0-IP-9 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmfsuoa + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-0-IP-10 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmfzhe4 + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-0-IP-11 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmfqrd7 + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-0-IP-12 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmg9tsh + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-0-IP-13 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmfwaj2 + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-0-IP-14 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmfssh5 + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-0-IP-15 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmg344o + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-0-IP-16 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmfzafc + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-0-IP-17 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmfxhkl + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-0-IP-18 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmg5bnp + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-0-IP-19 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmfvrz3 + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-0-IP-20 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmg919i + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-0-IP-21 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmg6xt4 + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-0-IP-22 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmfszn1 + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-0-IP-23 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmg7met + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-0-IP-24 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmg46hp + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-0-IP-25 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmg4134 + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-0-IP-26 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmg9duu + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-0-IP-27 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmfw0vd + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-0-IP-28 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmgakeq + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-0-IP-29 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmg66hq + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-0-IP-30 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmfxkuk + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-0-IP-31 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmg6tmh + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-0-IP-32 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmgaml0 + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-0-IP-33 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmg5tmv + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-0-IP-34 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmg773d + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-0-IP-35 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmg00ii + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-0-IP-36 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmfss1s + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-0-IP-37 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmfskw0 + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-0-IP-38 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmfx82r + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-0-IP-39 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmg6el3 + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-0-IP-40 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmfw799 + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-0-IP-41 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmfrtye + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-0-IP-42 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmg4qc4 + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-0-IP-43 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmg7k40 + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-0-IP-44 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmg01oo + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-0-IP-45 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmfzpak + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-0-IP-46 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmfxe39 + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-0-IP-47 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmfy288 + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-0-IP-48 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmfqafi + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-0-IP-49 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmfznan + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-0-IP-50 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmg576c + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-0-IP-51 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmfvtok + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-0-IP-52 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmftncs + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-0-IP-53 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmg8t2g + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-0-IP-54 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmg7sc9 + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-0-IP-55 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmg65qu + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-0-IP-56 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmg54co + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-0-IP-57 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmg13f1 + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-0-IP-58 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmg07e4 + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-0-IP-59 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmfz28f + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-0-IP-60 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmg4k2q + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-0-IP-61 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmg7nny + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-0-IP-62 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmg2a3y + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-0-IP-63 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmfv5ob + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-0-IP-64 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmfw0ep + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-0-IP-65 + 1.0 + InParameter + + + (number(if (jrqgfzes-CI-0-IP-1='') then '0' else + jrqgfzes-CI-0-IP-1) + number(if (jrqgfzes-CI-0-IP-2='') then '0' else + jrqgfzes-CI-0-IP-2) + number(if (jrqgfzes-CI-0-IP-3='') then '0' else + jrqgfzes-CI-0-IP-3) + number(if (jrqgfzes-CI-0-IP-4='') then '0' else + jrqgfzes-CI-0-IP-4) + number(if (jrqgfzes-CI-0-IP-5='') then '0' else + jrqgfzes-CI-0-IP-5) + number(if (jrqgfzes-CI-0-IP-6='') then '0' else + jrqgfzes-CI-0-IP-6) + number(if (jrqgfzes-CI-0-IP-7='') then '0' else + jrqgfzes-CI-0-IP-7) + number(if (jrqgfzes-CI-0-IP-8='') then '0' else + jrqgfzes-CI-0-IP-8) + number(if (jrqgfzes-CI-0-IP-9='') then '0' else + jrqgfzes-CI-0-IP-9) + number(if (jrqgfzes-CI-0-IP-10='') then '0' else + jrqgfzes-CI-0-IP-10) + number(if (jrqgfzes-CI-0-IP-11='') then '0' else + jrqgfzes-CI-0-IP-11) + number(if (jrqgfzes-CI-0-IP-12='') then '0' else + jrqgfzes-CI-0-IP-12) + number(if (jrqgfzes-CI-0-IP-13='') then '0' else + jrqgfzes-CI-0-IP-13) + number(if (jrqgfzes-CI-0-IP-14='') then '0' else + jrqgfzes-CI-0-IP-14) + number(if (jrqgfzes-CI-0-IP-15='') then '0' else + jrqgfzes-CI-0-IP-15) + number(if (jrqgfzes-CI-0-IP-16='') then '0' else + jrqgfzes-CI-0-IP-16) + number(if (jrqgfzes-CI-0-IP-17='') then '0' else + jrqgfzes-CI-0-IP-17) + number(if (jrqgfzes-CI-0-IP-18='') then '0' else + jrqgfzes-CI-0-IP-18) + number(if (jrqgfzes-CI-0-IP-19='') then '0' else + jrqgfzes-CI-0-IP-19) + number(if (jrqgfzes-CI-0-IP-20='') then '0' else + jrqgfzes-CI-0-IP-20) + number(if (jrqgfzes-CI-0-IP-21='') then '0' else + jrqgfzes-CI-0-IP-21) + number(if (jrqgfzes-CI-0-IP-22='') then '0' else + jrqgfzes-CI-0-IP-22) + number(if (jrqgfzes-CI-0-IP-23='') then '0' else + jrqgfzes-CI-0-IP-23) + number(if (jrqgfzes-CI-0-IP-24='') then '0' else + jrqgfzes-CI-0-IP-24) + number(if (jrqgfzes-CI-0-IP-25='') then '0' else + jrqgfzes-CI-0-IP-25) + number(if (jrqgfzes-CI-0-IP-26='') then '0' else + jrqgfzes-CI-0-IP-26) + number(if (jrqgfzes-CI-0-IP-27='') then '0' else + jrqgfzes-CI-0-IP-27) + number(if (jrqgfzes-CI-0-IP-28='') then '0' else + jrqgfzes-CI-0-IP-28) + number(if (jrqgfzes-CI-0-IP-29='') then '0' else + jrqgfzes-CI-0-IP-29) + number(if (jrqgfzes-CI-0-IP-30='') then '0' else + jrqgfzes-CI-0-IP-30) + number(if (jrqgfzes-CI-0-IP-31='') then '0' else + jrqgfzes-CI-0-IP-31) + number(if (jrqgfzes-CI-0-IP-32='') then '0' else + jrqgfzes-CI-0-IP-32) + number(if (jrqgfzes-CI-0-IP-33='') then '0' else + jrqgfzes-CI-0-IP-33) + number(if (jrqgfzes-CI-0-IP-34='') then '0' else + jrqgfzes-CI-0-IP-34) + number(if (jrqgfzes-CI-0-IP-35='') then '0' else + jrqgfzes-CI-0-IP-35) + number(if (jrqgfzes-CI-0-IP-36='') then '0' else + jrqgfzes-CI-0-IP-36) + number(if (jrqgfzes-CI-0-IP-37='') then '0' else + jrqgfzes-CI-0-IP-37) + number(if (jrqgfzes-CI-0-IP-38='') then '0' else + jrqgfzes-CI-0-IP-38) + number(if (jrqgfzes-CI-0-IP-39='') then '0' else + jrqgfzes-CI-0-IP-39) + number(if (jrqgfzes-CI-0-IP-40='') then '0' else + jrqgfzes-CI-0-IP-40) + number(if (jrqgfzes-CI-0-IP-41='') then '0' else + jrqgfzes-CI-0-IP-41) + number(if (jrqgfzes-CI-0-IP-42='') then '0' else + jrqgfzes-CI-0-IP-42) + number(if (jrqgfzes-CI-0-IP-43='') then '0' else + jrqgfzes-CI-0-IP-43) + number(if (jrqgfzes-CI-0-IP-44='') then '0' else + jrqgfzes-CI-0-IP-44) + number(if (jrqgfzes-CI-0-IP-45='') then '0' else + jrqgfzes-CI-0-IP-45) + number(if (jrqgfzes-CI-0-IP-46='') then '0' else + jrqgfzes-CI-0-IP-46) + number(if (jrqgfzes-CI-0-IP-47='') then '0' else + jrqgfzes-CI-0-IP-47) + number(if (jrqgfzes-CI-0-IP-48='') then '0' else + jrqgfzes-CI-0-IP-48) + number(if (jrqgfzes-CI-0-IP-49='') then '0' else + jrqgfzes-CI-0-IP-49) + number(if (jrqgfzes-CI-0-IP-50='') then '0' else + jrqgfzes-CI-0-IP-50) + number(if (jrqgfzes-CI-0-IP-51='') then '0' else + jrqgfzes-CI-0-IP-51) + number(if (jrqgfzes-CI-0-IP-52='') then '0' else + jrqgfzes-CI-0-IP-52) + number(if (jrqgfzes-CI-0-IP-53='') then '0' else + jrqgfzes-CI-0-IP-53) + number(if (jrqgfzes-CI-0-IP-54='') then '0' else + jrqgfzes-CI-0-IP-54) + number(if (jrqgfzes-CI-0-IP-55='') then '0' else + jrqgfzes-CI-0-IP-55) + number(if (jrqgfzes-CI-0-IP-56='') then '0' else + jrqgfzes-CI-0-IP-56) + number(if (jrqgfzes-CI-0-IP-57='') then '0' else + jrqgfzes-CI-0-IP-57) + number(if (jrqgfzes-CI-0-IP-58='') then '0' else + jrqgfzes-CI-0-IP-58) + number(if (jrqgfzes-CI-0-IP-59='') then '0' else + jrqgfzes-CI-0-IP-59) + number(if (jrqgfzes-CI-0-IP-60='') then '0' else + jrqgfzes-CI-0-IP-60) + number(if (jrqgfzes-CI-0-IP-61='') then '0' else + jrqgfzes-CI-0-IP-61) + number(if (jrqgfzes-CI-0-IP-62='') then '0' else + jrqgfzes-CI-0-IP-62) + number(if (jrqgfzes-CI-0-IP-63='') then '0' else + jrqgfzes-CI-0-IP-63) + number(if (jrqgfzes-CI-0-IP-64='') then '0' else + jrqgfzes-CI-0-IP-64) + number(if (jrqgfzes-CI-0-IP-65='') then '0' else + jrqgfzes-CI-0-IP-65) ) > 6 + + + + + + fr.insee + jrqgfzes-CI-1 + 1.0 + + si somme(DOM_CULT_BIBLIO->DOM_ENSEIG_RECH)=0 + + + + si somme(DOM_CULT_BIBLIO->DOM_ENSEIG_RECH)=0 + + + + fr.insee + jrqgfzes-CI-1-II-1 + 1.0 + Instruction + + + + xpath + + fr.insee + jrqgfzes-CI-1-IP-1 + 1.0 + + DOM_CULT_BIBLIO + + + + fr.insee + jrqgfzes-CI-1-IP-2 + 1.0 + + DOM_CULT_MUSEES + + + + fr.insee + jrqgfzes-CI-1-IP-3 + 1.0 + + DOM_CULT_SITES + + + + fr.insee + jrqgfzes-CI-1-IP-4 + 1.0 + + DOM_CULT_MJC + + + + fr.insee + jrqgfzes-CI-1-IP-5 + 1.0 + + DOM_ART_SPECT_CREA + + + + fr.insee + jrqgfzes-CI-1-IP-6 + 1.0 + + DOM_ART_SPECT_SOUTIEN + + + + fr.insee + jrqgfzes-CI-1-IP-7 + 1.0 + + DOM_ART_CREA + + + + fr.insee + jrqgfzes-CI-1-IP-8 + 1.0 + + DOM_ART_SPECT_SALLES + + + + fr.insee + jrqgfzes-CI-1-IP-9 + 1.0 + + DOM_LOISIRS_RECREA + + + + fr.insee + jrqgfzes-CI-1-IP-10 + 1.0 + + DOM_LOISIRS_COLO + + + + fr.insee + jrqgfzes-CI-1-IP-11 + 1.0 + + DOM_LOISIRS_AMICALES + + + + fr.insee + jrqgfzes-CI-1-IP-12 + 1.0 + + DOM_HEB_MED_PERS_AGEES + + + + fr.insee + jrqgfzes-CI-1-IP-13 + 1.0 + + DOM_HEB_MED_ENF_HAND + + + + fr.insee + jrqgfzes-CI-1-IP-14 + 1.0 + + DOM_HEB_MED_ADT_HAND + + + + fr.insee + jrqgfzes-CI-1-IP-15 + 1.0 + + DOM_HEB_SOC_HAND_MENT + + + + fr.insee + jrqgfzes-CI-1-IP-16 + 1.0 + + DOM_HEB_SOC_PERS_AGEES + + + + fr.insee + jrqgfzes-CI-1-IP-17 + 1.0 + + DOM_HEB_SOC_HAND_PHYS + + + + fr.insee + jrqgfzes-CI-1-IP-18 + 1.0 + + DOM_HEB_SOC_ENF_DIFF + + + + fr.insee + jrqgfzes-CI-1-IP-19 + 1.0 + + DOM_HEB_SOC_FOYERS + + + + fr.insee + jrqgfzes-CI-1-IP-20 + 1.0 + + DOM_HEB_SOC_AUTRES + + + + fr.insee + jrqgfzes-CI-1-IP-21 + 1.0 + + DOM_SANTE_HOP + + + + fr.insee + jrqgfzes-CI-1-IP-22 + 1.0 + + DOM_SANTE_MED + + + + fr.insee + jrqgfzes-CI-1-IP-23 + 1.0 + + DOM_SANTE_INF + + + + fr.insee + jrqgfzes-CI-1-IP-24 + 1.0 + + DOM_SANTE_REEDUC + + + + fr.insee + jrqgfzes-CI-1-IP-25 + 1.0 + + DOM_SANTE_RECHERCHE + + + + fr.insee + jrqgfzes-CI-1-IP-26 + 1.0 + + DOM_SANTE_AUTRES + + + + fr.insee + jrqgfzes-CI-1-IP-27 + 1.0 + + DOM_SPORT_CLUB + + + + fr.insee + jrqgfzes-CI-1-IP-28 + 1.0 + + DOM_SPORT_INSTALL + + + + fr.insee + jrqgfzes-CI-1-IP-29 + 1.0 + + DOM_SPORT_CHASSE + + + + fr.insee + jrqgfzes-CI-1-IP-30 + 1.0 + + DOM_SPORT_AUTRES + + + + fr.insee + jrqgfzes-CI-1-IP-31 + 1.0 + + DOM_CAUSES_POL + + + + fr.insee + jrqgfzes-CI-1-IP-32 + 1.0 + + DOM_CAUSES_CULT + + + + fr.insee + jrqgfzes-CI-1-IP-33 + 1.0 + + DOM_CAUSES_PATR + + + + fr.insee + jrqgfzes-CI-1-IP-34 + 1.0 + + DOM_CAUSES_PRO + + + + fr.insee + jrqgfzes-CI-1-IP-35 + 1.0 + + DOM_CAUSES_SYND + + + + fr.insee + jrqgfzes-CI-1-IP-36 + 1.0 + + DOM_CAUSES_ELEV_PAR + + + + fr.insee + jrqgfzes-CI-1-IP-37 + 1.0 + + DOM_CAUSES_ANC_COMB + + + + fr.insee + jrqgfzes-CI-1-IP-38 + 1.0 + + DOM_CAUSES_ENVIR + + + + fr.insee + jrqgfzes-CI-1-IP-39 + 1.0 + + DOM_CAUSES_CONSO + + + + fr.insee + jrqgfzes-CI-1-IP-40 + 1.0 + + DOM_CAUSES_LOGEMENT + + + + fr.insee + jrqgfzes-CI-1-IP-41 + 1.0 + + DOM_CAUSES_HUMA + + + + fr.insee + jrqgfzes-CI-1-IP-42 + 1.0 + + DOM_CAUSES_AUTRES + + + + fr.insee + jrqgfzes-CI-1-IP-43 + 1.0 + + DOM_ECO_DEV_LOCAL + + + + fr.insee + jrqgfzes-CI-1-IP-44 + 1.0 + + DOM_ECO_TOURISME + + + + fr.insee + jrqgfzes-CI-1-IP-45 + 1.0 + + DOM_ECO_GRPT_EMPL + + + + fr.insee + jrqgfzes-CI-1-IP-46 + 1.0 + + DOM_ECO_SUPPORT + + + + fr.insee + jrqgfzes-CI-1-IP-47 + 1.0 + + DOM_ECO_AMAP + + + + fr.insee + jrqgfzes-CI-1-IP-48 + 1.0 + + DOM_ECO_SECURITE + + + + fr.insee + jrqgfzes-CI-1-IP-49 + 1.0 + + DOM_SOCIAL_EMPLOI + + + + fr.insee + jrqgfzes-CI-1-IP-50 + 1.0 + + DOM_SOCIAL_AGE_HAND + + + + fr.insee + jrqgfzes-CI-1-IP-51 + 1.0 + + DOM_SOCIAL_CAT + + + + fr.insee + jrqgfzes-CI-1-IP-52 + 1.0 + + DOM_SOCIAL_JEUNES_ENF + + + + fr.insee + jrqgfzes-CI-1-IP-53 + 1.0 + + DOM_SOCIAL_ENF_HAND + + + + fr.insee + jrqgfzes-CI-1-IP-54 + 1.0 + + DOM_SOCIAL_ENF_ADO + + + + fr.insee + jrqgfzes-CI-1-IP-55 + 1.0 + + DOM_SOCIAL_LOGEMENT + + + + fr.insee + jrqgfzes-CI-1-IP-56 + 1.0 + + DOM_SOCIAL_AIDE_DOM + + + + fr.insee + jrqgfzes-CI-1-IP-57 + 1.0 + + DOM_SOCIAL_AIDE_MIG + + + + fr.insee + jrqgfzes-CI-1-IP-58 + 1.0 + + DOM_SOCIAL_CARITATIF + + + + fr.insee + jrqgfzes-CI-1-IP-59 + 1.0 + + DOM_ENSEIG_PRIM + + + + fr.insee + jrqgfzes-CI-1-IP-60 + 1.0 + + DOM_ENSEIG_SECOND + + + + fr.insee + jrqgfzes-CI-1-IP-61 + 1.0 + + DOM_ENSEIG_SUP + + + + fr.insee + jrqgfzes-CI-1-IP-62 + 1.0 + + DOM_ENSEIG_CULT + + + + fr.insee + jrqgfzes-CI-1-IP-63 + 1.0 + + DOM_ENSEIG_FORM_CONT + + + + fr.insee + jrqgfzes-CI-1-IP-64 + 1.0 + + DOM_ENSEIG_AUTRES + + + + fr.insee + jrqgfzes-CI-1-IP-65 + 1.0 + + DOM_ENSEIG_RECH + + + + + fr.insee + jrqgfzes-QOP-jvmg6vzp + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-1-IP-1 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmfww0r + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-1-IP-2 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmfzk08 + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-1-IP-3 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmg7p6r + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-1-IP-4 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmg4u0d + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-1-IP-5 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmg4n0f + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-1-IP-6 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmfr831 + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-1-IP-7 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmg069o + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-1-IP-8 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmfxjux + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-1-IP-9 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmfsuoa + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-1-IP-10 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmfzhe4 + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-1-IP-11 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmfqrd7 + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-1-IP-12 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmg9tsh + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-1-IP-13 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmfwaj2 + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-1-IP-14 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmfssh5 + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-1-IP-15 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmg344o + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-1-IP-16 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmfzafc + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-1-IP-17 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmfxhkl + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-1-IP-18 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmg5bnp + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-1-IP-19 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmfvrz3 + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-1-IP-20 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmg919i + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-1-IP-21 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmg6xt4 + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-1-IP-22 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmfszn1 + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-1-IP-23 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmg7met + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-1-IP-24 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmg46hp + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-1-IP-25 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmg4134 + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-1-IP-26 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmg9duu + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-1-IP-27 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmfw0vd + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-1-IP-28 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmgakeq + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-1-IP-29 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmg66hq + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-1-IP-30 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmfxkuk + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-1-IP-31 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmg6tmh + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-1-IP-32 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmgaml0 + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-1-IP-33 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmg5tmv + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-1-IP-34 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmg773d + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-1-IP-35 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmg00ii + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-1-IP-36 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmfss1s + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-1-IP-37 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmfskw0 + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-1-IP-38 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmfx82r + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-1-IP-39 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmg6el3 + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-1-IP-40 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmfw799 + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-1-IP-41 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmfrtye + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-1-IP-42 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmg4qc4 + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-1-IP-43 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmg7k40 + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-1-IP-44 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmg01oo + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-1-IP-45 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmfzpak + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-1-IP-46 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmfxe39 + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-1-IP-47 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmfy288 + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-1-IP-48 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmfqafi + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-1-IP-49 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmfznan + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-1-IP-50 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmg576c + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-1-IP-51 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmfvtok + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-1-IP-52 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmftncs + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-1-IP-53 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmg8t2g + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-1-IP-54 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmg7sc9 + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-1-IP-55 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmg65qu + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-1-IP-56 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmg54co + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-1-IP-57 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmg13f1 + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-1-IP-58 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmg07e4 + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-1-IP-59 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmfz28f + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-1-IP-60 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmg4k2q + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-1-IP-61 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmg7nny + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-1-IP-62 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmg2a3y + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-1-IP-63 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmfv5ob + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-1-IP-64 + 1.0 + InParameter + + + + + fr.insee + jrqgfzes-QOP-jvmfw0ep + 1.0 + OutParameter + + + fr.insee + jrqgfzes-CI-1-IP-65 + 1.0 + InParameter + + + (number(if (jrqgfzes-CI-1-IP-1='') then '0' else + jrqgfzes-CI-1-IP-1) + number(if (jrqgfzes-CI-1-IP-2='') then '0' else + jrqgfzes-CI-1-IP-2) + number(if (jrqgfzes-CI-1-IP-3='') then '0' else + jrqgfzes-CI-1-IP-3) + number(if (jrqgfzes-CI-1-IP-4='') then '0' else + jrqgfzes-CI-1-IP-4) + number(if (jrqgfzes-CI-1-IP-5='') then '0' else + jrqgfzes-CI-1-IP-5) + number(if (jrqgfzes-CI-1-IP-6='') then '0' else + jrqgfzes-CI-1-IP-6) + number(if (jrqgfzes-CI-1-IP-7='') then '0' else + jrqgfzes-CI-1-IP-7) + number(if (jrqgfzes-CI-1-IP-8='') then '0' else + jrqgfzes-CI-1-IP-8) + number(if (jrqgfzes-CI-1-IP-9='') then '0' else + jrqgfzes-CI-1-IP-9) + number(if (jrqgfzes-CI-1-IP-10='') then '0' else + jrqgfzes-CI-1-IP-10) + number(if (jrqgfzes-CI-1-IP-11='') then '0' else + jrqgfzes-CI-1-IP-11) + number(if (jrqgfzes-CI-1-IP-12='') then '0' else + jrqgfzes-CI-1-IP-12) + number(if (jrqgfzes-CI-1-IP-13='') then '0' else + jrqgfzes-CI-1-IP-13) + number(if (jrqgfzes-CI-1-IP-14='') then '0' else + jrqgfzes-CI-1-IP-14) + number(if (jrqgfzes-CI-1-IP-15='') then '0' else + jrqgfzes-CI-1-IP-15) + number(if (jrqgfzes-CI-1-IP-16='') then '0' else + jrqgfzes-CI-1-IP-16) + number(if (jrqgfzes-CI-1-IP-17='') then '0' else + jrqgfzes-CI-1-IP-17) + number(if (jrqgfzes-CI-1-IP-18='') then '0' else + jrqgfzes-CI-1-IP-18) + number(if (jrqgfzes-CI-1-IP-19='') then '0' else + jrqgfzes-CI-1-IP-19) + number(if (jrqgfzes-CI-1-IP-20='') then '0' else + jrqgfzes-CI-1-IP-20) + number(if (jrqgfzes-CI-1-IP-21='') then '0' else + jrqgfzes-CI-1-IP-21) + number(if (jrqgfzes-CI-1-IP-22='') then '0' else + jrqgfzes-CI-1-IP-22) + number(if (jrqgfzes-CI-1-IP-23='') then '0' else + jrqgfzes-CI-1-IP-23) + number(if (jrqgfzes-CI-1-IP-24='') then '0' else + jrqgfzes-CI-1-IP-24) + number(if (jrqgfzes-CI-1-IP-25='') then '0' else + jrqgfzes-CI-1-IP-25) + number(if (jrqgfzes-CI-1-IP-26='') then '0' else + jrqgfzes-CI-1-IP-26) + number(if (jrqgfzes-CI-1-IP-27='') then '0' else + jrqgfzes-CI-1-IP-27) + number(if (jrqgfzes-CI-1-IP-28='') then '0' else + jrqgfzes-CI-1-IP-28) + number(if (jrqgfzes-CI-1-IP-29='') then '0' else + jrqgfzes-CI-1-IP-29) + number(if (jrqgfzes-CI-1-IP-30='') then '0' else + jrqgfzes-CI-1-IP-30) + number(if (jrqgfzes-CI-1-IP-31='') then '0' else + jrqgfzes-CI-1-IP-31) + number(if (jrqgfzes-CI-1-IP-32='') then '0' else + jrqgfzes-CI-1-IP-32) + number(if (jrqgfzes-CI-1-IP-33='') then '0' else + jrqgfzes-CI-1-IP-33) + number(if (jrqgfzes-CI-1-IP-34='') then '0' else + jrqgfzes-CI-1-IP-34) + number(if (jrqgfzes-CI-1-IP-35='') then '0' else + jrqgfzes-CI-1-IP-35) + number(if (jrqgfzes-CI-1-IP-36='') then '0' else + jrqgfzes-CI-1-IP-36) + number(if (jrqgfzes-CI-1-IP-37='') then '0' else + jrqgfzes-CI-1-IP-37) + number(if (jrqgfzes-CI-1-IP-38='') then '0' else + jrqgfzes-CI-1-IP-38) + number(if (jrqgfzes-CI-1-IP-39='') then '0' else + jrqgfzes-CI-1-IP-39) + number(if (jrqgfzes-CI-1-IP-40='') then '0' else + jrqgfzes-CI-1-IP-40) + number(if (jrqgfzes-CI-1-IP-41='') then '0' else + jrqgfzes-CI-1-IP-41) + number(if (jrqgfzes-CI-1-IP-42='') then '0' else + jrqgfzes-CI-1-IP-42) + number(if (jrqgfzes-CI-1-IP-43='') then '0' else + jrqgfzes-CI-1-IP-43) + number(if (jrqgfzes-CI-1-IP-44='') then '0' else + jrqgfzes-CI-1-IP-44) + number(if (jrqgfzes-CI-1-IP-45='') then '0' else + jrqgfzes-CI-1-IP-45) + number(if (jrqgfzes-CI-1-IP-46='') then '0' else + jrqgfzes-CI-1-IP-46) + number(if (jrqgfzes-CI-1-IP-47='') then '0' else + jrqgfzes-CI-1-IP-47) + number(if (jrqgfzes-CI-1-IP-48='') then '0' else + jrqgfzes-CI-1-IP-48) + number(if (jrqgfzes-CI-1-IP-49='') then '0' else + jrqgfzes-CI-1-IP-49) + number(if (jrqgfzes-CI-1-IP-50='') then '0' else + jrqgfzes-CI-1-IP-50) + number(if (jrqgfzes-CI-1-IP-51='') then '0' else + jrqgfzes-CI-1-IP-51) + number(if (jrqgfzes-CI-1-IP-52='') then '0' else + jrqgfzes-CI-1-IP-52) + number(if (jrqgfzes-CI-1-IP-53='') then '0' else + jrqgfzes-CI-1-IP-53) + number(if (jrqgfzes-CI-1-IP-54='') then '0' else + jrqgfzes-CI-1-IP-54) + number(if (jrqgfzes-CI-1-IP-55='') then '0' else + jrqgfzes-CI-1-IP-55) + number(if (jrqgfzes-CI-1-IP-56='') then '0' else + jrqgfzes-CI-1-IP-56) + number(if (jrqgfzes-CI-1-IP-57='') then '0' else + jrqgfzes-CI-1-IP-57) + number(if (jrqgfzes-CI-1-IP-58='') then '0' else + jrqgfzes-CI-1-IP-58) + number(if (jrqgfzes-CI-1-IP-59='') then '0' else + jrqgfzes-CI-1-IP-59) + number(if (jrqgfzes-CI-1-IP-60='') then '0' else + jrqgfzes-CI-1-IP-60) + number(if (jrqgfzes-CI-1-IP-61='') then '0' else + jrqgfzes-CI-1-IP-61) + number(if (jrqgfzes-CI-1-IP-62='') then '0' else + jrqgfzes-CI-1-IP-62) + number(if (jrqgfzes-CI-1-IP-63='') then '0' else + jrqgfzes-CI-1-IP-63) + number(if (jrqgfzes-CI-1-IP-64='') then '0' else + jrqgfzes-CI-1-IP-64) + number(if (jrqgfzes-CI-1-IP-65='') then '0' else + jrqgfzes-CI-1-IP-65) ) = 0 + + + + + + fr.insee + js0d53t6-CI-0 + 1.0 + + si SAL_EMP = 1 et SAL_NB_H vide + + + si SAL_EMP = 1 et SAL_NB_H vide + + + fr.insee + js0d53t6-CI-0-II-0 + 1.0 + Instruction + + + + xpath + + fr.insee + js0d53t6-CI-0-IP-1 + 1.0 + + SAL_EMP + + + + fr.insee + js0d53t6-CI-0-IP-2 + 1.0 + + SAL_NB_H + + + + + fr.insee + jseoat5y-QOP-jseo51cx + 1.0 + OutParameter + + + fr.insee + js0d53t6-CI-0-IP-1 + 1.0 + InParameter + + + + + fr.insee + js0d53t6-QOP-js0czgby + 1.0 + OutParameter + + + fr.insee + js0d53t6-CI-0-IP-2 + 1.0 + InParameter + + + js0d53t6-CI-0-IP-1 = '1' and js0d53t6-CI-0-IP-2='' + + + + + + fr.insee + js0dpd65-CI-0 + 1.0 + + si SAL_CA_NB_H>0 et SAL_CA=0 + + + si SAL_CA_NB_H>0 et SAL_CA=0 + + + fr.insee + js0dpd65-CI-0-II-0 + 1.0 + Instruction + + + + xpath + + fr.insee + js0dpd65-CI-0-IP-1 + 1.0 + + SAL_CA + + + + fr.insee + js0dpd65-CI-0-IP-2 + 1.0 + + SAL_CA_NB_H + + + + + fr.insee + js0di1io-QOP-jvmfvkhi + 1.0 + OutParameter + + + fr.insee + js0dpd65-CI-0-IP-1 + 1.0 + InParameter + + + + + fr.insee + js0dpd65-QOP-jvmfqbn0 + 1.0 + OutParameter + + + fr.insee + js0dpd65-CI-0-IP-2 + 1.0 + InParameter + + + number(if (js0dpd65-CI-0-IP-2='') then '0' else + js0dpd65-CI-0-IP-2) > 0 and js0dpd65-CI-0-IP-1 = '0' + + + + + + fr.insee + js0dpd65-CI-1 + 1.0 + + si SAL_CA_NB_H=vide et SAL_CA=1 + + + si SAL_CA_NB_H=vide et SAL_CA=1 + + + fr.insee + js0dpd65-CI-1-II-1 + 1.0 + Instruction + + + + xpath + + fr.insee + js0dpd65-CI-1-IP-1 + 1.0 + + SAL_CA + + + + fr.insee + js0dpd65-CI-1-IP-2 + 1.0 + + SAL_CA_NB_H + + + + + fr.insee + js0di1io-QOP-jvmfvkhi + 1.0 + OutParameter + + + fr.insee + js0dpd65-CI-1-IP-1 + 1.0 + InParameter + + + + + fr.insee + js0dpd65-QOP-jvmfqbn0 + 1.0 + OutParameter + + + fr.insee + js0dpd65-CI-1-IP-2 + 1.0 + InParameter + + + js0dpd65-CI-1-IP-2='' and js0dpd65-CI-1-IP-1 = '1' + + + + + + fr.insee + js0dpd65-CI-2 + 1.0 + + si SAL_CA_NB_H=0 et SAL_CA=1 + + + si SAL_CA_NB_H=0 et SAL_CA=1 + + + fr.insee + js0dpd65-CI-2-II-2 + 1.0 + Instruction + + + + xpath + + fr.insee + js0dpd65-CI-2-IP-1 + 1.0 + + SAL_CA + + + + fr.insee + js0dpd65-CI-2-IP-2 + 1.0 + + SAL_CA_NB_H + + + + + fr.insee + js0di1io-QOP-jvmfvkhi + 1.0 + OutParameter + + + fr.insee + js0dpd65-CI-2-IP-1 + 1.0 + InParameter + + + + + fr.insee + js0dpd65-QOP-jvmfqbn0 + 1.0 + OutParameter + + + fr.insee + js0dpd65-CI-2-IP-2 + 1.0 + InParameter + + + number(if (js0dpd65-CI-2-IP-2='') then '0' else + js0dpd65-CI-2-IP-2) = 0 and js0dpd65-CI-2-IP-2!='' and js0dpd65-CI-2-IP-1 = '1' + + + + + + fr.insee + js0dpd65-CI-3 + 1.0 + + si SAL_CDI_NB_H>0 et SAL_CDI=0 + + + si SAL_CDI_NB_H>0 et SAL_CDI=0 + + + fr.insee + js0dpd65-CI-3-II-3 + 1.0 + Instruction + + + + xpath + + fr.insee + js0dpd65-CI-3-IP-1 + 1.0 + + SAL_CDI + + + + fr.insee + js0dpd65-CI-3-IP-2 + 1.0 + + SAL_CDI_NB_H + + + + + fr.insee + js0di1io-QOP-jvmfwwbw + 1.0 + OutParameter + + + fr.insee + js0dpd65-CI-3-IP-1 + 1.0 + InParameter + + + + + fr.insee + js0dpd65-QOP-jvmg2oc6 + 1.0 + OutParameter + + + fr.insee + js0dpd65-CI-3-IP-2 + 1.0 + InParameter + + + number(if (js0dpd65-CI-3-IP-2='') then '0' else + js0dpd65-CI-3-IP-2) > 0 and js0dpd65-CI-3-IP-1 = '0' + + + + + + fr.insee + js0dpd65-CI-4 + 1.0 + + si SAL_CDI_NB_H=vide et SAL_CDI=1 + + + si SAL_CDI_NB_H=vide et SAL_CDI=1 + + + fr.insee + js0dpd65-CI-4-II-4 + 1.0 + Instruction + + + + xpath + + fr.insee + js0dpd65-CI-4-IP-1 + 1.0 + + SAL_CDI + + + + fr.insee + js0dpd65-CI-4-IP-2 + 1.0 + + SAL_CDI_NB_H + + + + + fr.insee + js0di1io-QOP-jvmfwwbw + 1.0 + OutParameter + + + fr.insee + js0dpd65-CI-4-IP-1 + 1.0 + InParameter + + + + + fr.insee + js0dpd65-QOP-jvmg2oc6 + 1.0 + OutParameter + + + fr.insee + js0dpd65-CI-4-IP-2 + 1.0 + InParameter + + + js0dpd65-CI-4-IP-2='' and js0dpd65-CI-4-IP-1 = '1' + + + + + + fr.insee + js0dpd65-CI-5 + 1.0 + + si SAL_CDI_NB_H=0 et SAL_CDI=1 + + + si SAL_CDI_NB_H=0 et SAL_CDI=1 + + + fr.insee + js0dpd65-CI-5-II-5 + 1.0 + Instruction + + + + xpath + + fr.insee + js0dpd65-CI-5-IP-1 + 1.0 + + SAL_CDI + + + + fr.insee + js0dpd65-CI-5-IP-2 + 1.0 + + SAL_CDI_NB_H + + + + + fr.insee + js0di1io-QOP-jvmfwwbw + 1.0 + OutParameter + + + fr.insee + js0dpd65-CI-5-IP-1 + 1.0 + InParameter + + + + + fr.insee + js0dpd65-QOP-jvmg2oc6 + 1.0 + OutParameter + + + fr.insee + js0dpd65-CI-5-IP-2 + 1.0 + InParameter + + + number(if (js0dpd65-CI-5-IP-2='') then '0' else + js0dpd65-CI-5-IP-2) = 0 and js0dpd65-CI-5-IP-2!='' and js0dpd65-CI-5-IP-1 = '1' + + + + + + fr.insee + js0dpd65-CI-6 + 1.0 + + si SAL_CDD_NB_H>0 et SAL_CDD=0 + + + si SAL_CDD_NB_H>0 et SAL_CDD=0 + + + fr.insee + js0dpd65-CI-6-II-6 + 1.0 + Instruction + + + + xpath + + fr.insee + js0dpd65-CI-6-IP-1 + 1.0 + + SAL_CDD + + + + fr.insee + js0dpd65-CI-6-IP-2 + 1.0 + + SAL_CDD_NB_H + + + + + fr.insee + js0di1io-QOP-jvmfwqal + 1.0 + OutParameter + + + fr.insee + js0dpd65-CI-6-IP-1 + 1.0 + InParameter + + + + + fr.insee + js0dpd65-QOP-jvmg7ajq + 1.0 + OutParameter + + + fr.insee + js0dpd65-CI-6-IP-2 + 1.0 + InParameter + + + number(if (js0dpd65-CI-6-IP-2='') then '0' else + js0dpd65-CI-6-IP-2) > 0 and js0dpd65-CI-6-IP-1 = '0' + + + + + + fr.insee + js0dpd65-CI-7 + 1.0 + + si SAL_CDD_NB_H=vide et SAL_CDD=1 + + + si SAL_CDD_NB_H=vide et SAL_CDD=1 + + + fr.insee + js0dpd65-CI-7-II-7 + 1.0 + Instruction + + + + xpath + + fr.insee + js0dpd65-CI-7-IP-1 + 1.0 + + SAL_CDD + + + + fr.insee + js0dpd65-CI-7-IP-2 + 1.0 + + SAL_CDD_NB_H + + + + + fr.insee + js0di1io-QOP-jvmfwqal + 1.0 + OutParameter + + + fr.insee + js0dpd65-CI-7-IP-1 + 1.0 + InParameter + + + + + fr.insee + js0dpd65-QOP-jvmg7ajq + 1.0 + OutParameter + + + fr.insee + js0dpd65-CI-7-IP-2 + 1.0 + InParameter + + + js0dpd65-CI-7-IP-2='' and js0dpd65-CI-7-IP-1 = '1' + + + + + + fr.insee + js0dpd65-CI-8 + 1.0 + + si SAL_CDD_NB_H=0 et SAL_CDD=1 + + + si SAL_CDD_NB_H=0 et SAL_CDD=1 + + + fr.insee + js0dpd65-CI-8-II-8 + 1.0 + Instruction + + + + xpath + + fr.insee + js0dpd65-CI-8-IP-1 + 1.0 + + SAL_CDD + + + + fr.insee + js0dpd65-CI-8-IP-2 + 1.0 + + SAL_CDD_NB_H + + + + + fr.insee + js0di1io-QOP-jvmfwqal + 1.0 + OutParameter + + + fr.insee + js0dpd65-CI-8-IP-1 + 1.0 + InParameter + + + + + fr.insee + js0dpd65-QOP-jvmg7ajq + 1.0 + OutParameter + + + fr.insee + js0dpd65-CI-8-IP-2 + 1.0 + InParameter + + + number(if (js0dpd65-CI-8-IP-2='') then '0' else + js0dpd65-CI-8-IP-2) = 0 and js0dpd65-CI-8-IP-2!='' and js0dpd65-CI-8-IP-1 = '1' + + + + + + fr.insee + js0dpd65-CI-9 + 1.0 + + si SAL_NB_H non vide et SAL_CA_NB_H + SAL_CDI_NB_H + + SAL_CDD_NB_H > SAL_NB_H + + + si SAL_NB_H non vide et SAL_CA_NB_H + SAL_CDI_NB_H + + SAL_CDD_NB_H > SAL_NB_H + + + fr.insee + js0dpd65-CI-9-II-9 + 1.0 + Instruction + + + + xpath + + fr.insee + js0dpd65-CI-9-IP-1 + 1.0 + + SAL_NB_H + + + + fr.insee + js0dpd65-CI-9-IP-2 + 1.0 + + SAL_CA_NB_H + + + + fr.insee + js0dpd65-CI-9-IP-3 + 1.0 + + SAL_CDI_NB_H + + + + fr.insee + js0dpd65-CI-9-IP-4 + 1.0 + + SAL_CDD_NB_H + + + + + fr.insee + js0d53t6-QOP-js0czgby + 1.0 + OutParameter + + + fr.insee + js0dpd65-CI-9-IP-1 + 1.0 + InParameter + + + + + fr.insee + js0dpd65-QOP-jvmfqbn0 + 1.0 + OutParameter + + + fr.insee + js0dpd65-CI-9-IP-2 + 1.0 + InParameter + + + + + fr.insee + js0dpd65-QOP-jvmg2oc6 + 1.0 + OutParameter + + + fr.insee + js0dpd65-CI-9-IP-3 + 1.0 + InParameter + + + + + fr.insee + js0dpd65-QOP-jvmg7ajq + 1.0 + OutParameter + + + fr.insee + js0dpd65-CI-9-IP-4 + 1.0 + InParameter + + + js0dpd65-CI-9-IP-1!='' and (number(if (js0dpd65-CI-9-IP-2='') then '0' else + js0dpd65-CI-9-IP-2) + number(if (js0dpd65-CI-9-IP-3='') then '0' else + js0dpd65-CI-9-IP-3) + number(if (js0dpd65-CI-9-IP-4='') then '0' else + js0dpd65-CI-9-IP-4)) > number(if (js0dpd65-CI-9-IP-1='') then '0' else + js0dpd65-CI-9-IP-1) + + + + + + fr.insee + jseoi4yc-CI-0 + 1.0 + + Si SAL_NB > 0 et SAL_EMP = vide + + + Si SAL_NB > 0 et SAL_EMP = vide + + + fr.insee + jseoi4yc-CI-0-II-0 + 1.0 + Instruction + + + + xpath + + fr.insee + jseoi4yc-CI-0-IP-1 + 1.0 + + SAL_EMP + + + + fr.insee + jseoi4yc-CI-0-IP-2 + 1.0 + + SAL_NB + + + + + fr.insee + jseoat5y-QOP-jseo51cx + 1.0 + OutParameter + + + fr.insee + jseoi4yc-CI-0-IP-1 + 1.0 + InParameter + + + + + fr.insee + jseoi4yc-QOP-jseo0mfc + 1.0 + OutParameter + + + fr.insee + jseoi4yc-CI-0-IP-2 + 1.0 + InParameter + + + number(if (jseoi4yc-CI-0-IP-2='') then '0' else + jseoi4yc-CI-0-IP-2) > 0 and jseoi4yc-CI-0-IP-1 = '' + + + + + + fr.insee + jseoe6ty-CI-0 + 1.0 + + si SAL_TPS_PLEIN = 0 ET SAL_TPS_PARTIEL= 0 ET SAL_NB>0 + + + + si SAL_TPS_PLEIN = 0 ET SAL_TPS_PARTIEL= 0 ET SAL_NB>0 + + + + fr.insee + jseoe6ty-CI-0-II-0 + 1.0 + Instruction + + + + xpath + + fr.insee + jseoe6ty-CI-0-IP-1 + 1.0 + + SAL_NB + + + + fr.insee + jseoe6ty-CI-0-IP-2 + 1.0 + + SAL_TPS_PLEIN + + + + fr.insee + jseoe6ty-CI-0-IP-3 + 1.0 + + SAL_TPS_PARTIEL + + + + + fr.insee + jseoi4yc-QOP-jseo0mfc + 1.0 + OutParameter + + + fr.insee + jseoe6ty-CI-0-IP-1 + 1.0 + InParameter + + + + + fr.insee + jseoe6ty-QOP-jvmg69sa + 1.0 + OutParameter + + + fr.insee + jseoe6ty-CI-0-IP-2 + 1.0 + InParameter + + + + + fr.insee + jseoe6ty-QOP-jvmg5jhi + 1.0 + OutParameter + + + fr.insee + jseoe6ty-CI-0-IP-3 + 1.0 + InParameter + + + number(if (jseoe6ty-CI-0-IP-2='') then '0' else + jseoe6ty-CI-0-IP-2) = 0 and jseoe6ty-CI-0-IP-2!='' and number(if (jseoe6ty-CI-0-IP-3='') then '0' else + jseoe6ty-CI-0-IP-3) = 0 and jseoe6ty-CI-0-IP-3!='' and number(if (jseoe6ty-CI-0-IP-1='') then '0' else + jseoe6ty-CI-0-IP-1) > 0 + + + + + + fr.insee + jseoe6ty-CI-1 + 1.0 + + si SAL_NB > 0 et SAL_TPS_PLEIN + SAL_TPS_PARTIEL > + SAL_NB + + + si SAL_NB > 0 et SAL_TPS_PLEIN + SAL_TPS_PARTIEL > + SAL_NB + + + fr.insee + jseoe6ty-CI-1-II-1 + 1.0 + Instruction + + + + xpath + + fr.insee + jseoe6ty-CI-1-IP-1 + 1.0 + + SAL_NB + + + + fr.insee + jseoe6ty-CI-1-IP-2 + 1.0 + + SAL_TPS_PLEIN + + + + fr.insee + jseoe6ty-CI-1-IP-3 + 1.0 + + SAL_TPS_PARTIEL + + + + + fr.insee + jseoi4yc-QOP-jseo0mfc + 1.0 + OutParameter + + + fr.insee + jseoe6ty-CI-1-IP-1 + 1.0 + InParameter + + + + + fr.insee + jseoe6ty-QOP-jvmg69sa + 1.0 + OutParameter + + + fr.insee + jseoe6ty-CI-1-IP-2 + 1.0 + InParameter + + + + + fr.insee + jseoe6ty-QOP-jvmg5jhi + 1.0 + OutParameter + + + fr.insee + jseoe6ty-CI-1-IP-3 + 1.0 + InParameter + + + number(if (jseoe6ty-CI-1-IP-1='') then '0' else + jseoe6ty-CI-1-IP-1) > 0 and (number(if (jseoe6ty-CI-1-IP-2='') then '0' else + jseoe6ty-CI-1-IP-2) + number(if (jseoe6ty-CI-1-IP-3='') then '0' else + jseoe6ty-CI-1-IP-3)) > number(if (jseoe6ty-CI-1-IP-1='') then '0' else + jseoe6ty-CI-1-IP-1) + + + + + + fr.insee + jseoe6ty-CI-2 + 1.0 + + si SAL_TPS_PARTIEL > 0 et SAL_TPS_PARTIEL_RED > + SAL_TPS_PARTIEL + + + si SAL_TPS_PARTIEL > 0 et SAL_TPS_PARTIEL_RED > + SAL_TPS_PARTIEL + + + fr.insee + jseoe6ty-CI-2-II-2 + 1.0 + Instruction + + + + xpath + + fr.insee + jseoe6ty-CI-2-IP-1 + 1.0 + + SAL_TPS_PARTIEL + + + + fr.insee + jseoe6ty-CI-2-IP-2 + 1.0 + + SAL_TPS_PARTIEL_RED + + + + + fr.insee + jseoe6ty-QOP-jvmg5jhi + 1.0 + OutParameter + + + fr.insee + jseoe6ty-CI-2-IP-1 + 1.0 + InParameter + + + + + fr.insee + jseoe6ty-QOP-jvmfqq19 + 1.0 + OutParameter + + + fr.insee + jseoe6ty-CI-2-IP-2 + 1.0 + InParameter + + + number(if (jseoe6ty-CI-2-IP-1='') then '0' else + jseoe6ty-CI-2-IP-1) > 0 and number(if (jseoe6ty-CI-2-IP-2='') then '0' else + jseoe6ty-CI-2-IP-2) > number(if (jseoe6ty-CI-2-IP-1='') then '0' else + jseoe6ty-CI-2-IP-1) + + + + + + fr.insee + jseoe6ty-CI-3 + 1.0 + + si SAL_TPS_PARTIEL vide et SAL_TPS_PARTIEL_RED > 0 + + + + si SAL_TPS_PARTIEL vide et SAL_TPS_PARTIEL_RED > 0 + + + + fr.insee + jseoe6ty-CI-3-II-3 + 1.0 + Instruction + + + + xpath + + fr.insee + jseoe6ty-CI-3-IP-1 + 1.0 + + SAL_TPS_PARTIEL + + + + fr.insee + jseoe6ty-CI-3-IP-2 + 1.0 + + SAL_TPS_PARTIEL_RED + + + + + fr.insee + jseoe6ty-QOP-jvmg5jhi + 1.0 + OutParameter + + + fr.insee + jseoe6ty-CI-3-IP-1 + 1.0 + InParameter + + + + + fr.insee + jseoe6ty-QOP-jvmfqq19 + 1.0 + OutParameter + + + fr.insee + jseoe6ty-CI-3-IP-2 + 1.0 + InParameter + + + jseoe6ty-CI-3-IP-1='' and number(if (jseoe6ty-CI-3-IP-2='') then '0' else + jseoe6ty-CI-3-IP-2) > 0 + + + + + + fr.insee + jseoe6ty-CI-4 + 1.0 + + si SAL_NB > 0 et SAL_TPS_PLEIN + SAL_TPS_PARTIEL < + SAL_NB + + + si SAL_NB > 0 et SAL_TPS_PLEIN + SAL_TPS_PARTIEL < + SAL_NB + + + fr.insee + jseoe6ty-CI-4-II-4 + 1.0 + Instruction + + + + xpath + + fr.insee + jseoe6ty-CI-4-IP-1 + 1.0 + + SAL_NB + + + + fr.insee + jseoe6ty-CI-4-IP-2 + 1.0 + + SAL_TPS_PLEIN + + + + fr.insee + jseoe6ty-CI-4-IP-3 + 1.0 + + SAL_TPS_PARTIEL + + + + + fr.insee + jseoi4yc-QOP-jseo0mfc + 1.0 + OutParameter + + + fr.insee + jseoe6ty-CI-4-IP-1 + 1.0 + InParameter + + + + + fr.insee + jseoe6ty-QOP-jvmg69sa + 1.0 + OutParameter + + + fr.insee + jseoe6ty-CI-4-IP-2 + 1.0 + InParameter + + + + + fr.insee + jseoe6ty-QOP-jvmg5jhi + 1.0 + OutParameter + + + fr.insee + jseoe6ty-CI-4-IP-3 + 1.0 + InParameter + + + number(if (jseoe6ty-CI-4-IP-1='') then '0' else + jseoe6ty-CI-4-IP-1) > 0 and (number(if (jseoe6ty-CI-4-IP-2='') then '0' else + jseoe6ty-CI-4-IP-2) + number(if (jseoe6ty-CI-4-IP-3='') then '0' else + jseoe6ty-CI-4-IP-3)) < number(if (jseoe6ty-CI-4-IP-1='') then '0' else + jseoe6ty-CI-4-IP-1) + + + + + + fr.insee + js0dwvc2-CI-0 + 1.0 + + si AUT_PERS_INTERIM_NB_H>0 et AUT_PERS_INTERIM=0 + + + + si AUT_PERS_INTERIM_NB_H>0 et AUT_PERS_INTERIM=0 + + + + fr.insee + js0dwvc2-CI-0-II-0 + 1.0 + Instruction + + + + xpath + + fr.insee + js0dwvc2-CI-0-IP-1 + 1.0 + + AUT_PERS_INTERIM + + + + fr.insee + js0dwvc2-CI-0-IP-2 + 1.0 + + AUT_PERS_INTERIM_NB_H + + + + + fr.insee + js0dvdaw-QOP-jvmg80aa + 1.0 + OutParameter + + + fr.insee + js0dwvc2-CI-0-IP-1 + 1.0 + InParameter + + + + + fr.insee + js0dwvc2-QOP-jvmfxje1 + 1.0 + OutParameter + + + fr.insee + js0dwvc2-CI-0-IP-2 + 1.0 + InParameter + + + number(if (js0dwvc2-CI-0-IP-2='') then '0' else + js0dwvc2-CI-0-IP-2) > 0 and js0dwvc2-CI-0-IP-1 = '0' + + + + + + fr.insee + js0dwvc2-CI-1 + 1.0 + + si AUT_PERS_INTERIM_NB_H=0 et AUT_PERS_INTERIM=1 + + + + si AUT_PERS_INTERIM_NB_H=0 et AUT_PERS_INTERIM=1 + + + + fr.insee + js0dwvc2-CI-1-II-1 + 1.0 + Instruction + + + + xpath + + fr.insee + js0dwvc2-CI-1-IP-1 + 1.0 + + AUT_PERS_INTERIM + + + + fr.insee + js0dwvc2-CI-1-IP-2 + 1.0 + + AUT_PERS_INTERIM_NB_H + + + + + fr.insee + js0dvdaw-QOP-jvmg80aa + 1.0 + OutParameter + + + fr.insee + js0dwvc2-CI-1-IP-1 + 1.0 + InParameter + + + + + fr.insee + js0dwvc2-QOP-jvmfxje1 + 1.0 + OutParameter + + + fr.insee + js0dwvc2-CI-1-IP-2 + 1.0 + InParameter + + + number(if (js0dwvc2-CI-1-IP-2='') then '0' else + js0dwvc2-CI-1-IP-2) = 0 and js0dwvc2-CI-1-IP-2!='' and js0dwvc2-CI-1-IP-1 = '1' + + + + + + fr.insee + js0dwvc2-CI-2 + 1.0 + + si AUT_PERS_INTERIM_NB_H=vide et AUT_PERS_INTERIM=1 + + + + si AUT_PERS_INTERIM_NB_H=vide et AUT_PERS_INTERIM=1 + + + + fr.insee + js0dwvc2-CI-2-II-2 + 1.0 + Instruction + + + + xpath + + fr.insee + js0dwvc2-CI-2-IP-1 + 1.0 + + AUT_PERS_INTERIM + + + + fr.insee + js0dwvc2-CI-2-IP-2 + 1.0 + + AUT_PERS_INTERIM_NB_H + + + + + fr.insee + js0dvdaw-QOP-jvmg80aa + 1.0 + OutParameter + + + fr.insee + js0dwvc2-CI-2-IP-1 + 1.0 + InParameter + + + + + fr.insee + js0dwvc2-QOP-jvmfxje1 + 1.0 + OutParameter + + + fr.insee + js0dwvc2-CI-2-IP-2 + 1.0 + InParameter + + + js0dwvc2-CI-2-IP-2='' and js0dwvc2-CI-2-IP-1 = '1' + + + + + + fr.insee + js0dwvc2-CI-3 + 1.0 + + si AUT_PERS_MAD_NB_H>0 et AUT_PERS_MAD=0 + + + si AUT_PERS_MAD_NB_H>0 et AUT_PERS_MAD=0 + + + fr.insee + js0dwvc2-CI-3-II-3 + 1.0 + Instruction + + + + xpath + + fr.insee + js0dwvc2-CI-3-IP-1 + 1.0 + + AUT_PERS_MAD + + + + fr.insee + js0dwvc2-CI-3-IP-2 + 1.0 + + AUT_PERS_MAD_NB_H + + + + + fr.insee + js0dvdaw-QOP-jvmg0q44 + 1.0 + OutParameter + + + fr.insee + js0dwvc2-CI-3-IP-1 + 1.0 + InParameter + + + + + fr.insee + js0dwvc2-QOP-jvmg5k42 + 1.0 + OutParameter + + + fr.insee + js0dwvc2-CI-3-IP-2 + 1.0 + InParameter + + + number(if (js0dwvc2-CI-3-IP-2='') then '0' else + js0dwvc2-CI-3-IP-2) > 0 and js0dwvc2-CI-3-IP-1 = '0' + + + + + + fr.insee + js0dwvc2-CI-4 + 1.0 + + si AUT_PERS_MAD_NB_H=vide et AUT_PERS_MAD=1 + + + si AUT_PERS_MAD_NB_H=vide et AUT_PERS_MAD=1 + + + fr.insee + js0dwvc2-CI-4-II-4 + 1.0 + Instruction + + + + xpath + + fr.insee + js0dwvc2-CI-4-IP-1 + 1.0 + + AUT_PERS_MAD + + + + fr.insee + js0dwvc2-CI-4-IP-2 + 1.0 + + AUT_PERS_MAD_NB_H + + + + + fr.insee + js0dvdaw-QOP-jvmg0q44 + 1.0 + OutParameter + + + fr.insee + js0dwvc2-CI-4-IP-1 + 1.0 + InParameter + + + + + fr.insee + js0dwvc2-QOP-jvmg5k42 + 1.0 + OutParameter + + + fr.insee + js0dwvc2-CI-4-IP-2 + 1.0 + InParameter + + + js0dwvc2-CI-4-IP-2='' and js0dwvc2-CI-4-IP-1 = '1' + + + + + + fr.insee + js0dwvc2-CI-5 + 1.0 + + si AUT_PERS_MAD_NB_H=0 et AUT_PERS_MAD=1 + + + si AUT_PERS_MAD_NB_H=0 et AUT_PERS_MAD=1 + + + fr.insee + js0dwvc2-CI-5-II-5 + 1.0 + Instruction + + + + xpath + + fr.insee + js0dwvc2-CI-5-IP-1 + 1.0 + + AUT_PERS_MAD + + + + fr.insee + js0dwvc2-CI-5-IP-2 + 1.0 + + AUT_PERS_MAD_NB_H + + + + + fr.insee + js0dvdaw-QOP-jvmg0q44 + 1.0 + OutParameter + + + fr.insee + js0dwvc2-CI-5-IP-1 + 1.0 + InParameter + + + + + fr.insee + js0dwvc2-QOP-jvmg5k42 + 1.0 + OutParameter + + + fr.insee + js0dwvc2-CI-5-IP-2 + 1.0 + InParameter + + + number(if (js0dwvc2-CI-5-IP-2='') then '0' else + js0dwvc2-CI-5-IP-2) = 0 and js0dwvc2-CI-5-IP-2!='' and js0dwvc2-CI-5-IP-1 = '1' + + + + + + fr.insee + js0dwvc2-CI-6 + 1.0 + + si AUT_PERS_VOL_NB_H>0 et AUT_PERS_VOL=0 + + + si AUT_PERS_VOL_NB_H>0 et AUT_PERS_VOL=0 + + + fr.insee + js0dwvc2-CI-6-II-6 + 1.0 + Instruction + + + + xpath + + fr.insee + js0dwvc2-CI-6-IP-1 + 1.0 + + AUT_PERS_VOL + + + + fr.insee + js0dwvc2-CI-6-IP-2 + 1.0 + + AUT_PERS_VOL_NB_H + + + + + fr.insee + js0dvdaw-QOP-jvmfv87q + 1.0 + OutParameter + + + fr.insee + js0dwvc2-CI-6-IP-1 + 1.0 + InParameter + + + + + fr.insee + js0dwvc2-QOP-jvmftckh + 1.0 + OutParameter + + + fr.insee + js0dwvc2-CI-6-IP-2 + 1.0 + InParameter + + + number(if (js0dwvc2-CI-6-IP-2='') then '0' else + js0dwvc2-CI-6-IP-2) > 0 and js0dwvc2-CI-6-IP-1 = '0' + + + + + + fr.insee + js0dwvc2-CI-7 + 1.0 + + si AUT_PERS_VOL_NB_H=vide et AUT_PERS_VOL=1 + + + si AUT_PERS_VOL_NB_H=vide et AUT_PERS_VOL=1 + + + fr.insee + js0dwvc2-CI-7-II-7 + 1.0 + Instruction + + + + xpath + + fr.insee + js0dwvc2-CI-7-IP-1 + 1.0 + + AUT_PERS_VOL + + + + fr.insee + js0dwvc2-CI-7-IP-2 + 1.0 + + AUT_PERS_VOL_NB_H + + + + + fr.insee + js0dvdaw-QOP-jvmfv87q + 1.0 + OutParameter + + + fr.insee + js0dwvc2-CI-7-IP-1 + 1.0 + InParameter + + + + + fr.insee + js0dwvc2-QOP-jvmftckh + 1.0 + OutParameter + + + fr.insee + js0dwvc2-CI-7-IP-2 + 1.0 + InParameter + + + js0dwvc2-CI-7-IP-2='' and js0dwvc2-CI-7-IP-1 = '1' + + + + + + fr.insee + js0dwvc2-CI-8 + 1.0 + + si AUT_PERS_VOL_NB_H=0 et AUT_PERS_VOL=1 + + + si AUT_PERS_VOL_NB_H=0 et AUT_PERS_VOL=1 + + + fr.insee + js0dwvc2-CI-8-II-8 + 1.0 + Instruction + + + + xpath + + fr.insee + js0dwvc2-CI-8-IP-1 + 1.0 + + AUT_PERS_VOL + + + + fr.insee + js0dwvc2-CI-8-IP-2 + 1.0 + + AUT_PERS_VOL_NB_H + + + + + fr.insee + js0dvdaw-QOP-jvmfv87q + 1.0 + OutParameter + + + fr.insee + js0dwvc2-CI-8-IP-1 + 1.0 + InParameter + + + + + fr.insee + js0dwvc2-QOP-jvmftckh + 1.0 + OutParameter + + + fr.insee + js0dwvc2-CI-8-IP-2 + 1.0 + InParameter + + + number(if (js0dwvc2-CI-8-IP-2='') then '0' else + js0dwvc2-CI-8-IP-2) = 0 and js0dwvc2-CI-8-IP-2!='' and js0dwvc2-CI-8-IP-1 = '1' + + + + + + fr.insee + js0dwvc2-CI-9 + 1.0 + + si AUT_PERS_AUTRES_NB_H>0 et AUT_PERS_AUTRES=0 + + + + si AUT_PERS_AUTRES_NB_H>0 et AUT_PERS_AUTRES=0 + + + + fr.insee + js0dwvc2-CI-9-II-9 + 1.0 + Instruction + + + + xpath + + fr.insee + js0dwvc2-CI-9-IP-1 + 1.0 + + AUT_PERS_AUTRES + + + + fr.insee + js0dwvc2-CI-9-IP-2 + 1.0 + + AUT_PERS_AUTRES_NB_H + + + + + fr.insee + js0dvdaw-QOP-jvmfxlqr + 1.0 + OutParameter + + + fr.insee + js0dwvc2-CI-9-IP-1 + 1.0 + InParameter + + + + + fr.insee + js0dwvc2-QOP-jvmfv1sf + 1.0 + OutParameter + + + fr.insee + js0dwvc2-CI-9-IP-2 + 1.0 + InParameter + + + number(if (js0dwvc2-CI-9-IP-2='') then '0' else + js0dwvc2-CI-9-IP-2) > 0 and js0dwvc2-CI-9-IP-1 = '0' + + + + + + fr.insee + js0dwvc2-CI-10 + 1.0 + + si AUT_PERS_AUTRES_NB_H=vide et AUT_PERS_AUTRES=1 + + + + si AUT_PERS_AUTRES_NB_H=vide et AUT_PERS_AUTRES=1 + + + + fr.insee + js0dwvc2-CI-10-II-10 + 1.0 + Instruction + + + + xpath + + fr.insee + js0dwvc2-CI-10-IP-1 + 1.0 + + AUT_PERS_AUTRES + + + + fr.insee + js0dwvc2-CI-10-IP-2 + 1.0 + + AUT_PERS_AUTRES_NB_H + + + + + fr.insee + js0dvdaw-QOP-jvmfxlqr + 1.0 + OutParameter + + + fr.insee + js0dwvc2-CI-10-IP-1 + 1.0 + InParameter + + + + + fr.insee + js0dwvc2-QOP-jvmfv1sf + 1.0 + OutParameter + + + fr.insee + js0dwvc2-CI-10-IP-2 + 1.0 + InParameter + + + js0dwvc2-CI-10-IP-2='' and js0dwvc2-CI-10-IP-1 = '1' + + + + + + fr.insee + js0dwvc2-CI-11 + 1.0 + + si AUT_PERS_AUTRES_NB_H=0 et AUT_PERS_AUTRES=1 + + + si AUT_PERS_AUTRES_NB_H=0 et AUT_PERS_AUTRES=1 + + + + fr.insee + js0dwvc2-CI-11-II-11 + 1.0 + Instruction + + + + xpath + + fr.insee + js0dwvc2-CI-11-IP-1 + 1.0 + + AUT_PERS_AUTRES + + + + fr.insee + js0dwvc2-CI-11-IP-2 + 1.0 + + AUT_PERS_AUTRES_NB_H + + + + + fr.insee + js0dvdaw-QOP-jvmfxlqr + 1.0 + OutParameter + + + fr.insee + js0dwvc2-CI-11-IP-1 + 1.0 + InParameter + + + + + fr.insee + js0dwvc2-QOP-jvmfv1sf + 1.0 + OutParameter + + + fr.insee + js0dwvc2-CI-11-IP-2 + 1.0 + InParameter + + + number(if (js0dwvc2-CI-11-IP-2='') then '0' else + js0dwvc2-CI-11-IP-2) = 0 and js0dwvc2-CI-11-IP-2!='' and js0dwvc2-CI-11-IP-1 = '1' + + + + + + fr.insee + js0dvdaw-CI-0 + 1.0 + + si AUT_PERS_AUTRES_P=vide et AUT_PERS_AUTRES=1 + + + si AUT_PERS_AUTRES_P=vide et AUT_PERS_AUTRES=1 + + + + fr.insee + js0dvdaw-CI-0-II-0 + 1.0 + Instruction + + + + xpath + + fr.insee + js0dvdaw-CI-0-IP-1 + 1.0 + + AUT_PERS_AUTRES + + + + fr.insee + js0dvdaw-CI-0-IP-2 + 1.0 + + AUT_PERS_AUTRES_P + + + + + fr.insee + js0dvdaw-QOP-jvmfxlqr + 1.0 + OutParameter + + + fr.insee + js0dvdaw-CI-0-IP-1 + 1.0 + InParameter + + + + + fr.insee + js0dvdaw-QOP-jprecisez + 1.0 + OutParameter + + + fr.insee + js0dvdaw-CI-0-IP-2 + 1.0 + InParameter + + + js0dvdaw-CI-0-IP-1='1' and js0dvdaw-CI-0-IP-2='' + + + + + + fr.insee + js0eh523-CI-0 + 1.0 + + si BENEV_NB = vide + + + si BENEV_NB = vide + + + fr.insee + js0eh523-CI-0-II-0 + 1.0 + Instruction + + + + xpath + + fr.insee + js0eh523-CI-0-IP-1 + 1.0 + + BENEV_NB + + + + + fr.insee + js0eh523-QOP-js0e63o9 + 1.0 + OutParameter + + + fr.insee + js0eh523-CI-0-IP-1 + 1.0 + InParameter + + + js0eh523-CI-0-IP-1='' + + + + + + fr.insee + js0egvao-CI-0 + 1.0 + + si BENEV_NB > 0 et BENEV_REG_NB > BENEV_NB + + + + si BENEV_NB > 0 et BENEV_REG_NB > BENEV_NB + + + + fr.insee + js0egvao-CI-0-II-0 + 1.0 + Instruction + + + + xpath + + fr.insee + js0egvao-CI-0-IP-1 + 1.0 + + BENEV_NB + + + + fr.insee + js0egvao-CI-0-IP-2 + 1.0 + + BENEV_REG_NB + + + + + fr.insee + js0eh523-QOP-js0e63o9 + 1.0 + OutParameter + + + fr.insee + js0egvao-CI-0-IP-1 + 1.0 + InParameter + + + + + fr.insee + js0egvao-QOP-js0en3v8 + 1.0 + OutParameter + + + fr.insee + js0egvao-CI-0-IP-2 + 1.0 + InParameter + + + (number(if (js0egvao-CI-0-IP-1='') then '0' else + js0egvao-CI-0-IP-1) > 0) and (number(if (js0egvao-CI-0-IP-2='') then '0' + else js0egvao-CI-0-IP-2) > number(if (js0egvao-CI-0-IP-1='') then '0' else + js0egvao-CI-0-IP-1)) + + + + + + fr.insee + js0eg1cf-CI-0 + 1.0 + + si BENEV_NB_H= vide et BENEV_NB>0 + + + si BENEV_NB_H= vide et BENEV_NB>0 + + + fr.insee + js0eg1cf-CI-0-II-0 + 1.0 + Instruction + + + + xpath + + fr.insee + js0eg1cf-CI-0-IP-1 + 1.0 + + BENEV_NB + + + + fr.insee + js0eg1cf-CI-0-IP-2 + 1.0 + + BENEV_NB_H + + + + + fr.insee + js0eh523-QOP-js0e63o9 + 1.0 + OutParameter + + + fr.insee + js0eg1cf-CI-0-IP-1 + 1.0 + InParameter + + + + + fr.insee + js0eg1cf-QOP-jvmg494w + 1.0 + OutParameter + + + fr.insee + js0eg1cf-CI-0-IP-2 + 1.0 + InParameter + + + js0eg1cf-CI-0-IP-2='' and number(if (js0eg1cf-CI-0-IP-1='') then '0' else + js0eg1cf-CI-0-IP-1) > 0 + + + + + + fr.insee + js0eg1cf-CI-1 + 1.0 + + si BENEV_REG_NB_H= vide et BENEV_REG_NB>0 + + + si BENEV_REG_NB_H= vide et BENEV_REG_NB>0 + + + fr.insee + js0eg1cf-CI-1-II-1 + 1.0 + Instruction + + + + xpath + + fr.insee + js0eg1cf-CI-1-IP-1 + 1.0 + + BENEV_REG_NB + + + + fr.insee + js0eg1cf-CI-1-IP-2 + 1.0 + + BENEV_REG_NB_H + + + + + fr.insee + js0egvao-QOP-js0en3v8 + 1.0 + OutParameter + + + fr.insee + js0eg1cf-CI-1-IP-1 + 1.0 + InParameter + + + + + fr.insee + js0eg1cf-QOP-jvmg80ov + 1.0 + OutParameter + + + fr.insee + js0eg1cf-CI-1-IP-2 + 1.0 + InParameter + + + js0eg1cf-CI-1-IP-2='' and number(if (js0eg1cf-CI-1-IP-1='') then '0' else + js0eg1cf-CI-1-IP-1) > 0 + + + + + + fr.insee + js0eg1cf-CI-2 + 1.0 + + si BENEV_NB_H > 0 et BENEV_REG_NB_H > BENEV_NB_H + + + + si BENEV_NB_H > 0 et BENEV_REG_NB_H > BENEV_NB_H + + + + fr.insee + js0eg1cf-CI-2-II-2 + 1.0 + Instruction + + + + xpath + + fr.insee + js0eg1cf-CI-2-IP-1 + 1.0 + + BENEV_NB_H + + + + fr.insee + js0eg1cf-CI-2-IP-2 + 1.0 + + BENEV_REG_NB_H + + + + + fr.insee + js0eg1cf-QOP-jvmg494w + 1.0 + OutParameter + + + fr.insee + js0eg1cf-CI-2-IP-1 + 1.0 + InParameter + + + + + fr.insee + js0eg1cf-QOP-jvmg80ov + 1.0 + OutParameter + + + fr.insee + js0eg1cf-CI-2-IP-2 + 1.0 + InParameter + + + number(if (js0eg1cf-CI-2-IP-1='') then '0' else + js0eg1cf-CI-2-IP-1) > 0 and number(if (js0eg1cf-CI-2-IP-2='') then '0' else + js0eg1cf-CI-2-IP-2) > number(if (js0eg1cf-CI-2-IP-1='') then '0' else + js0eg1cf-CI-2-IP-1) + + + + + + fr.insee + js0eg1cf-CI-3 + 1.0 + + si BENEV_NB > 0 et BENEV_NB_H > BENEV_NB multiplié + par 3100 + + + si BENEV_NB > 0 et BENEV_NB_H > BENEV_NB multiplié + par 3100 + + + fr.insee + js0eg1cf-CI-3-II-3 + 1.0 + Instruction + + + + xpath + + fr.insee + js0eg1cf-CI-3-IP-1 + 1.0 + + BENEV_NB + + + + fr.insee + js0eg1cf-CI-3-IP-2 + 1.0 + + BENEV_NB_H + + + + + fr.insee + js0eh523-QOP-js0e63o9 + 1.0 + OutParameter + + + fr.insee + js0eg1cf-CI-3-IP-1 + 1.0 + InParameter + + + + + fr.insee + js0eg1cf-QOP-jvmg494w + 1.0 + OutParameter + + + fr.insee + js0eg1cf-CI-3-IP-2 + 1.0 + InParameter + + + number(if (js0eg1cf-CI-3-IP-1='') then '0' else + js0eg1cf-CI-3-IP-1) > 0 and number(if (js0eg1cf-CI-3-IP-2='') then '0' else + js0eg1cf-CI-3-IP-2) > 3100 * number(if (js0eg1cf-CI-3-IP-1='') then '0' else + js0eg1cf-CI-3-IP-1) + + + + + + fr.insee + js0eg1cf-CI-4 + 1.0 + + si BENEV_NB=BENEV_REG_NB et BENEV_NB_H différent de + BENEV_REG_NB_H + + + si BENEV_NB=BENEV_REG_NB et BENEV_NB_H différent de + BENEV_REG_NB_H + + + fr.insee + js0eg1cf-CI-4-II-4 + 1.0 + Instruction + + + + xpath + + fr.insee + js0eg1cf-CI-4-IP-1 + 1.0 + + BENEV_NB + + + + fr.insee + js0eg1cf-CI-4-IP-2 + 1.0 + + BENEV_REG_NB + + + + fr.insee + js0eg1cf-CI-4-IP-3 + 1.0 + + BENEV_NB_H + + + + fr.insee + js0eg1cf-CI-4-IP-4 + 1.0 + + BENEV_REG_NB_H + + + + + fr.insee + js0eh523-QOP-js0e63o9 + 1.0 + OutParameter + + + fr.insee + js0eg1cf-CI-4-IP-1 + 1.0 + InParameter + + + + + fr.insee + js0egvao-QOP-js0en3v8 + 1.0 + OutParameter + + + fr.insee + js0eg1cf-CI-4-IP-2 + 1.0 + InParameter + + + + + fr.insee + js0eg1cf-QOP-jvmg494w + 1.0 + OutParameter + + + fr.insee + js0eg1cf-CI-4-IP-3 + 1.0 + InParameter + + + + + fr.insee + js0eg1cf-QOP-jvmg80ov + 1.0 + OutParameter + + + fr.insee + js0eg1cf-CI-4-IP-4 + 1.0 + InParameter + + + number(if (js0eg1cf-CI-4-IP-1='') then '0' else + js0eg1cf-CI-4-IP-1) = number(if (js0eg1cf-CI-4-IP-2='') then '0' else + js0eg1cf-CI-4-IP-2) and number(if (js0eg1cf-CI-4-IP-3='') then '0' else + js0eg1cf-CI-4-IP-3) != number(if (js0eg1cf-CI-4-IP-4='') then '0' else + js0eg1cf-CI-4-IP-4) + + + + + + fr.insee + js0eg1cf-CI-5 + 1.0 + + si (BENEV_REG_NB = 0 ou vide) et BENEV_REG_NB_H > + 0 + + + si (BENEV_REG_NB = 0 ou vide) et BENEV_REG_NB_H > + 0 + + + fr.insee + js0eg1cf-CI-5-II-5 + 1.0 + Instruction + + + + xpath + + fr.insee + js0eg1cf-CI-5-IP-1 + 1.0 + + BENEV_REG_NB + + + + fr.insee + js0eg1cf-CI-5-IP-2 + 1.0 + + BENEV_REG_NB_H + + + + + fr.insee + js0egvao-QOP-js0en3v8 + 1.0 + OutParameter + + + fr.insee + js0eg1cf-CI-5-IP-1 + 1.0 + InParameter + + + + + fr.insee + js0eg1cf-QOP-jvmg80ov + 1.0 + OutParameter + + + fr.insee + js0eg1cf-CI-5-IP-2 + 1.0 + InParameter + + + (number(if (js0eg1cf-CI-5-IP-1='') then '0' else + js0eg1cf-CI-5-IP-1) = 0 ) and number(if (js0eg1cf-CI-5-IP-2='') then '0' else + js0eg1cf-CI-5-IP-2) > 0 + + + + + + fr.insee + junsenue-CI-0 + 1.0 + + Si "ress_date_cloture" ne se situe pas entre le 1er juin + 2018 et le 31 mai 2019 + + + Si "ress_date_cloture" ne se situe pas entre le 1er juin + 2018 et le 31 mai 2019 + + + fr.insee + junsenue-CI-0-II-0 + 1.0 + Instruction + + + + xpath + + fr.insee + junsenue-CI-0-IP-1 + 1.0 + + ANNEEDAAAA + + + + fr.insee + junsenue-CI-0-IP-2 + 1.0 + + ANNEESUIV + + + + fr.insee + junsenue-CI-0-IP-3 + 1.0 + + RESS_DATE_CLOTURE + + + + + fr.insee + ANNEEDAAAA + 1.0 + InParameter + + + fr.insee + junsenue-CI-0-IP-1 + 1.0 + InParameter + + + + + fr.insee + ANNEESUIV + 1.0 + InParameter + + + fr.insee + junsenue-CI-0-IP-2 + 1.0 + InParameter + + + + + fr.insee + junsenue-QOP-juns2o7l + 1.0 + OutParameter + + + fr.insee + junsenue-CI-0-IP-3 + 1.0 + InParameter + + + string(junsenue-CI-0-IP-3)!='' and (junsenue-CI-0-IP-3 < + xs:date(concat(junsenue-CI-0-IP-1,'-06-01')) or junsenue-CI-0-IP-3 > + xs:date(concat(junsenue-CI-0-IP-2,'-05-31'))) + + + + + + fr.insee + junsih01-CI-0 + 1.0 + + Si "ress_date_cloture" et/ou "ress_duree_exercice" + reste(nt) sans réponse(s) + + + Si "ress_date_cloture" et/ou "ress_duree_exercice" + reste(nt) sans réponse(s) + + + fr.insee + junsih01-CI-0-II-0 + 1.0 + Instruction + + + + xpath + + fr.insee + junsih01-CI-0-IP-1 + 1.0 + + RESS_DATE_CLOTURE + + + + fr.insee + junsih01-CI-0-IP-2 + 1.0 + + RESS_DUREE_EXERCICE + + + + + fr.insee + junsenue-QOP-juns2o7l + 1.0 + OutParameter + + + fr.insee + junsih01-CI-0-IP-1 + 1.0 + InParameter + + + + + fr.insee + junsih01-QOP-juns6j74 + 1.0 + OutParameter + + + fr.insee + junsih01-CI-0-IP-2 + 1.0 + InParameter + + + string(junsih01-CI-0-IP-1) = '' or + junsih01-CI-0-IP-2='' + + + + + + + fr.insee + junsih01-CI-1 + 1.0 + + Si ress_date_cloture de clôture en 2019 alors ress_duree_exercice <= (ress_date_cloture-01/01/2019) + + + Si ress_date_cloture de clôture en 2019 alors ress_duree_exercice <= (ress_date_cloture-01/01/2019) + + + fr.insee + junsih01-CI-1-II-1 + 1.0 + Instruction + + + + xpath + + fr.insee + junsih01-CI-1-IP-1 + 1.0 + + RESS_DATE_CLOTURE + + + + fr.insee + junsih01-CI-1-IP-2 + 1.0 + + RESS_DUREE_EXERCICE + + + + + fr.insee + junsenue-QOP-juns2o7l + 1.0 + OutParameter + + + fr.insee + junsih01-CI-1-IP-1 + 1.0 + InParameter + + + + + fr.insee + junsih01-QOP-juns6j74 + 1.0 + OutParameter + + + fr.insee + junsih01-CI-1-IP-2 + 1.0 + InParameter + + + junsih01-CI-1-IP-2!='' and string(junsih01-CI-1-IP-1) !='' and (substring(string(junsih01-CI-1-IP-1),1,4))='2019' and + (number(if (junsih01-CI-1-IP-2='') then '0' else junsih01-CI-1-IP-2) <= number(substring(string(junsih01-CI-1-IP-1),6,2))) + + + + + + + fr.insee + js0f7q4i-CI-0 + 1.0 + + si (RESS_COTIS+RESS_DONS+RESS_LEGS+RESS_MECENAT + +RESS_AUT_ASSO+RESS_RECETTE_ACT+RESS_SUBV+RESS_AUTRES>1,1 RESS_TOTAL + + + + si (RESS_COTIS+RESS_DONS+RESS_LEGS+RESS_MECENAT + +RESS_AUT_ASSO+RESS_RECETTE_ACT+RESS_SUBV+RESS_AUTRES>1,1 RESS_TOTAL + + + + fr.insee + js0f7q4i-CI-0-II-0 + 1.0 + Instruction + + + + xpath + + fr.insee + js0f7q4i-CI-0-IP-1 + 1.0 + + RESS_COTIS + + + + fr.insee + js0f7q4i-CI-0-IP-2 + 1.0 + + RESS_DONS + + + + fr.insee + js0f7q4i-CI-0-IP-3 + 1.0 + + RESS_LEGS + + + + fr.insee + js0f7q4i-CI-0-IP-4 + 1.0 + + RESS_MECENAT + + + + fr.insee + js0f7q4i-CI-0-IP-5 + 1.0 + + RESS_AUT_ASSO + + + + fr.insee + js0f7q4i-CI-0-IP-6 + 1.0 + + RESS_RECETTE_ACT + + + + fr.insee + js0f7q4i-CI-0-IP-7 + 1.0 + + RESS_SUBV + + + + fr.insee + js0f7q4i-CI-0-IP-8 + 1.0 + + RESS_AUTRES + + + + fr.insee + js0f7q4i-CI-0-IP-9 + 1.0 + + RESS_TOTAL + + + + + fr.insee + js0f7q4i-QOP-jvmg0x78 + 1.0 + OutParameter + + + fr.insee + js0f7q4i-CI-0-IP-1 + 1.0 + InParameter + + + + + fr.insee + js0f7q4i-QOP-jvmft6oi + 1.0 + OutParameter + + + fr.insee + js0f7q4i-CI-0-IP-2 + 1.0 + InParameter + + + + + fr.insee + js0f7q4i-QOP-jvmg5ja6 + 1.0 + OutParameter + + + fr.insee + js0f7q4i-CI-0-IP-3 + 1.0 + InParameter + + + + + fr.insee + js0f7q4i-QOP-jvmg2ntx + 1.0 + OutParameter + + + fr.insee + js0f7q4i-CI-0-IP-4 + 1.0 + InParameter + + + + + fr.insee + js0f7q4i-QOP-jvmg2qr5 + 1.0 + OutParameter + + + fr.insee + js0f7q4i-CI-0-IP-5 + 1.0 + InParameter + + + + + fr.insee + js0f7q4i-QOP-jvmg0bqq + 1.0 + OutParameter + + + fr.insee + js0f7q4i-CI-0-IP-6 + 1.0 + InParameter + + + + + fr.insee + js0f7q4i-QOP-jvmfvhj4 + 1.0 + OutParameter + + + fr.insee + js0f7q4i-CI-0-IP-7 + 1.0 + InParameter + + + + + fr.insee + js0f7q4i-QOP-jvmg3jpb + 1.0 + OutParameter + + + fr.insee + js0f7q4i-CI-0-IP-8 + 1.0 + InParameter + + + + + fr.insee + js0f7q4i-QOP-jvmftjzc + 1.0 + OutParameter + + + fr.insee + js0f7q4i-CI-0-IP-9 + 1.0 + InParameter + + + ( number(if (js0f7q4i-CI-0-IP-1='') then '0' else + js0f7q4i-CI-0-IP-1) + number(if (js0f7q4i-CI-0-IP-2='') then '0' else + js0f7q4i-CI-0-IP-2) + number(if (js0f7q4i-CI-0-IP-3='') then '0' else + js0f7q4i-CI-0-IP-3) + number(if (js0f7q4i-CI-0-IP-4='') then '0' else + js0f7q4i-CI-0-IP-4) + number(if (js0f7q4i-CI-0-IP-5='') then '0' else + js0f7q4i-CI-0-IP-5) + number(if (js0f7q4i-CI-0-IP-6='') then '0' else + js0f7q4i-CI-0-IP-6) + number(if (js0f7q4i-CI-0-IP-7='') then '0' else + js0f7q4i-CI-0-IP-7) + number(if (js0f7q4i-CI-0-IP-8='') then '0' else + js0f7q4i-CI-0-IP-8) ) > 1.1 * number(if (js0f7q4i-CI-0-IP-9='') then '0' + else js0f7q4i-CI-0-IP-9) + + + + + + fr.insee + js0f7q4i-CI-1 + 1.0 + + si RESS_RECETTE_ACT_PUB>RESS_RECETTE_ACT + + + si RESS_RECETTE_ACT_PUB>RESS_RECETTE_ACT + + + fr.insee + js0f7q4i-CI-1-II-1 + 1.0 + Instruction + + + + xpath + + fr.insee + js0f7q4i-CI-1-IP-1 + 1.0 + + RESS_RECETTE_ACT + + + + fr.insee + js0f7q4i-CI-1-IP-2 + 1.0 + + RESS_RECETTE_ACT_PUB + + + + + fr.insee + js0f7q4i-QOP-jvmg0bqq + 1.0 + OutParameter + + + fr.insee + js0f7q4i-CI-1-IP-1 + 1.0 + InParameter + + + + + fr.insee + js0f7q4i-QOP-jvmfwzam + 1.0 + OutParameter + + + fr.insee + js0f7q4i-CI-1-IP-2 + 1.0 + InParameter + + + number(if (js0f7q4i-CI-1-IP-2='') then '0' else + js0f7q4i-CI-1-IP-2) > number(if (js0f7q4i-CI-1-IP-1='') then '0' else + js0f7q4i-CI-1-IP-1) + + + + + + fr.insee + js0f7q4i-CI-2 + 1.0 + + si RESS_AUTRES>0 et RESS_AUTRES_P=vide + + + si RESS_AUTRES>0 et RESS_AUTRES_P=vide + + + fr.insee + js0f7q4i-CI-2-II-2 + 1.0 + Instruction + + + + xpath + + fr.insee + js0f7q4i-CI-2-IP-1 + 1.0 + + RESS_AUTRES + + + + fr.insee + js0f7q4i-CI-2-IP-2 + 1.0 + + RESS_AUTRES_P + + + + + fr.insee + js0f7q4i-QOP-jvmg3jpb + 1.0 + OutParameter + + + fr.insee + js0f7q4i-CI-2-IP-1 + 1.0 + InParameter + + + + + fr.insee + js0f7q4i-QOP-jprecisez + 1.0 + OutParameter + + + fr.insee + js0f7q4i-CI-2-IP-2 + 1.0 + InParameter + + + number(if (js0f7q4i-CI-2-IP-1='') then '0' else + js0f7q4i-CI-2-IP-1) > 0 and + js0f7q4i-CI-2-IP-2 ='' + + + + + + fr.insee + js0g28m1-CI-0 + 1.0 + + si somme(RESS_SUBV_COM-RESS_SUBV_AUTRES)>1,1 RESS_SUBV + ou <0,9 RESS_SUBV + + + si somme(RESS_SUBV_COM-RESS_SUBV_AUTRES)>1,1 RESS_SUBV + ou <0,9 RESS_SUBV + + + fr.insee + js0g28m1-CI-0-II-0 + 1.0 + Instruction + + + + xpath + + fr.insee + js0g28m1-CI-0-IP-1 + 1.0 + + RESS_SUBV + + + + fr.insee + js0g28m1-CI-0-IP-2 + 1.0 + + RESS_SUBV_COM + + + + fr.insee + js0g28m1-CI-0-IP-3 + 1.0 + + RESS_SUBV_DEP + + + + fr.insee + js0g28m1-CI-0-IP-4 + 1.0 + + RESS_SUBV_REG + + + + fr.insee + js0g28m1-CI-0-IP-5 + 1.0 + + RESS_SUBV_ETAT + + + + fr.insee + js0g28m1-CI-0-IP-6 + 1.0 + + RESS_SUBV_UE + + + + fr.insee + js0g28m1-CI-0-IP-7 + 1.0 + + RESS_SUBV_ORG_SOC + + + + fr.insee + js0g28m1-CI-0-IP-8 + 1.0 + + RESS_SUBV_AUTRES + + + + + fr.insee + js0f7q4i-QOP-jvmfvhj4 + 1.0 + OutParameter + + + fr.insee + js0g28m1-CI-0-IP-1 + 1.0 + InParameter + + + + + fr.insee + js0g28m1-QOP-jvmg02ch + 1.0 + OutParameter + + + fr.insee + js0g28m1-CI-0-IP-2 + 1.0 + InParameter + + + + + fr.insee + js0g28m1-QOP-jvmfrxup + 1.0 + OutParameter + + + fr.insee + js0g28m1-CI-0-IP-3 + 1.0 + InParameter + + + + + fr.insee + js0g28m1-QOP-jvmg6n78 + 1.0 + OutParameter + + + fr.insee + js0g28m1-CI-0-IP-4 + 1.0 + InParameter + + + + + fr.insee + js0g28m1-QOP-jvmfwqwf + 1.0 + OutParameter + + + fr.insee + js0g28m1-CI-0-IP-5 + 1.0 + InParameter + + + + + fr.insee + js0g28m1-QOP-jvmfvk3l + 1.0 + OutParameter + + + fr.insee + js0g28m1-CI-0-IP-6 + 1.0 + InParameter + + + + + fr.insee + js0g28m1-QOP-jvmftz8o + 1.0 + OutParameter + + + fr.insee + js0g28m1-CI-0-IP-7 + 1.0 + InParameter + + + + + fr.insee + js0g28m1-QOP-jvmfwc9t + 1.0 + OutParameter + + + fr.insee + js0g28m1-CI-0-IP-8 + 1.0 + InParameter + + + ((number(if (js0g28m1-CI-0-IP-2='') then '0' else + js0g28m1-CI-0-IP-2) + number(if (js0g28m1-CI-0-IP-3='') then '0' else + js0g28m1-CI-0-IP-3) + number(if (js0g28m1-CI-0-IP-4='') then '0' else + js0g28m1-CI-0-IP-4) + number(if (js0g28m1-CI-0-IP-5='') then '0' else + js0g28m1-CI-0-IP-5) + number(if (js0g28m1-CI-0-IP-6='') then '0' else + js0g28m1-CI-0-IP-6) + number(if (js0g28m1-CI-0-IP-7='') then '0' else + js0g28m1-CI-0-IP-7) + number(if (js0g28m1-CI-0-IP-8='') then '0' else + js0g28m1-CI-0-IP-8)) > 1.1 * number(if (js0g28m1-CI-0-IP-1='') then '0' else + js0g28m1-CI-0-IP-1)) or ((number(if (js0g28m1-CI-0-IP-2='') then '0' else + js0g28m1-CI-0-IP-2) + number(if (js0g28m1-CI-0-IP-3='') then '0' else + js0g28m1-CI-0-IP-3) + number(if (js0g28m1-CI-0-IP-4='') then '0' else + js0g28m1-CI-0-IP-4) + number(if (js0g28m1-CI-0-IP-5='') then '0' else + js0g28m1-CI-0-IP-5) + number(if (js0g28m1-CI-0-IP-6='') then '0' else + js0g28m1-CI-0-IP-6) + number(if (js0g28m1-CI-0-IP-7='') then '0' else + js0g28m1-CI-0-IP-7) + number(if (js0g28m1-CI-0-IP-8='') then '0' else + js0g28m1-CI-0-IP-8)) < 0.9 * number(if (js0g28m1-CI-0-IP-1='') then '0' else + js0g28m1-CI-0-IP-1)) + + + + + + fr.insee + js0g28m1-CI-1 + 1.0 + + si somme(RESS_RECT_ACT_COM-RESS_REC_ACT_AUTRES)>1,1 + RESS_RECETTE_ACT_PUB ou <0,9 RESS_RECETTE_ACT_PUB + + + si somme(RESS_RECT_ACT_COM-RESS_REC_ACT_AUTRES)>1,1 + RESS_RECETTE_ACT_PUB ou <0,9 RESS_RECETTE_ACT_PUB + + + fr.insee + js0g28m1-CI-1-II-1 + 1.0 + Instruction + + + + xpath + + fr.insee + js0g28m1-CI-1-IP-1 + 1.0 + + RESS_RECETTE_ACT_PUB + + + + fr.insee + js0g28m1-CI-1-IP-2 + 1.0 + + RESS_REC_ACT_COM + + + + fr.insee + js0g28m1-CI-1-IP-3 + 1.0 + + RESS_REC_ACT_DEP + + + + fr.insee + js0g28m1-CI-1-IP-4 + 1.0 + + RESS_REC_ACT_REG + + + + fr.insee + js0g28m1-CI-1-IP-5 + 1.0 + + RESS_REC_ACT_ETAT + + + + fr.insee + js0g28m1-CI-1-IP-6 + 1.0 + + RESS_REC_ACT_UE + + + + fr.insee + js0g28m1-CI-1-IP-7 + 1.0 + + RESS_REC_ACT_ORG_SOC + + + + fr.insee + js0g28m1-CI-1-IP-8 + 1.0 + + RESS_REC_ACT_AUTRES + + + + + fr.insee + js0f7q4i-QOP-jvmfwzam + 1.0 + OutParameter + + + fr.insee + js0g28m1-CI-1-IP-1 + 1.0 + InParameter + + + + + fr.insee + js0g28m1-QOP-jvmfq558 + 1.0 + OutParameter + + + fr.insee + js0g28m1-CI-1-IP-2 + 1.0 + InParameter + + + + + fr.insee + js0g28m1-QOP-jvmg7zsz + 1.0 + OutParameter + + + fr.insee + js0g28m1-CI-1-IP-3 + 1.0 + InParameter + + + + + fr.insee + js0g28m1-QOP-jvmfrarb + 1.0 + OutParameter + + + fr.insee + js0g28m1-CI-1-IP-4 + 1.0 + InParameter + + + + + fr.insee + js0g28m1-QOP-jvmg4tup + 1.0 + OutParameter + + + fr.insee + js0g28m1-CI-1-IP-5 + 1.0 + InParameter + + + + + fr.insee + js0g28m1-QOP-jvmg7coo + 1.0 + OutParameter + + + fr.insee + js0g28m1-CI-1-IP-6 + 1.0 + InParameter + + + + + fr.insee + js0g28m1-QOP-jvmg2kni + 1.0 + OutParameter + + + fr.insee + js0g28m1-CI-1-IP-7 + 1.0 + InParameter + + + + + fr.insee + js0g28m1-QOP-jvmg3112 + 1.0 + OutParameter + + + fr.insee + js0g28m1-CI-1-IP-8 + 1.0 + InParameter + + + ((number(if (js0g28m1-CI-1-IP-2='') then '0' else + js0g28m1-CI-1-IP-2) + number(if (js0g28m1-CI-1-IP-3='') then '0' else + js0g28m1-CI-1-IP-3) + number(if (js0g28m1-CI-1-IP-4='') then '0' else + js0g28m1-CI-1-IP-4) + number(if (js0g28m1-CI-1-IP-5='') then '0' else + js0g28m1-CI-1-IP-5) + number(if (js0g28m1-CI-1-IP-6='') then '0' else + js0g28m1-CI-1-IP-6) + number(if (js0g28m1-CI-1-IP-7='') then '0' else + js0g28m1-CI-1-IP-7) + number(if (js0g28m1-CI-1-IP-8='') then '0' else + js0g28m1-CI-1-IP-8)) > 1.1 * number(if (js0g28m1-CI-1-IP-1='') then '0' else + js0g28m1-CI-1-IP-1)) or ((number(if (js0g28m1-CI-1-IP-2='') then '0' else + js0g28m1-CI-1-IP-2) + number(if (js0g28m1-CI-1-IP-3='') then '0' else + js0g28m1-CI-1-IP-3) + number(if (js0g28m1-CI-1-IP-4='') then '0' else + js0g28m1-CI-1-IP-4) + number(if (js0g28m1-CI-1-IP-5='') then '0' else + js0g28m1-CI-1-IP-5) + number(if (js0g28m1-CI-1-IP-6='') then '0' else + js0g28m1-CI-1-IP-6) + number(if (js0g28m1-CI-1-IP-7='') then '0' else + js0g28m1-CI-1-IP-7) + number(if (js0g28m1-CI-1-IP-8='') then '0' else + js0g28m1-CI-1-IP-8)) < 0.9 * number(if (js0g28m1-CI-1-IP-1='') then '0' else + js0g28m1-CI-1-IP-1)) + + + + + + fr.insee + js0g28m1-CI-2 + 1.0 + + si RESS_SUBV_COM-RESS_SUBV_AUTRES>0 et RESS_SUBV = 0 ou + vide + + + si RESS_SUBV_COM-RESS_SUBV_AUTRES>0 et RESS_SUBV = 0 + ou vide + + + fr.insee + js0g28m1-CI-2-II-2 + 1.0 + Instruction + + + + xpath + + fr.insee + js0g28m1-CI-2-IP-1 + 1.0 + + RESS_SUBV + + + + fr.insee + js0g28m1-CI-2-IP-2 + 1.0 + + RESS_SUBV_COM + + + + fr.insee + js0g28m1-CI-2-IP-3 + 1.0 + + RESS_SUBV_DEP + + + + fr.insee + js0g28m1-CI-2-IP-4 + 1.0 + + RESS_SUBV_REG + + + + fr.insee + js0g28m1-CI-2-IP-5 + 1.0 + + RESS_SUBV_ETAT + + + + fr.insee + js0g28m1-CI-2-IP-6 + 1.0 + + RESS_SUBV_UE + + + + fr.insee + js0g28m1-CI-2-IP-7 + 1.0 + + RESS_SUBV_ORG_SOC + + + + fr.insee + js0g28m1-CI-2-IP-8 + 1.0 + + RESS_SUBV_AUTRES + + + + + fr.insee + js0f7q4i-QOP-jvmfvhj4 + 1.0 + OutParameter + + + fr.insee + js0g28m1-CI-2-IP-1 + 1.0 + InParameter + + + + + fr.insee + js0g28m1-QOP-jvmg02ch + 1.0 + OutParameter + + + fr.insee + js0g28m1-CI-2-IP-2 + 1.0 + InParameter + + + + + fr.insee + js0g28m1-QOP-jvmfrxup + 1.0 + OutParameter + + + fr.insee + js0g28m1-CI-2-IP-3 + 1.0 + InParameter + + + + + fr.insee + js0g28m1-QOP-jvmg6n78 + 1.0 + OutParameter + + + fr.insee + js0g28m1-CI-2-IP-4 + 1.0 + InParameter + + + + + fr.insee + js0g28m1-QOP-jvmfwqwf + 1.0 + OutParameter + + + fr.insee + js0g28m1-CI-2-IP-5 + 1.0 + InParameter + + + + + fr.insee + js0g28m1-QOP-jvmfvk3l + 1.0 + OutParameter + + + fr.insee + js0g28m1-CI-2-IP-6 + 1.0 + InParameter + + + + + fr.insee + js0g28m1-QOP-jvmftz8o + 1.0 + OutParameter + + + fr.insee + js0g28m1-CI-2-IP-7 + 1.0 + InParameter + + + + + fr.insee + js0g28m1-QOP-jvmfwc9t + 1.0 + OutParameter + + + fr.insee + js0g28m1-CI-2-IP-8 + 1.0 + InParameter + + + ((number(if (js0g28m1-CI-2-IP-2='') then '0' else + js0g28m1-CI-2-IP-2) + number(if (js0g28m1-CI-2-IP-3='') then '0' else + js0g28m1-CI-2-IP-3) + number(if (js0g28m1-CI-2-IP-4='') then '0' else + js0g28m1-CI-2-IP-4) + number(if (js0g28m1-CI-2-IP-5='') then '0' else + js0g28m1-CI-2-IP-5) + number(if (js0g28m1-CI-2-IP-6='') then '0' else + js0g28m1-CI-2-IP-6) + number(if (js0g28m1-CI-2-IP-7='') then '0' else + js0g28m1-CI-2-IP-7) + number(if (js0g28m1-CI-2-IP-8='') then '0' else + js0g28m1-CI-2-IP-8)) > 0) and (number(if (js0g28m1-CI-2-IP-1='') then '0' + else js0g28m1-CI-2-IP-1) = 0 ) + + + + + + fr.insee + js0g28m1-CI-3 + 1.0 + + si RESS_REC_ACT_COM RESS_REC_ACT_AUTRES>0 et + RESS_RECETTE_ACT_PUB = 0 ou vide + + + si RESS_REC_ACT_COM RESS_REC_ACT_AUTRES>0 et + RESS_RECETTE_ACT_PUB = 0 ou vide + + + fr.insee + js0g28m1-CI-3-II-3 + 1.0 + Instruction + + + + xpath + + fr.insee + js0g28m1-CI-3-IP-1 + 1.0 + + RESS_RECETTE_ACT_PUB + + + + fr.insee + js0g28m1-CI-3-IP-2 + 1.0 + + RESS_REC_ACT_COM + + + + fr.insee + js0g28m1-CI-3-IP-3 + 1.0 + + RESS_REC_ACT_DEP + + + + fr.insee + js0g28m1-CI-3-IP-4 + 1.0 + + RESS_REC_ACT_REG + + + + fr.insee + js0g28m1-CI-3-IP-5 + 1.0 + + RESS_REC_ACT_ETAT + + + + fr.insee + js0g28m1-CI-3-IP-6 + 1.0 + + RESS_REC_ACT_UE + + + + fr.insee + js0g28m1-CI-3-IP-7 + 1.0 + + RESS_REC_ACT_ORG_SOC + + + + fr.insee + js0g28m1-CI-3-IP-8 + 1.0 + + RESS_REC_ACT_AUTRES + + + + + fr.insee + js0f7q4i-QOP-jvmfwzam + 1.0 + OutParameter + + + fr.insee + js0g28m1-CI-3-IP-1 + 1.0 + InParameter + + + + + fr.insee + js0g28m1-QOP-jvmfq558 + 1.0 + OutParameter + + + fr.insee + js0g28m1-CI-3-IP-2 + 1.0 + InParameter + + + + + fr.insee + js0g28m1-QOP-jvmg7zsz + 1.0 + OutParameter + + + fr.insee + js0g28m1-CI-3-IP-3 + 1.0 + InParameter + + + + + fr.insee + js0g28m1-QOP-jvmfrarb + 1.0 + OutParameter + + + fr.insee + js0g28m1-CI-3-IP-4 + 1.0 + InParameter + + + + + fr.insee + js0g28m1-QOP-jvmg4tup + 1.0 + OutParameter + + + fr.insee + js0g28m1-CI-3-IP-5 + 1.0 + InParameter + + + + + fr.insee + js0g28m1-QOP-jvmg7coo + 1.0 + OutParameter + + + fr.insee + js0g28m1-CI-3-IP-6 + 1.0 + InParameter + + + + + fr.insee + js0g28m1-QOP-jvmg2kni + 1.0 + OutParameter + + + fr.insee + js0g28m1-CI-3-IP-7 + 1.0 + InParameter + + + + + fr.insee + js0g28m1-QOP-jvmg3112 + 1.0 + OutParameter + + + fr.insee + js0g28m1-CI-3-IP-8 + 1.0 + InParameter + + + (number(if (js0g28m1-CI-3-IP-2='') then '0' else + js0g28m1-CI-3-IP-2) + number(if (js0g28m1-CI-3-IP-3='') then '0' else + js0g28m1-CI-3-IP-3) + number(if (js0g28m1-CI-3-IP-4='') then '0' else + js0g28m1-CI-3-IP-4) + number(if (js0g28m1-CI-3-IP-5='') then '0' else + js0g28m1-CI-3-IP-5) + number(if (js0g28m1-CI-3-IP-6='') then '0' else + js0g28m1-CI-3-IP-6) + number(if (js0g28m1-CI-3-IP-7='') then '0' else + js0g28m1-CI-3-IP-7) + number(if (js0g28m1-CI-3-IP-8='') then '0' else + js0g28m1-CI-3-IP-8) > 0) and (number(if (js0g28m1-CI-3-IP-1='') then '0' + else js0g28m1-CI-3-IP-1) = 0) + + + + + + fr.insee + jvgc8k0y-CI-0 + 1.0 + + si RESS_SUBV_AUTRES>0 et + RESS_SUBV_AUTRES_P=vide + + + si RESS_SUBV_AUTRES>0 et + RESS_SUBV_AUTRES_P=vide + + + fr.insee + jvgc8k0y-CI-0-II-0 + 1.0 + Instruction + + + + xpath + + fr.insee + jvgc8k0y-CI-0-IP-1 + 1.0 + + RESS_SUBV_AUTRES + + + + fr.insee + jvgc8k0y-CI-0-IP-2 + 1.0 + + RESS_SUBV_AUTRES_P + + + + + fr.insee + js0g28m1-QOP-jvmfwc9t + 1.0 + OutParameter + + + fr.insee + jvgc8k0y-CI-0-IP-1 + 1.0 + InParameter + + + + + fr.insee + jvgc8k0y-QOP-jvgc4m44 + 1.0 + OutParameter + + + fr.insee + jvgc8k0y-CI-0-IP-2 + 1.0 + InParameter + + + number(if (jvgc8k0y-CI-0-IP-1='') then '0' else + jvgc8k0y-CI-0-IP-1) > 0 and jvgc8k0y-CI-0-IP-2 = '' + + + + + + fr.insee + jvgcdcjx-CI-0 + 1.0 + + si RESS_REC_ACT_AUTRES>0 et + RESS_REC_ACT_AUTRES_P=vide + + + si RESS_REC_ACT_AUTRES>0 et + RESS_REC_ACT_AUTRES_P=vide + + + fr.insee + jvgcdcjx-CI-0-II-0 + 1.0 + Instruction + + + + xpath + + fr.insee + jvgcdcjx-CI-0-IP-1 + 1.0 + + RESS_REC_ACT_AUTRES + + + + fr.insee + jvgcdcjx-CI-0-IP-2 + 1.0 + + RESS_REC_ACT_AUTRES_P + + + + + fr.insee + js0g28m1-QOP-jvmg3112 + 1.0 + OutParameter + + + fr.insee + jvgcdcjx-CI-0-IP-1 + 1.0 + InParameter + + + + + fr.insee + jvgcdcjx-QOP-jvgcbyxs + 1.0 + OutParameter + + + fr.insee + jvgcdcjx-CI-0-IP-2 + 1.0 + InParameter + + + number(if (jvgcdcjx-CI-0-IP-1='') then '0' else + jvgcdcjx-CI-0-IP-1) > 0 and jvgcdcjx-CI-0-IP-2 = '' + + + + + + fr.insee + js0gv8ia-CI-0 + 1.0 + + si (CHARGES_PERS+CHARGES_IMPOTS+CHARGES_AUTRES)>1,1 + CHARGES_TOTAL + + + si (CHARGES_PERS+CHARGES_IMPOTS+CHARGES_AUTRES)>1,1 + CHARGES_TOTAL + + + fr.insee + js0gv8ia-CI-0-II-0 + 1.0 + Instruction + + + + xpath + + fr.insee + js0gv8ia-CI-0-IP-1 + 1.0 + + CHARGES_PERS + + + + fr.insee + js0gv8ia-CI-0-IP-2 + 1.0 + + CHARGES_IMPOTS + + + + fr.insee + js0gv8ia-CI-0-IP-3 + 1.0 + + CHARGES_AUTRES + + + + fr.insee + js0gv8ia-CI-0-IP-4 + 1.0 + + CHARGES_TOTAL + + + + + fr.insee + js0gv8ia-QOP-jvmfslgm + 1.0 + OutParameter + + + fr.insee + js0gv8ia-CI-0-IP-1 + 1.0 + InParameter + + + + + fr.insee + js0gv8ia-QOP-jvmfz3pd + 1.0 + OutParameter + + + fr.insee + js0gv8ia-CI-0-IP-2 + 1.0 + InParameter + + + + + fr.insee + js0gv8ia-QOP-jvmfre83 + 1.0 + OutParameter + + + fr.insee + js0gv8ia-CI-0-IP-3 + 1.0 + InParameter + + + + + fr.insee + js0gv8ia-QOP-jvmft97z + 1.0 + OutParameter + + + fr.insee + js0gv8ia-CI-0-IP-4 + 1.0 + InParameter + + + (number(if (js0gv8ia-CI-0-IP-1='') then '0' else + js0gv8ia-CI-0-IP-1) + number(if (js0gv8ia-CI-0-IP-2='') then '0' else + js0gv8ia-CI-0-IP-2) + number(if (js0gv8ia-CI-0-IP-3='') then '0' else + js0gv8ia-CI-0-IP-3)) > 1.1 * number(if (js0gv8ia-CI-0-IP-4='') then '0' else + js0gv8ia-CI-0-IP-4) + + + + + + fr.insee + js0gv8ia-CI-1 + 1.0 + + si + somme(CHARGES_AUTRES_LOYERS+CHARGES_AUTRES_FORMATION+CHARGES_AUTRES_COTIS+CHARGES_AUTRES_PRESTA)>1,1 + CHARGES_AUTRES + + + si + somme(CHARGES_AUTRES_LOYERS+CHARGES_AUTRES_FORMATION+CHARGES_AUTRES_COTIS+CHARGES_AUTRES_PRESTA)>1,1 + CHARGES_AUTRES + + + fr.insee + js0gv8ia-CI-1-II-1 + 1.0 + Instruction + + + + xpath + + fr.insee + js0gv8ia-CI-1-IP-1 + 1.0 + + CHARGES_AUTRES + + + + fr.insee + js0gv8ia-CI-1-IP-2 + 1.0 + + CHARGES_AUTRES_LOYERS + + + + fr.insee + js0gv8ia-CI-1-IP-3 + 1.0 + + CHARGES_AUTRES_FORMATION + + + + fr.insee + js0gv8ia-CI-1-IP-4 + 1.0 + + CHARGES_AUTRES_COTIS + + + + fr.insee + js0gv8ia-CI-1-IP-5 + 1.0 + + CHARGES_AUTRES_PRESTA + + + + + fr.insee + js0gv8ia-QOP-jvmfre83 + 1.0 + OutParameter + + + fr.insee + js0gv8ia-CI-1-IP-1 + 1.0 + InParameter + + + + + fr.insee + js0gv8ia-QOP-jvmft7pd + 1.0 + OutParameter + + + fr.insee + js0gv8ia-CI-1-IP-2 + 1.0 + InParameter + + + + + fr.insee + js0gv8ia-QOP-jvmfye18 + 1.0 + OutParameter + + + fr.insee + js0gv8ia-CI-1-IP-3 + 1.0 + InParameter + + + + + fr.insee + js0gv8ia-QOP-jvmftqf0 + 1.0 + OutParameter + + + fr.insee + js0gv8ia-CI-1-IP-4 + 1.0 + InParameter + + + + + fr.insee + js0gv8ia-QOP-jvmg783j + 1.0 + OutParameter + + + fr.insee + js0gv8ia-CI-1-IP-5 + 1.0 + InParameter + + + (number(if (js0gv8ia-CI-1-IP-2='') then '0' else + js0gv8ia-CI-1-IP-2) + number(if (js0gv8ia-CI-1-IP-3='') then '0' else + js0gv8ia-CI-1-IP-3) + number(if (js0gv8ia-CI-1-IP-4='') then '0' else + js0gv8ia-CI-1-IP-4) + number(if (js0gv8ia-CI-1-IP-5='') then '0' else + js0gv8ia-CI-1-IP-5)) > 1.1 * number(if (js0gv8ia-CI-1-IP-1='') then '0' else + js0gv8ia-CI-1-IP-1) + + + + + + fr.insee + js0gv8ia-CI-2 + 1.0 + + si CHARGES_TOTAL>1,2 RESS_TOTAL ou <0,8 RESS_TOTAL + + + + si CHARGES_TOTAL>1,2 RESS_TOTAL ou <0,8 RESS_TOTAL + + + + fr.insee + js0gv8ia-CI-2-II-2 + 1.0 + Instruction + + + + xpath + + fr.insee + js0gv8ia-CI-2-IP-1 + 1.0 + + RESS_TOTAL + + + + fr.insee + js0gv8ia-CI-2-IP-2 + 1.0 + + CHARGES_TOTAL + + + + + fr.insee + js0f7q4i-QOP-jvmftjzc + 1.0 + OutParameter + + + fr.insee + js0gv8ia-CI-2-IP-1 + 1.0 + InParameter + + + + + fr.insee + js0gv8ia-QOP-jvmft97z + 1.0 + OutParameter + + + fr.insee + js0gv8ia-CI-2-IP-2 + 1.0 + InParameter + + + (number(if (js0gv8ia-CI-2-IP-2='') then '0' else + js0gv8ia-CI-2-IP-2) > 1.2 * number(if (js0gv8ia-CI-2-IP-1='') then '0' else + js0gv8ia-CI-2-IP-1)) or (number(if (js0gv8ia-CI-2-IP-2='') then '0' else + js0gv8ia-CI-2-IP-2) < 0.8 * number(if (js0gv8ia-CI-2-IP-1='') then '0' else + js0gv8ia-CI-2-IP-1)) + + + + + + fr.insee + js0gv8ia-CI-3 + 1.0 + + si CHARGES_TOTAL= vide ou 0 et RESS_TOTAL >0 + + + + si CHARGES_TOTAL= vide ou 0 et RESS_TOTAL >0 + + + + fr.insee + js0gv8ia-CI-3-II-3 + 1.0 + Instruction + + + + xpath + + fr.insee + js0gv8ia-CI-3-IP-1 + 1.0 + + RESS_TOTAL + + + + fr.insee + js0gv8ia-CI-3-IP-2 + 1.0 + + CHARGES_TOTAL + + + + + fr.insee + js0f7q4i-QOP-jvmftjzc + 1.0 + OutParameter + + + fr.insee + js0gv8ia-CI-3-IP-1 + 1.0 + InParameter + + + + + fr.insee + js0gv8ia-QOP-jvmft97z + 1.0 + OutParameter + + + fr.insee + js0gv8ia-CI-3-IP-2 + 1.0 + InParameter + + + (number(if (js0gv8ia-CI-3-IP-2='') then '0' else + js0gv8ia-CI-3-IP-2)= 0) and number(if (js0gv8ia-CI-3-IP-1='') then '0' else + js0gv8ia-CI-3-IP-1) > 0 + + + + + + fr.insee + js1xnjw7-CI-0 + 1.0 + + si RESEAU_TETE_NAT = vide + + + si RESEAU_TETE_NAT = vide + + + fr.insee + js1xnjw7-CI-0-II-0 + 1.0 + Instruction + + + + xpath + + fr.insee + js1xnjw7-CI-0-IP-1 + 1.0 + + RESEAU_TETE_NAT + + + + + fr.insee + js1xnjw7-QOP-js1x5b34 + 1.0 + OutParameter + + + fr.insee + js1xnjw7-CI-0-IP-1 + 1.0 + InParameter + + + js1xnjw7-CI-0-IP-1 = '' + + + + + + fr.insee + js1xmypc-CI-0 + 1.0 + + si RESEAU_TETE_AUTRE = vide + + + si RESEAU_TETE_AUTRE = vide + + + fr.insee + js1xmypc-CI-0-II-0 + 1.0 + Instruction + + + + xpath + + fr.insee + js1xmypc-CI-0-IP-1 + 1.0 + + RESEAU_TETE_AUTRE + + + + + fr.insee + js1xmypc-QOP-js1xcoh9 + 1.0 + OutParameter + + + fr.insee + js1xmypc-CI-0-IP-1 + 1.0 + InParameter + + + js1xmypc-CI-0-IP-1 = '' + + + + + + fr.insee + js1x9nsr-CI-0 + 1.0 + + si RESEAU_P=vide + + + si RESEAU_P=vide + + + fr.insee + js1x9nsr-CI-0-II-0 + 1.0 + Instruction + + + + xpath + + fr.insee + js1x9nsr-CI-0-IP-1 + 1.0 + + RESEAU_P + + + + + fr.insee + js1x9nsr-QOP-js1xkowa + 1.0 + OutParameter + + + fr.insee + js1x9nsr-CI-0-IP-1 + 1.0 + InParameter + + + js1x9nsr-CI-0-IP-1 = '' + + + + + + fr.insee + js1wmyn8-CI-0 + 1.0 + + si MAD_LOCAUX_PAR_AUTRES=1 et MAD_LOCAUX_PAR_AUTRES_P=vide + + + si MAD_LOCAUX_PAR_AUTRES=1 et MAD_LOCAUX_PAR_AUTRES_P=vide + + + fr.insee + js1wmyn8-CI-0-II-0 + 1.0 + Instruction + + + + xpath + + fr.insee + js1wmyn8-CI-0-IP-1 + 1.0 + + MAD_LOCAUX_PAR_AUTRES + + + + fr.insee + js1wmyn8-CI-0-IP-2 + 1.0 + + MAD_LOCAUX_PAR_AUTRES_P + + + + + fr.insee + js1wmyn8-QOP-jvmfr31k + 1.0 + OutParameter + + + fr.insee + js1wmyn8-CI-0-IP-1 + 1.0 + InParameter + + + + + fr.insee + js1wmyn8-QOP-jprecisez + 1.0 + OutParameter + + + fr.insee + js1wmyn8-CI-0-IP-2 + 1.0 + InParameter + + + js1wmyn8-CI-0-IP-1 = '1' and js1wmyn8-CI-0-IP-2='' + + + + + + fr.insee + js1wqahn-CI-0 + 1.0 + + si MAD_TERRAINS_PAR_AUTRES=1 et MAD_TERRAINS_PAR_AUTRES_P=vide + + + si MAD_LOCAUX_PAR_AUTRES=1 et MAD_LOCAUX_PAR_AUTRES_P=vide + + + fr.insee + js1wqahn-CI-0-II-0 + 1.0 + Instruction + + + + xpath + + fr.insee + js1wqahn-CI-0-IP-1 + 1.0 + + MAD_TERRAINS_PAR_AUTRES + + + + fr.insee + js1wqahn-CI-0-IP-2 + 1.0 + + MAD_TERRAINS_PAR_AUTRES_P + + + + + fr.insee + js1wqahn-QOP-jvmfudfq + 1.0 + OutParameter + + + fr.insee + js1wqahn-CI-0-IP-1 + 1.0 + InParameter + + + + + fr.insee + js1wqahn-QOP-jprecisez + 1.0 + OutParameter + + + fr.insee + js1wqahn-CI-0-IP-2 + 1.0 + InParameter + + + js1wqahn-CI-0-IP-1 = '1' and js1wqahn-CI-0-IP-2='' + + + + + + fr.insee + jrjbj42t-SI + 1.0 + + + + + Le RNA + (Répertoire National des Associations), anciennement appelé + répertoire Waldec, est le répertoire des associations relevant de la loi + 1901 géré par le ministère de l’Intérieur (ou greffe des associations). + Il intègre l’ensemble des déclarations (création, cessation, changement + d’adresse, modifications de statut, changements de dirigeants…) réalisées + en préfecture par les associations. + + + + + + + fr.insee + jrjcf68f-SI + 1.0 + + + + Le répertoire SIRENE (Système informatisé du + répertoire national des entreprises et des établissements) est un répertoire + géré par l'Insee enregistrant l'état-civil de toutes les entreprises et + leurs établissements, quelle que soit leur forme juridique et quel que soit + leur secteur d'activité, situés en métropole ou dans les DOM. + + + + + + + fr.insee + QuestionScheme-jmuk1uzy2 + 1.0 + + A définir + + + fr.insee + jqxvugxl + 1.0 + + IDENT_AN_CREATION + + + fr.insee + jqxvugxl-QOP-jqxw0i2w + 1.0 + + IDENT_AN_CREATION + + + + + fr.insee + jqxvugxl-RDOP-jqxw0i2w + 1.0 + OutParameter + + + fr.insee + jqxvugxl-QOP-jqxw0i2w + 1.0 + OutParameter + + + + + + Quelle est l’année de création de votre association + ? + + + + + + 1800 + 2019 + + Decimal + + fr.insee + jqxvugxl-RDOP-jqxw0i2w + 1.0 + + + + + fr.insee + jqxvy8en + 1.0 + + IDENT_ACTIVE + + + fr.insee + jqxvy8en-QOP-jqxw8s33 + 1.0 + + IDENT_ACTIVE + + + + + fr.insee + jqxvy8en-RDOP-jqxw8s33 + 1.0 + OutParameter + + + fr.insee + jqxvy8en-QOP-jqxw8s33 + 1.0 + OutParameter + + + + + + Votre association est-elle toujours active à ce + jour ? + + + + + radio-button + + fr.insee + jqxvqakq + 1.0 + CodeList + + + fr.insee + jqxvy8en-RDOP-jqxw8s33 + 1.0 + + + fr.insee + jqxvqakq + 1.0 + CodeList + + + + + + + fr.insee + jrkd64v7 + 1.0 + + + + Si vous avez répondu "oui" à la question 2 + veuillez passer à la question 4. Sinon, veuillez poursuivre. + $IDENT_ACTIVE$ = '1' + jqxx9cx9 + + + + + + + fr.insee + jqxvz5q8 + 1.0 + + IDENT_AN_CESSATION + + + fr.insee + jqxvz5q8-QOP-jqxwmhww + 1.0 + + IDENT_AN_CESSATION + + + + + fr.insee + jqxvz5q8-RDOP-jqxwmhww + 1.0 + OutParameter + + + fr.insee + jqxvz5q8-QOP-jqxwmhww + 1.0 + OutParameter + + + + + + Indiquez l’année de cessation de l’activité de + votre association : + + + + + + 1800 + 2019 + + Decimal + + fr.insee + jqxvz5q8-RDOP-jqxwmhww + 1.0 + + + + fr.insee + jsnbkxh8 + 1.0 + + + + + $ECHANTILLON$ = '1' + jrjcj7e6 + + + + + + fr.insee + juo1q2na + 1.0 + + + + Si l'année de cessation est antérieure à + 2018, veuillez passer au module XII. Sinon, veuillez poursuivre. + $IDENT_AN_CESSATION$ != 99 and + $IDENT_AN_CESSATION$ < 2018 + jqxywqlc + + + + + + + fr.insee + jqxx9cx9 + 1.0 + + IDENT_RNA + + + fr.insee + jqxx9cx9-QOP-jqxwwtmb + 1.0 + + IDENT_RNA + + + + + fr.insee + jqxx9cx9-RDOP-jqxwwtmb + 1.0 + OutParameter + + + fr.insee + jqxx9cx9-QOP-jqxwwtmb + 1.0 + OutParameter + + + + + + Votre association est-elle immatriculée au Répertoire National des + Associations (numéro de dossier en préfecture) + ? + + + + + radio-button + + fr.insee + jqxxby4z + 1.0 + CodeList + + + fr.insee + jqxx9cx9-RDOP-jqxwwtmb + 1.0 + + + fr.insee + jqxxby4z + 1.0 + CodeList + + + + + + + fr.insee + jrke1qem + 1.0 + + + + Si vous avez répondu "non" à la question 4, + veuillez passer à la question 8. Sinon, veuillez poursuivre. + $IDENT_RNA$ = '0' + jqxxw4zn + + + + + + fr.insee + jtshlobr + 1.0 + + + + Si votre numéro RNA n'est pas pré-rempli + question 5, veuillez passer à la question 6 + $IDENT_NUM_RNA$ = 'INCONNU' + jqxxtf4g + + + + + + + fr.insee + jqxxe71e + 1.0 + + IDENT_CONF_NUM_RNA + + + fr.insee + jqxxe71e-QOP-jqxx8tum + 1.0 + + IDENT_CONF_NUM_RNA + + + + + fr.insee + jqxxe71e-RDOP-jqxx8tum + 1.0 + OutParameter + + + fr.insee + jqxxe71e-QOP-jqxx8tum + 1.0 + OutParameter + + + + + L’identifiant RNA (numéro de dossier en préfecture) de + votre association est-il bien le suivant : ¤IDENT_NUM_RNA¤ ? + + + + radio-button + + fr.insee + jqxxby4z + 1.0 + CodeList + + + fr.insee + jqxxe71e-RDOP-jqxx8tum + 1.0 + + + fr.insee + jqxxby4z + 1.0 + CodeList + + + + + + + fr.insee + jrke573w + 1.0 + + + + Si vous avez répondu "oui" ou "ne sais pas" à + la question 5, veuillez passer à la question 8. Sinon, veuillez + poursuivre. + $IDENT_CONF_NUM_RNA$ = '1' or + $IDENT_CONF_NUM_RNA$ = '2' + jqxxw4zn + + + + + + + fr.insee + jqxxtf4g + 1.0 + + IDENT_CORR_NUM_RNA + + + fr.insee + jqxxtf4g-QOP-jqxxa763 + 1.0 + + IDENT_CORR_NUM_RNA + + + + + fr.insee + jqxxtf4g-RDOP-jqxxa763 + 1.0 + OutParameter + + + fr.insee + jqxxtf4g-QOP-jqxxa763 + 1.0 + OutParameter + + + + + + Indiquez, si vous le connaissez, l’identifiant RNA + correct de votre association : + + + + + + fr.insee + jqxxtf4g-RDOP-jqxxa763 + 1.0 + + + + + fr.insee + jsnbl8px + 1.0 + + + + + $ECHANTILLON$ = '2' + jqxxw4zn + + + + + + + fr.insee + jrjcj7e6 + 1.0 + + IDENT_NUM_SIREN + + + fr.insee + jrjcj7e6-QOP-jrjcekc4 + 1.0 + + IDENT_NUM_SIREN + + + + + fr.insee + jrjcj7e6-RDOP-jrjcekc4 + 1.0 + OutParameter + + + fr.insee + jrjcj7e6-QOP-jrjcekc4 + 1.0 + OutParameter + + + + + Si votre association a un numéro SIREN (9 premiers + chiffres du numéro SIRET), veuillez l'indiquer : + + + + + fr.insee + jrjcj7e6-RDOP-jrjcekc4 + 1.0 + + + + + + fr.insee + jqxxw4zn + 1.0 + + IDENT_SUBV + + + fr.insee + jqxxw4zn-QOP-jqxxt6rk + 1.0 + + IDENT_SUBV + + + + + fr.insee + jqxxw4zn-RDOP-jqxxt6rk + 1.0 + OutParameter + + + fr.insee + jqxxw4zn-QOP-jqxxt6rk + 1.0 + OutParameter + + + + + + Votre association a-t-elle déjà bénéficié de subventions + publiques ? + + + + + radio-button + + fr.insee + jqxvqakq + 1.0 + CodeList + + + fr.insee + jqxxw4zn-RDOP-jqxxt6rk + 1.0 + + + fr.insee + jqxvqakq + 1.0 + CodeList + + + + + + + + fr.insee + jqxxgibj + 1.0 + + IDENT_NIV_GEO + + + fr.insee + jqxxgibj-QOP-jqxxty1j + 1.0 + + IDENT_NIV_GEO + + + + + fr.insee + jqxxgibj-RDOP-jqxxty1j + 1.0 + OutParameter + + + fr.insee + jqxxgibj-QOP-jqxxty1j + 1.0 + OutParameter + + + + + + A quel niveau géographique votre association + a-t-elle été le plus souvent active en 2018 ? + + + + + checkbox + + fr.insee + jqxxwdxu + 1.0 + CodeList + + + fr.insee + jqxxgibj-RDOP-jqxxty1j + 1.0 + + + fr.insee + jqxxwdxu + 1.0 + CodeList + + + + + + + fr.insee + jrqaoypv + 1.0 + + + + Si vous avez répondu "A l'étranger" à la + question 9, veuillez passer à la question 11. Sinon, veuillez + poursuivre. + $IDENT_NIV_GEO$ ='7' + jqxxs2n2 + + + + + + fr.insee + jrjcxhyb + 1.0 + Instruction + + + + fr.insee + jqxxsed0 + 1.0 + + IDENT_ACTIVITE_ETRG + + + fr.insee + jqxxsed0-QOP-jqxxo9gu + 1.0 + + IDENT_ACTIVITE_ETRG + + + + + fr.insee + jqxxsed0-RDOP-jqxxo9gu + 1.0 + OutParameter + + + fr.insee + jqxxsed0-QOP-jqxxo9gu + 1.0 + OutParameter + + + + + + Votre association a-t-elle été active à l’étranger + en 2018 ? + + + + + checkbox + + fr.insee + jqxy4o08 + 1.0 + CodeList + + + fr.insee + jqxxsed0-RDOP-jqxxo9gu + 1.0 + + + fr.insee + jqxy4o08 + 1.0 + CodeList + + + + + + + fr.insee + jrjcryzn + 1.0 + Instruction + + + + fr.insee + jqxxs2n2 + 1.0 + + IDENT_RESEAU + + + fr.insee + jqxxs2n2-QOP-jqxy58di + 1.0 + + IDENT_RESEAU + + + + + fr.insee + jqxxs2n2-RDOP-jqxy58di + 1.0 + OutParameter + + + fr.insee + jqxxs2n2-QOP-jqxy58di + 1.0 + OutParameter + + + + + + Votre association appartenait-elle en 2018 à un ou plusieurs + réseaux internationaux d’associations ? + + + + + radio-button + + fr.insee + jqxvqakq + 1.0 + CodeList + + + fr.insee + jqxxs2n2-RDOP-jqxy58di + 1.0 + + + fr.insee + jqxvqakq + 1.0 + CodeList + + + + + + + + fr.insee + jqxy6sxf + 1.0 + + IDENT_OBJET + + + fr.insee + jqxy6sxf-QOP-jqxxtaap + 1.0 + + IDENT_OBJET + + + + + fr.insee + jqxy6sxf-RDOP-jqxxtaap + 1.0 + OutParameter + + + fr.insee + jqxy6sxf-QOP-jqxxtaap + 1.0 + OutParameter + + + + + + Pouvez-vous expliquer en quelques mots l’objet de votre + association ? + + + + + + fr.insee + jqxy6sxf-RDOP-jqxxtaap + 1.0 + + + + + + fr.insee + jrjda2qx + 1.0 + + GOUV_CA_EXIST + + + fr.insee + jrjda2qx-QOP-jrjd9kim + 1.0 + + GOUV_CA_EXIST + + + + + fr.insee + jrjda2qx-RDOP-jrjd9kim + 1.0 + OutParameter + + + fr.insee + jrjda2qx-QOP-jrjd9kim + 1.0 + OutParameter + + + + + + Votre association disposait-elle d’un conseil + d’administration au 31/12/2018 ? + + + + + radio-button + + fr.insee + jqxvqakq + 1.0 + CodeList + + + fr.insee + jrjda2qx-RDOP-jrjd9kim + 1.0 + + + fr.insee + jqxvqakq + 1.0 + CodeList + + + + + + + fr.insee + jrqazhg5 + 1.0 + + + + Si vous avez répondu "non" à la question 1, + veuillez passer à la question 4. Sinon, veuillez poursuivre. + $GOUV_CA_EXIST$ = '0' + jrjdnoqo + + + + + + + fr.insee + jrjd54n7 + 1.0 + + GOUV_CA_NB + + + fr.insee + jrjd54n7-QOP-jrjdm55e + 1.0 + + GOUV_CA_NB + + + + + fr.insee + jrjd54n7-RDOP-jrjdm55e + 1.0 + OutParameter + + + fr.insee + jrjd54n7-QOP-jrjdm55e + 1.0 + OutParameter + + + + + Combien de membres comptait-il (personnes physiques ou + morales) ? + + + + + 1 + 999 + + Decimal + + fr.insee + jrjd54n7-RDOP-jrjdm55e + 1.0 + + + + + fr.insee + jrjdhk1u + 1.0 + + GOUV_CA_NB_F + + + fr.insee + jrjdhk1u-QOP-jrjdnih8 + 1.0 + + GOUV_CA_NB_F + + + + + fr.insee + jrjdhk1u-RDOP-jrjdnih8 + 1.0 + OutParameter + + + fr.insee + jrjdhk1u-QOP-jrjdnih8 + 1.0 + OutParameter + + + + + Parmi les membres du conseil d'administration, combien + sont des femmes ? + + + + + 0 + 999 + + Decimal + + fr.insee + jrjdhk1u-RDOP-jrjdnih8 + 1.0 + + + + + fr.insee + jrjdnoqo + 1.0 + + GOUV_BUREAU_EXIST + + + fr.insee + jrjdnoqo-QOP-jrjdpfju + 1.0 + + GOUV_BUREAU_EXIST + + + + + fr.insee + jrjdnoqo-RDOP-jrjdpfju + 1.0 + OutParameter + + + fr.insee + jrjdnoqo-QOP-jrjdpfju + 1.0 + OutParameter + + + + + Votre association disposait-elle d'un bureau au + 31/12/2018 ? + + + + radio-button + + fr.insee + jqxvqakq + 1.0 + CodeList + + + fr.insee + jrjdnoqo-RDOP-jrjdpfju + 1.0 + + + fr.insee + jqxvqakq + 1.0 + CodeList + + + + + + + fr.insee + jrqao9l2 + 1.0 + + + + Si vous avez répondu "non" à la question 4, + veuillez passer à la question 7. Sinon, veuillez poursuivre. + $GOUV_BUREAU_EXIST$ = '0' + jrjdtxvt + + + + + + + fr.insee + jrjdgpya + 1.0 + + GOUV_BUREAU_NB + + + fr.insee + jrjdgpya-QOP-jrjdvpg0 + 1.0 + + GOUV_BUREAU_NB + + + + + fr.insee + jrjdgpya-RDOP-jrjdvpg0 + 1.0 + OutParameter + + + fr.insee + jrjdgpya-QOP-jrjdvpg0 + 1.0 + OutParameter + + + + + Combien de membres comptait-il (personnes physiques ou + morales) ? + + + + + 1 + 999 + + Decimal + + fr.insee + jrjdgpya-RDOP-jrjdvpg0 + 1.0 + + + + + fr.insee + jrjdmxr3 + 1.0 + + GOUV_BUREAU_NB_F + + + fr.insee + jrjdmxr3-QOP-jrjdugue + 1.0 + + GOUV_BUREAU_NB_F + + + + + fr.insee + jrjdmxr3-RDOP-jrjdugue + 1.0 + OutParameter + + + fr.insee + jrjdmxr3-QOP-jrjdugue + 1.0 + OutParameter + + + + + Parmi les membres du bureau, combien sont des femmes + ? + + + + + 0 + 999 + + Decimal + + fr.insee + jrjdmxr3-RDOP-jrjdugue + 1.0 + + + + + fr.insee + jrjdtxvt + 1.0 + + GOUV_PDT_EXIST + + + fr.insee + jrjdtxvt-QOP-jrjdxa3i + 1.0 + + GOUV_PDT_EXIST + + + + + fr.insee + jrjdtxvt-RDOP-jrjdxa3i + 1.0 + OutParameter + + + fr.insee + jrjdtxvt-QOP-jrjdxa3i + 1.0 + OutParameter + + + + + Votre association avait-elle un(e) président(e) au + 31/12/2018 ? + + + + radio-button + + fr.insee + jrjdn9sk + 1.0 + CodeList + + + fr.insee + jrjdtxvt-RDOP-jrjdxa3i + 1.0 + + + fr.insee + jrjdn9sk + 1.0 + CodeList + + + + + + + fr.insee + jrqeofdd + 1.0 + + + + Si vous avez répondu "oui, plusieurs + co-présidents(es)" ou "non" à la question 7, veuillez passer à la + question 11. Sinon, veuillez poursuivre. + $GOUV_PDT_EXIST$ = '0' or $GOUV_PDT_EXIST$ = + '2' + jrjdypnr + + + + + + + fr.insee + jrjdn5o5 + 1.0 + + GOUV_PDT_SEXE + + + fr.insee + jrjdn5o5-QOP-jrje3de3 + 1.0 + + GOUV_PDT_SEXE + + + + + fr.insee + jrjdn5o5-RDOP-jrje3de3 + 1.0 + OutParameter + + + fr.insee + jrjdn5o5-QOP-jrje3de3 + 1.0 + OutParameter + + + + + Le(la) président(e) de votre association est-il(elle) + ? + + + + radio-button + + fr.insee + jrjdm6kc + 1.0 + CodeList + + + fr.insee + jrjdn5o5-RDOP-jrje3de3 + 1.0 + + + fr.insee + jrjdm6kc + 1.0 + CodeList + + + + + + + + fr.insee + jrje3unr + 1.0 + + GOUV_PDT_AGE + + + fr.insee + jrje3unr-QOP-jrjdrrnu + 1.0 + + GOUV_PDT_AGE + + + + + fr.insee + jrje3unr-RDOP-jrjdrrnu + 1.0 + OutParameter + + + fr.insee + jrje3unr-QOP-jrjdrrnu + 1.0 + OutParameter + + + + + Quel est son âge (même approximatif) ? + + + + + 10 + 99 + + Decimal + + fr.insee + jrje3unr-RDOP-jrjdrrnu + 1.0 + + + + + fr.insee + jrjds2dp + 1.0 + + GOUV_PDT_STATUT + + + fr.insee + jrjds2dp-QOP-jrje668k + 1.0 + + GOUV_PDT_STATUT + + + + + fr.insee + jrjds2dp-RDOP-jrje668k + 1.0 + OutParameter + + + fr.insee + jrjds2dp-QOP-jrje668k + 1.0 + OutParameter + + + + + Quel est son statut d'activité professionnelle ? + + + + checkbox + + fr.insee + jrje5vjq + 1.0 + CodeList + + + fr.insee + jrjds2dp-RDOP-jrje668k + 1.0 + + + fr.insee + jrje5vjq + 1.0 + CodeList + + + + + + + fr.insee + jrje2xqr + 1.0 + Instruction + + + + fr.insee + jrjdypnr + 1.0 + + GOUV_TRESOR_EXIST + + + fr.insee + jrjdypnr-QOP-jrjehc9e + 1.0 + + GOUV_TRESOR_EXIST + + + + + fr.insee + jrjdypnr-RDOP-jrjehc9e + 1.0 + OutParameter + + + fr.insee + jrjdypnr-QOP-jrjehc9e + 1.0 + OutParameter + + + + + Votre association avait-elle un(e) trésorier(ère) au + 31/12/2018 ? + + + + radio-button + + fr.insee + jqxvqakq + 1.0 + CodeList + + + fr.insee + jrjdypnr-RDOP-jrjehc9e + 1.0 + + + fr.insee + jqxvqakq + 1.0 + CodeList + + + + + + + fr.insee + jrqequ0z + 1.0 + + + + Si vous avez répondu "non" à la question 11, + veuillez passer à la question 15. Sinon, veuillez poursuivre. + $GOUV_TRESOR_EXIST$ = '0' + jrkcrjf5 + + + + + + + fr.insee + jrkcdydx + 1.0 + + GOUV_TRESOR_SEXE + + + fr.insee + jrkcdydx-QOP-jrkch5yv + 1.0 + + GOUV_TRESOR_SEXE + + + + + fr.insee + jrkcdydx-RDOP-jrkch5yv + 1.0 + OutParameter + + + fr.insee + jrkcdydx-QOP-jrkch5yv + 1.0 + OutParameter + + + + + Le(la) trésorier(ère) de votre association est-il(elle) + ? + + + + radio-button + + fr.insee + jrjdm6kc + 1.0 + CodeList + + + fr.insee + jrkcdydx-RDOP-jrkch5yv + 1.0 + + + fr.insee + jrjdm6kc + 1.0 + CodeList + + + + + + + + fr.insee + jrkcgkye + 1.0 + + GOUV_TRESOR_AGE + + + fr.insee + jrkcgkye-QOP-jrkcbqg3 + 1.0 + + GOUV_TRESOR_AGE + + + + + fr.insee + jrkcgkye-RDOP-jrkcbqg3 + 1.0 + OutParameter + + + fr.insee + jrkcgkye-QOP-jrkcbqg3 + 1.0 + OutParameter + + + + + Quel est son âge (même approximatif) ? + + + + + 10 + 99 + + Decimal + + fr.insee + jrkcgkye-RDOP-jrkcbqg3 + 1.0 + + + + + fr.insee + jrkccq4q + 1.0 + + GOUV_TRESOR_STATUT + + + fr.insee + jrkccq4q-QOP-jrkcj45j + 1.0 + + GOUV_TRESOR_STATUT + + + + + fr.insee + jrkccq4q-RDOP-jrkcj45j + 1.0 + OutParameter + + + fr.insee + jrkccq4q-QOP-jrkcj45j + 1.0 + OutParameter + + + + + Quel est son statut d'activité professionnelle ? + + + + checkbox + + fr.insee + jrje5vjq + 1.0 + CodeList + + + fr.insee + jrkccq4q-RDOP-jrkcj45j + 1.0 + + + fr.insee + jrje5vjq + 1.0 + CodeList + + + + + + + fr.insee + jrkcsjie + 1.0 + Instruction + + + + fr.insee + jrkcsvme + 1.0 + + GOUV_SECRET_EXIST + + + fr.insee + jrkcsvme-QOP-jrkco2h6 + 1.0 + + GOUV_SECRET_EXIST + + + + + fr.insee + jrkcsvme-RDOP-jrkco2h6 + 1.0 + OutParameter + + + fr.insee + jrkcsvme-QOP-jrkco2h6 + 1.0 + OutParameter + + + + + Votre association avait-elle un(e) secrétaire au + 31/12/2018 ? + + + + radio-button + + fr.insee + jqxvqakq + 1.0 + CodeList + + + fr.insee + jrkcsvme-RDOP-jrkco2h6 + 1.0 + + + fr.insee + jqxvqakq + 1.0 + CodeList + + + + + + + fr.insee + jrqes3zn + 1.0 + + + + Si vous avez répondu "non" à la question 15, + veuillez passer au module III. Sinon, veuillez poursuivre. + $GOUV_SECRET_EXIST$ = '0' + jrkcqyr1 + + + + + + + fr.insee + jrkcnb33 + 1.0 + + GOUV_SECRET_SEXE + + + fr.insee + jrkcnb33-QOP-jrkcofze + 1.0 + + GOUV_SECRET_SEXE + + + + + fr.insee + jrkcnb33-RDOP-jrkcofze + 1.0 + OutParameter + + + fr.insee + jrkcnb33-QOP-jrkcofze + 1.0 + OutParameter + + + + + Le (la) secrétaire de votre association est-il(elle) + ? + + + + radio-button + + fr.insee + jrjdm6kc + 1.0 + CodeList + + + fr.insee + jrkcnb33-RDOP-jrkcofze + 1.0 + + + fr.insee + jrjdm6kc + 1.0 + CodeList + + + + + + + + fr.insee + jrkcgtrt + 1.0 + + GOUV_SECRET_AGE + + + fr.insee + jrkcgtrt-QOP-jrkcpbgp + 1.0 + + GOUV_SECRET_AGE + + + + + fr.insee + jrkcgtrt-RDOP-jrkcpbgp + 1.0 + OutParameter + + + fr.insee + jrkcgtrt-QOP-jrkcpbgp + 1.0 + OutParameter + + + + + Quel est son âge (même approximatif) ? + + + + + 10 + 99 + + Decimal + + fr.insee + jrkcgtrt-RDOP-jrkcpbgp + 1.0 + + + + + fr.insee + jrkcxp0c + 1.0 + + GOUV_SECRET_STATUT + + + fr.insee + jrkcxp0c-QOP-jrkcj75w + 1.0 + + GOUV_SECRET_STATUT + + + + + fr.insee + jrkcxp0c-RDOP-jrkcj75w + 1.0 + OutParameter + + + fr.insee + jrkcxp0c-QOP-jrkcj75w + 1.0 + OutParameter + + + + + Quel est son statut d'activité professionnelle ? + + + + checkbox + + fr.insee + jrje5vjq + 1.0 + CodeList + + + fr.insee + jrkcxp0c-RDOP-jrkcj75w + 1.0 + + + fr.insee + jrje5vjq + 1.0 + CodeList + + + + + + + fr.insee + jrkci389 + 1.0 + Instruction + + + + fr.insee + jrkd7a3w + 1.0 + + AD_AUTRES_P + + + fr.insee + jrkd7a3w-QOP-jrkd75hk + 1.0 + + AD_AUTRES_P + + + + + fr.insee + jrkd7a3w-RDOP-jrkd75hk + 1.0 + OutParameter + + + fr.insee + jrkd7a3w-QOP-jrkd75hk + 1.0 + OutParameter + + + + + Précisez la nature de ces autres adhérents : + + + + + fr.insee + jrkd7a3w-RDOP-jrkd75hk + 1.0 + + + + + + fr.insee + jrkd4r0n + 1.0 + + DOM_P + + + fr.insee + jrkd4r0n-QOP-jrkdjlwp + 1.0 + + DOM_P + + + + + fr.insee + jrkd4r0n-RDOP-jrkdjlwp + 1.0 + OutParameter + + + fr.insee + jrkd4r0n-QOP-jrkdjlwp + 1.0 + OutParameter + + + + + Indiquez ci-dessous toute précision jugée importante sur + les activités de votre association (association se revendiquant d'une démarche + particulière comme l'éducation populaire, activités secondaires, difficultés de + classement...) : + + + + + fr.insee + jrkd4r0n-RDOP-jrkdjlwp + 1.0 + + + + + + fr.insee + jseoat5y + 1.0 + + SAL_EMP + + + fr.insee + jseoat5y-QOP-jseo51cx + 1.0 + + SAL_EMP + + + + + fr.insee + jseoat5y-RDOP-jseo51cx + 1.0 + OutParameter + + + fr.insee + jseoat5y-QOP-jseo51cx + 1.0 + OutParameter + + + + + Votre association a-t-elle eu recours à l’emploi salarié + en 2018 ? + + + + radio-button + + fr.insee + jqxvqakq + 1.0 + CodeList + + + fr.insee + jseoat5y-RDOP-jseo51cx + 1.0 + + + fr.insee + jqxvqakq + 1.0 + CodeList + + + + + + + fr.insee + jski107k + 1.0 + + + + Si vous avez répondu "Non" à la question 1, + veuillez passer au module VI. Sinon, veuillez poursuivre. + $SAL_EMP$ = '0' + js0dur5c + + + + + + fr.insee + jseogy8a + 1.0 + Instruction + + + + fr.insee + js0d53t6 + 1.0 + + SAL_NB_H + + + fr.insee + js0d53t6-QOP-js0czgby + 1.0 + + SAL_NB_H + + + + + fr.insee + js0d53t6-RDOP-js0czgby + 1.0 + OutParameter + + + fr.insee + js0d53t6-QOP-js0czgby + 1.0 + OutParameter + + + + + + Quel est le nombre d’heures de travail rémunérées des salariés de votre association au cours de l’année 2018 ? + + + + + + 0 + 999999999 + + Decimal + + fr.insee + js0d53t6-RDOP-js0czgby + 1.0 + + + + fr.insee + jski9scj + 1.0 + + + + Si vous avez répondu "0" à la question 2, + veuillez passer au module VI. Sinon, veuillez poursuivre. + $SAL_NB_H$ = 0 + js0dur5c + + + + + + + fr.insee + jseoi4yc + 1.0 + + SAL_NB + + + fr.insee + jseoi4yc-QOP-jseo0mfc + 1.0 + + SAL_NB + + + + + fr.insee + jseoi4yc-RDOP-jseo0mfc + 1.0 + OutParameter + + + fr.insee + jseoi4yc-QOP-jseo0mfc + 1.0 + OutParameter + + + + + Combien de salariés comptait votre association au + 31/12/2018 ? + + + + + 0 + 9999999 + + Decimal + + fr.insee + jseoi4yc-RDOP-jseo0mfc + 1.0 + + + + fr.insee + jskicrkc + 1.0 + + + + Si vous avez répondu "0" à la question 5, + veuillez passer au module VI. Sinon, veuillez poursuivre. + $SAL_NB$ = 0 + js0dur5c + + + + + + fr.insee + jseoe9ig + 1.0 + Instruction + + + + fr.insee + js0eh523 + 1.0 + + BENEV_NB + + + fr.insee + js0eh523-QOP-js0e63o9 + 1.0 + + BENEV_NB + + + + + fr.insee + js0eh523-RDOP-js0e63o9 + 1.0 + OutParameter + + + fr.insee + js0eh523-QOP-js0e63o9 + 1.0 + OutParameter + + + + + Combien votre association a-t-elle compté de bénévoles, + quel que soit leur rôle (bénévoles réguliers ou occasionnels, y compris membres + du bureau et du conseil d’administration) en 2018 : + + + + + 0 + 9999999 + + Decimal + + fr.insee + js0eh523-RDOP-js0e63o9 + 1.0 + + + + fr.insee + js4egucr + 1.0 + + + + Si vous avez répondu "0" à la question 1, + veuillez passer au module VIII. Sinon, veuillez poursuivre. + $BENEV_NB$ = 0 and $BENEV_NB$ !=99 + js0f3pie + + + + + + + fr.insee + js0egvao + 1.0 + + BENEV_REG_NB + + + fr.insee + js0egvao-QOP-js0en3v8 + 1.0 + + BENEV_REG_NB + + + + + fr.insee + js0egvao-RDOP-js0en3v8 + 1.0 + OutParameter + + + fr.insee + js0egvao-QOP-js0en3v8 + 1.0 + OutParameter + + + + + Parmi ces bénévoles, combien sont des bénévoles réguliers + ? + + + + + 0 + 9999999 + + Decimal + + fr.insee + js0egvao-RDOP-js0en3v8 + 1.0 + + + + + fr.insee + js0en9yl + 1.0 + + BENEV_FORM + + + fr.insee + js0en9yl-QOP-js0elnnk + 1.0 + + BENEV_FORM + + + + + fr.insee + js0en9yl-RDOP-js0elnnk + 1.0 + OutParameter + + + fr.insee + js0en9yl-QOP-js0elnnk + 1.0 + OutParameter + + + + + Avez-vous fait suivre des formations à certains bénévoles + de votre association en 2018 ? + + + + radio-button + + fr.insee + jqxvqakq + 1.0 + CodeList + + + fr.insee + js0en9yl-RDOP-js0elnnk + 1.0 + + + fr.insee + jqxvqakq + 1.0 + CodeList + + + + + + + fr.insee + jskiehhi + 1.0 + + + + Si vous avez répondu "Non" à la question 4, + veuillez passer à la question 7. Sinon, veuillez poursuivre. + $BENEV_FORM$ = '0' + js0ema6d + + + + + + + fr.insee + js0ef83m + 1.0 + + BENEV_FORM_CHARGES + + + fr.insee + js0ef83m-QOP-js0ep1yk + 1.0 + + BENEV_FORM_CHARGES + + + + + fr.insee + js0ef83m-RDOP-js0ep1yk + 1.0 + OutParameter + + + fr.insee + js0ef83m-QOP-js0ep1yk + 1.0 + OutParameter + + + + + Votre association a-t-elle eu en 2018 des charges liées à + la formation de ses bénévoles ? + + + + radio-button + + fr.insee + jqxvqakq + 1.0 + CodeList + + + fr.insee + js0ef83m-RDOP-js0ep1yk + 1.0 + + + fr.insee + jqxvqakq + 1.0 + CodeList + + + + + + + fr.insee + jskifr2b + 1.0 + + + + Si vous avez répondu "Non" à la question 5, + veuillez passer à la question 7. Sinon, veuillez poursuivre. + $BENEV_FORM_CHARGES$ = '0' + js0ema6d + + + + + + + fr.insee + js0et52n + 1.0 + + BENEV_FORM_MONTANT + + + fr.insee + js0et52n-QOP-js0engj1 + 1.0 + + BENEV_FORM_MONTANT + + + + + fr.insee + js0et52n-RDOP-js0engj1 + 1.0 + OutParameter + + + fr.insee + js0et52n-QOP-js0engj1 + 1.0 + OutParameter + + + + + Pouvez-vous en estimer le montant, même approximativement + ? + + + + + 0 + 999999999 + + Decimal + + fr.insee + js0et52n-RDOP-js0engj1 + 1.0 + + + + + fr.insee + js0ema6d + 1.0 + + BENEV_REMB_FRAIS + + + fr.insee + js0ema6d-QOP-js0eoqcr + 1.0 + + BENEV_REMB_FRAIS + + + + + fr.insee + js0ema6d-RDOP-js0eoqcr + 1.0 + OutParameter + + + fr.insee + js0ema6d-QOP-js0eoqcr + 1.0 + OutParameter + + + + + Votre association a-t-elle eu en 2018 des charges liées à + des remboursements de frais divers de ses bénévoles (transport, repas, + hébergement…)? + + + + radio-button + + fr.insee + jqxvqakq + 1.0 + CodeList + + + fr.insee + js0ema6d-RDOP-js0eoqcr + 1.0 + + + fr.insee + jqxvqakq + 1.0 + CodeList + + + + + + + fr.insee + jskiwraj + 1.0 + + + + Si vous avez répondu "Non" à la question 7, + veuillez passer à la question 9. Sinon, veuillez poursuivre. + $BENEV_REMB_FRAIS$ = '0' + js0ezdnw + + + + + + + fr.insee + js0errla + 1.0 + + BENEV_REMB_MONTANT + + + fr.insee + js0errla-QOP-js0eljk9 + 1.0 + + BENEV_REMB_MONTANT + + + + + fr.insee + js0errla-RDOP-js0eljk9 + 1.0 + OutParameter + + + fr.insee + js0errla-QOP-js0eljk9 + 1.0 + OutParameter + + + + + Pouvez-vous en estimer le montant, même approximativement + ? + + + + + 0 + 999999999 + + Decimal + + fr.insee + js0errla-RDOP-js0eljk9 + 1.0 + + + + fr.insee + jvgdoydj + 1.0 + + + + Si vous avez répondu "Non" à la question 1 du + module V, veuillez passer au module VIII. Sinon, veuillez poursuivre. + $SAL_EMP$ = '0' + js0f3pie + + + + + + + fr.insee + js0ezdnw + 1.0 + + BENEV_SAL_ENCADRANT + + + fr.insee + js0ezdnw-QOP-js0etdbh + 1.0 + + BENEV_SAL_ENCADRANT + + + + + fr.insee + js0ezdnw-RDOP-js0etdbh + 1.0 + OutParameter + + + fr.insee + js0ezdnw-QOP-js0etdbh + 1.0 + OutParameter + + + + + Certains salariés de votre association avaient-ils pour + tâche principale en 2018 la coordination ou l’encadrement de bénévoles + ? + + + + radio-button + + fr.insee + jqxvqakq + 1.0 + CodeList + + + fr.insee + js0ezdnw-RDOP-js0etdbh + 1.0 + + + fr.insee + jqxvqakq + 1.0 + CodeList + + + + + + + + fr.insee + junsenue + 1.0 + + RESS_DATE_CLOTURE + + + fr.insee + junsenue-QOP-juns2o7l + 1.0 + + RESS_DATE_CLOTURE + + + + + fr.insee + junsenue-RDOP-juns2o7l + 1.0 + OutParameter + + + fr.insee + junsenue-QOP-juns2o7l + 1.0 + OutParameter + + + + + Quelle était la date de clôture de votre exercice + comptable 2018 ? + + + + fr.insee + INSEE-COMMUN-MNR-DateTimedate + 1.0 + ManagedDateTimeRepresentation + + fr.insee + junsenue-RDOP-juns2o7l + 1.0 + + fr.insee + INSEE-COMMUN-MNR-DateTimedate + 1.0 + ManagedDateTimeRepresentation + + + + + + fr.insee + junsih01 + 1.0 + + RESS_DUREE_EXERCICE + + + fr.insee + junsih01-QOP-juns6j74 + 1.0 + + RESS_DUREE_EXERCICE + + + + + fr.insee + junsih01-RDOP-juns6j74 + 1.0 + OutParameter + + + fr.insee + junsih01-QOP-juns6j74 + 1.0 + OutParameter + + + + + Quelle était la durée de cet exercice (en mois) + ? + + + + + 0 + 24 + + Decimal + + fr.insee + junsih01-RDOP-juns6j74 + 1.0 + + + + + fr.insee + js0g5z55 + 1.0 + + RESS_RECUS_FISC + + + fr.insee + js0g5z55-QOP-js0g62h4 + 1.0 + + RESS_RECUS_FISC + + + + + fr.insee + js0g5z55-RDOP-js0g62h4 + 1.0 + OutParameter + + + fr.insee + js0g5z55-QOP-js0g62h4 + 1.0 + OutParameter + + + + + + Votre association a-t-elle délivré des reçus + fiscaux (formulaire Cerfa) à ses donateurs en 2018 ? + + + + + radio-button + + fr.insee + jqxvqakq + 1.0 + CodeList + + + fr.insee + js0g5z55-RDOP-js0g62h4 + 1.0 + + + fr.insee + jqxvqakq + 1.0 + CodeList + + + + + + + fr.insee + jvgdp5xz + 1.0 + + + + Si avez déclaré "0" pour les recettes + d'activité d'origine publique et pour les subventions publiques à la + question 3, veuillez passer au module IX. Sinon, veuillez + poursuivre. + $RESS_RECETTE_ACT_PUB$ = 0 and $RESS_SUBV$ = + 0 + js0gkmjz + + + + + + fr.insee + js0ga2c4 + 1.0 + Instruction + + + + fr.insee + jvgc8k0y + 1.0 + + RESS_SUBV_AUTRES_P + + + fr.insee + jvgc8k0y-QOP-jvgc4m44 + 1.0 + + RESS_SUBV_AUTRES_P + + + + + fr.insee + jvgc8k0y-RDOP-jvgc4m44 + 1.0 + OutParameter + + + fr.insee + jvgc8k0y-QOP-jvgc4m44 + 1.0 + OutParameter + + + + + Précisez l'origine des subventions publiques de la + catégorie "Autres" : + + + + + fr.insee + jvgc8k0y-RDOP-jvgc4m44 + 1.0 + + + + + + fr.insee + jvgcdcjx + 1.0 + + RESS_REC_ACT_AUTRES_P + + + fr.insee + jvgcdcjx-QOP-jvgcbyxs + 1.0 + + RESS_REC_ACT_AUTRES_P + + + + + fr.insee + jvgcdcjx-RDOP-jvgcbyxs + 1.0 + OutParameter + + + fr.insee + jvgcdcjx-QOP-jvgcbyxs + 1.0 + OutParameter + + + + + Précisez l'origine des recettes d'activité d'origine + publique de la catégorie "Autres" + + + + + fr.insee + jvgcdcjx-RDOP-jvgcbyxs + 1.0 + + + + + + fr.insee + js1vv01p + 1.0 + + MAD_LOCAUX + + + fr.insee + js1vv01p-QOP-js1vzbye + 1.0 + + MAD_LOCAUX + + + + + fr.insee + js1vv01p-RDOP-js1vzbye + 1.0 + OutParameter + + + fr.insee + js1vv01p-QOP-js1vzbye + 1.0 + OutParameter + + + + + Votre association a-t-elle bénéficié en 2018 de locaux + mis à disposition gratuitement ou à des conditions avantageuses ? + + + + radio-button + + fr.insee + jqxvqakq + 1.0 + CodeList + + + fr.insee + js1vv01p-RDOP-js1vzbye + 1.0 + + + fr.insee + jqxvqakq + 1.0 + CodeList + + + + + + + fr.insee + jskim1ra + 1.0 + + + + Si vous avez répondu "Non" à la question 1, + veuillez passer à la question 8. Sinon, veuillez poursuivre. + $MAD_LOCAUX$ = '0' + js1wic46 + + + + + + + fr.insee + js1w04zo + 1.0 + + MAD_LOCAUX_EXCLU + + + fr.insee + js1w04zo-QOP-js1vynip + 1.0 + + MAD_LOCAUX_EXCLU + + + + + fr.insee + js1w04zo-RDOP-js1vynip + 1.0 + OutParameter + + + fr.insee + js1w04zo-QOP-js1vynip + 1.0 + OutParameter + + + + + Votre association a-t-elle disposé de ces locaux de façon + exclusive, tout au long de l’année ? + + + + radio-button + + fr.insee + jqxvqakq + 1.0 + CodeList + + + fr.insee + js1w04zo-RDOP-js1vynip + 1.0 + + + fr.insee + jqxvqakq + 1.0 + CodeList + + + + + + + + fr.insee + js1wasgx + 1.0 + + MAD_LOCAUX_DUREE_PREF + + + fr.insee + js1wasgx-QOP-js1w6zxa + 1.0 + + MAD_LOCAUX_DUREE_PREF + + + + + fr.insee + js1wasgx-RDOP-js1w6zxa + 1.0 + OutParameter + + + fr.insee + js1wasgx-QOP-js1w6zxa + 1.0 + OutParameter + + + + + Préférez-vous estimer la durée dans l’année de cette mise + à disposition en nombre de jours par an, ou en nombre d’heures par an + ? + + + + checkbox + + fr.insee + js1w4chj + 1.0 + CodeList + + + fr.insee + js1wasgx-RDOP-js1w6zxa + 1.0 + + + fr.insee + js1w4chj + 1.0 + CodeList + + + + + + + fr.insee + jskiyz80 + 1.0 + + + + Si vous avez répondu "en nombre d'heures dans + l'année" à la question 3, veuillez passer à la question 5. Sinon, + veuillez poursuivre. + $MAD_LOCAUX_DUREE_PREF$ = '2' + js1wc3wz + + + + + + + fr.insee + js1wcjld + 1.0 + + MAD_LOCAUX_DUREE_JR + + + fr.insee + js1wcjld-QOP-js1wf69p + 1.0 + + MAD_LOCAUX_DUREE_JR + + + + + fr.insee + js1wcjld-RDOP-js1wf69p + 1.0 + OutParameter + + + fr.insee + js1wcjld-QOP-js1wf69p + 1.0 + OutParameter + + + + + Combien de jours dans l’année ces locaux sont-ils mis à + votre disposition ? + + + + + 0 + 365 + + Decimal + + fr.insee + js1wcjld-RDOP-js1wf69p + 1.0 + + + + fr.insee + jskizmdn + 1.0 + + + + Après avoir répondu à la question 4, veuillez + passer à la question 6. + $MAD_LOCAUX_DUREE_PREF$ = '1' + js1wcxvg + + + + + + + fr.insee + js1wc3wz + 1.0 + + MAD_LOCAUX_DUREE_H + + + fr.insee + js1wc3wz-QOP-js1wjcbw + 1.0 + + MAD_LOCAUX_DUREE_H + + + + + fr.insee + js1wc3wz-RDOP-js1wjcbw + 1.0 + OutParameter + + + fr.insee + js1wc3wz-QOP-js1wjcbw + 1.0 + OutParameter + + + + + Combien d’heures dans l’année ces locaux sont-ils mis à + votre disposition ? + + + + + 0 + 8760 + + Decimal + + fr.insee + js1wc3wz-RDOP-js1wjcbw + 1.0 + + + + + fr.insee + js1wcxvg + 1.0 + + MAD_LOCAUX_SURFACE + + + fr.insee + js1wcxvg-QOP-js1wgiim + 1.0 + + MAD_LOCAUX_SURFACE + + + + + fr.insee + js1wcxvg-RDOP-js1wgiim + 1.0 + OutParameter + + + fr.insee + js1wcxvg-QOP-js1wgiim + 1.0 + OutParameter + + + + + Quelle est la surface approximative de ces locaux + ? + + + + + 0 + 9999999 + + Decimal + + fr.insee + js1wcxvg-RDOP-js1wgiim + 1.0 + + + + + fr.insee + js1wic46 + 1.0 + + MAD_TERRAINS + + + fr.insee + js1wic46-QOP-js1wt5z4 + 1.0 + + MAD_TERRAINS + + + + + fr.insee + js1wic46-RDOP-js1wt5z4 + 1.0 + OutParameter + + + fr.insee + js1wic46-QOP-js1wt5z4 + 1.0 + OutParameter + + + + + Votre association a-t-elle bénéficié en 2018 de terrains + mis à disposition gratuitement ou à des conditions avantageuses ? + + + + radio-button + + fr.insee + jqxvqakq + 1.0 + CodeList + + + fr.insee + js1wic46-RDOP-js1wt5z4 + 1.0 + + + fr.insee + jqxvqakq + 1.0 + CodeList + + + + + + + fr.insee + jskj4cne + 1.0 + + + + Si vous avez répondu "Non" à la question 8, + veuillez passer au module XI. Sinon, veuillez poursuivre. + $MAD_TERRAINS$ = '0' + js1xf53s + + + + + + + fr.insee + js1wwgqi + 1.0 + + MAD_TERRAINS_EXCLU + + + fr.insee + js1wwgqi-QOP-js1wv5rg + 1.0 + + MAD_TERRAINS_EXCLU + + + + + fr.insee + js1wwgqi-RDOP-js1wv5rg + 1.0 + OutParameter + + + fr.insee + js1wwgqi-QOP-js1wv5rg + 1.0 + OutParameter + + + + + Votre association a-t-elle disposé de ces terrains de + façon exclusive, tout au long de l’année ? + + + + radio-button + + fr.insee + jqxvqakq + 1.0 + CodeList + + + fr.insee + js1wwgqi-RDOP-js1wv5rg + 1.0 + + + fr.insee + jqxvqakq + 1.0 + CodeList + + + + + + + + fr.insee + js1wx3qa + 1.0 + + MAD_TERRAINS_DUREE_PREF + + + fr.insee + js1wx3qa-QOP-js1wsgt4 + 1.0 + + MAD_TERRAINS_DUREE_PREF + + + + + fr.insee + js1wx3qa-RDOP-js1wsgt4 + 1.0 + OutParameter + + + fr.insee + js1wx3qa-QOP-js1wsgt4 + 1.0 + OutParameter + + + + + Préférez-vous estimer la durée dans l’année de cette mise + à disposition en nombre de jours par an, ou en nombre d’heures par an + ? + + + + checkbox + + fr.insee + js1w4chj + 1.0 + CodeList + + + fr.insee + js1wx3qa-RDOP-js1wsgt4 + 1.0 + + + fr.insee + js1w4chj + 1.0 + CodeList + + + + + + + fr.insee + jskj4pm6 + 1.0 + + + + Si vous avez répondu "en nombre d'heures dans + l'année" à la question 10, veuillez passer à la question 12. Sinon, + veuillez poursuivre. + $MAD_TERRAINS_DUREE_PREF$ = '2' + js1x11dd + + + + + + + fr.insee + js1wt9ts + 1.0 + + MAD_TERRAINS_DUREE_JR + + + fr.insee + js1wt9ts-QOP-js1x0t4l + 1.0 + + MAD_TERRAINS_DUREE_JR + + + + + fr.insee + js1wt9ts-RDOP-js1x0t4l + 1.0 + OutParameter + + + fr.insee + js1wt9ts-QOP-js1x0t4l + 1.0 + OutParameter + + + + + Combien de jours dans l’année ces terrains sont-ils mis à + votre disposition ? + + + + + 0 + 365 + + Decimal + + fr.insee + js1wt9ts-RDOP-js1x0t4l + 1.0 + + + + fr.insee + jskj1bpl + 1.0 + + + + Après avoir répondu à la question 11, + veuillez passer à la question 13. + $MAD_TERRAINS_DUREE_PREF$ = '1' + js1wk2jf + + + + + + + fr.insee + js1x11dd + 1.0 + + MAD_TERRAINS_DUREE_H + + + fr.insee + js1x11dd-QOP-js1wuju5 + 1.0 + + MAD_TERRAINS_DUREE_H + + + + + fr.insee + js1x11dd-RDOP-js1wuju5 + 1.0 + OutParameter + + + fr.insee + js1x11dd-QOP-js1wuju5 + 1.0 + OutParameter + + + + + Combien d’heures dans l’année ces terrains sont-ils mis à + votre disposition ? + + + + + 0 + 8760 + + Decimal + + fr.insee + js1x11dd-RDOP-js1wuju5 + 1.0 + + + + + fr.insee + js1wk2jf + 1.0 + + MAD_TERRAINS_SURFACE + + + fr.insee + js1wk2jf-QOP-js1x27mu + 1.0 + + MAD_TERRAINS_SURFACE + + + + + fr.insee + js1wk2jf-RDOP-js1x27mu + 1.0 + OutParameter + + + fr.insee + js1wk2jf-QOP-js1x27mu + 1.0 + OutParameter + + + + + Quelle est la surface approximative de ces terrains + ? + + + + + 0 + 9999999 + + Decimal + + fr.insee + js1wk2jf-RDOP-js1x27mu + 1.0 + + + + + fr.insee + js1xblc8 + 1.0 + + RESEAU + + + fr.insee + js1xblc8-QOP-js1x70lq + 1.0 + + RESEAU + + + + + fr.insee + js1xblc8-RDOP-js1x70lq + 1.0 + OutParameter + + + fr.insee + js1xblc8-QOP-js1x70lq + 1.0 + OutParameter + + + + + Votre association appartenait-elle en 2018 à un ou + plusieurs réseaux d’associations (fédération, union, ligue, comité, groupement, + collectif, mouvement…), en tant que membre ou tête de réseau ? + + + + radio-button + + fr.insee + jqxvqakq + 1.0 + CodeList + + + fr.insee + js1xblc8-RDOP-js1x70lq + 1.0 + + + fr.insee + jqxvqakq + 1.0 + CodeList + + + + + + + fr.insee + jslulnjd + 1.0 + + + + Si vous avez répondu "Non" à la question 1, + veuillez passer au module XII. Sinon, veuillez poursuivre. + $RESEAU$ = '0' + jqxywqlc + + + + + + + fr.insee + js1xnjw7 + 1.0 + + RESEAU_TETE_NAT + + + fr.insee + js1xnjw7-QOP-js1x5b34 + 1.0 + + RESEAU_TETE_NAT + + + + + fr.insee + js1xnjw7-RDOP-js1x5b34 + 1.0 + OutParameter + + + fr.insee + js1xnjw7-QOP-js1x5b34 + 1.0 + OutParameter + + + + + Votre association est-elle la tête nationale d’un ou + plusieurs réseaux d’associations ? + + + + radio-button + + fr.insee + jqxvqakq + 1.0 + CodeList + + + fr.insee + js1xnjw7-RDOP-js1x5b34 + 1.0 + + + fr.insee + jqxvqakq + 1.0 + CodeList + + + + + + + + fr.insee + js1xmypc + 1.0 + + RESEAU_TETE_AUTRE + + + fr.insee + js1xmypc-QOP-js1xcoh9 + 1.0 + + RESEAU_TETE_AUTRE + + + + + fr.insee + js1xmypc-RDOP-js1xcoh9 + 1.0 + OutParameter + + + fr.insee + js1xmypc-QOP-js1xcoh9 + 1.0 + OutParameter + + + + + Votre association est-elle la tête régionale, + départementale ou locale, … d’un ou plusieurs réseaux d’associations ? + + + + radio-button + + fr.insee + jqxvqakq + 1.0 + CodeList + + + fr.insee + js1xmypc-RDOP-js1xcoh9 + 1.0 + + + fr.insee + jqxvqakq + 1.0 + CodeList + + + + + + + + fr.insee + js1x9nsr + 1.0 + + RESEAU_P + + + fr.insee + js1x9nsr-QOP-js1xkowa + 1.0 + + RESEAU_P + + + + + fr.insee + js1x9nsr-RDOP-js1xkowa + 1.0 + OutParameter + + + fr.insee + js1x9nsr-QOP-js1xkowa + 1.0 + OutParameter + + + + + Précisez à quel(s) réseau(x) appartient votre + association + + + + + fr.insee + js1x9nsr-RDOP-js1xkowa + 1.0 + + + + + + fr.insee + jrkctbou + 1.0 + + AD_PP + + + fr.insee + jrkctbou-QOP-jvmg5u30 + 1.0 + + AD_PP + + + + fr.insee + jrkctbou-QOP-jvmg014v + 1.0 + + AD_ASSO + + + + fr.insee + jrkctbou-QOP-jvmg13p6 + 1.0 + + AD_ENTPRIV + + + + fr.insee + jrkctbou-QOP-jvmfv25y + 1.0 + + AD_COLLPUB + + + + fr.insee + jrkctbou-QOP-jvmfs5xd + 1.0 + + AD_AUTRES + + + + + fr.insee + jrkctbou-RDOP-jvmg5u30 + 1.0 + OutParameter + + + fr.insee + jrkctbou-QOP-jvmg5u30 + 1.0 + OutParameter + + + + + fr.insee + jrkctbou-RDOP-jvmg014v + 1.0 + OutParameter + + + fr.insee + jrkctbou-QOP-jvmg014v + 1.0 + OutParameter + + + + + fr.insee + jrkctbou-RDOP-jvmg13p6 + 1.0 + OutParameter + + + fr.insee + jrkctbou-QOP-jvmg13p6 + 1.0 + OutParameter + + + + + fr.insee + jrkctbou-RDOP-jvmfv25y + 1.0 + OutParameter + + + fr.insee + jrkctbou-QOP-jvmfv25y + 1.0 + OutParameter + + + + + fr.insee + jrkctbou-RDOP-jvmfs5xd + 1.0 + OutParameter + + + fr.insee + jrkctbou-QOP-jvmfs5xd + 1.0 + OutParameter + + + + + Quelle est la nature des adhérents de votre association + (personnes physiques ou morales, plusieurs choix possibles) ? + + + + + + fr.insee + jrkctpmr + 1.0 + CodeList + + + + + + + radio-button + + fr.insee + jqxvqakq + 1.0 + CodeList + + + fr.insee + jrkctbou-RDOP-jvmg5u30 + 1.0 + + + fr.insee + jqxvqakq + 1.0 + CodeList + + + + + + + + + + + + + + radio-button + + fr.insee + jqxvqakq + 1.0 + CodeList + + + fr.insee + jrkctbou-RDOP-jvmg014v + 1.0 + + + fr.insee + jqxvqakq + 1.0 + CodeList + + + + + + + + + + + + + + radio-button + + fr.insee + jqxvqakq + 1.0 + CodeList + + + fr.insee + jrkctbou-RDOP-jvmg13p6 + 1.0 + + + fr.insee + jqxvqakq + 1.0 + CodeList + + + + + + + + + + + + + + radio-button + + fr.insee + jqxvqakq + 1.0 + CodeList + + + fr.insee + jrkctbou-RDOP-jvmfv25y + 1.0 + + + fr.insee + jqxvqakq + 1.0 + CodeList + + + + + + + + + + + + + + radio-button + + fr.insee + jqxvqakq + 1.0 + CodeList + + + fr.insee + jrkctbou-RDOP-jvmfs5xd + 1.0 + + + fr.insee + jqxvqakq + 1.0 + CodeList + + + + + + + + + + + + + + fr.insee + jrqf8o1k + 1.0 + + + + Si vous avez répondu "non" à toutes les + modalités de la question 1, veuillez passer au module IV. Sinon, veuillez + poursuivre. + $AD_PP$ = '0' and $AD_ASSO$ = '0' and + $AD_ENTPRIV$ = '0' and $AD_COLLPUB$ = '0' and $AD_AUTRES$ = + '0' + jmuk2e5k + + + + + + fr.insee + jrqf6kqk + 1.0 + + + + Si vous avez répondu "non" à la modalité + "autres" de la question 1, veuillez passer à la question 3. Sinon, + veuillez poursuivre. + $AD_AUTRES$ = '0' + jrkcrrfa + + + + + + + fr.insee + jrkcrrfa + 1.0 + + AD_PP_NB + + + fr.insee + jrkcrrfa-QOP-jvmg66ld + 1.0 + + AD_PP_NB + + + + fr.insee + jrkcrrfa-QOP-jvmg1yny + 1.0 + + AD_ASSO_NB + + + + fr.insee + jrkcrrfa-QOP-jvmg45de + 1.0 + + AD_ENTPRIV_NB + + + + fr.insee + jrkcrrfa-QOP-jvmfw0za + 1.0 + + AD_COLLPUB_NB + + + + fr.insee + jrkcrrfa-QOP-jvmg4fsj + 1.0 + + AD_AUTRES_NB + + + + + fr.insee + jrkcrrfa-RDOP-jvmg66ld + 1.0 + OutParameter + + + fr.insee + jrkcrrfa-QOP-jvmg66ld + 1.0 + OutParameter + + + + + fr.insee + jrkcrrfa-RDOP-jvmg1yny + 1.0 + OutParameter + + + fr.insee + jrkcrrfa-QOP-jvmg1yny + 1.0 + OutParameter + + + + + fr.insee + jrkcrrfa-RDOP-jvmg45de + 1.0 + OutParameter + + + fr.insee + jrkcrrfa-QOP-jvmg45de + 1.0 + OutParameter + + + + + fr.insee + jrkcrrfa-RDOP-jvmfw0za + 1.0 + OutParameter + + + fr.insee + jrkcrrfa-QOP-jvmfw0za + 1.0 + OutParameter + + + + + fr.insee + jrkcrrfa-RDOP-jvmg4fsj + 1.0 + OutParameter + + + fr.insee + jrkcrrfa-QOP-jvmg4fsj + 1.0 + OutParameter + + + + + Pour chaque catégorie pertinente, précisez le nombre + d'adhérents en 2018. + + + + + + fr.insee + jrkctpmr + 1.0 + CodeList + + + + + + + fr.insee + jrkcrrfa-secondDimension-fakeCL-1 + 1.0 + CodeList + + + + + + + + 0 + 999999 + + Decimal + + fr.insee + jrkcrrfa-RDOP-jvmg66ld + 1.0 + + + + + + + + + + + + + 0 + 999999 + + Decimal + + fr.insee + jrkcrrfa-RDOP-jvmg1yny + 1.0 + + + + + + + + + + + + + 0 + 999999 + + Decimal + + fr.insee + jrkcrrfa-RDOP-jvmg45de + 1.0 + + + + + + + + + + + + + 0 + 999999 + + Decimal + + fr.insee + jrkcrrfa-RDOP-jvmfw0za + 1.0 + + + + + + + + + + + + + 0 + 999999 + + Decimal + + fr.insee + jrkcrrfa-RDOP-jvmg4fsj + 1.0 + + + + + + + + + + + + + fr.insee + jrqgfzes + 1.0 + + DOMAINES_ACT + + + fr.insee + jrqgfzes-QOP-jvmg6vzp + 1.0 + + DOM_CULT_BIBLIO + + + + fr.insee + jrqgfzes-QOP-jvmfww0r + 1.0 + + DOM_CULT_MUSEES + + + + fr.insee + jrqgfzes-QOP-jvmfzk08 + 1.0 + + DOM_CULT_SITES + + + + fr.insee + jrqgfzes-QOP-jvmg7p6r + 1.0 + + DOM_CULT_MJC + + + + fr.insee + jrqgfzes-QOP-jvmg4u0d + 1.0 + + DOM_ART_SPECT_CREA + + + + fr.insee + jrqgfzes-QOP-jvmg4n0f + 1.0 + + DOM_ART_SPECT_SOUTIEN + + + + fr.insee + jrqgfzes-QOP-jvmfr831 + 1.0 + + DOM_ART_CREA + + + + fr.insee + jrqgfzes-QOP-jvmg069o + 1.0 + + DOM_ART_SPECT_SALLES + + + + fr.insee + jrqgfzes-QOP-jvmfxjux + 1.0 + + DOM_LOISIRS_RECREA + + + + fr.insee + jrqgfzes-QOP-jvmfsuoa + 1.0 + + DOM_LOISIRS_COLO + + + + fr.insee + jrqgfzes-QOP-jvmfzhe4 + 1.0 + + DOM_LOISIRS_AMICALES + + + + fr.insee + jrqgfzes-QOP-jvmfqrd7 + 1.0 + + DOM_HEB_MED_PERS_AGEES + + + + fr.insee + jrqgfzes-QOP-jvmg9tsh + 1.0 + + DOM_HEB_MED_ENF_HAND + + + + fr.insee + jrqgfzes-QOP-jvmfwaj2 + 1.0 + + DOM_HEB_MED_ADT_HAND + + + + fr.insee + jrqgfzes-QOP-jvmfssh5 + 1.0 + + DOM_HEB_SOC_HAND_MENT + + + + fr.insee + jrqgfzes-QOP-jvmg344o + 1.0 + + DOM_HEB_SOC_PERS_AGEES + + + + fr.insee + jrqgfzes-QOP-jvmfzafc + 1.0 + + DOM_HEB_SOC_HAND_PHYS + + + + fr.insee + jrqgfzes-QOP-jvmfxhkl + 1.0 + + DOM_HEB_SOC_ENF_DIFF + + + + fr.insee + jrqgfzes-QOP-jvmg5bnp + 1.0 + + DOM_HEB_SOC_FOYERS + + + + fr.insee + jrqgfzes-QOP-jvmfvrz3 + 1.0 + + DOM_HEB_SOC_AUTRES + + + + fr.insee + jrqgfzes-QOP-jvmg919i + 1.0 + + DOM_SANTE_HOP + + + + fr.insee + jrqgfzes-QOP-jvmg6xt4 + 1.0 + + DOM_SANTE_MED + + + + fr.insee + jrqgfzes-QOP-jvmfszn1 + 1.0 + + DOM_SANTE_INF + + + + fr.insee + jrqgfzes-QOP-jvmg7met + 1.0 + + DOM_SANTE_REEDUC + + + + fr.insee + jrqgfzes-QOP-jvmg46hp + 1.0 + + DOM_SANTE_RECHERCHE + + + + fr.insee + jrqgfzes-QOP-jvmg4134 + 1.0 + + DOM_SANTE_AUTRES + + + + fr.insee + jrqgfzes-QOP-jvmg9duu + 1.0 + + DOM_SPORT_CLUB + + + + fr.insee + jrqgfzes-QOP-jvmfw0vd + 1.0 + + DOM_SPORT_INSTALL + + + + fr.insee + jrqgfzes-QOP-jvmgakeq + 1.0 + + DOM_SPORT_CHASSE + + + + fr.insee + jrqgfzes-QOP-jvmg66hq + 1.0 + + DOM_SPORT_AUTRES + + + + fr.insee + jrqgfzes-QOP-jvmfxkuk + 1.0 + + DOM_CAUSES_POL + + + + fr.insee + jrqgfzes-QOP-jvmg6tmh + 1.0 + + DOM_CAUSES_CULT + + + + fr.insee + jrqgfzes-QOP-jvmgaml0 + 1.0 + + DOM_CAUSES_PATR + + + + fr.insee + jrqgfzes-QOP-jvmg5tmv + 1.0 + + DOM_CAUSES_PRO + + + + fr.insee + jrqgfzes-QOP-jvmg773d + 1.0 + + DOM_CAUSES_SYND + + + + fr.insee + jrqgfzes-QOP-jvmg00ii + 1.0 + + DOM_CAUSES_ELEV_PAR + + + + fr.insee + jrqgfzes-QOP-jvmfss1s + 1.0 + + DOM_CAUSES_ANC_COMB + + + + fr.insee + jrqgfzes-QOP-jvmfskw0 + 1.0 + + DOM_CAUSES_ENVIR + + + + fr.insee + jrqgfzes-QOP-jvmfx82r + 1.0 + + DOM_CAUSES_CONSO + + + + fr.insee + jrqgfzes-QOP-jvmg6el3 + 1.0 + + DOM_CAUSES_LOGEMENT + + + + fr.insee + jrqgfzes-QOP-jvmfw799 + 1.0 + + DOM_CAUSES_HUMA + + + + fr.insee + jrqgfzes-QOP-jvmfrtye + 1.0 + + DOM_CAUSES_AUTRES + + + + fr.insee + jrqgfzes-QOP-jvmg4qc4 + 1.0 + + DOM_ECO_DEV_LOCAL + + + + fr.insee + jrqgfzes-QOP-jvmg7k40 + 1.0 + + DOM_ECO_TOURISME + + + + fr.insee + jrqgfzes-QOP-jvmg01oo + 1.0 + + DOM_ECO_GRPT_EMPL + + + + fr.insee + jrqgfzes-QOP-jvmfzpak + 1.0 + + DOM_ECO_SUPPORT + + + + fr.insee + jrqgfzes-QOP-jvmfxe39 + 1.0 + + DOM_ECO_AMAP + + + + fr.insee + jrqgfzes-QOP-jvmfy288 + 1.0 + + DOM_ECO_SECURITE + + + + fr.insee + jrqgfzes-QOP-jvmfqafi + 1.0 + + DOM_SOCIAL_EMPLOI + + + + fr.insee + jrqgfzes-QOP-jvmfznan + 1.0 + + DOM_SOCIAL_AGE_HAND + + + + fr.insee + jrqgfzes-QOP-jvmg576c + 1.0 + + DOM_SOCIAL_CAT + + + + fr.insee + jrqgfzes-QOP-jvmfvtok + 1.0 + + DOM_SOCIAL_JEUNES_ENF + + + + fr.insee + jrqgfzes-QOP-jvmftncs + 1.0 + + DOM_SOCIAL_ENF_HAND + + + + fr.insee + jrqgfzes-QOP-jvmg8t2g + 1.0 + + DOM_SOCIAL_ENF_ADO + + + + fr.insee + jrqgfzes-QOP-jvmg7sc9 + 1.0 + + DOM_SOCIAL_LOGEMENT + + + + fr.insee + jrqgfzes-QOP-jvmg65qu + 1.0 + + DOM_SOCIAL_AIDE_DOM + + + + fr.insee + jrqgfzes-QOP-jvmg54co + 1.0 + + DOM_SOCIAL_AIDE_MIG + + + + fr.insee + jrqgfzes-QOP-jvmg13f1 + 1.0 + + DOM_SOCIAL_CARITATIF + + + + fr.insee + jrqgfzes-QOP-jvmg07e4 + 1.0 + + DOM_ENSEIG_PRIM + + + + fr.insee + jrqgfzes-QOP-jvmfz28f + 1.0 + + DOM_ENSEIG_SECOND + + + + fr.insee + jrqgfzes-QOP-jvmg4k2q + 1.0 + + DOM_ENSEIG_SUP + + + + fr.insee + jrqgfzes-QOP-jvmg7nny + 1.0 + + DOM_ENSEIG_CULT + + + + fr.insee + jrqgfzes-QOP-jvmg2a3y + 1.0 + + DOM_ENSEIG_FORM_CONT + + + + fr.insee + jrqgfzes-QOP-jvmfv5ob + 1.0 + + DOM_ENSEIG_AUTRES + + + + fr.insee + jrqgfzes-QOP-jvmfw0ep + 1.0 + + DOM_ENSEIG_RECH + + + + + fr.insee + jrqgfzes-RDOP-jvmg6vzp + 1.0 + OutParameter + + + fr.insee + jrqgfzes-QOP-jvmg6vzp + 1.0 + OutParameter + + + + + fr.insee + jrqgfzes-RDOP-jvmfww0r + 1.0 + OutParameter + + + fr.insee + jrqgfzes-QOP-jvmfww0r + 1.0 + OutParameter + + + + + fr.insee + jrqgfzes-RDOP-jvmfzk08 + 1.0 + OutParameter + + + fr.insee + jrqgfzes-QOP-jvmfzk08 + 1.0 + OutParameter + + + + + fr.insee + jrqgfzes-RDOP-jvmg7p6r + 1.0 + OutParameter + + + fr.insee + jrqgfzes-QOP-jvmg7p6r + 1.0 + OutParameter + + + + + fr.insee + jrqgfzes-RDOP-jvmg4u0d + 1.0 + OutParameter + + + fr.insee + jrqgfzes-QOP-jvmg4u0d + 1.0 + OutParameter + + + + + fr.insee + jrqgfzes-RDOP-jvmg4n0f + 1.0 + OutParameter + + + fr.insee + jrqgfzes-QOP-jvmg4n0f + 1.0 + OutParameter + + + + + fr.insee + jrqgfzes-RDOP-jvmfr831 + 1.0 + OutParameter + + + fr.insee + jrqgfzes-QOP-jvmfr831 + 1.0 + OutParameter + + + + + fr.insee + jrqgfzes-RDOP-jvmg069o + 1.0 + OutParameter + + + fr.insee + jrqgfzes-QOP-jvmg069o + 1.0 + OutParameter + + + + + fr.insee + jrqgfzes-RDOP-jvmfxjux + 1.0 + OutParameter + + + fr.insee + jrqgfzes-QOP-jvmfxjux + 1.0 + OutParameter + + + + + fr.insee + jrqgfzes-RDOP-jvmfsuoa + 1.0 + OutParameter + + + fr.insee + jrqgfzes-QOP-jvmfsuoa + 1.0 + OutParameter + + + + + fr.insee + jrqgfzes-RDOP-jvmfzhe4 + 1.0 + OutParameter + + + fr.insee + jrqgfzes-QOP-jvmfzhe4 + 1.0 + OutParameter + + + + + fr.insee + jrqgfzes-RDOP-jvmfqrd7 + 1.0 + OutParameter + + + fr.insee + jrqgfzes-QOP-jvmfqrd7 + 1.0 + OutParameter + + + + + fr.insee + jrqgfzes-RDOP-jvmg9tsh + 1.0 + OutParameter + + + fr.insee + jrqgfzes-QOP-jvmg9tsh + 1.0 + OutParameter + + + + + fr.insee + jrqgfzes-RDOP-jvmfwaj2 + 1.0 + OutParameter + + + fr.insee + jrqgfzes-QOP-jvmfwaj2 + 1.0 + OutParameter + + + + + fr.insee + jrqgfzes-RDOP-jvmfssh5 + 1.0 + OutParameter + + + fr.insee + jrqgfzes-QOP-jvmfssh5 + 1.0 + OutParameter + + + + + fr.insee + jrqgfzes-RDOP-jvmg344o + 1.0 + OutParameter + + + fr.insee + jrqgfzes-QOP-jvmg344o + 1.0 + OutParameter + + + + + fr.insee + jrqgfzes-RDOP-jvmfzafc + 1.0 + OutParameter + + + fr.insee + jrqgfzes-QOP-jvmfzafc + 1.0 + OutParameter + + + + + fr.insee + jrqgfzes-RDOP-jvmfxhkl + 1.0 + OutParameter + + + fr.insee + jrqgfzes-QOP-jvmfxhkl + 1.0 + OutParameter + + + + + fr.insee + jrqgfzes-RDOP-jvmg5bnp + 1.0 + OutParameter + + + fr.insee + jrqgfzes-QOP-jvmg5bnp + 1.0 + OutParameter + + + + + fr.insee + jrqgfzes-RDOP-jvmfvrz3 + 1.0 + OutParameter + + + fr.insee + jrqgfzes-QOP-jvmfvrz3 + 1.0 + OutParameter + + + + + fr.insee + jrqgfzes-RDOP-jvmg919i + 1.0 + OutParameter + + + fr.insee + jrqgfzes-QOP-jvmg919i + 1.0 + OutParameter + + + + + fr.insee + jrqgfzes-RDOP-jvmg6xt4 + 1.0 + OutParameter + + + fr.insee + jrqgfzes-QOP-jvmg6xt4 + 1.0 + OutParameter + + + + + fr.insee + jrqgfzes-RDOP-jvmfszn1 + 1.0 + OutParameter + + + fr.insee + jrqgfzes-QOP-jvmfszn1 + 1.0 + OutParameter + + + + + fr.insee + jrqgfzes-RDOP-jvmg7met + 1.0 + OutParameter + + + fr.insee + jrqgfzes-QOP-jvmg7met + 1.0 + OutParameter + + + + + fr.insee + jrqgfzes-RDOP-jvmg46hp + 1.0 + OutParameter + + + fr.insee + jrqgfzes-QOP-jvmg46hp + 1.0 + OutParameter + + + + + fr.insee + jrqgfzes-RDOP-jvmg4134 + 1.0 + OutParameter + + + fr.insee + jrqgfzes-QOP-jvmg4134 + 1.0 + OutParameter + + + + + fr.insee + jrqgfzes-RDOP-jvmg9duu + 1.0 + OutParameter + + + fr.insee + jrqgfzes-QOP-jvmg9duu + 1.0 + OutParameter + + + + + fr.insee + jrqgfzes-RDOP-jvmfw0vd + 1.0 + OutParameter + + + fr.insee + jrqgfzes-QOP-jvmfw0vd + 1.0 + OutParameter + + + + + fr.insee + jrqgfzes-RDOP-jvmgakeq + 1.0 + OutParameter + + + fr.insee + jrqgfzes-QOP-jvmgakeq + 1.0 + OutParameter + + + + + fr.insee + jrqgfzes-RDOP-jvmg66hq + 1.0 + OutParameter + + + fr.insee + jrqgfzes-QOP-jvmg66hq + 1.0 + OutParameter + + + + + fr.insee + jrqgfzes-RDOP-jvmfxkuk + 1.0 + OutParameter + + + fr.insee + jrqgfzes-QOP-jvmfxkuk + 1.0 + OutParameter + + + + + fr.insee + jrqgfzes-RDOP-jvmg6tmh + 1.0 + OutParameter + + + fr.insee + jrqgfzes-QOP-jvmg6tmh + 1.0 + OutParameter + + + + + fr.insee + jrqgfzes-RDOP-jvmgaml0 + 1.0 + OutParameter + + + fr.insee + jrqgfzes-QOP-jvmgaml0 + 1.0 + OutParameter + + + + + fr.insee + jrqgfzes-RDOP-jvmg5tmv + 1.0 + OutParameter + + + fr.insee + jrqgfzes-QOP-jvmg5tmv + 1.0 + OutParameter + + + + + fr.insee + jrqgfzes-RDOP-jvmg773d + 1.0 + OutParameter + + + fr.insee + jrqgfzes-QOP-jvmg773d + 1.0 + OutParameter + + + + + fr.insee + jrqgfzes-RDOP-jvmg00ii + 1.0 + OutParameter + + + fr.insee + jrqgfzes-QOP-jvmg00ii + 1.0 + OutParameter + + + + + fr.insee + jrqgfzes-RDOP-jvmfss1s + 1.0 + OutParameter + + + fr.insee + jrqgfzes-QOP-jvmfss1s + 1.0 + OutParameter + + + + + fr.insee + jrqgfzes-RDOP-jvmfskw0 + 1.0 + OutParameter + + + fr.insee + jrqgfzes-QOP-jvmfskw0 + 1.0 + OutParameter + + + + + fr.insee + jrqgfzes-RDOP-jvmfx82r + 1.0 + OutParameter + + + fr.insee + jrqgfzes-QOP-jvmfx82r + 1.0 + OutParameter + + + + + fr.insee + jrqgfzes-RDOP-jvmg6el3 + 1.0 + OutParameter + + + fr.insee + jrqgfzes-QOP-jvmg6el3 + 1.0 + OutParameter + + + + + fr.insee + jrqgfzes-RDOP-jvmfw799 + 1.0 + OutParameter + + + fr.insee + jrqgfzes-QOP-jvmfw799 + 1.0 + OutParameter + + + + + fr.insee + jrqgfzes-RDOP-jvmfrtye + 1.0 + OutParameter + + + fr.insee + jrqgfzes-QOP-jvmfrtye + 1.0 + OutParameter + + + + + fr.insee + jrqgfzes-RDOP-jvmg4qc4 + 1.0 + OutParameter + + + fr.insee + jrqgfzes-QOP-jvmg4qc4 + 1.0 + OutParameter + + + + + fr.insee + jrqgfzes-RDOP-jvmg7k40 + 1.0 + OutParameter + + + fr.insee + jrqgfzes-QOP-jvmg7k40 + 1.0 + OutParameter + + + + + fr.insee + jrqgfzes-RDOP-jvmg01oo + 1.0 + OutParameter + + + fr.insee + jrqgfzes-QOP-jvmg01oo + 1.0 + OutParameter + + + + + fr.insee + jrqgfzes-RDOP-jvmfzpak + 1.0 + OutParameter + + + fr.insee + jrqgfzes-QOP-jvmfzpak + 1.0 + OutParameter + + + + + fr.insee + jrqgfzes-RDOP-jvmfxe39 + 1.0 + OutParameter + + + fr.insee + jrqgfzes-QOP-jvmfxe39 + 1.0 + OutParameter + + + + + fr.insee + jrqgfzes-RDOP-jvmfy288 + 1.0 + OutParameter + + + fr.insee + jrqgfzes-QOP-jvmfy288 + 1.0 + OutParameter + + + + + fr.insee + jrqgfzes-RDOP-jvmfqafi + 1.0 + OutParameter + + + fr.insee + jrqgfzes-QOP-jvmfqafi + 1.0 + OutParameter + + + + + fr.insee + jrqgfzes-RDOP-jvmfznan + 1.0 + OutParameter + + + fr.insee + jrqgfzes-QOP-jvmfznan + 1.0 + OutParameter + + + + + fr.insee + jrqgfzes-RDOP-jvmg576c + 1.0 + OutParameter + + + fr.insee + jrqgfzes-QOP-jvmg576c + 1.0 + OutParameter + + + + + fr.insee + jrqgfzes-RDOP-jvmfvtok + 1.0 + OutParameter + + + fr.insee + jrqgfzes-QOP-jvmfvtok + 1.0 + OutParameter + + + + + fr.insee + jrqgfzes-RDOP-jvmftncs + 1.0 + OutParameter + + + fr.insee + jrqgfzes-QOP-jvmftncs + 1.0 + OutParameter + + + + + fr.insee + jrqgfzes-RDOP-jvmg8t2g + 1.0 + OutParameter + + + fr.insee + jrqgfzes-QOP-jvmg8t2g + 1.0 + OutParameter + + + + + fr.insee + jrqgfzes-RDOP-jvmg7sc9 + 1.0 + OutParameter + + + fr.insee + jrqgfzes-QOP-jvmg7sc9 + 1.0 + OutParameter + + + + + fr.insee + jrqgfzes-RDOP-jvmg65qu + 1.0 + OutParameter + + + fr.insee + jrqgfzes-QOP-jvmg65qu + 1.0 + OutParameter + + + + + fr.insee + jrqgfzes-RDOP-jvmg54co + 1.0 + OutParameter + + + fr.insee + jrqgfzes-QOP-jvmg54co + 1.0 + OutParameter + + + + + fr.insee + jrqgfzes-RDOP-jvmg13f1 + 1.0 + OutParameter + + + fr.insee + jrqgfzes-QOP-jvmg13f1 + 1.0 + OutParameter + + + + + fr.insee + jrqgfzes-RDOP-jvmg07e4 + 1.0 + OutParameter + + + fr.insee + jrqgfzes-QOP-jvmg07e4 + 1.0 + OutParameter + + + + + fr.insee + jrqgfzes-RDOP-jvmfz28f + 1.0 + OutParameter + + + fr.insee + jrqgfzes-QOP-jvmfz28f + 1.0 + OutParameter + + + + + fr.insee + jrqgfzes-RDOP-jvmg4k2q + 1.0 + OutParameter + + + fr.insee + jrqgfzes-QOP-jvmg4k2q + 1.0 + OutParameter + + + + + fr.insee + jrqgfzes-RDOP-jvmg7nny + 1.0 + OutParameter + + + fr.insee + jrqgfzes-QOP-jvmg7nny + 1.0 + OutParameter + + + + + fr.insee + jrqgfzes-RDOP-jvmg2a3y + 1.0 + OutParameter + + + fr.insee + jrqgfzes-QOP-jvmg2a3y + 1.0 + OutParameter + + + + + fr.insee + jrqgfzes-RDOP-jvmfv5ob + 1.0 + OutParameter + + + fr.insee + jrqgfzes-QOP-jvmfv5ob + 1.0 + OutParameter + + + + + fr.insee + jrqgfzes-RDOP-jvmfw0ep + 1.0 + OutParameter + + + fr.insee + jrqgfzes-QOP-jvmfw0ep + 1.0 + OutParameter + + + + + Indiquez dans le tableau suivant l'activité qui + représentait le mieux votre association en 2018 : + + + + + + fr.insee + jrqgl3lm + 1.0 + CodeList + + + + + + + fr.insee + jrqgfzes-secondDimension-fakeCL-1 + 1.0 + CodeList + + + + + + + + + + + + + + 1 + 3 + + Decimal + + fr.insee + jrqgfzes-RDOP-jvmg6vzp + 1.0 + + + + + + + + + + + + + 1 + 3 + + Decimal + + fr.insee + jrqgfzes-RDOP-jvmfww0r + 1.0 + + + + + + + + + + + + + 1 + 3 + + Decimal + + fr.insee + jrqgfzes-RDOP-jvmfzk08 + 1.0 + + + + + + + + + + + + + 1 + 3 + + Decimal + + fr.insee + jrqgfzes-RDOP-jvmg7p6r + 1.0 + + + + + + + + + + + + + + + + + + + 1 + 3 + + Decimal + + fr.insee + jrqgfzes-RDOP-jvmg4u0d + 1.0 + + + + + + + + + + + + + 1 + 3 + + Decimal + + fr.insee + jrqgfzes-RDOP-jvmg4n0f + 1.0 + + + + + + + + + + + + + 1 + 3 + + Decimal + + fr.insee + jrqgfzes-RDOP-jvmfr831 + 1.0 + + + + + + + + + + + + + 1 + 3 + + Decimal + + fr.insee + jrqgfzes-RDOP-jvmg069o + 1.0 + + + + + + + + + + + + + + + + + + + 1 + 3 + + Decimal + + fr.insee + jrqgfzes-RDOP-jvmfxjux + 1.0 + + + + + + + + + + + + + 1 + 3 + + Decimal + + fr.insee + jrqgfzes-RDOP-jvmfsuoa + 1.0 + + + + + + + + + + + + + 1 + 3 + + Decimal + + fr.insee + jrqgfzes-RDOP-jvmfzhe4 + 1.0 + + + + + + + + + + + + + + + + + + + 1 + 3 + + Decimal + + fr.insee + jrqgfzes-RDOP-jvmfqrd7 + 1.0 + + + + + + + + + + + + + 1 + 3 + + Decimal + + fr.insee + jrqgfzes-RDOP-jvmg9tsh + 1.0 + + + + + + + + + + + + + 1 + 3 + + Decimal + + fr.insee + jrqgfzes-RDOP-jvmfwaj2 + 1.0 + + + + + + + + + + + + + 1 + 3 + + Decimal + + fr.insee + jrqgfzes-RDOP-jvmfssh5 + 1.0 + + + + + + + + + + + + + 1 + 3 + + Decimal + + fr.insee + jrqgfzes-RDOP-jvmg344o + 1.0 + + + + + + + + + + + + + 1 + 3 + + Decimal + + fr.insee + jrqgfzes-RDOP-jvmfzafc + 1.0 + + + + + + + + + + + + + 1 + 3 + + Decimal + + fr.insee + jrqgfzes-RDOP-jvmfxhkl + 1.0 + + + + + + + + + + + + + 1 + 3 + + Decimal + + fr.insee + jrqgfzes-RDOP-jvmg5bnp + 1.0 + + + + + + + + + + + + + 1 + 3 + + Decimal + + fr.insee + jrqgfzes-RDOP-jvmfvrz3 + 1.0 + + + + + + + + + + + + + + + + + + + 1 + 3 + + Decimal + + fr.insee + jrqgfzes-RDOP-jvmg919i + 1.0 + + + + + + + + + + + + + 1 + 3 + + Decimal + + fr.insee + jrqgfzes-RDOP-jvmg6xt4 + 1.0 + + + + + + + + + + + + + 1 + 3 + + Decimal + + fr.insee + jrqgfzes-RDOP-jvmfszn1 + 1.0 + + + + + + + + + + + + + 1 + 3 + + Decimal + + fr.insee + jrqgfzes-RDOP-jvmg7met + 1.0 + + + + + + + + + + + + + 1 + 3 + + Decimal + + fr.insee + jrqgfzes-RDOP-jvmg46hp + 1.0 + + + + + + + + + + + + + 1 + 3 + + Decimal + + fr.insee + jrqgfzes-RDOP-jvmg4134 + 1.0 + + + + + + + + + + + + + + + + + + + 1 + 3 + + Decimal + + fr.insee + jrqgfzes-RDOP-jvmg9duu + 1.0 + + + + + + + + + + + + + 1 + 3 + + Decimal + + fr.insee + jrqgfzes-RDOP-jvmfw0vd + 1.0 + + + + + + + + + + + + + 1 + 3 + + Decimal + + fr.insee + jrqgfzes-RDOP-jvmgakeq + 1.0 + + + + + + + + + + + + + 1 + 3 + + Decimal + + fr.insee + jrqgfzes-RDOP-jvmg66hq + 1.0 + + + + + + + + + + + + + + + + + + + 1 + 3 + + Decimal + + fr.insee + jrqgfzes-RDOP-jvmfxkuk + 1.0 + + + + + + + + + + + + + 1 + 3 + + Decimal + + fr.insee + jrqgfzes-RDOP-jvmg6tmh + 1.0 + + + + + + + + + + + + + 1 + 3 + + Decimal + + fr.insee + jrqgfzes-RDOP-jvmgaml0 + 1.0 + + + + + + + + + + + + + 1 + 3 + + Decimal + + fr.insee + jrqgfzes-RDOP-jvmg5tmv + 1.0 + + + + + + + + + + + + + 1 + 3 + + Decimal + + fr.insee + jrqgfzes-RDOP-jvmg773d + 1.0 + + + + + + + + + + + + + 1 + 3 + + Decimal + + fr.insee + jrqgfzes-RDOP-jvmg00ii + 1.0 + + + + + + + + + + + + + 1 + 3 + + Decimal + + fr.insee + jrqgfzes-RDOP-jvmfss1s + 1.0 + + + + + + + + + + + + + 1 + 3 + + Decimal + + fr.insee + jrqgfzes-RDOP-jvmfskw0 + 1.0 + + + + + + + + + + + + + 1 + 3 + + Decimal + + fr.insee + jrqgfzes-RDOP-jvmfx82r + 1.0 + + + + + + + + + + + + + 1 + 3 + + Decimal + + fr.insee + jrqgfzes-RDOP-jvmg6el3 + 1.0 + + + + + + + + + + + + + 1 + 3 + + Decimal + + fr.insee + jrqgfzes-RDOP-jvmfw799 + 1.0 + + + + + + + + + + + + + 1 + 3 + + Decimal + + fr.insee + jrqgfzes-RDOP-jvmfrtye + 1.0 + + + + + + + + + + + + + + + + + + + 1 + 3 + + Decimal + + fr.insee + jrqgfzes-RDOP-jvmg4qc4 + 1.0 + + + + + + + + + + + + + 1 + 3 + + Decimal + + fr.insee + jrqgfzes-RDOP-jvmg7k40 + 1.0 + + + + + + + + + + + + + 1 + 3 + + Decimal + + fr.insee + jrqgfzes-RDOP-jvmg01oo + 1.0 + + + + + + + + + + + + + 1 + 3 + + Decimal + + fr.insee + jrqgfzes-RDOP-jvmfzpak + 1.0 + + + + + + + + + + + + + 1 + 3 + + Decimal + + fr.insee + jrqgfzes-RDOP-jvmfxe39 + 1.0 + + + + + + + + + + + + + 1 + 3 + + Decimal + + fr.insee + jrqgfzes-RDOP-jvmfy288 + 1.0 + + + + + + + + + + + + + + + + + + + 1 + 3 + + Decimal + + fr.insee + jrqgfzes-RDOP-jvmfqafi + 1.0 + + + + + + + + + + + + + 1 + 3 + + Decimal + + fr.insee + jrqgfzes-RDOP-jvmfznan + 1.0 + + + + + + + + + + + + + 1 + 3 + + Decimal + + fr.insee + jrqgfzes-RDOP-jvmg576c + 1.0 + + + + + + + + + + + + + 1 + 3 + + Decimal + + fr.insee + jrqgfzes-RDOP-jvmfvtok + 1.0 + + + + + + + + + + + + + 1 + 3 + + Decimal + + fr.insee + jrqgfzes-RDOP-jvmftncs + 1.0 + + + + + + + + + + + + + 1 + 3 + + Decimal + + fr.insee + jrqgfzes-RDOP-jvmg8t2g + 1.0 + + + + + + + + + + + + + 1 + 3 + + Decimal + + fr.insee + jrqgfzes-RDOP-jvmg7sc9 + 1.0 + + + + + + + + + + + + + 1 + 3 + + Decimal + + fr.insee + jrqgfzes-RDOP-jvmg65qu + 1.0 + + + + + + + + + + + + + 1 + 3 + + Decimal + + fr.insee + jrqgfzes-RDOP-jvmg54co + 1.0 + + + + + + + + + + + + + 1 + 3 + + Decimal + + fr.insee + jrqgfzes-RDOP-jvmg13f1 + 1.0 + + + + + + + + + + + + + + + + + + + 1 + 3 + + Decimal + + fr.insee + jrqgfzes-RDOP-jvmg07e4 + 1.0 + + + + + + + + + + + + + 1 + 3 + + Decimal + + fr.insee + jrqgfzes-RDOP-jvmfz28f + 1.0 + + + + + + + + + + + + + 1 + 3 + + Decimal + + fr.insee + jrqgfzes-RDOP-jvmg4k2q + 1.0 + + + + + + + + + + + + + 1 + 3 + + Decimal + + fr.insee + jrqgfzes-RDOP-jvmg7nny + 1.0 + + + + + + + + + + + + + 1 + 3 + + Decimal + + fr.insee + jrqgfzes-RDOP-jvmg2a3y + 1.0 + + + + + + + + + + + + + 1 + 3 + + Decimal + + fr.insee + jrqgfzes-RDOP-jvmfv5ob + 1.0 + + + + + + + + + + + + + 1 + 3 + + Decimal + + fr.insee + jrqgfzes-RDOP-jvmfw0ep + 1.0 + + + + + + + + + + + + fr.insee + jrqi3jr7 + 1.0 + Instruction + + + + fr.insee + js0di1io + 1.0 + + CA_CDI_CDD + + + fr.insee + js0di1io-QOP-jvmfvkhi + 1.0 + + SAL_CA + + + + fr.insee + js0di1io-QOP-jvmfwwbw + 1.0 + + SAL_CDI + + + + fr.insee + js0di1io-QOP-jvmfwqal + 1.0 + + SAL_CDD + + + + + fr.insee + js0di1io-RDOP-jvmfvkhi + 1.0 + OutParameter + + + fr.insee + js0di1io-QOP-jvmfvkhi + 1.0 + OutParameter + + + + + fr.insee + js0di1io-RDOP-jvmfwwbw + 1.0 + OutParameter + + + fr.insee + js0di1io-QOP-jvmfwwbw + 1.0 + OutParameter + + + + + fr.insee + js0di1io-RDOP-jvmfwqal + 1.0 + OutParameter + + + fr.insee + js0di1io-QOP-jvmfwqal + 1.0 + OutParameter + + + + + Parmi ces salariés, votre association a-t-elle employé au + cours de l’année 2018 les catégories suivantes : + + + + + + fr.insee + js0d86zt + 1.0 + CodeList + + + + + + + radio-button + + fr.insee + jqxvqakq + 1.0 + CodeList + + + fr.insee + js0di1io-RDOP-jvmfvkhi + 1.0 + + + fr.insee + jqxvqakq + 1.0 + CodeList + + + + + + + + + + + + + + radio-button + + fr.insee + jqxvqakq + 1.0 + CodeList + + + fr.insee + js0di1io-RDOP-jvmfwwbw + 1.0 + + + fr.insee + jqxvqakq + 1.0 + CodeList + + + + + + + + + + + + + + radio-button + + fr.insee + jqxvqakq + 1.0 + CodeList + + + fr.insee + js0di1io-RDOP-jvmfwqal + 1.0 + + + fr.insee + jqxvqakq + 1.0 + CodeList + + + + + + + + + + + + + + fr.insee + jski8d2y + 1.0 + + + + Si vous avez répondu "Non" à toutes les + modalités de la question 3, veuillez passer à la question 5. Sinon, + veuillez poursuivre. + $SAL_CA$ = '0' and $SAL_CDI$ = '0' and + $SAL_CDD$ = '0' + jseoi4yc + + + + + + + fr.insee + js0dpd65 + 1.0 + + SAL_CONTRAT + + + fr.insee + js0dpd65-QOP-jvmfqbn0 + 1.0 + + SAL_CA_NB_H + + + + fr.insee + js0dpd65-QOP-jvmg2oc6 + 1.0 + + SAL_CDI_NB_H + + + + fr.insee + js0dpd65-QOP-jvmg7ajq + 1.0 + + SAL_CDD_NB_H + + + + + fr.insee + js0dpd65-RDOP-jvmfqbn0 + 1.0 + OutParameter + + + fr.insee + js0dpd65-QOP-jvmfqbn0 + 1.0 + OutParameter + + + + + fr.insee + js0dpd65-RDOP-jvmg2oc6 + 1.0 + OutParameter + + + fr.insee + js0dpd65-QOP-jvmg2oc6 + 1.0 + OutParameter + + + + + fr.insee + js0dpd65-RDOP-jvmg7ajq + 1.0 + OutParameter + + + fr.insee + js0dpd65-QOP-jvmg7ajq + 1.0 + OutParameter + + + + + Pour chaque catégorie pertinente, quel est le nombre + d’heures de travail rémunérées en 2018 ? + + + + + + fr.insee + js0d86zt + 1.0 + CodeList + + + + + + + fr.insee + js0dpd65-secondDimension-fakeCL-1 + 1.0 + CodeList + + + + + + + + 0 + 999999999 + + Decimal + + fr.insee + js0dpd65-RDOP-jvmfqbn0 + 1.0 + + + + + + + + + + + + + 0 + 999999999 + + Decimal + + fr.insee + js0dpd65-RDOP-jvmg2oc6 + 1.0 + + + + + + + + + + + + + 0 + 999999999 + + Decimal + + fr.insee + js0dpd65-RDOP-jvmg7ajq + 1.0 + + + + + + + + + + + + + fr.insee + jseoe6ty + 1.0 + + SAL_TPS + + + fr.insee + jseoe6ty-QOP-jvmg69sa + 1.0 + + SAL_TPS_PLEIN + + + + fr.insee + jseoe6ty-QOP-jvmg5jhi + 1.0 + + SAL_TPS_PARTIEL + + + + fr.insee + jseoe6ty-QOP-jvmfqq19 + 1.0 + + SAL_TPS_PARTIEL_RED + + + + + fr.insee + jseoe6ty-RDOP-jvmg69sa + 1.0 + OutParameter + + + fr.insee + jseoe6ty-QOP-jvmg69sa + 1.0 + OutParameter + + + + + fr.insee + jseoe6ty-RDOP-jvmg5jhi + 1.0 + OutParameter + + + fr.insee + jseoe6ty-QOP-jvmg5jhi + 1.0 + OutParameter + + + + + fr.insee + jseoe6ty-RDOP-jvmfqq19 + 1.0 + OutParameter + + + fr.insee + jseoe6ty-QOP-jvmfqq19 + 1.0 + OutParameter + + + + + Comment se répartissaient ces salariés de votre + association au 31/12/2018 selon leur temps de travail ? + + + + + + fr.insee + jseocrba + 1.0 + CodeList + + + + + + + fr.insee + jseoe6ty-secondDimension-fakeCL-1 + 1.0 + CodeList + + + + + + + + 0 + 9999999 + + Decimal + + fr.insee + jseoe6ty-RDOP-jvmg69sa + 1.0 + + + + + + + + + + + + + 0 + 9999999 + + Decimal + + fr.insee + jseoe6ty-RDOP-jvmg5jhi + 1.0 + + + + + + + + + + + + + 0 + 9999999 + + Decimal + + fr.insee + jseoe6ty-RDOP-jvmfqq19 + 1.0 + + + + + + + + + + + + + fr.insee + js0dvdaw + 1.0 + + AUT_PERS + + + fr.insee + js0dvdaw-QOP-jvmg80aa + 1.0 + + AUT_PERS_INTERIM + + + + fr.insee + js0dvdaw-QOP-jvmg0q44 + 1.0 + + AUT_PERS_MAD + + + + fr.insee + js0dvdaw-QOP-jvmfv87q + 1.0 + + AUT_PERS_VOL + + + + fr.insee + js0dvdaw-QOP-jvmfxlqr + 1.0 + + AUT_PERS_AUTRES + + + + fr.insee + js0dvdaw-QOP-jprecisez + 1.0 + + AUT_PERS_AUTRES_P + + + + + fr.insee + js0dvdaw-RDOP-jvmg80aa + 1.0 + OutParameter + + + fr.insee + js0dvdaw-QOP-jvmg80aa + 1.0 + OutParameter + + + + + fr.insee + js0dvdaw-RDOP-jvmg0q44 + 1.0 + OutParameter + + + fr.insee + js0dvdaw-QOP-jvmg0q44 + 1.0 + OutParameter + + + + + fr.insee + js0dvdaw-RDOP-jvmfv87q + 1.0 + OutParameter + + + fr.insee + js0dvdaw-QOP-jvmfv87q + 1.0 + OutParameter + + + + + fr.insee + js0dvdaw-RDOP-jvmfxlqr + 1.0 + OutParameter + + + fr.insee + js0dvdaw-QOP-jvmfxlqr + 1.0 + OutParameter + + + + + fr.insee + js0dvdaw-RDOP-jprecisez + 1.0 + OutParameter + + + fr.insee + js0dvdaw-QOP-jprecisez + 1.0 + OutParameter + + + + + Votre association a-t-elle eu recours à du personnel non + rémunéré directement par l'association au cours de l’année 2018 ? + + + + + + fr.insee + jtsfadi0 + 1.0 + CodeList + + + + + + + radio-button + + fr.insee + jqxvqakq + 1.0 + CodeList + + + fr.insee + js0dvdaw-RDOP-jvmg80aa + 1.0 + + + fr.insee + jqxvqakq + 1.0 + CodeList + + + + + + + + + + + + + + radio-button + + fr.insee + jqxvqakq + 1.0 + CodeList + + + fr.insee + js0dvdaw-RDOP-jvmg0q44 + 1.0 + + + fr.insee + jqxvqakq + 1.0 + CodeList + + + + + + + + + + + + + + radio-button + + fr.insee + jqxvqakq + 1.0 + CodeList + + + fr.insee + js0dvdaw-RDOP-jvmfv87q + 1.0 + + + fr.insee + jqxvqakq + 1.0 + CodeList + + + + + + + + + + + + + + radio-button + + fr.insee + jqxvqakq + 1.0 + CodeList + + + fr.insee + js0dvdaw-RDOP-jvmfxlqr + 1.0 + + + fr.insee + jqxvqakq + 1.0 + CodeList + + + + + + + + + + + + + + + Précisez la nature de ces autres personnes + : + + + fr.insee + js0dvdaw-RDOP-jprecisez + 1 + + + + + + + + + + + 1 + + + fr.insee + jqxvqakq--1 + 0.1.0 + Code + + + + + + fr.insee + js4e110g + 1.0 + + + + Si vous avez répondu "non" à toutes les + modalités de la question 1, veuillez passer au module VII. Sinon, + veuillez poursuivre. + $AUT_PERS_INTERIM$ = '0' and $AUT_PERS_MAD$ = + '0' and $AUT_PERS_VOL$ = '0' and $AUT_PERS_AUTRES$ = '0' + js0e7bpv + + + + + + fr.insee + js0dx5bf + 1.0 + Instruction + + + + fr.insee + js0dwvc2 + 1.0 + + AUT_NB_H + + + fr.insee + js0dwvc2-QOP-jvmfxje1 + 1.0 + + AUT_PERS_INTERIM_NB_H + + + + fr.insee + js0dwvc2-QOP-jvmg5k42 + 1.0 + + AUT_PERS_MAD_NB_H + + + + fr.insee + js0dwvc2-QOP-jvmftckh + 1.0 + + AUT_PERS_VOL_NB_H + + + + fr.insee + js0dwvc2-QOP-jvmfv1sf + 1.0 + + AUT_PERS_AUTRES_NB_H + + + + + fr.insee + js0dwvc2-RDOP-jvmfxje1 + 1.0 + OutParameter + + + fr.insee + js0dwvc2-QOP-jvmfxje1 + 1.0 + OutParameter + + + + + fr.insee + js0dwvc2-RDOP-jvmg5k42 + 1.0 + OutParameter + + + fr.insee + js0dwvc2-QOP-jvmg5k42 + 1.0 + OutParameter + + + + + fr.insee + js0dwvc2-RDOP-jvmftckh + 1.0 + OutParameter + + + fr.insee + js0dwvc2-QOP-jvmftckh + 1.0 + OutParameter + + + + + fr.insee + js0dwvc2-RDOP-jvmfv1sf + 1.0 + OutParameter + + + fr.insee + js0dwvc2-QOP-jvmfv1sf + 1.0 + OutParameter + + + + + Pour chaque catégorie pertinente, quel est le nombre + d’heures de travail en 2018 ? + + + + + + fr.insee + js0dkszc + 1.0 + CodeList + + + + + + + fr.insee + js0dwvc2-secondDimension-fakeCL-1 + 1.0 + CodeList + + + + + + + + 0 + 999999999 + + Decimal + + fr.insee + js0dwvc2-RDOP-jvmfxje1 + 1.0 + + + + + + + + + + + + + 0 + 999999999 + + Decimal + + fr.insee + js0dwvc2-RDOP-jvmg5k42 + 1.0 + + + + + + + + + + + + + 0 + 999999999 + + Decimal + + fr.insee + js0dwvc2-RDOP-jvmftckh + 1.0 + + + + + + + + + + + + + 0 + 999999999 + + Decimal + + fr.insee + js0dwvc2-RDOP-jvmfv1sf + 1.0 + + + + + + + + + + + + + fr.insee + js0eg1cf + 1.0 + + BENEV_NB_H + + + fr.insee + js0eg1cf-QOP-jvmg494w + 1.0 + + BENEV_NB_H + + + + fr.insee + js0eg1cf-QOP-jvmg80ov + 1.0 + + BENEV_REG_NB_H + + + + + fr.insee + js0eg1cf-RDOP-jvmg494w + 1.0 + OutParameter + + + fr.insee + js0eg1cf-QOP-jvmg494w + 1.0 + OutParameter + + + + + fr.insee + js0eg1cf-RDOP-jvmg80ov + 1.0 + OutParameter + + + fr.insee + js0eg1cf-QOP-jvmg80ov + 1.0 + OutParameter + + + + + Quel est le nombre total approximatif d’heures consacrées + par l’ensemble des bénévoles à votre association au cours de l’année 2018 + : + + + + + + fr.insee + js0eqly4 + 1.0 + CodeList + + + + + + + fr.insee + js0eg1cf-secondDimension-fakeCL-1 + 1.0 + CodeList + + + + + + + + 0 + 999999999 + + Decimal + + fr.insee + js0eg1cf-RDOP-jvmg494w + 1.0 + + + + + + + + + + + + + 0 + 999999999 + + Decimal + + fr.insee + js0eg1cf-RDOP-jvmg80ov + 1.0 + + + + + + + + + + + + + fr.insee + js0f7q4i + 1.0 + + RESS_ + + + fr.insee + js0f7q4i-QOP-jvmg0x78 + 1.0 + + RESS_COTIS + + + + fr.insee + js0f7q4i-QOP-jvmft6oi + 1.0 + + RESS_DONS + + + + fr.insee + js0f7q4i-QOP-jvmg5ja6 + 1.0 + + RESS_LEGS + + + + fr.insee + js0f7q4i-QOP-jvmg2ntx + 1.0 + + RESS_MECENAT + + + + fr.insee + js0f7q4i-QOP-jvmg2qr5 + 1.0 + + RESS_AUT_ASSO + + + + fr.insee + js0f7q4i-QOP-jvmg0bqq + 1.0 + + RESS_RECETTE_ACT + + + + fr.insee + js0f7q4i-QOP-jvmfwzam + 1.0 + + RESS_RECETTE_ACT_PUB + + + + fr.insee + js0f7q4i-QOP-jvmfvhj4 + 1.0 + + RESS_SUBV + + + + fr.insee + js0f7q4i-QOP-jvmg3jpb + 1.0 + + RESS_AUTRES + + + + fr.insee + js0f7q4i-QOP-jprecisez + 1.0 + + RESS_AUTRES_P + + + + fr.insee + js0f7q4i-QOP-jvmftjzc + 1.0 + + RESS_TOTAL + + + + + fr.insee + js0f7q4i-RDOP-jvmg0x78 + 1.0 + OutParameter + + + fr.insee + js0f7q4i-QOP-jvmg0x78 + 1.0 + OutParameter + + + + + fr.insee + js0f7q4i-RDOP-jvmft6oi + 1.0 + OutParameter + + + fr.insee + js0f7q4i-QOP-jvmft6oi + 1.0 + OutParameter + + + + + fr.insee + js0f7q4i-RDOP-jvmg5ja6 + 1.0 + OutParameter + + + fr.insee + js0f7q4i-QOP-jvmg5ja6 + 1.0 + OutParameter + + + + + fr.insee + js0f7q4i-RDOP-jvmg2ntx + 1.0 + OutParameter + + + fr.insee + js0f7q4i-QOP-jvmg2ntx + 1.0 + OutParameter + + + + + fr.insee + js0f7q4i-RDOP-jvmg2qr5 + 1.0 + OutParameter + + + fr.insee + js0f7q4i-QOP-jvmg2qr5 + 1.0 + OutParameter + + + + + fr.insee + js0f7q4i-RDOP-jvmg0bqq + 1.0 + OutParameter + + + fr.insee + js0f7q4i-QOP-jvmg0bqq + 1.0 + OutParameter + + + + + fr.insee + js0f7q4i-RDOP-jvmfwzam + 1.0 + OutParameter + + + fr.insee + js0f7q4i-QOP-jvmfwzam + 1.0 + OutParameter + + + + + fr.insee + js0f7q4i-RDOP-jvmfvhj4 + 1.0 + OutParameter + + + fr.insee + js0f7q4i-QOP-jvmfvhj4 + 1.0 + OutParameter + + + + + fr.insee + js0f7q4i-RDOP-jvmg3jpb + 1.0 + OutParameter + + + fr.insee + js0f7q4i-QOP-jvmg3jpb + 1.0 + OutParameter + + + + + fr.insee + js0f7q4i-RDOP-jprecisez + 1.0 + OutParameter + + + fr.insee + js0f7q4i-QOP-jprecisez + 1.0 + OutParameter + + + + + fr.insee + js0f7q4i-RDOP-jvmftjzc + 1.0 + OutParameter + + + fr.insee + js0f7q4i-QOP-jvmftjzc + 1.0 + OutParameter + + + + + Quels étaient les montants des produits d’exploitation + (ressources courantes, budget) de votre association en 2018, même + approximativement, en euros : + + + + + + fr.insee + js0f2fiv + 1.0 + CodeList + + + + + + + fr.insee + js0f7q4i-secondDimension-fakeCL-1 + 1.0 + CodeList + + + + + + + + 0 + 999999999 + + Decimal + + fr.insee + js0f7q4i-RDOP-jvmg0x78 + 1.0 + + + + + + + + + + + + + 0 + 999999999 + + Decimal + + fr.insee + js0f7q4i-RDOP-jvmft6oi + 1.0 + + + + + + + + + + + + + 0 + 999999999 + + Decimal + + fr.insee + js0f7q4i-RDOP-jvmg5ja6 + 1.0 + + + + + + + + + + + + + 0 + 999999999 + + Decimal + + fr.insee + js0f7q4i-RDOP-jvmg2ntx + 1.0 + + + + + + + + + + + + + 0 + 999999999 + + Decimal + + fr.insee + js0f7q4i-RDOP-jvmg2qr5 + 1.0 + + + + + + + + + + + + + 0 + 999999999 + + Decimal + + fr.insee + js0f7q4i-RDOP-jvmg0bqq + 1.0 + + + + + + + + + + + + + 0 + 999999999 + + Decimal + + fr.insee + js0f7q4i-RDOP-jvmfwzam + 1.0 + + + + + + + + + + + + + 0 + 999999999 + + Decimal + + fr.insee + js0f7q4i-RDOP-jvmfvhj4 + 1.0 + + + + + + + + + + + + + 0 + 999999999 + + Decimal + + fr.insee + js0f7q4i-RDOP-jvmg3jpb + 1.0 + + + + + + + + + + + + + Précisez la nature de ces autres ressources + : + + + fr.insee + js0f7q4i-RDOP-jprecisez + 0.1.0 + + + + + + + + + + + + + + 0 + 999999999 + + Decimal + + fr.insee + js0f7q4i-RDOP-jvmftjzc + 1.0 + + + + + + + + + + + + fr.insee + js0foe9d + 1.0 + Instruction + + + + fr.insee + js0g28m1 + 1.0 + + RESS_SUBV_REC + + + fr.insee + js0g28m1-QOP-jvmg02ch + 1.0 + + RESS_SUBV_COM + + + + fr.insee + js0g28m1-QOP-jvmfrxup + 1.0 + + RESS_SUBV_DEP + + + + fr.insee + js0g28m1-QOP-jvmg6n78 + 1.0 + + RESS_SUBV_REG + + + + fr.insee + js0g28m1-QOP-jvmfwqwf + 1.0 + + RESS_SUBV_ETAT + + + + fr.insee + js0g28m1-QOP-jvmfvk3l + 1.0 + + RESS_SUBV_UE + + + + fr.insee + js0g28m1-QOP-jvmftz8o + 1.0 + + RESS_SUBV_ORG_SOC + + + + fr.insee + js0g28m1-QOP-jvmfwc9t + 1.0 + + RESS_SUBV_AUTRES + + + + fr.insee + js0g28m1-QOP-jvmfq558 + 1.0 + + RESS_REC_ACT_COM + + + + fr.insee + js0g28m1-QOP-jvmg7zsz + 1.0 + + RESS_REC_ACT_DEP + + + + fr.insee + js0g28m1-QOP-jvmfrarb + 1.0 + + RESS_REC_ACT_REG + + + + fr.insee + js0g28m1-QOP-jvmg4tup + 1.0 + + RESS_REC_ACT_ETAT + + + + fr.insee + js0g28m1-QOP-jvmg7coo + 1.0 + + RESS_REC_ACT_UE + + + + fr.insee + js0g28m1-QOP-jvmg2kni + 1.0 + + RESS_REC_ACT_ORG_SOC + + + + fr.insee + js0g28m1-QOP-jvmg3112 + 1.0 + + RESS_REC_ACT_AUTRES + + + + + fr.insee + js0g28m1-RDOP-jvmg02ch + 1.0 + OutParameter + + + fr.insee + js0g28m1-QOP-jvmg02ch + 1.0 + OutParameter + + + + + fr.insee + js0g28m1-RDOP-jvmfrxup + 1.0 + OutParameter + + + fr.insee + js0g28m1-QOP-jvmfrxup + 1.0 + OutParameter + + + + + fr.insee + js0g28m1-RDOP-jvmg6n78 + 1.0 + OutParameter + + + fr.insee + js0g28m1-QOP-jvmg6n78 + 1.0 + OutParameter + + + + + fr.insee + js0g28m1-RDOP-jvmfwqwf + 1.0 + OutParameter + + + fr.insee + js0g28m1-QOP-jvmfwqwf + 1.0 + OutParameter + + + + + fr.insee + js0g28m1-RDOP-jvmfvk3l + 1.0 + OutParameter + + + fr.insee + js0g28m1-QOP-jvmfvk3l + 1.0 + OutParameter + + + + + fr.insee + js0g28m1-RDOP-jvmftz8o + 1.0 + OutParameter + + + fr.insee + js0g28m1-QOP-jvmftz8o + 1.0 + OutParameter + + + + + fr.insee + js0g28m1-RDOP-jvmfwc9t + 1.0 + OutParameter + + + fr.insee + js0g28m1-QOP-jvmfwc9t + 1.0 + OutParameter + + + + + + fr.insee + js0g28m1-RDOP-jvmfq558 + 1.0 + OutParameter + + + fr.insee + js0g28m1-QOP-jvmfq558 + 1.0 + OutParameter + + + + + fr.insee + js0g28m1-RDOP-jvmg7zsz + 1.0 + OutParameter + + + fr.insee + js0g28m1-QOP-jvmg7zsz + 1.0 + OutParameter + + + + + fr.insee + js0g28m1-RDOP-jvmfrarb + 1.0 + OutParameter + + + fr.insee + js0g28m1-QOP-jvmfrarb + 1.0 + OutParameter + + + + + fr.insee + js0g28m1-RDOP-jvmg4tup + 1.0 + OutParameter + + + fr.insee + js0g28m1-QOP-jvmg4tup + 1.0 + OutParameter + + + + + fr.insee + js0g28m1-RDOP-jvmg7coo + 1.0 + OutParameter + + + fr.insee + js0g28m1-QOP-jvmg7coo + 1.0 + OutParameter + + + + + fr.insee + js0g28m1-RDOP-jvmg2kni + 1.0 + OutParameter + + + fr.insee + js0g28m1-QOP-jvmg2kni + 1.0 + OutParameter + + + + + fr.insee + js0g28m1-RDOP-jvmg3112 + 1.0 + OutParameter + + + fr.insee + js0g28m1-QOP-jvmg3112 + 1.0 + OutParameter + + + + + En ce qui concerne les subventions publiques et les + recettes d’activité d’origine publique, quelles étaient leurs montants selon + leurs origines (montants en 2018, même approximatifs, en euros) ? + + + + + + fr.insee + js0ghnlg + 1.0 + CodeList + + + + + + + fr.insee + js0g8wkq + 1.0 + CodeList + + + + + + + + 0 + 999999999 + + Decimal + + fr.insee + js0g28m1-RDOP-jvmg02ch + 1.0 + + + + + + + + + + + + + 0 + 999999999 + + Decimal + + fr.insee + js0g28m1-RDOP-jvmfrxup + 1.0 + + + + + + + + + + + + + 0 + 999999999 + + Decimal + + fr.insee + js0g28m1-RDOP-jvmg6n78 + 1.0 + + + + + + + + + + + + + 0 + 999999999 + + Decimal + + fr.insee + js0g28m1-RDOP-jvmfwqwf + 1.0 + + + + + + + + + + + + + 0 + 999999999 + + Decimal + + fr.insee + js0g28m1-RDOP-jvmfvk3l + 1.0 + + + + + + + + + + + + + 0 + 999999999 + + Decimal + + fr.insee + js0g28m1-RDOP-jvmftz8o + 1.0 + + + + + + + + + + + + + 0 + 999999999 + + Decimal + + fr.insee + js0g28m1-RDOP-jvmfwc9t + 1.0 + + + + + + + + + + + + + + + + + + + 0 + 999999999 + + Decimal + + fr.insee + js0g28m1-RDOP-jvmfq558 + 1.0 + + + + + + + + + + + + + 0 + 999999999 + + Decimal + + fr.insee + js0g28m1-RDOP-jvmg7zsz + 1.0 + + + + + + + + + + + + + 0 + 999999999 + + Decimal + + fr.insee + js0g28m1-RDOP-jvmfrarb + 1.0 + + + + + + + + + + + + + 0 + 999999999 + + Decimal + + fr.insee + js0g28m1-RDOP-jvmg4tup + 1.0 + + + + + + + + + + + + + 0 + 999999999 + + Decimal + + fr.insee + js0g28m1-RDOP-jvmg7coo + 1.0 + + + + + + + + + + + + + 0 + 999999999 + + Decimal + + fr.insee + js0g28m1-RDOP-jvmg2kni + 1.0 + + + + + + + + + + + + + 0 + 999999999 + + Decimal + + fr.insee + js0g28m1-RDOP-jvmg3112 + 1.0 + + + + + + + + + + + + + + + + + + ¤jsn6qqzh-GOP¤ + total + + + + + + + + + ¤jsn757cc-GOP¤ + total + + + + + + + + + fr.insee + jvgqx618 + 1.0 + + + + Si vous avez renseigné des subventions + publiques de la catégorie "Autres" à la question 5, veuillez répondre à la question 6. Sinon, veuillez poursuivre. + $RESS_SUBV_AUTRES$ > 0 + jvgc8k0y + + + + + + fr.insee + jvgqtg7s + 1.0 + + + + Si vous avez renseigné des recettes d'activité d'origine publique de la catégorie "Autres" à la question 5, veuillez passer à la question 7. Sinon, veuillez poursuivre. + $RESS_REC_ACT_AUTRES$ > 0 + jvgcdcjx + + + + + + fr.insee + js0grp6u + 1.0 + Instruction + + + + fr.insee + js0gv8ia + 1.0 + + CHARGES + + + fr.insee + js0gv8ia-QOP-jvmfslgm + 1.0 + + CHARGES_PERS + + + + fr.insee + js0gv8ia-QOP-jvmfz3pd + 1.0 + + CHARGES_IMPOTS + + + + fr.insee + js0gv8ia-QOP-jvmfre83 + 1.0 + + CHARGES_AUTRES + + + + fr.insee + js0gv8ia-QOP-jvmft7pd + 1.0 + + CHARGES_AUTRES_LOYERS + + + + fr.insee + js0gv8ia-QOP-jvmfye18 + 1.0 + + CHARGES_AUTRES_FORMATION + + + + fr.insee + js0gv8ia-QOP-jvmftqf0 + 1.0 + + CHARGES_AUTRES_COTIS + + + + fr.insee + js0gv8ia-QOP-jvmg783j + 1.0 + + CHARGES_AUTRES_PRESTA + + + + fr.insee + js0gv8ia-QOP-jvmft97z + 1.0 + + CHARGES_TOTAL + + + + + fr.insee + js0gv8ia-RDOP-jvmfslgm + 1.0 + OutParameter + + + fr.insee + js0gv8ia-QOP-jvmfslgm + 1.0 + OutParameter + + + + + fr.insee + js0gv8ia-RDOP-jvmfz3pd + 1.0 + OutParameter + + + fr.insee + js0gv8ia-QOP-jvmfz3pd + 1.0 + OutParameter + + + + + fr.insee + js0gv8ia-RDOP-jvmfre83 + 1.0 + OutParameter + + + fr.insee + js0gv8ia-QOP-jvmfre83 + 1.0 + OutParameter + + + + + fr.insee + js0gv8ia-RDOP-jvmft7pd + 1.0 + OutParameter + + + fr.insee + js0gv8ia-QOP-jvmft7pd + 1.0 + OutParameter + + + + + fr.insee + js0gv8ia-RDOP-jvmfye18 + 1.0 + OutParameter + + + fr.insee + js0gv8ia-QOP-jvmfye18 + 1.0 + OutParameter + + + + + fr.insee + js0gv8ia-RDOP-jvmftqf0 + 1.0 + OutParameter + + + fr.insee + js0gv8ia-QOP-jvmftqf0 + 1.0 + OutParameter + + + + + fr.insee + js0gv8ia-RDOP-jvmg783j + 1.0 + OutParameter + + + fr.insee + js0gv8ia-QOP-jvmg783j + 1.0 + OutParameter + + + + + fr.insee + js0gv8ia-RDOP-jvmft97z + 1.0 + OutParameter + + + fr.insee + js0gv8ia-QOP-jvmft97z + 1.0 + OutParameter + + + + + Quelles ont été les charges (dépenses) de votre + association en 2018, même approximativement, en euros : + + + + + + fr.insee + js0gyyn3 + 1.0 + CodeList + + + + + + + fr.insee + js0gv8ia-secondDimension-fakeCL-1 + 1.0 + CodeList + + + + + + + + 0 + 999999999 + + Decimal + + fr.insee + js0gv8ia-RDOP-jvmfslgm + 1.0 + + + + + + + + + + + + + 0 + 999999999 + + Decimal + + fr.insee + js0gv8ia-RDOP-jvmfz3pd + 1.0 + + + + + + + + + + + + + 0 + 999999999 + + Decimal + + fr.insee + js0gv8ia-RDOP-jvmfre83 + 1.0 + + + + + + + + + + + + + 0 + 999999999 + + Decimal + + fr.insee + js0gv8ia-RDOP-jvmft7pd + 1.0 + + + + + + + + + + + + + 0 + 999999999 + + Decimal + + fr.insee + js0gv8ia-RDOP-jvmfye18 + 1.0 + + + + + + + + + + + + + 0 + 999999999 + + Decimal + + fr.insee + js0gv8ia-RDOP-jvmftqf0 + 1.0 + + + + + + + + + + + + + 0 + 999999999 + + Decimal + + fr.insee + js0gv8ia-RDOP-jvmg783j + 1.0 + + + + + + + + + + + + + 0 + 999999999 + + Decimal + + fr.insee + js0gv8ia-RDOP-jvmft97z + 1.0 + + + + + + + + + + + + fr.insee + js0h422p + 1.0 + Instruction + + + + fr.insee + js1wmyn8 + 1.0 + + MAD_LOCAUX_ORIGINE + + + fr.insee + js1wmyn8-QOP-jvmg34og + 1.0 + + MAD_LOCAUX_PAR_PP + + + + fr.insee + js1wmyn8-QOP-jvmg7ad4 + 1.0 + + MAD_LOCAUX_PAR_COM + + + + fr.insee + js1wmyn8-QOP-jvmg2ici + 1.0 + + MAD_LOCAUX_PAR_AUTPUB + + + + fr.insee + js1wmyn8-QOP-jvmg9j11 + 1.0 + + MAD_LOCAUX_PAR_ASSO + + + + fr.insee + js1wmyn8-QOP-jvmfzpgm + 1.0 + + MAD_LOCAUX_PAR_ENTPRIV + + + + fr.insee + js1wmyn8-QOP-jvmfr31k + 1.0 + + MAD_LOCAUX_PAR_AUTRES + + + + fr.insee + js1wmyn8-QOP-jprecisez + 1.0 + + MAD_LOCAUX_PAR_AUTRES_P + + + + + fr.insee + js1wmyn8-RDOP-jvmg34og + 1.0 + OutParameter + + + fr.insee + js1wmyn8-QOP-jvmg34og + 1.0 + OutParameter + + + + + fr.insee + js1wmyn8-RDOP-jvmg7ad4 + 1.0 + OutParameter + + + fr.insee + js1wmyn8-QOP-jvmg7ad4 + 1.0 + OutParameter + + + + + fr.insee + js1wmyn8-RDOP-jvmg2ici + 1.0 + OutParameter + + + fr.insee + js1wmyn8-QOP-jvmg2ici + 1.0 + OutParameter + + + + + fr.insee + js1wmyn8-RDOP-jvmg9j11 + 1.0 + OutParameter + + + fr.insee + js1wmyn8-QOP-jvmg9j11 + 1.0 + OutParameter + + + + + fr.insee + js1wmyn8-RDOP-jvmfzpgm + 1.0 + OutParameter + + + fr.insee + js1wmyn8-QOP-jvmfzpgm + 1.0 + OutParameter + + + + + fr.insee + js1wmyn8-RDOP-jvmfr31k + 1.0 + OutParameter + + + fr.insee + js1wmyn8-QOP-jvmfr31k + 1.0 + OutParameter + + + + + fr.insee + js1wmyn8-RDOP-jprecisez + 1.0 + OutParameter + + + fr.insee + js1wmyn8-QOP-jprecisez + 1.0 + OutParameter + + + + + Par qui ces locaux sont-ils mis à disposition ? + + + + + + fr.insee + js1wcn8q + 1.0 + CodeList + + + + + + + + fr.insee + js1wmyn8-RDOP-jvmg34og + 1.0 + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 1.0 + Code + + + + + + + + + + + + + + + + + + fr.insee + js1wmyn8-RDOP-jvmg7ad4 + 1.0 + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 1.0 + Code + + + + + + + + + + + + + + + + + + fr.insee + js1wmyn8-RDOP-jvmg2ici + 1.0 + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 1.0 + Code + + + + + + + + + + + + + + + + + + fr.insee + js1wmyn8-RDOP-jvmg9j11 + 1.0 + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 1.0 + Code + + + + + + + + + + + + + + + + + + fr.insee + js1wmyn8-RDOP-jvmfzpgm + 1.0 + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 1.0 + Code + + + + + + + + + + + + + + + + + + fr.insee + js1wmyn8-RDOP-jvmfr31k + 1.0 + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 1.0 + Code + + + + + + + + + + + + + + + + + + Précisez : + + + fr.insee + js1wmyn8-RDOP-jprecisez + 1 + + + + + + + + + + + 1 + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 0.1.0 + Code + + + + + + fr.insee + js1wc5aw + 1.0 + Instruction + + + + fr.insee + js1wqahn + 1.0 + + MAD_TERRAINS_ORIGINE + + + fr.insee + js1wqahn-QOP-jvmfq3kc + 1.0 + + MAD_TERRAINS_PAR_PP + + + + fr.insee + js1wqahn-QOP-jvmfttd6 + 1.0 + + MAD_TERRAINS_PAR_COM + + + + fr.insee + js1wqahn-QOP-jvmfrnpx + 1.0 + + MAD_TERRAINS_PAR_AUTPUB + + + + fr.insee + js1wqahn-QOP-jvmg67jg + 1.0 + + MAD_TERRAINS_PAR_ASSO + + + + fr.insee + js1wqahn-QOP-jvmfve1a + 1.0 + + MAD_TERRAINS_PAR_ENTPRIV + + + + fr.insee + js1wqahn-QOP-jvmfudfq + 1.0 + + MAD_TERRAINS_PAR_AUTRES + + + + fr.insee + js1wqahn-QOP-jprecisez + 1.0 + + MAD_TERRAINS_PAR_AUTRES_P + + + + + fr.insee + js1wqahn-RDOP-jvmfq3kc + 1.0 + OutParameter + + + fr.insee + js1wqahn-QOP-jvmfq3kc + 1.0 + OutParameter + + + + + fr.insee + js1wqahn-RDOP-jvmfttd6 + 1.0 + OutParameter + + + fr.insee + js1wqahn-QOP-jvmfttd6 + 1.0 + OutParameter + + + + + fr.insee + js1wqahn-RDOP-jvmfrnpx + 1.0 + OutParameter + + + fr.insee + js1wqahn-QOP-jvmfrnpx + 1.0 + OutParameter + + + + + fr.insee + js1wqahn-RDOP-jvmg67jg + 1.0 + OutParameter + + + fr.insee + js1wqahn-QOP-jvmg67jg + 1.0 + OutParameter + + + + + fr.insee + js1wqahn-RDOP-jvmfve1a + 1.0 + OutParameter + + + fr.insee + js1wqahn-QOP-jvmfve1a + 1.0 + OutParameter + + + + + fr.insee + js1wqahn-RDOP-jvmfudfq + 1.0 + OutParameter + + + fr.insee + js1wqahn-QOP-jvmfudfq + 1.0 + OutParameter + + + + + fr.insee + js1wqahn-RDOP-jprecisez + 1.0 + OutParameter + + + fr.insee + js1wqahn-QOP-jprecisez + 1.0 + OutParameter + + + + + Par qui ces terrains sont-ils mis à disposition + ? + + + + + + fr.insee + js1wcn8q + 1.0 + CodeList + + + + + + + + fr.insee + js1wqahn-RDOP-jvmfq3kc + 1.0 + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 1.0 + Code + + + + + + + + + + + + + + + + + + fr.insee + js1wqahn-RDOP-jvmfttd6 + 1.0 + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 1.0 + Code + + + + + + + + + + + + + + + + + + fr.insee + js1wqahn-RDOP-jvmfrnpx + 1.0 + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 1.0 + Code + + + + + + + + + + + + + + + + + + fr.insee + js1wqahn-RDOP-jvmg67jg + 1.0 + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 1.0 + Code + + + + + + + + + + + + + + + + + + fr.insee + js1wqahn-RDOP-jvmfve1a + 1.0 + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 1.0 + Code + + + + + + + + + + + + + + + + + + fr.insee + js1wqahn-RDOP-jvmfudfq + 1.0 + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 1.0 + Code + + + + + + + + + + + + + + + + + + Précisez : + + + fr.insee + js1wqahn-RDOP-jprecisez + 1 + + + + + + + + + + + 1 + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 0.1.0 + Code + + + + + + fr.insee + jt7bd92h + 1.0 + Instruction + + + + fr.insee + js1xpf9k + 1.0 + + RESEAU_MOTIFS + + + fr.insee + js1xpf9k-QOP-jvmfuxf9 + 1.0 + + RESEAU_MOTIFS_OBL + + + + fr.insee + js1xpf9k-QOP-jvmg2zlb + 1.0 + + RESEAU_MOTIFS_ECHG + + + + fr.insee + js1xpf9k-QOP-jvmfvjfu + 1.0 + + RESEAU_MOTIFS_RH + + + + fr.insee + js1xpf9k-QOP-jvmg0yuy + 1.0 + + RESEAU_MOTIFS_FINANCIER + + + + fr.insee + js1xpf9k-QOP-jvmgbdj9 + 1.0 + + RESEAU_MOTIFS_OUTILS + + + + fr.insee + js1xpf9k-QOP-jvmfx6oh + 1.0 + + RESEAU_MOTIFS_ACTIVITE + + + + fr.insee + js1xpf9k-QOP-jvmg7m1e + 1.0 + + RESEAU_MOTIFS_INFLUENCE + + + + fr.insee + js1xpf9k-QOP-jvmg8hmw + 1.0 + + RESEAU_MOTIFS_COORD + + + + + fr.insee + js1xpf9k-RDOP-jvmfuxf9 + 1.0 + OutParameter + + + fr.insee + js1xpf9k-QOP-jvmfuxf9 + 1.0 + OutParameter + + + + + fr.insee + js1xpf9k-RDOP-jvmg2zlb + 1.0 + OutParameter + + + fr.insee + js1xpf9k-QOP-jvmg2zlb + 1.0 + OutParameter + + + + + fr.insee + js1xpf9k-RDOP-jvmfvjfu + 1.0 + OutParameter + + + fr.insee + js1xpf9k-QOP-jvmfvjfu + 1.0 + OutParameter + + + + + fr.insee + js1xpf9k-RDOP-jvmg0yuy + 1.0 + OutParameter + + + fr.insee + js1xpf9k-QOP-jvmg0yuy + 1.0 + OutParameter + + + + + fr.insee + js1xpf9k-RDOP-jvmgbdj9 + 1.0 + OutParameter + + + fr.insee + js1xpf9k-QOP-jvmgbdj9 + 1.0 + OutParameter + + + + + fr.insee + js1xpf9k-RDOP-jvmfx6oh + 1.0 + OutParameter + + + fr.insee + js1xpf9k-QOP-jvmfx6oh + 1.0 + OutParameter + + + + + fr.insee + js1xpf9k-RDOP-jvmg7m1e + 1.0 + OutParameter + + + fr.insee + js1xpf9k-QOP-jvmg7m1e + 1.0 + OutParameter + + + + + fr.insee + js1xpf9k-RDOP-jvmg8hmw + 1.0 + OutParameter + + + fr.insee + js1xpf9k-QOP-jvmg8hmw + 1.0 + OutParameter + + + + + Pour quels motifs votre association appartient-elle à un + ou plusieurs réseaux d’associations ? + + + + + + fr.insee + js1xruca + 1.0 + CodeList + + + + + + + + fr.insee + js1xpf9k-RDOP-jvmfuxf9 + 1.0 + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 1.0 + Code + + + + + + + + + + + + + + + + + + fr.insee + js1xpf9k-RDOP-jvmg2zlb + 1.0 + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 1.0 + Code + + + + + + + + + + + + + + + + + + fr.insee + js1xpf9k-RDOP-jvmfvjfu + 1.0 + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 1.0 + Code + + + + + + + + + + + + + + + + + + fr.insee + js1xpf9k-RDOP-jvmg0yuy + 1.0 + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 1.0 + Code + + + + + + + + + + + + + + + + + + fr.insee + js1xpf9k-RDOP-jvmgbdj9 + 1.0 + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 1.0 + Code + + + + + + + + + + + + + + + + + + fr.insee + js1xpf9k-RDOP-jvmfx6oh + 1.0 + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 1.0 + Code + + + + + + + + + + + + + + + + + + fr.insee + js1xpf9k-RDOP-jvmg7m1e + 1.0 + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 1.0 + Code + + + + + + + + + + + + + + + + + + fr.insee + js1xpf9k-RDOP-jvmg8hmw + 1.0 + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 1.0 + Code + + + + + + + + + + + + + + + + + fr.insee + jt7bpuz6 + 1.0 + Instruction + + + + + fr.insee + CategoryScheme-jqxvqakq + 1.0 + + OuiNon + + + fr.insee + CA-jqxvqakq--1 + 1.0 + + Oui + + + + fr.insee + CA-jqxvqakq-0 + 1.0 + + Non + + + + + fr.insee + CategoryScheme-jqxxby4z + 1.0 + + OuiNonNesaispas + + + fr.insee + CA-jqxxby4z--1 + 1.0 + + Oui + + + + fr.insee + CA-jqxxby4z-0 + 1.0 + + Non + + + + fr.insee + CA-jqxxby4z-1 + 1.0 + + Ne sais pas + + + + + fr.insee + CategoryScheme-jqxxwdxu + 1.0 + + Niveau_geographique + + + fr.insee + CA-jqxxwdxu--1 + 1.0 + + Immeuble, quartier + + + + fr.insee + CA-jqxxwdxu-0 + 1.0 + + Commune + + + + fr.insee + CA-jqxxwdxu-1 + 1.0 + + Commune et communes avoisinantes, canton, + métropole + + + + fr.insee + CA-jqxxwdxu-2 + 1.0 + + Département + + + + fr.insee + CA-jqxxwdxu-3 + 1.0 + + Région + + + + fr.insee + CA-jqxxwdxu-4 + 1.0 + + Plusieurs régions ou France entière + + + + fr.insee + CA-jqxxwdxu-5 + 1.0 + + A l’étranger + + + + + fr.insee + CategoryScheme-jqxy4o08 + 1.0 + + DegreActiveEtrg + + + fr.insee + CA-jqxy4o08--1 + 1.0 + + Oui, régulièrement + + + + fr.insee + CA-jqxy4o08-0 + 1.0 + + Oui, occasionnellement + + + + fr.insee + CA-jqxy4o08-1 + 1.0 + + Non, jamais + + + + + fr.insee + CategoryScheme-jrjdn9sk + 1.0 + + OuiNonP + + + fr.insee + CA-jrjdn9sk--1 + 1.0 + + Oui, un(e) seul(e) président(e) + + + + fr.insee + CA-jrjdn9sk-0 + 1.0 + + Oui, plusieurs co-présidents(es) + + + + fr.insee + CA-jrjdn9sk-1 + 1.0 + + Non + + + + + fr.insee + CategoryScheme-jrjdm6kc + 1.0 + + sexe + + + fr.insee + CA-jrjdm6kc--1 + 1.0 + + Une femme + + + + fr.insee + CA-jrjdm6kc-0 + 1.0 + + Un homme + + + + + fr.insee + CategoryScheme-jrje5vjq + 1.0 + + Statut + + + fr.insee + CA-jrje5vjq--1 + 1.0 + + Occupe un emploi dans le secteur privé + + + + fr.insee + CA-jrje5vjq-0 + 1.0 + + Occupe un emploi dans le secteur public + + + + fr.insee + CA-jrje5vjq-1 + 1.0 + + Retraité(e) du secteur privé + + + + fr.insee + CA-jrje5vjq-2 + 1.0 + + Retraité(e) du secteur public + + + + fr.insee + CA-jrje5vjq-3 + 1.0 + + En recherche d'emploi + + + + fr.insee + CA-jrje5vjq-4 + 1.0 + + Sans activité professionnelle (y compris + étudiant(e)s) + + + + + fr.insee + CategoryScheme-jrkctpmr + 1.0 + + nature adhérents + + + fr.insee + CA-jrkctpmr--1 + 1.0 + + Personnes physiques + + + + fr.insee + CA-jrkctpmr-0 + 1.0 + + Associations + + + + fr.insee + CA-jrkctpmr-1 + 1.0 + + Entreprises privées + + + + fr.insee + CA-jrkctpmr-2 + 1.0 + + Collectivités publiques + + + + fr.insee + CA-jrkctpmr-3 + 1.0 + + Autres + + + + + fr.insee + CategoryScheme-jrqgl3lm + 1.0 + + L_ACTIVITES + + + fr.insee + CA-jrqgl3lm--1 + 1.0 + + + + Activités culturelles hors spectacles, préservation ou promotion du + patrimoine + + + + + + fr.insee + CA-jrqgl3lm-0 + 1.0 + + Bibliothèques, médiathèques, archives + + + + fr.insee + CA-jrqgl3lm-1 + 1.0 + + Gestion des musées + + + + fr.insee + CA-jrqgl3lm-2 + 1.0 + + Gestion des sites, monuments historiques et attractions + touristiques similaires, sociétés historiques + + + + fr.insee + CA-jrqgl3lm-3 + 1.0 + + MJC, centres d'action culturelle, clubs culturels + + + + + fr.insee + CA-jrqgl3lm-4 + 1.0 + + + + Spectacles et activités artistiques + + + + + + fr.insee + CA-jrqgl3lm-5 + 1.0 + + Création ou production de spectacles vivants (groupes ou + artistes indépendants), festivals, radios et télévisions ​ + + + + fr.insee + CA-jrqgl3lm-6 + 1.0 + + Prestation de soutien au spectacle vivant (son, + éclairage, conseils, gestion administrative…) + + + + fr.insee + CA-jrqgl3lm-7 + 1.0 + + Création artistique (peinture, dessin, sculpture, + écriture, composition musicale…) + + + + fr.insee + CA-jrqgl3lm-8 + 1.0 + + Gestion de salles de spectacles + + + + fr.insee + CA-jrqgl3lm-9 + 1.0 + + + + Loisirs, divertissements, vie sociale + + + + + + fr.insee + CA-jrqgl3lm-10 + 1.0 + + Activités récréatives et de loisirs dont jeux organisés + en fédérations (bridge, échecs...), comités des fêtes, clubs 3ème âge, scouts, + clubs (Rotary, Lyons...), collectionneurs, jumelage, activités de plein air ou + voyages + + + + fr.insee + CA-jrqgl3lm-11 + 1.0 + + Hébergement touristique social (dont maisons et colonies + de vacances, centres aérés), cantines ​ + + + + fr.insee + CA-jrqgl3lm-12 + 1.0 + + Amicales ou groupement d’habitants, d’un quartier, d’un + village, de personnes originaires d’une même région, d’un même pays, amicales de + personnels d’entreprise ​ + + + + fr.insee + CA-jrqgl3lm-13 + 1.0 + + + + Hébergement social ou médico-social + + + + + + fr.insee + CA-jrqgl3lm-14 + 1.0 + + + Hébergement médicalisé pour personnes âgées, dont EHPAD + + + + + fr.insee + CA-jrqgl3lm-15 + 1.0 + + Hébergement médicalisé pour enfants handicapés + + + + + fr.insee + CA-jrqgl3lm-16 + 1.0 + + Hébergement médicalisé pour adultes handicapés et autre + hébergement médicalisé + + + + fr.insee + CA-jrqgl3lm-17 + 1.0 + + Hébergement social pour handicapés mentaux + + + + fr.insee + CA-jrqgl3lm-18 + 1.0 + + Hébergement social pour personnes âgées + + + + fr.insee + CA-jrqgl3lm-19 + 1.0 + + Hébergement social pour handicapés physiques + + + + fr.insee + CA-jrqgl3lm-20 + 1.0 + + Hébergement social pour enfants en difficulté + + + + fr.insee + CA-jrqgl3lm-21 + 1.0 + + Foyers de jeunes travailleurs + + + + fr.insee + CA-jrqgl3lm-22 + 1.0 + + Autre hébergement social, dont pour adultes et familles + en difficulté + + + + fr.insee + CA-jrqgl3lm-23 + 1.0 + + + + Santé + + + + + + fr.insee + CA-jrqgl3lm-24 + 1.0 + + Activités hospitalières + + + + fr.insee + CA-jrqgl3lm-25 + 1.0 + + Dispensaires, médecine générale ou + spécialisée + + + + fr.insee + CA-jrqgl3lm-26 + 1.0 + + Soins dispensés par des infirmiers et des sages-femmes + + + + + fr.insee + CA-jrqgl3lm-27 + 1.0 + + Soins dispensés par des professionnels de la rééducation + + + + + fr.insee + CA-jrqgl3lm-28 + 1.0 + + Recherche médicale (lutte contre le cancer, la + myopathie...) + + + + fr.insee + CA-jrqgl3lm-29 + 1.0 + + Autres activités de santé, dont information et + prévention, aides aux malades, groupements de malades + + + + fr.insee + CA-jrqgl3lm-30 + 1.0 + + + + Sports + + + + + + fr.insee + CA-jrqgl3lm-31 + 1.0 + + Clubs de sports, enseignement de disciplines sportives + + + + + fr.insee + CA-jrqgl3lm-32 + 1.0 + + Gestion d'installations sportives + + + + fr.insee + CA-jrqgl3lm-33 + 1.0 + + Chasse et pêche + + + + fr.insee + CA-jrqgl3lm-34 + 1.0 + + Autres activités liées au sport + + + + fr.insee + CA-jrqgl3lm-35 + 1.0 + + + + Défense de causes, de droits, d'intérêts + + + + + + fr.insee + CA-jrqgl3lm-36 + 1.0 + + Organisations politiques, clubs et cercles de réflexion + + + + + fr.insee + CA-jrqgl3lm-37 + 1.0 + + Organisations cultuelles et religieuses + + + + fr.insee + CA-jrqgl3lm-38 + 1.0 + + Organisations patronales et consulaires + + + + fr.insee + CA-jrqgl3lm-39 + 1.0 + + Organisations professionnelles + + + + fr.insee + CA-jrqgl3lm-40 + 1.0 + + Syndicats de salariés + + + + fr.insee + CA-jrqgl3lm-41 + 1.0 + + Associations d’élèves, d’étudiants ou de parents d'élèves + + + + + fr.insee + CA-jrqgl3lm-42 + 1.0 + + Associations patriotiques ou d'anciens combattants + + + + + fr.insee + CA-jrqgl3lm-43 + 1.0 + + Protection de l'environnement, gestion des jardins et + réserves naturelles, protection des animaux + + + + fr.insee + CA-jrqgl3lm-44 + 1.0 + + Défense des consommateurs, des usagers des services + publics + + + + fr.insee + CA-jrqgl3lm-45 + 1.0 + + Associations de locataires ou de propriétaires + + + + + fr.insee + CA-jrqgl3lm-46 + 1.0 + + Associations de défense des droits humains, des droits + des femmes, de minorités, groupes d’entraide + + + + fr.insee + CA-jrqgl3lm-47 + 1.0 + + Autres défenses de droits, de causes et + d’intérêts + + + + fr.insee + CA-jrqgl3lm-48 + 1.0 + + + + Gestion de services économiques et développement local + + + + + + fr.insee + CA-jrqgl3lm-49 + 1.0 + + + Développement économique et local, GIP + + + + + fr.insee + CA-jrqgl3lm-50 + 1.0 + + Offices de tourisme, syndicats d’initiative, comités de + tourisme, agences de développement touristique + + + + fr.insee + CA-jrqgl3lm-51 + 1.0 + + Groupement d’employeurs ayant des salariés pour le compte + de tiers, société d'économie mixte locale, coopérative d'activités et + d'emploi + + + + fr.insee + CA-jrqgl3lm-52 + 1.0 + + Gestion d’activités communes par la mise en commun de + moyens, associations réalisant des activités support (y compris associations de + moyens ou de gestion et caisses de congés payés) + + + + fr.insee + CA-jrqgl3lm-53 + 1.0 + + AMAP (Association pour le Maintien d’une Agriculture + Paysanne) + + + + fr.insee + CA-jrqgl3lm-54 + 1.0 + + Sécurité, protection civile, sauvetage, + secourisme + + + + fr.insee + CA-jrqgl3lm-55 + 1.0 + + + + Action sociale, action humanitaire et caritative sans + hébergement + + + + + + fr.insee + CA-jrqgl3lm-56 + 1.0 + + Aide à l'emploi, activités d'insertion professionnelle, + missions locales pour l'emploi, associations intermédiaires + + + + fr.insee + CA-jrqgl3lm-57 + 1.0 + + Accueil ou accompagnement sans hébergement d'adultes + handicapés ou de personnes âgées + + + + fr.insee + CA-jrqgl3lm-58 + 1.0 + + Aide par le travail pour les salariés handicapés + + + + + fr.insee + CA-jrqgl3lm-59 + 1.0 + + Accueil de jeunes enfants sans hébergement + + + + fr.insee + CA-jrqgl3lm-60 + 1.0 + + Accueil ou accompagnement sans hébergement d'enfants + handicapés + + + + fr.insee + CA-jrqgl3lm-61 + 1.0 + + Autre accueil ou accompagnement sans hébergement + d'enfants et d'adolescents + + + + fr.insee + CA-jrqgl3lm-62 + 1.0 + + Aide au logement + + + + fr.insee + CA-jrqgl3lm-63 + 1.0 + + Aide à domicile + + + + fr.insee + CA-jrqgl3lm-64 + 1.0 + + Aide aux migrants + + + + fr.insee + CA-jrqgl3lm-65 + 1.0 + + Associations caritatives, humanitaires (y compris aide + internationale) et autre action sociale + + + + fr.insee + CA-jrqgl3lm-66 + 1.0 + + + + Enseignement, formation et recherche + + + + + + fr.insee + CA-jrqgl3lm-67 + 1.0 + + Enseignement pré-primaire ou primaire + + + + fr.insee + CA-jrqgl3lm-68 + 1.0 + + Enseignement secondaire général, technique ou + professionnel + + + + fr.insee + CA-jrqgl3lm-69 + 1.0 + + Enseignement supérieur + + + + fr.insee + CA-jrqgl3lm-70 + 1.0 + + Enseignement d'activités culturelles et de loisirs (y + compris écoles de danse, musique, arts plastiques, etc.) + + + + fr.insee + CA-jrqgl3lm-71 + 1.0 + + Formation continue d'adultes + + + + fr.insee + CA-jrqgl3lm-72 + 1.0 + + Autres formes d’enseignements dont soutien scolaire + + + + + fr.insee + CA-jrqgl3lm-73 + 1.0 + + Recherche (hors recherche médicale) + + + + + fr.insee + CategoryScheme-js0d86zt + 1.0 + + Contrats + + + fr.insee + CA-js0d86zt--1 + 1.0 + + + des salariés en contrat aidé (CUI-CAE, CUI-CIE, PEC, + IAE, CDDI, emplois d’avenir, + apprentissage…) + + + + + fr.insee + CA-js0d86zt-0 + 1.0 + + + des salariés en contrat à durée indéterminée (CDI) non + aidé + + + + + fr.insee + CA-js0d86zt-1 + 1.0 + + + des salariés en contrat à durée déterminée (CDD) non + aidé (y compris contrat d’usage, contrat d’engagement + éducatif) + + + + + + fr.insee + CategoryScheme-jseocrba + 1.0 + + temps travail + + + fr.insee + CA-jseocrba--1 + 1.0 + + Salariés à temps plein (au moins 35h par + semaine) + + + + fr.insee + CA-jseocrba-0 + 1.0 + + Salariés à temps partiel (moins de 35h par + semaine) + + + + fr.insee + CA-jseocrba-1 + 1.0 + + + + - dont salariés à temps partiel réduit (moins de 17h30 par + semaine) + + + + + + + fr.insee + CategoryScheme-jtsfadi0 + 1.0 + + autres_cat_personnel_infobulles + + + fr.insee + CA-jtsfadi0--1 + 1.0 + + + Des intérimaires + + + + + fr.insee + CA-jtsfadi0-0 + 1.0 + + + Des personnels mis à disposition autres que les intérimaires (y compris mécénat de compétences) + + + + + fr.insee + CA-jtsfadi0-1 + 1.0 + + + Des volontaires (service civique, sapeurs + pompiers...) + + + + + fr.insee + CA-jtsfadi0-2 + 1.0 + + D'autres personnes non mentionnées ci-dessus + (stagiaires...) + + + + + fr.insee + CategoryScheme-js0dkszc + 1.0 + + autres catégories de personnel + + + fr.insee + CA-js0dkszc--1 + 1.0 + + Des intérimaires + + + + fr.insee + CA-js0dkszc-0 + 1.0 + + Des personnels mis à disposition autres que les + intérimaires (y compris mécénat de compétences) + + + + fr.insee + CA-js0dkszc-1 + 1.0 + + Des volontaires (service civique, sapeurs + pompiers…) + + + + fr.insee + CA-js0dkszc-2 + 1.0 + + D’autres personnes non mentionnées ci-dessus + (stagiaires…) + + + + + fr.insee + CategoryScheme-js0eqly4 + 1.0 + + heures bénévoles + + + fr.insee + CA-js0eqly4--1 + 1.0 + + + Estimation du nombre d’heures effectuées par des bénévoles, quel + que soit leur rôle (bénévoles réguliers ou occasionnels, y compris + bénévoles membres du bureau ou du conseil d'administration) + + + + + fr.insee + CA-js0eqly4-0 + 1.0 + + + + - dont effectuées par des + + bénévoles « réguliers » + + + + + + + + fr.insee + CategoryScheme-js0f2fiv + 1.0 + + ressources + + + fr.insee + CA-js0f2fiv--1 + 1.0 + + + Cotisations perçues + + + + + fr.insee + CA-js0f2fiv-0 + 1.0 + + Dons des particuliers + + + + fr.insee + CA-js0f2fiv-1 + 1.0 + + + Donations et legs (ou « libéralités ») + + + + + fr.insee + CA-js0f2fiv-2 + 1.0 + + Mécénat, sponsoring ou parrainage + d’entreprise + + + + fr.insee + CA-js0f2fiv-3 + 1.0 + + Financements en provenance d’autres associations + (fédérations, ligues…) ou de fondations + + + + fr.insee + CA-js0f2fiv-4 + 1.0 + + + Recettes d’activité d’origine privée ou + publique (ventes de marchandises et prestations de + services réalisées auprès des particuliers, de personnes morales privées ou des + collectivités publiques) + + + + + fr.insee + CA-js0f2fiv-5 + 1.0 + + + - dont recettes d’activité d’origine publique + (commandes publiques, marchés publics et délégations de service public, + dotations, prix de journées, produits de tarification…) + + + + + fr.insee + CA-js0f2fiv-6 + 1.0 + + + Subventions publiques + + + + + fr.insee + CA-js0f2fiv-7 + 1.0 + + Autres ressources courantes + + + + fr.insee + CA-js0f2fiv-8 + 1.0 + + + + Total des produits d’exploitation (ressources courantes) + + + + + + + fr.insee + CategoryScheme-js0ghnlg + 1.0 + + origine + + + fr.insee + CA-js0ghnlg--1 + 1.0 + + + Communes, EPCI (communautés de communes, + métropoles…) ? + + + + + fr.insee + CA-js0ghnlg-0 + 1.0 + + Départements, conseils départementaux + + + + fr.insee + CA-js0ghnlg-1 + 1.0 + + Régions, conseils régionaux + + + + fr.insee + CA-js0ghnlg-2 + 1.0 + + + État (ministères, ARS, DREAL…) + + + + + fr.insee + CA-js0ghnlg-3 + 1.0 + + Union européenne + + + + fr.insee + CA-js0ghnlg-4 + 1.0 + + + Organismes sociaux (Pôle emploi, CAF, CNSA, + MSA…) + + + + + fr.insee + CA-js0ghnlg-5 + 1.0 + + Autres + + + + fr.insee + CA-js0ghnlg-6 + 1.0 + + + + Total + + + + + + + fr.insee + CategoryScheme-js0g8wkq + 1.0 + + subventions recettes + + + fr.insee + CA-js0g8wkq--1 + 1.0 + + Subventions publiques + + + + fr.insee + CA-js0g8wkq-0 + 1.0 + + Recettes d'activité d'origine publique + + + + + fr.insee + CategoryScheme-js0gyyn3 + 1.0 + + charges + + + fr.insee + CA-js0gyyn3--1 + 1.0 + + Charges de personnel (salaires et traitements, charges + sociales et autres charges de personnel) + + + + fr.insee + CA-js0gyyn3-0 + 1.0 + + Impôts, taxes et versements assimilés + + + + fr.insee + CA-js0gyyn3-1 + 1.0 + + Autres dépenses courantes (achats, services extérieurs, + dépenses de loyers…) + + + + fr.insee + CA-js0gyyn3-2 + 1.0 + + - dont dépenses de loyers, de charges locatives, + d'entretien, de réparations et d'assurances + + + + fr.insee + CA-js0gyyn3-3 + 1.0 + + - dont dépenses de formation du personnel + + + + fr.insee + CA-js0gyyn3-4 + 1.0 + + - dont cotisations et licences reversées à des + fédérations + + + + fr.insee + CA-js0gyyn3-5 + 1.0 + + - dont achats de services à des prestataires ou + intervenants, y compris micro-entrepreneurs + + + + fr.insee + CA-js0gyyn3-6 + 1.0 + + + + Total des charges d'exploitation (dépenses courantes) + + + + + + + fr.insee + CategoryScheme-js1w4chj + 1.0 + + préférence + + + fr.insee + CA-js1w4chj--1 + 1.0 + + En nombre de jours dans l'année + + + + fr.insee + CA-js1w4chj-0 + 1.0 + + En nombre d'heures dans l'année + + + + + fr.insee + CategoryScheme-js1wcn8q + 1.0 + + Origine MAD + + + fr.insee + CA-js1wcn8q--1 + 1.0 + + Un particulier (personne physique) + + + + fr.insee + CA-js1wcn8q-0 + 1.0 + + Une commune + + + + fr.insee + CA-js1wcn8q-1 + 1.0 + + Un autre intervenant du secteur public + + + + fr.insee + CA-js1wcn8q-2 + 1.0 + + Une autre association ou fondation + + + + fr.insee + CA-js1wcn8q-3 + 1.0 + + Une entreprise privée + + + + fr.insee + CA-js1wcn8q-4 + 1.0 + + Un autre partenaire + + + + + fr.insee + CategoryScheme-js1xruca + 1.0 + + L_Motifs + + + fr.insee + CA-js1xruca--1 + 1.0 + + Obligation d'adhésion ou d'affiliation + + + + fr.insee + CA-js1xruca-0 + 1.0 + + Échanges d'informations + + + + fr.insee + CA-js1xruca-1 + 1.0 + + Mise à disposition de ressources humaines + + + + fr.insee + CA-js1xruca-2 + 1.0 + + Mise en commun de moyens financiers + + + + fr.insee + CA-js1xruca-3 + 1.0 + + Partage d'outils (de gestion, de formation...) + + + + + fr.insee + CA-js1xruca-4 + 1.0 + + Possibilité d'augmenter ou d'élargir l'activité de votre + association + + + + fr.insee + CA-js1xruca-5 + 1.0 + + Augmentation de l'influence de votre association auprès + des décideurs publics ou du grand public + + + + fr.insee + CA-js1xruca-6 + 1.0 + + Meilleure coordination avec les autres associations + agissant sur un même territoire + + + + + fr.insee + CategoryScheme-jrkcrrfa-secondDimension-fakeCL-1 + 1.0 + + FAKE-CODELIST-jrkcrrfa-secondDimension-fakeCL-1 + + + fr.insee + CA-jrkcrrfa-secondDimension-fakeCL-1--1 + 1.0 + + Nombre d'adhérents en 2018 + + + + + fr.insee + CategoryScheme-jrqgfzes-secondDimension-fakeCL-1 + 1.0 + + FAKE-CODELIST-jrqgfzes-secondDimension-fakeCL-1 + + + fr.insee + CA-jrqgfzes-secondDimension-fakeCL-1--1 + 1.0 + + Activité représentant le mieux votre + association Indiquez 1, 2 ou 3 + + + + + fr.insee + CategoryScheme-js0dpd65-secondDimension-fakeCL-1 + 1.0 + + FAKE-CODELIST-js0dpd65-secondDimension-fakeCL-1 + + + fr.insee + CA-js0dpd65-secondDimension-fakeCL-1--1 + 1.0 + + Nombre d'heures de travail rémunérées en 2018 + + + + + fr.insee + CategoryScheme-jseoe6ty-secondDimension-fakeCL-1 + 1.0 + + FAKE-CODELIST-jseoe6ty-secondDimension-fakeCL-1 + + + fr.insee + CA-jseoe6ty-secondDimension-fakeCL-1--1 + 1.0 + + Nombre de salariés + + + + + fr.insee + CategoryScheme-js0dwvc2-secondDimension-fakeCL-1 + 1.0 + + FAKE-CODELIST-js0dwvc2-secondDimension-fakeCL-1 + + + fr.insee + CA-js0dwvc2-secondDimension-fakeCL-1--1 + 1.0 + + Nombre d'heures travaillées en 2018 + + + + + fr.insee + CategoryScheme-js0eg1cf-secondDimension-fakeCL-1 + 1.0 + + FAKE-CODELIST-js0eg1cf-secondDimension-fakeCL-1 + + + fr.insee + CA-js0eg1cf-secondDimension-fakeCL-1--1 + 1.0 + + Nombre d'heures + + + + + fr.insee + CategoryScheme-js0f7q4i-secondDimension-fakeCL-1 + 1.0 + + FAKE-CODELIST-js0f7q4i-secondDimension-fakeCL-1 + + + fr.insee + CA-js0f7q4i-secondDimension-fakeCL-1--1 + 1.0 + + Montants en euros + + + + + fr.insee + CategoryScheme-js0gv8ia-secondDimension-fakeCL-1 + 1.0 + + FAKE-CODELIST-js0gv8ia-secondDimension-fakeCL-1 + + + fr.insee + CA-js0gv8ia-secondDimension-fakeCL-1--1 + 1.0 + + Dépenses + + + + + fr.insee + CategoryScheme-jmuk1uzy2 + 1.0 + + A définir + + + fr.insee + INSEE-COMMUN-CA-Booleen-1 + 1.0 + + + + + + + fr.insee + ASSOCIATIONS-CLS + 1.0 + + ASSOCIATIONS + + + fr.insee + jqxvqakq + 1.0 + + OuiNon + + Regular + + Ordinal + + + fr.insee + jqxvqakq--1 + 1.0 + + fr.insee + CA-jqxvqakq--1 + 1.0 + Category + + 1 + + + fr.insee + jqxvqakq-0 + 1.0 + + fr.insee + CA-jqxvqakq-0 + 1.0 + Category + + 0 + + + + fr.insee + jqxxby4z + 1.0 + + OuiNonNesaispas + + Regular + + Ordinal + + + fr.insee + jqxxby4z--1 + 1.0 + + fr.insee + CA-jqxxby4z--1 + 1.0 + Category + + 1 + + + fr.insee + jqxxby4z-0 + 1.0 + + fr.insee + CA-jqxxby4z-0 + 1.0 + Category + + 0 + + + fr.insee + jqxxby4z-1 + 1.0 + + fr.insee + CA-jqxxby4z-1 + 1.0 + Category + + 2 + + + + fr.insee + jqxxwdxu + 1.0 + + Niveau_geographique + + Regular + + Ordinal + + + fr.insee + jqxxwdxu--1 + 1.0 + + fr.insee + CA-jqxxwdxu--1 + 1.0 + Category + + 1 + + + fr.insee + jqxxwdxu-0 + 1.0 + + fr.insee + CA-jqxxwdxu-0 + 1.0 + Category + + 2 + + + fr.insee + jqxxwdxu-1 + 1.0 + + fr.insee + CA-jqxxwdxu-1 + 1.0 + Category + + 3 + + + fr.insee + jqxxwdxu-2 + 1.0 + + fr.insee + CA-jqxxwdxu-2 + 1.0 + Category + + 4 + + + fr.insee + jqxxwdxu-3 + 1.0 + + fr.insee + CA-jqxxwdxu-3 + 1.0 + Category + + 5 + + + fr.insee + jqxxwdxu-4 + 1.0 + + fr.insee + CA-jqxxwdxu-4 + 1.0 + Category + + 6 + + + fr.insee + jqxxwdxu-5 + 1.0 + + fr.insee + CA-jqxxwdxu-5 + 1.0 + Category + + 7 + + + + fr.insee + jqxy4o08 + 1.0 + + DegreActiveEtrg + + Regular + + Ordinal + + + fr.insee + jqxy4o08--1 + 1.0 + + fr.insee + CA-jqxy4o08--1 + 1.0 + Category + + 2 + + + fr.insee + jqxy4o08-0 + 1.0 + + fr.insee + CA-jqxy4o08-0 + 1.0 + Category + + 1 + + + fr.insee + jqxy4o08-1 + 1.0 + + fr.insee + CA-jqxy4o08-1 + 1.0 + Category + + 0 + + + + fr.insee + jrjdn9sk + 1.0 + + OuiNonP + + Regular + + Ordinal + + + fr.insee + jrjdn9sk--1 + 1.0 + + fr.insee + CA-jrjdn9sk--1 + 1.0 + Category + + 1 + + + fr.insee + jrjdn9sk-0 + 1.0 + + fr.insee + CA-jrjdn9sk-0 + 1.0 + Category + + 2 + + + fr.insee + jrjdn9sk-1 + 1.0 + + fr.insee + CA-jrjdn9sk-1 + 1.0 + Category + + 0 + + + + fr.insee + jrjdm6kc + 1.0 + + sexe + + Regular + + Ordinal + + + fr.insee + jrjdm6kc--1 + 1.0 + + fr.insee + CA-jrjdm6kc--1 + 1.0 + Category + + 2 + + + fr.insee + jrjdm6kc-0 + 1.0 + + fr.insee + CA-jrjdm6kc-0 + 1.0 + Category + + 1 + + + + fr.insee + jrje5vjq + 1.0 + + Statut + + Regular + + Ordinal + + + fr.insee + jrje5vjq--1 + 1.0 + + fr.insee + CA-jrje5vjq--1 + 1.0 + Category + + 1 + + + fr.insee + jrje5vjq-0 + 1.0 + + fr.insee + CA-jrje5vjq-0 + 1.0 + Category + + 2 + + + fr.insee + jrje5vjq-1 + 1.0 + + fr.insee + CA-jrje5vjq-1 + 1.0 + Category + + 3 + + + fr.insee + jrje5vjq-2 + 1.0 + + fr.insee + CA-jrje5vjq-2 + 1.0 + Category + + 4 + + + fr.insee + jrje5vjq-3 + 1.0 + + fr.insee + CA-jrje5vjq-3 + 1.0 + Category + + 5 + + + fr.insee + jrje5vjq-4 + 1.0 + + fr.insee + CA-jrje5vjq-4 + 1.0 + Category + + 6 + + + + fr.insee + jrkctpmr + 1.0 + + nature adhérents + + Regular + + Ordinal + + + fr.insee + jrkctpmr--1 + 1.0 + + fr.insee + CA-jrkctpmr--1 + 1.0 + Category + + 1 + + + fr.insee + jrkctpmr-0 + 1.0 + + fr.insee + CA-jrkctpmr-0 + 1.0 + Category + + 2 + + + fr.insee + jrkctpmr-1 + 1.0 + + fr.insee + CA-jrkctpmr-1 + 1.0 + Category + + 3 + + + fr.insee + jrkctpmr-2 + 1.0 + + fr.insee + CA-jrkctpmr-2 + 1.0 + Category + + 4 + + + fr.insee + jrkctpmr-3 + 1.0 + + fr.insee + CA-jrkctpmr-3 + 1.0 + Category + + 5 + + + + fr.insee + jrqgl3lm + 1.0 + + L_ACTIVITES + + Regular + + Ordinal + + + fr.insee + jrqgl3lm--1 + 1.0 + + fr.insee + CA-jrqgl3lm--1 + 1.0 + Category + + 1 + + + fr.insee + jrqgl3lm-0 + 1.0 + + fr.insee + CA-jrqgl3lm-0 + 1.0 + Category + + 2 + + + fr.insee + jrqgl3lm-1 + 1.0 + + fr.insee + CA-jrqgl3lm-1 + 1.0 + Category + + 3 + + + fr.insee + jrqgl3lm-2 + 1.0 + + fr.insee + CA-jrqgl3lm-2 + 1.0 + Category + + 4 + + + fr.insee + jrqgl3lm-3 + 1.0 + + fr.insee + CA-jrqgl3lm-3 + 1.0 + Category + + 5 + + + fr.insee + jrqgl3lm-4 + 1.0 + + fr.insee + CA-jrqgl3lm-4 + 1.0 + Category + + 6 + + + fr.insee + jrqgl3lm-5 + 1.0 + + fr.insee + CA-jrqgl3lm-5 + 1.0 + Category + + 7 + + + fr.insee + jrqgl3lm-6 + 1.0 + + fr.insee + CA-jrqgl3lm-6 + 1.0 + Category + + 8 + + + fr.insee + jrqgl3lm-7 + 1.0 + + fr.insee + CA-jrqgl3lm-7 + 1.0 + Category + + 9 + + + fr.insee + jrqgl3lm-8 + 1.0 + + fr.insee + CA-jrqgl3lm-8 + 1.0 + Category + + 10 + + + fr.insee + jrqgl3lm-9 + 1.0 + + fr.insee + CA-jrqgl3lm-9 + 1.0 + Category + + 11 + + + fr.insee + jrqgl3lm-10 + 1.0 + + fr.insee + CA-jrqgl3lm-10 + 1.0 + Category + + 12 + + + fr.insee + jrqgl3lm-11 + 1.0 + + fr.insee + CA-jrqgl3lm-11 + 1.0 + Category + + 13 + + + fr.insee + jrqgl3lm-12 + 1.0 + + fr.insee + CA-jrqgl3lm-12 + 1.0 + Category + + 14 + + + fr.insee + jrqgl3lm-13 + 1.0 + + fr.insee + CA-jrqgl3lm-13 + 1.0 + Category + + 15 + + + fr.insee + jrqgl3lm-14 + 1.0 + + fr.insee + CA-jrqgl3lm-14 + 1.0 + Category + + 16 + + + fr.insee + jrqgl3lm-15 + 1.0 + + fr.insee + CA-jrqgl3lm-15 + 1.0 + Category + + 17 + + + fr.insee + jrqgl3lm-16 + 1.0 + + fr.insee + CA-jrqgl3lm-16 + 1.0 + Category + + 18 + + + fr.insee + jrqgl3lm-17 + 1.0 + + fr.insee + CA-jrqgl3lm-17 + 1.0 + Category + + 19 + + + fr.insee + jrqgl3lm-18 + 1.0 + + fr.insee + CA-jrqgl3lm-18 + 1.0 + Category + + 20 + + + fr.insee + jrqgl3lm-19 + 1.0 + + fr.insee + CA-jrqgl3lm-19 + 1.0 + Category + + 21 + + + fr.insee + jrqgl3lm-20 + 1.0 + + fr.insee + CA-jrqgl3lm-20 + 1.0 + Category + + 22 + + + fr.insee + jrqgl3lm-21 + 1.0 + + fr.insee + CA-jrqgl3lm-21 + 1.0 + Category + + 23 + + + fr.insee + jrqgl3lm-22 + 1.0 + + fr.insee + CA-jrqgl3lm-22 + 1.0 + Category + + 24 + + + fr.insee + jrqgl3lm-23 + 1.0 + + fr.insee + CA-jrqgl3lm-23 + 1.0 + Category + + 25 + + + fr.insee + jrqgl3lm-24 + 1.0 + + fr.insee + CA-jrqgl3lm-24 + 1.0 + Category + + 26 + + + fr.insee + jrqgl3lm-25 + 1.0 + + fr.insee + CA-jrqgl3lm-25 + 1.0 + Category + + 27 + + + fr.insee + jrqgl3lm-26 + 1.0 + + fr.insee + CA-jrqgl3lm-26 + 1.0 + Category + + 28 + + + fr.insee + jrqgl3lm-27 + 1.0 + + fr.insee + CA-jrqgl3lm-27 + 1.0 + Category + + 29 + + + fr.insee + jrqgl3lm-28 + 1.0 + + fr.insee + CA-jrqgl3lm-28 + 1.0 + Category + + 30 + + + fr.insee + jrqgl3lm-29 + 1.0 + + fr.insee + CA-jrqgl3lm-29 + 1.0 + Category + + 31 + + + fr.insee + jrqgl3lm-30 + 1.0 + + fr.insee + CA-jrqgl3lm-30 + 1.0 + Category + + 32 + + + fr.insee + jrqgl3lm-31 + 1.0 + + fr.insee + CA-jrqgl3lm-31 + 1.0 + Category + + 33 + + + fr.insee + jrqgl3lm-32 + 1.0 + + fr.insee + CA-jrqgl3lm-32 + 1.0 + Category + + 34 + + + fr.insee + jrqgl3lm-33 + 1.0 + + fr.insee + CA-jrqgl3lm-33 + 1.0 + Category + + 35 + + + fr.insee + jrqgl3lm-34 + 1.0 + + fr.insee + CA-jrqgl3lm-34 + 1.0 + Category + + 36 + + + fr.insee + jrqgl3lm-35 + 1.0 + + fr.insee + CA-jrqgl3lm-35 + 1.0 + Category + + 37 + + + fr.insee + jrqgl3lm-36 + 1.0 + + fr.insee + CA-jrqgl3lm-36 + 1.0 + Category + + 38 + + + fr.insee + jrqgl3lm-37 + 1.0 + + fr.insee + CA-jrqgl3lm-37 + 1.0 + Category + + 39 + + + fr.insee + jrqgl3lm-38 + 1.0 + + fr.insee + CA-jrqgl3lm-38 + 1.0 + Category + + 40 + + + fr.insee + jrqgl3lm-39 + 1.0 + + fr.insee + CA-jrqgl3lm-39 + 1.0 + Category + + 41 + + + fr.insee + jrqgl3lm-40 + 1.0 + + fr.insee + CA-jrqgl3lm-40 + 1.0 + Category + + 42 + + + fr.insee + jrqgl3lm-41 + 1.0 + + fr.insee + CA-jrqgl3lm-41 + 1.0 + Category + + 43 + + + fr.insee + jrqgl3lm-42 + 1.0 + + fr.insee + CA-jrqgl3lm-42 + 1.0 + Category + + 44 + + + fr.insee + jrqgl3lm-43 + 1.0 + + fr.insee + CA-jrqgl3lm-43 + 1.0 + Category + + 45 + + + fr.insee + jrqgl3lm-44 + 1.0 + + fr.insee + CA-jrqgl3lm-44 + 1.0 + Category + + 46 + + + fr.insee + jrqgl3lm-45 + 1.0 + + fr.insee + CA-jrqgl3lm-45 + 1.0 + Category + + 47 + + + fr.insee + jrqgl3lm-46 + 1.0 + + fr.insee + CA-jrqgl3lm-46 + 1.0 + Category + + 48 + + + fr.insee + jrqgl3lm-47 + 1.0 + + fr.insee + CA-jrqgl3lm-47 + 1.0 + Category + + 49 + + + fr.insee + jrqgl3lm-48 + 1.0 + + fr.insee + CA-jrqgl3lm-48 + 1.0 + Category + + 50 + + + fr.insee + jrqgl3lm-49 + 1.0 + + fr.insee + CA-jrqgl3lm-49 + 1.0 + Category + + 51 + + + fr.insee + jrqgl3lm-50 + 1.0 + + fr.insee + CA-jrqgl3lm-50 + 1.0 + Category + + 52 + + + fr.insee + jrqgl3lm-51 + 1.0 + + fr.insee + CA-jrqgl3lm-51 + 1.0 + Category + + 53 + + + fr.insee + jrqgl3lm-52 + 1.0 + + fr.insee + CA-jrqgl3lm-52 + 1.0 + Category + + 54 + + + fr.insee + jrqgl3lm-53 + 1.0 + + fr.insee + CA-jrqgl3lm-53 + 1.0 + Category + + 55 + + + fr.insee + jrqgl3lm-54 + 1.0 + + fr.insee + CA-jrqgl3lm-54 + 1.0 + Category + + 56 + + + fr.insee + jrqgl3lm-55 + 1.0 + + fr.insee + CA-jrqgl3lm-55 + 1.0 + Category + + 57 + + + fr.insee + jrqgl3lm-56 + 1.0 + + fr.insee + CA-jrqgl3lm-56 + 1.0 + Category + + 58 + + + fr.insee + jrqgl3lm-57 + 1.0 + + fr.insee + CA-jrqgl3lm-57 + 1.0 + Category + + 59 + + + fr.insee + jrqgl3lm-58 + 1.0 + + fr.insee + CA-jrqgl3lm-58 + 1.0 + Category + + 60 + + + fr.insee + jrqgl3lm-59 + 1.0 + + fr.insee + CA-jrqgl3lm-59 + 1.0 + Category + + 61 + + + fr.insee + jrqgl3lm-60 + 1.0 + + fr.insee + CA-jrqgl3lm-60 + 1.0 + Category + + 62 + + + fr.insee + jrqgl3lm-61 + 1.0 + + fr.insee + CA-jrqgl3lm-61 + 1.0 + Category + + 63 + + + fr.insee + jrqgl3lm-62 + 1.0 + + fr.insee + CA-jrqgl3lm-62 + 1.0 + Category + + 64 + + + fr.insee + jrqgl3lm-63 + 1.0 + + fr.insee + CA-jrqgl3lm-63 + 1.0 + Category + + 65 + + + fr.insee + jrqgl3lm-64 + 1.0 + + fr.insee + CA-jrqgl3lm-64 + 1.0 + Category + + 66 + + + fr.insee + jrqgl3lm-65 + 1.0 + + fr.insee + CA-jrqgl3lm-65 + 1.0 + Category + + 67 + + + fr.insee + jrqgl3lm-66 + 1.0 + + fr.insee + CA-jrqgl3lm-66 + 1.0 + Category + + 68 + + + fr.insee + jrqgl3lm-67 + 1.0 + + fr.insee + CA-jrqgl3lm-67 + 1.0 + Category + + 69 + + + fr.insee + jrqgl3lm-68 + 1.0 + + fr.insee + CA-jrqgl3lm-68 + 1.0 + Category + + 70 + + + fr.insee + jrqgl3lm-69 + 1.0 + + fr.insee + CA-jrqgl3lm-69 + 1.0 + Category + + 71 + + + fr.insee + jrqgl3lm-70 + 1.0 + + fr.insee + CA-jrqgl3lm-70 + 1.0 + Category + + 72 + + + fr.insee + jrqgl3lm-71 + 1.0 + + fr.insee + CA-jrqgl3lm-71 + 1.0 + Category + + 73 + + + fr.insee + jrqgl3lm-72 + 1.0 + + fr.insee + CA-jrqgl3lm-72 + 1.0 + Category + + 74 + + + fr.insee + jrqgl3lm-73 + 1.0 + + fr.insee + CA-jrqgl3lm-73 + 1.0 + Category + + 75 + + + + fr.insee + js0d86zt + 1.0 + + Contrats + + Regular + + Ordinal + + + fr.insee + js0d86zt--1 + 1.0 + + fr.insee + CA-js0d86zt--1 + 1.0 + Category + + 1 + + + fr.insee + js0d86zt-0 + 1.0 + + fr.insee + CA-js0d86zt-0 + 1.0 + Category + + 2 + + + fr.insee + js0d86zt-1 + 1.0 + + fr.insee + CA-js0d86zt-1 + 1.0 + Category + + 3 + + + + fr.insee + jseocrba + 1.0 + + temps travail + + Regular + + Ordinal + + + fr.insee + jseocrba--1 + 1.0 + + fr.insee + CA-jseocrba--1 + 1.0 + Category + + 1 + + + fr.insee + jseocrba-0 + 1.0 + + fr.insee + CA-jseocrba-0 + 1.0 + Category + + 2 + + + fr.insee + jseocrba-1 + 1.0 + + fr.insee + CA-jseocrba-1 + 1.0 + Category + + 3 + + + + fr.insee + jtsfadi0 + 1.0 + + autres_cat_personnel_infobulles + + Regular + + Ordinal + + + fr.insee + jtsfadi0--1 + 1.0 + + fr.insee + CA-jtsfadi0--1 + 1.0 + Category + + 1 + + + fr.insee + jtsfadi0-0 + 1.0 + + fr.insee + CA-jtsfadi0-0 + 1.0 + Category + + 2 + + + fr.insee + jtsfadi0-1 + 1.0 + + fr.insee + CA-jtsfadi0-1 + 1.0 + Category + + 3 + + + fr.insee + jtsfadi0-2 + 1.0 + + fr.insee + CA-jtsfadi0-2 + 1.0 + Category + + 4 + + + + fr.insee + js0dkszc + 1.0 + + autres catégories de personnel + + Regular + + Ordinal + + + fr.insee + js0dkszc--1 + 1.0 + + fr.insee + CA-js0dkszc--1 + 1.0 + Category + + 1 + + + fr.insee + js0dkszc-0 + 1.0 + + fr.insee + CA-js0dkszc-0 + 1.0 + Category + + 2 + + + fr.insee + js0dkszc-1 + 1.0 + + fr.insee + CA-js0dkszc-1 + 1.0 + Category + + 3 + + + fr.insee + js0dkszc-2 + 1.0 + + fr.insee + CA-js0dkszc-2 + 1.0 + Category + + 4 + + + + fr.insee + js0eqly4 + 1.0 + + heures bénévoles + + Regular + + Ordinal + + + fr.insee + js0eqly4--1 + 1.0 + + fr.insee + CA-js0eqly4--1 + 1.0 + Category + + 1 + + + fr.insee + js0eqly4-0 + 1.0 + + fr.insee + CA-js0eqly4-0 + 1.0 + Category + + 2 + + + + fr.insee + js0f2fiv + 1.0 + + ressources + + Regular + + Ordinal + + + fr.insee + js0f2fiv--1 + 1.0 + + fr.insee + CA-js0f2fiv--1 + 1.0 + Category + + 1 + + + fr.insee + js0f2fiv-0 + 1.0 + + fr.insee + CA-js0f2fiv-0 + 1.0 + Category + + 2 + + + fr.insee + js0f2fiv-1 + 1.0 + + fr.insee + CA-js0f2fiv-1 + 1.0 + Category + + 3 + + + fr.insee + js0f2fiv-2 + 1.0 + + fr.insee + CA-js0f2fiv-2 + 1.0 + Category + + 4 + + + fr.insee + js0f2fiv-3 + 1.0 + + fr.insee + CA-js0f2fiv-3 + 1.0 + Category + + 5 + + + fr.insee + js0f2fiv-4 + 1.0 + + fr.insee + CA-js0f2fiv-4 + 1.0 + Category + + 6 + + + fr.insee + js0f2fiv-5 + 1.0 + + fr.insee + CA-js0f2fiv-5 + 1.0 + Category + + 7 + + + fr.insee + js0f2fiv-6 + 1.0 + + fr.insee + CA-js0f2fiv-6 + 1.0 + Category + + 8 + + + fr.insee + js0f2fiv-7 + 1.0 + + fr.insee + CA-js0f2fiv-7 + 1.0 + Category + + 9 + + + fr.insee + js0f2fiv-8 + 1.0 + + fr.insee + CA-js0f2fiv-8 + 1.0 + Category + + 10 + + + + fr.insee + js0ghnlg + 1.0 + + origine + + Regular + + Ordinal + + + fr.insee + js0ghnlg--1 + 1.0 + + fr.insee + CA-js0ghnlg--1 + 1.0 + Category + + 1 + + + fr.insee + js0ghnlg-0 + 1.0 + + fr.insee + CA-js0ghnlg-0 + 1.0 + Category + + 2 + + + fr.insee + js0ghnlg-1 + 1.0 + + fr.insee + CA-js0ghnlg-1 + 1.0 + Category + + 3 + + + fr.insee + js0ghnlg-2 + 1.0 + + fr.insee + CA-js0ghnlg-2 + 1.0 + Category + + 4 + + + fr.insee + js0ghnlg-3 + 1.0 + + fr.insee + CA-js0ghnlg-3 + 1.0 + Category + + 5 + + + fr.insee + js0ghnlg-4 + 1.0 + + fr.insee + CA-js0ghnlg-4 + 1.0 + Category + + 6 + + + fr.insee + js0ghnlg-5 + 1.0 + + fr.insee + CA-js0ghnlg-5 + 1.0 + Category + + 7 + + + fr.insee + js0ghnlg-6 + 1.0 + + fr.insee + CA-js0ghnlg-6 + 1.0 + Category + + 8 + + + + fr.insee + js0g8wkq + 1.0 + + subventions recettes + + Regular + + Ordinal + + + fr.insee + js0g8wkq--1 + 1.0 + + fr.insee + CA-js0g8wkq--1 + 1.0 + Category + + 1 + + + fr.insee + js0g8wkq-0 + 1.0 + + fr.insee + CA-js0g8wkq-0 + 1.0 + Category + + 2 + + + + fr.insee + js0gyyn3 + 1.0 + + charges + + Regular + + Ordinal + + + fr.insee + js0gyyn3--1 + 1.0 + + fr.insee + CA-js0gyyn3--1 + 1.0 + Category + + 1 + + + fr.insee + js0gyyn3-0 + 1.0 + + fr.insee + CA-js0gyyn3-0 + 1.0 + Category + + 2 + + + fr.insee + js0gyyn3-1 + 1.0 + + fr.insee + CA-js0gyyn3-1 + 1.0 + Category + + 3 + + + fr.insee + js0gyyn3-2 + 1.0 + + fr.insee + CA-js0gyyn3-2 + 1.0 + Category + + 4 + + + fr.insee + js0gyyn3-3 + 1.0 + + fr.insee + CA-js0gyyn3-3 + 1.0 + Category + + 5 + + + fr.insee + js0gyyn3-4 + 1.0 + + fr.insee + CA-js0gyyn3-4 + 1.0 + Category + + 6 + + + fr.insee + js0gyyn3-5 + 1.0 + + fr.insee + CA-js0gyyn3-5 + 1.0 + Category + + 7 + + + fr.insee + js0gyyn3-6 + 1.0 + + fr.insee + CA-js0gyyn3-6 + 1.0 + Category + + 8 + + + + fr.insee + js1w4chj + 1.0 + + préférence + + Regular + + Ordinal + + + fr.insee + js1w4chj--1 + 1.0 + + fr.insee + CA-js1w4chj--1 + 1.0 + Category + + 1 + + + fr.insee + js1w4chj-0 + 1.0 + + fr.insee + CA-js1w4chj-0 + 1.0 + Category + + 2 + + + + fr.insee + js1wcn8q + 1.0 + + Origine MAD + + Regular + + Ordinal + + + fr.insee + js1wcn8q--1 + 1.0 + + fr.insee + CA-js1wcn8q--1 + 1.0 + Category + + 1 + + + fr.insee + js1wcn8q-0 + 1.0 + + fr.insee + CA-js1wcn8q-0 + 1.0 + Category + + 2 + + + fr.insee + js1wcn8q-1 + 1.0 + + fr.insee + CA-js1wcn8q-1 + 1.0 + Category + + 3 + + + fr.insee + js1wcn8q-2 + 1.0 + + fr.insee + CA-js1wcn8q-2 + 1.0 + Category + + 4 + + + fr.insee + js1wcn8q-3 + 1.0 + + fr.insee + CA-js1wcn8q-3 + 1.0 + Category + + 5 + + + fr.insee + js1wcn8q-4 + 1.0 + + fr.insee + CA-js1wcn8q-4 + 1.0 + Category + + 6 + + + + fr.insee + js1xruca + 1.0 + + L_Motifs + + Regular + + Ordinal + + + fr.insee + js1xruca--1 + 1.0 + + fr.insee + CA-js1xruca--1 + 1.0 + Category + + 1 + + + fr.insee + js1xruca-0 + 1.0 + + fr.insee + CA-js1xruca-0 + 1.0 + Category + + 2 + + + fr.insee + js1xruca-1 + 1.0 + + fr.insee + CA-js1xruca-1 + 1.0 + Category + + 3 + + + fr.insee + js1xruca-2 + 1.0 + + fr.insee + CA-js1xruca-2 + 1.0 + Category + + 4 + + + fr.insee + js1xruca-3 + 1.0 + + fr.insee + CA-js1xruca-3 + 1.0 + Category + + 5 + + + fr.insee + js1xruca-4 + 1.0 + + fr.insee + CA-js1xruca-4 + 1.0 + Category + + 6 + + + fr.insee + js1xruca-5 + 1.0 + + fr.insee + CA-js1xruca-5 + 1.0 + Category + + 7 + + + fr.insee + js1xruca-6 + 1.0 + + fr.insee + CA-js1xruca-6 + 1.0 + Category + + 8 + + + + fr.insee + jrkcrrfa-secondDimension-fakeCL-1 + 1.0 + + FAKE-CODELIST-jrkcrrfa-secondDimension-fakeCL-1 + + Regular + + Ordinal + + + fr.insee + jrkcrrfa-secondDimension-fakeCL-1--1 + 1.0 + + fr.insee + CA-jrkcrrfa-secondDimension-fakeCL-1--1 + 1.0 + Category + + 1 + + + + fr.insee + jrqgfzes-secondDimension-fakeCL-1 + 1.0 + + FAKE-CODELIST-jrqgfzes-secondDimension-fakeCL-1 + + Regular + + Ordinal + + + fr.insee + jrqgfzes-secondDimension-fakeCL-1--1 + 1.0 + + fr.insee + CA-jrqgfzes-secondDimension-fakeCL-1--1 + 1.0 + Category + + 1 + + + + fr.insee + js0dpd65-secondDimension-fakeCL-1 + 1.0 + + FAKE-CODELIST-js0dpd65-secondDimension-fakeCL-1 + + Regular + + Ordinal + + + fr.insee + js0dpd65-secondDimension-fakeCL-1--1 + 1.0 + + fr.insee + CA-js0dpd65-secondDimension-fakeCL-1--1 + 1.0 + Category + + 1 + + + + fr.insee + jseoe6ty-secondDimension-fakeCL-1 + 1.0 + + FAKE-CODELIST-jseoe6ty-secondDimension-fakeCL-1 + + Regular + + Ordinal + + + fr.insee + jseoe6ty-secondDimension-fakeCL-1--1 + 1.0 + + fr.insee + CA-jseoe6ty-secondDimension-fakeCL-1--1 + 1.0 + Category + + 1 + + + + fr.insee + js0dwvc2-secondDimension-fakeCL-1 + 1.0 + + FAKE-CODELIST-js0dwvc2-secondDimension-fakeCL-1 + + Regular + + Ordinal + + + fr.insee + js0dwvc2-secondDimension-fakeCL-1--1 + 1.0 + + fr.insee + CA-js0dwvc2-secondDimension-fakeCL-1--1 + 1.0 + Category + + 1 + + + + fr.insee + js0eg1cf-secondDimension-fakeCL-1 + 1.0 + + FAKE-CODELIST-js0eg1cf-secondDimension-fakeCL-1 + + Regular + + Ordinal + + + fr.insee + js0eg1cf-secondDimension-fakeCL-1--1 + 1.0 + + fr.insee + CA-js0eg1cf-secondDimension-fakeCL-1--1 + 1.0 + Category + + 1 + + + + fr.insee + js0f7q4i-secondDimension-fakeCL-1 + 1.0 + + FAKE-CODELIST-js0f7q4i-secondDimension-fakeCL-1 + + Regular + + Ordinal + + + fr.insee + js0f7q4i-secondDimension-fakeCL-1--1 + 1.0 + + fr.insee + CA-js0f7q4i-secondDimension-fakeCL-1--1 + 1.0 + Category + + 1 + + + + fr.insee + js0gv8ia-secondDimension-fakeCL-1 + 1.0 + + FAKE-CODELIST-js0gv8ia-secondDimension-fakeCL-1 + + Regular + + Ordinal + + + fr.insee + js0gv8ia-secondDimension-fakeCL-1--1 + 1.0 + + fr.insee + CA-js0gv8ia-secondDimension-fakeCL-1--1 + 1.0 + Category + + 1 + + + + fr.insee + INSEE-COMMUN-CL-Booleen + 1.0 + + Booleen + + Regular + + Ordinal + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 1.0 + + fr.insee + INSEE-COMMUN-CA-Booleen-1 + 1.0 + Category + + 1 + + + + + fr.insee + VariableScheme-jmuk1uzy2 + 1.0 + + Variable Scheme for the survey + + + fr.insee + jskcp2py + 1.0 + + sal_ca_cdi_cdd + + + somme des heures de travail rémunérées + déclarées + + + fr.insee + jskcp2py-VROP + 1.0 + + + + fr.insee + jskcp2py-GI + 1.0 + GenerationInstruction + + + fr.insee + jskcp2py-GOP + 1.0 + OutParameter + + + fr.insee + jskcp2py-VROP + 1.0 + OutParameter + + + + + + + + fr.insee + jskezenm + 1.0 + + Somme_RESS + + + Somme des ressources courantes + + + fr.insee + jskezenm-VROP + 1.0 + + + + fr.insee + jskezenm-GI + 1.0 + GenerationInstruction + + + fr.insee + jskezenm-GOP + 1.0 + OutParameter + + + fr.insee + jskezenm-VROP + 1.0 + OutParameter + + + + + + + + fr.insee + jskgabwa + 1.0 + + sommeCHARGES + + + Somme des charges + + + fr.insee + jskgabwa-VROP + 1.0 + + + + fr.insee + jskgabwa-GI + 1.0 + GenerationInstruction + + + fr.insee + jskgabwa-GOP + 1.0 + OutParameter + + + fr.insee + jskgabwa-VROP + 1.0 + OutParameter + + + + + + + + fr.insee + jskh90m6 + 1.0 + + Somme_charges_AUTRES + + + Somme des charges autres + + + fr.insee + jskh90m6-VROP + 1.0 + + + + fr.insee + jskh90m6-GI + 1.0 + GenerationInstruction + + + fr.insee + jskh90m6-GOP + 1.0 + OutParameter + + + fr.insee + jskh90m6-VROP + 1.0 + OutParameter + + + + + + + + fr.insee + jsn6qqzh + 1.0 + + Somme_RESS_SUBV + + + Somme des subventions publiques + + + fr.insee + jsn6qqzh-VROP + 1.0 + + + + fr.insee + jsn6qqzh-GI + 1.0 + GenerationInstruction + + + fr.insee + jsn6qqzh-GOP + 1.0 + OutParameter + + + fr.insee + jsn6qqzh-VROP + 1.0 + OutParameter + + + + + + + + fr.insee + jsn757cc + 1.0 + + Somme_RESS_RECT_ACT + + + Somme des recettes d'activités publiques + + + fr.insee + jsn757cc-VROP + 1.0 + + + + fr.insee + jsn757cc-GI + 1.0 + GenerationInstruction + + + fr.insee + jsn757cc-GOP + 1.0 + OutParameter + + + fr.insee + jsn757cc-VROP + 1.0 + OutParameter + + + + + + + + fr.insee + jqxyhbht + 1.0 + + IDENT_NUM_RNA + + + base de sondage d'appartenance RNA + + + + fr.insee + jsnbbf62 + 1.0 + + ECHANTILLON + + + Echantillon RNA ou Sirene + + + + fr.insee + juo0oy5e + 1.0 + + ANNEEDAAAA + + + Année de début d'exercice + + + + fr.insee + juo0ogyp + 1.0 + + ANNEESUIV + + + Année de fin d'exercice + + + + fr.insee + jslo1qwl + 1.0 + + IDENT_AN_CREATION + + + IDENT_AN_CREATION label + + + fr.insee + jqxvugxl-QOP-jqxw0i2w + 1.0 + OutParameter + + + fr.insee + jqxvugxl + 1.0 + QuestionItem + + + + + fr.insee + jqxw3u1j + 1.0 + + IDENT_ACTIVE + + + IDENT_ACTIVE + + + fr.insee + jqxvy8en-QOP-jqxw8s33 + 1.0 + OutParameter + + + fr.insee + jqxvy8en + 1.0 + QuestionItem + + + + + fr.insee + jslo1t2k + 1.0 + + IDENT_AN_CESSATION + + + IDENT_AN_CESSATION label + + + fr.insee + jqxvz5q8-QOP-jqxwmhww + 1.0 + OutParameter + + + fr.insee + jqxvz5q8 + 1.0 + QuestionItem + + + + + fr.insee + jrjb9qg1 + 1.0 + + IDENT_RNA + + + IDENT_RNA label + + + fr.insee + jqxx9cx9-QOP-jqxwwtmb + 1.0 + OutParameter + + + fr.insee + jqxx9cx9 + 1.0 + QuestionItem + + + + + fr.insee + jrjbfzch + 1.0 + + IDENT_CONF_NUM_RNA + + + IDENT_CONF_NUM_RNA label + + + fr.insee + jqxxe71e-QOP-jqxx8tum + 1.0 + OutParameter + + + fr.insee + jqxxe71e + 1.0 + QuestionItem + + + + + fr.insee + jrjbqmi9 + 1.0 + + IDENT_CORR_NUM_RNA + + + IDENT_CORR_NUM_RNA label + + + fr.insee + jqxxtf4g-QOP-jqxxa763 + 1.0 + OutParameter + + + fr.insee + jqxxtf4g + 1.0 + QuestionItem + + + + + fr.insee + jrjchiok + 1.0 + + IDENT_NUM_SIREN + + + IDENT_NUM_SIREN label + + + fr.insee + jrjcj7e6-QOP-jrjcekc4 + 1.0 + OutParameter + + + fr.insee + jrjcj7e6 + 1.0 + QuestionItem + + + + + fr.insee + jrjcpckr + 1.0 + + IDENT_SUBV + + + IDENT_SUBV label + + + fr.insee + jqxxw4zn-QOP-jqxxt6rk + 1.0 + OutParameter + + + fr.insee + jqxxw4zn + 1.0 + QuestionItem + + + + + fr.insee + jrqaahtn + 1.0 + + IDENT_NIV_GEO + + + IDENT_NIV_GEO label + + + fr.insee + jqxxgibj-QOP-jqxxty1j + 1.0 + OutParameter + + + fr.insee + jqxxgibj + 1.0 + QuestionItem + + + + + fr.insee + jrjcn509 + 1.0 + + IDENT_ACTIVITE_ETRG + + + IDENT_ACTIVITE_ETRG label + + + fr.insee + jqxxsed0-QOP-jqxxo9gu + 1.0 + OutParameter + + + fr.insee + jqxxsed0 + 1.0 + QuestionItem + + + + + fr.insee + jrjdfadb + 1.0 + + IDENT_RESEAU + + + IDENT_RESEAU label + + + fr.insee + jqxxs2n2-QOP-jqxy58di + 1.0 + OutParameter + + + fr.insee + jqxxs2n2 + 1.0 + QuestionItem + + + + + fr.insee + jrjd85tv + 1.0 + + IDENT_OBJET + + + IDENT_OBJET label + + + fr.insee + jqxy6sxf-QOP-jqxxtaap + 1.0 + OutParameter + + + fr.insee + jqxy6sxf + 1.0 + QuestionItem + + + + + fr.insee + jrjd5fow + 1.0 + + GOUV_CA_EXIST + + + GOUV_CA_EXIST label + + + fr.insee + jrjda2qx-QOP-jrjd9kim + 1.0 + OutParameter + + + fr.insee + jrjda2qx + 1.0 + QuestionItem + + + + + fr.insee + jslqma8b + 1.0 + + GOUV_CA_NB + + + GOUV_CA_NB label + + + fr.insee + jrjd54n7-QOP-jrjdm55e + 1.0 + OutParameter + + + fr.insee + jrjd54n7 + 1.0 + QuestionItem + + + + + fr.insee + jslqgvdb + 1.0 + + GOUV_CA_NB_F + + + GOUV_CA_NB_F label + + + fr.insee + jrjdhk1u-QOP-jrjdnih8 + 1.0 + OutParameter + + + fr.insee + jrjdhk1u + 1.0 + QuestionItem + + + + + fr.insee + jrjdfrry + 1.0 + + GOUV_BUREAU_EXIST + + + GOUV_BUREAU_EXIST label + + + fr.insee + jrjdnoqo-QOP-jrjdpfju + 1.0 + OutParameter + + + fr.insee + jrjdnoqo + 1.0 + QuestionItem + + + + + fr.insee + jslqm0af + 1.0 + + GOUV_BUREAU_NB + + + GOUV_BUREAU_NB label + + + fr.insee + jrjdgpya-QOP-jrjdvpg0 + 1.0 + OutParameter + + + fr.insee + jrjdgpya + 1.0 + QuestionItem + + + + + fr.insee + jslqsh63 + 1.0 + + GOUV_BUREAU_NB_F + + + GOUV_BUREAU_NB_F label + + + fr.insee + jrjdmxr3-QOP-jrjdugue + 1.0 + OutParameter + + + fr.insee + jrjdmxr3 + 1.0 + QuestionItem + + + + + fr.insee + jslqsddg + 1.0 + + GOUV_PDT_EXIST + + + GOUV_PDT_EXIST label + + + fr.insee + jrjdtxvt-QOP-jrjdxa3i + 1.0 + OutParameter + + + fr.insee + jrjdtxvt + 1.0 + QuestionItem + + + + + fr.insee + jt79vd0m + 1.0 + + GOUV_PDT_SEXE + + + GOUV_PDT_SEXE label + + + fr.insee + jrjdn5o5-QOP-jrje3de3 + 1.0 + OutParameter + + + fr.insee + jrjdn5o5 + 1.0 + QuestionItem + + + + + fr.insee + jrjdsoev + 1.0 + + GOUV_PDT_AGE + + + GOUV_PDT_AGE label + + + fr.insee + jrje3unr-QOP-jrjdrrnu + 1.0 + OutParameter + + + fr.insee + jrje3unr + 1.0 + QuestionItem + + + + + fr.insee + jrjdsl7t + 1.0 + + GOUV_PDT_STATUT + + + GOUV_PDT_STATUT label + + + fr.insee + jrjds2dp-QOP-jrje668k + 1.0 + OutParameter + + + fr.insee + jrjds2dp + 1.0 + QuestionItem + + + + + fr.insee + jrje4mzo + 1.0 + + GOUV_TRESOR_EXIST + + + GOUV_TRESOR_EXIST label + + + fr.insee + jrjdypnr-QOP-jrjehc9e + 1.0 + OutParameter + + + fr.insee + jrjdypnr + 1.0 + QuestionItem + + + + + fr.insee + jt79mdl0 + 1.0 + + GOUV_TRESOR_SEXE + + + GOUV_TRESOR_SEXE label + + + fr.insee + jrkcdydx-QOP-jrkch5yv + 1.0 + OutParameter + + + fr.insee + jrkcdydx + 1.0 + QuestionItem + + + + + fr.insee + jrkchmlx + 1.0 + + GOUV_TRESOR_AGE + + + GOUV_TRESOR_AGE label + + + fr.insee + jrkcgkye-QOP-jrkcbqg3 + 1.0 + OutParameter + + + fr.insee + jrkcgkye + 1.0 + QuestionItem + + + + + fr.insee + jrkckeis + 1.0 + + GOUV_TRESOR_STATUT + + + GOUV_TRESOR_STATUT label + + + fr.insee + jrkccq4q-QOP-jrkcj45j + 1.0 + OutParameter + + + fr.insee + jrkccq4q + 1.0 + QuestionItem + + + + + fr.insee + jrkcvkk1 + 1.0 + + GOUV_SECRET_EXIST + + + GOUV_SECRET_EXIST label + + + fr.insee + jrkcsvme-QOP-jrkco2h6 + 1.0 + OutParameter + + + fr.insee + jrkcsvme + 1.0 + QuestionItem + + + + + fr.insee + jt79ub9c + 1.0 + + GOUV_SECRET_SEXE + + + GOUV_SECRET_SEXE label + + + fr.insee + jrkcnb33-QOP-jrkcofze + 1.0 + OutParameter + + + fr.insee + jrkcnb33 + 1.0 + QuestionItem + + + + + fr.insee + jrkco9zv + 1.0 + + GOUV_SECRET_AGE + + + GOUV_SECRET_AGE label + + + fr.insee + jrkcgtrt-QOP-jrkcpbgp + 1.0 + OutParameter + + + fr.insee + jrkcgtrt + 1.0 + QuestionItem + + + + + fr.insee + jrkclp8h + 1.0 + + GOUV_SECRET_STATUT + + + GOUV_SECRET_STATUT label + + + fr.insee + jrkcxp0c-QOP-jrkcj75w + 1.0 + OutParameter + + + fr.insee + jrkcxp0c + 1.0 + QuestionItem + + + + + fr.insee + jrkcwuq1 + 1.0 + + AD_PP + + + 1 - Personnes physiques + + + fr.insee + jrkctbou-QOP-jvmg5u30 + 1.0 + OutParameter + + + fr.insee + jrkctbou + 1.0 + QuestionGrid + + + + + fr.insee + jrkcpr5w + 1.0 + + AD_ASSO + + + 2 - Associations + + + fr.insee + jrkctbou-QOP-jvmg014v + 1.0 + OutParameter + + + fr.insee + jrkctbou + 1.0 + QuestionGrid + + + + + fr.insee + jrkcq2e4 + 1.0 + + AD_ENTPRIV + + + 3 - Entreprises privées + + + fr.insee + jrkctbou-QOP-jvmg13p6 + 1.0 + OutParameter + + + fr.insee + jrkctbou + 1.0 + QuestionGrid + + + + + fr.insee + jrkcz68m + 1.0 + + AD_COLLPUB + + + 4 - Collectivités publiques + + + fr.insee + jrkctbou-QOP-jvmfv25y + 1.0 + OutParameter + + + fr.insee + jrkctbou + 1.0 + QuestionGrid + + + + + fr.insee + jrkcw1v2 + 1.0 + + AD_AUTRES + + + 5 - Autres + + + fr.insee + jrkctbou-QOP-jvmfs5xd + 1.0 + OutParameter + + + fr.insee + jrkctbou + 1.0 + QuestionGrid + + + + + fr.insee + jrkcu0kd + 1.0 + + AD_AUTRES_P + + + AD_AUTRES_P label + + + fr.insee + jrkd7a3w-QOP-jrkd75hk + 1.0 + OutParameter + + + fr.insee + jrkd7a3w + 1.0 + QuestionItem + + + + + fr.insee + jslqz42f + 1.0 + + AD_PP_NB + + + Personnes physiques-Nombre d'adhérents en + 2018 + + + fr.insee + jrkcrrfa-QOP-jvmg66ld + 1.0 + OutParameter + + + fr.insee + jrkcrrfa + 1.0 + QuestionGrid + + + + + fr.insee + jslqx5zf + 1.0 + + AD_ASSO_NB + + + Associations-Nombre d'adhérents en 2018 + + + fr.insee + jrkcrrfa-QOP-jvmg1yny + 1.0 + OutParameter + + + fr.insee + jrkcrrfa + 1.0 + QuestionGrid + + + + + fr.insee + jslqw3h2 + 1.0 + + AD_ENTPRIV_NB + + + Entreprises privées-Nombre d'adhérents en + 2018 + + + fr.insee + jrkcrrfa-QOP-jvmg45de + 1.0 + OutParameter + + + fr.insee + jrkcrrfa + 1.0 + QuestionGrid + + + + + fr.insee + jslqw5xa + 1.0 + + AD_COLLPUB_NB + + + Collectivités publiques-Nombre d'adhérents en + 2018 + + + fr.insee + jrkcrrfa-QOP-jvmfw0za + 1.0 + OutParameter + + + fr.insee + jrkcrrfa + 1.0 + QuestionGrid + + + + + fr.insee + jslqv0s7 + 1.0 + + AD_AUTRES_NB + + + Autres-Nombre d'adhérents en 2018 + + + fr.insee + jrkcrrfa-QOP-jvmg4fsj + 1.0 + OutParameter + + + fr.insee + jrkcrrfa + 1.0 + QuestionGrid + + + + + fr.insee + jt8snemt + 1.0 + + DOM_CULT_BIBLIO + + + Bibliothèques, médiathèques, archives -Activité + représentant le mieux votre association + + + fr.insee + jrqgfzes-QOP-jvmg6vzp + 1.0 + OutParameter + + + fr.insee + jrqgfzes + 1.0 + QuestionGrid + + + + + fr.insee + jt8sl5t4 + 1.0 + + DOM_CULT_MUSEES + + + Gestion des musées -Activité représentant le mieux votre + association + + + fr.insee + jrqgfzes-QOP-jvmfww0r + 1.0 + OutParameter + + + fr.insee + jrqgfzes + 1.0 + QuestionGrid + + + + + fr.insee + jt8svkkp + 1.0 + + DOM_CULT_SITES + + + Gestion des sites, monuments historiques et attractions + touristiques similaires, sociétés historiques -Activité représentant le mieux + votre association + + + fr.insee + jrqgfzes-QOP-jvmfzk08 + 1.0 + OutParameter + + + fr.insee + jrqgfzes + 1.0 + QuestionGrid + + + + + fr.insee + jt8slp1d + 1.0 + + DOM_CULT_MJC + + + MJC, centres d'action culturelle, clubs culturels + -Activité représentant le mieux votre association + + + fr.insee + jrqgfzes-QOP-jvmg7p6r + 1.0 + OutParameter + + + fr.insee + jrqgfzes + 1.0 + QuestionGrid + + + + + fr.insee + jt8sn8su + 1.0 + + DOM_ART_SPECT_CREA + + + Création ou production de spectacles vivants (groupes ou + artistes indépendants), festivals, radios et télévisions ​ -Activité représentant + le mieux votre association + + + fr.insee + jrqgfzes-QOP-jvmg4u0d + 1.0 + OutParameter + + + fr.insee + jrqgfzes + 1.0 + QuestionGrid + + + + + fr.insee + jt8sowp7 + 1.0 + + DOM_ART_SPECT_SOUTIEN + + + Prestation de soutien au spectacle vivant (son, + éclairage, conseils, gestion administrative, …) -Activité représentant le mieux + votre association + + + fr.insee + jrqgfzes-QOP-jvmg4n0f + 1.0 + OutParameter + + + fr.insee + jrqgfzes + 1.0 + QuestionGrid + + + + + fr.insee + jt8sta4x + 1.0 + + DOM_ART_CREA + + + Création artistique (peinture, dessin, sculpture, + écriture, composition musicale, …) -Activité représentant le mieux votre + association + + + fr.insee + jrqgfzes-QOP-jvmfr831 + 1.0 + OutParameter + + + fr.insee + jrqgfzes + 1.0 + QuestionGrid + + + + + fr.insee + jt8sh2d2 + 1.0 + + DOM_ART_SPECT_SALLES + + + Gestion de salles de spectacles -Activité représentant le + mieux votre association + + + fr.insee + jrqgfzes-QOP-jvmg069o + 1.0 + OutParameter + + + fr.insee + jrqgfzes + 1.0 + QuestionGrid + + + + + fr.insee + jt8sjygo + 1.0 + + DOM_LOISIRS_RECREA + + + Activités récréatives et de loisirs dont jeux organisés + en fédérations (bridge, échecs..), comités des fêtes, clubs 3ème âge, scouts, + clubs (Rotary, Lyons..), collectionneurs, jumelage, activités de plein air ou + voyages -Activité représentant le mieux votre association + + + fr.insee + jrqgfzes-QOP-jvmfxjux + 1.0 + OutParameter + + + fr.insee + jrqgfzes + 1.0 + QuestionGrid + + + + + fr.insee + jt8ssxu4 + 1.0 + + DOM_LOISIRS_COLO + + + Hébergement touristique social (dont maisons et colonies + de vacances, centres aérés), cantines ​ -Activité représentant le mieux votre + association + + + fr.insee + jrqgfzes-QOP-jvmfsuoa + 1.0 + OutParameter + + + fr.insee + jrqgfzes + 1.0 + QuestionGrid + + + + + fr.insee + jt8ser6o + 1.0 + + DOM_LOISIRS_AMICALES + + + Amicales ou groupement d’habitants, d’un quartier, d’un + village, de personnes originaires d’une même région, d’un même pays, amicales de + personnels d’entreprise ​ -Activité représentant le mieux votre + association + + + fr.insee + jrqgfzes-QOP-jvmfzhe4 + 1.0 + OutParameter + + + fr.insee + jrqgfzes + 1.0 + QuestionGrid + + + + + fr.insee + jt8siqmm + 1.0 + + DOM_HEB_MED_PERS_AGEES + + + + Hébergement médicalisé pour personnes âgées, dont EHPAD -Activité représentant le mieux votre association + + + + fr.insee + jrqgfzes-QOP-jvmfqrd7 + 1.0 + OutParameter + + + fr.insee + jrqgfzes + 1.0 + QuestionGrid + + + + + fr.insee + jt8spccu + 1.0 + + DOM_HEB_MED_ENF_HAND + + + Hébergement médicalisé pour enfants handicapés -Activité + représentant le mieux votre association + + + fr.insee + jrqgfzes-QOP-jvmg9tsh + 1.0 + OutParameter + + + fr.insee + jrqgfzes + 1.0 + QuestionGrid + + + + + fr.insee + jt8shxj5 + 1.0 + + DOM_HEB_MED_ADT_HAND + + + Hébergement médicalisé pour adultes handicapés et autre + hébergement médicalisé -Activité représentant le mieux votre + association + + + fr.insee + jrqgfzes-QOP-jvmfwaj2 + 1.0 + OutParameter + + + fr.insee + jrqgfzes + 1.0 + QuestionGrid + + + + + fr.insee + jt8scdil + 1.0 + + DOM_HEB_SOC_HAND_MENT + + + Hébergement social pour handicapés mentaux -Activité + représentant le mieux votre association + + + fr.insee + jrqgfzes-QOP-jvmfssh5 + 1.0 + OutParameter + + + fr.insee + jrqgfzes + 1.0 + QuestionGrid + + + + + fr.insee + jt8sq0ue + 1.0 + + DOM_HEB_SOC_PERS_AGEES + + + Hébergement social pour personnes âgées -Activité + représentant le mieux votre association + + + fr.insee + jrqgfzes-QOP-jvmg344o + 1.0 + OutParameter + + + fr.insee + jrqgfzes + 1.0 + QuestionGrid + + + + + fr.insee + jt8sjjad + 1.0 + + DOM_HEB_SOC_HAND_PHYS + + + Hébergement social pour handicapés physiques -Activité + représentant le mieux votre association + + + fr.insee + jrqgfzes-QOP-jvmfzafc + 1.0 + OutParameter + + + fr.insee + jrqgfzes + 1.0 + QuestionGrid + + + + + fr.insee + jt8scpxv + 1.0 + + DOM_HEB_SOC_ENF_DIFF + + + Hébergement social pour enfants en difficultés -Activité + représentant le mieux votre association + + + fr.insee + jrqgfzes-QOP-jvmfxhkl + 1.0 + OutParameter + + + fr.insee + jrqgfzes + 1.0 + QuestionGrid + + + + + fr.insee + jt8som55 + 1.0 + + DOM_HEB_SOC_FOYERS + + + Foyers de jeunes travailleurs -Activité représentant le + mieux votre association + + + fr.insee + jrqgfzes-QOP-jvmg5bnp + 1.0 + OutParameter + + + fr.insee + jrqgfzes + 1.0 + QuestionGrid + + + + + fr.insee + jt8snmae + 1.0 + + DOM_HEB_SOC_AUTRES + + + Autre hébergement social, dont pour adultes et familles + en difficultés -Activité représentant le mieux votre association + + + fr.insee + jrqgfzes-QOP-jvmfvrz3 + 1.0 + OutParameter + + + fr.insee + jrqgfzes + 1.0 + QuestionGrid + + + + + fr.insee + jt8squid + 1.0 + + DOM_SANTE_HOP + + + Activités hospitalières -Activité représentant le mieux + votre association + + + fr.insee + jrqgfzes-QOP-jvmg919i + 1.0 + OutParameter + + + fr.insee + jrqgfzes + 1.0 + QuestionGrid + + + + + fr.insee + jt8srocz + 1.0 + + DOM_SANTE_MED + + + Dispensaires, médecine générale ou spécialisée-Activité + représentant le mieux votre association + + + fr.insee + jrqgfzes-QOP-jvmg6xt4 + 1.0 + OutParameter + + + fr.insee + jrqgfzes + 1.0 + QuestionGrid + + + + + fr.insee + jt8srx6a + 1.0 + + DOM_SANTE_INF + + + Soins dispensés par des infirmiers et des sages-femmes + -Activité représentant le mieux votre association + + + fr.insee + jrqgfzes-QOP-jvmfszn1 + 1.0 + OutParameter + + + fr.insee + jrqgfzes + 1.0 + QuestionGrid + + + + + fr.insee + jt8siwrn + 1.0 + + DOM_SANTE_REEDUC + + + Soins dispensés par des professionnels de la rééducation + -Activité représentant le mieux votre association + + + fr.insee + jrqgfzes-QOP-jvmg7met + 1.0 + OutParameter + + + fr.insee + jrqgfzes + 1.0 + QuestionGrid + + + + + fr.insee + jt8speu9 + 1.0 + + DOM_SANTE_RECHERCHE + + + Recherche médicale (lutte contre le cancer, la + myopathie...) -Activité représentant le mieux votre association + + + fr.insee + jrqgfzes-QOP-jvmg46hp + 1.0 + OutParameter + + + fr.insee + jrqgfzes + 1.0 + QuestionGrid + + + + + fr.insee + jt8sfjku + 1.0 + + DOM_SANTE_AUTRES + + + Autres activités de santé, dont information et + prévention, aides aux malades, groupements de malades -Activité représentant le + mieux votre association + + + fr.insee + jrqgfzes-QOP-jvmg4134 + 1.0 + OutParameter + + + fr.insee + jrqgfzes + 1.0 + QuestionGrid + + + + + fr.insee + jt8sgbhn + 1.0 + + DOM_SPORT_CLUB + + + Clubs de sports, enseignement de disciplines sportives + -Activité représentant le mieux votre association + + + fr.insee + jrqgfzes-QOP-jvmg9duu + 1.0 + OutParameter + + + fr.insee + jrqgfzes + 1.0 + QuestionGrid + + + + + fr.insee + jt8sgqlm + 1.0 + + DOM_SPORT_INSTALL + + + Gestion d'installations sportives -Activité représentant + le mieux votre association + + + fr.insee + jrqgfzes-QOP-jvmfw0vd + 1.0 + OutParameter + + + fr.insee + jrqgfzes + 1.0 + QuestionGrid + + + + + fr.insee + jt8ss4wj + 1.0 + + DOM_SPORT_CHASSE + + + Chasse et pêche -Activité représentant le mieux votre + association + + + fr.insee + jrqgfzes-QOP-jvmgakeq + 1.0 + OutParameter + + + fr.insee + jrqgfzes + 1.0 + QuestionGrid + + + + + fr.insee + jt8sp9v1 + 1.0 + + DOM_SPORT_AUTRES + + + Autres activités liées au sport -Activité représentant le + mieux votre association + + + fr.insee + jrqgfzes-QOP-jvmg66hq + 1.0 + OutParameter + + + fr.insee + jrqgfzes + 1.0 + QuestionGrid + + + + + fr.insee + jt8sffye + 1.0 + + DOM_CAUSES_POL + + + Organisations politiques, clubs et cercles de réflexion + -Activité représentant le mieux votre association + + + fr.insee + jrqgfzes-QOP-jvmfxkuk + 1.0 + OutParameter + + + fr.insee + jrqgfzes + 1.0 + QuestionGrid + + + + + fr.insee + jt8st385 + 1.0 + + DOM_CAUSES_CULT + + + Organisations cultuelles et religieuses -Activité + représentant le mieux votre association + + + fr.insee + jrqgfzes-QOP-jvmg6tmh + 1.0 + OutParameter + + + fr.insee + jrqgfzes + 1.0 + QuestionGrid + + + + + fr.insee + jt8sn6cn + 1.0 + + DOM_CAUSES_PATR + + + Organisations patronales et consulaires -Activité + représentant le mieux votre association + + + fr.insee + jrqgfzes-QOP-jvmgaml0 + 1.0 + OutParameter + + + fr.insee + jrqgfzes + 1.0 + QuestionGrid + + + + + fr.insee + jt8sst1g + 1.0 + + DOM_CAUSES_PRO + + + Organisations professionnelles -Activité représentant le + mieux votre association + + + fr.insee + jrqgfzes-QOP-jvmg5tmv + 1.0 + OutParameter + + + fr.insee + jrqgfzes + 1.0 + QuestionGrid + + + + + fr.insee + jt8sgya8 + 1.0 + + DOM_CAUSES_SYND + + + Syndicats de salariés -Activité représentant le mieux + votre association + + + fr.insee + jrqgfzes-QOP-jvmg773d + 1.0 + OutParameter + + + fr.insee + jrqgfzes + 1.0 + QuestionGrid + + + + + fr.insee + jt8sgssp + 1.0 + + DOM_CAUSES_ELEV_PAR + + + Associations d’élèves, d’étudiants ou de parents d'élèves + -Activité représentant le mieux votre association + + + fr.insee + jrqgfzes-QOP-jvmg00ii + 1.0 + OutParameter + + + fr.insee + jrqgfzes + 1.0 + QuestionGrid + + + + + fr.insee + jt8se08b + 1.0 + + DOM_CAUSES_ANC_COMB + + + Associations patriotiques ou d'anciens combattants + -Activité représentant le mieux votre association + + + fr.insee + jrqgfzes-QOP-jvmfss1s + 1.0 + OutParameter + + + fr.insee + jrqgfzes + 1.0 + QuestionGrid + + + + + fr.insee + jt8seq3b + 1.0 + + DOM_CAUSES_ENVIR + + + Protection de l'environnement, gestion des jardins et + réserves naturelles, protection des animaux -Activité représentant le mieux votre + association + + + fr.insee + jrqgfzes-QOP-jvmfskw0 + 1.0 + OutParameter + + + fr.insee + jrqgfzes + 1.0 + QuestionGrid + + + + + fr.insee + jt8sn2r7 + 1.0 + + DOM_CAUSES_CONSO + + + Défense des consommateurs, des usagers des services + publics -Activité représentant le mieux votre association + + + fr.insee + jrqgfzes-QOP-jvmfx82r + 1.0 + OutParameter + + + fr.insee + jrqgfzes + 1.0 + QuestionGrid + + + + + fr.insee + jt8scy3k + 1.0 + + DOM_CAUSES_LOGEMENT + + + Associations de locataires ou de propriétaires -Activité + représentant le mieux votre association + + + fr.insee + jrqgfzes-QOP-jvmg6el3 + 1.0 + OutParameter + + + fr.insee + jrqgfzes + 1.0 + QuestionGrid + + + + + fr.insee + jt8sd1wd + 1.0 + + DOM_CAUSES_HUMA + + + Associations de défenses des droits humains, des droits + des femmes, de minorités, groupes d’entraide -Activité représentant le mieux votre + association + + + fr.insee + jrqgfzes-QOP-jvmfw799 + 1.0 + OutParameter + + + fr.insee + jrqgfzes + 1.0 + QuestionGrid + + + + + fr.insee + jt8skaxo + 1.0 + + DOM_CAUSES_AUTRES + + + Autres défenses de droits, de causes et d’intérêt + -Activité représentant le mieux votre association + + + fr.insee + jrqgfzes-QOP-jvmfrtye + 1.0 + OutParameter + + + fr.insee + jrqgfzes + 1.0 + QuestionGrid + + + + + fr.insee + jt8sm89u + 1.0 + + DOM_ECO_DEV_LOCAL + + + + Développement économique et local, GIP -Activité + représentant le mieux votre association + + + + fr.insee + jrqgfzes-QOP-jvmg4qc4 + 1.0 + OutParameter + + + fr.insee + jrqgfzes + 1.0 + QuestionGrid + + + + + fr.insee + jt8sw0fp + 1.0 + + DOM_ECO_TOURISME + + + Offices de tourisme, syndicats d’initiative, comités de + tourisme, agences de développement touristique -Activité représentant le mieux + votre association + + + fr.insee + jrqgfzes-QOP-jvmg7k40 + 1.0 + OutParameter + + + fr.insee + jrqgfzes + 1.0 + QuestionGrid + + + + + fr.insee + jt8sm3o6 + 1.0 + + DOM_ECO_GRPT_EMPL + + + Groupements d’employeurs ayant des salariés pour le + compte de tiers, société d'économie mixte locale, coopérative d'activités et + d'emploi, associations intermédiaires -Activité représentant le mieux votre + association + + + fr.insee + jrqgfzes-QOP-jvmg01oo + 1.0 + OutParameter + + + fr.insee + jrqgfzes + 1.0 + QuestionGrid + + + + + fr.insee + jt8sn7la + 1.0 + + DOM_ECO_SUPPORT + + + Gestion d’activités communes par la mise en commun de + moyens, associations réalisant des activités support (y compris associations de + moyens ou de gestion et caisses de congés payés)-Activité représentant le mieux + votre association + + + fr.insee + jrqgfzes-QOP-jvmfzpak + 1.0 + OutParameter + + + fr.insee + jrqgfzes + 1.0 + QuestionGrid + + + + + fr.insee + jt8scz2b + 1.0 + + DOM_ECO_AMAP + + + AMAP (asso. pour le maintien d’une agriculture paysanne) + -Activité représentant le mieux votre association + + + fr.insee + jrqgfzes-QOP-jvmfxe39 + 1.0 + OutParameter + + + fr.insee + jrqgfzes + 1.0 + QuestionGrid + + + + + fr.insee + jt8sq11v + 1.0 + + DOM_ECO_SECURITE + + + Sécurité, protection civile, sauvetage, + secourisme-Activité représentant le mieux votre association + + + fr.insee + jrqgfzes-QOP-jvmfy288 + 1.0 + OutParameter + + + fr.insee + jrqgfzes + 1.0 + QuestionGrid + + + + + fr.insee + jt8seo19 + 1.0 + + DOM_SOCIAL_EMPLOI + + + Aide à l'emploi, activités d'insertion professionnelle, + missions locales pour l'emploi -Activité représentant le mieux votre + association + + + fr.insee + jrqgfzes-QOP-jvmfqafi + 1.0 + OutParameter + + + fr.insee + jrqgfzes + 1.0 + QuestionGrid + + + + + fr.insee + jt8srxwi + 1.0 + + DOM_SOCIAL_AGE_HAND + + + Accueil ou accompagnement sans hébergement d'adultes + handicapés ou de personnes âgées -Activité représentant le mieux votre + association + + + fr.insee + jrqgfzes-QOP-jvmfznan + 1.0 + OutParameter + + + fr.insee + jrqgfzes + 1.0 + QuestionGrid + + + + + fr.insee + jt8smjlw + 1.0 + + DOM_SOCIAL_CAT + + + Aide par le travail pour les salariés handicapés + -Activité représentant le mieux votre association + + + fr.insee + jrqgfzes-QOP-jvmg576c + 1.0 + OutParameter + + + fr.insee + jrqgfzes + 1.0 + QuestionGrid + + + + + fr.insee + jt8ssqc4 + 1.0 + + DOM_SOCIAL_JEUNES_ENF + + + Accueil de jeunes enfants sans hébergement-Activité + représentant le mieux votre association + + + fr.insee + jrqgfzes-QOP-jvmfvtok + 1.0 + OutParameter + + + fr.insee + jrqgfzes + 1.0 + QuestionGrid + + + + + fr.insee + jt8shcer + 1.0 + + DOM_SOCIAL_ENF_HAND + + + Accueil ou accompagnement sans hébergement d'enfants + handicapés -Activité représentant le mieux votre association + + + fr.insee + jrqgfzes-QOP-jvmftncs + 1.0 + OutParameter + + + fr.insee + jrqgfzes + 1.0 + QuestionGrid + + + + + fr.insee + jt8skb4u + 1.0 + + DOM_SOCIAL_ENF_ADO + + + Autre accueil ou accompagnement sans hébergement + d'enfants et d'adolescents -Activité représentant le mieux votre + association + + + fr.insee + jrqgfzes-QOP-jvmg8t2g + 1.0 + OutParameter + + + fr.insee + jrqgfzes + 1.0 + QuestionGrid + + + + + fr.insee + jt8shcal + 1.0 + + DOM_SOCIAL_LOGEMENT + + + Aide au logement -Activité représentant le mieux votre + association + + + fr.insee + jrqgfzes-QOP-jvmg7sc9 + 1.0 + OutParameter + + + fr.insee + jrqgfzes + 1.0 + QuestionGrid + + + + + fr.insee + jt8sdmia + 1.0 + + DOM_SOCIAL_AIDE_DOM + + + Aide à domicile -Activité représentant le mieux votre + association + + + fr.insee + jrqgfzes-QOP-jvmg65qu + 1.0 + OutParameter + + + fr.insee + jrqgfzes + 1.0 + QuestionGrid + + + + + fr.insee + jt8sokjv + 1.0 + + DOM_SOCIAL_AIDE_MIG + + + Aide aux migrants -Activité représentant le mieux votre + association + + + fr.insee + jrqgfzes-QOP-jvmg54co + 1.0 + OutParameter + + + fr.insee + jrqgfzes + 1.0 + QuestionGrid + + + + + fr.insee + jt8sl2b8 + 1.0 + + DOM_SOCIAL_CARITATIF + + + Associations caritatives, humanitaires (y compris aide + internationale) et autre action sociale -Activité représentant le mieux votre + association + + + fr.insee + jrqgfzes-QOP-jvmg13f1 + 1.0 + OutParameter + + + fr.insee + jrqgfzes + 1.0 + QuestionGrid + + + + + fr.insee + jt8sv3n6 + 1.0 + + DOM_ENSEIG_PRIM + + + Enseignement pré-primaire ou primaire -Activité + représentant le mieux votre association + + + fr.insee + jrqgfzes-QOP-jvmg07e4 + 1.0 + OutParameter + + + fr.insee + jrqgfzes + 1.0 + QuestionGrid + + + + + fr.insee + jt8sh8ft + 1.0 + + DOM_ENSEIG_SECOND + + + Enseignement secondaire général, technique ou + professionnel -Activité représentant le mieux votre association + + + fr.insee + jrqgfzes-QOP-jvmfz28f + 1.0 + OutParameter + + + fr.insee + jrqgfzes + 1.0 + QuestionGrid + + + + + fr.insee + jt8sskru + 1.0 + + DOM_ENSEIG_SUP + + + Enseignement supérieur -Activité représentant le mieux + votre association + + + fr.insee + jrqgfzes-QOP-jvmg4k2q + 1.0 + OutParameter + + + fr.insee + jrqgfzes + 1.0 + QuestionGrid + + + + + fr.insee + jt8sn8cl + 1.0 + + DOM_ENSEIG_CULT + + + Enseignement d'activités culturelles et de loisirs (y + compris écoles de danse, musique, arts plastique, etc …) -Activité représentant le + mieux votre association + + + fr.insee + jrqgfzes-QOP-jvmg7nny + 1.0 + OutParameter + + + fr.insee + jrqgfzes + 1.0 + QuestionGrid + + + + + fr.insee + jt8srpua + 1.0 + + DOM_ENSEIG_FORM_CONT + + + Formation continue d'adultes -Activité représentant le + mieux votre association + + + fr.insee + jrqgfzes-QOP-jvmg2a3y + 1.0 + OutParameter + + + fr.insee + jrqgfzes + 1.0 + QuestionGrid + + + + + fr.insee + jt8snfyg + 1.0 + + DOM_ENSEIG_AUTRES + + + Autres formes d’enseignements dont soutien scolaire + -Activité représentant le mieux votre association + + + fr.insee + jrqgfzes-QOP-jvmfv5ob + 1.0 + OutParameter + + + fr.insee + jrqgfzes + 1.0 + QuestionGrid + + + + + fr.insee + jt8snmlc + 1.0 + + DOM_ENSEIG_RECH + + + Recherche (hors recherche médicale) -Activité + représentant le mieux votre association + + + fr.insee + jrqgfzes-QOP-jvmfw0ep + 1.0 + OutParameter + + + fr.insee + jrqgfzes + 1.0 + QuestionGrid + + + + + fr.insee + jrkddyts + 1.0 + + DOM_P + + + DOM_P label + + + fr.insee + jrkd4r0n-QOP-jrkdjlwp + 1.0 + OutParameter + + + fr.insee + jrkd4r0n + 1.0 + QuestionItem + + + + + fr.insee + jseo5rj4 + 1.0 + + SAL_EMP + + + SAL_EMP label + + + fr.insee + jseoat5y-QOP-jseo51cx + 1.0 + OutParameter + + + fr.insee + jseoat5y + 1.0 + QuestionItem + + + + + fr.insee + js0dcfvt + 1.0 + + SAL_NB_H + + + SAL_NB_H label + + + fr.insee + js0d53t6-QOP-js0czgby + 1.0 + OutParameter + + + fr.insee + js0d53t6 + 1.0 + QuestionItem + + + + + fr.insee + juwh2y9u + 1.0 + + SAL_CA + + + + 1 - des salariés en contrat aidé (CUI-CAE, CUI-CIE, PEC, IAE, CDDI, emplois + d’avenir, apprentissage…) + + + + fr.insee + js0di1io-QOP-jvmfvkhi + 1.0 + OutParameter + + + fr.insee + js0di1io + 1.0 + QuestionGrid + + + + + fr.insee + juwgyxbb + 1.0 + + SAL_CDI + + + + 2 - des salariés en contrat à durée indéterminée (CDI) non + aidé + + + + fr.insee + js0di1io-QOP-jvmfwwbw + 1.0 + OutParameter + + + fr.insee + js0di1io + 1.0 + QuestionGrid + + + + + fr.insee + juwh4n0n + 1.0 + + SAL_CDD + + + + 3 - des salariés en contrat à durée déterminée (CDD) non + aidé (y compris contrat d’usage, contrat d’engagement + éducatif) + + + + fr.insee + js0di1io-QOP-jvmfwqal + 1.0 + OutParameter + + + fr.insee + js0di1io + 1.0 + QuestionGrid + + + + + fr.insee + js0dg9qy + 1.0 + + SAL_CA_NB_H + + + + des salariés en contrat aidé (CUI-CAE, + CUI-CIE, PEC, IAE, CDDI, emplois d’avenir, + apprentissage, …)-Nombre d'heures de travail rémunérées en 2018 + + + + fr.insee + js0dpd65-QOP-jvmfqbn0 + 1.0 + OutParameter + + + fr.insee + js0dpd65 + 1.0 + QuestionGrid + + + + + fr.insee + js0dec0k + 1.0 + + SAL_CDI_NB_H + + + + des salariés en contrat à durée indéterminée (CDI) non + aidé-Nombre d'heures de travail rémunérées en 2018 + + + + fr.insee + js0dpd65-QOP-jvmg2oc6 + 1.0 + OutParameter + + + fr.insee + js0dpd65 + 1.0 + QuestionGrid + + + + + fr.insee + js0dkhaf + 1.0 + + SAL_CDD_NB_H + + + + des salariés en contrat à durée déterminée (CDD) non + aidé (y compris contrat d’usage, contrat d’engagement + éducatif)-Nombre d'heures de travail rémunérées en 2018 + + + + fr.insee + js0dpd65-QOP-jvmg7ajq + 1.0 + OutParameter + + + fr.insee + js0dpd65 + 1.0 + QuestionGrid + + + + + fr.insee + jseo93pm + 1.0 + + SAL_NB + + + SAL_NB label + + + fr.insee + jseoi4yc-QOP-jseo0mfc + 1.0 + OutParameter + + + fr.insee + jseoi4yc + 1.0 + QuestionItem + + + + + fr.insee + jseotd98 + 1.0 + + SAL_TPS_PLEIN + + + Salariés à temps plein (au moins 35h par semaine)-Nombre + de salariés + + + fr.insee + jseoe6ty-QOP-jvmg69sa + 1.0 + OutParameter + + + fr.insee + jseoe6ty + 1.0 + QuestionGrid + + + + + fr.insee + jseovmeu + 1.0 + + SAL_TPS_PARTIEL + + + Salariés à temps partiel (moins de 35h par + semaine)-Nombre de salariés + + + fr.insee + jseoe6ty-QOP-jvmg5jhi + 1.0 + OutParameter + + + fr.insee + jseoe6ty + 1.0 + QuestionGrid + + + + + fr.insee + jseoiesi + 1.0 + + SAL_TPS_PARTIEL_RED + + + + - dont salariés à temps partiel réduit (moins de 17h30 par + semaine)-Nombre de salariés + + + + fr.insee + jseoe6ty-QOP-jvmfqq19 + 1.0 + OutParameter + + + fr.insee + jseoe6ty + 1.0 + QuestionGrid + + + + + fr.insee + jtsfihyl + 1.0 + + AUT_PERS_INTERIM + + + + 1 - Des intérimaires + + + + fr.insee + js0dvdaw-QOP-jvmg80aa + 1.0 + OutParameter + + + fr.insee + js0dvdaw + 1.0 + QuestionGrid + + + + + fr.insee + jtsfp6of + 1.0 + + AUT_PERS_MAD + + + + 2 - Des personnels mis à disposition autres que les intérimaires (y compris mécénat de compétences) + + + + fr.insee + js0dvdaw-QOP-jvmg0q44 + 1.0 + OutParameter + + + fr.insee + js0dvdaw + 1.0 + QuestionGrid + + + + + fr.insee + jtsf8afq + 1.0 + + AUT_PERS_VOL + + + + 3 - Des volontaires (service civique, sapeurs + pompiers,...) + + + + fr.insee + js0dvdaw-QOP-jvmfv87q + 1.0 + OutParameter + + + fr.insee + js0dvdaw + 1.0 + QuestionGrid + + + + + fr.insee + jtsfllvx + 1.0 + + AUT_PERS_AUTRES + + + 4 - D'autres personnes non mentionnées ci-dessus + (stagiaires,...) + + + fr.insee + js0dvdaw-QOP-jvmfxlqr + 1.0 + OutParameter + + + fr.insee + js0dvdaw + 1.0 + QuestionGrid + + + + + fr.insee + jtsfllvxpr + 1.0 + + AUT_PERS_AUTRES_P + + + AUT_PERS_AUTRES - Précisez + + + fr.insee + js0dvdaw-QOP-jprecisez + 1.0 + OutParameter + + + fr.insee + js0dvdaw + 1.0 + QuestionGrid + + + + + + + fr.insee + js0e4d7a + 1.0 + + AUT_PERS_INTERIM_NB_H + + + + Des intérimaires-Nombre d'heures travaillées en + 2018 + + + + fr.insee + js0dwvc2-QOP-jvmfxje1 + 1.0 + OutParameter + + + fr.insee + js0dwvc2 + 1.0 + QuestionGrid + + + + + fr.insee + js0e4lmw + 1.0 + + AUT_PERS_MAD_NB_H + + + + Des personnels mis à disposition autres que les intérimaires (y compris mécénat de compétences)-Nombre d'heures travaillées en 2018 + + + + fr.insee + js0dwvc2-QOP-jvmg5k42 + 1.0 + OutParameter + + + fr.insee + js0dwvc2 + 1.0 + QuestionGrid + + + + + fr.insee + js0e0vmz + 1.0 + + AUT_PERS_VOL_NB_H + + + + Des volontaires (service civique, sapeurs + pompiers, …)-Nombre d'heures travaillées en 2018 + + + + fr.insee + js0dwvc2-QOP-jvmftckh + 1.0 + OutParameter + + + fr.insee + js0dwvc2 + 1.0 + QuestionGrid + + + + + fr.insee + js0e4uy9 + 1.0 + + AUT_PERS_AUTRES_NB_H + + + D’autres personnes non mentionnées ci-dessus (stagiaires, + …)-Nombre d'heures travaillées en 2018 + + + fr.insee + js0dwvc2-QOP-jvmfv1sf + 1.0 + OutParameter + + + fr.insee + js0dwvc2 + 1.0 + QuestionGrid + + + + + fr.insee + js0eko1x + 1.0 + + BENEV_NB + + + BENEV_NB label + + + fr.insee + js0eh523-QOP-js0e63o9 + 1.0 + OutParameter + + + fr.insee + js0eh523 + 1.0 + QuestionItem + + + + + fr.insee + js0e8uvf + 1.0 + + BENEV_REG_NB + + + BENEV_REG_NB label + + + fr.insee + js0egvao-QOP-js0en3v8 + 1.0 + OutParameter + + + fr.insee + js0egvao + 1.0 + QuestionItem + + + + + fr.insee + js0efk0o + 1.0 + + BENEV_NB_H + + + + Estimation du nombre d’heures effectuées par des bénévoles, quel + que soit leur rôle (bénévoles réguliers ou occasionnels, y compris + bénévoles membres du bureau ou du CA)-Nombre d'heures + + + + fr.insee + js0eg1cf-QOP-jvmg494w + 1.0 + OutParameter + + + fr.insee + js0eg1cf + 1.0 + QuestionGrid + + + + + fr.insee + js0egrzl + 1.0 + + BENEV_REG_NB_H + + + + - dont effectuées par des + bénévoles « réguliers »-Nombre + d'heures + + + + fr.insee + js0eg1cf-QOP-jvmg80ov + 1.0 + OutParameter + + + fr.insee + js0eg1cf + 1.0 + QuestionGrid + + + + + fr.insee + js0erud6 + 1.0 + + BENEV_FORM + + + BENEV_FORM label + + + fr.insee + js0en9yl-QOP-js0elnnk + 1.0 + OutParameter + + + fr.insee + js0en9yl + 1.0 + QuestionItem + + + + + fr.insee + js0eo1lo + 1.0 + + BENEV_FORM_CHARGES + + + BENEV_FORM_CHARGES label + + + fr.insee + js0ef83m-QOP-js0ep1yk + 1.0 + OutParameter + + + fr.insee + js0ef83m + 1.0 + QuestionItem + + + + + fr.insee + js0ex724 + 1.0 + + BENEV_FORM_MONTANT + + + BENEV_FORM_MONTANT label + + + fr.insee + js0et52n-QOP-js0engj1 + 1.0 + OutParameter + + + fr.insee + js0et52n + 1.0 + QuestionItem + + + € + + + + fr.insee + js0ewrv2 + 1.0 + + BENEV_REMB_FRAIS + + + BENEV_REMB_FRAIS label + + + fr.insee + js0ema6d-QOP-js0eoqcr + 1.0 + OutParameter + + + fr.insee + js0ema6d + 1.0 + QuestionItem + + + + + fr.insee + js0es1lo + 1.0 + + BENEV_REMB_MONTANT + + + BENEV_REMB_MONTANT label + + + fr.insee + js0errla-QOP-js0eljk9 + 1.0 + OutParameter + + + fr.insee + js0errla + 1.0 + QuestionItem + + + € + + + + fr.insee + js0eroip + 1.0 + + BENEV_SAL_ENCADRANT + + + BENEV_SAL_ENCADRANT label + + + fr.insee + js0ezdnw-QOP-js0etdbh + 1.0 + OutParameter + + + fr.insee + js0ezdnw + 1.0 + QuestionItem + + + + + fr.insee + junse9xe + 1.0 + + RESS_DATE_CLOTURE + + + RESS_DATE_CLOTURE label + + + fr.insee + junsenue-QOP-juns2o7l + 1.0 + OutParameter + + + fr.insee + junsenue + 1.0 + QuestionItem + + + + + fr.insee + junsehq1 + 1.0 + + RESS_DUREE_EXERCICE + + + RESS_DUREE_EXERCICE label + + + fr.insee + junsih01-QOP-juns6j74 + 1.0 + OutParameter + + + fr.insee + junsih01 + 1.0 + QuestionItem + + + + + fr.insee + js0f9lde + 1.0 + + RESS_COTIS + + + Cotisations perçues-Montants en euros + + + fr.insee + js0f7q4i-QOP-jvmg0x78 + 1.0 + OutParameter + + + fr.insee + js0f7q4i + 1.0 + QuestionGrid + + + € + + + + fr.insee + js0f4rf8 + 1.0 + + RESS_DONS + + + Dons des particuliers -Montants en euros + + + fr.insee + js0f7q4i-QOP-jvmft6oi + 1.0 + OutParameter + + + fr.insee + js0f7q4i + 1.0 + QuestionGrid + + + € + + + + fr.insee + js0fb8s7 + 1.0 + + RESS_LEGS + + + Donations et legs (ou « libéralités »)-Montants en + euros + + + fr.insee + js0f7q4i-QOP-jvmg5ja6 + 1.0 + OutParameter + + + fr.insee + js0f7q4i + 1.0 + QuestionGrid + + + € + + + + fr.insee + js0fec1g + 1.0 + + RESS_MECENAT + + + Mécénat, sponsoring ou parrainage d’entreprise-Montants + en euros + + + fr.insee + js0f7q4i-QOP-jvmg2ntx + 1.0 + OutParameter + + + fr.insee + js0f7q4i + 1.0 + QuestionGrid + + + € + + + + fr.insee + js0ff23i + 1.0 + + RESS_AUT_ASSO + + + Financements en provenance d’autres associations + (fédérations, ligues, …) ou de fondations-Montants en euros + + + fr.insee + js0f7q4i-QOP-jvmg2qr5 + 1.0 + OutParameter + + + fr.insee + js0f7q4i + 1.0 + QuestionGrid + + + € + + + + fr.insee + js0fe4rc + 1.0 + + RESS_RECETTE_ACT + + + Recettes d’activité d’origine privée ou publique (ventes + de marchandises et prestations de services réalisées auprès des particuliers, de + personnes morales privées ou des collectivités publiques)-Montants en + euros + + + fr.insee + js0f7q4i-QOP-jvmg0bqq + 1.0 + OutParameter + + + fr.insee + js0f7q4i + 1.0 + QuestionGrid + + + € + + + + fr.insee + js0f9yxu + 1.0 + + RESS_RECETTE_ACT_PUB + + + + - dont recettes d’activité d’origine publique (commande + publique, marchés publics et délégations de service public, dotations, prix + de journées, produits de tarification, …)-Montants en + euros + + + + fr.insee + js0f7q4i-QOP-jvmfwzam + 1.0 + OutParameter + + + fr.insee + js0f7q4i + 1.0 + QuestionGrid + + + € + + + + fr.insee + js0f9gqt + 1.0 + + RESS_SUBV + + + Subventions publiques-Montants en euros + + + fr.insee + js0f7q4i-QOP-jvmfvhj4 + 1.0 + OutParameter + + + fr.insee + js0f7q4i + 1.0 + QuestionGrid + + + € + + + + fr.insee + js0f4xwn + 1.0 + + RESS_AUTRES + + + Autres ressources courantes-Montants en euros + + + fr.insee + js0f7q4i-QOP-jvmg3jpb + 1.0 + OutParameter + + + fr.insee + js0f7q4i + 1.0 + QuestionGrid + + + € + + + + fr.insee + js0f4xwnpr + 1.0 + + RESS_AUTRES_P + + + Autres ressources courantes-Précisez + + + fr.insee + js0f7q4i-QOP-jprecisez + 1.0 + OutParameter + + + fr.insee + js0f7q4i + 1.0 + QuestionGrid + + + + + fr.insee + js0fgz3k + 1.0 + + RESS_TOTAL + + + + Total des produits d’exploitation (ressources + courantes)-Montants en euros + + + + fr.insee + js0f7q4i-QOP-jvmftjzc + 1.0 + OutParameter + + + fr.insee + js0f7q4i + 1.0 + QuestionGrid + + + € + + + + fr.insee + js0fzq6m + 1.0 + + RESS_RECUS_FISC + + + RESS_RECUS_FISC label + + + fr.insee + js0g5z55-QOP-js0g62h4 + 1.0 + OutParameter + + + fr.insee + js0g5z55 + 1.0 + QuestionItem + + + + + fr.insee + js0ge01f + 1.0 + + RESS_SUBV_COM + + + Communes, EPCI (communautés de communes, métropoles,…) + ?-Subventions publiques-Montants + + + fr.insee + js0g28m1-QOP-jvmg02ch + 1.0 + OutParameter + + + fr.insee + js0g28m1 + 1.0 + QuestionGrid + + + € + + + + fr.insee + js0g7ny4 + 1.0 + + RESS_SUBV_DEP + + + Départements, conseils départementaux-Subventions + publiques-Montants + + + fr.insee + js0g28m1-QOP-jvmfrxup + 1.0 + OutParameter + + + fr.insee + js0g28m1 + 1.0 + QuestionGrid + + + € + + + + fr.insee + js0gh3k9 + 1.0 + + RESS_SUBV_REG + + + Régions, conseil régionaux-Subventions + publiques-Montants + + + fr.insee + js0g28m1-QOP-jvmg6n78 + 1.0 + OutParameter + + + fr.insee + js0g28m1 + 1.0 + QuestionGrid + + + € + + + + fr.insee + js0gjpnt + 1.0 + + RESS_SUBV_ETAT + + + État (ministères, ARS, DREAL, …)-Subventions + publiques-Montants + + + fr.insee + js0g28m1-QOP-jvmfwqwf + 1.0 + OutParameter + + + fr.insee + js0g28m1 + 1.0 + QuestionGrid + + + € + + + + fr.insee + js0g7wop + 1.0 + + RESS_SUBV_UE + + + Union européenne-Subventions + publiques-Montants + + + fr.insee + js0g28m1-QOP-jvmfvk3l + 1.0 + OutParameter + + + fr.insee + js0g28m1 + 1.0 + QuestionGrid + + + € + + + + fr.insee + js0goild + 1.0 + + RESS_SUBV_ORG_SOC + + + Organismes sociaux (Pôle emploi, CAF, CNSA, + MSA…)-Subventions publiques-Montants + + + fr.insee + js0g28m1-QOP-jvmftz8o + 1.0 + OutParameter + + + fr.insee + js0g28m1 + 1.0 + QuestionGrid + + + € + + + + fr.insee + js0gm9jg + 1.0 + + RESS_SUBV_AUTRES + + + Autres -Subventions publiques-Montants + + + fr.insee + js0g28m1-QOP-jvmfwc9t + 1.0 + OutParameter + + + fr.insee + js0g28m1 + 1.0 + QuestionGrid + + + € + + + + fr.insee + js0ghqnm + 1.0 + + RESS_REC_ACT_COM + + + Communes, EPCI (communautés de communes, métropoles,…) + ?-Recettes d'activité d'origine publique-Montants + + + fr.insee + js0g28m1-QOP-jvmfq558 + 1.0 + OutParameter + + + fr.insee + js0g28m1 + 1.0 + QuestionGrid + + + € + + + + fr.insee + js0gelqn + 1.0 + + RESS_REC_ACT_DEP + + + Départements, conseils départementaux-Recettes d'activité + d'origine publique-Montants + + + fr.insee + js0g28m1-QOP-jvmg7zsz + 1.0 + OutParameter + + + fr.insee + js0g28m1 + 1.0 + QuestionGrid + + + € + + + + fr.insee + js0gl1uh + 1.0 + + RESS_REC_ACT_REG + + + Régions, conseil régionaux-Recettes d'activité d'origine + publique-Montants + + + fr.insee + js0g28m1-QOP-jvmfrarb + 1.0 + OutParameter + + + fr.insee + js0g28m1 + 1.0 + QuestionGrid + + + € + + + + fr.insee + js0gmisn + 1.0 + + RESS_REC_ACT_ETAT + + + État (ministères, ARS, DREAL, …)-Recettes d'activité + d'origine publique-Montants + + + fr.insee + js0g28m1-QOP-jvmg4tup + 1.0 + OutParameter + + + fr.insee + js0g28m1 + 1.0 + QuestionGrid + + + € + + + + fr.insee + js0gcb97 + 1.0 + + RESS_REC_ACT_UE + + + Union européenne-Recettes d'activité d'origine + publique-Montants + + + fr.insee + js0g28m1-QOP-jvmg7coo + 1.0 + OutParameter + + + fr.insee + js0g28m1 + 1.0 + QuestionGrid + + + € + + + + fr.insee + js0gnnbw + 1.0 + + RESS_REC_ACT_ORG_SOC + + + Organismes sociaux (Pôle emploi, CAF, CNSA, + MSA…)-Recettes d'activité d'origine publique-Montants + + + fr.insee + js0g28m1-QOP-jvmg2kni + 1.0 + OutParameter + + + fr.insee + js0g28m1 + 1.0 + QuestionGrid + + + € + + + + fr.insee + js0gmeec + 1.0 + + RESS_REC_ACT_AUTRES + + + Autres -Recettes d'activité d'origine + publique-Montants + + + fr.insee + js0g28m1-QOP-jvmg3112 + 1.0 + OutParameter + + + fr.insee + js0g28m1 + 1.0 + QuestionGrid + + + € + + + + fr.insee + jvgcbngo + 1.0 + + RESS_SUBV_AUTRES_P + + + RESS_SUBV_AUTRES_P label + + + fr.insee + jvgc8k0y-QOP-jvgc4m44 + 1.0 + OutParameter + + + fr.insee + jvgc8k0y + 1.0 + QuestionItem + + + + + fr.insee + jvgcd0im + 1.0 + + RESS_REC_ACT_AUTRES_P + + + RESS_REC_ACT_AUTRES_P label + + + fr.insee + jvgcdcjx-QOP-jvgcbyxs + 1.0 + OutParameter + + + fr.insee + jvgcdcjx + 1.0 + QuestionItem + + + + + fr.insee + js0gqkq3 + 1.0 + + CHARGES_PERS + + + Charges de personnel (salaires et traitements, charges + sociales et autres charges de personnel)-Dépenses + + + fr.insee + js0gv8ia-QOP-jvmfslgm + 1.0 + OutParameter + + + fr.insee + js0gv8ia + 1.0 + QuestionGrid + + + € + + + + fr.insee + js0grc6f + 1.0 + + CHARGES_IMPOTS + + + Impôts, taxes et versements + assimilés-Dépenses + + + fr.insee + js0gv8ia-QOP-jvmfz3pd + 1.0 + OutParameter + + + fr.insee + js0gv8ia + 1.0 + QuestionGrid + + + € + + + + fr.insee + js0go6hr + 1.0 + + CHARGES_AUTRES + + + Autres dépenses courantes (achats, services extérieurs + dont dépenses de loyers, …)-Dépenses + + + fr.insee + js0gv8ia-QOP-jvmfre83 + 1.0 + OutParameter + + + fr.insee + js0gv8ia + 1.0 + QuestionGrid + + + € + + + + fr.insee + js0gs3gj + 1.0 + + CHARGES_AUTRES_LOYERS + + + - dont dépenses de loyers, de charges locatives, + d'entretien, de réparations et d'assurances-Dépenses + + + fr.insee + js0gv8ia-QOP-jvmft7pd + 1.0 + OutParameter + + + fr.insee + js0gv8ia + 1.0 + QuestionGrid + + + € + + + + fr.insee + js0gtilg + 1.0 + + CHARGES_AUTRES_FORMATION + + + - dont dépenses de formation du + personnel-Dépenses + + + fr.insee + js0gv8ia-QOP-jvmfye18 + 1.0 + OutParameter + + + fr.insee + js0gv8ia + 1.0 + QuestionGrid + + + € + + + + fr.insee + js0h0146 + 1.0 + + CHARGES_AUTRES_COTIS + + + - dont cotisations et licences reversées à des + fédérations-Dépenses + + + fr.insee + js0gv8ia-QOP-jvmftqf0 + 1.0 + OutParameter + + + fr.insee + js0gv8ia + 1.0 + QuestionGrid + + + € + + + + fr.insee + js0gvgb3 + 1.0 + + CHARGES_AUTRES_PRESTA + + + - dont achat de services à des prestataires ou + intervenants, y compris micro-entrepreneurs-Dépenses + + + fr.insee + js0gv8ia-QOP-jvmg783j + 1.0 + OutParameter + + + fr.insee + js0gv8ia + 1.0 + QuestionGrid + + + € + + + + fr.insee + js0h6qt5 + 1.0 + + CHARGES_TOTAL + + + Total des charges d'exploitation (dépenses + courantes)-Dépenses + + + fr.insee + js0gv8ia-QOP-jvmft97z + 1.0 + OutParameter + + + fr.insee + js0gv8ia + 1.0 + QuestionGrid + + + € + + + + fr.insee + js1w5j3t + 1.0 + + MAD_LOCAUX + + + MAD_LOCAUX label + + + fr.insee + js1vv01p-QOP-js1vzbye + 1.0 + OutParameter + + + fr.insee + js1vv01p + 1.0 + QuestionItem + + + + + fr.insee + js1we2rr + 1.0 + + MAD_LOCAUX_EXCLU + + + MAD_LOCAUX_EXCLU label + + + fr.insee + js1w04zo-QOP-js1vynip + 1.0 + OutParameter + + + fr.insee + js1w04zo + 1.0 + QuestionItem + + + + + fr.insee + js1w8vr9 + 1.0 + + MAD_LOCAUX_DUREE_PREF + + + MAD_LOCAUX_DUREE_PREF label + + + fr.insee + js1wasgx-QOP-js1w6zxa + 1.0 + OutParameter + + + fr.insee + js1wasgx + 1.0 + QuestionItem + + + + + fr.insee + js1wkpxs + 1.0 + + MAD_LOCAUX_DUREE_JR + + + MAD_LOCAUX_DUREE_JR label + + + fr.insee + js1wcjld-QOP-js1wf69p + 1.0 + OutParameter + + + fr.insee + js1wcjld + 1.0 + QuestionItem + + + + + fr.insee + js1wd1pb + 1.0 + + MAD_LOCAUX_DUREE_H + + + MAD_LOCAUX_DUREE_H label + + + fr.insee + js1wc3wz-QOP-js1wjcbw + 1.0 + OutParameter + + + fr.insee + js1wc3wz + 1.0 + QuestionItem + + + + + fr.insee + js1wmfrl + 1.0 + + MAD_LOCAUX_SURFACE + + + MAD_LOCAUX_SURFACE label + + + fr.insee + js1wcxvg-QOP-js1wgiim + 1.0 + OutParameter + + + fr.insee + js1wcxvg + 1.0 + QuestionItem + + + m² + + + + fr.insee + js1wmgpt + 1.0 + + MAD_LOCAUX_PAR_PP + + + 1 - Un particulier (personne physique) + + + fr.insee + js1wmyn8-QOP-jvmg34og + 1.0 + OutParameter + + + fr.insee + js1wmyn8 + 1.0 + QuestionGrid + + + + + fr.insee + js1w978c + 1.0 + + MAD_LOCAUX_PAR_COM + + + 2 - Une commune + + + fr.insee + js1wmyn8-QOP-jvmg7ad4 + 1.0 + OutParameter + + + fr.insee + js1wmyn8 + 1.0 + QuestionGrid + + + + + fr.insee + js1wklpy + 1.0 + + MAD_LOCAUX_PAR_AUTPUB + + + 3 - Un autre intervenant du secteur public + + + fr.insee + js1wmyn8-QOP-jvmg2ici + 1.0 + OutParameter + + + fr.insee + js1wmyn8 + 1.0 + QuestionGrid + + + + + fr.insee + js1wncc1 + 1.0 + + MAD_LOCAUX_PAR_ASSO + + + 4 - Une autre association ou fondation + + + fr.insee + js1wmyn8-QOP-jvmg9j11 + 1.0 + OutParameter + + + fr.insee + js1wmyn8 + 1.0 + QuestionGrid + + + + + fr.insee + js1wehz4 + 1.0 + + MAD_LOCAUX_PAR_ENTPRIV + + + 5 - Une entreprise privée + + + fr.insee + js1wmyn8-QOP-jvmfzpgm + 1.0 + OutParameter + + + fr.insee + js1wmyn8 + 1.0 + QuestionGrid + + + + + fr.insee + js1we4rw + 1.0 + + MAD_LOCAUX_PAR_AUTRES + + + 6 - Un autre partenaire + + + fr.insee + js1wmyn8-QOP-jvmfr31k + 1.0 + OutParameter + + + fr.insee + js1wmyn8 + 1.0 + QuestionGrid + + + + + fr.insee + js1we4rwpr + 1.0 + + MAD_LOCAUX_PAR_AUTRES_P + + + MAD_LOCAUX_PAR_AUTRES - Précisez + + + fr.insee + js1wmyn8-QOP-jprecisez + 1.0 + OutParameter + + + fr.insee + js1wmyn8 + 1.0 + QuestionGrid + + + + + fr.insee + js1wkops + 1.0 + + MAD_TERRAINS + + + MAD_TERRAINS label + + + fr.insee + js1wic46-QOP-js1wt5z4 + 1.0 + OutParameter + + + fr.insee + js1wic46 + 1.0 + QuestionItem + + + + + fr.insee + js1wk4mk + 1.0 + + MAD_TERRAINS_EXCLU + + + MAD_TERRAINS_EXCLU label + + + fr.insee + js1wwgqi-QOP-js1wv5rg + 1.0 + OutParameter + + + fr.insee + js1wwgqi + 1.0 + QuestionItem + + + + + fr.insee + js1wyx0f + 1.0 + + MAD_TERRAINS_DUREE_PREF + + + MAD_TERRAINS_DUREE_PREF label + + + fr.insee + js1wx3qa-QOP-js1wsgt4 + 1.0 + OutParameter + + + fr.insee + js1wx3qa + 1.0 + QuestionItem + + + + + fr.insee + js1wzvdg + 1.0 + + MAD_TERRAINS_DUREE_JR + + + MAD_TERRAINS_DUREE_JR label + + + fr.insee + js1wt9ts-QOP-js1x0t4l + 1.0 + OutParameter + + + fr.insee + js1wt9ts + 1.0 + QuestionItem + + + + + fr.insee + js1x0g7p + 1.0 + + MAD_TERRAINS_DUREE_H + + + MAD_TERRAINS_DUREE_H label + + + fr.insee + js1x11dd-QOP-js1wuju5 + 1.0 + OutParameter + + + fr.insee + js1x11dd + 1.0 + QuestionItem + + + + + fr.insee + js1x53cf + 1.0 + + MAD_TERRAINS_SURFACE + + + MAD_TERRAINS_SURFACE label + + + fr.insee + js1wk2jf-QOP-js1x27mu + 1.0 + OutParameter + + + fr.insee + js1wk2jf + 1.0 + QuestionItem + + + m² + + + + fr.insee + js1wv2r5 + 1.0 + + MAD_TERRAINS_PAR_PP + + + 1 - Un particulier (personne physique) + + + fr.insee + js1wqahn-QOP-jvmfq3kc + 1.0 + OutParameter + + + fr.insee + js1wqahn + 1.0 + QuestionGrid + + + + + fr.insee + js1x7ti2 + 1.0 + + MAD_TERRAINS_PAR_COM + + + 2 - Une commune + + + fr.insee + js1wqahn-QOP-jvmfttd6 + 1.0 + OutParameter + + + fr.insee + js1wqahn + 1.0 + QuestionGrid + + + + + fr.insee + js1x1ri3 + 1.0 + + MAD_TERRAINS_PAR_AUTPUB + + + 3 - Un autre intervenant du secteur public + + + fr.insee + js1wqahn-QOP-jvmfrnpx + 1.0 + OutParameter + + + fr.insee + js1wqahn + 1.0 + QuestionGrid + + + + + fr.insee + js1xclrn + 1.0 + + MAD_TERRAINS_PAR_ASSO + + + 4 - Une autre association ou fondation + + + fr.insee + js1wqahn-QOP-jvmg67jg + 1.0 + OutParameter + + + fr.insee + js1wqahn + 1.0 + QuestionGrid + + + + + fr.insee + js1wuj6y + 1.0 + + MAD_TERRAINS_PAR_ENTPRIV + + + 5 - Une entreprise privée + + + fr.insee + js1wqahn-QOP-jvmfve1a + 1.0 + OutParameter + + + fr.insee + js1wqahn + 1.0 + QuestionGrid + + + + + fr.insee + js1x7aeq + 1.0 + + MAD_TERRAINS_PAR_AUTRES + + + 6 - Un autre partenaire + + + fr.insee + js1wqahn-QOP-jvmfudfq + 1.0 + OutParameter + + + fr.insee + js1wqahn + 1.0 + QuestionGrid + + + + + fr.insee + js1x7aeqpr + 1.0 + + MAD_TERRAINS_PAR_AUTRES_P + + + MAD_TERRAINS_PAR_AUTRES - Précisez + + + fr.insee + js1wqahn-QOP-jprecisez + 1.0 + OutParameter + + + fr.insee + js1wqahn + 1.0 + QuestionGrid + + + + + fr.insee + js1xmouc + 1.0 + + RESEAU + + + RESEAU label + + + fr.insee + js1xblc8-QOP-js1x70lq + 1.0 + OutParameter + + + fr.insee + js1xblc8 + 1.0 + QuestionItem + + + + + fr.insee + js1xfsg0 + 1.0 + + RESEAU_TETE_NAT + + + RESEAU_TETE_NAT label + + + fr.insee + js1xnjw7-QOP-js1x5b34 + 1.0 + OutParameter + + + fr.insee + js1xnjw7 + 1.0 + QuestionItem + + + + + fr.insee + js1xfvd4 + 1.0 + + RESEAU_TETE_AUTRE + + + RESEAU_TETE_AUTRE label + + + fr.insee + js1xmypc-QOP-js1xcoh9 + 1.0 + OutParameter + + + fr.insee + js1xmypc + 1.0 + QuestionItem + + + + + fr.insee + js1xabz7 + 1.0 + + RESEAU_P + + + RESEAU_P label + + + fr.insee + js1x9nsr-QOP-js1xkowa + 1.0 + OutParameter + + + fr.insee + js1x9nsr + 1.0 + QuestionItem + + + + + fr.insee + js1xe8j0 + 1.0 + + RESEAU_MOTIFS_OBL + + + 1 - Obligation d'adhésion ou d'affiliation + + + fr.insee + js1xpf9k-QOP-jvmfuxf9 + 1.0 + OutParameter + + + fr.insee + js1xpf9k + 1.0 + QuestionGrid + + + + + fr.insee + js1xmujk + 1.0 + + RESEAU_MOTIFS_ECHG + + + 2 - Échanges d'informations + + + fr.insee + js1xpf9k-QOP-jvmg2zlb + 1.0 + OutParameter + + + fr.insee + js1xpf9k + 1.0 + QuestionGrid + + + + + fr.insee + js1xjq2h + 1.0 + + RESEAU_MOTIFS_RH + + + 3 - Mise à disposition de ressources humaines + + + fr.insee + js1xpf9k-QOP-jvmfvjfu + 1.0 + OutParameter + + + fr.insee + js1xpf9k + 1.0 + QuestionGrid + + + + + fr.insee + js1xinse + 1.0 + + RESEAU_MOTIFS_FINANCIER + + + 4 - Mise en commun de moyens financiers + + + fr.insee + js1xpf9k-QOP-jvmg0yuy + 1.0 + OutParameter + + + fr.insee + js1xpf9k + 1.0 + QuestionGrid + + + + + fr.insee + js1xlcxe + 1.0 + + RESEAU_MOTIFS_OUTILS + + + 5 - Partage d'outils (de gestion, de + formation...) + + + fr.insee + js1xpf9k-QOP-jvmgbdj9 + 1.0 + OutParameter + + + fr.insee + js1xpf9k + 1.0 + QuestionGrid + + + + + fr.insee + js1xk6tn + 1.0 + + RESEAU_MOTIFS_ACTIVITE + + + 6 - Possibilité d'augmenter ou d'élargir l'activité de + votre association + + + fr.insee + js1xpf9k-QOP-jvmfx6oh + 1.0 + OutParameter + + + fr.insee + js1xpf9k + 1.0 + QuestionGrid + + + + + fr.insee + js1xctnf + 1.0 + + RESEAU_MOTIFS_INFLUENCE + + + 7 - Augmentation de l'influence de votre association + auprès des décideurs publics ou du grand public + + + fr.insee + js1xpf9k-QOP-jvmg7m1e + 1.0 + OutParameter + + + fr.insee + js1xpf9k + 1.0 + QuestionGrid + + + + + fr.insee + js1xlfn4 + 1.0 + + RESEAU_MOTIFS_COORD + + + 8 - Meilleure coordination avec les autres associations + agissant sur un même territoire + + + fr.insee + js1xpf9k-QOP-jvmg8hmw + 1.0 + OutParameter + + + fr.insee + js1xpf9k + 1.0 + QuestionGrid + + + + + + fr.insee + INSEE-SIMPSONS-PIS-1 + 1.0 + + SIMPSONS + + + Processing instructions of the Simpsons + questionnaire + + + fr.insee + jskcp2py-GI + 1.0 + + + fr.insee + js0dg9qy + 1.0 + Variable + + + fr.insee + js0dec0k + 1.0 + Variable + + + fr.insee + js0dkhaf + 1.0 + Variable + + + + xpath + + fr.insee + jskcp2py-IP-1 + 1.0 + + SAL_CA_NB_H + + + + fr.insee + jskcp2py-IP-2 + 1.0 + + SAL_CDI_NB_H + + + + fr.insee + jskcp2py-IP-3 + 1.0 + + SAL_CDD_NB_H + + + + fr.insee + jskcp2py-GOP + 1.0 + + + + fr.insee + js0dpd65-QOP-jvmfqbn0 + 1.0 + OutParameter + + + fr.insee + jskcp2py-IP-1 + 1.0 + InParameter + + + + + fr.insee + js0dpd65-QOP-jvmg2oc6 + 1.0 + OutParameter + + + fr.insee + jskcp2py-IP-2 + 1.0 + InParameter + + + + + fr.insee + js0dpd65-QOP-jvmg7ajq + 1.0 + OutParameter + + + fr.insee + jskcp2py-IP-3 + 1.0 + InParameter + + + number(if (jskcp2py-IP-1='') then '0' else jskcp2py-IP-1) + + number(if (jskcp2py-IP-2='') then '0' else jskcp2py-IP-2) + number(if + (jskcp2py-IP-3='') then '0' else jskcp2py-IP-3) + + + + fr.insee + Sequence-jmuk1uzy2 + 1.0 + Sequence + + + + fr.insee + jskezenm-GI + 1.0 + + + fr.insee + js0f9lde + 1.0 + Variable + + + fr.insee + js0f4rf8 + 1.0 + Variable + + + fr.insee + js0fb8s7 + 1.0 + Variable + + + fr.insee + js0fec1g + 1.0 + Variable + + + fr.insee + js0ff23i + 1.0 + Variable + + + fr.insee + js0fe4rc + 1.0 + Variable + + + fr.insee + js0f9gqt + 1.0 + Variable + + + fr.insee + js0f4xwn + 1.0 + Variable + + + + xpath + + fr.insee + jskezenm-IP-1 + 1.0 + + RESS_COTIS + + + + fr.insee + jskezenm-IP-2 + 1.0 + + RESS_DONS + + + + fr.insee + jskezenm-IP-3 + 1.0 + + RESS_LEGS + + + + fr.insee + jskezenm-IP-4 + 1.0 + + RESS_MECENAT + + + + fr.insee + jskezenm-IP-5 + 1.0 + + RESS_AUT_ASSO + + + + fr.insee + jskezenm-IP-6 + 1.0 + + RESS_RECETTE_ACT + + + + fr.insee + jskezenm-IP-7 + 1.0 + + RESS_SUBV + + + + fr.insee + jskezenm-IP-8 + 1.0 + + RESS_AUTRES + + + + fr.insee + jskezenm-GOP + 1.0 + + + + fr.insee + js0f7q4i-QOP-jvmg0x78 + 1.0 + OutParameter + + + fr.insee + jskezenm-IP-1 + 1.0 + InParameter + + + + + fr.insee + js0f7q4i-QOP-jvmft6oi + 1.0 + OutParameter + + + fr.insee + jskezenm-IP-2 + 1.0 + InParameter + + + + + fr.insee + js0f7q4i-QOP-jvmg5ja6 + 1.0 + OutParameter + + + fr.insee + jskezenm-IP-3 + 1.0 + InParameter + + + + + fr.insee + js0f7q4i-QOP-jvmg2ntx + 1.0 + OutParameter + + + fr.insee + jskezenm-IP-4 + 1.0 + InParameter + + + + + fr.insee + js0f7q4i-QOP-jvmg2qr5 + 1.0 + OutParameter + + + fr.insee + jskezenm-IP-5 + 1.0 + InParameter + + + + + fr.insee + js0f7q4i-QOP-jvmg0bqq + 1.0 + OutParameter + + + fr.insee + jskezenm-IP-6 + 1.0 + InParameter + + + + + fr.insee + js0f7q4i-QOP-jvmfvhj4 + 1.0 + OutParameter + + + fr.insee + jskezenm-IP-7 + 1.0 + InParameter + + + + + fr.insee + js0f7q4i-QOP-jvmg3jpb + 1.0 + OutParameter + + + fr.insee + jskezenm-IP-8 + 1.0 + InParameter + + + number(if (jskezenm-IP-1='') then '0' else jskezenm-IP-1) + + number(if (jskezenm-IP-2='') then '0' else jskezenm-IP-2) + number(if + (jskezenm-IP-3='') then '0' else jskezenm-IP-3) + number(if (jskezenm-IP-4='') + then '0' else jskezenm-IP-4) + number(if (jskezenm-IP-5='') then '0' else + jskezenm-IP-5) + number(if (jskezenm-IP-6='') then '0' else jskezenm-IP-6) + + number(if (jskezenm-IP-7='') then '0' else jskezenm-IP-7) + number(if + (jskezenm-IP-8='') then '0' else jskezenm-IP-8) + + + + fr.insee + Sequence-jmuk1uzy2 + 1.0 + Sequence + + + + fr.insee + jskgabwa-GI + 1.0 + + + fr.insee + js0gqkq3 + 1.0 + Variable + + + fr.insee + js0grc6f + 1.0 + Variable + + + fr.insee + js0go6hr + 1.0 + Variable + + + + xpath + + fr.insee + jskgabwa-IP-1 + 1.0 + + CHARGES_PERS + + + + fr.insee + jskgabwa-IP-2 + 1.0 + + CHARGES_IMPOTS + + + + fr.insee + jskgabwa-IP-3 + 1.0 + + CHARGES_AUTRES + + + + fr.insee + jskgabwa-GOP + 1.0 + + + + fr.insee + js0gv8ia-QOP-jvmfslgm + 1.0 + OutParameter + + + fr.insee + jskgabwa-IP-1 + 1.0 + InParameter + + + + + fr.insee + js0gv8ia-QOP-jvmfz3pd + 1.0 + OutParameter + + + fr.insee + jskgabwa-IP-2 + 1.0 + InParameter + + + + + fr.insee + js0gv8ia-QOP-jvmfre83 + 1.0 + OutParameter + + + fr.insee + jskgabwa-IP-3 + 1.0 + InParameter + + + number(if (jskgabwa-IP-1='') then '0' else jskgabwa-IP-1) + + number(if (jskgabwa-IP-2='') then '0' else jskgabwa-IP-2) + number(if + (jskgabwa-IP-3='') then '0' else jskgabwa-IP-3) + + + + fr.insee + Sequence-jmuk1uzy2 + 1.0 + Sequence + + + + fr.insee + jskh90m6-GI + 1.0 + + + fr.insee + js0gs3gj + 1.0 + Variable + + + fr.insee + js0gtilg + 1.0 + Variable + + + fr.insee + js0h0146 + 1.0 + Variable + + + fr.insee + js0gvgb3 + 1.0 + Variable + + + + xpath + + fr.insee + jskh90m6-IP-1 + 1.0 + + CHARGES_AUTRES_LOYERS + + + + fr.insee + jskh90m6-IP-2 + 1.0 + + CHARGES_AUTRES_FORMATION + + + + fr.insee + jskh90m6-IP-3 + 1.0 + + CHARGES_AUTRES_COTIS + + + + fr.insee + jskh90m6-IP-4 + 1.0 + + CHARGES_AUTRES_PRESTA + + + + fr.insee + jskh90m6-GOP + 1.0 + + + + fr.insee + js0gv8ia-QOP-jvmft7pd + 1.0 + OutParameter + + + fr.insee + jskh90m6-IP-1 + 1.0 + InParameter + + + + + fr.insee + js0gv8ia-QOP-jvmfye18 + 1.0 + OutParameter + + + fr.insee + jskh90m6-IP-2 + 1.0 + InParameter + + + + + fr.insee + js0gv8ia-QOP-jvmftqf0 + 1.0 + OutParameter + + + fr.insee + jskh90m6-IP-3 + 1.0 + InParameter + + + + + fr.insee + js0gv8ia-QOP-jvmg783j + 1.0 + OutParameter + + + fr.insee + jskh90m6-IP-4 + 1.0 + InParameter + + + number(if (jskh90m6-IP-1='') then '0' else jskh90m6-IP-1) + + number(if (jskh90m6-IP-2='') then '0' else jskh90m6-IP-2) + number(if + (jskh90m6-IP-3='') then '0' else jskh90m6-IP-3) + number(if (jskh90m6-IP-4='') + then '0' else jskh90m6-IP-4) + + + + fr.insee + Sequence-jmuk1uzy2 + 1.0 + Sequence + + + + fr.insee + jsn6qqzh-GI + 1.0 + + + fr.insee + js0ge01f + 1.0 + Variable + + + fr.insee + js0g7ny4 + 1.0 + Variable + + + fr.insee + js0gh3k9 + 1.0 + Variable + + + fr.insee + js0gjpnt + 1.0 + Variable + + + fr.insee + js0g7wop + 1.0 + Variable + + + fr.insee + js0goild + 1.0 + Variable + + + fr.insee + js0gm9jg + 1.0 + Variable + + + + xpath + + fr.insee + jsn6qqzh-IP-1 + 1.0 + + RESS_SUBV_COM + + + + fr.insee + jsn6qqzh-IP-2 + 1.0 + + RESS_SUBV_DEP + + + + fr.insee + jsn6qqzh-IP-3 + 1.0 + + RESS_SUBV_REG + + + + fr.insee + jsn6qqzh-IP-4 + 1.0 + + RESS_SUBV_ETAT + + + + fr.insee + jsn6qqzh-IP-5 + 1.0 + + RESS_SUBV_UE + + + + fr.insee + jsn6qqzh-IP-6 + 1.0 + + RESS_SUBV_ORG_SOC + + + + fr.insee + jsn6qqzh-IP-7 + 1.0 + + RESS_SUBV_AUTRES + + + + fr.insee + jsn6qqzh-GOP + 1.0 + + + + fr.insee + js0g28m1-QOP-jvmg02ch + 1.0 + OutParameter + + + fr.insee + jsn6qqzh-IP-1 + 1.0 + InParameter + + + + + fr.insee + js0g28m1-QOP-jvmfrxup + 1.0 + OutParameter + + + fr.insee + jsn6qqzh-IP-2 + 1.0 + InParameter + + + + + fr.insee + js0g28m1-QOP-jvmg6n78 + 1.0 + OutParameter + + + fr.insee + jsn6qqzh-IP-3 + 1.0 + InParameter + + + + + fr.insee + js0g28m1-QOP-jvmfwqwf + 1.0 + OutParameter + + + fr.insee + jsn6qqzh-IP-4 + 1.0 + InParameter + + + + + fr.insee + js0g28m1-QOP-jvmfvk3l + 1.0 + OutParameter + + + fr.insee + jsn6qqzh-IP-5 + 1.0 + InParameter + + + + + fr.insee + js0g28m1-QOP-jvmftz8o + 1.0 + OutParameter + + + fr.insee + jsn6qqzh-IP-6 + 1.0 + InParameter + + + + + fr.insee + js0g28m1-QOP-jvmfwc9t + 1.0 + OutParameter + + + fr.insee + jsn6qqzh-IP-7 + 1.0 + InParameter + + + number(if (jsn6qqzh-IP-1='') then '0' else jsn6qqzh-IP-1) + + number(if (jsn6qqzh-IP-2='') then '0' else jsn6qqzh-IP-2) + number(if + (jsn6qqzh-IP-3='') then '0' else jsn6qqzh-IP-3) + number(if (jsn6qqzh-IP-4='') + then '0' else jsn6qqzh-IP-4) + number(if (jsn6qqzh-IP-5='') then '0' else + jsn6qqzh-IP-5) + number(if (jsn6qqzh-IP-6='') then '0' else jsn6qqzh-IP-6) + + number(if (jsn6qqzh-IP-7='') then '0' else jsn6qqzh-IP-7) + + + + fr.insee + Sequence-jmuk1uzy2 + 1.0 + Sequence + + + + fr.insee + jsn757cc-GI + 1.0 + + + fr.insee + js0ghqnm + 1.0 + Variable + + + fr.insee + js0gelqn + 1.0 + Variable + + + fr.insee + js0gl1uh + 1.0 + Variable + + + fr.insee + js0gmisn + 1.0 + Variable + + + fr.insee + js0gcb97 + 1.0 + Variable + + + fr.insee + js0gnnbw + 1.0 + Variable + + + fr.insee + js0gmeec + 1.0 + Variable + + + + xpath + + fr.insee + jsn757cc-IP-1 + 1.0 + + RESS_REC_ACT_COM + + + + fr.insee + jsn757cc-IP-2 + 1.0 + + RESS_REC_ACT_DEP + + + + fr.insee + jsn757cc-IP-3 + 1.0 + + RESS_REC_ACT_REG + + + + fr.insee + jsn757cc-IP-4 + 1.0 + + RESS_REC_ACT_ETAT + + + + fr.insee + jsn757cc-IP-5 + 1.0 + + RESS_REC_ACT_UE + + + + fr.insee + jsn757cc-IP-6 + 1.0 + + RESS_REC_ACT_ORG_SOC + + + + fr.insee + jsn757cc-IP-7 + 1.0 + + RESS_REC_ACT_AUTRES + + + + fr.insee + jsn757cc-GOP + 1.0 + + + + fr.insee + js0g28m1-QOP-jvmfq558 + 1.0 + OutParameter + + + fr.insee + jsn757cc-IP-1 + 1.0 + InParameter + + + + + fr.insee + js0g28m1-QOP-jvmg7zsz + 1.0 + OutParameter + + + fr.insee + jsn757cc-IP-2 + 1.0 + InParameter + + + + + fr.insee + js0g28m1-QOP-jvmfrarb + 1.0 + OutParameter + + + fr.insee + jsn757cc-IP-3 + 1.0 + InParameter + + + + + fr.insee + js0g28m1-QOP-jvmg4tup + 1.0 + OutParameter + + + fr.insee + jsn757cc-IP-4 + 1.0 + InParameter + + + + + fr.insee + js0g28m1-QOP-jvmg7coo + 1.0 + OutParameter + + + fr.insee + jsn757cc-IP-5 + 1.0 + InParameter + + + + + fr.insee + js0g28m1-QOP-jvmg2kni + 1.0 + OutParameter + + + fr.insee + jsn757cc-IP-6 + 1.0 + InParameter + + + + + fr.insee + js0g28m1-QOP-jvmg3112 + 1.0 + OutParameter + + + fr.insee + jsn757cc-IP-7 + 1.0 + InParameter + + + number(if (jsn757cc-IP-1='') then '0' else jsn757cc-IP-1) + + number(if (jsn757cc-IP-2='') then '0' else jsn757cc-IP-2) + number(if + (jsn757cc-IP-3='') then '0' else jsn757cc-IP-3) + number(if (jsn757cc-IP-4='') + then '0' else jsn757cc-IP-4) + number(if (jsn757cc-IP-5='') then '0' else + jsn757cc-IP-5) + number(if (jsn757cc-IP-6='') then '0' else jsn757cc-IP-6) + + number(if (jsn757cc-IP-7='') then '0' else jsn757cc-IP-7) + + + + fr.insee + Sequence-jmuk1uzy2 + 1.0 + Sequence + + + + + fr.insee + INSEE-SIMPSONS-MRS + 1.0 + + Liste de formats numériques et dates de + l'enquête + Numeric and DateTime list for the survey + + + fr.insee + INSEE-COMMUN-MNR-DateTimedate + 1.0 + jj/mm/aaaa + date + + + + + fr.insee + StudyUnit-jmuk1uzy2 + 1.0 + + + fr.insee + DataCollection-jmuk1uzy2 + 1.0 + + fr.insee + QuestionScheme-jmuk1uzy2 + 1.0 + QuestionScheme + + + fr.insee + ControlConstructScheme-jmuk1uzy2 + 1.0 + ControlConstructScheme + + + fr.insee + InterviewerInstructionScheme-jmuk1uzy2 + 1.0 + InterviewerInstructionScheme + + + fr.insee + InstrumentScheme-jmuk1uzy2 + 1.0 + + fr.insee + Instrument-jmuk1uzy2 + 1.0 + + m1 + + + Situation des associations en 2018 + questionnaire + + A définir + + fr.insee + Sequence-jmuk1uzy2 + 1.0 + Sequence + + + + + + diff --git a/src/test/resources/params/in-to-out/business/form.xhtml b/src/test/resources/params/in-to-out/business/form.xhtml new file mode 100644 index 000000000..34afc0e4b --- /dev/null +++ b/src/test/resources/params/in-to-out/business/form.xhtml @@ -0,0 +1,11700 @@ + + + + Situation des associations en 2018 + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + + non + non + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Sequence-jmuk1uzy2 + Sequence-jmuk1uzy2 + Situation des associations en 2018 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Vous devez saisir un nombre entier compris entre 1800 et 2019 + + + + + + 1 + + + + 0 + + + + + + Vous devez saisir un nombre entier compris entre 1800 et 2019 + + + + + + + + + + + 1 + + + + 0 + + + + 2 + + + + + + + + + 1 + + + + 0 + + + + 2 + + + + + + Vous devez saisir une valeur correcte + + + + + + + + Vous devez saisir une valeur correcte + + + Les 9 premiers chiffres du numéro que vous avez renseigné ne correspondent pas à un numéro Siren + + + + + + 1 + + + + 0 + + + + + + + 1 + + + + 2 + + + + 3 + + + + 4 + + + + 5 + + + + 6 + + + + 7 + + + + + + + + 2 + + + + 1 + + + + 0 + + + + + + + 1 + + + + 0 + + + + + + + + + + + + + + + + + + + 1 + + + + 0 + + + + + + Vous devez saisir un nombre entier compris entre 1 et 999 + + + + Vous devez saisir un nombre entier compris entre 0 et 999 + + + Vous avez indiqué une valeur supérieure au nombre de membres composant votre conseil d'administration. Merci de bien vouloir revoir vos réponses. + + + + + + + + + + + + 1 + + + + 0 + + + + + + Vous devez saisir un nombre entier compris entre 1 et 999 + + + + Vous devez saisir un nombre entier compris entre 0 et 999 + + + Vous avez indiqué une valeur supérieure au nombre de membres composant votre bureau. Merci de bien vouloir revoir vos réponses. + + + + + + + + + 1 + + + + 2 + + + + 0 + + + + + + + + 2 + + + + 1 + + + + + Vous devez saisir un nombre entier compris entre 10 et 99 + + + + + + 1 + + + + 2 + + + + 3 + + + + 4 + + + + 5 + + + + 6 + + + + + + + + + + 1 + + + + 0 + + + + + + + + 2 + + + + 1 + + + + + Vous devez saisir un nombre entier compris entre 10 et 99 + + + + + + 1 + + + + 2 + + + + 3 + + + + 4 + + + + 5 + + + + 6 + + + + + + + + + + 1 + + + + 0 + + + + + + + + 2 + + + + 1 + + + + + Vous devez saisir un nombre entier compris entre 10 et 99 + + + + + + 1 + + + + 2 + + + + 3 + + + + 4 + + + + 5 + + + + 6 + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + + + + 0 + + + + + + 1 + + + + 0 + + + + + + 1 + + + + 0 + + + + + + 1 + + + + 0 + + + + + + 1 + + + + 0 + + + + + + + + + Vous indiquez avoir des adhérents autres, merci de bien vouloir préciser de quels types d'adhérents il s'agit. + + + + + + + + + + + + + + + + + + + + + + + + + Vous devez saisir un nombre entier compris entre 0 et 999999 + + + Vous devez saisir un nombre entier compris entre 0 et 999999 + + + Vous devez saisir un nombre entier compris entre 0 et 999999 + + + Vous devez saisir un nombre entier compris entre 0 et 999999 + + + Vous devez saisir un nombre entier compris entre 0 et 999999 + + + Vous indiquez ne pas avoir d'adhérents personnes physiques à la question 1 mais vous avez renseigné un nombre d'adhérents personnes physiques. Merci de bien vouloir revoir vos réponses. + + + Vous indiquez avoir des adhérents personnes physiques à la question 1 mais vous n'avez pas renseigné le nombre d'adhérents personnes physiques. Si vous ne connaissez pas le nombre exact, vous pouvez donner une estimation. + + + Vous indiquez avoir des adhérents personnes physiques à la question 1 mais vous avez renseigné 0 adhérent personnes physiques. Merci de bien vouloir revoir vos réponses. Si vous ne connaissez pas le nombre exact, vous pouvez donner une estimation. + + + Vous indiquez ne pas avoir d'adhérents associations à la question 1 mais vous avez renseigné un nombre d'adhérents associations. Merci de bien vouloir revoir vos réponses. + + + Vous indiquez avoir des adhérents associations à la question 1 mais vous n'avez pas renseigné le nombre d'adhérents associations. Si vous ne connaissez pas le nombre exact, vous pouvez donner une estimation. + + + Vous indiquez avoir des adhérents associations à la question 1 mais vous avez renseigné 0 adhérent associations. Merci de bien vouloir revoir vos réponses. Si vous ne connaissez pas le nombre exact, vous pouvez donner une estimation. + + + Vous indiquez ne pas avoir d'adhérents entreprises privées à la question 1 mais vous avez renseigné le nombre d'adhérents entreprises privées. Merci de bien vouloir revoir vos réponses. + + + Vous indiquez avoir des adhérents entreprises privées à la question 1 mais vous n'avez pas renseigné le nombre d'adhérents entreprises privées. Si vous ne connaissez pas le nombre exact, vous pouvez donner une estimation. + + + Vous indiquez avoir des adhérents entreprises privées à la question 1 mais vous avez renseigné 0 adhérent entreprises privées. Merci de bien vouloir revoir vos réponses. Si vous ne connaissez pas le nombre exact, vous pouvez donner une estimation. + + + Vous indiquez ne pas avoir d'adhérents collectivités publiques à la question 1 mais vous avez renseigné un nombre d'adhérents collectivités publiques. Merci de bien vouloir revoir vos réponses. + + + Vous indiquez avoir des adhérents collectivités publiques à la question 1 mais vous n'avez pas renseigné le nombre d'adhérents collectivités publiques. Si vous ne connaissez pas le nombre exact, vous pouvez donner une estimation. + + + Vous indiquez avoir des adhérents collectivités publiques à la question 1 mais vous avez renseigné 0 adhérent collectivités publiques. Merci de bien vouloir revoir vos réponses. Si vous ne connaissez pas le nombre exact, vous pouvez donner une estimation. + + + Vous indiquez ne pas avoir d'adhérents "autres" à la question 1 mais vous avez renseigné un nombre d'adhérents "autres". Merci de bien vouloir revoir vos réponses. + + + Vous indiquez avoir des adhérents "autres" à la question 1 mais vous n'avez pas renseigné le nombre d'adhérents "autres". Si vous ne connaissez pas le nombre exact, vous pouvez donner une estimation. + + + Vous indiquez avoir des adhérents "autres" à la question 1 mais vous avez renseigné 0 adhérent "autres". Merci de bien vouloir revoir vos réponses. Si vous ne connaissez pas le nombre exact, vous pouvez donner une estimation. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Vous devez saisir un nombre entier compris entre 1 et 3 + + + Vous devez saisir un nombre entier compris entre 1 et 3 + + + Vous devez saisir un nombre entier compris entre 1 et 3 + + + Vous devez saisir un nombre entier compris entre 1 et 3 + + + Vous devez saisir un nombre entier compris entre 1 et 3 + + + Vous devez saisir un nombre entier compris entre 1 et 3 + + + Vous devez saisir un nombre entier compris entre 1 et 3 + + + Vous devez saisir un nombre entier compris entre 1 et 3 + + + Vous devez saisir un nombre entier compris entre 1 et 3 + + + Vous devez saisir un nombre entier compris entre 1 et 3 + + + Vous devez saisir un nombre entier compris entre 1 et 3 + + + Vous devez saisir un nombre entier compris entre 1 et 3 + + + Vous devez saisir un nombre entier compris entre 1 et 3 + + + Vous devez saisir un nombre entier compris entre 1 et 3 + + + Vous devez saisir un nombre entier compris entre 1 et 3 + + + Vous devez saisir un nombre entier compris entre 1 et 3 + + + Vous devez saisir un nombre entier compris entre 1 et 3 + + + Vous devez saisir un nombre entier compris entre 1 et 3 + + + Vous devez saisir un nombre entier compris entre 1 et 3 + + + Vous devez saisir un nombre entier compris entre 1 et 3 + + + Vous devez saisir un nombre entier compris entre 1 et 3 + + + Vous devez saisir un nombre entier compris entre 1 et 3 + + + Vous devez saisir un nombre entier compris entre 1 et 3 + + + Vous devez saisir un nombre entier compris entre 1 et 3 + + + Vous devez saisir un nombre entier compris entre 1 et 3 + + + Vous devez saisir un nombre entier compris entre 1 et 3 + + + Vous devez saisir un nombre entier compris entre 1 et 3 + + + Vous devez saisir un nombre entier compris entre 1 et 3 + + + Vous devez saisir un nombre entier compris entre 1 et 3 + + + Vous devez saisir un nombre entier compris entre 1 et 3 + + + Vous devez saisir un nombre entier compris entre 1 et 3 + + + Vous devez saisir un nombre entier compris entre 1 et 3 + + + Vous devez saisir un nombre entier compris entre 1 et 3 + + + Vous devez saisir un nombre entier compris entre 1 et 3 + + + Vous devez saisir un nombre entier compris entre 1 et 3 + + + Vous devez saisir un nombre entier compris entre 1 et 3 + + + Vous devez saisir un nombre entier compris entre 1 et 3 + + + Vous devez saisir un nombre entier compris entre 1 et 3 + + + Vous devez saisir un nombre entier compris entre 1 et 3 + + + Vous devez saisir un nombre entier compris entre 1 et 3 + + + Vous devez saisir un nombre entier compris entre 1 et 3 + + + Vous devez saisir un nombre entier compris entre 1 et 3 + + + Vous devez saisir un nombre entier compris entre 1 et 3 + + + Vous devez saisir un nombre entier compris entre 1 et 3 + + + Vous devez saisir un nombre entier compris entre 1 et 3 + + + Vous devez saisir un nombre entier compris entre 1 et 3 + + + Vous devez saisir un nombre entier compris entre 1 et 3 + + + Vous devez saisir un nombre entier compris entre 1 et 3 + + + Vous devez saisir un nombre entier compris entre 1 et 3 + + + Vous devez saisir un nombre entier compris entre 1 et 3 + + + Vous devez saisir un nombre entier compris entre 1 et 3 + + + Vous devez saisir un nombre entier compris entre 1 et 3 + + + Vous devez saisir un nombre entier compris entre 1 et 3 + + + Vous devez saisir un nombre entier compris entre 1 et 3 + + + Vous devez saisir un nombre entier compris entre 1 et 3 + + + Vous devez saisir un nombre entier compris entre 1 et 3 + + + Vous devez saisir un nombre entier compris entre 1 et 3 + + + Vous devez saisir un nombre entier compris entre 1 et 3 + + + Vous devez saisir un nombre entier compris entre 1 et 3 + + + Vous devez saisir un nombre entier compris entre 1 et 3 + + + Vous devez saisir un nombre entier compris entre 1 et 3 + + + Vous devez saisir un nombre entier compris entre 1 et 3 + + + Vous devez saisir un nombre entier compris entre 1 et 3 + + + Vous devez saisir un nombre entier compris entre 1 et 3 + + + Vous devez saisir un nombre entier compris entre 1 et 3 + + + Merci d'indiquer trois domaines au maximum, en les classant de 1 à 3 par ordre d'importance. + + + Merci d'indiquer au moins un domaine d'activité. + + + + + + + + + + + + 1 + + + + 0 + + + + + + Vous devez saisir un nombre entier compris entre 0 et 999999999 + + + Vous indiquez avoir des salariés mais vous ne renseignez pas le nombre d'heures de travail pour ces salariés. Si vous ne connaissez pas le nombre exact, vous pouvez donner une estimation. + + + + + + + + + + + + + + + + + + 1 + + + + 0 + + + + + + 1 + + + + 0 + + + + + + 1 + + + + 0 + + + + + + + + + + + + + + + + + + + + + Vous devez saisir un nombre entier compris entre 0 et 999999999 + + + Vous devez saisir un nombre entier compris entre 0 et 999999999 + + + Vous devez saisir un nombre entier compris entre 0 et 999999999 + + + Vous indiquez ne pas avoir de salariés en contrat aidé mais vous renseignez le nombre d'heures de travail de salariés en contrat aidé. Merci de bien vouloir revoir vos réponses. + + + Vous indiquez avoir des salariés en contrat aidé mais vous ne renseignez pas le nombre d'heures de travail pour ces salariés. Si vous ne connaissez pas le nombre exact, vous pouvez donner une estimation. + + + Vous indiquez avoir des salariés en contrat aidé mais vous renseignez 0 heure de travail pour ces salariés. Merci de bien vouloir revoir vos réponses. + + + Vous indiquez ne pas avoir de salariés en CDI mais vous renseignez le nombre d'heures de travail de salariés en CDI. Merci de bien vouloir revoir vos réponses. + + + Vous indiquez avoir des salariés en CDI mais vous ne renseignez pas le nombre d'heures de travail pour ces salariés. Si vous ne connaissez pas le nombre exact, vous pouvez donner une estimation. + + + Vous indiquez avoir des salariés en CDI mais vous renseignez 0 heure de travail pour ces salariés. Merci de bien vouloir revoir vos réponses. + + + Vous indiquez ne pas avoir de salariés en CDD mais vous renseignez le nombre d'heures de travail de salariés en CDD. Merci de bien vouloir revoir vos réponses. + + + Vous indiquez avoir des salariés en CDD mais vous ne renseignez pas le nombre d'heures de travail pour ces salariés. Si vous ne connaissez pas le nombre exact, vous pouvez donner une estimation. + + + Vous indiquez avoir des salariés en CDD mais vous renseignez 0 heure de travail pour ces salariés. Merci de bien vouloir revoir vos réponses. + + + La somme des heures de travail rémunérées déclarées (¤jskcp2py-GOP¤) est supérieure au total des heures de travail rémunérées déclaré à la question 2 (¤js0d53t6-QOP-js0czgby¤). Merci de bien vouloir revoir vos réponses. + + + + Vous devez saisir un nombre entier compris entre 0 et 9999999 + + + Vous indiquez avoir des salariés au 31/12/2018 mais vous ne renseignez pas avoir eu recours à l'emploi salarié au cours de l'année 2018. Merci de bien vouloir revoir vos réponses. + + + + + + + + + + + + + + + + + + + + Vous devez saisir un nombre entier compris entre 0 et 9999999 + + + Vous devez saisir un nombre entier compris entre 0 et 9999999 + + + Vous devez saisir un nombre entier compris entre 0 et 9999999 + + + Vous indiquez avoir des salariés à la question précédente mais n'indiquez aucun salarié à temps plein et aucun salarié à temps partiel. Merci de bien vouloir revoir vos réponses. + + + Vous indiquez ¤jseoe6ty-QOP-jvmg69sa¤ salariés à temps plein et ¤jseoe6ty-QOP-jvmg5jhi¤ à temps partiel ce qui est supérieur au nombre total des salariés de votre association (¤jseoi4yc-QOP-jseo0mfc¤). Merci de bien vouloir revoir vos réponses. + + + Vous indiquez ¤jseoe6ty-QOP-jvmfqq19¤ salariés à temps partiel réduit ce qui est supérieur au nombre de salariés à temps partiel (¤jseoe6ty-QOP-jvmg5jhi¤). Merci de bien vouloir revoir vos réponses. + + + Vous indiquez ¤jseoe6ty-QOP-jvmfqq19¤ salariés à temps partiel réduit mais aucun salarié à temps partiel. Merci de bien vouloir revoir vos réponses. + + + Vous indiquez ¤jseoe6ty-QOP-jvmg69sa¤ salariés à temps plein et ¤jseoe6ty-QOP-jvmg5jhi¤ à temps partiel ce qui est inférieur au nombre total des salariés de votre association (¤jseoi4yc-QOP-jseo0mfc¤). Merci de bien vouloir revoir vos réponses. + + + + + + + + + + + + + + + + + + + + + + + 1 + + + + 0 + + + + + + 1 + + + + 0 + + + + + + 1 + + + + 0 + + + + + + 1 + + + + 0 + + + + + + + + Merci de bien vouloir préciser quelles sont les autres catégories de personnels non mentionnées auparavant. + + + + + + + + + + + + + + + + + + + + + + + Vous devez saisir un nombre entier compris entre 0 et 999999999 + + + Vous devez saisir un nombre entier compris entre 0 et 999999999 + + + Vous devez saisir un nombre entier compris entre 0 et 999999999 + + + Vous devez saisir un nombre entier compris entre 0 et 999999999 + + + Vous indiquez ne pas avoir employé d'intérimaires mais vous renseignez le nombre d'heures de travail pour cette catégorie de personnel. Merci de bien vouloir revoir vos réponses. + + + Vous indiquez avoir employé des intérimaires mais vous renseignez 0 heure de travail pour cette catégorie de personnel. Merci de bien vouloir revoir vos réponses. + + + Vous indiquez avoir employé des intérimaires mais vous ne renseignez pas le nombre d'heures de travail pour cette catégorie de personnel. Si vous ne connaissez pas le nombre exact, vous pouvez donner une estimation. + + + Vous indiquez ne pas avoir de personnels mis à disposition mais vous renseignez le nombre d'heures de travail pour cette catégorie de personnel. Merci de bien vouloir revoir vos réponses. + + + Vous indiquez avoir des personnels mis à disposition mais vous ne renseignez pas le nombre d'heures de travail pour cette catégorie de personnel. Si vous ne connaissez pas le nombre exact, vous pouvez donner une estimation. + + + Vous indiquez avoir des personnels mis à disposition mais vous renseignez 0 heure de travail pour cette catégorie de personnel. Merci de bien vouloir revoir vos réponses. + + + Vous indiquez ne pas avoir de volontaires mais vous renseignez le nombre d'heures de travail pour cette catégorie de personnel. Merci de bien vouloir revoir vos réponses. + + + Vous indiquez avoir des volontaires mais vous ne renseignez pas le nombre d'heures de travail pour cette catégorie de personnel. Si vous ne connaissez pas le nombre exact, vous pouvez donner une estimation. + + + Vous indiquez avoir des volontaires mais vous renseignez 0 heure de travail pour cette catégorie de personnel. Merci de bien vouloir revoir vos réponses. + + + Vous indiquez ne pas avoir d'autres catégories de personnels mais vous renseignez le nombre d'heures de travail pour cette catégorie "autres". Merci de bien vouloir revoir vos réponses. + + + Vous indiquez avoir d'autres catégories de personnels mais vous ne renseignez pas le nombre d'heures de travail pour cette catégorie ""autres"". Si vous ne connaissez pas le nombre exact, vous pouvez donner une estimation. + + + Vous indiquez avoir d'autres catégories de personnels mais vous renseignez 0 heure de travail pour cette catégorie "autres". Merci de bien vouloir revoir vos réponses. + + + + + + + + + + Vous devez saisir un nombre entier compris entre 0 et 9999999 + + + Vous n’avez pas répondu à la question sur les bénévoles qui est essentielle dans ce questionnaire. Il est préférable de le faire avant de passer à la suite. + + + + + Vous devez saisir un nombre entier compris entre 0 et 9999999 + + + Vous indiquez ¤js0egvao-QOP-js0en3v8¤ bénévoles réguliers, ce qui est supérieur au nombre de bénévoles total (¤js0eh523-QOP-js0e63o9¤). Merci de bien vouloir revoir vos réponses. + + + + + + + + + + + + + + + + Vous devez saisir un nombre entier compris entre 0 et 999999999 + + + Vous devez saisir un nombre entier compris entre 0 et 999999999 + + + Merci de bien vouloir renseigner le nombre d'heures effectuées par les bénévoles de votre association. Vous pouvez donner une estimation. + + + Merci de bien vouloir renseigner le nombre d'heures effectuées par les bénévoles réguliers de votre association. Vous pouvez donner une estimation. + + + Vous indiquez un nombre d'heure de travail des bénévoles réguliers supérieur au nombre d'heure total de travail des bénévoles. Merci de bien vouloir revoir vos réponses. + + + Vous indiquez un nombre d'heures qui semble très élevé au regard du nombre de bénévoles indiqué. Merci de bien vouloir vérifier et de revoir vos réponses. + + + Vous considérez que tous les bénévoles sont des bénévoles réguliers, mais le nombre d’heures effectuées par des bénévoles réguliers est différent du nombre d’heures effectuées par l’ensemble des bénévoles. Merci de bien vouloir revoir vos réponses. + + + Vous avez indiqué 0 bénévole régulier à la question 2 mais vous renseignez un nombre d'heures consacré à votre association pour cette catégorie de bénévole. Merci de bien vouloir revoir vos réponses. + + + + + + 1 + + + + 0 + + + + + + + + 1 + + + + 0 + + + + + + Vous devez saisir un nombre entier compris entre 0 et 999999999 + + + + + + 1 + + + + 0 + + + + + + Vous devez saisir un nombre entier compris entre 0 et 999999999 + + + + + + + 1 + + + + 0 + + + + + + + + + + + Date au format JJ/MM/AAAA + Entrez une date valide + + + La question porte sur votre exercice comptable 2018, en conséquence la date de clôture devrait être comprise entre le 1er juin 2018 et le 31 mai 2019. + + + + Vous devez saisir un nombre entier compris entre 0 et 24 + + + Vous n'avez pas répondu à toutes les questions concernant le dernier exercice comptable clos. Il est préférable de le faire avant de passer à la suite. + + + La question porte sur votre exercice comptable 2018, la durée d’exercice devrait être supérieure ou égale au nombre de mois écoulés entre le 01/01/2019 et ¤junsenue-QOP-juns2o7l¤. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Vous devez saisir un nombre entier compris entre 0 et 999999999 + + + Vous devez saisir un nombre entier compris entre 0 et 999999999 + + + Vous devez saisir un nombre entier compris entre 0 et 999999999 + + + Vous devez saisir un nombre entier compris entre 0 et 999999999 + + + Vous devez saisir un nombre entier compris entre 0 et 999999999 + + + Vous devez saisir un nombre entier compris entre 0 et 999999999 + + + Vous devez saisir un nombre entier compris entre 0 et 999999999 + + + Vous devez saisir un nombre entier compris entre 0 et 999999999 + + + Vous devez saisir un nombre entier compris entre 0 et 999999999 + + + + + + Vous devez saisir un nombre entier compris entre 0 et 999999999 + + + La somme des montants des différentes ressources courantes (¤jskezenm-GOP¤) est supérieure au montant total des ressources courantes (¤js0f7q4i-QOP-jvmftjzc¤). Merci de bien vouloir revoir votre réponse. + + + Vous indiquez ¤js0f7q4i-QOP-jvmfwzam¤ euros de recette d'activité d'origine publique mais seulement ¤js0f7q4i-QOP-jvmg0bqq¤ euros de recette d'activité totale (privée + publique). Merci de bien vouloir revoir votre réponse. + + + Merci de bien vouloir préciser quelle est la nature des autres ressources non mentionnées auparavant. + + + + + + 1 + + + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Vous devez saisir un nombre entier compris entre 0 et 999999999 + + + Vous devez saisir un nombre entier compris entre 0 et 999999999 + + + Vous devez saisir un nombre entier compris entre 0 et 999999999 + + + Vous devez saisir un nombre entier compris entre 0 et 999999999 + + + Vous devez saisir un nombre entier compris entre 0 et 999999999 + + + Vous devez saisir un nombre entier compris entre 0 et 999999999 + + + Vous devez saisir un nombre entier compris entre 0 et 999999999 + + + + + + Vous devez saisir un nombre entier compris entre 0 et 999999999 + + + Vous devez saisir un nombre entier compris entre 0 et 999999999 + + + Vous devez saisir un nombre entier compris entre 0 et 999999999 + + + Vous devez saisir un nombre entier compris entre 0 et 999999999 + + + Vous devez saisir un nombre entier compris entre 0 et 999999999 + + + Vous devez saisir un nombre entier compris entre 0 et 999999999 + + + Vous devez saisir un nombre entier compris entre 0 et 999999999 + + + + + + La somme des subventions publiques de la question 5 (¤jsn6qqzh-GOP¤ euros) diffère du montant total des subventions publiques indiqué dans la question 3 (¤js0f7q4i-QOP-jvmfvhj4¤ euros) + + + La somme des recettes d'activités publiques de la question 5 (¤jsn757cc-GOP¤ euros) diffère du montant total des recettes d'activité d'origine publique indiqué dans la question 3 (¤js0f7q4i-QOP-jvmfwzam¤ euros). + + + Vous n'avez pas indiqué avoir de subventions publiques dans la question 3 mais vous renseignez l'origine de ces subventions. Veuillez revoir vos réponses. + + + Vous n'avez pas indiqué avoir de recettes d'activité d'origine publique dans la question 3 mais vous renseignez l'origine de ces recettes d'activités. Veuillez revoir vos réponses. + + + + + + + Merci de bien vouloir préciser quelle est la nature des autres acteurs non-mentionnés auparavant. + + + + + + + Merci de bien vouloir préciser quelle est la nature des autres acteurs non-mentionnés auparavant. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Vous devez saisir un nombre entier compris entre 0 et 999999999 + + + Vous devez saisir un nombre entier compris entre 0 et 999999999 + + + Vous devez saisir un nombre entier compris entre 0 et 999999999 + + + Vous devez saisir un nombre entier compris entre 0 et 999999999 + + + Vous devez saisir un nombre entier compris entre 0 et 999999999 + + + Vous devez saisir un nombre entier compris entre 0 et 999999999 + + + Vous devez saisir un nombre entier compris entre 0 et 999999999 + + + Vous devez saisir un nombre entier compris entre 0 et 999999999 + + + Vous indiquez ¤jskgabwa-GOP¤ euros de charges et un total de ¤js0gv8ia-QOP-jvmft97z¤ euros, soit un écart de plus de 10%. Merci de bien vouloir revoir votre réponse. + + + Vous indiquez ¤jskh90m6-GOP¤ euros d'autres charges et un total de ¤js0gv8ia-QOP-jvmfre83¤, soit un écart de plus de 10%. Veuillez revoir votre réponse. + + + Le total des charges (¤js0gv8ia-QOP-jvmft97z¤ euros) diffère de plus de 20% du total des ressources (¤js0f7q4i-QOP-jvmftjzc¤ euros). Veuillez revoir votre réponse. + + + Vous indiquez des ressources et aucune charge. Merci de bien vouloir revoir vos réponses. + + + + + + + + + + + + 1 + + + + 0 + + + + + + + + 1 + + + + 0 + + + + + + + 1 + + + + 2 + + + + + + Vous devez saisir un nombre entier compris entre 0 et 365 + + + + + Vous devez saisir un nombre entier compris entre 0 et 8760 + + + + Vous devez saisir un nombre entier compris entre 0 et 9999999 + + + + + + + + 1 + + + + + + 1 + + + + + + 1 + + + + + + 1 + + + + + + 1 + + + + + + 1 + + + + + + + + Merci de bien vouloir préciser quelle est la nature de cet autre partenaire non mentionné auparavant. + + + + + + + + + 1 + + + + 0 + + + + + + + + 1 + + + + 0 + + + + + + + 1 + + + + 2 + + + + + + Vous devez saisir un nombre entier compris entre 0 et 365 + + + + + Vous devez saisir un nombre entier compris entre 0 et 8760 + + + + Vous devez saisir un nombre entier compris entre 0 et 9999999 + + + + + + + + 1 + + + + + + 1 + + + + + + 1 + + + + + + 1 + + + + + + 1 + + + + + + 1 + + + + + + + + Merci de bien vouloir préciser quelle est la nature de cet autre partenaire non mentionné auparavant. + + + + + + + + + + + + 1 + + + + 0 + + + + + + + + 1 + + + + 0 + + + + Vous n’avez pas répondu à cette question qui est essentielle dans ce questionnaire. Merci de bien vouloir revoir votre réponse. + + + + + + 1 + + + + 0 + + + + Vous n’avez pas répondu à cette question qui est essentielle dans ce questionnaire. Merci de bien vouloir revoir votre réponse. + + + + + + Merci de préciser à quel réseau appartient votre association. + + + + + + + + 1 + + + + + + 1 + + + + + + 1 + + + + + + 1 + + + + + + 1 + + + + + + 1 + + + + + + 1 + + + + + + 1 + + + + + + + + + + + + + Le nombre d'heures doit être compris entre 0 et 99. + + + Le nombre de minutes doit être compris entre 0 et 59. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + + + + + + + + + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + % + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Pour renseigner ou mettre à jour vos coordonnées, cliquez + sur ce lien : Mon + compte. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + € + + + + + + + + + + + + + + + + + + € + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + € + + + + + + + + + + + + + + € + + + + + + + + + + + + + + € + + + + + + + + + + + + + + € + + + + + + + + + + + + + + € + + + + + + + + + + + + + + + € + + + + + + + + + + + + + + + + + + + € + + + + + + + + + + + + + + + + + + + € + + + + + + + + + + + + + + + + + + + € + + + + + + + + + + + + + + + + € + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + € + + + + + + + + € + + + + + + + + + + + + + + + € + + + + + + + + € + + + + + + + + + + + + + + + € + + + + + + + + € + + + + + + + + + + + + + + + € + + + + + + + + € + + + + + + + + + + + + + + + € + + + + + + + + € + + + + + + + + + + + + + + + € + + + + + + + + € + + + + + + + + + + + + + + + + + + + € + + + + + + + + + + + + € + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + € + + + + + + + + + + + + + + € + + + + + + + + + + + + + + + € + + + + + + + + + + + + + + € + + + + + + + + + + + + + + € + + + + + + + + + + + + + + € + + + + + + + + + + + + + + € + + + + + + + + + + + + + + + + € + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + m² + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + m² + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + heures + + + + minutes + + + + + + + + + + + + + Vous êtes arrivé à la fin du questionnaire. + + + Si vous avez terminé de renseigner  + votre questionnaire, + pour le transmettre à nos services, merci de cliquer ci-dessous sur le bouton : "Envoyer". + + + Une fois le questionnaire envoyé : + + + - vous ne pourrez  + plus modifier vos réponses +  ; + + + - vous pourrez télécharger le  + récapitulatif de vos réponses au format pdf + . + + + + + + + + + + + + + Si vous souhaitez y apporter des modifications + , vous pouvez : + + - revenir dessus dès à présent en cliquant sur le bouton "Retour" ; + - ou plus tard en cliquant sur le bouton "Fermer le questionnaire" et en vous authentifiant à nouveau. + Dans les deux cas, vos données seront enregistrées mais +   + le questionnaire ne sera pas + envoyé à + . + + + Fermer le questionnaire + + + + + + + + + + + + CONFIRMER VOTRE ENVOI + + Votre réponse est définitive et vous souhaitez l'envoyer. + + Je confirme l'envoi + + + + + + + + + + Ne pas envoyer + + + + + + + + + + + + + + + + + + Télécharger le récapitulatif de vos + réponses au format PDF + . + + + + La Statistique publique vous remercie de votre collaboration à + cette enquête. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/test/resources/params/in-to-out/business/fr-specific-treatment.xsl b/src/test/resources/params/in-to-out/business/fr-specific-treatment.xsl new file mode 100644 index 000000000..8c4de4106 --- /dev/null +++ b/src/test/resources/params/in-to-out/business/fr-specific-treatment.xsl @@ -0,0 +1,107 @@ + + + + + + + + Template de racine, on applique les templates de tous les enfants + + + + + + + + Template de base pour tous les éléments et tous les attributs, on recopie + simplement en sortie + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/test/resources/params/in-to-out/business/metadata.xml b/src/test/resources/params/in-to-out/business/metadata.xml new file mode 100644 index 000000000..8e46eb04f --- /dev/null +++ b/src/test/resources/params/in-to-out/business/metadata.xml @@ -0,0 +1,117 @@ + + + INSEE +
l'
+ Institut national de la statistique et des études économiques + de l'Économie et des Finances + + 1 + + + La directrice des Statistiques d'Entreprises + Christel COLIN + + + + PEE + Insee Occitanie - PEE + 0123456789 + dr31-pole-enquetes-entreprises@insee.fr + + 36 + Rue + des 36 Ponts + BP 94217 + 31054 + TOULOUSE CEDEX 4 + + + La directrice régionale de l'Insee Occitanie + Caroline JAMET + + + + ASSOT + Situation des associations + ASSOT + 5 + + ServiceProducteur + INSEE + + + ServiceCollecteur + PEE + + + pluriannuelle + + + + 2019 + Situation des associations + Situation des associations + ASSOT + 10000 + Les objectifs sont de fournir des données statistiques de cadrage sur + l’ensemble des associations relevant de la loi 1901 et assimilées : domaine d’activité, + nombre d’adhérents, ressources + Cette enquête a pour objectif de fournir des données statistiques de cadrage + sur l’ensemble des associations relevant de la loi 1901 et assimilées en dénombrant les + associations actives par domaine d’activité, en évaluant le nombre de leurs adhérents, + leurs ressources financières et humaines (salariés et bénévoles) et en informant sur la + composition du bureau. À ce titre, des données à caractère personnel sont collectées sur + le président, le trésorier et le secrétaire. Conformément à la loi, un droit d’accès et + de rectification sur ces données personnelles peut être exercé auprès de + contact-enquete-association@insee.fr, merci d’en informer les personnes + concernées. + + https://insee.fr/fr/statistiques?debut=0&theme=85&categorie=1 + https://www.insee.fr/fr/metadonnees/source/fichier/DOC_ASSO_NOTICE_2018.pdf + https://www.insee.fr/fr/metadonnees/source/fichier/DOC_ASSO_QUEST_2018.pdf + intérêt général et de qualité statistique + oui + 2019X090EC (arrêté en date du 25/07/2019) + + + Situation des associations en 2018 + + Enquete + ASSOT2019 + + 2018 + pluriannuelle + + + + 20171215 + Ouverture + + + 20191107 + Relance + + + 20200215 + Fermeture + + + + + + + 20171215 + Ouverture + + + 20191107 + Relance + + + 20200215 + Fermeture + + + + + diff --git a/src/test/resources/params/in-to-out/business/params.xml b/src/test/resources/params/in-to-out/business/params.xml new file mode 100644 index 000000000..53a4f7f1f --- /dev/null +++ b/src/test/resources/params/in-to-out/business/params.xml @@ -0,0 +1,81 @@ + + + + ddi + fr + + ddi-mapping + ddi-dereferencing + ddi-cleaning + ddi-titling + + fr-insert-generic-questions + fr-browsing + fr-modele-coltrane + fr-edit-patron + fr-identification + fr-insert-welcome + fr-insert-end + fr-specificTreatment + fr-fix-adherence + + + + + business + + assot-2019-x00 + + + fr + + + + true + + + + true + true + + + + false + false + false + entreprise.css + + + + <Browsing>module</Browsing> + <Sequence> + <Level name="template"/> + <Level name="module"> + <PreSeq/> + <NumParent>N</NumParent> + <PostNumParentSeq/> + <StyleNumSeq>I</StyleNumSeq> + <PostNumSeq> - </PostNumSeq> + </Level> + <Level name="submodule"/> + </Sequence> + <Question> + <Level name="module"> + <PreQuest>➡ </PreQuest> + <NumParent>N</NumParent> + <PostNumParentQuest/> + <StyleNumQuest>1</StyleNumQuest> + <PostNumQuest>. </PostNumQuest> + </Level> + <Level name="submodule"> + <PreQuest>➡ </PreQuest> + <NumParent>N</NumParent> + <PostNumParentQuest/> + <StyleNumQuest>1</StyleNumQuest> + <PostNumQuest>. </PostNumQuest> + </Level> + </Question> + + + + diff --git a/src/test/resources/params/in-to-out/business/pdf-specific-treatment.xsl b/src/test/resources/params/in-to-out/business/pdf-specific-treatment.xsl new file mode 100644 index 000000000..0556676d7 --- /dev/null +++ b/src/test/resources/params/in-to-out/business/pdf-specific-treatment.xsl @@ -0,0 +1,73 @@ + + + + + + + + + Template de racine, on applique les templates de tous les enfants + + + + + + + + + Template de base pour tous les éléments et tous les attributs, on recopie + simplement en sortie + + + + + + + + + + + + + + 173mm + + + + + + + + + + 7mm + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/test/resources/params/in-to-out/household/ddi.xml b/src/test/resources/params/in-to-out/household/ddi.xml new file mode 100644 index 000000000..46b89ed0a --- /dev/null +++ b/src/test/resources/params/in-to-out/household/ddi.xml @@ -0,0 +1,29295 @@ + + + fr.insee + INSEE-ji4df4oc5 + 1.0 + + + Enquête auprès des salariés de l'État en 2018 + + + + fr.insee + RessourcePackage-ji4df4oc5 + 1.0 + + fr.insee + InterviewerInstructionScheme-ji4df4oc5 + 1.0 + + A définir + + + fr.insee + ji4dwdtx-CI-0-II-0 + 1.0 + + warning + + + + Merci de bien vouloir répondre à la question 1 + + + + + fr.insee + juazfzeq + 1.0 + + instruction + + + + + + Indiquez le mois et l'année. + + + + + + + fr.insee + ji4jt9p2-CI-0-II-0 + 1.0 + + warning + + + + Merci de bien vouloir répondre à la question 2 + + + + + fr.insee + jp2rw471 + 1.0 + + instruction + + + + + + Une seule réponse possible. + + + + + + + fr.insee + ji4k6ysf + 1.0 + + help + + + + + Si vous avez repris vos études, année de la + première + sortie. + + + + + + fr.insee + ji4l5cir + 1.0 + + help + + + + + + Y compris parmi ceux acquis par la formation + professionnelle. + + + + + + + fr.insee + jp48zkql + 1.0 + + instruction + + + + + + Une seule réponse possible. + + + + + + + fr.insee + ji4kr456-CI-0-II-0 + 1.0 + + warning + + + + Merci de bien vouloir répondre à la question 5 + + + + + fr.insee + joyd1rpg + 1.0 + + instruction + + + + Dans cette partie, nous allons décrire votre premier + emploi rémunéré, qu'il soit dans la fonction publique ou dans le privé, ainsi + que les éventuelles périodes de chômage que vous avez connues. + + + + + fr.insee + ji4m4u8b + 1.0 + + instruction + + + + + Ne prenez pas en compte l’apprentissage, les petits boulots + ou jobs d’été ou la période de formation initiale (exemples : élèves + fonctionnaires, doctorants rémunérés pour leur thèse, + etc.). + + + + + + fr.insee + jn5zkble + 1.0 + + instruction + + + + + + Répondez en nombre d'années et de mois. Exemple : 3 ans et 6 + mois. + + + + + + + fr.insee + jn6403av + 1.0 + + instruction + + + + + + Répondez en nombre de mois. + + + + + + + fr.insee + jnpobei2 + 1.0 + + instruction + + + + Les questions qui vont suivre portent sur votre premier + poste dans la fonction publique, y compris si celui-ci était dans la fonction + publique hospitalière ou territoriale. + + + + + fr.insee + jjfp0qrr + 1.0 + + help + + + + + Il s’agit de la prise effective du premier poste y compris en + tant que contractuel mais hors période de formation initiale (exemples : + élèves fonctionnaires, doctorants rémunérés pour leur thèse, + etc.). + + + + + + fr.insee + ji4ml7ax-CI-0-II-0 + 1.0 + + warning + + + + Votre année d'entrée dans la fonction publique ne peut + pas être antérieure à ¤ji4lkkue-QOP-ji4m4qn9¤ (votre réponse sur l'année où + vous avez commencé à exercer un emploi rémunéré). Merci de corriger l'une ou + l'autre de ces deux dates (question 6 ou 13). + + + + fr.insee + ji4lkkue-QOP-ji4m4qn9 + 1.0 + OutParameter + + + + + + fr.insee + ji4ml7ax-CI-1-II-1 + 1.0 + + warning + + + + Merci de bien vouloir répondre à la question 13 + + + + + fr.insee + jvc3t0ds + 1.0 + + instruction + + + + Une seule réponse possible. + + + + + fr.insee + jruu3ssd + 1.0 + + instruction + + + + + + Une seule réponse possible. + + + + + + + fr.insee + jn64jhtz-CI-0-II-0 + 1.0 + + warning + + + + Merci de bien vouloir répondre à la question 16 + + + + + fr.insee + jjfpa81t-CI-0-II-0 + 1.0 + + warning + + + + Merci de bien vouloir répondre à la question 17 + + + + + fr.insee + jn6515od-CI-0-II-0 + 1.0 + + warning + + + + L'année indiquée est antérieure à l'année où vous avez + commencé à travailler dans la fonction publique ¤ji4ml7ax-QOP-ji4mrm8r¤. Merci + de corriger l'une ou l'autre de ces deux dates (Questions 13 ou 19). + + + + fr.insee + ji4ml7ax-QOP-ji4mrm8r + 1.0 + OutParameter + + + + + + fr.insee + jn6515od-CI-1-II-1 + 1.0 + + warning + + + + Merci de bien vouloir répondre à la question 19 + + + + + fr.insee + jjfpoyj4 + 1.0 + + comment + + + + + + Indiquez le niveau du poste occupé si vous n'étiez pas + fonctionnaire. Si vous étiez enseignant-chercheur, cochez A. + + + + + + + fr.insee + jn659ucl + 1.0 + + instruction + + + + + + Indiquez le lieu de la première prise de poste et non celui de la + période de formation pour les fonctionnaires stagiaires. + + + + + + + fr.insee + jn65kwcr + 1.0 + + instruction + + + + + + Par exemple : 971 pour la Guadeloupe, 86 pour la Vienne. + + + + + + + fr.insee + jo4k0bx2 + 1.0 + + instruction + + + + Si vous êtes retraité, avez quitté la fonction publique + ou si vous êtes actuellement en formation professionnelle, pour les questions + sur le poste actuel, répondez sur votre dernier poste. + + + + + fr.insee + jo4jzq65 + 1.0 + + instruction + + + + + + Indiquez le niveau du poste occupé si vous n'êtes pas + fonctionnaire. Si vous êtes enseignant-chercheur, cochez A. + + + + + + + fr.insee + jjfqa4n7-CI-0-II-0 + 1.0 + + warning + + + + Merci de bien vouloir répondre à la question 23 + + + + + fr.insee + jubdgfzw + 1.0 + + instruction + + + + + Comptez le nombre de changements de département du lieu de + travail. + + + + + + fr.insee + jubd7agf + 1.0 + + instruction + + + + + + Ne comptez pas la mobilité liée à la formation des fonctionnaires + stagiaires. + + + + + + + fr.insee + jo4k1wz1-CI-0-II-0 + 1.0 + + warning + + + + Vous indiquez un nombre de changements souhaités + supérieur au nombre de changements de département. Merci de bien vouloir + corriger. + + + + + fr.insee + jo4khrya-CI-0-II-0 + 1.0 + + warning + + + + Vous indiquez un nombre de changements liés au suivi de + votre conjoint supérieur au nombre de changements de département. Merci de bien + vouloir corriger. + + + + + fr.insee + joyjjnm7 + 1.0 + + instruction + + + + + + Par exemple, passage de catégorie B en catégorie A. Ne prenez pas + en compte les changements de grade ou d'échelon. + + + + + + + fr.insee + jjfq9ozv + 1.0 + + comment + + + + + + Plusieurs réponses possibles. + + + + + + + fr.insee + joykhisr + 1.0 + + instruction + + + + + + Plusieurs réponses possibles si plusieurs temps partiels ou non + complets pendant la carrière. + + + + + + + fr.insee + jrhqyq13 + 1.0 + + instruction + + + + + + Répondez en nombre d'années et de mois. Exemple : 3 ans et 6 + mois. + + + + + + + fr.insee + jrc1cdki + 1.0 + + instruction + + + + + + Les enseignants ne sont pas concernés par cette question. + + + + + + + fr.insee + jo9uth1s + 1.0 + + instruction + + + + + Répondez en nombre d'années et de mois. Exemple : 3 ans et 6 + mois. + + + + + + fr.insee + jo9us5ty + 1.0 + + instruction + + + + + + Répondez en nombre d'années et de mois. Exemple : 3 ans et 6 + mois. + + + + + + + fr.insee + jo9v2ai4 + 1.0 + + instruction + + + + + + Répondez en nombre d'années et de mois. Exemple : 3 ans et 6 + mois. + + + + + + + fr.insee + jjfrrtwf-CI-0-II-0 + 1.0 + + warning + + + + Vous n'avez pas répondu à la question sur votre statut ou + non d'enseignant. Elle conditionne la suite des questions posées, merci de bien + vouloir y répondre. + + + + + fr.insee + jrc22fzo + 1.0 + + instruction + + + + Les questions 41 à 47 portent sur l'année scolaire + 2018-2019. + + + + + fr.insee + jozds2b9-CI-0-II-0 + 1.0 + + warning + + + + Merci de bien vouloir répondre à la question 40. + + + + + fr.insee + jjfscd7k-CI-0-II-0 + 1.0 + + warning + + + + Merci de bien vouloir répondre à la question 43 + + + + + fr.insee + jjfsq33z-CI-0-II-0 + 1.0 + + warning + + + + Merci de bien vouloir répondre à la question 44 + + + + + fr.insee + jrhs4t3c + 1.0 + + instruction + + + + + + Si vous y avez consacré une demi-journée, indiquez 0.5 + + + + + + + fr.insee + jjfrk62q-CI-0-II-0 + 1.0 + + warning + + + + Merci de répondre à la demi-journée près (par exemple 3 + ou 3.5) + + + + + fr.insee + jjyem4cy + 1.0 + + instruction + + + + + + Si vous y avez consacré une demi-journée, indiquez 0.5 + + + + + + + fr.insee + jjfrtikv-CI-0-II-0 + 1.0 + + warning + + + + Merci de répondre à la demi-journée près (par exemple 5 + ou 5.5) + + + + + fr.insee + jozesim0 + 1.0 + + instruction + + + + + + Indiquez ici le temps de travail réel effectif (et non le nombre + d'heures légales). + + + + + + + fr.insee + jrw0txvz + 1.0 + + instruction + + + + + + En cas de cycle ou de modulation, indiquez la durée + moyenne. + + + + + + + fr.insee + jrw0flne + 1.0 + + instruction + + + + + + Répondez en nombre d'heures et minutes par semaine. + + + + + + + fr.insee + jozf0haj-CI-0-II-0 + 1.0 + + warning + + + + Merci de bien vouloir répondre à la question 40. + + + + + fr.insee + jozf0haj-CI-1-II-1 + 1.0 + + warning + + + + Merci de bien vouloir répondre à la question 48. + + + + + fr.insee + jp47xpqs + 1.0 + + instruction + + + + Répondez en nombre de jours travaillés par semaine + (exemple : 3 ou 3.5) + + + + + fr.insee + jozf688x-CI-0-II-0 + 1.0 + + warning + + + + Merci de répondre à la demi-journée près (par exemple 3 + ou 3.5) + + + + + fr.insee + jozf688x-CI-1-II-1 + 1.0 + + warning + + + + Merci de bien vouloir répondre à la question 49 + + + + + fr.insee + jrc3ntww + 1.0 + + instruction + + + + + + Ne comptez pas les jours de récupération pour horaires + variables. + + + + + + + fr.insee + jrc3lj9f + 1.0 + + instruction + + + + + Répondez en nombre de jours ouvrés (exemple : 25 ou + 25.5) + + + + + + fr.insee + jjfrm2qf-CI-0-II-0 + 1.0 + + warning + + + + Merci de répondre à la demi-journée près (par exemple 25 + ou 25.5) + + + + + fr.insee + jjfrm2qf-CI-1-II-1 + 1.0 + + warning + + + + Merci de bien vouloir répondre à la question 50, même + approximativement. Si vous êtes enseignants-chercheurs ne tenez pas compte de + ce message. + + + + + fr.insee + jjfrqvpf + 1.0 + + comment + + + + + Répondez en nombre de jours ouvrés (exemple : 9 ou + 9.5) + + + + + + fr.insee + jjfrsfl4-CI-0-II-0 + 1.0 + + warning + + + + Le nombre de jours de RTT indiqué ne peut pas être + supérieur à ¤jjfrm2qf-QOP-jjfrqs55¤ (votre réponse sur le nombre de jours de + congés auquel vous avez droit au total). Merci de corriger l'une ou l'autre de + vos réponses (question 50 ou 51). + + + + fr.insee + jjfrm2qf-QOP-jjfrqs55 + 1.0 + OutParameter + + + + + + fr.insee + jjfrsfl4-CI-1-II-1 + 1.0 + + warning + + + + Merci de répondre à la demi-journée près (par exemple 9 + ou 9.5) + + + + + fr.insee + jjfs71bb + 1.0 + + comment + + + + + + Ne comptez pas les jours en provenance d'un compte + épargne-temps. + + + + + + + fr.insee + jp494kkr + 1.0 + + instruction + + + + + Répondez en nombre de jours ouvrés (exemple : 22 ou + 22.5) + + + + + + fr.insee + jjfrzvhu-CI-0-II-0 + 1.0 + + warning + + + + Vous indiquez avoir pris plus de jours de congés que ceux + auxquels vous avez droit au total (¤jjfrm2qf-QOP-jjfrqs55¤ jours). Merci de + corriger l'une ou l'autre de vos réponses (question 50 ou 52). + + + + fr.insee + jjfrm2qf-QOP-jjfrqs55 + 1.0 + OutParameter + + + + + + fr.insee + jjfrzvhu-CI-1-II-1 + 1.0 + + warning + + + + Merci de répondre à la demi-journée près (par exemple 22 + ou 22.5) + + + + + fr.insee + jjfrzvhu-CI-2-II-2 + 1.0 + + warning + + + + Merci de bien vouloir répondre à la question 52, même + approximativement + + + + + fr.insee + jjfsah38 + 1.0 + + comment + + + + + Répondez en nombre de jours ouvrés (exemple : 3 ou + 3.5) + + + + + + fr.insee + jjfs3b3c-CI-0-II-0 + 1.0 + + warning + + + + Vous indiquez avoir déposé plus de jours sur le CET que + ceux auxquels vous avez droit au total (¤jjfrm2qf-QOP-jjfrqs55¤ jours). Merci + de corriger l'une ou l'autre de vos réponses (question 50 ou 53). + + + + fr.insee + jjfrm2qf-QOP-jjfrqs55 + 1.0 + OutParameter + + + + + + fr.insee + jjfs3b3c-CI-1-II-1 + 1.0 + + warning + + + + Merci de répondre à la demi-journée près (par exemple 3 + ou 3.5) + + + + + fr.insee + jjfs3b3c-CI-2-II-2 + 1.0 + + warning + + + + Vous indiquez avoir pris ¤jjfrzvhu-QOP-jjfs8u5a¤ jours de + congé et avoir déposé ¤jjfs3b3c-QOP-jjfsgm0w¤ jours sur le CET en 2018. Merci + de bien vouloir corriger la réponse à la question 52 ou 53 afin que le total ne + dépasse pas le total de vos congés (¤jjfrm2qf-QOP-jjfrqs55¤ jours). + + + + fr.insee + jjfrm2qf-QOP-jjfrqs55 + 1.0 + OutParameter + + + + + fr.insee + jjfrzvhu-QOP-jjfs8u5a + 1.0 + OutParameter + + + + + fr.insee + jjfs3b3c-QOP-jjfsgm0w + 1.0 + OutParameter + + + + + + fr.insee + jp4844kz + 1.0 + + instruction + + + + + + Répondez en nombre de jours ouvrés (exemple : 3 ou 3.5) + + + + + + + fr.insee + jozfj20z-CI-0-II-0 + 1.0 + + warning + + + + Merci de répondre à la demi-journée près (par exemple 3 + ou 3.5) + + + + + fr.insee + jrc3nwpp + 1.0 + + instruction + + + + + + Tenez compte des jours déposés en 2019 au titre de l'année + 2018. + + + + + + + fr.insee + jrc3gtuy + 1.0 + + instruction + + + + + Répondez en nombre de jours ouvrés (exemple : 10 ou + 10.5) + + + + + + fr.insee + jozfsqpe-CI-0-II-0 + 1.0 + + warning + + + + Merci de répondre à la demi-journée près (par exemple 10 + ou 10.5) + + + + + fr.insee + jrc433y3 + 1.0 + + instruction + + + + + Répondez en nombre de jours ouvrés (exemple : 4 ou + 4.5) + + + + + + fr.insee + jrc3ye5q-CI-0-II-0 + 1.0 + + warning + + + + Merci de répondre à la demi-journée près (par exemple 4 + ou 4.5) + + + + + fr.insee + jjfsjlr1 + 1.0 + + comment + + + + + + Indiquez le nombre de jours même approximativement. + + + + + + + fr.insee + jp49kf80 + 1.0 + + instruction + + + + + + Répondez en nombre de jours ouvrés (exemple : 4 ou 4.5) + + + + + + + fr.insee + jjfsdz8f-CI-0-II-0 + 1.0 + + warning + + + + Merci de répondre à la demi-journée près (par exemple 3 + ou 3.5) + + + + + fr.insee + jjfsdz8f-CI-1-II-1 + 1.0 + + warning + + + + Merci de bien vouloir répondre à la question 57, même + approximativement + + + + + fr.insee + jjfsdz8f-CI-2-II-2 + 1.0 + + warning + + + + Vous indiquez avoir pris ¤jjfrzvhu-QOP-jjfs8u5a¤ jours de congés et eu ¤jjfsdz8f-QOP-jozfxq9v¤ jours d'absences. Merci de bien vouloir corriger la réponse à la + question 52 ou 57 afin que le total ne dépasse pas 365 jours. + + + + fr.insee + jjfrzvhu-QOP-jjfs8u5a + 1.0 + OutParameter + + + + + fr.insee + jjfsdz8f-QOP-jozfxq9v + 1.0 + OutParameter + + + + + + fr.insee + jozh6nqa + 1.0 + + instruction + + + + + + Répondez en nombre d'années et de mois. Exemple : 3 ans et 6 + mois. + + + + + + + fr.insee + jjintpi8-CI-0-II-0 + 1.0 + + warning + + + + L'année de naissance de votre enfant le plus âgé est + postérieure à celle de votre enfant le plus jeune. Merci de bien vouloir + corriger. + + + + + fr.insee + jp2tx20k + 1.0 + + instruction + + + + + + Une seule réponse possible. En cas de double nationalité, cochez en + priorité "né français" ou "devenu français". + + + + + + + fr.insee + jp2tvhdo + 1.0 + + instruction + + + + + + Exemples : Italienne, Japonaise, Algérienne ... + + + + + + + fr.insee + js32jdng + 1.0 + + instruction + + + + + + Exemples : Italie, Japon, Algérie... + + + + + + + fr.insee + FTN-INSTRUCTION-1 + 1.0 + + tooltip + + + + + Dans le cas où le service national vient interrompre vos + études, ne tenez pas compte de cette interruption. + + + + + + fr.insee + FTN-INSTRUCTION-2 + 1.0 + + tooltip + + + + + Ne prenez pas en compte le service militaire + + + + + + fr.insee + FTN-INSTRUCTION-3 + 1.0 + + tooltip + + + + + Ne prenez pas en compte le service militaire + + + + + + fr.insee + FTN-INSTRUCTION-4 + 1.0 + + tooltip + + + + + Comptez une mobilité à l'étranger comme un changement de + département + + + + + + fr.insee + FTN-INSTRUCTION-5 + 1.0 + + tooltip + + + + + comptez les jours de vacances scolaires auxquels vous avez + droit, soit environ 80 jours si vous bénéficiez de toutes les vacances + scolaires + + + + + + fr.insee + FTN-INSTRUCTION-6 + 1.0 + + tooltip + + + + + En cas de missions en intérim, comptez un employeur par + société d'intérim. + + + + + + fr.insee + FTN-INSTRUCTION-7 + 1.0 + + tooltip + + + + + Il peut s'agir d'un travail à temps partiel mis en place à + votre initiative ou à l'initiative de votre employeur. + + + + + + fr.insee + FTN-INSTRUCTION-8 + 1.0 + + tooltip + + + + + Si vous êtes en télétravail un jour et demi par semaine, + cochez un jour par semaine. Si vous êtes en télétravail deux jours et demi + par semaine, cochez deux jours par semaine. + + + + + + fr.insee + FTN-INSTRUCTION-9 + 1.0 + + tooltip + + + + + Si vous êtes enseignant en stage dans le cadre de votre + formation initiale, cochez -temps plein- et comptez vos heures de formation + dans la question 45. + + + + + + fr.insee + FTN-INSTRUCTION-10 + 1.0 + + tooltip + + + + + Pour les questions suivantes (de 50 à 57), aidez-vous de + votre outil RH si nécessaire. + + + + + + fr.insee + FTN-INSTRUCTION-11 + 1.0 + + tooltip + + + + + Ne comptez pas les congés à monétiser qui transitent par le + CET sans y rester + + + + + + fr.insee + FTN-INSTRUCTION-12 + 1.0 + + tooltip + + + + + Il s'agit des formations qui préparaient ou étaient + consécutives à un concours, à un examen professionnel ou à un + diplôme. + + + + + + fr.insee + FTN-INSTRUCTION-13 + 1.0 + + tooltip + + + + + En cas d'interruption de carrière pour des raisons de + formation, cochez non. Vous pourrez décrire cette période dans les questions + 58 à 60. + + + + + + fr.insee + FTN-INSTRUCTION-14 + 1.0 + + tooltip + + + + + Si un de vos parents a travaillé en tant qu'assimilé + fonctionnaire, répondez oui. + + + + + + fr.insee + FTN-INSTRUCTION-15 + 1.0 + + tooltip + + + + + Le Pacte (Parcours d’Accès aux Carrières des fonctions + publiques Hospitalière, Territoriale et de l’État) est un moyen d’accès à la + fonction publique par des contrats de droit public qui par détermination de + la loi peuvent conduire à une titularisation dans un corps ou cadre + d’emplois classé en catégorie C. + + + + + + fr.insee + FTN-INSTRUCTION-16 + 1.0 + + tooltip + + + + + Si vous avez été recruté comme fonctionnaire titulaire mais + que votre titularisation est intervenue après votre prise de poste, cochez + la modalité - fonctionnaire titulaire - + + + + + + fr.insee + FTN-INSTRUCTION-17 + 1.0 + + tooltip + + + + + Un changement de corps sur proposition de votre hiérarchie + peut avoir lieu en CAP (Commission Administrative Paritaire) ou sur liste + d'aptitude pour les enseignants par exemple. + + + + + + fr.insee + FTN-INSTRUCTION-18 + 1.0 + + tooltip + + + + + Si vous êtes à temps partiel pour des raisons de santé + (temps partiel thérapeutique), cochez cette modalité. + + + + + + fr.insee + FTN-INSTRUCTION-19 + 1.0 + + tooltip + + + + + Un changement de corps sur proposition de votre hiérarchie + peut avoir lieu en CAP (Commission Administrative Paritaire) ou sur liste + d'aptitude pour les enseignants par exemple. + + + + + + + fr.insee + ControlConstructScheme-ji4df4oc5 + 1.0 + + fr.insee + Sequence-ji4df4oc5 + 1.0 + + Enquête auprès des salariés de l'État en 2018 + + template + + fr.insee + ji4d7eko + 1.0 + Sequence + + + fr.insee + ji4d6ts5 + 1.0 + Sequence + + + fr.insee + ji4dejyu + 1.0 + Sequence + + + fr.insee + ji4dintd + 1.0 + Sequence + + + fr.insee + jje9445l + 1.0 + Sequence + + + fr.insee + jjfrghoq + 1.0 + Sequence + + + fr.insee + jj5q7j9i + 1.0 + Sequence + + + fr.insee + ji4dnal1 + 1.0 + Sequence + + + + fr.insee + ji4d7eko + 1.0 + + SITU_PRO_ACTU + + + VOTRE SITUATION PROFESSIONNELLE ACTUELLE + + module + + fr.insee + ji5pfex8-SI + 1.0 + StatementItem + + + fr.insee + ji4dwdtx-QC + 1.0 + QuestionConstruct + + + fr.insee + ji4dwdtx-CI-0 + 1.0 + ComputationItem + + + fr.insee + ji5qog18-a-ji4dwdtx + 1.0 + IfThenElse + + + + fr.insee + ji4d6ts5 + 1.0 + + FORMA_INIT + + + VOTRE FORMATION + + module + + fr.insee + ji4jutje-QC + 1.0 + QuestionConstruct + + + fr.insee + ji4kr456-QC + 1.0 + QuestionConstruct + + + fr.insee + ji4kr456-CI-0 + 1.0 + ComputationItem + + + + fr.insee + ji4dejyu + 1.0 + + ENTR_VIE_ACT + + + VOTRE ENTRÉE DANS LA VIE ACTIVE + + + fr.insee + joyd1rpg + 1.0 + Instruction + + module + + fr.insee + jnpo04pu + 1.0 + Sequence + + + fr.insee + jnpo1w6d + 1.0 + Sequence + + + + fr.insee + jnpo04pu + 1.0 + + IIIA + + + III.A - VOTRE PREMIER EMPLOI RÉMUNÉRÉ + + submodule + + fr.insee + ji4lkkue-QC + 1.0 + QuestionConstruct + + + fr.insee + ji4ly1lu-QC + 1.0 + QuestionConstruct + + + fr.insee + ji5s4ys2-a-ji4ly1lu + 1.0 + IfThenElse + + + + fr.insee + jnpo1w6d + 1.0 + + IIIB + + + III.B - PÉRIODES DE CHÔMAGE + + submodule + + fr.insee + ji5rui6p-QC + 1.0 + QuestionConstruct + + + fr.insee + ji5rwq2l-a-ji5rui6p + 1.0 + IfThenElse + + + + fr.insee + ji4dintd + 1.0 + + PREM_POSTE + + + VOTRE PREMIER POSTE DANS LA FONCTION PUBLIQUE + + + fr.insee + jnpobei2 + 1.0 + Instruction + + module + + fr.insee + ji4ml7ax-QC + 1.0 + QuestionConstruct + + + fr.insee + ji4ml7ax-CI-0 + 1.0 + ComputationItem + + + fr.insee + ji4ml7ax-CI-1 + 1.0 + ComputationItem + + + fr.insee + ji4mrfyk-QC + 1.0 + QuestionConstruct + + + fr.insee + ji5x2loi-QC + 1.0 + QuestionConstruct + + + fr.insee + jn64jhtz-QC + 1.0 + QuestionConstruct + + + fr.insee + jn64jhtz-CI-0 + 1.0 + ComputationItem + + + fr.insee + jn64zful-a-jn64jhtz + 1.0 + IfThenElse + + + fr.insee + jjfparcg-QC + 1.0 + QuestionConstruct + + + fr.insee + jm6g69xh-QC + 1.0 + QuestionConstruct + + + fr.insee + jm6g8t7k-a-jm6g69xh + 1.0 + IfThenElse + + + + fr.insee + jje9445l + 1.0 + + PARCOURS_PRO + + + VOTRE PARCOURS PROFESSIONNEL DANS LA FONCTION + PUBLIQUE + + module + + fr.insee + jo4jx7ie + 1.0 + Sequence + + + fr.insee + jo4jsoga + 1.0 + Sequence + + + fr.insee + jo4kt8uk + 1.0 + Sequence + + + + fr.insee + jo4jx7ie + 1.0 + + VA_VOTREPOS + + + V.A - VOTRE POSTE ACTUEL + + + fr.insee + jo4k0bx2 + 1.0 + Instruction + + submodule + + fr.insee + jjfqa4n7-QC + 1.0 + QuestionConstruct + + + fr.insee + jjfqa4n7-CI-0 + 1.0 + ComputationItem + + + fr.insee + jje9fape-QC + 1.0 + QuestionConstruct + + + fr.insee + jje9bdqm-QC + 1.0 + QuestionConstruct + + + fr.insee + joyirwwm-QC + 1.0 + QuestionConstruct + + + + fr.insee + jo4jsoga + 1.0 + + VB_MOBILITE + + + V.B - MOBILITÉ GÉOGRAPHIQUE ET PROMOTION + + submodule + + fr.insee + jje9mvyn-QC + 1.0 + QuestionConstruct + + + fr.insee + jrgfrrrn-a-jje9mvyn + 1.0 + IfThenElse + + + fr.insee + jjfq3jkl-QC + 1.0 + QuestionConstruct + + + fr.insee + jjfqjyvv-a-jjfq3jkl + 1.0 + IfThenElse + + + + fr.insee + jo4kt8uk + 1.0 + + VC_ORGA + + + V.C - ORGANISATION DU TRAVAIL ET INTERRUPTIONS DE + CARRIÈRE + + submodule + + fr.insee + jjfr67oy-QC + 1.0 + QuestionConstruct + + + fr.insee + jjfr2ybd-a-jjfr67oy + 1.0 + IfThenElse + + + fr.insee + joyke3ob-QC + 1.0 + QuestionConstruct + + + fr.insee + jjfr6a91-QC + 1.0 + QuestionConstruct + + + fr.insee + d1e1 + 1.0 + IfThenElse + + + fr.insee + d1e2 + 1.0 + IfThenElse + + + fr.insee + d1e3 + 1.0 + IfThenElse + + + + fr.insee + jjfrghoq + 1.0 + + TRV_CONGES_ABS + + + VOTRE TEMPS DE TRAVAIL, VOS CONGÉS ET ABSENCES EN + 2018 + + module + + fr.insee + jjfrrtwf-QC + 1.0 + QuestionConstruct + + + fr.insee + jjfrrtwf-CI-0 + 1.0 + ComputationItem + + + fr.insee + jjyebdv3-a-jjfrrtwf + 1.0 + IfThenElse + + + fr.insee + jp3t0zmv-jjyebdv3-b-jozeysd5 + 1.0 + IfThenElse + + + fr.insee + jozfk2zz + 1.0 + Sequence + + + + fr.insee + jozde2wi + 1.0 + + ENSEIG + + + VI.A - VOUS ÊTES ENSEIGNANT DU PRIMAIRE OU DU SECONDAIRE + (SANS DÉCHARGE TOTALE) + + + fr.insee + jrc22fzo + 1.0 + Instruction + + submodule + + fr.insee + jozds2b9-QC + 1.0 + QuestionConstruct + + + fr.insee + jozds2b9-CI-0 + 1.0 + ComputationItem + + + fr.insee + jozdgt4o-QC + 1.0 + QuestionConstruct + + + fr.insee + jrhrn9ti-SI + 1.0 + StatementItem + + + fr.insee + jjfscd7k-QC + 1.0 + QuestionConstruct + + + fr.insee + jjfscd7k-CI-0 + 1.0 + ComputationItem + + + fr.insee + jjfsq33z-QC + 1.0 + QuestionConstruct + + + fr.insee + jjfsq33z-CI-0 + 1.0 + ComputationItem + + + fr.insee + jjfspjuz-QC + 1.0 + QuestionConstruct + + + fr.insee + jjfrxfol-SI + 1.0 + StatementItem + + + fr.insee + jjfrk62q-QC + 1.0 + QuestionConstruct + + + fr.insee + jjfrk62q-CI-0 + 1.0 + ComputationItem + + + fr.insee + jjfrtikv-QC + 1.0 + QuestionConstruct + + + fr.insee + jjfrtikv-CI-0 + 1.0 + ComputationItem + + + + fr.insee + jozeysd5 + 1.0 + + NON_ENSEIGN + + + VI.B - VOUS N'ÊTES PAS ENSEIGNANT DU PRIMAIRE OU DU + SECONDAIRE (OU EN CAS DE DÉCHARGE TOTALE) + + submodule + + fr.insee + jozf0haj-QC + 1.0 + QuestionConstruct + + + fr.insee + jozf0haj-CI-0 + 1.0 + ComputationItem + + + fr.insee + jozf0haj-CI-1 + 1.0 + ComputationItem + + + fr.insee + jozf688x-QC + 1.0 + QuestionConstruct + + + fr.insee + jozf688x-CI-0 + 1.0 + ComputationItem + + + fr.insee + jozf688x-CI-1 + 1.0 + ComputationItem + + + fr.insee + jrc5ea2c-SI + 1.0 + StatementItem + + + fr.insee + jjfrm2qf-QC + 1.0 + QuestionConstruct + + + fr.insee + jjfrm2qf-CI-0 + 1.0 + ComputationItem + + + fr.insee + jjfrm2qf-CI-1 + 1.0 + ComputationItem + + + fr.insee + jjfrsfl4-QC + 1.0 + QuestionConstruct + + + fr.insee + jjfrsfl4-CI-0 + 1.0 + ComputationItem + + + fr.insee + jjfrsfl4-CI-1 + 1.0 + ComputationItem + + + fr.insee + jjfrzvhu-QC + 1.0 + QuestionConstruct + + + fr.insee + jjfrzvhu-CI-0 + 1.0 + ComputationItem + + + fr.insee + jjfrzvhu-CI-1 + 1.0 + ComputationItem + + + fr.insee + jjfrzvhu-CI-2 + 1.0 + ComputationItem + + + fr.insee + jjfs3b3c-QC + 1.0 + QuestionConstruct + + + fr.insee + jjfs3b3c-CI-0 + 1.0 + ComputationItem + + + fr.insee + jjfs3b3c-CI-1 + 1.0 + ComputationItem + + + fr.insee + jjfs3b3c-CI-2 + 1.0 + ComputationItem + + + fr.insee + jozfj20z-QC + 1.0 + QuestionConstruct + + + fr.insee + jozfj20z-CI-0 + 1.0 + ComputationItem + + + fr.insee + jozfsqpe-QC + 1.0 + QuestionConstruct + + + fr.insee + jozfsqpe-CI-0 + 1.0 + ComputationItem + + + fr.insee + jrc3ye5q-QC + 1.0 + QuestionConstruct + + + fr.insee + jrc3ye5q-CI-0 + 1.0 + ComputationItem + + + + fr.insee + jozfk2zz + 1.0 + + ABS + + + VI.C - POUR TOUS - ABSENCES + + submodule + + fr.insee + jjfsdz8f-QC + 1.0 + QuestionConstruct + + + fr.insee + jjfsdz8f-CI-0 + 1.0 + ComputationItem + + + fr.insee + jjfsdz8f-CI-1 + 1.0 + ComputationItem + + + fr.insee + jjfsdz8f-CI-2 + 1.0 + ComputationItem + + + + fr.insee + jj5q7j9i + 1.0 + + FORM_CONT + + + VOTRE FORMATION CONTINUE + + module + + fr.insee + jjzrk79r-QC + 1.0 + QuestionConstruct + + + fr.insee + jjzs62m2-a-jjzrk79r + 1.0 + IfThenElse + + + + fr.insee + ji4dnal1 + 1.0 + + SITU_FAM + + + VOTRE SITUATION FAMILIALE, VOS ORIGINES GÉOGRAPHIQUES ET + FAMILIALES + + module + + fr.insee + jozgw4j3-QC + 1.0 + QuestionConstruct + + + fr.insee + jozgw8a7-a-jozgw4j3 + 1.0 + IfThenElse + + + fr.insee + ji5x49d4-QC + 1.0 + QuestionConstruct + + + fr.insee + jjio9ccf-a-ji5x49d4 + 1.0 + IfThenElse + + + fr.insee + jp2u3e8k-QC + 1.0 + QuestionConstruct + + + fr.insee + jp2uhtl5-a-jp2u3e8k + 1.0 + IfThenElse + + + fr.insee + jjiokcqs-QC + 1.0 + QuestionConstruct + + + fr.insee + js329yn4-a-jjiokcqs + 1.0 + IfThenElse + + + fr.insee + jjioti5q-QC + 1.0 + QuestionConstruct + + + fr.insee + jp2tn1vq-QC + 1.0 + QuestionConstruct + + + + fr.insee + ji5qog18-a-ji4dwdtx + 1.0 + + A définir + + + + + + + xpath + + fr.insee + ji5qog18-a-ji4dwdtx-IP-1 + 1.0 + + ACTADMIN + + + + + fr.insee + ji4dwdtx-QOP-ji4dunra + 1.0 + OutParameter + + + fr.insee + ji5qog18-a-ji4dwdtx-IP-1 + 1.0 + InParameter + + + not(ji5qog18-a-ji4dwdtx-IP-1 != '2') + + + + fr.insee + ji5qog18-a-ji4dwdtx-THEN + 1.0 + Sequence + + + + fr.insee + ji5qog18-a-ji4dwdtx-THEN + 1.0 + + + + hideable + + fr.insee + ji4jt9p2-QC + 1.0 + QuestionConstruct + + + fr.insee + ji4jt9p2-CI-0 + 1.0 + ComputationItem + + + fr.insee + ji4jwh9s-QC + 1.0 + QuestionConstruct + + + + fr.insee + ji5s4ys2-a-ji4ly1lu + 1.0 + + A définir + + + + + + + xpath + + fr.insee + ji5s4ys2-a-ji4ly1lu-IP-1 + 1.0 + + SECTEUR + + + + + fr.insee + ji4ly1lu-QOP-ji4m2n5u + 1.0 + OutParameter + + + fr.insee + ji5s4ys2-a-ji4ly1lu-IP-1 + 1.0 + InParameter + + + not(ji5s4ys2-a-ji4ly1lu-IP-1 != '1' ) + + + + fr.insee + ji5s4ys2-a-ji4ly1lu-THEN + 1.0 + Sequence + + + + fr.insee + ji5s4ys2-a-ji4ly1lu-THEN + 1.0 + + + + hideable + + fr.insee + ji5r2tmo-QC + 1.0 + QuestionConstruct + + + fr.insee + ji5rge4j-QC + 1.0 + QuestionConstruct + + + + fr.insee + ji5rwq2l-a-ji5rui6p + 1.0 + + A définir + + + + + + + xpath + + fr.insee + ji5rwq2l-a-ji5rui6p-IP-1 + 1.0 + + PERIODCHOM + + + + + fr.insee + ji5rui6p-QOP-ji5rs7j6 + 1.0 + OutParameter + + + fr.insee + ji5rwq2l-a-ji5rui6p-IP-1 + 1.0 + InParameter + + + not(ji5rwq2l-a-ji5rui6p-IP-1!= '1') + + + + fr.insee + ji5rwq2l-a-ji5rui6p-THEN + 1.0 + Sequence + + + + fr.insee + ji5rwq2l-a-ji5rui6p-THEN + 1.0 + + + + hideable + + fr.insee + ji5s11e3-QC + 1.0 + QuestionConstruct + + + fr.insee + ji5rv55w-QC + 1.0 + QuestionConstruct + + + + fr.insee + jn64zful-a-jn64jhtz + 1.0 + + A définir + + + + + + + xpath + + fr.insee + jn64zful-a-jn64jhtz-IP-1 + 1.0 + + STATUTPP + + + + + fr.insee + jn64jhtz-QOP-jn6516e0 + 1.0 + OutParameter + + + fr.insee + jn64zful-a-jn64jhtz-IP-1 + 1.0 + InParameter + + + not(jn64zful-a-jn64jhtz-IP-1= '1' ) + + + + fr.insee + jn64zful-a-jn64jhtz-THEN + 1.0 + Sequence + + + + fr.insee + jn64zful-a-jn64jhtz-THEN + 1.0 + + + + hideable + + fr.insee + jjfpa81t-QC + 1.0 + QuestionConstruct + + + fr.insee + jjfpa81t-CI-0 + 1.0 + ComputationItem + + + fr.insee + jjy9qsja-a-jjfpa81t + 1.0 + IfThenElse + + + + fr.insee + jjy9qsja-a-jjfpa81t + 1.0 + + A définir + + + + + + + xpath + + fr.insee + jjy9qsja-a-jjfpa81t-IP-1 + 1.0 + + TITUL + + + + + fr.insee + jjfpa81t-QOP-jjfpk302 + 1.0 + OutParameter + + + fr.insee + jjy9qsja-a-jjfpa81t-IP-1 + 1.0 + InParameter + + + not(jjy9qsja-a-jjfpa81t-IP-1= '2' ) + + + + fr.insee + jjy9qsja-a-jjfpa81t-THEN + 1.0 + Sequence + + + + fr.insee + jjy9qsja-a-jjfpa81t-THEN + 1.0 + + + + hideable + + fr.insee + jjfpeiy4-QC + 1.0 + QuestionConstruct + + + fr.insee + jn6515od-QC + 1.0 + QuestionConstruct + + + fr.insee + jn6515od-CI-0 + 1.0 + ComputationItem + + + fr.insee + jn6515od-CI-1 + 1.0 + ComputationItem + + + + fr.insee + jm6g8t7k-a-jm6g69xh + 1.0 + + A définir + + + + + + + xpath + + fr.insee + jm6g8t7k-a-jm6g69xh-IP-1 + 1.0 + + LIEUFP + + + + + fr.insee + jm6g69xh-QOP-jm6grla8 + 1.0 + OutParameter + + + fr.insee + jm6g8t7k-a-jm6g69xh-IP-1 + 1.0 + InParameter + + + not(jm6g8t7k-a-jm6g69xh-IP-1 = '2') + + + + fr.insee + jm6g8t7k-a-jm6g69xh-THEN + 1.0 + Sequence + + + + fr.insee + jm6g8t7k-a-jm6g69xh-THEN + 1.0 + + + + hideable + + fr.insee + ji5wosav-QC + 1.0 + QuestionConstruct + + + + fr.insee + jrgfrrrn-a-jje9mvyn + 1.0 + + A définir + + + + + + + xpath + + fr.insee + jrgfrrrn-a-jje9mvyn-IP-1 + 1.0 + + NBDPT + + + + + fr.insee + jje9mvyn-QOP-jje9i8cz + 1.0 + OutParameter + + + fr.insee + jrgfrrrn-a-jje9mvyn-IP-1 + 1.0 + InParameter + + + not(number(if (jrgfrrrn-a-jje9mvyn-IP-1='') then '0' else + jrgfrrrn-a-jje9mvyn-IP-1) = 0 and jrgfrrrn-a-jje9mvyn-IP-1!='') + + + + + fr.insee + jrgfrrrn-a-jje9mvyn-THEN + 1.0 + Sequence + + + + fr.insee + jrgfrrrn-a-jje9mvyn-THEN + 1.0 + + + + hideable + + fr.insee + jo4k1wz1-QC + 1.0 + QuestionConstruct + + + fr.insee + jo4k1wz1-CI-0 + 1.0 + ComputationItem + + + fr.insee + jo4khrya-QC + 1.0 + QuestionConstruct + + + fr.insee + jo4khrya-CI-0 + 1.0 + ComputationItem + + + + fr.insee + jjfqjyvv-a-jjfq3jkl + 1.0 + + A définir + + + + + + + xpath + + fr.insee + jjfqjyvv-a-jjfq3jkl-IP-1 + 1.0 + + PROMOTION + + + + + fr.insee + jjfq3jkl-QOP-jjfr4jff + 1.0 + OutParameter + + + fr.insee + jjfqjyvv-a-jjfq3jkl-IP-1 + 1.0 + InParameter + + + not(jjfqjyvv-a-jjfq3jkl-IP-1= '2') + + + + fr.insee + jjfqjyvv-a-jjfq3jkl-THEN + 1.0 + Sequence + + + + fr.insee + jjfqjyvv-a-jjfq3jkl-THEN + 1.0 + + + + hideable + + fr.insee + jjfqblut-QC + 1.0 + QuestionConstruct + + + + fr.insee + jjfr2ybd-a-jjfr67oy + 1.0 + + A définir + + + + + + + xpath + + fr.insee + jjfr2ybd-a-jjfr67oy-IP-1 + 1.0 + + TPSPART + + + + + fr.insee + jjfr67oy-QOP-jjfr9xmw + 1.0 + OutParameter + + + fr.insee + jjfr2ybd-a-jjfr67oy-IP-1 + 1.0 + InParameter + + + not(jjfr2ybd-a-jjfr67oy-IP-1= '2') + + + + fr.insee + jjfr2ybd-a-jjfr67oy-THEN + 1.0 + Sequence + + + + fr.insee + jjfr2ybd-a-jjfr67oy-THEN + 1.0 + + + + hideable + + fr.insee + joyk2rvl-QC + 1.0 + QuestionConstruct + + + fr.insee + jjfqtw3t-QC + 1.0 + QuestionConstruct + + + + fr.insee + d1e1 + 1.0 + + A définir + + + + + + + xpath + + fr.insee + d1e1-IP-1 + 1.0 + + INTERR_1 + + + + + fr.insee + jjfr6a91-QOP-jui1od9s + 1.0 + OutParameter + + + fr.insee + d1e1-IP-1 + 1.0 + InParameter + + + not(d1e1-IP-1 ='2') + + + + fr.insee + d1e1-THEN + 1.0 + Sequence + + + + fr.insee + d1e1-THEN + 1.0 + + + + hideable + + fr.insee + jjyd137l-QC + 1.0 + QuestionConstruct + + + + fr.insee + d1e2 + 1.0 + + A définir + + + + + + + xpath + + fr.insee + d1e2-IP-2 + 1.0 + + INTERR_2 + + + + + fr.insee + jjfr6a91-QOP-jui1vq3t + 1.0 + OutParameter + + + fr.insee + d1e2-IP-2 + 1.0 + InParameter + + + not(d1e2-IP-2 ='2') + + + + fr.insee + d1e2-THEN + 1.0 + Sequence + + + + fr.insee + d1e2-THEN + 1.0 + + + + hideable + + fr.insee + jjzcm9q0-QC + 1.0 + QuestionConstruct + + + + fr.insee + d1e3 + 1.0 + + A définir + + + + + + + xpath + + fr.insee + d1e3-IP-3 + 1.0 + + INTERR_3 + + + + + fr.insee + jjfr6a91-QOP-jui1ue62 + 1.0 + OutParameter + + + fr.insee + d1e3-IP-3 + 1.0 + InParameter + + + not(d1e3-IP-3 ='2') + + + + fr.insee + d1e3-THEN + 1.0 + Sequence + + + + fr.insee + d1e3-THEN + 1.0 + + + + hideable + + fr.insee + jjzcr77v-QC + 1.0 + QuestionConstruct + + + + fr.insee + jjyebdv3-a-jjfrrtwf + 1.0 + + A définir + + + + + + + xpath + + fr.insee + jjyebdv3-a-jjfrrtwf-IP-1 + 1.0 + + INDIC_ENSEIGN + + + + + fr.insee + jjfrrtwf-QOP-jjfrdkf5 + 1.0 + OutParameter + + + fr.insee + jjyebdv3-a-jjfrrtwf-IP-1 + 1.0 + InParameter + + + not(jjyebdv3-a-jjfrrtwf-IP-1 = '2' or jjyebdv3-a-jjfrrtwf-IP-1 + ='3') + + + + fr.insee + jjyebdv3-a-jjfrrtwf-THEN + 1.0 + Sequence + + + + fr.insee + jjyebdv3-a-jjfrrtwf-THEN + 1.0 + + + + hideable + + fr.insee + jozde2wi + 1.0 + Sequence + + + + fr.insee + jp3t0zmv-jjyebdv3-b-jozeysd5 + 1.0 + + A définir + + + + + + + xpath + + fr.insee + jp3t0zmv-jjyebdv3-b-jozeysd5-IP-1 + 1.0 + + INDIC_ENSEIGN + + + + + fr.insee + jjfrrtwf-QOP-jjfrdkf5 + 1.0 + OutParameter + + + fr.insee + jp3t0zmv-jjyebdv3-b-jozeysd5-IP-1 + 1.0 + InParameter + + + not((jp3t0zmv-jjyebdv3-b-jozeysd5-IP-1 = '1') and not + ((jp3t0zmv-jjyebdv3-b-jozeysd5-IP-1 = '2' or jp3t0zmv-jjyebdv3-b-jozeysd5-IP-1 + ='3'))) + + + + fr.insee + jp3t0zmv-jjyebdv3-b-jozeysd5-THEN + 1.0 + Sequence + + + + fr.insee + jp3t0zmv-jjyebdv3-b-jozeysd5-THEN + 1.0 + + + + hideable + + fr.insee + jozeysd5 + 1.0 + Sequence + + + + fr.insee + jjzs62m2-a-jjzrk79r + 1.0 + + A définir + + + + + + + xpath + + fr.insee + jjzs62m2-a-jjzrk79r-IP-1 + 1.0 + + FORMATION + + + + + fr.insee + jjzrk79r-QOP-jjzrzk7e + 1.0 + OutParameter + + + fr.insee + jjzs62m2-a-jjzrk79r-IP-1 + 1.0 + InParameter + + + not(jjzs62m2-a-jjzrk79r-IP-1 = '2') + + + + fr.insee + jjzs62m2-a-jjzrk79r-THEN + 1.0 + Sequence + + + + fr.insee + jjzs62m2-a-jjzrk79r-THEN + 1.0 + + + + hideable + + fr.insee + jj5qtb8v-QC + 1.0 + QuestionConstruct + + + fr.insee + jk26kkao-a-jj5qtb8v + 1.0 + IfThenElse + + + + fr.insee + jk26kkao-a-jj5qtb8v + 1.0 + + A définir + + + + + + + xpath + + fr.insee + jk26kkao-a-jj5qtb8v-IP-1 + 1.0 + + FORMRAISON + + + + + fr.insee + jj5qtb8v-QOP-jjfuqw8h + 1.0 + OutParameter + + + fr.insee + jk26kkao-a-jj5qtb8v-IP-1 + 1.0 + InParameter + + + not(jk26kkao-a-jj5qtb8v-IP-1 = '2') + + + + fr.insee + jk26kkao-a-jj5qtb8v-THEN + 1.0 + Sequence + + + + fr.insee + jk26kkao-a-jj5qtb8v-THEN + 1.0 + + + + hideable + + fr.insee + jj5qwesk-QC + 1.0 + QuestionConstruct + + + + fr.insee + jozgw8a7-a-jozgw4j3 + 1.0 + + A définir + + + + + + + xpath + + fr.insee + jozgw8a7-a-jozgw4j3-IP-1 + 1.0 + + COUPLE + + + + + fr.insee + jozgw4j3-QOP-jozh8iwe + 1.0 + OutParameter + + + fr.insee + jozgw8a7-a-jozgw4j3-IP-1 + 1.0 + InParameter + + + not(jozgw8a7-a-jozgw4j3-IP-1 = '2') + + + + fr.insee + jozgw8a7-a-jozgw4j3-THEN + 1.0 + Sequence + + + + fr.insee + jozgw8a7-a-jozgw4j3-THEN + 1.0 + + + + hideable + + fr.insee + jjin9pqp-QC + 1.0 + QuestionConstruct + + + + fr.insee + jjio9ccf-a-ji5x49d4 + 1.0 + + A définir + + + + + + + xpath + + fr.insee + jjio9ccf-a-ji5x49d4-IP-1 + 1.0 + + ENFANTS + + + + + fr.insee + ji5x49d4-QOP-ji5xoepk + 1.0 + OutParameter + + + fr.insee + jjio9ccf-a-ji5x49d4-IP-1 + 1.0 + InParameter + + + not(jjio9ccf-a-ji5x49d4-IP-1 = '2') + + + + fr.insee + jjio9ccf-a-ji5x49d4-THEN + 1.0 + Sequence + + + + fr.insee + jjio9ccf-a-ji5x49d4-THEN + 1.0 + + + + hideable + + fr.insee + jjinpzje-QC + 1.0 + QuestionConstruct + + + fr.insee + jjio3k4v-QC + 1.0 + QuestionConstruct + + + fr.insee + jp2t8dsf-a-jjio3k4v + 1.0 + IfThenElse + + + + fr.insee + jp2t8dsf-a-jjio3k4v + 1.0 + + A définir + + + + + + + xpath + + fr.insee + jp2t8dsf-a-jjio3k4v-IP-1 + 1.0 + + NBENFANTS + + + + + fr.insee + jjinpzje-QOP-jjioyaql + 1.0 + OutParameter + + + fr.insee + jp2t8dsf-a-jjio3k4v-IP-1 + 1.0 + InParameter + + + not(number(if (jp2t8dsf-a-jjio3k4v-IP-1='') then '0' else + jp2t8dsf-a-jjio3k4v-IP-1) = 1) + + + + fr.insee + jp2t8dsf-a-jjio3k4v-THEN + 1.0 + Sequence + + + + fr.insee + jp2t8dsf-a-jjio3k4v-THEN + 1.0 + + + + hideable + + fr.insee + jjintpi8-QC + 1.0 + QuestionConstruct + + + fr.insee + jjintpi8-CI-0 + 1.0 + ComputationItem + + + + fr.insee + jp2uhtl5-a-jp2u3e8k + 1.0 + + A définir + + + + + + + xpath + + fr.insee + jp2uhtl5-a-jp2u3e8k-IP-1 + 1.0 + + NATIONALITE + + + + + fr.insee + jp2u3e8k-QOP-jp2tp7le + 1.0 + OutParameter + + + fr.insee + jp2uhtl5-a-jp2u3e8k-IP-1 + 1.0 + InParameter + + + not(jp2uhtl5-a-jp2u3e8k-IP-1 = '1') + + + + fr.insee + jp2uhtl5-a-jp2u3e8k-THEN + 1.0 + Sequence + + + + fr.insee + jp2uhtl5-a-jp2u3e8k-THEN + 1.0 + + + + hideable + + fr.insee + jjioktcf-QC + 1.0 + QuestionConstruct + + + + fr.insee + js329yn4-a-jjiokcqs + 1.0 + + A définir + + + + + + + xpath + + fr.insee + js329yn4-a-jjiokcqs-IP-1 + 1.0 + + LIEUNAISS + + + + + fr.insee + jjiokcqs-QOP-jjip1s8w + 1.0 + OutParameter + + + fr.insee + js329yn4-a-jjiokcqs-IP-1 + 1.0 + InParameter + + + not(js329yn4-a-jjiokcqs-IP-1 = '1' or js329yn4-a-jjiokcqs-IP-1 + ='2') + + + + fr.insee + js329yn4-a-jjiokcqs-THEN + 1.0 + Sequence + + + + fr.insee + js329yn4-a-jjiokcqs-THEN + 1.0 + + + + hideable + + fr.insee + js329wn3-QC + 1.0 + QuestionConstruct + + + + fr.insee + ji4dwdtx-QC + 1.0 + + ACTADMIN + + + fr.insee + ji4dwdtx + 1.0 + QuestionItem + + + + fr.insee + ji4jt9p2-QC + 1.0 + + DATEDEP + + + fr.insee + ji4jt9p2 + 1.0 + QuestionItem + + + + fr.insee + ji4jwh9s-QC + 1.0 + + RAISONDEP + + + fr.insee + ji4jwh9s + 1.0 + QuestionItem + + + + fr.insee + ji4jutje-QC + 1.0 + + ANNEEFORM + + + fr.insee + ji4jutje + 1.0 + QuestionItem + + + + fr.insee + ji4kr456-QC + 1.0 + + DIPL + + + fr.insee + ji4kr456 + 1.0 + QuestionItem + + + + fr.insee + ji4lkkue-QC + 1.0 + + ANNEEREM + + + fr.insee + ji4lkkue + 1.0 + QuestionItem + + + + fr.insee + ji4ly1lu-QC + 1.0 + + SECTEUR + + + fr.insee + ji4ly1lu + 1.0 + QuestionItem + + + + fr.insee + ji5r2tmo-QC + 1.0 + + NBEMPL + + + fr.insee + ji5r2tmo + 1.0 + QuestionItem + + + + fr.insee + ji5rge4j-QC + 1.0 + + DUREEPRIV + + + fr.insee + ji5rge4j + 1.0 + QuestionItem + + + + fr.insee + ji5rui6p-QC + 1.0 + + PERIODCHOM + + + fr.insee + ji5rui6p + 1.0 + QuestionItem + + + + fr.insee + ji5s11e3-QC + 1.0 + + NBCHOM + + + fr.insee + ji5s11e3 + 1.0 + QuestionItem + + + + fr.insee + ji5rv55w-QC + 1.0 + + DUREECHOM + + + fr.insee + ji5rv55w + 1.0 + QuestionItem + + + + fr.insee + ji4ml7ax-QC + 1.0 + + ANNEEFP + + + fr.insee + ji4ml7ax + 1.0 + QuestionItem + + + + fr.insee + ji4mrfyk-QC + 1.0 + + FPDEBUT + + + fr.insee + ji4mrfyk + 1.0 + QuestionItem + + + + fr.insee + ji5x2loi-QC + 1.0 + + MOYENENTREE + + + fr.insee + ji5x2loi + 1.0 + QuestionItem + + + + fr.insee + jn64jhtz-QC + 1.0 + + STATUTPP + + + fr.insee + jn64jhtz + 1.0 + QuestionItem + + + + fr.insee + jjfpa81t-QC + 1.0 + + TITUL + + + fr.insee + jjfpa81t + 1.0 + QuestionItem + + + + fr.insee + jjfpeiy4-QC + 1.0 + + MOYTIT + + + fr.insee + jjfpeiy4 + 1.0 + QuestionItem + + + + fr.insee + jn6515od-QC + 1.0 + + ANNEE_FONC + + + fr.insee + jn6515od + 1.0 + QuestionItem + + + + fr.insee + jjfparcg-QC + 1.0 + + CATPP + + + fr.insee + jjfparcg + 1.0 + QuestionItem + + + + fr.insee + jm6g69xh-QC + 1.0 + + LIEUFP + + + fr.insee + jm6g69xh + 1.0 + QuestionItem + + + + fr.insee + ji5wosav-QC + 1.0 + + DEPTFP + + + fr.insee + ji5wosav + 1.0 + QuestionItem + + + + fr.insee + jjfqa4n7-QC + 1.0 + + CATDEC + + + fr.insee + jjfqa4n7 + 1.0 + QuestionItem + + + + fr.insee + jje9fape-QC + 1.0 + + MINPOSTE + + + fr.insee + jje9fape + 1.0 + QuestionItem + + + + fr.insee + jje9bdqm-QC + 1.0 + + FILIEREPOSTE + + + fr.insee + jje9bdqm + 1.0 + QuestionItem + + + + fr.insee + joyirwwm-QC + 1.0 + + AUTRE_ACT + + + fr.insee + joyirwwm + 1.0 + QuestionItem + + + + fr.insee + jje9mvyn-QC + 1.0 + + NBDPT + + + fr.insee + jje9mvyn + 1.0 + QuestionItem + + + + fr.insee + jo4k1wz1-QC + 1.0 + + CHGMT_SOUHAIT + + + fr.insee + jo4k1wz1 + 1.0 + QuestionItem + + + + fr.insee + jo4khrya-QC + 1.0 + + CHGMT_SUIVI + + + fr.insee + jo4khrya + 1.0 + QuestionItem + + + + fr.insee + jjfq3jkl-QC + 1.0 + + PROMOTION + + + fr.insee + jjfq3jkl + 1.0 + QuestionItem + + + + fr.insee + jjfqblut-QC + 1.0 + + RAISPROMO + + + fr.insee + jjfqblut + 1.0 + QuestionGrid + + + + fr.insee + jjfr67oy-QC + 1.0 + + TPSPART + + + fr.insee + jjfr67oy + 1.0 + QuestionItem + + + + fr.insee + joyk2rvl-QC + 1.0 + + RAISON_TP + + + fr.insee + joyk2rvl + 1.0 + QuestionGrid + + + + fr.insee + jjfqtw3t-QC + 1.0 + + DUREETP + + + fr.insee + jjfqtw3t + 1.0 + QuestionItem + + + + fr.insee + joyke3ob-QC + 1.0 + + TELETRAV + + + fr.insee + joyke3ob + 1.0 + QuestionItem + + + + fr.insee + jjfr6a91-QC + 1.0 + + INTERRUPTION + + + fr.insee + jjfr6a91 + 1.0 + QuestionGrid + + + + fr.insee + jjyd137l-QC + 1.0 + + DUREEINTERR_1 + + + fr.insee + jjyd137l + 1.0 + QuestionItem + + + + fr.insee + jjzcm9q0-QC + 1.0 + + DUREEINTERR_2 + + + fr.insee + jjzcm9q0 + 1.0 + QuestionItem + + + + fr.insee + jjzcr77v-QC + 1.0 + + DUREEINTERR_3 + + + fr.insee + jjzcr77v + 1.0 + QuestionItem + + + + fr.insee + jjfrrtwf-QC + 1.0 + + INDIC_ENSEIGN + + + fr.insee + jjfrrtwf + 1.0 + QuestionItem + + + + fr.insee + jozds2b9-QC + 1.0 + + PLS_ETAB + + + fr.insee + jozds2b9 + 1.0 + QuestionItem + + + + fr.insee + jozdgt4o-QC + 1.0 + + TPS_TRAV + + + fr.insee + jozdgt4o + 1.0 + QuestionItem + + + + fr.insee + jjfscd7k-QC + 1.0 + + NBHEURPROF + + + fr.insee + jjfscd7k + 1.0 + QuestionItem + + + + fr.insee + jjfsq33z-QC + 1.0 + + NBHEURPREP + + + fr.insee + jjfsq33z + 1.0 + QuestionItem + + + + fr.insee + jjfspjuz-QC + 1.0 + + NBHEURAUTRE + + + fr.insee + jjfspjuz + 1.0 + QuestionItem + + + + fr.insee + jjfrk62q-QC + 1.0 + + TPS_PREP_VAC + + + fr.insee + jjfrk62q + 1.0 + QuestionItem + + + + fr.insee + jjfrtikv-QC + 1.0 + + TPS_PREP_ETE + + + fr.insee + jjfrtikv + 1.0 + QuestionItem + + + + fr.insee + jozf0haj-QC + 1.0 + + NBHEURHEBDO + + + fr.insee + jozf0haj + 1.0 + QuestionItem + + + + fr.insee + jozf688x-QC + 1.0 + + NBJOURHEBDO + + + fr.insee + jozf688x + 1.0 + QuestionItem + + + + fr.insee + jjfrm2qf-QC + 1.0 + + NBCGE + + + fr.insee + jjfrm2qf + 1.0 + QuestionItem + + + + fr.insee + jjfrsfl4-QC + 1.0 + + NBRTT + + + fr.insee + jjfrsfl4 + 1.0 + QuestionItem + + + + fr.insee + jjfrzvhu-QC + 1.0 + + NBCONGPRIS + + + fr.insee + jjfrzvhu + 1.0 + QuestionItem + + + + fr.insee + jjfs3b3c-QC + 1.0 + + NBCET + + + fr.insee + jjfs3b3c + 1.0 + QuestionItem + + + + fr.insee + jozfj20z-QC + 1.0 + + NBCET_PRIS + + + fr.insee + jozfj20z + 1.0 + QuestionItem + + + + fr.insee + jozfsqpe-QC + 1.0 + + STOCK_CET + + + fr.insee + jozfsqpe + 1.0 + QuestionItem + + + + fr.insee + jrc3ye5q-QC + 1.0 + + JOURSRECUP + + + fr.insee + jrc3ye5q + 1.0 + QuestionItem + + + + fr.insee + jjfsdz8f-QC + 1.0 + + NBJOURSABS + + + fr.insee + jjfsdz8f + 1.0 + QuestionItem + + + + fr.insee + jjzrk79r-QC + 1.0 + + FORMATION + + + fr.insee + jjzrk79r + 1.0 + QuestionItem + + + + fr.insee + jj5qtb8v-QC + 1.0 + + FORMRAISON + + + fr.insee + jj5qtb8v + 1.0 + QuestionItem + + + + fr.insee + jj5qwesk-QC + 1.0 + + DUREEFORM + + + fr.insee + jj5qwesk + 1.0 + QuestionItem + + + + fr.insee + jozgw4j3-QC + 1.0 + + COUPLE + + + fr.insee + jozgw4j3 + 1.0 + QuestionItem + + + + fr.insee + jjin9pqp-QC + 1.0 + + EMPLOI_CONJ + + + fr.insee + jjin9pqp + 1.0 + QuestionItem + + + + fr.insee + ji5x49d4-QC + 1.0 + + ENFANTS + + + fr.insee + ji5x49d4 + 1.0 + QuestionItem + + + + fr.insee + jjinpzje-QC + 1.0 + + NBENFANTS + + + fr.insee + jjinpzje + 1.0 + QuestionItem + + + + fr.insee + jjio3k4v-QC + 1.0 + + ANNEEJEUNE + + + fr.insee + jjio3k4v + 1.0 + QuestionItem + + + + fr.insee + jjintpi8-QC + 1.0 + + ANNEEAINE + + + fr.insee + jjintpi8 + 1.0 + QuestionItem + + + + fr.insee + jp2u3e8k-QC + 1.0 + + NATIONALITE + + + fr.insee + jp2u3e8k + 1.0 + QuestionItem + + + + fr.insee + jjioktcf-QC + 1.0 + + NATIONAISS + + + fr.insee + jjioktcf + 1.0 + QuestionItem + + + + fr.insee + jjiokcqs-QC + 1.0 + + LIEUNAISS + + + fr.insee + jjiokcqs + 1.0 + QuestionItem + + + + fr.insee + js329wn3-QC + 1.0 + + PAYSNAISS + + + fr.insee + js329wn3 + 1.0 + QuestionItem + + + + fr.insee + jjioti5q-QC + 1.0 + + LIEUNAISSPAR + + + fr.insee + jjioti5q + 1.0 + QuestionItem + + + + fr.insee + jp2tn1vq-QC + 1.0 + + EMPL_PAR + + + fr.insee + jp2tn1vq + 1.0 + QuestionGrid + + + + fr.insee + ji4dwdtx-CI-0 + 1.0 + + Absence de réponse à la question 1 + + + Absence de réponse à la question 1 + + + fr.insee + ji4dwdtx-CI-0-II-0 + 1.0 + Instruction + + + + xpath + + fr.insee + ji4dwdtx-CI-0-IP-1 + 1.0 + + ACTADMIN + + + + + fr.insee + ji4dwdtx-QOP-ji4dunra + 1.0 + OutParameter + + + fr.insee + ji4dwdtx-CI-0-IP-1 + 1.0 + InParameter + + + ji4dwdtx-CI-0-IP-1 != '1' and ji4dwdtx-CI-0-IP-1!= '2' + + + + + + + fr.insee + ji4jt9p2-CI-0 + 1.0 + + Absence de réponse à la question 2 + + + Absence de réponse à la question 2 + + + fr.insee + ji4jt9p2-CI-0-II-0 + 1.0 + Instruction + + + + xpath + + fr.insee + ji4jt9p2-CI-0-IP-1 + 1.0 + + DATEDEP + + + + + fr.insee + ji4jt9p2-QOP-ji4l16gl + 1.0 + OutParameter + + + fr.insee + ji4jt9p2-CI-0-IP-1 + 1.0 + InParameter + + + string(ji4jt9p2-CI-0-IP-1) = '' + + + + + + fr.insee + ji4kr456-CI-0 + 1.0 + + Absence de réponse à la question 5 + + + Absence de réponse à la question 5 + + + fr.insee + ji4kr456-CI-0-II-0 + 1.0 + Instruction + + + + xpath + + fr.insee + ji4kr456-CI-0-IP-1 + 1.0 + + DIPL + + + + + fr.insee + ji4kr456-QOP-jn5yikx6 + 1.0 + OutParameter + + + fr.insee + ji4kr456-CI-0-IP-1 + 1.0 + InParameter + + + ji4kr456-CI-0-IP-1 = '' + + + + + + fr.insee + ji4ml7ax-CI-0 + 1.0 + + comparaison année d'entrée dans la FP et année du premier + emploi rémunéré + + + comparaison année d'entrée dans la FP et année du premier + emploi rémunéré + + + fr.insee + ji4ml7ax-CI-0-II-0 + 1.0 + Instruction + + + + xpath + + fr.insee + ji4ml7ax-CI-0-IP-1 + 1.0 + + ANNEEREM + + + + fr.insee + ji4ml7ax-CI-0-IP-2 + 1.0 + + ANNEEFP + + + + + fr.insee + ji4lkkue-QOP-ji4m4qn9 + 1.0 + OutParameter + + + fr.insee + ji4ml7ax-CI-0-IP-1 + 1.0 + InParameter + + + + + fr.insee + ji4ml7ax-QOP-ji4mrm8r + 1.0 + OutParameter + + + fr.insee + ji4ml7ax-CI-0-IP-2 + 1.0 + InParameter + + + number(if (ji4ml7ax-CI-0-IP-2='') then '0' else + ji4ml7ax-CI-0-IP-2) < number(if (ji4ml7ax-CI-0-IP-1='') then '0' else + ji4ml7ax-CI-0-IP-1) and number(if (ji4ml7ax-CI-0-IP-2='') then '0' else + ji4ml7ax-CI-0-IP-2) > 0 + + + + + + fr.insee + ji4ml7ax-CI-1 + 1.0 + + si absence de réponse + + + si absence de réponse + + + fr.insee + ji4ml7ax-CI-1-II-1 + 1.0 + Instruction + + + + xpath + + fr.insee + ji4ml7ax-CI-1-IP-1 + 1.0 + + ANNEEFP + + + + + fr.insee + ji4ml7ax-QOP-ji4mrm8r + 1.0 + OutParameter + + + fr.insee + ji4ml7ax-CI-1-IP-1 + 1.0 + InParameter + + + ji4ml7ax-CI-1-IP-1='' + + + + + + fr.insee + jn64jhtz-CI-0 + 1.0 + + Absence de réponse + + + Absence de réponse + + + fr.insee + jn64jhtz-CI-0-II-0 + 1.0 + Instruction + + + + xpath + + fr.insee + jn64jhtz-CI-0-IP-1 + 1.0 + + STATUTPP + + + + + fr.insee + jn64jhtz-QOP-jn6516e0 + 1.0 + OutParameter + + + fr.insee + jn64jhtz-CI-0-IP-1 + 1.0 + InParameter + + + jn64jhtz-CI-0-IP-1!= '1' and jn64jhtz-CI-0-IP-1!= '2' and + jn64jhtz-CI-0-IP-1!= '3' + + + + + + fr.insee + jjfpa81t-CI-0 + 1.0 + + Absence de réponse + + + Absence de réponse + + + fr.insee + jjfpa81t-CI-0-II-0 + 1.0 + Instruction + + + + xpath + + fr.insee + jjfpa81t-CI-0-IP-1 + 1.0 + + TITUL + + + + + fr.insee + jjfpa81t-QOP-jjfpk302 + 1.0 + OutParameter + + + fr.insee + jjfpa81t-CI-0-IP-1 + 1.0 + InParameter + + + jjfpa81t-CI-0-IP-1!= '1' and jjfpa81t-CI-0-IP-1!= '2' + + + + + + + fr.insee + jn6515od-CI-0 + 1.0 + + comparaison année d'entrée dans la FP et année de + titularisation + + + comparaison année d'entrée dans la FP et année de + titularisation + + + fr.insee + jn6515od-CI-0-II-0 + 1.0 + Instruction + + + + xpath + + fr.insee + jn6515od-CI-0-IP-1 + 1.0 + + ANNEEFP + + + + fr.insee + jn6515od-CI-0-IP-2 + 1.0 + + ANNEE_FONC + + + + + fr.insee + ji4ml7ax-QOP-ji4mrm8r + 1.0 + OutParameter + + + fr.insee + jn6515od-CI-0-IP-1 + 1.0 + InParameter + + + + + fr.insee + jn6515od-QOP-jn6559y5 + 1.0 + OutParameter + + + fr.insee + jn6515od-CI-0-IP-2 + 1.0 + InParameter + + + number(if (jn6515od-CI-0-IP-2='') then '0' else + jn6515od-CI-0-IP-2) < number(if (jn6515od-CI-0-IP-1='') then '0' else + jn6515od-CI-0-IP-1) and number(if (jn6515od-CI-0-IP-2='') then '0' else + jn6515od-CI-0-IP-2)> 0 + + + + + + fr.insee + jn6515od-CI-1 + 1.0 + + absence de réponse à la question + + + absence de réponse à la question + + + fr.insee + jn6515od-CI-1-II-1 + 1.0 + Instruction + + + + xpath + + fr.insee + jn6515od-CI-1-IP-1 + 1.0 + + ANNEE_FONC + + + + + fr.insee + jn6515od-QOP-jn6559y5 + 1.0 + OutParameter + + + fr.insee + jn6515od-CI-1-IP-1 + 1.0 + InParameter + + + jn6515od-CI-1-IP-1='' + + + + + + fr.insee + jjfqa4n7-CI-0 + 1.0 + + si absence de réponse + + + si absence de réponse + + + fr.insee + jjfqa4n7-CI-0-II-0 + 1.0 + Instruction + + + + xpath + + fr.insee + jjfqa4n7-CI-0-IP-1 + 1.0 + + CATDEC + + + + + fr.insee + jjfqa4n7-QOP-jjfqw6fz + 1.0 + OutParameter + + + fr.insee + jjfqa4n7-CI-0-IP-1 + 1.0 + InParameter + + + jjfqa4n7-CI-0-IP-1 !='1' and jjfqa4n7-CI-0-IP-1 !='2' and + jjfqa4n7-CI-0-IP-1 !='3' + + + + + + fr.insee + jo4k1wz1-CI-0 + 1.0 + + comparaison nombre de changements souhaités par rapport au + nombre de changements au total + + + comparaison nombre de changements souhaités par rapport + au nombre de changements au total + + + fr.insee + jo4k1wz1-CI-0-II-0 + 1.0 + Instruction + + + + xpath + + fr.insee + jo4k1wz1-CI-0-IP-1 + 1.0 + + NBDPT + + + + fr.insee + jo4k1wz1-CI-0-IP-2 + 1.0 + + CHGMT_SOUHAIT + + + + + fr.insee + jje9mvyn-QOP-jje9i8cz + 1.0 + OutParameter + + + fr.insee + jo4k1wz1-CI-0-IP-1 + 1.0 + InParameter + + + + + fr.insee + jo4k1wz1-QOP-jo4jyad7 + 1.0 + OutParameter + + + fr.insee + jo4k1wz1-CI-0-IP-2 + 1.0 + InParameter + + + number(if (jo4k1wz1-CI-0-IP-2='') then '0' else + jo4k1wz1-CI-0-IP-2) > number(if (jo4k1wz1-CI-0-IP-1='') then '0' else + jo4k1wz1-CI-0-IP-1) and number(if (jo4k1wz1-CI-0-IP-1='') then '0' else + jo4k1wz1-CI-0-IP-1) > 0 + + + + + + fr.insee + jo4khrya-CI-0 + 1.0 + + comparaison du nombre de changements liés au conjoint au + nombre de changements total + + + comparaison du nombre de changements liés au conjoint au + nombre de changements total + + + fr.insee + jo4khrya-CI-0-II-0 + 1.0 + Instruction + + + + xpath + + fr.insee + jo4khrya-CI-0-IP-1 + 1.0 + + NBDPT + + + + fr.insee + jo4khrya-CI-0-IP-2 + 1.0 + + CHGMT_SUIVI + + + + + fr.insee + jje9mvyn-QOP-jje9i8cz + 1.0 + OutParameter + + + fr.insee + jo4khrya-CI-0-IP-1 + 1.0 + InParameter + + + + + fr.insee + jo4khrya-QOP-jo4kkktz + 1.0 + OutParameter + + + fr.insee + jo4khrya-CI-0-IP-2 + 1.0 + InParameter + + + number(if (jo4khrya-CI-0-IP-2='') then '0' else + jo4khrya-CI-0-IP-2) > number(if (jo4khrya-CI-0-IP-1='') then '0' else + jo4khrya-CI-0-IP-1) and number(if (jo4khrya-CI-0-IP-1='') then '0' else + jo4khrya-CI-0-IP-1) >0 + + + + + + fr.insee + jjfrrtwf-CI-0 + 1.0 + + Si absence de réponse à la question "êtes-vous + enseignant?", question de contrôle + + + Si absence de réponse à la question "êtes-vous + enseignant?", question de contrôle + + + fr.insee + jjfrrtwf-CI-0-II-0 + 1.0 + Instruction + + + + xpath + + fr.insee + jjfrrtwf-CI-0-IP-1 + 1.0 + + INDIC_ENSEIGN + + + + + fr.insee + jjfrrtwf-QOP-jjfrdkf5 + 1.0 + OutParameter + + + fr.insee + jjfrrtwf-CI-0-IP-1 + 1.0 + InParameter + + + jjfrrtwf-CI-0-IP-1 != '1' and jjfrrtwf-CI-0-IP-1 != '2' and + jjfrrtwf-CI-0-IP-1 != '3' + + + + + + fr.insee + jozds2b9-CI-0 + 1.0 + + Si non réponse à la question 40 + + + Si non réponse à la question 40 + + + fr.insee + jozds2b9-CI-0-II-0 + 1.0 + Instruction + + + + xpath + + fr.insee + jozds2b9-CI-0-IP-1 + 1.0 + + INDIC_ENSEIGN + + + + fr.insee + jozds2b9-CI-0-IP-2 + 1.0 + + PLS_ETAB + + + + + fr.insee + jjfrrtwf-QOP-jjfrdkf5 + 1.0 + OutParameter + + + fr.insee + jozds2b9-CI-0-IP-1 + 1.0 + InParameter + + + + + fr.insee + jozds2b9-QOP-jozdr8rz + 1.0 + OutParameter + + + fr.insee + jozds2b9-CI-0-IP-2 + 1.0 + InParameter + + + (jozds2b9-CI-0-IP-2='1' or jozds2b9-CI-0-IP-2='2') and jozds2b9-CI-0-IP-1 = '' + + + + + + fr.insee + jjfscd7k-CI-0 + 1.0 + + si absence de réponse + + + si absence de réponse + + + fr.insee + jjfscd7k-CI-0-II-0 + 1.0 + Instruction + + + + xpath + + fr.insee + jjfscd7k-CI-0-IP-1 + 1.0 + + NBHEURPROF + + + + + fr.insee + jjfscd7k-QOP-jjfsda5p + 1.0 + OutParameter + + + fr.insee + jjfscd7k-CI-0-IP-1 + 1.0 + InParameter + + + string(jjfscd7k-CI-0-IP-1) ='' + + + + + + fr.insee + jjfsq33z-CI-0 + 1.0 + + si absence de réponse + + + si absence de réponse + + + fr.insee + jjfsq33z-CI-0-II-0 + 1.0 + Instruction + + + + xpath + + fr.insee + jjfsq33z-CI-0-IP-1 + 1.0 + + NBHEURPREP + + + + + fr.insee + jjfsq33z-QOP-jjfswh7r + 1.0 + OutParameter + + + fr.insee + jjfsq33z-CI-0-IP-1 + 1.0 + InParameter + + + string(jjfsq33z-CI-0-IP-1) = '' + + + + + + fr.insee + jjfrk62q-CI-0 + 1.0 + + Obliger à renseigner la partie décimale avec un multiple + de 5 + + + Obliger à renseigner la partie décimale avec un multiple + de 5 + + + fr.insee + jjfrk62q-CI-0-II-0 + 1.0 + Instruction + + + + xpath + + fr.insee + jjfrk62q-CI-0-IP-1 + 1.0 + + TPS_PREP_VAC + + + + + fr.insee + jjfrk62q-QOP-jjfrqgfr + 1.0 + OutParameter + + + fr.insee + jjfrk62q-CI-0-IP-1 + 1.0 + InParameter + + + number(if (jjfrk62q-CI-0-IP-1='') then '0' else + jjfrk62q-CI-0-IP-1)>0 and ( 10 * number(if (jjfrk62q-CI-0-IP-1='') then '0' + else jjfrk62q-CI-0-IP-1) ) mod 5 != 0 + + + + + + fr.insee + jjfrtikv-CI-0 + 1.0 + + Obliger à renseigner la partie décimale avec un multiple + de 5 + + + Obliger à renseigner la partie décimale avec un multiple + de 5 + + + fr.insee + jjfrtikv-CI-0-II-0 + 1.0 + Instruction + + + + xpath + + fr.insee + jjfrtikv-CI-0-IP-1 + 1.0 + + TPS_PREP_ETE + + + + + fr.insee + jjfrtikv-QOP-jjfrr11x + 1.0 + OutParameter + + + fr.insee + jjfrtikv-CI-0-IP-1 + 1.0 + InParameter + + + number(if (jjfrtikv-CI-0-IP-1='') then '0' else + jjfrtikv-CI-0-IP-1)>0 and ( 10 * number(if (jjfrtikv-CI-0-IP-1='') then '0' + else jjfrtikv-CI-0-IP-1) ) mod 5 != 0 + + + + + + fr.insee + jozf0haj-CI-0 + 1.0 + + Si non réponse à la Q 40 + + + Si non réponse à la Q 40 + + + fr.insee + jozf0haj-CI-0-II-0 + 1.0 + Instruction + + + + xpath + + fr.insee + jozf0haj-CI-0-IP-1 + 1.0 + + INDIC_ENSEIGN + + + + fr.insee + jozf0haj-CI-0-IP-2 + 1.0 + + NBHEURHEBDO + + + + + fr.insee + jjfrrtwf-QOP-jjfrdkf5 + 1.0 + OutParameter + + + fr.insee + jozf0haj-CI-0-IP-1 + 1.0 + InParameter + + + + + fr.insee + jozf0haj-QOP-jozfemiz + 1.0 + OutParameter + + + fr.insee + jozf0haj-CI-0-IP-2 + 1.0 + InParameter + + + jozf0haj-CI-0-IP-1 = '' and string (jozf0haj-CI-0-IP-2) != '' + + + + + + fr.insee + jozf0haj-CI-1 + 1.0 + + Absence de réponse + + + Absence de réponse + + + fr.insee + jozf0haj-CI-1-II-1 + 1.0 + Instruction + + + + xpath + + fr.insee + jozf0haj-CI-1-IP-1 + 1.0 + + NBHEURHEBDO + + + + + fr.insee + jozf0haj-QOP-jozfemiz + 1.0 + OutParameter + + + fr.insee + jozf0haj-CI-1-IP-1 + 1.0 + InParameter + + + string(jozf0haj-CI-1-IP-1)='' + + + + + + fr.insee + jozf688x-CI-0 + 1.0 + + Obliger à renseigner la partie décimale avec un multiple + de 5 + + + Obliger à renseigner la partie décimale avec un multiple + de 5 + + + fr.insee + jozf688x-CI-0-II-0 + 1.0 + Instruction + + + + xpath + + fr.insee + jozf688x-CI-0-IP-1 + 1.0 + + NBJOURHEBDO + + + + + fr.insee + jozf688x-QOP-jozfbisb + 1.0 + OutParameter + + + fr.insee + jozf688x-CI-0-IP-1 + 1.0 + InParameter + + + number(if (jozf688x-CI-0-IP-1='') then '0' else + jozf688x-CI-0-IP-1)>0 and ( 10 * number(if (jozf688x-CI-0-IP-1='') then '0' + else jozf688x-CI-0-IP-1) ) mod 5 != 0 + + + + + + fr.insee + jozf688x-CI-1 + 1.0 + + Absence de réponse + + + Absence de réponse + + + fr.insee + jozf688x-CI-1-II-1 + 1.0 + Instruction + + + + xpath + + fr.insee + jozf688x-CI-1-IP-1 + 1.0 + + NBJOURHEBDO + + + + + fr.insee + jozf688x-QOP-jozfbisb + 1.0 + OutParameter + + + fr.insee + jozf688x-CI-1-IP-1 + 1.0 + InParameter + + + jozf688x-CI-1-IP-1='' + + + + + + fr.insee + jjfrm2qf-CI-0 + 1.0 + + Obliger à renseigner la partie décimale avec un multiple + de 5 + + + Obliger à renseigner la partie décimale avec un multiple + de 5 + + + fr.insee + jjfrm2qf-CI-0-II-0 + 1.0 + Instruction + + + + xpath + + fr.insee + jjfrm2qf-CI-0-IP-1 + 1.0 + + NBCGE + + + + + fr.insee + jjfrm2qf-QOP-jjfrqs55 + 1.0 + OutParameter + + + fr.insee + jjfrm2qf-CI-0-IP-1 + 1.0 + InParameter + + + number(if (jjfrm2qf-CI-0-IP-1='') then '0' else + jjfrm2qf-CI-0-IP-1)>0 and ( 10 * number(if (jjfrm2qf-CI-0-IP-1='') then '0' + else jjfrm2qf-CI-0-IP-1) ) mod 5 != 0 + + + + + + fr.insee + jjfrm2qf-CI-1 + 1.0 + + Absence de réponse + + + Absence de réponse + + + fr.insee + jjfrm2qf-CI-1-II-1 + 1.0 + Instruction + + + + xpath + + fr.insee + jjfrm2qf-CI-1-IP-1 + 1.0 + + NBCGE + + + + + fr.insee + jjfrm2qf-QOP-jjfrqs55 + 1.0 + OutParameter + + + fr.insee + jjfrm2qf-CI-1-IP-1 + 1.0 + InParameter + + + jjfrm2qf-CI-1-IP-1='' + + + + + + fr.insee + jjfrsfl4-CI-0 + 1.0 + + comparaison nombre de jours de RTT par rapport au nombre + de jours de congés total + + + comparaison nombre de jours de RTT par rapport au nombre + de jours de congés total + + + fr.insee + jjfrsfl4-CI-0-II-0 + 1.0 + Instruction + + + + xpath + + fr.insee + jjfrsfl4-CI-0-IP-1 + 1.0 + + NBCGE + + + + fr.insee + jjfrsfl4-CI-0-IP-2 + 1.0 + + NBRTT + + + + + fr.insee + jjfrm2qf-QOP-jjfrqs55 + 1.0 + OutParameter + + + fr.insee + jjfrsfl4-CI-0-IP-1 + 1.0 + InParameter + + + + + fr.insee + jjfrsfl4-QOP-jjfs11gt + 1.0 + OutParameter + + + fr.insee + jjfrsfl4-CI-0-IP-2 + 1.0 + InParameter + + + number(if (jjfrsfl4-CI-0-IP-2='') then '0' else + jjfrsfl4-CI-0-IP-2) >= number(if (jjfrsfl4-CI-0-IP-1='') then '0' else + jjfrsfl4-CI-0-IP-1) and jjfrsfl4-CI-0-IP-1!='' and jjfrsfl4-CI-0-IP-2!='' + + + + + + + fr.insee + jjfrsfl4-CI-1 + 1.0 + + Obliger à renseigner la partie décimale avec un multiple + de 5 + + + Obliger à renseigner la partie décimale avec un multiple + de 5 + + + fr.insee + jjfrsfl4-CI-1-II-1 + 1.0 + Instruction + + + + xpath + + fr.insee + jjfrsfl4-CI-1-IP-1 + 1.0 + + NBRTT + + + + + fr.insee + jjfrsfl4-QOP-jjfs11gt + 1.0 + OutParameter + + + fr.insee + jjfrsfl4-CI-1-IP-1 + 1.0 + InParameter + + + number(if (jjfrsfl4-CI-1-IP-1='') then '0' else + jjfrsfl4-CI-1-IP-1)>0 and ( 10 * number(if (jjfrsfl4-CI-1-IP-1='') then '0' + else jjfrsfl4-CI-1-IP-1) ) mod 5 != 0 + + + + + + fr.insee + jjfrzvhu-CI-0 + 1.0 + + comparaison nombre de jours de congés pris et nombre de + jours de congés total + + + comparaison nombre de jours de congés pris et nombre de + jours de congés total + + + fr.insee + jjfrzvhu-CI-0-II-0 + 1.0 + Instruction + + + + xpath + + fr.insee + jjfrzvhu-CI-0-IP-1 + 1.0 + + NBCGE + + + + fr.insee + jjfrzvhu-CI-0-IP-2 + 1.0 + + NBCONGPRIS + + + + + fr.insee + jjfrm2qf-QOP-jjfrqs55 + 1.0 + OutParameter + + + fr.insee + jjfrzvhu-CI-0-IP-1 + 1.0 + InParameter + + + + + fr.insee + jjfrzvhu-QOP-jjfs8u5a + 1.0 + OutParameter + + + fr.insee + jjfrzvhu-CI-0-IP-2 + 1.0 + InParameter + + + number(if (jjfrzvhu-CI-0-IP-2='') then '0' else + jjfrzvhu-CI-0-IP-2) > number(if (jjfrzvhu-CI-0-IP-1='') then '0' else + jjfrzvhu-CI-0-IP-1) and jjfrzvhu-CI-0-IP-2!='' and jjfrzvhu-CI-0-IP-1!='' + + + + + + fr.insee + jjfrzvhu-CI-1 + 1.0 + + Obliger à renseigner la partie décimale avec un multiple + de 5 + + + Obliger à renseigner la partie décimale avec un multiple + de 5 + + + fr.insee + jjfrzvhu-CI-1-II-1 + 1.0 + Instruction + + + + xpath + + fr.insee + jjfrzvhu-CI-1-IP-1 + 1.0 + + NBCONGPRIS + + + + + fr.insee + jjfrzvhu-QOP-jjfs8u5a + 1.0 + OutParameter + + + fr.insee + jjfrzvhu-CI-1-IP-1 + 1.0 + InParameter + + + number(if (jjfrzvhu-CI-1-IP-1='') then '0' else + jjfrzvhu-CI-1-IP-1)>0 and ( 10 * number(if (jjfrzvhu-CI-1-IP-1='') then '0' + else jjfrzvhu-CI-1-IP-1) ) mod 5 != 0 + + + + + + fr.insee + jjfrzvhu-CI-2 + 1.0 + + absence de réponse + + + absence de réponse + + + fr.insee + jjfrzvhu-CI-2-II-2 + 1.0 + Instruction + + + + xpath + + fr.insee + jjfrzvhu-CI-2-IP-1 + 1.0 + + NBCONGPRIS + + + + + fr.insee + jjfrzvhu-QOP-jjfs8u5a + 1.0 + OutParameter + + + fr.insee + jjfrzvhu-CI-2-IP-1 + 1.0 + InParameter + + + jjfrzvhu-CI-2-IP-1='' + + + + + + fr.insee + jjfs3b3c-CI-0 + 1.0 + + comparaison entre nombre de jours déposés sur CET et + nombre de jours de congés total + + + comparaison entre nombre de jours déposés sur CET et + nombre de jours de congés total + + + fr.insee + jjfs3b3c-CI-0-II-0 + 1.0 + Instruction + + + + xpath + + fr.insee + jjfs3b3c-CI-0-IP-1 + 1.0 + + NBCGE + + + + fr.insee + jjfs3b3c-CI-0-IP-2 + 1.0 + + NBCET + + + + + fr.insee + jjfrm2qf-QOP-jjfrqs55 + 1.0 + OutParameter + + + fr.insee + jjfs3b3c-CI-0-IP-1 + 1.0 + InParameter + + + + + fr.insee + jjfs3b3c-QOP-jjfsgm0w + 1.0 + OutParameter + + + fr.insee + jjfs3b3c-CI-0-IP-2 + 1.0 + InParameter + + + number(if (jjfs3b3c-CI-0-IP-2='') then '0' else + jjfs3b3c-CI-0-IP-2) > number(if (jjfs3b3c-CI-0-IP-1='') then '0' else + jjfs3b3c-CI-0-IP-1) and jjfs3b3c-CI-0-IP-2!='' and jjfs3b3c-CI-0-IP-1!='' + + + + + + fr.insee + jjfs3b3c-CI-1 + 1.0 + + Obliger à renseigner la partie décimale avec un multiple + de 5 + + + Obliger à renseigner la partie décimale avec un multiple + de 5 + + + fr.insee + jjfs3b3c-CI-1-II-1 + 1.0 + Instruction + + + + xpath + + fr.insee + jjfs3b3c-CI-1-IP-1 + 1.0 + + NBCET + + + + + fr.insee + jjfs3b3c-QOP-jjfsgm0w + 1.0 + OutParameter + + + fr.insee + jjfs3b3c-CI-1-IP-1 + 1.0 + InParameter + + + number(if (jjfs3b3c-CI-1-IP-1='') then '0' else + jjfs3b3c-CI-1-IP-1)>0 and ( 10 * number(if (jjfs3b3c-CI-1-IP-1='') then '0' + else jjfs3b3c-CI-1-IP-1) ) mod 5 != 0 + + + + + + fr.insee + jjfs3b3c-CI-2 + 1.0 + + comparaison entre nombre de jours de congés total et somme + des jours pris et déposés sur CET + + + comparaison entre nombre de jours de congés total et + somme des jours pris et déposés sur CET + + + fr.insee + jjfs3b3c-CI-2-II-2 + 1.0 + Instruction + + + + xpath + + fr.insee + jjfs3b3c-CI-2-IP-1 + 1.0 + + NBCGE + + + + fr.insee + jjfs3b3c-CI-2-IP-2 + 1.0 + + NBCONGPRIS + + + + fr.insee + jjfs3b3c-CI-2-IP-3 + 1.0 + + NBCET + + + + + fr.insee + jjfrm2qf-QOP-jjfrqs55 + 1.0 + OutParameter + + + fr.insee + jjfs3b3c-CI-2-IP-1 + 1.0 + InParameter + + + + + fr.insee + jjfrzvhu-QOP-jjfs8u5a + 1.0 + OutParameter + + + fr.insee + jjfs3b3c-CI-2-IP-2 + 1.0 + InParameter + + + + + fr.insee + jjfs3b3c-QOP-jjfsgm0w + 1.0 + OutParameter + + + fr.insee + jjfs3b3c-CI-2-IP-3 + 1.0 + InParameter + + + (number(if (jjfs3b3c-CI-2-IP-2='') then '0' else + jjfs3b3c-CI-2-IP-2) + number(if (jjfs3b3c-CI-2-IP-3='') then '0' else + jjfs3b3c-CI-2-IP-3))> number(if (jjfs3b3c-CI-2-IP-1='') then '0' else + jjfs3b3c-CI-2-IP-1) and jjfs3b3c-CI-2-IP-3!='' and jjfs3b3c-CI-2-IP-2!='' and jjfs3b3c-CI-2-IP-1!='' + + + + + + + fr.insee + jozfj20z-CI-0 + 1.0 + + Obliger à renseigner la partie décimale avec un multiple + de 5 + + + Obliger à renseigner la partie décimale avec un multiple + de 5 + + + fr.insee + jozfj20z-CI-0-II-0 + 1.0 + Instruction + + + + xpath + + fr.insee + jozfj20z-CI-0-IP-1 + 1.0 + + NBCET_PRIS + + + + + fr.insee + jozfj20z-QOP-jozfvwah + 1.0 + OutParameter + + + fr.insee + jozfj20z-CI-0-IP-1 + 1.0 + InParameter + + + number(if (jozfj20z-CI-0-IP-1='') then '0' else + jozfj20z-CI-0-IP-1)>0 and ( 10 * number(if (jozfj20z-CI-0-IP-1='') then '0' + else jozfj20z-CI-0-IP-1) ) mod 5 != 0 + + + + + + fr.insee + jozfsqpe-CI-0 + 1.0 + + Obliger à renseigner la partie décimale avec un multiple + de 5 + + + Obliger à renseigner la partie décimale avec un multiple + de 5 + + + fr.insee + jozfsqpe-CI-0-II-0 + 1.0 + Instruction + + + + xpath + + fr.insee + jozfsqpe-CI-0-IP-1 + 1.0 + + STOCK_CET + + + + + fr.insee + jozfsqpe-QOP-jozfitrh + 1.0 + OutParameter + + + fr.insee + jozfsqpe-CI-0-IP-1 + 1.0 + InParameter + + + number(if (jozfsqpe-CI-0-IP-1='') then '0' else + jozfsqpe-CI-0-IP-1)>0 and ( 10 * number(if (jozfsqpe-CI-0-IP-1='') then '0' + else jozfsqpe-CI-0-IP-1) ) mod 5 != 0 + + + + + + fr.insee + jrc3ye5q-CI-0 + 1.0 + + Obliger à renseigner la partie décimale avec un multiple + de 5 + + + Obliger à renseigner la partie décimale avec un multiple + de 5 + + + fr.insee + jrc3ye5q-CI-0-II-0 + 1.0 + Instruction + + + + xpath + + fr.insee + jrc3ye5q-CI-0-IP-1 + 1.0 + + JOURSRECUP + + + + + fr.insee + jrc3ye5q-QOP-jrc4j6mx + 1.0 + OutParameter + + + fr.insee + jrc3ye5q-CI-0-IP-1 + 1.0 + InParameter + + + number(if (jrc3ye5q-CI-0-IP-1='') then '0' else + jrc3ye5q-CI-0-IP-1)>0 and ( 10 * number(if (jrc3ye5q-CI-0-IP-1='') then '0' + else jrc3ye5q-CI-0-IP-1) ) mod 5 != 0 + + + + + + fr.insee + jjfsdz8f-CI-0 + 1.0 + + Obliger à renseigner la partie décimale avec un multiple + de 5 + + + Obliger à renseigner la partie décimale avec un multiple + de 5 + + + fr.insee + jjfsdz8f-CI-0-II-0 + 1.0 + Instruction + + + + xpath + + fr.insee + jjfsdz8f-CI-0-IP-1 + 1.0 + + NBJOURSABS + + + + + fr.insee + jjfsdz8f-QOP-jozfxq9v + 1.0 + OutParameter + + + fr.insee + jjfsdz8f-CI-0-IP-1 + 1.0 + InParameter + + + number(if (jjfsdz8f-CI-0-IP-1='') then '0' else + jjfsdz8f-CI-0-IP-1)>0 and ( 10 * number(if (jjfsdz8f-CI-0-IP-1='') then '0' + else jjfsdz8f-CI-0-IP-1) ) mod 5 != 0 + + + + + + fr.insee + jjfsdz8f-CI-1 + 1.0 + + absence de réponse + + + absence de réponse + + + fr.insee + jjfsdz8f-CI-1-II-1 + 1.0 + Instruction + + + + xpath + + fr.insee + jjfsdz8f-CI-1-IP-1 + 1.0 + + NBJOURSABS + + + + + fr.insee + jjfsdz8f-QOP-jozfxq9v + 1.0 + OutParameter + + + fr.insee + jjfsdz8f-CI-1-IP-1 + 1.0 + InParameter + + + jjfsdz8f-CI-1-IP-1='' + + + + + + fr.insee + jjfsdz8f-CI-2 + 1.0 + + Cohérence entre nombre de jours d'absence et nombre de + congés pris sur l'année + + + Cohérence entre nombre de jours d'absence et nombre de + congés pris sur l'année + + + fr.insee + jjfsdz8f-CI-2-II-2 + 1.0 + Instruction + + + + xpath + + fr.insee + jjfsdz8f-CI-2-IP-1 + 1.0 + + INDIC_ENSEIGN + + + + fr.insee + jjfsdz8f-CI-2-IP-2 + 1.0 + + NBCONGPRIS + + + + fr.insee + jjfsdz8f-CI-2-IP-3 + 1.0 + + NBJOURSABS + + + + + fr.insee + jjfrrtwf-QOP-jjfrdkf5 + 1.0 + OutParameter + + + fr.insee + jjfsdz8f-CI-2-IP-1 + 1.0 + InParameter + + + + + fr.insee + jjfrzvhu-QOP-jjfs8u5a + 1.0 + OutParameter + + + fr.insee + jjfsdz8f-CI-2-IP-2 + 1.0 + InParameter + + + + + fr.insee + jjfsdz8f-QOP-jozfxq9v + 1.0 + OutParameter + + + fr.insee + jjfsdz8f-CI-2-IP-3 + 1.0 + InParameter + + + (jjfsdz8f-CI-2-IP-1 = '2' or jjfsdz8f-CI-2-IP-1 ='3') and (number(if (jjfsdz8f-CI-2-IP-2='') then '0' else jjfsdz8f-CI-2-IP-2) + number(if (jjfsdz8f-CI-2-IP-3='') then '0' else jjfsdz8f-CI-2-IP-3) )> 365 and jjfsdz8f-CI-2-IP-3!='' and jjfsdz8f-CI-2-IP-2!='' + + + + + + fr.insee + jjintpi8-CI-0 + 1.0 + + comparaison des années de naissance des enfants + + + comparaison des années de naissance des + enfants + + + fr.insee + jjintpi8-CI-0-II-0 + 1.0 + Instruction + + + + xpath + + fr.insee + jjintpi8-CI-0-IP-1 + 1.0 + + ANNEEJEUNE + + + + fr.insee + jjintpi8-CI-0-IP-2 + 1.0 + + ANNEEAINE + + + + + fr.insee + jjio3k4v-QOP-jjiovwol + 1.0 + OutParameter + + + fr.insee + jjintpi8-CI-0-IP-1 + 1.0 + InParameter + + + + + fr.insee + jjintpi8-QOP-jjioptu5 + 1.0 + OutParameter + + + fr.insee + jjintpi8-CI-0-IP-2 + 1.0 + InParameter + + + number(if (jjintpi8-CI-0-IP-2='') then '0' else + jjintpi8-CI-0-IP-2) > number(if (jjintpi8-CI-0-IP-1='') then '0' else + jjintpi8-CI-0-IP-1) + + + + + + fr.insee + ji5pfex8-SI + 1.0 + + + + En 2018, vous avez exercé un emploi salarié dans l'administration + désignée ci-dessous + :¤ADMINISTRATION1¤¤ADMINISTRATION2¤ + + + + + + fr.insee + jrhrn9ti-SI + 1.0 + + + + + Durant une semaine type de travail (semaine sans absence ou jour + férié), hors vacances scolaires : + + + + + + + fr.insee + jjfrxfol-SI + 1.0 + + + + + Pendant les vacances scolaires, combien de temps avez-vous consacré + à des activités en rapport avec l'exercice de votre métier d'enseignant + : + + + + + + + fr.insee + jrc5ea2c-SI + 1.0 + + + + + Les questions suivantes portent sur vos congés (Questions 50 à 56). + Veuillez y répondre, sauf si vous êtes dans les cas suivants : + + - vous êtes enseignant-chercheur : + répondez (même approximativement) sur le nombre de jours de congés pris (question 52) puis passez à la question 57. + + - vous n'êtes pas enseignant mais + vous bénéficiez des vacances scolaires, + répondez aux questions 50 et 52 puis passez à la question 57. + ​ + + + + + + + fr.insee + QuestionScheme-ji4df4oc5 + 1.0 + + A définir + + + fr.insee + ji4dwdtx + 1.0 + + ACTADMIN + + + fr.insee + ji4dwdtx-QOP-ji4dunra + 1.0 + + ACTADMIN + + + + + fr.insee + ji4dwdtx-RDOP-ji4dunra + 1.0 + OutParameter + + + fr.insee + ji4dwdtx-QOP-ji4dunra + 1.0 + OutParameter + + + + + Êtes-vous toujours en activité au sein de cette + administration ? + + + + checkbox + + fr.insee + ji4e0b4b + 1.0 + CodeList + + + fr.insee + ji4dwdtx-RDOP-ji4dunra + 1.0 + + + fr.insee + ji4e0b4b + 1.0 + CodeList + + + + + + + fr.insee + ji5qog18 + 1.0 + + + + Si oui, passez à la question 4. + $ACTADMIN$ != '2' + ji4jutje + + + + + + + fr.insee + ji4jt9p2 + 1.0 + + DATEDEP + + + fr.insee + ji4jt9p2-QOP-ji4l16gl + 1.0 + + DATEDEP + + + + + fr.insee + ji4jt9p2-RDOP-ji4l16gl + 1.0 + OutParameter + + + fr.insee + ji4jt9p2-QOP-ji4l16gl + 1.0 + OutParameter + + + + + Si vous n'êtes plus en activité dans cette + administration, quand l'avez-vous quittée ? + + + + fr.insee + INSEE-COMMUN-MNR-DateTimedate-MMAAAA + 1.0 + ManagedDateTimeRepresentation + + fr.insee + ji4jt9p2-RDOP-ji4l16gl + 1.0 + + fr.insee + INSEE-COMMUN-MNR-DateTimedate-MMAAAA + 1.0 + ManagedDateTimeRepresentation + + + + + fr.insee + juazfzeq + 1.0 + Instruction + + + + fr.insee + ji4jwh9s + 1.0 + + RAISONDEP + + + fr.insee + ji4jwh9s-QOP-ji4l168h + 1.0 + + RAISONDEP + + + + + fr.insee + ji4jwh9s-RDOP-ji4l168h + 1.0 + OutParameter + + + fr.insee + ji4jwh9s-QOP-ji4l168h + 1.0 + OutParameter + + + + + Pour quelle raison avez-vous quitté cette administration + ? + + + + checkbox + + fr.insee + ji4k33ri + 1.0 + CodeList + + + fr.insee + ji4jwh9s-RDOP-ji4l168h + 1.0 + + + fr.insee + ji4k33ri + 1.0 + CodeList + + + + + + + fr.insee + jp2rw471 + 1.0 + Instruction + + + + fr.insee + ji4jutje + 1.0 + + ANNEEFORM + + + fr.insee + ji4jutje-QOP-ji4l7t2j + 1.0 + + ANNEEFORM + + + + + fr.insee + ji4jutje-RDOP-ji4l7t2j + 1.0 + OutParameter + + + fr.insee + ji4jutje-QOP-ji4l7t2j + 1.0 + OutParameter + + + + + En quelle année avez-vous cessé de fréquenter + régulièrement l'école ou l'université dans le cadre de vos études ? + + + + fr.insee + INSEE-COMMUN-MNR-DateTimedate-AAAA + 1.0 + ManagedDateTimeRepresentation + + fr.insee + ji4jutje-RDOP-ji4l7t2j + 1.0 + + fr.insee + INSEE-COMMUN-MNR-DateTimedate-AAAA + 1.0 + ManagedDateTimeRepresentation + + + + + fr.insee + ji4k6ysf + 1.0 + Instruction + + + + fr.insee + ji4kr456 + 1.0 + + DIPL + + + fr.insee + ji4kr456-QOP-jn5yikx6 + 1.0 + + DIPL + + + + + fr.insee + ji4kr456-RDOP-jn5yikx6 + 1.0 + OutParameter + + + fr.insee + ji4kr456-QOP-jn5yikx6 + 1.0 + OutParameter + + + + + Quel est votre diplôme le plus élevé ? + + + + checkbox + + fr.insee + jn5y8tek + 1.0 + CodeList + + + fr.insee + ji4kr456-RDOP-jn5yikx6 + 1.0 + + + fr.insee + jn5y8tek + 1.0 + CodeList + + + + + + + fr.insee + ji4l5cir + 1.0 + Instruction + + + fr.insee + jp48zkql + 1.0 + Instruction + + + + fr.insee + ji4lkkue + 1.0 + + ANNEEREM + + + fr.insee + ji4lkkue-QOP-ji4m4qn9 + 1.0 + + ANNEEREM + + + + + fr.insee + ji4lkkue-RDOP-ji4m4qn9 + 1.0 + OutParameter + + + fr.insee + ji4lkkue-QOP-ji4m4qn9 + 1.0 + OutParameter + + + + + En quelle année avez-vous commencé à exercer un emploi + rémunéré ? + + + + fr.insee + INSEE-COMMUN-MNR-DateTimedate-AAAA + 1.0 + ManagedDateTimeRepresentation + + fr.insee + ji4lkkue-RDOP-ji4m4qn9 + 1.0 + + fr.insee + INSEE-COMMUN-MNR-DateTimedate-AAAA + 1.0 + ManagedDateTimeRepresentation + + + + + fr.insee + ji4m4u8b + 1.0 + Instruction + + + + fr.insee + ji4ly1lu + 1.0 + + SECTEUR + + + fr.insee + ji4ly1lu-QOP-ji4m2n5u + 1.0 + + SECTEUR + + + + + fr.insee + ji4ly1lu-RDOP-ji4m2n5u + 1.0 + OutParameter + + + fr.insee + ji4ly1lu-QOP-ji4m2n5u + 1.0 + OutParameter + + + + + Dans quel secteur se situait votre premier emploi + rémunéré ? + + + + checkbox + + fr.insee + ji4m4x9l + 1.0 + CodeList + + + fr.insee + ji4ly1lu-RDOP-ji4m2n5u + 1.0 + + + fr.insee + ji4m4x9l + 1.0 + CodeList + + + + + + + fr.insee + ji5s4ys2 + 1.0 + + + + Si vous avez répondu dans le secteur public, + passez à la question 10. + $SECTEUR$ != '1' + ji5rui6p + + + + + + + fr.insee + ji5r2tmo + 1.0 + + NBEMPL + + + fr.insee + ji5r2tmo-QOP-ji5s5f83 + 1.0 + + NBEMPL + + + + + fr.insee + ji5r2tmo-RDOP-ji5s5f83 + 1.0 + OutParameter + + + fr.insee + ji5r2tmo-QOP-ji5s5f83 + 1.0 + OutParameter + + + + + + Combien d’employeurs différents avez-vous eu dans le secteur privé, + avant votre entrée dans la fonction publique ? + + + + + + 1 + 30 + + Decimal + + fr.insee + ji5r2tmo-RDOP-ji5s5f83 + 1.0 + + + + + fr.insee + ji5rge4j + 1.0 + + DUREEPRIV + + + fr.insee + ji5rge4j-QOP-ji5rt610 + 1.0 + + DUREEPRIV + + + + + fr.insee + ji5rge4j-RDOP-ji5rt610 + 1.0 + OutParameter + + + fr.insee + ji5rge4j-QOP-ji5rt610 + 1.0 + OutParameter + + + + + Combien de temps avez-vous travaillé dans le secteur + privé, même approximativement ? + + + + fr.insee + INSEE-COMMUN-MNR-DateTimedate-DUREEAAMM + 1.0 + ManagedDateTimeRepresentation + + fr.insee + ji5rge4j-RDOP-ji5rt610 + 1.0 + + fr.insee + INSEE-COMMUN-MNR-DateTimedate-DUREEAAMM + 1.0 + ManagedDateTimeRepresentation + + + + + fr.insee + jn5zkble + 1.0 + Instruction + + + + fr.insee + ji5rui6p + 1.0 + + PERIODCHOM + + + fr.insee + ji5rui6p-QOP-ji5rs7j6 + 1.0 + + PERIODCHOM + + + + + fr.insee + ji5rui6p-RDOP-ji5rs7j6 + 1.0 + OutParameter + + + fr.insee + ji5rui6p-QOP-ji5rs7j6 + 1.0 + OutParameter + + + + + Au cours de votre carrière, avez-vous connu des périodes + de chômage supérieures à 6 mois ? + + + + checkbox + + fr.insee + ji4e0b4b + 1.0 + CodeList + + + fr.insee + ji5rui6p-RDOP-ji5rs7j6 + 1.0 + + + fr.insee + ji4e0b4b + 1.0 + CodeList + + + + + + + fr.insee + ji5rwq2l + 1.0 + + + + Si non, passez à la question 13. + $PERIODCHOM != '1' + ji4ml7ax + + + + + + + fr.insee + ji5s11e3 + 1.0 + + NBCHOM + + + fr.insee + ji5s11e3-QOP-ji5rzked + 1.0 + + NBCHOM + + + + + fr.insee + ji5s11e3-RDOP-ji5rzked + 1.0 + OutParameter + + + fr.insee + ji5s11e3-QOP-ji5rzked + 1.0 + OutParameter + + + + + Combien de périodes de chômage de plus de 6 mois + avez-vous connues ? + + + + + 1 + 50 + + Decimal + + fr.insee + ji5s11e3-RDOP-ji5rzked + 1.0 + + + + + fr.insee + ji5rv55w + 1.0 + + DUREECHOM + + + fr.insee + ji5rv55w-QOP-ji5s9zlm + 1.0 + + DUREECHOM + + + + + fr.insee + ji5rv55w-RDOP-ji5s9zlm + 1.0 + OutParameter + + + fr.insee + ji5rv55w-QOP-ji5s9zlm + 1.0 + OutParameter + + + + + Quelle a été la durée totale de ces périodes de chômage + ? + + + + + 6 + 500 + + Decimal + + fr.insee + ji5rv55w-RDOP-ji5s9zlm + 1.0 + + + + fr.insee + jn6403av + 1.0 + Instruction + + + + fr.insee + ji4ml7ax + 1.0 + + ANNEEFP + + + fr.insee + ji4ml7ax-QOP-ji4mrm8r + 1.0 + + ANNEEFP + + + + + fr.insee + ji4ml7ax-RDOP-ji4mrm8r + 1.0 + OutParameter + + + fr.insee + ji4ml7ax-QOP-ji4mrm8r + 1.0 + OutParameter + + + + + En quelle année avez-vous commencé à travailler dans la + fonction publique ? + + + + fr.insee + INSEE-COMMUN-MNR-DateTimedate-AAAA + 1.0 + ManagedDateTimeRepresentation + + fr.insee + ji4ml7ax-RDOP-ji4mrm8r + 1.0 + + fr.insee + INSEE-COMMUN-MNR-DateTimedate-AAAA + 1.0 + ManagedDateTimeRepresentation + + + + + fr.insee + jjfp0qrr + 1.0 + Instruction + + + + fr.insee + ji4mrfyk + 1.0 + + FPDEBUT + + + fr.insee + ji4mrfyk-QOP-ji4mpo07 + 1.0 + + FPDEBUT + + + + + fr.insee + ji4mrfyk-RDOP-ji4mpo07 + 1.0 + OutParameter + + + fr.insee + ji4mrfyk-QOP-ji4mpo07 + 1.0 + OutParameter + + + + + Dans quelle fonction publique avez-vous débuté ? + + + + checkbox + + fr.insee + ji4mpfcj + 1.0 + CodeList + + + fr.insee + ji4mrfyk-RDOP-ji4mpo07 + 1.0 + + + fr.insee + ji4mpfcj + 1.0 + CodeList + + + + + + + + fr.insee + ji5x2loi + 1.0 + + MOYENENTREE + + + fr.insee + ji5x2loi-QOP-ji5xds58 + 1.0 + + MOYENENTREE + + + + + fr.insee + ji5x2loi-RDOP-ji5xds58 + 1.0 + OutParameter + + + fr.insee + ji5x2loi-QOP-ji5xds58 + 1.0 + OutParameter + + + + + Comment êtes-vous entré dans la fonction publique + ? + + + + checkbox + + fr.insee + ji5x0f32 + 1.0 + CodeList + + + fr.insee + ji5x2loi-RDOP-ji5xds58 + 1.0 + + + fr.insee + ji5x0f32 + 1.0 + CodeList + + + + + + + fr.insee + jvc3t0ds + 1.0 + Instruction + + + + fr.insee + jn64jhtz + 1.0 + + STATUTPP + + + fr.insee + jn64jhtz-QOP-jn6516e0 + 1.0 + + STATUTPP + + + + + fr.insee + jn64jhtz-RDOP-jn6516e0 + 1.0 + OutParameter + + + fr.insee + jn64jhtz-QOP-jn6516e0 + 1.0 + OutParameter + + + + + À la prise de votre premier poste dans la fonction + publique, vous étiez : + + + + checkbox + + fr.insee + jn64rn0g + 1.0 + CodeList + + + fr.insee + jn64jhtz-RDOP-jn6516e0 + 1.0 + + + fr.insee + jn64rn0g + 1.0 + CodeList + + + + + + + fr.insee + jn64zful + 1.0 + + + + Si vous avez répondu fonctionnaire titulaire + ou militaire, passez à la question 20. + $STATUTPP = '1' + jjfparcg + + + + + + fr.insee + jruu3ssd + 1.0 + Instruction + + + + fr.insee + jjfpa81t + 1.0 + + TITUL + + + fr.insee + jjfpa81t-QOP-jjfpk302 + 1.0 + + TITUL + + + + + fr.insee + jjfpa81t-RDOP-jjfpk302 + 1.0 + OutParameter + + + fr.insee + jjfpa81t-QOP-jjfpk302 + 1.0 + OutParameter + + + + + Êtes-vous devenu fonctionnaire titulaire depuis votre + entrée dans la fonction publique ? + + + + checkbox + + fr.insee + ji4e0b4b + 1.0 + CodeList + + + fr.insee + jjfpa81t-RDOP-jjfpk302 + 1.0 + + + fr.insee + ji4e0b4b + 1.0 + CodeList + + + + + + + fr.insee + jjy9qsja + 1.0 + + + + Si non, passez à la question 20. + $TITUL = '2' + jjfparcg + + + + + + + fr.insee + jjfpeiy4 + 1.0 + + MOYTIT + + + fr.insee + jjfpeiy4-QOP-jjfpj9ii + 1.0 + + MOYTIT + + + + fr.insee + jjfpeiy4-QOP-jprecisez + 0.1.0 + + MOYTIT_AUTRE + + + + + + fr.insee + jjfpeiy4-RDOP-jjfpj9ii + 1.0 + OutParameter + + + fr.insee + jjfpeiy4-QOP-jjfpj9ii + 1.0 + OutParameter + + + + + fr.insee + jjfpeiy4-RDOP-jprecisez + 1.0 + OutParameter + + + fr.insee + jjfpeiy4-QOP-jprecisez + 1.0 + OutParameter + + + + + Par quel moyen êtes-vous devenu fonctionnaire titulaire + depuis votre entrée dans la fonction publique ? + + + + + + checkbox + + fr.insee + jjfpp3rw + 1.0 + CodeList + + + fr.insee + jjfpeiy4-RDOP-jjfpj9ii + 1.0 + + + fr.insee + jjfpp3rw + 1.0 + CodeList + + + + + + + + + + + + Précisez : + + + + + fr.insee + jjfpeiy4-RDOP-jprecisez + 0.1.0 + + MOYTIT_AUTRE + + + + + + + 1 + + + fr.insee + jjfpp3rw-1 + 0.1.0 + Code + + + + + + + fr.insee + jn6515od + 1.0 + + ANNEE_FONC + + + fr.insee + jn6515od-QOP-jn6559y5 + 1.0 + + ANNEE_FONC + + + + + fr.insee + jn6515od-RDOP-jn6559y5 + 1.0 + OutParameter + + + fr.insee + jn6515od-QOP-jn6559y5 + 1.0 + OutParameter + + + + + En quelle année êtes-vous devenu fonctionnaire titulaire + ? + + + + fr.insee + INSEE-COMMUN-MNR-DateTimedate-AAAA + 1.0 + ManagedDateTimeRepresentation + + fr.insee + jn6515od-RDOP-jn6559y5 + 1.0 + + fr.insee + INSEE-COMMUN-MNR-DateTimedate-AAAA + 1.0 + ManagedDateTimeRepresentation + + + + + + fr.insee + jjfparcg + 1.0 + + CATPP + + + fr.insee + jjfparcg-QOP-jjfq0l78 + 1.0 + + CATPP + + + + + fr.insee + jjfparcg-RDOP-jjfq0l78 + 1.0 + OutParameter + + + fr.insee + jjfparcg-QOP-jjfq0l78 + 1.0 + OutParameter + + + + + Pour votre premier poste dans la fonction publique, + quelle était votre catégorie ? + + + + checkbox + + fr.insee + jjfpo4vp + 1.0 + CodeList + + + fr.insee + jjfparcg-RDOP-jjfq0l78 + 1.0 + + + fr.insee + jjfpo4vp + 1.0 + CodeList + + + + + + + fr.insee + jjfpoyj4 + 1.0 + Instruction + + + + fr.insee + jm6g69xh + 1.0 + + LIEUFP + + + fr.insee + jm6g69xh-QOP-jm6grla8 + 1.0 + + LIEUFP + + + + + fr.insee + jm6g69xh-RDOP-jm6grla8 + 1.0 + OutParameter + + + fr.insee + jm6g69xh-QOP-jm6grla8 + 1.0 + OutParameter + + + + + Où avez-vous commencé à travailler dans la fonction + publique ? + + + + checkbox + + fr.insee + jm6gc2nv + 1.0 + CodeList + + + fr.insee + jm6g69xh-RDOP-jm6grla8 + 1.0 + + + fr.insee + jm6gc2nv + 1.0 + CodeList + + + + + + + fr.insee + jm6g8t7k + 1.0 + + + + Si vous avez commencé à travailler dans la + fonction publique à l'étranger, dans une COM, un TOM ou dans un autre + territoire, passez à la question 23. + $LIEUFP$ = '2' + jjfqa4n7 + + + + + + fr.insee + jn659ucl + 1.0 + Instruction + + + + fr.insee + ji5wosav + 1.0 + + DEPTFP + + + fr.insee + ji5wosav-QOP-jn65gas0 + 1.0 + + DEPTFP + + + + + fr.insee + ji5wosav-RDOP-jn65gas0 + 1.0 + OutParameter + + + fr.insee + ji5wosav-QOP-jn65gas0 + 1.0 + OutParameter + + + + + Si vous avez commencé en France, précisez dans quel + département : + + + + drop-down-list + + fr.insee + jL_DEPT + 1.0 + CodeList + + + fr.insee + ji5wosav-RDOP-jn65gas0 + 1.0 + + + fr.insee + jL_DEPT + 1.0 + CodeList + + + + + + + fr.insee + jn65kwcr + 1.0 + Instruction + + + + fr.insee + jjfqa4n7 + 1.0 + + CATDEC + + + fr.insee + jjfqa4n7-QOP-jjfqw6fz + 1.0 + + CATDEC + + + + + fr.insee + jjfqa4n7-RDOP-jjfqw6fz + 1.0 + OutParameter + + + fr.insee + jjfqa4n7-QOP-jjfqw6fz + 1.0 + OutParameter + + + + + Au 31 décembre 2018, quelle était votre catégorie + ? + + + + checkbox + + fr.insee + jjfq9tsq + 1.0 + CodeList + + + fr.insee + jjfqa4n7-RDOP-jjfqw6fz + 1.0 + + + fr.insee + jjfq9tsq + 1.0 + CodeList + + + + + + + fr.insee + jo4jzq65 + 1.0 + Instruction + + + + fr.insee + jje9fape + 1.0 + + MINPOSTE + + + fr.insee + jje9fape-QOP-jje9ac6d + 1.0 + + MINPOSTE + + + + + fr.insee + jje9fape-RDOP-jje9ac6d + 1.0 + OutParameter + + + fr.insee + jje9fape-QOP-jje9ac6d + 1.0 + OutParameter + + + + + Votre poste actuel est-il dans le même ministère ou dans + la même institution que celui de votre premier poste dans la fonction publique + ? + + + + checkbox + + fr.insee + ji4e0b4b + 1.0 + CodeList + + + fr.insee + jje9fape-RDOP-jje9ac6d + 1.0 + + + fr.insee + ji4e0b4b + 1.0 + CodeList + + + + + + + + fr.insee + jje9bdqm + 1.0 + + FILIEREPOSTE + + + fr.insee + jje9bdqm-QOP-jje9sq60 + 1.0 + + FILIEREPOSTE + + + + + fr.insee + jje9bdqm-RDOP-jje9sq60 + 1.0 + OutParameter + + + fr.insee + jje9bdqm-QOP-jje9sq60 + 1.0 + OutParameter + + + + + Votre poste actuel correspond-il au même métier que celui + de votre premier poste dans la fonction publique ? + + + + checkbox + + fr.insee + ji4e0b4b + 1.0 + CodeList + + + fr.insee + jje9bdqm-RDOP-jje9sq60 + 1.0 + + + fr.insee + ji4e0b4b + 1.0 + CodeList + + + + + + + + fr.insee + joyirwwm + 1.0 + + AUTRE_ACT + + + fr.insee + joyirwwm-QOP-joyj305n + 1.0 + + AUTRE_ACT + + + + + fr.insee + joyirwwm-RDOP-joyj305n + 1.0 + OutParameter + + + fr.insee + joyirwwm-QOP-joyj305n + 1.0 + OutParameter + + + + + Avez-vous une autre activité professionnelle en dehors de + votre poste actuel ? + + + + checkbox + + fr.insee + ji4e0b4b + 1.0 + CodeList + + + fr.insee + joyirwwm-RDOP-joyj305n + 1.0 + + + fr.insee + ji4e0b4b + 1.0 + CodeList + + + + + + + + fr.insee + jje9mvyn + 1.0 + + NBDPT + + + fr.insee + jje9mvyn-QOP-jje9i8cz + 1.0 + + NBDPT + + + + + fr.insee + jje9mvyn-RDOP-jje9i8cz + 1.0 + OutParameter + + + fr.insee + jje9mvyn-QOP-jje9i8cz + 1.0 + OutParameter + + + + + Combien de fois avez-vous changé de département depuis + votre entrée dans la fonction publique ? + + + + + 0 + 40 + + Decimal + + fr.insee + jje9mvyn-RDOP-jje9i8cz + 1.0 + + + + fr.insee + jrgfrrrn + 1.0 + + + + Si vous n'avez jamais changé de département, + passez à la question 30. + $NBDPT$ = 0 + jjfq3jkl + + + + + + fr.insee + jubdgfzw + 1.0 + Instruction + + + fr.insee + jubd7agf + 1.0 + Instruction + + + + fr.insee + jo4k1wz1 + 1.0 + + CHGMT_SOUHAIT + + + fr.insee + jo4k1wz1-QOP-jo4jyad7 + 1.0 + + CHGMT_SOUHAIT + + + + + fr.insee + jo4k1wz1-RDOP-jo4jyad7 + 1.0 + OutParameter + + + fr.insee + jo4k1wz1-QOP-jo4jyad7 + 1.0 + OutParameter + + + + + Parmi ce(s) changement(s), combien en avez-vous + souhaité(s)? + + + + + 0 + 40 + + Decimal + + fr.insee + jo4k1wz1-RDOP-jo4jyad7 + 1.0 + + + + + fr.insee + jo4khrya + 1.0 + + CHGMT_SUIVI + + + fr.insee + jo4khrya-QOP-jo4kkktz + 1.0 + + CHGMT_SUIVI + + + + + fr.insee + jo4khrya-RDOP-jo4kkktz + 1.0 + OutParameter + + + fr.insee + jo4khrya-QOP-jo4kkktz + 1.0 + OutParameter + + + + + Parmi ce(s) changement(s), combien sont lié(s) au suivi + de votre conjoint ? + + + + + 0 + 40 + + Decimal + + fr.insee + jo4khrya-RDOP-jo4kkktz + 1.0 + + + + + fr.insee + jjfq3jkl + 1.0 + + PROMOTION + + + fr.insee + jjfq3jkl-QOP-jjfr4jff + 1.0 + + PROMOTION + + + + + fr.insee + jjfq3jkl-RDOP-jjfr4jff + 1.0 + OutParameter + + + fr.insee + jjfq3jkl-QOP-jjfr4jff + 1.0 + OutParameter + + + + + Depuis votre entrée dans la fonction publique, avez-vous + bénéficié d'une ou plusieurs promotions par le biais d'un changement de corps + (ou assimilé) ? + + + + checkbox + + fr.insee + ji4e0b4b + 1.0 + CodeList + + + fr.insee + jjfq3jkl-RDOP-jjfr4jff + 1.0 + + + fr.insee + ji4e0b4b + 1.0 + CodeList + + + + + + + fr.insee + jjfqjyvv + 1.0 + + + + Si non, passez à la question 32. + $PROMOTION = '2' + jjfr67oy + + + + + + fr.insee + joyjjnm7 + 1.0 + Instruction + + + + fr.insee + jjfr67oy + 1.0 + + TPSPART + + + fr.insee + jjfr67oy-QOP-jjfr9xmw + 1.0 + + TPSPART + + + + + fr.insee + jjfr67oy-RDOP-jjfr9xmw + 1.0 + OutParameter + + + fr.insee + jjfr67oy-QOP-jjfr9xmw + 1.0 + OutParameter + + + + + + Depuis votre entrée dans la fonction publique, avez-vous déjà + travaillé à temps partiel ou non complet ? + + + + + checkbox + + fr.insee + ji4e0b4b + 1.0 + CodeList + + + fr.insee + jjfr67oy-RDOP-jjfr9xmw + 1.0 + + + fr.insee + ji4e0b4b + 1.0 + CodeList + + + + + + + fr.insee + jjfr2ybd + 1.0 + + + + Si non, passez à la question 35. + $TPSPART = '2' + joyke3ob + + + + + + + fr.insee + jjfqtw3t + 1.0 + + DUREETP + + + fr.insee + jjfqtw3t-QOP-jjfrdxhu + 1.0 + + DUREETP + + + + + fr.insee + jjfqtw3t-RDOP-jjfrdxhu + 1.0 + OutParameter + + + fr.insee + jjfqtw3t-QOP-jjfrdxhu + 1.0 + OutParameter + + + + + Indiquez la durée totale de travail à temps partiel ou + non complet, même approximativement : + + + + fr.insee + INSEE-COMMUN-MNR-DateTimedate-DUREEAAMM + 1.0 + ManagedDateTimeRepresentation + + fr.insee + jjfqtw3t-RDOP-jjfrdxhu + 1.0 + + fr.insee + INSEE-COMMUN-MNR-DateTimedate-DUREEAAMM + 1.0 + ManagedDateTimeRepresentation + + + + + fr.insee + jrhqyq13 + 1.0 + Instruction + + + + fr.insee + joyke3ob + 1.0 + + TELETRAV + + + fr.insee + joyke3ob-QOP-joyktgfk + 1.0 + + TELETRAV + + + + + fr.insee + joyke3ob-RDOP-joyktgfk + 1.0 + OutParameter + + + fr.insee + joyke3ob-QOP-joyktgfk + 1.0 + OutParameter + + + + + + Sur votre poste actuel, êtes-vous en télétravail ? + + + + + checkbox + + fr.insee + joykfudt + 1.0 + CodeList + + + fr.insee + joyke3ob-RDOP-joyktgfk + 1.0 + + + fr.insee + joykfudt + 1.0 + CodeList + + + + + + + fr.insee + jrc1cdki + 1.0 + Instruction + + + + fr.insee + jjyd137l + 1.0 + + DUREEINTERR_1 + + + fr.insee + jjyd137l-QOP-jjyde4pq + 1.0 + + DUREEINTERR_1 + + + + + fr.insee + jjyd137l-RDOP-jjyde4pq + 1.0 + OutParameter + + + fr.insee + jjyd137l-QOP-jjyde4pq + 1.0 + OutParameter + + + + + Pendant combien de temps avez-vous interrompu votre + carrière pour vous occuper de vos enfants ? + + + + fr.insee + INSEE-COMMUN-MNR-DateTimedate-DUREEAAMM + 1.0 + ManagedDateTimeRepresentation + + fr.insee + jjyd137l-RDOP-jjyde4pq + 1.0 + + fr.insee + INSEE-COMMUN-MNR-DateTimedate-DUREEAAMM + 1.0 + ManagedDateTimeRepresentation + + + + + fr.insee + jo9uth1s + 1.0 + Instruction + + + + fr.insee + jjzcm9q0 + 1.0 + + DUREEINTERR_2 + + + fr.insee + jjzcm9q0-QOP-jjzd3d32 + 1.0 + + DUREEINTERR_2 + + + + + fr.insee + jjzcm9q0-RDOP-jjzd3d32 + 1.0 + OutParameter + + + fr.insee + jjzcm9q0-QOP-jjzd3d32 + 1.0 + OutParameter + + + + + Pendant combien de temps avez-vous interrompu votre + carrière pour travailler hors de la fonction publique ? + + + + fr.insee + INSEE-COMMUN-MNR-DateTimedate-DUREEAAMM + 1.0 + ManagedDateTimeRepresentation + + fr.insee + jjzcm9q0-RDOP-jjzd3d32 + 1.0 + + fr.insee + INSEE-COMMUN-MNR-DateTimedate-DUREEAAMM + 1.0 + ManagedDateTimeRepresentation + + + + + fr.insee + jo9us5ty + 1.0 + Instruction + + + + fr.insee + jjzcr77v + 1.0 + + DUREEINTERR_3 + + + fr.insee + jjzcr77v-QOP-jjzcto35 + 1.0 + + DUREEINTERR_3 + + + + + fr.insee + jjzcr77v-RDOP-jjzcto35 + 1.0 + OutParameter + + + fr.insee + jjzcr77v-QOP-jjzcto35 + 1.0 + OutParameter + + + + + Pendant combien de temps avez-vous interrompu votre + carrière pour une autre raison (hors formations) ? + + + + fr.insee + INSEE-COMMUN-MNR-DateTimedate-DUREEAAMM + 1.0 + ManagedDateTimeRepresentation + + fr.insee + jjzcr77v-RDOP-jjzcto35 + 1.0 + + fr.insee + INSEE-COMMUN-MNR-DateTimedate-DUREEAAMM + 1.0 + ManagedDateTimeRepresentation + + + + + fr.insee + jo9v2ai4 + 1.0 + Instruction + + + + fr.insee + jjfrrtwf + 1.0 + + INDIC_ENSEIGN + + + fr.insee + jjfrrtwf-QOP-jjfrdkf5 + 1.0 + + INDIC_ENSEIGN + + + + + fr.insee + jjfrrtwf-RDOP-jjfrdkf5 + 1.0 + OutParameter + + + fr.insee + jjfrrtwf-QOP-jjfrdkf5 + 1.0 + OutParameter + + + + + Êtes-vous enseignant du primaire ou du secondaire + ? + + + + checkbox + + fr.insee + js33gq97 + 1.0 + CodeList + + + fr.insee + jjfrrtwf-RDOP-jjfrdkf5 + 1.0 + + + fr.insee + js33gq97 + 1.0 + CodeList + + + + + + + fr.insee + jjyebdv3 + 1.0 + + + + Si non ou si vous bénéficiez d'une décharge + totale, passez à la question 48. + $INDIC_ENSEIGN$ = '2' or $INDIC_ENSEIGN$ + ='3' + jozf0haj + + + + + + + fr.insee + jozds2b9 + 1.0 + + PLS_ETAB + + + fr.insee + jozds2b9-QOP-jozdr8rz + 1.0 + + PLS_ETAB + + + + + fr.insee + jozds2b9-RDOP-jozdr8rz + 1.0 + OutParameter + + + fr.insee + jozds2b9-QOP-jozdr8rz + 1.0 + OutParameter + + + + + Étiez-vous affecté sur plusieurs établissements en même + temps ? + + + + checkbox + + fr.insee + ji4e0b4b + 1.0 + CodeList + + + fr.insee + jozds2b9-RDOP-jozdr8rz + 1.0 + + + fr.insee + ji4e0b4b + 1.0 + CodeList + + + + + + + + fr.insee + jozdgt4o + 1.0 + + TPS_TRAV + + + fr.insee + jozdgt4o-QOP-joze1cs7 + 1.0 + + TPS_TRAV + + + + + fr.insee + jozdgt4o-RDOP-joze1cs7 + 1.0 + OutParameter + + + fr.insee + jozdgt4o-QOP-joze1cs7 + 1.0 + OutParameter + + + + + + En tenant compte de tous vos postes occupés, quel était votre temps de + travail ? + + + + + checkbox + + fr.insee + jozdqrw6 + 1.0 + CodeList + + + fr.insee + jozdgt4o-RDOP-joze1cs7 + 1.0 + + + fr.insee + jozdqrw6 + 1.0 + CodeList + + + + + + + + fr.insee + jjfscd7k + 1.0 + + NBHEURPROF + + + fr.insee + jjfscd7k-QOP-jjfsda5p + 1.0 + + NBHEURPROF + + + + + fr.insee + jjfscd7k-RDOP-jjfsda5p + 1.0 + OutParameter + + + fr.insee + jjfscd7k-QOP-jjfsda5p + 1.0 + OutParameter + + + + + Combien de temps avez-vous consacré à l'enseignement + ? + + + + fr.insee + INSEE-COMMUN-MNR-DateTimedate-DUREEHHMM + 1.0 + ManagedDateTimeRepresentation + + fr.insee + jjfscd7k-RDOP-jjfsda5p + 1.0 + + fr.insee + INSEE-COMMUN-MNR-DateTimedate-DUREEHHMM + 1.0 + ManagedDateTimeRepresentation + + + + + + fr.insee + jjfsq33z + 1.0 + + NBHEURPREP + + + fr.insee + jjfsq33z-QOP-jjfswh7r + 1.0 + + NBHEURPREP + + + + + fr.insee + jjfsq33z-RDOP-jjfswh7r + 1.0 + OutParameter + + + fr.insee + jjfsq33z-QOP-jjfswh7r + 1.0 + OutParameter + + + + + Combien de temps approximativement avez-vous consacré à + la préparation des cours et à la correction des copies ? + + + + fr.insee + INSEE-COMMUN-MNR-DateTimedate-DUREEHHMM + 1.0 + ManagedDateTimeRepresentation + + fr.insee + jjfsq33z-RDOP-jjfswh7r + 1.0 + + fr.insee + INSEE-COMMUN-MNR-DateTimedate-DUREEHHMM + 1.0 + ManagedDateTimeRepresentation + + + + + + fr.insee + jjfspjuz + 1.0 + + NBHEURAUTRE + + + fr.insee + jjfspjuz-QOP-jjftfr3f + 1.0 + + NBHEURAUTRE + + + + + fr.insee + jjfspjuz-RDOP-jjftfr3f + 1.0 + OutParameter + + + fr.insee + jjfspjuz-QOP-jjftfr3f + 1.0 + OutParameter + + + + + Combien de temps approximativement avez-vous consacré à + d’autres tâches liées à votre métier d’enseignant (réunions avec les parents, + conseils des professeurs, activités périscolaires, formation, décharge + partielle…) ? + + + + fr.insee + INSEE-COMMUN-MNR-DateTimedate-DUREEHHMM + 1.0 + ManagedDateTimeRepresentation + + fr.insee + jjfspjuz-RDOP-jjftfr3f + 1.0 + + fr.insee + INSEE-COMMUN-MNR-DateTimedate-DUREEHHMM + 1.0 + ManagedDateTimeRepresentation + + + + + + fr.insee + jjfrk62q + 1.0 + + TPS_PREP_VAC + + + fr.insee + jjfrk62q-QOP-jjfrqgfr + 1.0 + + TPS_PREP_VAC + + + + + fr.insee + jjfrk62q-RDOP-jjfrqgfr + 1.0 + OutParameter + + + fr.insee + jjfrk62q-QOP-jjfrqgfr + 1.0 + OutParameter + + + + + En moyenne, pendant une semaine de vacances hors congés + d'été ? + + + + + 0 + 7 + + Decimal + + fr.insee + jjfrk62q-RDOP-jjfrqgfr + 1.0 + + + + fr.insee + jrhs4t3c + 1.0 + Instruction + + + + fr.insee + jjfrtikv + 1.0 + + TPS_PREP_ETE + + + fr.insee + jjfrtikv-QOP-jjfrr11x + 1.0 + + TPS_PREP_ETE + + + + + fr.insee + jjfrtikv-RDOP-jjfrr11x + 1.0 + OutParameter + + + fr.insee + jjfrtikv-QOP-jjfrr11x + 1.0 + OutParameter + + + + + En moyenne, pendant les congés d'été ? + + + + + 0 + 60 + + Decimal + + fr.insee + jjfrtikv-RDOP-jjfrr11x + 1.0 + + + + fr.insee + jp3t0zmv + 1.0 + + + + Passez à la question 57. + $INDIC_ENSEIGN$ = '1' + jjfsdz8f + + + + + + fr.insee + jjyem4cy + 1.0 + Instruction + + + + fr.insee + jozf0haj + 1.0 + + NBHEURHEBDO + + + fr.insee + jozf0haj-QOP-jozfemiz + 1.0 + + NBHEURHEBDO + + + + + fr.insee + jozf0haj-RDOP-jozfemiz + 1.0 + OutParameter + + + fr.insee + jozf0haj-QOP-jozfemiz + 1.0 + OutParameter + + + + + Quelle est votre durée hebdomadaire de travail habituelle + ? + + + + fr.insee + INSEE-COMMUN-MNR-DateTimedate-DUREEHHMM + 1.0 + ManagedDateTimeRepresentation + + fr.insee + jozf0haj-RDOP-jozfemiz + 1.0 + + fr.insee + INSEE-COMMUN-MNR-DateTimedate-DUREEHHMM + 1.0 + ManagedDateTimeRepresentation + + + + + fr.insee + jozesim0 + 1.0 + Instruction + + + fr.insee + jrw0txvz + 1.0 + Instruction + + + fr.insee + jrw0flne + 1.0 + Instruction + + + + fr.insee + jozf688x + 1.0 + + NBJOURHEBDO + + + fr.insee + jozf688x-QOP-jozfbisb + 1.0 + + NBJOURHEBDO + + + + + fr.insee + jozf688x-RDOP-jozfbisb + 1.0 + OutParameter + + + fr.insee + jozf688x-QOP-jozfbisb + 1.0 + OutParameter + + + + + Combien de jours travaillez-vous habituellement par + semaine ? + + + + + 0.5 + 7 + + Decimal + + fr.insee + jozf688x-RDOP-jozfbisb + 1.0 + + + + fr.insee + jp47xpqs + 1.0 + Instruction + + + + fr.insee + jjfrm2qf + 1.0 + + NBCGE + + + fr.insee + jjfrm2qf-QOP-jjfrqs55 + 1.0 + + NBCGE + + + + + fr.insee + jjfrm2qf-RDOP-jjfrqs55 + 1.0 + OutParameter + + + fr.insee + jjfrm2qf-QOP-jjfrqs55 + 1.0 + OutParameter + + + + + + En 2018, à combien de jours de congés payés aviez-vous droit au total + (congés annuels, RTT, jours de fractionnement) ? + + + + + + 0 + 200 + + Decimal + + fr.insee + jjfrm2qf-RDOP-jjfrqs55 + 1.0 + + + + fr.insee + jrc3ntww + 1.0 + Instruction + + + fr.insee + jrc3lj9f + 1.0 + Instruction + + + + fr.insee + jjfrsfl4 + 1.0 + + NBRTT + + + fr.insee + jjfrsfl4-QOP-jjfs11gt + 1.0 + + NBRTT + + + + + fr.insee + jjfrsfl4-RDOP-jjfs11gt + 1.0 + OutParameter + + + fr.insee + jjfrsfl4-QOP-jjfs11gt + 1.0 + OutParameter + + + + + Parmi ces jours de congés payés, à combien de jours de + RTT aviez-vous droit en 2018 ? + + + + + 0 + 80 + + Decimal + + fr.insee + jjfrsfl4-RDOP-jjfs11gt + 1.0 + + + + fr.insee + jjfrqvpf + 1.0 + Instruction + + + + fr.insee + jjfrzvhu + 1.0 + + NBCONGPRIS + + + fr.insee + jjfrzvhu-QOP-jjfs8u5a + 1.0 + + NBCONGPRIS + + + + + fr.insee + jjfrzvhu-RDOP-jjfs8u5a + 1.0 + OutParameter + + + fr.insee + jjfrzvhu-QOP-jjfs8u5a + 1.0 + OutParameter + + + + + Parmi ces jours de congés payés, combien en avez-vous + effectivement pris en 2018 (congés annuels, RTT, jours de fractionnement) + ? + + + + + 0 + 200 + + Decimal + + fr.insee + jjfrzvhu-RDOP-jjfs8u5a + 1.0 + + + + fr.insee + jjfs71bb + 1.0 + Instruction + + + fr.insee + jp494kkr + 1.0 + Instruction + + + + fr.insee + jjfs3b3c + 1.0 + + NBCET + + + fr.insee + jjfs3b3c-QOP-jjfsgm0w + 1.0 + + NBCET + + + + + fr.insee + jjfs3b3c-RDOP-jjfsgm0w + 1.0 + OutParameter + + + fr.insee + jjfs3b3c-QOP-jjfsgm0w + 1.0 + OutParameter + + + + + + Parmi ces jours de congés payés, combien de jours avez-vous déposés + sur un compte épargne-temps ? + + + + + + 0 + 99 + + Decimal + + fr.insee + jjfs3b3c-RDOP-jjfsgm0w + 1.0 + + + + fr.insee + jjfsah38 + 1.0 + Instruction + + + + fr.insee + jozfj20z + 1.0 + + NBCET_PRIS + + + fr.insee + jozfj20z-QOP-jozfvwah + 1.0 + + NBCET_PRIS + + + + + fr.insee + jozfj20z-RDOP-jozfvwah + 1.0 + OutParameter + + + fr.insee + jozfj20z-QOP-jozfvwah + 1.0 + OutParameter + + + + + En 2018, combien de jours avez-vous pris en provenance + d'un compte épargne-temps ? + + + + + 0 + 300 + + Decimal + + fr.insee + jozfj20z-RDOP-jozfvwah + 1.0 + + + + fr.insee + jp4844kz + 1.0 + Instruction + + + + fr.insee + jozfsqpe + 1.0 + + STOCK_CET + + + fr.insee + jozfsqpe-QOP-jozfitrh + 1.0 + + STOCK_CET + + + + + fr.insee + jozfsqpe-RDOP-jozfitrh + 1.0 + OutParameter + + + fr.insee + jozfsqpe-QOP-jozfitrh + 1.0 + OutParameter + + + + + Au 31 décembre 2018, au total, combien de jours avez-vous + en stock sur votre (vos) compte(s) épargne-temps ? + + + + + 0 + 999 + + Decimal + + fr.insee + jozfsqpe-RDOP-jozfitrh + 1.0 + + + + fr.insee + jrc3nwpp + 1.0 + Instruction + + + fr.insee + jrc3gtuy + 1.0 + Instruction + + + + fr.insee + jrc3ye5q + 1.0 + + JOURSRECUP + + + fr.insee + jrc3ye5q-QOP-jrc4j6mx + 1.0 + + JOURSRECUP + + + + + fr.insee + jrc3ye5q-RDOP-jrc4j6mx + 1.0 + OutParameter + + + fr.insee + jrc3ye5q-QOP-jrc4j6mx + 1.0 + OutParameter + + + + + En 2018, combien avez-vous pris de jours de récupération + pour horaires variables ? + + + + + 0 + 99 + + Decimal + + fr.insee + jrc3ye5q-RDOP-jrc4j6mx + 1.0 + + + + fr.insee + jrc433y3 + 1.0 + Instruction + + + + fr.insee + jjfsdz8f + 1.0 + + NBJOURSABS + + + fr.insee + jjfsdz8f-QOP-jozfxq9v + 1.0 + + NBJOURSABS + + + + + fr.insee + jjfsdz8f-RDOP-jozfxq9v + 1.0 + OutParameter + + + fr.insee + jjfsdz8f-QOP-jozfxq9v + 1.0 + OutParameter + + + + + En 2018, à l'exclusion des congés annuels, RTT et jours + de fractionnement, combien de jours avez-vous été absent (exemples : pour + maladie, congés maternité ou paternité, accident ou maladie professionnelle, + raisons familiales ou personnelles, garde d’enfants, jours de grève, etc.) + ? + + + + + 0 + 365 + + Decimal + + fr.insee + jjfsdz8f-RDOP-jozfxq9v + 1.0 + + + + fr.insee + jjfsjlr1 + 1.0 + Instruction + + + fr.insee + jp49kf80 + 1.0 + Instruction + + + + fr.insee + jjzrk79r + 1.0 + + FORMATION + + + fr.insee + jjzrk79r-QOP-jjzrzk7e + 1.0 + + FORMATION + + + + + fr.insee + jjzrk79r-RDOP-jjzrzk7e + 1.0 + OutParameter + + + fr.insee + jjzrk79r-QOP-jjzrzk7e + 1.0 + OutParameter + + + + + Depuis que vous avez commencé à exercer un emploi + rémunéré, avez-vous suivi une période de formation à temps plein qui s’étalait + sur 6 mois consécutifs ou plus ? + + + + checkbox + + fr.insee + ji4e0b4b + 1.0 + CodeList + + + fr.insee + jjzrk79r-RDOP-jjzrzk7e + 1.0 + + + fr.insee + ji4e0b4b + 1.0 + CodeList + + + + + + + fr.insee + jjzs62m2 + 1.0 + + + + Si non, passez à la question 61. + $FORMATION$ = '2' + jozgw4j3 + + + + + + + fr.insee + jj5qtb8v + 1.0 + + FORMRAISON + + + fr.insee + jj5qtb8v-QOP-jjfuqw8h + 1.0 + + FORMRAISON + + + + + fr.insee + jj5qtb8v-RDOP-jjfuqw8h + 1.0 + OutParameter + + + fr.insee + jj5qtb8v-QOP-jjfuqw8h + 1.0 + OutParameter + + + + + Ces formations préparaient-elles, ou étaient-elles + consécutives à un concours, à un examen professionnel, à un diplôme (ou à un + titre homologué qui a favorisé une promotion personnelle ou une reconversion) + ? + + + + checkbox + + fr.insee + ji4e0b4b + 1.0 + CodeList + + + fr.insee + jj5qtb8v-RDOP-jjfuqw8h + 1.0 + + + fr.insee + ji4e0b4b + 1.0 + CodeList + + + + + + + fr.insee + jk26kkao + 1.0 + + + + Si non, passez à la question 61. + $FORMRAISON$ = '2' + jozgw4j3 + + + + + + + fr.insee + jj5qwesk + 1.0 + + DUREEFORM + + + fr.insee + jj5qwesk-QOP-jjful415 + 1.0 + + DUREEFORM + + + + + fr.insee + jj5qwesk-RDOP-jjful415 + 1.0 + OutParameter + + + fr.insee + jj5qwesk-QOP-jjful415 + 1.0 + OutParameter + + + + + + Indiquez la durée cumulée de ces formations à temps plein, même approximativement : + + + + + fr.insee + INSEE-COMMUN-MNR-DateTimedate-DUREEAAMM + 1.0 + ManagedDateTimeRepresentation + + fr.insee + jj5qwesk-RDOP-jjful415 + 1.0 + + fr.insee + INSEE-COMMUN-MNR-DateTimedate-DUREEAAMM + 1.0 + ManagedDateTimeRepresentation + + + + + fr.insee + jozh6nqa + 1.0 + Instruction + + + + fr.insee + jozgw4j3 + 1.0 + + COUPLE + + + fr.insee + jozgw4j3-QOP-jozh8iwe + 1.0 + + COUPLE + + + + + fr.insee + jozgw4j3-RDOP-jozh8iwe + 1.0 + OutParameter + + + fr.insee + jozgw4j3-QOP-jozh8iwe + 1.0 + OutParameter + + + + + Êtes-vous en couple ? + + + + checkbox + + fr.insee + ji4e0b4b + 1.0 + CodeList + + + fr.insee + jozgw4j3-RDOP-jozh8iwe + 1.0 + + + fr.insee + ji4e0b4b + 1.0 + CodeList + + + + + + + fr.insee + jozgw8a7 + 1.0 + + + + Si non, passez à la question 63. + $COUPLE$ = '2' + ji5x49d4 + + + + + + + fr.insee + jjin9pqp + 1.0 + + EMPLOI_CONJ + + + fr.insee + jjin9pqp-QOP-jjioqv2r + 1.0 + + EMPLOI_CONJ + + + + + fr.insee + jjin9pqp-RDOP-jjioqv2r + 1.0 + OutParameter + + + fr.insee + jjin9pqp-QOP-jjioqv2r + 1.0 + OutParameter + + + + + Votre conjoint(e) ou partenaire travaille-t-il (elle) + dans la fonction publique actuellement ? + + + + checkbox + + fr.insee + jp2splv8 + 1.0 + CodeList + + + fr.insee + jjin9pqp-RDOP-jjioqv2r + 1.0 + + + fr.insee + jp2splv8 + 1.0 + CodeList + + + + + + + + fr.insee + ji5x49d4 + 1.0 + + ENFANTS + + + fr.insee + ji5x49d4-QOP-ji5xoepk + 1.0 + + ENFANTS + + + + + fr.insee + ji5x49d4-RDOP-ji5xoepk + 1.0 + OutParameter + + + fr.insee + ji5x49d4-QOP-ji5xoepk + 1.0 + OutParameter + + + + + Avez-vous des enfants à charge ? + + + + checkbox + + fr.insee + ji4e0b4b + 1.0 + CodeList + + + fr.insee + ji5x49d4-RDOP-ji5xoepk + 1.0 + + + fr.insee + ji4e0b4b + 1.0 + CodeList + + + + + + + fr.insee + jjio9ccf + 1.0 + + + + Si non, passez à la question 67. + $ENFANTS$ = '2' + jp2u3e8k + + + + + + + fr.insee + jjinpzje + 1.0 + + NBENFANTS + + + fr.insee + jjinpzje-QOP-jjioyaql + 1.0 + + NBENFANTS + + + + + fr.insee + jjinpzje-RDOP-jjioyaql + 1.0 + OutParameter + + + fr.insee + jjinpzje-QOP-jjioyaql + 1.0 + OutParameter + + + + + Combien avez-vous d'enfants à charge ? + + + + + 1 + 25 + + Decimal + + fr.insee + jjinpzje-RDOP-jjioyaql + 1.0 + + + + + fr.insee + jjio3k4v + 1.0 + + ANNEEJEUNE + + + fr.insee + jjio3k4v-QOP-jjiovwol + 1.0 + + ANNEEJEUNE + + + + + fr.insee + jjio3k4v-RDOP-jjiovwol + 1.0 + OutParameter + + + fr.insee + jjio3k4v-QOP-jjiovwol + 1.0 + OutParameter + + + + + Quelle est l'année de naissance du plus jeune (ou de + l'enfant s'il n'y en a qu'un) ? + + + + + 1960 + 2019 + + Decimal + + fr.insee + jjio3k4v-RDOP-jjiovwol + 1.0 + + + + fr.insee + jp2t8dsf + 1.0 + + + + Si vous n'avez qu'un enfant à charge, passez + à la question 67. + $NBENFANTS$ = 1 + jp2u3e8k + + + + + + + fr.insee + jjintpi8 + 1.0 + + ANNEEAINE + + + fr.insee + jjintpi8-QOP-jjioptu5 + 1.0 + + ANNEEAINE + + + + + fr.insee + jjintpi8-RDOP-jjioptu5 + 1.0 + OutParameter + + + fr.insee + jjintpi8-QOP-jjioptu5 + 1.0 + OutParameter + + + + + Quelle est l'année de naissance du plus âgé ? + + + + + 1960 + 2019 + + Decimal + + fr.insee + jjintpi8-RDOP-jjioptu5 + 1.0 + + + + + fr.insee + jp2u3e8k + 1.0 + + NATIONALITE + + + fr.insee + jp2u3e8k-QOP-jp2tp7le + 1.0 + + NATIONALITE + + + + + fr.insee + jp2u3e8k-RDOP-jp2tp7le + 1.0 + OutParameter + + + fr.insee + jp2u3e8k-QOP-jp2tp7le + 1.0 + OutParameter + + + + + Quelle est votre nationalité ? + + + + checkbox + + fr.insee + jp2u21aa + 1.0 + CodeList + + + fr.insee + jp2u3e8k-RDOP-jp2tp7le + 1.0 + + + fr.insee + jp2u21aa + 1.0 + CodeList + + + + + + + fr.insee + jp2uhtl5 + 1.0 + + + + Si vous êtes né(e) français(e), passez à la + question 69. + $NATIONALITE$ = '1' + jjiokcqs + + + + + + fr.insee + jp2tx20k + 1.0 + Instruction + + + + fr.insee + jjioktcf + 1.0 + + NATIONAISS + + + fr.insee + jjioktcf-QOP-jjip19t2 + 1.0 + + NATIONAISS + + + + + fr.insee + jjioktcf-RDOP-jjip19t2 + 1.0 + OutParameter + + + fr.insee + jjioktcf-QOP-jjip19t2 + 1.0 + OutParameter + + + + + Si vous n’êtes pas Français de naissance, précisez votre + nationalité à la naissance : + + + + drop-down-list + + fr.insee + jL_NATIONALITE + 1.0 + CodeList + + + fr.insee + jjioktcf-RDOP-jjip19t2 + 1.0 + + + fr.insee + jL_NATIONALITE + 1.0 + CodeList + + + + + + + fr.insee + jp2tvhdo + 1.0 + Instruction + + + + fr.insee + jjiokcqs + 1.0 + + LIEUNAISS + + + fr.insee + jjiokcqs-QOP-jjip1s8w + 1.0 + + LIEUNAISS + + + + + fr.insee + jjiokcqs-RDOP-jjip1s8w + 1.0 + OutParameter + + + fr.insee + jjiokcqs-QOP-jjip1s8w + 1.0 + OutParameter + + + + + Où êtes-vous né ? + + + + checkbox + + fr.insee + jjioig73 + 1.0 + CodeList + + + fr.insee + jjiokcqs-RDOP-jjip1s8w + 1.0 + + + fr.insee + jjioig73 + 1.0 + CodeList + + + + + + + fr.insee + js329yn4 + 1.0 + + + + Si vous êtes né(e) en France, passez à la + question 71. + $LIEUNAISS$ = '1' or $LIEUNAISS$ + ='2' + jjioti5q + + + + + + + fr.insee + js329wn3 + 1.0 + + PAYSNAISS + + + fr.insee + js329wn3-QOP-js32r76t + 1.0 + + PAYSNAISS + + + + + fr.insee + js329wn3-RDOP-js32r76t + 1.0 + OutParameter + + + fr.insee + js329wn3-QOP-js32r76t + 1.0 + OutParameter + + + + + Si vous n'êtes pas né en France, précisez votre pays de + naissance : + + + + drop-down-list + + fr.insee + jL_PAYS + 1.0 + CodeList + + + fr.insee + js329wn3-RDOP-js32r76t + 1.0 + + + fr.insee + jL_PAYS + 1.0 + CodeList + + + + + + + fr.insee + js32jdng + 1.0 + Instruction + + + + fr.insee + jjioti5q + 1.0 + + LIEUNAISSPAR + + + fr.insee + jjioti5q-QOP-jjip8k3v + 1.0 + + LIEUNAISSPAR + + + + + fr.insee + jjioti5q-RDOP-jjip8k3v + 1.0 + OutParameter + + + fr.insee + jjioti5q-QOP-jjip8k3v + 1.0 + OutParameter + + + + + Où sont nés vos parents ? + + + + checkbox + + fr.insee + jjiosiky + 1.0 + CodeList + + + fr.insee + jjioti5q-RDOP-jjip8k3v + 1.0 + + + fr.insee + jjiosiky + 1.0 + CodeList + + + + + + + + fr.insee + jjfqblut + 1.0 + + RAISPROMO + + + fr.insee + jjfqblut-QOP-jui26ui6 + 1.0 + + RAISPROMO_1 + + + + fr.insee + jjfqblut-QOP-jui1nx58 + 1.0 + + RAISPROMO_2 + + + + fr.insee + jjfqblut-QOP-jui1mbam + 1.0 + + RAISPROMO_3 + + + + fr.insee + jjfqblut-QOP-jui269od + 1.0 + + RAISPROMO_4 + + + + fr.insee + jjfqblut-QOP-jui228y2 + 1.0 + + RAISPROMO_A + + + + fr.insee + jjfqblut-QOP-jprecisez + 1.0 + + RAISONPROMO_A_LIB + + + + + fr.insee + jjfqblut-RDOP-jui26ui6 + 1.0 + OutParameter + + + fr.insee + jjfqblut-QOP-jui26ui6 + 1.0 + OutParameter + + + + + fr.insee + jjfqblut-RDOP-jui1nx58 + 1.0 + OutParameter + + + fr.insee + jjfqblut-QOP-jui1nx58 + 1.0 + OutParameter + + + + + fr.insee + jjfqblut-RDOP-jui1mbam + 1.0 + OutParameter + + + fr.insee + jjfqblut-QOP-jui1mbam + 1.0 + OutParameter + + + + + fr.insee + jjfqblut-RDOP-jui269od + 1.0 + OutParameter + + + fr.insee + jjfqblut-QOP-jui269od + 1.0 + OutParameter + + + + + fr.insee + jjfqblut-RDOP-jui228y2 + 1.0 + OutParameter + + + fr.insee + jjfqblut-QOP-jui228y2 + 1.0 + OutParameter + + + + + fr.insee + jjfqblut-RDOP-jprecisez + 1.0 + OutParameter + + + fr.insee + jjfqblut-QOP-jprecisez + 1.0 + OutParameter + + + + + Lorsque vous avez bénéficié d'une ou plusieurs + promotions, comment avez-vous obtenu ce(s) changement(s) de corps ? + + + + + + fr.insee + jjfqpl9t + 1.0 + CodeList + + + + + + + + fr.insee + jjfqblut-RDOP-jui26ui6 + 1.0 + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 1.0 + Code + + + + + + + + + + + + + + + + + + fr.insee + jjfqblut-RDOP-jui1nx58 + 1.0 + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 1.0 + Code + + + + + + + + + + + + + + + + + + fr.insee + jjfqblut-RDOP-jui1mbam + 1.0 + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 1.0 + Code + + + + + + + + + + + + + + + + + + fr.insee + jjfqblut-RDOP-jui269od + 1.0 + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 1.0 + Code + + + + + + + + + + + + + + + + + + fr.insee + jjfqblut-RDOP-jui228y2 + 1.0 + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 1.0 + Code + + + + + + + + + + + + + + + + + + Précisez : + + + fr.insee + jjfqblut-RDOP-jprecisez + 1 + + + + + + + + + + + 1 + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 0.1.0 + Code + + + + + + fr.insee + jjfq9ozv + 1.0 + Instruction + + + + fr.insee + joyk2rvl + 1.0 + + RAISON_TP + + + fr.insee + joyk2rvl-QOP-jui1zfaf + 1.0 + + TP_CHOISI + + + + fr.insee + joyk2rvl-QOP-jui1wh9z + 1.0 + + TP_SUBI + + + + + fr.insee + joyk2rvl-RDOP-jui1zfaf + 1.0 + OutParameter + + + fr.insee + joyk2rvl-QOP-jui1zfaf + 1.0 + OutParameter + + + + + fr.insee + joyk2rvl-RDOP-jui1wh9z + 1.0 + OutParameter + + + fr.insee + joyk2rvl-QOP-jui1wh9z + 1.0 + OutParameter + + + + + Qui a été à l'initiative de cette demande de temps partiel ? + + + + + + fr.insee + joykgc7w + 1.0 + CodeList + + + + + + + + fr.insee + joyk2rvl-RDOP-jui1zfaf + 1.0 + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 1.0 + Code + + + + + + + + + + + + + + + + + + fr.insee + joyk2rvl-RDOP-jui1wh9z + 1.0 + + + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 1.0 + Code + + + + + + + + + + + + + + + + + fr.insee + joykhisr + 1.0 + Instruction + + + + fr.insee + jjfr6a91 + 1.0 + + INTERRUPTION + + + fr.insee + jjfr6a91-QOP-jui1od9s + 1.0 + + INTERR_1 + + + + fr.insee + jjfr6a91-QOP-jui1vq3t + 1.0 + + INTERR_2 + + + + fr.insee + jjfr6a91-QOP-jui1ue62 + 1.0 + + INTERR_3 + + + + + fr.insee + jjfr6a91-RDOP-jui1od9s + 1.0 + OutParameter + + + fr.insee + jjfr6a91-QOP-jui1od9s + 1.0 + OutParameter + + + + + fr.insee + jjfr6a91-RDOP-jui1vq3t + 1.0 + OutParameter + + + fr.insee + jjfr6a91-QOP-jui1vq3t + 1.0 + OutParameter + + + + + fr.insee + jjfr6a91-RDOP-jui1ue62 + 1.0 + OutParameter + + + fr.insee + jjfr6a91-QOP-jui1ue62 + 1.0 + OutParameter + + + + + + Depuis votre entrée dans la fonction publique, avez-vous déjà + interrompu votre carrière sur une période d’au moins 6 mois consécutifs + ? + + + + + + + fr.insee + jo9uhdgp + 1.0 + CodeList + + + + + + + checkbox + + fr.insee + ji4e0b4b + 1.0 + CodeList + + + fr.insee + jjfr6a91-RDOP-jui1od9s + 1.0 + + + fr.insee + ji4e0b4b + 1.0 + CodeList + + + + + + + + + + + + + + checkbox + + fr.insee + ji4e0b4b + 1.0 + CodeList + + + fr.insee + jjfr6a91-RDOP-jui1vq3t + 1.0 + + + fr.insee + ji4e0b4b + 1.0 + CodeList + + + + + + + + + + + + + + checkbox + + fr.insee + ji4e0b4b + 1.0 + CodeList + + + fr.insee + jjfr6a91-RDOP-jui1ue62 + 1.0 + + + fr.insee + ji4e0b4b + 1.0 + CodeList + + + + + + + + + + + + + + fr.insee + jrkiguvz + 1.0 + + + + Si vous avez interrompu votre carrière pour une des raisons ci-dessus, précisez la durée de cette ou de ces interruptions, sinon passez à la question 40. + $INTERR_1$ ='2' + jjzcm9q0 + + + + + + fr.insee + jrkj5rve + 1.0 + + + + + $INTERR_2$ ='2' + jjzcr77v + + + + + + fr.insee + jvc5dcaz + 1.0 + + + + + $INTERR_3$ ='2' + jjfrrtwf + + + + + + + fr.insee + jp2tn1vq + 1.0 + + EMPL_PAR + + + fr.insee + jp2tn1vq-QOP-jui1t03s + 1.0 + + PERE + + + + fr.insee + jp2tn1vq-QOP-jui1nr60 + 1.0 + + MERE + + + + + fr.insee + jp2tn1vq-RDOP-jui1t03s + 1.0 + OutParameter + + + fr.insee + jp2tn1vq-QOP-jui1t03s + 1.0 + OutParameter + + + + + fr.insee + jp2tn1vq-RDOP-jui1nr60 + 1.0 + OutParameter + + + fr.insee + jp2tn1vq-QOP-jui1nr60 + 1.0 + OutParameter + + + + + + Est-ce que vos parents travaillent ou ont travaillé dans la fonction + publique ? + + + + + + + fr.insee + jp2trkr0 + 1.0 + CodeList + + + + + + + checkbox + + fr.insee + jub8ymq5 + 1.0 + CodeList + + + fr.insee + jp2tn1vq-RDOP-jui1t03s + 1.0 + + + fr.insee + jub8ymq5 + 1.0 + CodeList + + + + + + + + + + + + + + checkbox + + fr.insee + jub8ymq5 + 1.0 + CodeList + + + fr.insee + jp2tn1vq-RDOP-jui1nr60 + 1.0 + + + fr.insee + jub8ymq5 + 1.0 + CodeList + + + + + + + + + + + + + + + + fr.insee + CategoryScheme-ji4e0b4b + 1.0 + + L_OUINON + + + fr.insee + CA-ji4e0b4b--1 + 1.0 + + Oui + + + + fr.insee + CA-ji4e0b4b-0 + 1.0 + + Non + + + + + fr.insee + CategoryScheme-ji4k33ri + 1.0 + + L_RAISDEP + + + fr.insee + CA-ji4k33ri--1 + 1.0 + + Changement d'administration + + + + fr.insee + CA-ji4k33ri-0 + 1.0 + + Départ à la retraite + + + + fr.insee + CA-ji4k33ri-1 + 1.0 + + Départ définitif de la fonction publique (fin de contrat, + démission...) + + + + fr.insee + CA-ji4k33ri-2 + 1.0 + + Disponibilité ou autre sortie temporaire + (détachement...) + + + + fr.insee + CA-ji4k33ri-3 + 1.0 + + Autre + + + + + fr.insee + CategoryScheme-jn5y8tek + 1.0 + + L_DIP + + + fr.insee + CA-jn5y8tek--1 + 1.0 + + + Aucun diplôme, certificat d'études primaires + + + + + fr.insee + CA-jn5y8tek-0 + 1.0 + + + Brevet des collèges ou diplôme de niveau équivalent + (BEPC, brevet élémentaire, diplôme national du brevet, etc.) + + + + + fr.insee + CA-jn5y8tek-1 + 1.0 + + + CAP, BEP ou diplôme de niveau équivalent + + + + + fr.insee + CA-jn5y8tek-2 + 1.0 + + + Baccalauréat général, technologique, professionnel ou + diplôme de niveau équivalent (brevet supérieur, capacité en droit, DAEU, ESEU, + brevet professionnel, de technicien ou d'enseignement, etc.) + + + + + fr.insee + CA-jn5y8tek-3 + 1.0 + + + BTS, DUT, Deug, diplôme ou titre équivalent de niveau + bac+2 (Deust, diplôme de la santé ou du social, etc.) + + + + + fr.insee + CA-jn5y8tek-4 + 1.0 + + + Licence, maîtrise, diplôme ou titre équivalent de + niveau bac+3 ou bac+4 (Licence pro, Master 1, etc.) + + + + + fr.insee + CA-jn5y8tek-5 + 1.0 + + + Master, DEA, DESS, diplôme grande école, doctorat de + santé, diplôme ou titre équivalent de niveau bac+5 (Master 2, + etc.) + + + + + fr.insee + CA-jn5y8tek-6 + 1.0 + + + Doctorat de recherche (hors santé) ou HDR + + + + + + fr.insee + CategoryScheme-ji4m4x9l + 1.0 + + L_SECTEUR + + + fr.insee + CA-ji4m4x9l--1 + 1.0 + + Privé + + + + fr.insee + CA-ji4m4x9l-0 + 1.0 + + Public + + + + + fr.insee + CategoryScheme-ji4mpfcj + 1.0 + + L_TYPFP + + + fr.insee + CA-ji4mpfcj--1 + 1.0 + + État + + + + fr.insee + CA-ji4mpfcj-0 + 1.0 + + Territoriale + + + + fr.insee + CA-ji4mpfcj-1 + 1.0 + + Hospitalière + + + + + fr.insee + CategoryScheme-ji5x0f32 + 1.0 + + L_VOIEENTREE + + + fr.insee + CA-ji5x0f32--1 + 1.0 + + Par concours externe ou concours sur titre + + + + fr.insee + CA-ji5x0f32-0 + 1.0 + + Par concours unique + + + + fr.insee + CA-ji5x0f32-1 + 1.0 + + Par 3ème concours + + + + fr.insee + CA-ji5x0f32-2 + 1.0 + + + Sans concours : non-titulaires (contractuels/vacataires/auxiliaires), + Pacte, recrutement externe sans concours + etc. + + + + + + fr.insee + CategoryScheme-jn64rn0g + 1.0 + + L_TypePoste + + + fr.insee + CA-jn64rn0g--1 + 1.0 + + + Fonctionnaire titulaire (dont fonctionnaire + stagiaire) ou militaire + + + + + fr.insee + CA-jn64rn0g-0 + 1.0 + + Non-titulaire (y compris contractuel en CDI ou CDD, + vacataire ou auxiliaire), ouvrier d’état ou autre statut + + + + fr.insee + CA-jn64rn0g-1 + 1.0 + + En contrat aidé + + + + + fr.insee + CategoryScheme-jjfpp3rw + 1.0 + + L_VOIETITULARISATION + + + fr.insee + CA-jjfpp3rw--1 + 1.0 + + Par un concours + + + + fr.insee + CA-jjfpp3rw-0 + 1.0 + + Par plans/lois de titularisation Durafour 1990, Perben + 1996, Sapin 2001, Sauvadet 2012 + + + + fr.insee + CA-jjfpp3rw-1 + 1.0 + + Par un autre moyen + + + + + fr.insee + CategoryScheme-jjfpo4vp + 1.0 + + L_CATEGORIE1 + + + fr.insee + CA-jjfpo4vp--1 + 1.0 + + A + + + + fr.insee + CA-jjfpo4vp-0 + 1.0 + + B + + + + fr.insee + CA-jjfpo4vp-1 + 1.0 + + C + + + + fr.insee + CA-jjfpo4vp-2 + 1.0 + + D + + + + + fr.insee + CategoryScheme-jm6gc2nv + 1.0 + + L_DEPTFP + + + fr.insee + CA-jm6gc2nv--1 + 1.0 + + En France métropolitaine ou dans un DOM + + + + fr.insee + CA-jm6gc2nv-0 + 1.0 + + À l'étranger, dans une COM, un TOM ou dans un autre + territoire + + + + + fr.insee + CategoryScheme-jjfq9tsq + 1.0 + + L_CATEGORIE2 + + + fr.insee + CA-jjfq9tsq--1 + 1.0 + + A + + + + fr.insee + CA-jjfq9tsq-0 + 1.0 + + B + + + + fr.insee + CA-jjfq9tsq-1 + 1.0 + + C + + + + + fr.insee + CategoryScheme-jjfqpl9t + 1.0 + + L_RAISPROMO + + + fr.insee + CA-jjfqpl9t--1 + 1.0 + + Grâce à la réussite d’un ou plusieurs concours ou examens + professionnels + + + + fr.insee + CA-jjfqpl9t-0 + 1.0 + + + «Au choix», sur proposition de votre hiérarchie (en CAP par exemple) + + + + + fr.insee + CA-jjfqpl9t-1 + 1.0 + + Par protocole d’accord de 1990 « Plan Durafour » avec + passage automatique de D en C + + + + fr.insee + CA-jjfqpl9t-2 + 1.0 + + Par intégration des instituteurs dans le corps des + professeurs des écoles (passage de B en A) + + + + fr.insee + CA-jjfqpl9t-3 + 1.0 + + Autre + + + + + fr.insee + CategoryScheme-joykgc7w + 1.0 + + L_RAISON_TP + + + fr.insee + CA-joykgc7w--1 + 1.0 + + + Vous êtes à l'initiative de cette demande + + + + + fr.insee + CA-joykgc7w-0 + 1.0 + + Votre administration vous en a fait la + demande + + + + + fr.insee + CategoryScheme-joykfudt + 1.0 + + L_TELETRAV + + + fr.insee + CA-joykfudt--1 + 1.0 + + Non + + + + fr.insee + CA-joykfudt-0 + 1.0 + + Quelques jours ou demi-journées par mois + + + + fr.insee + CA-joykfudt-1 + 1.0 + + 1 jour par semaine + + + + fr.insee + CA-joykfudt-2 + 1.0 + + 2 jours par semaine + + + + fr.insee + CA-joykfudt-3 + 1.0 + + 3 jours par semaine ou plus + + + + + fr.insee + CategoryScheme-jo9uhdgp + 1.0 + + INTERRUPTION + + + fr.insee + CA-jo9uhdgp--1 + 1.0 + + + - Pour vous occuper de vos enfants (hors congés maternité ou + paternité) + + + + + fr.insee + CA-jo9uhdgp-0 + 1.0 + + - Pour travailler hors de la fonction + publique + + + + fr.insee + CA-jo9uhdgp-1 + 1.0 + + - Pour une autre raison (hors formations) + + + + + fr.insee + CategoryScheme-js33gq97 + 1.0 + + L_INDIC_ENSEIGN + + + fr.insee + CA-js33gq97--1 + 1.0 + + Oui, sans décharge totale + + + + fr.insee + CA-js33gq97-0 + 1.0 + + Oui, avec décharge totale + + + + fr.insee + CA-js33gq97-1 + 1.0 + + Non + + + + + fr.insee + CategoryScheme-jozdqrw6 + 1.0 + + L_TPS_TRAV + + + fr.insee + CA-jozdqrw6--1 + 1.0 + + À temps plein + + + + fr.insee + CA-jozdqrw6-0 + 1.0 + + À temps partiel + + + + + fr.insee + CategoryScheme-jp2splv8 + 1.0 + + L_CONJOINT + + + fr.insee + CA-jp2splv8--1 + 1.0 + + Oui, en tant qu'enseignant + + + + fr.insee + CA-jp2splv8-0 + 1.0 + + Oui, mais pas en tant qu'enseignant + + + + fr.insee + CA-jp2splv8-1 + 1.0 + + Non (secteur privé, chômage, retraite...) + + + + + fr.insee + CategoryScheme-jp2u21aa + 1.0 + + L_Nation + + + fr.insee + CA-jp2u21aa--1 + 1.0 + + Vous êtes né(e) français(e) + + + + fr.insee + CA-jp2u21aa-0 + 1.0 + + Vous êtes devenu(e) français(e) (par exemple : par + naturalisation, par déclaration, à votre majorité) + + + + fr.insee + CA-jp2u21aa-1 + 1.0 + + Vous êtes étranger + + + + + fr.insee + CategoryScheme-jjioig73 + 1.0 + + L_LIEUNAISS + + + fr.insee + CA-jjioig73--1 + 1.0 + + En France, en métropole + + + + fr.insee + CA-jjioig73-0 + 1.0 + + En France, en outre-mer ou dans un autre + territoire + + + + fr.insee + CA-jjioig73-1 + 1.0 + + À l'étranger + + + + + fr.insee + CategoryScheme-jjiosiky + 1.0 + + L_LIEUNAISSPAR + + + fr.insee + CA-jjiosiky--1 + 1.0 + + Vos deux parents sont nés en France (y compris outre-mer + ou autre territoire) + + + + fr.insee + CA-jjiosiky-0 + 1.0 + + Un de vos parents est né à l’étranger + + + + fr.insee + CA-jjiosiky-1 + 1.0 + + Vos deux parents sont nés à l’étranger + + + + fr.insee + CA-jjiosiky-2 + 1.0 + + Ne sais pas + + + + + fr.insee + CategoryScheme-jp2trkr0 + 1.0 + + L_PARENTS_TRAV + + + fr.insee + CA-jp2trkr0--1 + 1.0 + + Votre père + + + + fr.insee + CA-jp2trkr0-0 + 1.0 + + Votre mère + + + + + fr.insee + CategoryScheme-jub8ymq5 + 1.0 + + L_OUINON_NSP + + + fr.insee + CA-jub8ymq5--1 + 1.0 + + Oui + + + + fr.insee + CA-jub8ymq5-0 + 1.0 + + Non + + + + fr.insee + CA-jub8ymq5-1 + 1.0 + + Ne sais pas + + + + + fr.insee + CategoryScheme-ji4df4oc5 + 1.0 + + A définir + + + fr.insee + INSEE-COMMUN-CA-Booleen-1 + 1.0 + + + + + + + fr.insee + CategoryScheme-jL_DEPT + 1.0 + + L_DEPT + + + fr.insee + CA-jL_DEPT-1 + 0.1.0 + + 01-Ain + + + + fr.insee + CA-jL_DEPT-2 + 0.1.0 + + 02-Aisne + + + + fr.insee + CA-jL_DEPT-3 + 0.1.0 + + 03-Allier + + + + fr.insee + CA-jL_DEPT-4 + 0.1.0 + + 04-Alpes-de-Haute-Provence + + + + fr.insee + CA-jL_DEPT-5 + 0.1.0 + + 05-Hautes-Alpes + + + + fr.insee + CA-jL_DEPT-6 + 0.1.0 + + 06-Alpes-Maritimes + + + + fr.insee + CA-jL_DEPT-7 + 0.1.0 + + 07-Ardèche + + + + fr.insee + CA-jL_DEPT-8 + 0.1.0 + + 08-Ardennes + + + + fr.insee + CA-jL_DEPT-9 + 0.1.0 + + 09-Ariège + + + + fr.insee + CA-jL_DEPT-10 + 0.1.0 + + 10-Aube + + + + fr.insee + CA-jL_DEPT-11 + 0.1.0 + + 11-Aude + + + + fr.insee + CA-jL_DEPT-12 + 0.1.0 + + 12-Aveyron + + + + fr.insee + CA-jL_DEPT-13 + 0.1.0 + + 13-Bouches-du-Rhône + + + + fr.insee + CA-jL_DEPT-14 + 0.1.0 + + 14-Calvados + + + + fr.insee + CA-jL_DEPT-15 + 0.1.0 + + 15-Cantal + + + + fr.insee + CA-jL_DEPT-16 + 0.1.0 + + 16-Charente + + + + fr.insee + CA-jL_DEPT-17 + 0.1.0 + + 17-Charente-Maritime + + + + fr.insee + CA-jL_DEPT-18 + 0.1.0 + + 18-Cher + + + + fr.insee + CA-jL_DEPT-19 + 0.1.0 + + 19-Corrèze + + + + fr.insee + CA-jL_DEPT-20 + 0.1.0 + + 21-Côte-d'Or + + + + fr.insee + CA-jL_DEPT-21 + 0.1.0 + + 22-Côtes-d'Armor + + + + fr.insee + CA-jL_DEPT-22 + 0.1.0 + + 23-Creuse + + + + fr.insee + CA-jL_DEPT-23 + 0.1.0 + + 24-Dordogne + + + + fr.insee + CA-jL_DEPT-24 + 0.1.0 + + 25-Doubs + + + + fr.insee + CA-jL_DEPT-25 + 0.1.0 + + 26-Drôme + + + + fr.insee + CA-jL_DEPT-26 + 0.1.0 + + 27-Eure + + + + fr.insee + CA-jL_DEPT-27 + 0.1.0 + + 28-Eure-et-Loir + + + + fr.insee + CA-jL_DEPT-28 + 0.1.0 + + 29-Finistère + + + + fr.insee + CA-jL_DEPT-29 + 0.1.0 + + 2A-Corse-du-Sud + + + + fr.insee + CA-jL_DEPT-30 + 0.1.0 + + 2B-Haute-Corse + + + + fr.insee + CA-jL_DEPT-31 + 0.1.0 + + 30-Gard + + + + fr.insee + CA-jL_DEPT-32 + 0.1.0 + + 31-Haute-Garonne + + + + fr.insee + CA-jL_DEPT-33 + 0.1.0 + + 32-Gers + + + + fr.insee + CA-jL_DEPT-34 + 0.1.0 + + 33-Gironde + + + + fr.insee + CA-jL_DEPT-35 + 0.1.0 + + 34-Hérault + + + + fr.insee + CA-jL_DEPT-36 + 0.1.0 + + 35-Ille-et-Vilaine + + + + fr.insee + CA-jL_DEPT-37 + 0.1.0 + + 36-Indre + + + + fr.insee + CA-jL_DEPT-38 + 0.1.0 + + 37-Indre-et-Loire + + + + fr.insee + CA-jL_DEPT-39 + 0.1.0 + + 38-Isère + + + + fr.insee + CA-jL_DEPT-40 + 0.1.0 + + 39-Jura + + + + fr.insee + CA-jL_DEPT-41 + 0.1.0 + + 40-Landes + + + + fr.insee + CA-jL_DEPT-42 + 0.1.0 + + 41-Loir-et-Cher + + + + fr.insee + CA-jL_DEPT-43 + 0.1.0 + + 42-Loire + + + + fr.insee + CA-jL_DEPT-44 + 0.1.0 + + 43-Haute-Loire + + + + fr.insee + CA-jL_DEPT-45 + 0.1.0 + + 44-Loire-Atlantique + + + + fr.insee + CA-jL_DEPT-46 + 0.1.0 + + 45-Loiret + + + + fr.insee + CA-jL_DEPT-47 + 0.1.0 + + 46-Lot + + + + fr.insee + CA-jL_DEPT-48 + 0.1.0 + + 47-Lot-et-Garonne + + + + fr.insee + CA-jL_DEPT-49 + 0.1.0 + + 48-Lozère + + + + fr.insee + CA-jL_DEPT-50 + 0.1.0 + + 49-Maine-et-Loire + + + + fr.insee + CA-jL_DEPT-51 + 0.1.0 + + 50-Manche + + + + fr.insee + CA-jL_DEPT-52 + 0.1.0 + + 51-Marne + + + + fr.insee + CA-jL_DEPT-53 + 0.1.0 + + 52-Haute-Marne + + + + fr.insee + CA-jL_DEPT-54 + 0.1.0 + + 53-Mayenne + + + + fr.insee + CA-jL_DEPT-55 + 0.1.0 + + 54-Meurthe-et-Moselle + + + + fr.insee + CA-jL_DEPT-56 + 0.1.0 + + 55-Meuse + + + + fr.insee + CA-jL_DEPT-57 + 0.1.0 + + 56-Morbihan + + + + fr.insee + CA-jL_DEPT-58 + 0.1.0 + + 57-Moselle + + + + fr.insee + CA-jL_DEPT-59 + 0.1.0 + + 58-Nièvre + + + + fr.insee + CA-jL_DEPT-60 + 0.1.0 + + 59-Nord + + + + fr.insee + CA-jL_DEPT-61 + 0.1.0 + + 60-Oise + + + + fr.insee + CA-jL_DEPT-62 + 0.1.0 + + 61-Orne + + + + fr.insee + CA-jL_DEPT-63 + 0.1.0 + + 62-Pas-de-Calais + + + + fr.insee + CA-jL_DEPT-64 + 0.1.0 + + 63-Puy-de-Dôme + + + + fr.insee + CA-jL_DEPT-65 + 0.1.0 + + 64-Pyrénées-Atlantiques + + + + fr.insee + CA-jL_DEPT-66 + 0.1.0 + + 65-Hautes-Pyrénées + + + + fr.insee + CA-jL_DEPT-67 + 0.1.0 + + 66-Pyrénées-Orientales + + + + fr.insee + CA-jL_DEPT-68 + 0.1.0 + + 67-Bas-Rhin + + + + fr.insee + CA-jL_DEPT-69 + 0.1.0 + + 68-Haut-Rhin + + + + fr.insee + CA-jL_DEPT-70 + 0.1.0 + + 69-Rhône + + + + fr.insee + CA-jL_DEPT-71 + 0.1.0 + + 70-Haute-Saône + + + + fr.insee + CA-jL_DEPT-72 + 0.1.0 + + 71-Saône-et-Loire + + + + fr.insee + CA-jL_DEPT-73 + 0.1.0 + + 72-Sarthe + + + + fr.insee + CA-jL_DEPT-74 + 0.1.0 + + 73-Savoie + + + + fr.insee + CA-jL_DEPT-75 + 0.1.0 + + 74-Haute-Savoie + + + + fr.insee + CA-jL_DEPT-76 + 0.1.0 + + 75-Paris + + + + fr.insee + CA-jL_DEPT-77 + 0.1.0 + + 76-Seine-Maritime + + + + fr.insee + CA-jL_DEPT-78 + 0.1.0 + + 77-Seine-et-Marne + + + + fr.insee + CA-jL_DEPT-79 + 0.1.0 + + 78-Yvelines + + + + fr.insee + CA-jL_DEPT-80 + 0.1.0 + + 79-Deux-Sèvres + + + + fr.insee + CA-jL_DEPT-81 + 0.1.0 + + 80-Somme + + + + fr.insee + CA-jL_DEPT-82 + 0.1.0 + + 81-Tarn + + + + fr.insee + CA-jL_DEPT-83 + 0.1.0 + + 82-Tarn-et-Garonne + + + + fr.insee + CA-jL_DEPT-84 + 0.1.0 + + 83-Var + + + + fr.insee + CA-jL_DEPT-85 + 0.1.0 + + 84-Vaucluse + + + + fr.insee + CA-jL_DEPT-86 + 0.1.0 + + 85-Vendée + + + + fr.insee + CA-jL_DEPT-87 + 0.1.0 + + 86-Vienne + + + + fr.insee + CA-jL_DEPT-88 + 0.1.0 + + 87-Haute-Vienne + + + + fr.insee + CA-jL_DEPT-89 + 0.1.0 + + 88-Vosges + + + + fr.insee + CA-jL_DEPT-90 + 0.1.0 + + 89-Yonne + + + + fr.insee + CA-jL_DEPT-91 + 0.1.0 + + 90-Territoire de Belfort + + + + fr.insee + CA-jL_DEPT-92 + 0.1.0 + + 91-Essonne + + + + fr.insee + CA-jL_DEPT-93 + 0.1.0 + + 92-Hauts-de-Seine + + + + fr.insee + CA-jL_DEPT-94 + 0.1.0 + + 93-Seine-Saint-Denis + + + + fr.insee + CA-jL_DEPT-95 + 0.1.0 + + 94-Val-de-Marne + + + + fr.insee + CA-jL_DEPT-96 + 0.1.0 + + 95-Val-d'Oise + + + + fr.insee + CA-jL_DEPT-97 + 0.1.0 + + 971-Guadeloupe + + + + fr.insee + CA-jL_DEPT-98 + 0.1.0 + + 972-Martinique + + + + fr.insee + CA-jL_DEPT-99 + 0.1.0 + + 973-Guyane + + + + fr.insee + CA-jL_DEPT-100 + 0.1.0 + + 974-La Réunion + + + + fr.insee + CA-jL_DEPT-101 + 0.1.0 + + 976-Mayotte + + + + + fr.insee + CategoryScheme-jL_PAYS + 1.0 + + L_PAYS + + + fr.insee + CA-jL_PAYS-1 + 0.1.0 + + ABU DHABI, ABOU DABI + + + + fr.insee + CA-jL_PAYS-2 + 0.1.0 + + AÇORES + + + + fr.insee + CA-jL_PAYS-3 + 0.1.0 + + ADJMAN + + + + fr.insee + CA-jL_PAYS-4 + 0.1.0 + + AFGHANISTAN + + + + fr.insee + CA-jL_PAYS-5 + 0.1.0 + + AFRIQUE DU SUD + + + + fr.insee + CA-jL_PAYS-6 + 0.1.0 + + ALBANIE + + + + fr.insee + CA-jL_PAYS-7 + 0.1.0 + + ALGERIE + + + + fr.insee + CA-jL_PAYS-8 + 0.1.0 + + ALLEMAGNE, EX-RFA, EX-RDA + + + + fr.insee + CA-jL_PAYS-9 + 0.1.0 + + ANDORRE + + + + fr.insee + CA-jL_PAYS-10 + 0.1.0 + + ANGLETERRE + + + + fr.insee + CA-jL_PAYS-11 + 0.1.0 + + ANGOLA + + + + fr.insee + CA-jL_PAYS-12 + 0.1.0 + + ANGUILLA + + + + fr.insee + CA-jL_PAYS-13 + 0.1.0 + + ANTIGUA ET BARBUDA + + + + fr.insee + CA-jL_PAYS-14 + 0.1.0 + + ANTILLES NEERLANDAISES + + + + fr.insee + CA-jL_PAYS-15 + 0.1.0 + + ARABIE SAOUDITE + + + + fr.insee + CA-jL_PAYS-16 + 0.1.0 + + ARGENTINE + + + + fr.insee + CA-jL_PAYS-17 + 0.1.0 + + ARMENIE (EX-URSS) + + + + fr.insee + CA-jL_PAYS-18 + 0.1.0 + + ARUBA + + + + fr.insee + CA-jL_PAYS-19 + 0.1.0 + + AUSTRALIE + + + + fr.insee + CA-jL_PAYS-20 + 0.1.0 + + AUTRICHE + + + + fr.insee + CA-jL_PAYS-21 + 0.1.0 + + AZERBAÏDJAN (EX-URSS) + + + + fr.insee + CA-jL_PAYS-22 + 0.1.0 + + BAHAMAS + + + + fr.insee + CA-jL_PAYS-23 + 0.1.0 + + BAHREIN + + + + fr.insee + CA-jL_PAYS-24 + 0.1.0 + + BANGLADESH + + + + fr.insee + CA-jL_PAYS-25 + 0.1.0 + + BARBADE + + + + fr.insee + CA-jL_PAYS-26 + 0.1.0 + + BELGIQUE + + + + fr.insee + CA-jL_PAYS-27 + 0.1.0 + + BELIZE + + + + fr.insee + CA-jL_PAYS-28 + 0.1.0 + + BENIN + + + + fr.insee + CA-jL_PAYS-29 + 0.1.0 + + BERMUDES + + + + fr.insee + CA-jL_PAYS-30 + 0.1.0 + + BHOUTAN, BHUTAN + + + + fr.insee + CA-jL_PAYS-31 + 0.1.0 + + BIELORUSSIE, BELARUS (EX-URSS) + + + + fr.insee + CA-jL_PAYS-32 + 0.1.0 + + BOLIVIE + + + + fr.insee + CA-jL_PAYS-33 + 0.1.0 + + BONAIRE + + + + fr.insee + CA-jL_PAYS-34 + 0.1.0 + + BOSNIE-HERZEGOVINE (EX-YOUGOSLAVIE) + + + + fr.insee + CA-jL_PAYS-35 + 0.1.0 + + BOTSWANA + + + + fr.insee + CA-jL_PAYS-36 + 0.1.0 + + BRESIL + + + + fr.insee + CA-jL_PAYS-37 + 0.1.0 + + BRETAGNE + + + + fr.insee + CA-jL_PAYS-38 + 0.1.0 + + BRUNEI + + + + fr.insee + CA-jL_PAYS-39 + 0.1.0 + + BULGARIE + + + + fr.insee + CA-jL_PAYS-40 + 0.1.0 + + BURKINA FASO + + + + fr.insee + CA-jL_PAYS-41 + 0.1.0 + + BURUNDI + + + + fr.insee + CA-jL_PAYS-42 + 0.1.0 + + CABINDA + + + + fr.insee + CA-jL_PAYS-43 + 0.1.0 + + CAMBODGE + + + + fr.insee + CA-jL_PAYS-44 + 0.1.0 + + CAMEROUN + + + + fr.insee + CA-jL_PAYS-45 + 0.1.0 + + CANADA + + + + fr.insee + CA-jL_PAYS-46 + 0.1.0 + + CANARIES + + + + fr.insee + CA-jL_PAYS-47 + 0.1.0 + + CAP-VERT + + + + fr.insee + CA-jL_PAYS-48 + 0.1.0 + + CEUTA ET MELILA + + + + fr.insee + CA-jL_PAYS-49 + 0.1.0 + + CHARDJA + + + + fr.insee + CA-jL_PAYS-50 + 0.1.0 + + CHILI + + + + fr.insee + CA-jL_PAYS-51 + 0.1.0 + + CHYPRE + + + + fr.insee + CA-jL_PAYS-52 + 0.1.0 + + COLOMBIE + + + + fr.insee + CA-jL_PAYS-53 + 0.1.0 + + COMORES + + + + fr.insee + CA-jL_PAYS-54 + 0.1.0 + + CORSE + + + + fr.insee + CA-jL_PAYS-55 + 0.1.0 + + COSTA RICA + + + + fr.insee + CA-jL_PAYS-56 + 0.1.0 + + COTE-D'IVOIRE + + + + fr.insee + CA-jL_PAYS-57 + 0.1.0 + + CRETE + + + + fr.insee + CA-jL_PAYS-58 + 0.1.0 + + CROATIE (EX-YOUGOSLAVIE) + + + + fr.insee + CA-jL_PAYS-59 + 0.1.0 + + CUBA + + + + fr.insee + CA-jL_PAYS-60 + 0.1.0 + + CURAÇAO + + + + fr.insee + CA-jL_PAYS-61 + 0.1.0 + + DAGUESTAN + + + + fr.insee + CA-jL_PAYS-62 + 0.1.0 + + DANEMARK + + + + fr.insee + CA-jL_PAYS-63 + 0.1.0 + + DJIBOUTI + + + + fr.insee + CA-jL_PAYS-64 + 0.1.0 + + DOMINIQUE + + + + fr.insee + CA-jL_PAYS-65 + 0.1.0 + + DUBAÏ, DOUBAÏ + + + + fr.insee + CA-jL_PAYS-66 + 0.1.0 + + ECOSSE + + + + fr.insee + CA-jL_PAYS-67 + 0.1.0 + + EGYPTE + + + + fr.insee + CA-jL_PAYS-68 + 0.1.0 + + EL SALVADOR + + + + fr.insee + CA-jL_PAYS-69 + 0.1.0 + + EMIRATS ARABES UNIS + + + + fr.insee + CA-jL_PAYS-70 + 0.1.0 + + EQUATEUR + + + + fr.insee + CA-jL_PAYS-71 + 0.1.0 + + ERYTHREE + + + + fr.insee + CA-jL_PAYS-72 + 0.1.0 + + ESPAGNE + + + + fr.insee + CA-jL_PAYS-73 + 0.1.0 + + ESTONIE (EX-URSS) + + + + fr.insee + CA-jL_PAYS-74 + 0.1.0 + + ETATS-UNIS D'AMERIQUE, USA, EU + + + + fr.insee + CA-jL_PAYS-75 + 0.1.0 + + ETHIOPIE + + + + fr.insee + CA-jL_PAYS-76 + 0.1.0 + + FIDJI + + + + fr.insee + CA-jL_PAYS-77 + 0.1.0 + + FINLANDE + + + + fr.insee + CA-jL_PAYS-78 + 0.1.0 + + FRANCE + + + + fr.insee + CA-jL_PAYS-79 + 0.1.0 + + FUDJAYRA, FOUDJAÏRAH + + + + fr.insee + CA-jL_PAYS-80 + 0.1.0 + + GABON + + + + fr.insee + CA-jL_PAYS-81 + 0.1.0 + + GAMBIE + + + + fr.insee + CA-jL_PAYS-82 + 0.1.0 + + GEORGIE (EX-URSS) + + + + fr.insee + CA-jL_PAYS-83 + 0.1.0 + + GEORGIE DU SUD + + + + fr.insee + CA-jL_PAYS-84 + 0.1.0 + + GHANA + + + + fr.insee + CA-jL_PAYS-85 + 0.1.0 + + GIBRALTAR + + + + fr.insee + CA-jL_PAYS-86 + 0.1.0 + + GRANDE-BRETAGNE + + + + fr.insee + CA-jL_PAYS-87 + 0.1.0 + + GRECE + + + + fr.insee + CA-jL_PAYS-88 + 0.1.0 + + GRENADE + + + + fr.insee + CA-jL_PAYS-89 + 0.1.0 + + GROENLAND + + + + fr.insee + CA-jL_PAYS-90 + 0.1.0 + + GUADELOUPE + + + + fr.insee + CA-jL_PAYS-91 + 0.1.0 + + GUAM + + + + fr.insee + CA-jL_PAYS-92 + 0.1.0 + + GUATEMALA + + + + fr.insee + CA-jL_PAYS-93 + 0.1.0 + + GUERNESEY + + + + fr.insee + CA-jL_PAYS-94 + 0.1.0 + + GUINEE EQUATORIALE + + + + fr.insee + CA-jL_PAYS-95 + 0.1.0 + + GUINEE-BISSAO + + + + fr.insee + CA-jL_PAYS-96 + 0.1.0 + + GUYANA + + + + fr.insee + CA-jL_PAYS-97 + 0.1.0 + + GUYANE FRANÇAISE + + + + fr.insee + CA-jL_PAYS-98 + 0.1.0 + + HAITI + + + + fr.insee + CA-jL_PAYS-99 + 0.1.0 + + HONDURAS + + + + fr.insee + CA-jL_PAYS-100 + 0.1.0 + + HONG-KONG + + + + fr.insee + CA-jL_PAYS-101 + 0.1.0 + + HONGRIE + + + + fr.insee + CA-jL_PAYS-102 + 0.1.0 + + ILE DE L'ASCENSION + + + + fr.insee + CA-jL_PAYS-103 + 0.1.0 + + ILE DE MAN + + + + fr.insee + CA-jL_PAYS-104 + 0.1.0 + + ILE MAURICE + + + + fr.insee + CA-jL_PAYS-105 + 0.1.0 + + ILE PITCAIRN + + + + fr.insee + CA-jL_PAYS-106 + 0.1.0 + + ILES ANGLO-NORMANDES + + + + fr.insee + CA-jL_PAYS-107 + 0.1.0 + + ILES BOUVET + + + + fr.insee + CA-jL_PAYS-108 + 0.1.0 + + ILES CAYMAN + + + + fr.insee + CA-jL_PAYS-109 + 0.1.0 + + ILES CHAGOS + + + + fr.insee + CA-jL_PAYS-110 + 0.1.0 + + ILES CHRISTMAS + + + + fr.insee + CA-jL_PAYS-111 + 0.1.0 + + ILES COCOS, KEELING + + + + fr.insee + CA-jL_PAYS-112 + 0.1.0 + + ILES COOK + + + + fr.insee + CA-jL_PAYS-113 + 0.1.0 + + ILES DE TOKELAU + + + + fr.insee + CA-jL_PAYS-114 + 0.1.0 + + ILES FALKLAND, MALOUINES + + + + fr.insee + CA-jL_PAYS-115 + 0.1.0 + + ILES FEROE + + + + fr.insee + CA-jL_PAYS-116 + 0.1.0 + + ILES HEARD, MAC DONALD + + + + fr.insee + CA-jL_PAYS-117 + 0.1.0 + + ILES KIRIBATI, GILBERT + + + + fr.insee + CA-jL_PAYS-118 + 0.1.0 + + ILES MARIANNES + + + + fr.insee + CA-jL_PAYS-119 + 0.1.0 + + ILES MARSHALL + + + + fr.insee + CA-jL_PAYS-120 + 0.1.0 + + ILES NORFOLK + + + + fr.insee + CA-jL_PAYS-121 + 0.1.0 + + ILES SALOMON + + + + fr.insee + CA-jL_PAYS-122 + 0.1.0 + + ILES SANDWICH DU SUD + + + + fr.insee + CA-jL_PAYS-123 + 0.1.0 + + ILES TRISTAN DE CUNHA + + + + fr.insee + CA-jL_PAYS-124 + 0.1.0 + + ILES TURKS ET CAÏQUES, TURKS ET CAÏCOS + + + + fr.insee + CA-jL_PAYS-125 + 0.1.0 + + ILES VIERGES AMERICAINES + + + + fr.insee + CA-jL_PAYS-126 + 0.1.0 + + ILES VIERGES BRITANNIQUES + + + + fr.insee + CA-jL_PAYS-127 + 0.1.0 + + ILES WAKE, JOHNSTON + + + + fr.insee + CA-jL_PAYS-128 + 0.1.0 + + INDE + + + + fr.insee + CA-jL_PAYS-129 + 0.1.0 + + INDONESIE + + + + fr.insee + CA-jL_PAYS-130 + 0.1.0 + + IRAN + + + + fr.insee + CA-jL_PAYS-131 + 0.1.0 + + IRAQ, IRAK + + + + fr.insee + CA-jL_PAYS-132 + 0.1.0 + + IRLANDE DU NORD (ULSTER) + + + + fr.insee + CA-jL_PAYS-133 + 0.1.0 + + IRLANDE, EIRE + + + + fr.insee + CA-jL_PAYS-134 + 0.1.0 + + ISLANDE + + + + fr.insee + CA-jL_PAYS-135 + 0.1.0 + + ISRAËL + + + + fr.insee + CA-jL_PAYS-136 + 0.1.0 + + ITALIE + + + + fr.insee + CA-jL_PAYS-137 + 0.1.0 + + JAMAÏQUE + + + + fr.insee + CA-jL_PAYS-138 + 0.1.0 + + JAPON + + + + fr.insee + CA-jL_PAYS-139 + 0.1.0 + + JERSEY + + + + fr.insee + CA-jL_PAYS-140 + 0.1.0 + + JORDANIE + + + + fr.insee + CA-jL_PAYS-141 + 0.1.0 + + KABYLIE + + + + fr.insee + CA-jL_PAYS-142 + 0.1.0 + + KANAKIE + + + + fr.insee + CA-jL_PAYS-143 + 0.1.0 + + KAZAKHSTAN (EX-URSS) + + + + fr.insee + CA-jL_PAYS-144 + 0.1.0 + + KENYA + + + + fr.insee + CA-jL_PAYS-145 + 0.1.0 + + KIRGHIZISTAN, KIRGHIZIE (EX-URSS) + + + + fr.insee + CA-jL_PAYS-146 + 0.1.0 + + KOSOVO + + + + fr.insee + CA-jL_PAYS-147 + 0.1.0 + + KOWEÏT + + + + fr.insee + CA-jL_PAYS-148 + 0.1.0 + + KURDISTAN (IRAQ) + + + + fr.insee + CA-jL_PAYS-149 + 0.1.0 + + KURDISTAN (TURQUIE) + + + + fr.insee + CA-jL_PAYS-150 + 0.1.0 + + LAOS + + + + fr.insee + CA-jL_PAYS-151 + 0.1.0 + + LESOTHO + + + + fr.insee + CA-jL_PAYS-152 + 0.1.0 + + LETTONIE (EX-URSS) + + + + fr.insee + CA-jL_PAYS-153 + 0.1.0 + + LIBAN + + + + fr.insee + CA-jL_PAYS-154 + 0.1.0 + + LIBERIA + + + + fr.insee + CA-jL_PAYS-155 + 0.1.0 + + LIBYE + + + + fr.insee + CA-jL_PAYS-156 + 0.1.0 + + LIECHTENSTEIN + + + + fr.insee + CA-jL_PAYS-157 + 0.1.0 + + LITUANIE (EX-URSS) + + + + fr.insee + CA-jL_PAYS-158 + 0.1.0 + + LUXEMBOURG + + + + fr.insee + CA-jL_PAYS-159 + 0.1.0 + + MACAO + + + + fr.insee + CA-jL_PAYS-160 + 0.1.0 + + MACEDOINE (EX-YOUGOSLAVIE) + + + + fr.insee + CA-jL_PAYS-161 + 0.1.0 + + MADAGASCAR + + + + fr.insee + CA-jL_PAYS-162 + 0.1.0 + + MADERE + + + + fr.insee + CA-jL_PAYS-163 + 0.1.0 + + MALAISIE + + + + fr.insee + CA-jL_PAYS-164 + 0.1.0 + + MALAWI + + + + fr.insee + CA-jL_PAYS-165 + 0.1.0 + + MALDIVES + + + + fr.insee + CA-jL_PAYS-166 + 0.1.0 + + MALI + + + + fr.insee + CA-jL_PAYS-167 + 0.1.0 + + MALTE + + + + fr.insee + CA-jL_PAYS-168 + 0.1.0 + + MAROC + + + + fr.insee + CA-jL_PAYS-169 + 0.1.0 + + MARTINIQUE + + + + fr.insee + CA-jL_PAYS-170 + 0.1.0 + + MAURITANIE + + + + fr.insee + CA-jL_PAYS-171 + 0.1.0 + + MAYOTTE + + + + fr.insee + CA-jL_PAYS-172 + 0.1.0 + + MEXIQUE + + + + fr.insee + CA-jL_PAYS-173 + 0.1.0 + + MICRONESIE + + + + fr.insee + CA-jL_PAYS-174 + 0.1.0 + + MOLDAVIE (EX-URSS) + + + + fr.insee + CA-jL_PAYS-175 + 0.1.0 + + MONACO + + + + fr.insee + CA-jL_PAYS-176 + 0.1.0 + + MONGOLIE + + + + fr.insee + CA-jL_PAYS-177 + 0.1.0 + + MONTENEGRO + + + + fr.insee + CA-jL_PAYS-178 + 0.1.0 + + MONTSERRAT + + + + fr.insee + CA-jL_PAYS-179 + 0.1.0 + + MOZAMBIQUE + + + + fr.insee + CA-jL_PAYS-180 + 0.1.0 + + MYANMAR, BIRMANIE + + + + fr.insee + CA-jL_PAYS-181 + 0.1.0 + + NAMIBIE + + + + fr.insee + CA-jL_PAYS-182 + 0.1.0 + + NAURU + + + + fr.insee + CA-jL_PAYS-183 + 0.1.0 + + NEPAL + + + + fr.insee + CA-jL_PAYS-184 + 0.1.0 + + NICARAGUA + + + + fr.insee + CA-jL_PAYS-185 + 0.1.0 + + NIGER + + + + fr.insee + CA-jL_PAYS-186 + 0.1.0 + + NIGERIA + + + + fr.insee + CA-jL_PAYS-187 + 0.1.0 + + NIUE, SAVAGE + + + + fr.insee + CA-jL_PAYS-188 + 0.1.0 + + NORVEGE + + + + fr.insee + CA-jL_PAYS-189 + 0.1.0 + + NOUVELLE-CALEDONIE + + + + fr.insee + CA-jL_PAYS-190 + 0.1.0 + + NOUVELLE-ZELANDE + + + + fr.insee + CA-jL_PAYS-191 + 0.1.0 + + OMAN + + + + fr.insee + CA-jL_PAYS-192 + 0.1.0 + + OUGANDA + + + + fr.insee + CA-jL_PAYS-193 + 0.1.0 + + OUZBEKISTAN, UZBEKISTAN (EX-URSS) + + + + fr.insee + CA-jL_PAYS-194 + 0.1.0 + + PAKISTAN + + + + fr.insee + CA-jL_PAYS-195 + 0.1.0 + + PALESTINE + + + + fr.insee + CA-jL_PAYS-196 + 0.1.0 + + PANAMA + + + + fr.insee + CA-jL_PAYS-197 + 0.1.0 + + PAPOUASIE-NOUVELLE-GUINEE + + + + fr.insee + CA-jL_PAYS-198 + 0.1.0 + + PARAGUAY + + + + fr.insee + CA-jL_PAYS-199 + 0.1.0 + + PAYS BASQUE (ESPAGNE) + + + + fr.insee + CA-jL_PAYS-200 + 0.1.0 + + PAYS BASQUE (FRANCE) + + + + fr.insee + CA-jL_PAYS-201 + 0.1.0 + + PAYS-BAS, HOLLANDE + + + + fr.insee + CA-jL_PAYS-202 + 0.1.0 + + PAYS-DE-GALLES + + + + fr.insee + CA-jL_PAYS-203 + 0.1.0 + + PEROU + + + + fr.insee + CA-jL_PAYS-204 + 0.1.0 + + PHILIPPINES + + + + fr.insee + CA-jL_PAYS-205 + 0.1.0 + + POLOGNE + + + + fr.insee + CA-jL_PAYS-206 + 0.1.0 + + POLYNESIE FRANÇAISE + + + + fr.insee + CA-jL_PAYS-207 + 0.1.0 + + PORTO RICO + + + + fr.insee + CA-jL_PAYS-208 + 0.1.0 + + PORTUGAL + + + + fr.insee + CA-jL_PAYS-209 + 0.1.0 + + QATAR + + + + fr.insee + CA-jL_PAYS-210 + 0.1.0 + + QUEBEC + + + + fr.insee + CA-jL_PAYS-211 + 0.1.0 + + RAS AL-KHAYMA, RAS AL KHAÏMAH + + + + fr.insee + CA-jL_PAYS-212 + 0.1.0 + + REP. DEMOCRATIQUE DU CONGO, EX-ZAÏRE + + + + fr.insee + CA-jL_PAYS-213 + 0.1.0 + + REP. FED. DE YOUGOSLAVIE (EX-YOUGOSLAVIE) + + + + fr.insee + CA-jL_PAYS-214 + 0.1.0 + + REP. POP. DEM. DE COREE, COREE DU NORD + + + + fr.insee + CA-jL_PAYS-215 + 0.1.0 + + REPUBLIQUE CENTRAFRICAINE RCA + + + + fr.insee + CA-jL_PAYS-216 + 0.1.0 + + REPUBLIQUE DE COREE, COREE DU SUD + + + + fr.insee + CA-jL_PAYS-217 + 0.1.0 + + REPUBLIQUE DE GUINEE + + + + fr.insee + CA-jL_PAYS-218 + 0.1.0 + + REPUBLIQUE DE SAINT-MARIN + + + + fr.insee + CA-jL_PAYS-219 + 0.1.0 + + REPUBLIQUE DES ILES PALAOS, PALAU, BELAU + + + + fr.insee + CA-jL_PAYS-220 + 0.1.0 + + REPUBLIQUE DOMINICAINE + + + + fr.insee + CA-jL_PAYS-221 + 0.1.0 + + REPUBLIQUE DU CONGO + + + + fr.insee + CA-jL_PAYS-222 + 0.1.0 + + REPUBLIQUE POPULAIRE DE CHINE + + + + fr.insee + CA-jL_PAYS-223 + 0.1.0 + + REPUBLIQUE TCHEQUE (EX-TCHECOSLOVAQUIE) + + + + fr.insee + CA-jL_PAYS-224 + 0.1.0 + + REUNION + + + + fr.insee + CA-jL_PAYS-225 + 0.1.0 + + ROUMANIE + + + + fr.insee + CA-jL_PAYS-226 + 0.1.0 + + ROYAUME-UNI + + + + fr.insee + CA-jL_PAYS-227 + 0.1.0 + + RUSSIE (EX-URSS) + + + + fr.insee + CA-jL_PAYS-228 + 0.1.0 + + RWANDA, RUANDA + + + + fr.insee + CA-jL_PAYS-229 + 0.1.0 + + SABA + + + + fr.insee + CA-jL_PAYS-230 + 0.1.0 + + SAHARA OCCIDENTAL + + + + fr.insee + CA-jL_PAYS-231 + 0.1.0 + + SAINT-BARTHELEMY + + + + fr.insee + CA-jL_PAYS-232 + 0.1.0 + + SAINT-EUSTACHE + + + + fr.insee + CA-jL_PAYS-233 + 0.1.0 + + SAINT-KITTS ET NEVIS + + + + fr.insee + CA-jL_PAYS-234 + 0.1.0 + + SAINT-MARTIN + + + + fr.insee + CA-jL_PAYS-235 + 0.1.0 + + SAINT-PIERRE ET MIQUELON + + + + fr.insee + CA-jL_PAYS-236 + 0.1.0 + + SAINT-VINCENT-ET-LES-GRENADINES + + + + fr.insee + CA-jL_PAYS-237 + 0.1.0 + + SAINTE-HELENE + + + + fr.insee + CA-jL_PAYS-238 + 0.1.0 + + SAINTE-LUCIE + + + + fr.insee + CA-jL_PAYS-239 + 0.1.0 + + SAMOA AMERICAINES, SAMOA ORIENTALES + + + + fr.insee + CA-jL_PAYS-240 + 0.1.0 + + SAMOA OCCIDENTALES + + + + fr.insee + CA-jL_PAYS-241 + 0.1.0 + + SAO TOME-ET-PRINCIPE + + + + fr.insee + CA-jL_PAYS-242 + 0.1.0 + + SARDAIGNE + + + + fr.insee + CA-jL_PAYS-243 + 0.1.0 + + SENEGAL + + + + fr.insee + CA-jL_PAYS-244 + 0.1.0 + + SERBIE + + + + fr.insee + CA-jL_PAYS-245 + 0.1.0 + + SEYCHELLES + + + + fr.insee + CA-jL_PAYS-246 + 0.1.0 + + SICILE + + + + fr.insee + CA-jL_PAYS-247 + 0.1.0 + + SIERRA LEONE + + + + fr.insee + CA-jL_PAYS-248 + 0.1.0 + + SINGAPOUR + + + + fr.insee + CA-jL_PAYS-249 + 0.1.0 + + SINT MAARTEN, SAINT-MARTIN (NEERLANDAISE) + + + + fr.insee + CA-jL_PAYS-250 + 0.1.0 + + SLOVAQUIE (EX-TCHECOSLOVAQUIE) + + + + fr.insee + CA-jL_PAYS-251 + 0.1.0 + + SLOVENIE (EX-YOUGOSLAVIE) + + + + fr.insee + CA-jL_PAYS-252 + 0.1.0 + + SOMALIE + + + + fr.insee + CA-jL_PAYS-253 + 0.1.0 + + SOUDAN + + + + fr.insee + CA-jL_PAYS-254 + 0.1.0 + + SRI LANKA, CEYLAN + + + + fr.insee + CA-jL_PAYS-255 + 0.1.0 + + SUEDE + + + + fr.insee + CA-jL_PAYS-256 + 0.1.0 + + SUISSE + + + + fr.insee + CA-jL_PAYS-257 + 0.1.0 + + SURINAM + + + + fr.insee + CA-jL_PAYS-258 + 0.1.0 + + SVALBARD, SPITSBERG, ILE JAN MAYEN + + + + fr.insee + CA-jL_PAYS-259 + 0.1.0 + + SWAZILAND + + + + fr.insee + CA-jL_PAYS-260 + 0.1.0 + + SYRIE + + + + fr.insee + CA-jL_PAYS-261 + 0.1.0 + + TADJIKISTAN (EX-URSS) + + + + fr.insee + CA-jL_PAYS-262 + 0.1.0 + + TAIWAN, FORMOSE + + + + fr.insee + CA-jL_PAYS-263 + 0.1.0 + + TANZANIE + + + + fr.insee + CA-jL_PAYS-264 + 0.1.0 + + TCHAD + + + + fr.insee + CA-jL_PAYS-265 + 0.1.0 + + TCHECOSLOVAQUIE + + + + fr.insee + CA-jL_PAYS-266 + 0.1.0 + + TCHETCHENIE + + + + fr.insee + CA-jL_PAYS-267 + 0.1.0 + + TERRES AUSTRALES FRANÇAISES + + + + fr.insee + CA-jL_PAYS-268 + 0.1.0 + + TERRITOIRE ANTARCTIQUE BRITANNIQUE + + + + fr.insee + CA-jL_PAYS-269 + 0.1.0 + + THAILANDE + + + + fr.insee + CA-jL_PAYS-270 + 0.1.0 + + TIBET + + + + fr.insee + CA-jL_PAYS-271 + 0.1.0 + + TIMOR ORIENTAL + + + + fr.insee + CA-jL_PAYS-272 + 0.1.0 + + TOGO + + + + fr.insee + CA-jL_PAYS-273 + 0.1.0 + + TONGA + + + + fr.insee + CA-jL_PAYS-274 + 0.1.0 + + TRANSNISTRIE + + + + fr.insee + CA-jL_PAYS-275 + 0.1.0 + + TRINIDAD ET TOBAGO + + + + fr.insee + CA-jL_PAYS-276 + 0.1.0 + + TUNISIE + + + + fr.insee + CA-jL_PAYS-277 + 0.1.0 + + TURKMENISTAN (EX-URSS) + + + + fr.insee + CA-jL_PAYS-278 + 0.1.0 + + TURQUIE + + + + fr.insee + CA-jL_PAYS-279 + 0.1.0 + + TUVALU + + + + fr.insee + CA-jL_PAYS-280 + 0.1.0 + + U.R.S.S + + + + fr.insee + CA-jL_PAYS-281 + 0.1.0 + + UKRAINE (EX-URSS) + + + + fr.insee + CA-jL_PAYS-282 + 0.1.0 + + UMM AL QAYWAYN, OUM AL QAÏWAÏN + + + + fr.insee + CA-jL_PAYS-283 + 0.1.0 + + URUGUAY + + + + fr.insee + CA-jL_PAYS-284 + 0.1.0 + + VANUATU + + + + fr.insee + CA-jL_PAYS-285 + 0.1.0 + + VATICAN + + + + fr.insee + CA-jL_PAYS-286 + 0.1.0 + + VENEZUELA + + + + fr.insee + CA-jL_PAYS-287 + 0.1.0 + + VIET NAM + + + + fr.insee + CA-jL_PAYS-288 + 0.1.0 + + WALLIS ET FUTUNA + + + + fr.insee + CA-jL_PAYS-289 + 0.1.0 + + YEMEN + + + + fr.insee + CA-jL_PAYS-290 + 0.1.0 + + ZAMBIE + + + + fr.insee + CA-jL_PAYS-291 + 0.1.0 + + ZIMBABWE + + + + + fr.insee + CategoryScheme-jL_NATIONALITE + 1.0 + + L_NATIONALITE + + + fr.insee + CA-jL_NATIONALITE-1 + 0.1.0 + + AFGHANE + + + + fr.insee + CA-jL_NATIONALITE-2 + 0.1.0 + + ALBANAISE + + + + fr.insee + CA-jL_NATIONALITE-3 + 0.1.0 + + ALGERIENNE + + + + fr.insee + CA-jL_NATIONALITE-4 + 0.1.0 + + ALLEMANDE + + + + fr.insee + CA-jL_NATIONALITE-5 + 0.1.0 + + AMERICAINE + + + + fr.insee + CA-jL_NATIONALITE-6 + 0.1.0 + + AMERICAINE SAMOANE + + + + fr.insee + CA-jL_NATIONALITE-7 + 0.1.0 + + ANDORRANE + + + + fr.insee + CA-jL_NATIONALITE-8 + 0.1.0 + + ANGLAISE + + + + fr.insee + CA-jL_NATIONALITE-9 + 0.1.0 + + ANGOLAISE + + + + fr.insee + CA-jL_NATIONALITE-10 + 0.1.0 + + ANTIGUAISE ET BARBUDIENNE + + + + fr.insee + CA-jL_NATIONALITE-11 + 0.1.0 + + APATRIDE (SANS NATIONALITE) + + + + fr.insee + CA-jL_NATIONALITE-12 + 0.1.0 + + ARGENTINE + + + + fr.insee + CA-jL_NATIONALITE-13 + 0.1.0 + + ARMENIENNE + + + + fr.insee + CA-jL_NATIONALITE-14 + 0.1.0 + + AUSTRALIENNE + + + + fr.insee + CA-jL_NATIONALITE-15 + 0.1.0 + + AUTRICHIENNE + + + + fr.insee + CA-jL_NATIONALITE-16 + 0.1.0 + + AZERBAÏDJANAISE + + + + fr.insee + CA-jL_NATIONALITE-17 + 0.1.0 + + BAHAMIENNE + + + + fr.insee + CA-jL_NATIONALITE-18 + 0.1.0 + + BAHREÏNIENNE + + + + fr.insee + CA-jL_NATIONALITE-19 + 0.1.0 + + BANGLADAISE + + + + fr.insee + CA-jL_NATIONALITE-20 + 0.1.0 + + BARBADIENNE + + + + fr.insee + CA-jL_NATIONALITE-21 + 0.1.0 + + BASQUE ESPAGNOLE + + + + fr.insee + CA-jL_NATIONALITE-22 + 0.1.0 + + BASQUE FRANCAISE + + + + fr.insee + CA-jL_NATIONALITE-23 + 0.1.0 + + BELGE + + + + fr.insee + CA-jL_NATIONALITE-24 + 0.1.0 + + BELIZIENNE + + + + fr.insee + CA-jL_NATIONALITE-25 + 0.1.0 + + BENINOISE + + + + fr.insee + CA-jL_NATIONALITE-26 + 0.1.0 + + BHOUTANAISE + + + + fr.insee + CA-jL_NATIONALITE-27 + 0.1.0 + + BIELORUSSE + + + + fr.insee + CA-jL_NATIONALITE-28 + 0.1.0 + + BIRMANE + + + + fr.insee + CA-jL_NATIONALITE-29 + 0.1.0 + + BISSAO-GUINEENNE + + + + fr.insee + CA-jL_NATIONALITE-30 + 0.1.0 + + BOLIVIENNE + + + + fr.insee + CA-jL_NATIONALITE-31 + 0.1.0 + + BOSNIAQUE + + + + fr.insee + CA-jL_NATIONALITE-32 + 0.1.0 + + BOTSWANEENNE + + + + fr.insee + CA-jL_NATIONALITE-33 + 0.1.0 + + BRESILIENNE + + + + fr.insee + CA-jL_NATIONALITE-34 + 0.1.0 + + BRETONNE + + + + fr.insee + CA-jL_NATIONALITE-35 + 0.1.0 + + BRITANNIQUE + + + + fr.insee + CA-jL_NATIONALITE-36 + 0.1.0 + + BRUNÉIENNE + + + + fr.insee + CA-jL_NATIONALITE-37 + 0.1.0 + + BULGARE + + + + fr.insee + CA-jL_NATIONALITE-38 + 0.1.0 + + BURKINABE + + + + fr.insee + CA-jL_NATIONALITE-39 + 0.1.0 + + BURUNDAISE + + + + fr.insee + CA-jL_NATIONALITE-40 + 0.1.0 + + CABINDAISE + + + + fr.insee + CA-jL_NATIONALITE-41 + 0.1.0 + + CAMBODGIENNE + + + + fr.insee + CA-jL_NATIONALITE-42 + 0.1.0 + + CAMEROUNAISE + + + + fr.insee + CA-jL_NATIONALITE-43 + 0.1.0 + + CANADIENNE + + + + fr.insee + CA-jL_NATIONALITE-44 + 0.1.0 + + CAP-VERDIENNE + + + + fr.insee + CA-jL_NATIONALITE-45 + 0.1.0 + + CENTRAFRICAINE + + + + fr.insee + CA-jL_NATIONALITE-46 + 0.1.0 + + CHILIENNE + + + + fr.insee + CA-jL_NATIONALITE-47 + 0.1.0 + + CHINOISE + + + + fr.insee + CA-jL_NATIONALITE-48 + 0.1.0 + + CHYPRIOTE + + + + fr.insee + CA-jL_NATIONALITE-49 + 0.1.0 + + COLOMBIENNE + + + + fr.insee + CA-jL_NATIONALITE-50 + 0.1.0 + + COMORIENNE + + + + fr.insee + CA-jL_NATIONALITE-51 + 0.1.0 + + CONGOLAISE (BRAZZAVILLE) + + + + fr.insee + CA-jL_NATIONALITE-52 + 0.1.0 + + CONGOLAISE ZAÏROISE + + + + fr.insee + CA-jL_NATIONALITE-53 + 0.1.0 + + CORSE + + + + fr.insee + CA-jL_NATIONALITE-54 + 0.1.0 + + COSTARICAINNE + + + + fr.insee + CA-jL_NATIONALITE-55 + 0.1.0 + + CRETOISE + + + + fr.insee + CA-jL_NATIONALITE-56 + 0.1.0 + + CROATE + + + + fr.insee + CA-jL_NATIONALITE-57 + 0.1.0 + + CUBAINE + + + + fr.insee + CA-jL_NATIONALITE-58 + 0.1.0 + + DAGUESTANAISE + + + + fr.insee + CA-jL_NATIONALITE-59 + 0.1.0 + + DANOISE + + + + fr.insee + CA-jL_NATIONALITE-60 + 0.1.0 + + DJIBOUTIENNE + + + + fr.insee + CA-jL_NATIONALITE-61 + 0.1.0 + + DOMINICAINE + + + + fr.insee + CA-jL_NATIONALITE-62 + 0.1.0 + + DOMINIQUAISE + + + + fr.insee + CA-jL_NATIONALITE-63 + 0.1.0 + + ECOSSAISE + + + + fr.insee + CA-jL_NATIONALITE-64 + 0.1.0 + + EGYPTIENNE + + + + fr.insee + CA-jL_NATIONALITE-65 + 0.1.0 + + EMIRIENNE + + + + fr.insee + CA-jL_NATIONALITE-66 + 0.1.0 + + EQUATO-GUINEENNE + + + + fr.insee + CA-jL_NATIONALITE-67 + 0.1.0 + + EQUATORIENNE + + + + fr.insee + CA-jL_NATIONALITE-68 + 0.1.0 + + ERYTHREENNE + + + + fr.insee + CA-jL_NATIONALITE-69 + 0.1.0 + + ESPAGNOLE + + + + fr.insee + CA-jL_NATIONALITE-70 + 0.1.0 + + ESTONIENNE + + + + fr.insee + CA-jL_NATIONALITE-71 + 0.1.0 + + ETHIOPIENNE + + + + fr.insee + CA-jL_NATIONALITE-72 + 0.1.0 + + FIDJIENNE + + + + fr.insee + CA-jL_NATIONALITE-73 + 0.1.0 + + FINLANDAISE FINNOISE + + + + fr.insee + CA-jL_NATIONALITE-74 + 0.1.0 + + FRANCAISE + + + + fr.insee + CA-jL_NATIONALITE-75 + 0.1.0 + + GABONAISE + + + + fr.insee + CA-jL_NATIONALITE-76 + 0.1.0 + + GALLOISE + + + + fr.insee + CA-jL_NATIONALITE-77 + 0.1.0 + + GAMBIENNE + + + + fr.insee + CA-jL_NATIONALITE-78 + 0.1.0 + + GEORGIENNE + + + + fr.insee + CA-jL_NATIONALITE-79 + 0.1.0 + + GHANÉENNE + + + + fr.insee + CA-jL_NATIONALITE-80 + 0.1.0 + + GRECQUE + + + + fr.insee + CA-jL_NATIONALITE-81 + 0.1.0 + + GRENADIENNE + + + + fr.insee + CA-jL_NATIONALITE-82 + 0.1.0 + + GUADELOUPEENNE + + + + fr.insee + CA-jL_NATIONALITE-83 + 0.1.0 + + GUATEMALTEQUE + + + + fr.insee + CA-jL_NATIONALITE-84 + 0.1.0 + + GUINEENNE + + + + fr.insee + CA-jL_NATIONALITE-85 + 0.1.0 + + GUYANAISE + + + + fr.insee + CA-jL_NATIONALITE-86 + 0.1.0 + + GUYANIENNE + + + + fr.insee + CA-jL_NATIONALITE-87 + 0.1.0 + + HAÏTIENNE + + + + fr.insee + CA-jL_NATIONALITE-88 + 0.1.0 + + HONDURIENNE + + + + fr.insee + CA-jL_NATIONALITE-89 + 0.1.0 + + HONGROISE + + + + fr.insee + CA-jL_NATIONALITE-90 + 0.1.0 + + INDIENNE + + + + fr.insee + CA-jL_NATIONALITE-91 + 0.1.0 + + INDONESIENNE + + + + fr.insee + CA-jL_NATIONALITE-92 + 0.1.0 + + IRANIENNE + + + + fr.insee + CA-jL_NATIONALITE-93 + 0.1.0 + + IRAQUIENNE IRAKIENNE + + + + fr.insee + CA-jL_NATIONALITE-94 + 0.1.0 + + IRLANDAISE (EIRE) + + + + fr.insee + CA-jL_NATIONALITE-95 + 0.1.0 + + IRLANDAISE (ULSTER) + + + + fr.insee + CA-jL_NATIONALITE-96 + 0.1.0 + + ISLANDAISE + + + + fr.insee + CA-jL_NATIONALITE-97 + 0.1.0 + + ISRAËLIENNE + + + + fr.insee + CA-jL_NATIONALITE-98 + 0.1.0 + + ITALIENNE + + + + fr.insee + CA-jL_NATIONALITE-99 + 0.1.0 + + IVOIRIENNE + + + + fr.insee + CA-jL_NATIONALITE-100 + 0.1.0 + + JAMAICAINE + + + + fr.insee + CA-jL_NATIONALITE-101 + 0.1.0 + + JAPONAISE + + + + fr.insee + CA-jL_NATIONALITE-102 + 0.1.0 + + JORDANIENNE + + + + fr.insee + CA-jL_NATIONALITE-103 + 0.1.0 + + KABYLE + + + + fr.insee + CA-jL_NATIONALITE-104 + 0.1.0 + + KANAK + + + + fr.insee + CA-jL_NATIONALITE-105 + 0.1.0 + + KAZAKH + + + + fr.insee + CA-jL_NATIONALITE-106 + 0.1.0 + + KÉNYANE + + + + fr.insee + CA-jL_NATIONALITE-107 + 0.1.0 + + KIRGHIZ + + + + fr.insee + CA-jL_NATIONALITE-108 + 0.1.0 + + KIRIBATIENNE + + + + fr.insee + CA-jL_NATIONALITE-109 + 0.1.0 + + KITTITIENNE ET NEVICIENNE + + + + fr.insee + CA-jL_NATIONALITE-110 + 0.1.0 + + KOSOVARDE + + + + fr.insee + CA-jL_NATIONALITE-111 + 0.1.0 + + KOWEÏTIENNE + + + + fr.insee + CA-jL_NATIONALITE-112 + 0.1.0 + + KURDE (IRAQ) + + + + fr.insee + CA-jL_NATIONALITE-113 + 0.1.0 + + KURDE (TURQUIE) + + + + fr.insee + CA-jL_NATIONALITE-114 + 0.1.0 + + LAOTIENNE + + + + fr.insee + CA-jL_NATIONALITE-115 + 0.1.0 + + LESOTHANE + + + + fr.insee + CA-jL_NATIONALITE-116 + 0.1.0 + + LETTONNE + + + + fr.insee + CA-jL_NATIONALITE-117 + 0.1.0 + + LIBANAISE + + + + fr.insee + CA-jL_NATIONALITE-118 + 0.1.0 + + LIBERIENNE + + + + fr.insee + CA-jL_NATIONALITE-119 + 0.1.0 + + LIBYENNE + + + + fr.insee + CA-jL_NATIONALITE-120 + 0.1.0 + + LIECHTENSTEINOISE + + + + fr.insee + CA-jL_NATIONALITE-121 + 0.1.0 + + LITUANIENNE + + + + fr.insee + CA-jL_NATIONALITE-122 + 0.1.0 + + LUXEMBOURGEOISE + + + + fr.insee + CA-jL_NATIONALITE-123 + 0.1.0 + + MACAAISE + + + + fr.insee + CA-jL_NATIONALITE-124 + 0.1.0 + + MACEDONIENNE + + + + fr.insee + CA-jL_NATIONALITE-125 + 0.1.0 + + MALAISIENNE + + + + fr.insee + CA-jL_NATIONALITE-126 + 0.1.0 + + MALAWIENNE + + + + fr.insee + CA-jL_NATIONALITE-127 + 0.1.0 + + MALDIVIENNE + + + + fr.insee + CA-jL_NATIONALITE-128 + 0.1.0 + + MALGACHE + + + + fr.insee + CA-jL_NATIONALITE-129 + 0.1.0 + + MALIENNE + + + + fr.insee + CA-jL_NATIONALITE-130 + 0.1.0 + + MALTAISE + + + + fr.insee + CA-jL_NATIONALITE-131 + 0.1.0 + + MAROCAINE + + + + fr.insee + CA-jL_NATIONALITE-132 + 0.1.0 + + MARSHALLAISE + + + + fr.insee + CA-jL_NATIONALITE-133 + 0.1.0 + + MARTINIQUAISE + + + + fr.insee + CA-jL_NATIONALITE-134 + 0.1.0 + + MAURICIENNE + + + + fr.insee + CA-jL_NATIONALITE-135 + 0.1.0 + + MAURITANIENNE + + + + fr.insee + CA-jL_NATIONALITE-136 + 0.1.0 + + MEXICAINE + + + + fr.insee + CA-jL_NATIONALITE-137 + 0.1.0 + + MICRONESIENNE + + + + fr.insee + CA-jL_NATIONALITE-138 + 0.1.0 + + MOLDAVE + + + + fr.insee + CA-jL_NATIONALITE-139 + 0.1.0 + + MONEGASQUE + + + + fr.insee + CA-jL_NATIONALITE-140 + 0.1.0 + + MONGOLE + + + + fr.insee + CA-jL_NATIONALITE-141 + 0.1.0 + + MONTENEGRAINE + + + + fr.insee + CA-jL_NATIONALITE-142 + 0.1.0 + + MOZAMBICAINE + + + + fr.insee + CA-jL_NATIONALITE-143 + 0.1.0 + + NAMIBIENNE + + + + fr.insee + CA-jL_NATIONALITE-144 + 0.1.0 + + NAURUANE + + + + fr.insee + CA-jL_NATIONALITE-145 + 0.1.0 + + NEERLANDAISE, HOLLANDAISE + + + + fr.insee + CA-jL_NATIONALITE-146 + 0.1.0 + + NEO-CALEDONIENNE + + + + fr.insee + CA-jL_NATIONALITE-147 + 0.1.0 + + NEO-ZELANDAISE + + + + fr.insee + CA-jL_NATIONALITE-148 + 0.1.0 + + NEPALAISE + + + + fr.insee + CA-jL_NATIONALITE-149 + 0.1.0 + + NICARAGUAYENNE + + + + fr.insee + CA-jL_NATIONALITE-150 + 0.1.0 + + NIGERIANE + + + + fr.insee + CA-jL_NATIONALITE-151 + 0.1.0 + + NIGERIENNE + + + + fr.insee + CA-jL_NATIONALITE-152 + 0.1.0 + + NORD-COREENNE + + + + fr.insee + CA-jL_NATIONALITE-153 + 0.1.0 + + NORVEGIENNE + + + + fr.insee + CA-jL_NATIONALITE-154 + 0.1.0 + + OMANAISE + + + + fr.insee + CA-jL_NATIONALITE-155 + 0.1.0 + + OUGANDAISE + + + + fr.insee + CA-jL_NATIONALITE-156 + 0.1.0 + + OUZBEK + + + + fr.insee + CA-jL_NATIONALITE-157 + 0.1.0 + + PAKISTANAIS + + + + fr.insee + CA-jL_NATIONALITE-158 + 0.1.0 + + PALAUANE + + + + fr.insee + CA-jL_NATIONALITE-159 + 0.1.0 + + PALESTINIENNE + + + + fr.insee + CA-jL_NATIONALITE-160 + 0.1.0 + + PANAMEENNE + + + + fr.insee + CA-jL_NATIONALITE-161 + 0.1.0 + + PAPOUAN NEO GUINEENNE + + + + fr.insee + CA-jL_NATIONALITE-162 + 0.1.0 + + PARAGUAYENNE + + + + fr.insee + CA-jL_NATIONALITE-163 + 0.1.0 + + PERUVIENNE + + + + fr.insee + CA-jL_NATIONALITE-164 + 0.1.0 + + PHILIPPINE + + + + fr.insee + CA-jL_NATIONALITE-165 + 0.1.0 + + POLONAISE + + + + fr.insee + CA-jL_NATIONALITE-166 + 0.1.0 + + POLYNESIENNE + + + + fr.insee + CA-jL_NATIONALITE-167 + 0.1.0 + + PORTORICAINE + + + + fr.insee + CA-jL_NATIONALITE-168 + 0.1.0 + + PORTUGAISE + + + + fr.insee + CA-jL_NATIONALITE-169 + 0.1.0 + + PORTUGAISE (ACORES) + + + + fr.insee + CA-jL_NATIONALITE-170 + 0.1.0 + + QATARIENNE + + + + fr.insee + CA-jL_NATIONALITE-171 + 0.1.0 + + QUEBECOISE + + + + fr.insee + CA-jL_NATIONALITE-172 + 0.1.0 + + REUNIONNAISE + + + + fr.insee + CA-jL_NATIONALITE-173 + 0.1.0 + + ROUMAINE + + + + fr.insee + CA-jL_NATIONALITE-174 + 0.1.0 + + RUSSE + + + + fr.insee + CA-jL_NATIONALITE-175 + 0.1.0 + + RWANDAISE + + + + fr.insee + CA-jL_NATIONALITE-176 + 0.1.0 + + SAHARIENNE + + + + fr.insee + CA-jL_NATIONALITE-177 + 0.1.0 + + SAINT-LUCIENNE + + + + fr.insee + CA-jL_NATIONALITE-178 + 0.1.0 + + SAINT-MARINAISE + + + + fr.insee + CA-jL_NATIONALITE-179 + 0.1.0 + + SAINT-VINCENTAISE ET GRENADINE + + + + fr.insee + CA-jL_NATIONALITE-180 + 0.1.0 + + SALOMONAISE + + + + fr.insee + CA-jL_NATIONALITE-181 + 0.1.0 + + SALVADORIENNE + + + + fr.insee + CA-jL_NATIONALITE-182 + 0.1.0 + + SAMOANE + + + + fr.insee + CA-jL_NATIONALITE-183 + 0.1.0 + + SANTOMEENNE + + + + fr.insee + CA-jL_NATIONALITE-184 + 0.1.0 + + SAOUDIENNE + + + + fr.insee + CA-jL_NATIONALITE-185 + 0.1.0 + + SARDE + + + + fr.insee + CA-jL_NATIONALITE-186 + 0.1.0 + + SENEGALAISE + + + + fr.insee + CA-jL_NATIONALITE-187 + 0.1.0 + + SERBE + + + + fr.insee + CA-jL_NATIONALITE-188 + 0.1.0 + + SEYCHELLOISE + + + + fr.insee + CA-jL_NATIONALITE-189 + 0.1.0 + + SICILIENNE + + + + fr.insee + CA-jL_NATIONALITE-190 + 0.1.0 + + SIERRA-LEONAISE + + + + fr.insee + CA-jL_NATIONALITE-191 + 0.1.0 + + SINGAPOURIENNE + + + + fr.insee + CA-jL_NATIONALITE-192 + 0.1.0 + + SLOVAQUE + + + + fr.insee + CA-jL_NATIONALITE-193 + 0.1.0 + + SLOVENE + + + + fr.insee + CA-jL_NATIONALITE-194 + 0.1.0 + + SOMALIENNE + + + + fr.insee + CA-jL_NATIONALITE-195 + 0.1.0 + + SOUDANAISE + + + + fr.insee + CA-jL_NATIONALITE-196 + 0.1.0 + + SRI-LANKAISE + + + + fr.insee + CA-jL_NATIONALITE-197 + 0.1.0 + + SUD-AFRICAINE + + + + fr.insee + CA-jL_NATIONALITE-198 + 0.1.0 + + SUD-COREENNE + + + + fr.insee + CA-jL_NATIONALITE-199 + 0.1.0 + + SUEDOISE + + + + fr.insee + CA-jL_NATIONALITE-200 + 0.1.0 + + SUISSE + + + + fr.insee + CA-jL_NATIONALITE-201 + 0.1.0 + + SURINAMAISE + + + + fr.insee + CA-jL_NATIONALITE-202 + 0.1.0 + + SWAZI + + + + fr.insee + CA-jL_NATIONALITE-203 + 0.1.0 + + SYRIENNE + + + + fr.insee + CA-jL_NATIONALITE-204 + 0.1.0 + + TADJIK + + + + fr.insee + CA-jL_NATIONALITE-205 + 0.1.0 + + TAÏWANAISE + + + + fr.insee + CA-jL_NATIONALITE-206 + 0.1.0 + + TANZANIENNE + + + + fr.insee + CA-jL_NATIONALITE-207 + 0.1.0 + + TCHADIENNE + + + + fr.insee + CA-jL_NATIONALITE-208 + 0.1.0 + + TCHECOSLOVAQUE + + + + fr.insee + CA-jL_NATIONALITE-209 + 0.1.0 + + TCHEQUE + + + + fr.insee + CA-jL_NATIONALITE-210 + 0.1.0 + + TCHETCHENE + + + + fr.insee + CA-jL_NATIONALITE-211 + 0.1.0 + + THAÏLANDAISE + + + + fr.insee + CA-jL_NATIONALITE-212 + 0.1.0 + + TIBETAINE + + + + fr.insee + CA-jL_NATIONALITE-213 + 0.1.0 + + TIMORIENNE + + + + fr.insee + CA-jL_NATIONALITE-214 + 0.1.0 + + TOGOLAISE + + + + fr.insee + CA-jL_NATIONALITE-215 + 0.1.0 + + TONGUIENNE + + + + fr.insee + CA-jL_NATIONALITE-216 + 0.1.0 + + TRANSNISTRIENNE + + + + fr.insee + CA-jL_NATIONALITE-217 + 0.1.0 + + TRINIDADIENNE + + + + fr.insee + CA-jL_NATIONALITE-218 + 0.1.0 + + TUNISIENNE + + + + fr.insee + CA-jL_NATIONALITE-219 + 0.1.0 + + TURC + + + + fr.insee + CA-jL_NATIONALITE-220 + 0.1.0 + + TURKMENE + + + + fr.insee + CA-jL_NATIONALITE-221 + 0.1.0 + + TUVALUANE + + + + fr.insee + CA-jL_NATIONALITE-222 + 0.1.0 + + UKRAINIENNE + + + + fr.insee + CA-jL_NATIONALITE-223 + 0.1.0 + + URUGUAYENNE + + + + fr.insee + CA-jL_NATIONALITE-224 + 0.1.0 + + VANUATUANE + + + + fr.insee + CA-jL_NATIONALITE-225 + 0.1.0 + + VATICANE + + + + fr.insee + CA-jL_NATIONALITE-226 + 0.1.0 + + VENEZUELIENNE + + + + fr.insee + CA-jL_NATIONALITE-227 + 0.1.0 + + VIETNAMIENNE + + + + fr.insee + CA-jL_NATIONALITE-228 + 0.1.0 + + YEMENITE + + + + fr.insee + CA-jL_NATIONALITE-229 + 0.1.0 + + YOUGOSLAVE + + + + fr.insee + CA-jL_NATIONALITE-230 + 0.1.0 + + ZAMBIENNE + + + + fr.insee + CA-jL_NATIONALITE-231 + 0.1.0 + + ZIMBABWEENNE + + + + + fr.insee + FPE_2018-CLS + 1.0 + + FPE_2018 + + + fr.insee + ji4e0b4b + 1.0 + + L_OUINON + + Regular + + Ordinal + + + fr.insee + ji4e0b4b--1 + 1.0 + + fr.insee + CA-ji4e0b4b--1 + 1.0 + Category + + 1 + + + fr.insee + ji4e0b4b-0 + 1.0 + + fr.insee + CA-ji4e0b4b-0 + 1.0 + Category + + 2 + + + + fr.insee + ji4k33ri + 1.0 + + L_RAISDEP + + Regular + + Ordinal + + + fr.insee + ji4k33ri--1 + 1.0 + + fr.insee + CA-ji4k33ri--1 + 1.0 + Category + + 1 + + + fr.insee + ji4k33ri-0 + 1.0 + + fr.insee + CA-ji4k33ri-0 + 1.0 + Category + + 2 + + + fr.insee + ji4k33ri-1 + 1.0 + + fr.insee + CA-ji4k33ri-1 + 1.0 + Category + + 3 + + + fr.insee + ji4k33ri-2 + 1.0 + + fr.insee + CA-ji4k33ri-2 + 1.0 + Category + + 4 + + + fr.insee + ji4k33ri-3 + 1.0 + + fr.insee + CA-ji4k33ri-3 + 1.0 + Category + + 5 + + + + fr.insee + jn5y8tek + 1.0 + + L_DIP + + Regular + + Ordinal + + + fr.insee + jn5y8tek--1 + 1.0 + + fr.insee + CA-jn5y8tek--1 + 1.0 + Category + + DIP_AUC + + + fr.insee + jn5y8tek-0 + 1.0 + + fr.insee + CA-jn5y8tek-0 + 1.0 + Category + + DIP_BRE + + + fr.insee + jn5y8tek-1 + 1.0 + + fr.insee + CA-jn5y8tek-1 + 1.0 + Category + + DIP_CAP + + + fr.insee + jn5y8tek-2 + 1.0 + + fr.insee + CA-jn5y8tek-2 + 1.0 + Category + + DIP_BAC + + + fr.insee + jn5y8tek-3 + 1.0 + + fr.insee + CA-jn5y8tek-3 + 1.0 + Category + + DIP_BTS + + + fr.insee + jn5y8tek-4 + 1.0 + + fr.insee + CA-jn5y8tek-4 + 1.0 + Category + + DIP_LIC + + + fr.insee + jn5y8tek-5 + 1.0 + + fr.insee + CA-jn5y8tek-5 + 1.0 + Category + + DIP_MAST + + + fr.insee + jn5y8tek-6 + 1.0 + + fr.insee + CA-jn5y8tek-6 + 1.0 + Category + + DIP_DOCT + + + + fr.insee + ji4m4x9l + 1.0 + + L_SECTEUR + + Regular + + Ordinal + + + fr.insee + ji4m4x9l--1 + 1.0 + + fr.insee + CA-ji4m4x9l--1 + 1.0 + Category + + 1 + + + fr.insee + ji4m4x9l-0 + 1.0 + + fr.insee + CA-ji4m4x9l-0 + 1.0 + Category + + 2 + + + + fr.insee + ji4mpfcj + 1.0 + + L_TYPFP + + Regular + + Ordinal + + + fr.insee + ji4mpfcj--1 + 1.0 + + fr.insee + CA-ji4mpfcj--1 + 1.0 + Category + + 1 + + + fr.insee + ji4mpfcj-0 + 1.0 + + fr.insee + CA-ji4mpfcj-0 + 1.0 + Category + + 2 + + + fr.insee + ji4mpfcj-1 + 1.0 + + fr.insee + CA-ji4mpfcj-1 + 1.0 + Category + + 3 + + + + fr.insee + ji5x0f32 + 1.0 + + L_VOIEENTREE + + Regular + + Ordinal + + + fr.insee + ji5x0f32--1 + 1.0 + + fr.insee + CA-ji5x0f32--1 + 1.0 + Category + + 1 + + + fr.insee + ji5x0f32-0 + 1.0 + + fr.insee + CA-ji5x0f32-0 + 1.0 + Category + + 2 + + + fr.insee + ji5x0f32-1 + 1.0 + + fr.insee + CA-ji5x0f32-1 + 1.0 + Category + + 3 + + + fr.insee + ji5x0f32-2 + 1.0 + + fr.insee + CA-ji5x0f32-2 + 1.0 + Category + + 4 + + + + fr.insee + jn64rn0g + 1.0 + + L_TypePoste + + Regular + + Ordinal + + + fr.insee + jn64rn0g--1 + 1.0 + + fr.insee + CA-jn64rn0g--1 + 1.0 + Category + + 1 + + + fr.insee + jn64rn0g-0 + 1.0 + + fr.insee + CA-jn64rn0g-0 + 1.0 + Category + + 2 + + + fr.insee + jn64rn0g-1 + 1.0 + + fr.insee + CA-jn64rn0g-1 + 1.0 + Category + + 3 + + + + fr.insee + jjfpp3rw + 1.0 + + L_VOIETITULARISATION + + Regular + + Ordinal + + + fr.insee + jjfpp3rw--1 + 1.0 + + fr.insee + CA-jjfpp3rw--1 + 1.0 + Category + + 3 + + + fr.insee + jjfpp3rw-0 + 1.0 + + fr.insee + CA-jjfpp3rw-0 + 1.0 + Category + + 2 + + + fr.insee + jjfpp3rw-1 + 1.0 + + fr.insee + CA-jjfpp3rw-1 + 1.0 + Category + + 1 + + + + fr.insee + jjfpo4vp + 1.0 + + L_CATEGORIE1 + + Regular + + Ordinal + + + fr.insee + jjfpo4vp--1 + 1.0 + + fr.insee + CA-jjfpo4vp--1 + 1.0 + Category + + 1 + + + fr.insee + jjfpo4vp-0 + 1.0 + + fr.insee + CA-jjfpo4vp-0 + 1.0 + Category + + 2 + + + fr.insee + jjfpo4vp-1 + 1.0 + + fr.insee + CA-jjfpo4vp-1 + 1.0 + Category + + 3 + + + fr.insee + jjfpo4vp-2 + 1.0 + + fr.insee + CA-jjfpo4vp-2 + 1.0 + Category + + 4 + + + + fr.insee + jm6gc2nv + 1.0 + + L_DEPTFP + + Regular + + Ordinal + + + fr.insee + jm6gc2nv--1 + 1.0 + + fr.insee + CA-jm6gc2nv--1 + 1.0 + Category + + 1 + + + fr.insee + jm6gc2nv-0 + 1.0 + + fr.insee + CA-jm6gc2nv-0 + 1.0 + Category + + 2 + + + + fr.insee + jjfq9tsq + 1.0 + + L_CATEGORIE2 + + Regular + + Ordinal + + + fr.insee + jjfq9tsq--1 + 1.0 + + fr.insee + CA-jjfq9tsq--1 + 1.0 + Category + + 1 + + + fr.insee + jjfq9tsq-0 + 1.0 + + fr.insee + CA-jjfq9tsq-0 + 1.0 + Category + + 2 + + + fr.insee + jjfq9tsq-1 + 1.0 + + fr.insee + CA-jjfq9tsq-1 + 1.0 + Category + + 3 + + + + fr.insee + jjfqpl9t + 1.0 + + L_RAISPROMO + + Regular + + Ordinal + + + fr.insee + jjfqpl9t--1 + 1.0 + + fr.insee + CA-jjfqpl9t--1 + 1.0 + Category + + RAISPROMO_1 + + + fr.insee + jjfqpl9t-0 + 1.0 + + fr.insee + CA-jjfqpl9t-0 + 1.0 + Category + + RAISPROMO_2 + + + fr.insee + jjfqpl9t-1 + 1.0 + + fr.insee + CA-jjfqpl9t-1 + 1.0 + Category + + RAISPROMO_3 + + + fr.insee + jjfqpl9t-2 + 1.0 + + fr.insee + CA-jjfqpl9t-2 + 1.0 + Category + + RAISPROMO_4 + + + fr.insee + jjfqpl9t-3 + 1.0 + + fr.insee + CA-jjfqpl9t-3 + 1.0 + Category + + RAISPROMO_A + + + + fr.insee + joykgc7w + 1.0 + + L_RAISON_TP + + Regular + + Ordinal + + + fr.insee + joykgc7w--1 + 1.0 + + fr.insee + CA-joykgc7w--1 + 1.0 + Category + + TP_CHOISI + + + fr.insee + joykgc7w-0 + 1.0 + + fr.insee + CA-joykgc7w-0 + 1.0 + Category + + TP_SUBI + + + + fr.insee + joykfudt + 1.0 + + L_TELETRAV + + Regular + + Ordinal + + + fr.insee + joykfudt--1 + 1.0 + + fr.insee + CA-joykfudt--1 + 1.0 + Category + + 1 + + + fr.insee + joykfudt-0 + 1.0 + + fr.insee + CA-joykfudt-0 + 1.0 + Category + + 2 + + + fr.insee + joykfudt-1 + 1.0 + + fr.insee + CA-joykfudt-1 + 1.0 + Category + + 3 + + + fr.insee + joykfudt-2 + 1.0 + + fr.insee + CA-joykfudt-2 + 1.0 + Category + + 4 + + + fr.insee + joykfudt-3 + 1.0 + + fr.insee + CA-joykfudt-3 + 1.0 + Category + + 5 + + + + fr.insee + jo9uhdgp + 1.0 + + INTERRUPTION + + Regular + + Ordinal + + + fr.insee + jo9uhdgp--1 + 1.0 + + fr.insee + CA-jo9uhdgp--1 + 1.0 + Category + + INTERR_1 + + + fr.insee + jo9uhdgp-0 + 1.0 + + fr.insee + CA-jo9uhdgp-0 + 1.0 + Category + + INTERR_2 + + + fr.insee + jo9uhdgp-1 + 1.0 + + fr.insee + CA-jo9uhdgp-1 + 1.0 + Category + + INTERR_3 + + + + fr.insee + js33gq97 + 1.0 + + L_INDIC_ENSEIGN + + Regular + + Ordinal + + + fr.insee + js33gq97--1 + 1.0 + + fr.insee + CA-js33gq97--1 + 1.0 + Category + + 1 + + + fr.insee + js33gq97-0 + 1.0 + + fr.insee + CA-js33gq97-0 + 1.0 + Category + + 2 + + + fr.insee + js33gq97-1 + 1.0 + + fr.insee + CA-js33gq97-1 + 1.0 + Category + + 3 + + + + fr.insee + jozdqrw6 + 1.0 + + L_TPS_TRAV + + Regular + + Ordinal + + + fr.insee + jozdqrw6--1 + 1.0 + + fr.insee + CA-jozdqrw6--1 + 1.0 + Category + + 1 + + + fr.insee + jozdqrw6-0 + 1.0 + + fr.insee + CA-jozdqrw6-0 + 1.0 + Category + + 2 + + + + fr.insee + jp2splv8 + 1.0 + + L_CONJOINT + + Regular + + Ordinal + + + fr.insee + jp2splv8--1 + 1.0 + + fr.insee + CA-jp2splv8--1 + 1.0 + Category + + 1 + + + fr.insee + jp2splv8-0 + 1.0 + + fr.insee + CA-jp2splv8-0 + 1.0 + Category + + 2 + + + fr.insee + jp2splv8-1 + 1.0 + + fr.insee + CA-jp2splv8-1 + 1.0 + Category + + 3 + + + + fr.insee + jp2u21aa + 1.0 + + L_Nation + + Regular + + Ordinal + + + fr.insee + jp2u21aa--1 + 1.0 + + fr.insee + CA-jp2u21aa--1 + 1.0 + Category + + 1 + + + fr.insee + jp2u21aa-0 + 1.0 + + fr.insee + CA-jp2u21aa-0 + 1.0 + Category + + 2 + + + fr.insee + jp2u21aa-1 + 1.0 + + fr.insee + CA-jp2u21aa-1 + 1.0 + Category + + 3 + + + + fr.insee + jjioig73 + 1.0 + + L_LIEUNAISS + + Regular + + Ordinal + + + fr.insee + jjioig73--1 + 1.0 + + fr.insee + CA-jjioig73--1 + 1.0 + Category + + 1 + + + fr.insee + jjioig73-0 + 1.0 + + fr.insee + CA-jjioig73-0 + 1.0 + Category + + 2 + + + fr.insee + jjioig73-1 + 1.0 + + fr.insee + CA-jjioig73-1 + 1.0 + Category + + 3 + + + + fr.insee + jjiosiky + 1.0 + + L_LIEUNAISSPAR + + Regular + + Ordinal + + + fr.insee + jjiosiky--1 + 1.0 + + fr.insee + CA-jjiosiky--1 + 1.0 + Category + + 1 + + + fr.insee + jjiosiky-0 + 1.0 + + fr.insee + CA-jjiosiky-0 + 1.0 + Category + + 2 + + + fr.insee + jjiosiky-1 + 1.0 + + fr.insee + CA-jjiosiky-1 + 1.0 + Category + + 3 + + + fr.insee + jjiosiky-2 + 1.0 + + fr.insee + CA-jjiosiky-2 + 1.0 + Category + + 4 + + + + fr.insee + jp2trkr0 + 1.0 + + L_PARENTS_TRAV + + Regular + + Ordinal + + + fr.insee + jp2trkr0--1 + 1.0 + + fr.insee + CA-jp2trkr0--1 + 1.0 + Category + + PERE + + + fr.insee + jp2trkr0-0 + 1.0 + + fr.insee + CA-jp2trkr0-0 + 1.0 + Category + + MERE + + + + fr.insee + jub8ymq5 + 1.0 + + L_OUINON_NSP + + Regular + + Ordinal + + + fr.insee + jub8ymq5--1 + 1.0 + + fr.insee + CA-jub8ymq5--1 + 1.0 + Category + + 1 + + + fr.insee + jub8ymq5-0 + 1.0 + + fr.insee + CA-jub8ymq5-0 + 1.0 + Category + + 2 + + + fr.insee + jub8ymq5-1 + 1.0 + + fr.insee + CA-jub8ymq5-1 + 1.0 + Category + + 3 + + + + fr.insee + INSEE-COMMUN-CL-Booleen + 1.0 + + Booleen + + Regular + + Ordinal + + + fr.insee + INSEE-COMMUN-CL-Booleen-1 + 1.0 + + fr.insee + INSEE-COMMUN-CA-Booleen-1 + 1.0 + Category + + 1 + + + + fr.insee + jL_DEPT + 1.0 + + L_DEPT + + Regular + + Ordinal + + + fr.insee + jL_DEPT-1 + 1.0 + + fr.insee + CA-jL_DEPT-1 + 1.0 + Category + + 01 + + + fr.insee + jL_DEPT-2 + 1.0 + + fr.insee + CA-jL_DEPT-2 + 1.0 + Category + + 02 + + + fr.insee + jL_DEPT-3 + 1.0 + + fr.insee + CA-jL_DEPT-3 + 1.0 + Category + + 03 + + + fr.insee + jL_DEPT-4 + 1.0 + + fr.insee + CA-jL_DEPT-4 + 1.0 + Category + + 04 + + + fr.insee + jL_DEPT-5 + 1.0 + + fr.insee + CA-jL_DEPT-5 + 1.0 + Category + + 05 + + + fr.insee + jL_DEPT-6 + 1.0 + + fr.insee + CA-jL_DEPT-6 + 1.0 + Category + + 06 + + + fr.insee + jL_DEPT-7 + 1.0 + + fr.insee + CA-jL_DEPT-7 + 1.0 + Category + + 07 + + + fr.insee + jL_DEPT-8 + 1.0 + + fr.insee + CA-jL_DEPT-8 + 1.0 + Category + + 08 + + + fr.insee + jL_DEPT-9 + 1.0 + + fr.insee + CA-jL_DEPT-9 + 1.0 + Category + + 09 + + + fr.insee + jL_DEPT-10 + 1.0 + + fr.insee + CA-jL_DEPT-10 + 1.0 + Category + + 10 + + + fr.insee + jL_DEPT-11 + 1.0 + + fr.insee + CA-jL_DEPT-11 + 1.0 + Category + + 11 + + + fr.insee + jL_DEPT-12 + 1.0 + + fr.insee + CA-jL_DEPT-12 + 1.0 + Category + + 12 + + + fr.insee + jL_DEPT-13 + 1.0 + + fr.insee + CA-jL_DEPT-13 + 1.0 + Category + + 13 + + + fr.insee + jL_DEPT-14 + 1.0 + + fr.insee + CA-jL_DEPT-14 + 1.0 + Category + + 14 + + + fr.insee + jL_DEPT-15 + 1.0 + + fr.insee + CA-jL_DEPT-15 + 1.0 + Category + + 15 + + + fr.insee + jL_DEPT-16 + 1.0 + + fr.insee + CA-jL_DEPT-16 + 1.0 + Category + + 16 + + + fr.insee + jL_DEPT-17 + 1.0 + + fr.insee + CA-jL_DEPT-17 + 1.0 + Category + + 17 + + + fr.insee + jL_DEPT-18 + 1.0 + + fr.insee + CA-jL_DEPT-18 + 1.0 + Category + + 18 + + + fr.insee + jL_DEPT-19 + 1.0 + + fr.insee + CA-jL_DEPT-19 + 1.0 + Category + + 19 + + + fr.insee + jL_DEPT-20 + 1.0 + + fr.insee + CA-jL_DEPT-20 + 1.0 + Category + + 21 + + + fr.insee + jL_DEPT-21 + 1.0 + + fr.insee + CA-jL_DEPT-21 + 1.0 + Category + + 22 + + + fr.insee + jL_DEPT-22 + 1.0 + + fr.insee + CA-jL_DEPT-22 + 1.0 + Category + + 23 + + + fr.insee + jL_DEPT-23 + 1.0 + + fr.insee + CA-jL_DEPT-23 + 1.0 + Category + + 24 + + + fr.insee + jL_DEPT-24 + 1.0 + + fr.insee + CA-jL_DEPT-24 + 1.0 + Category + + 25 + + + fr.insee + jL_DEPT-25 + 1.0 + + fr.insee + CA-jL_DEPT-25 + 1.0 + Category + + 26 + + + fr.insee + jL_DEPT-26 + 1.0 + + fr.insee + CA-jL_DEPT-26 + 1.0 + Category + + 27 + + + fr.insee + jL_DEPT-27 + 1.0 + + fr.insee + CA-jL_DEPT-27 + 1.0 + Category + + 28 + + + fr.insee + jL_DEPT-28 + 1.0 + + fr.insee + CA-jL_DEPT-28 + 1.0 + Category + + 29 + + + fr.insee + jL_DEPT-29 + 1.0 + + fr.insee + CA-jL_DEPT-29 + 1.0 + Category + + 2A + + + fr.insee + jL_DEPT-30 + 1.0 + + fr.insee + CA-jL_DEPT-30 + 1.0 + Category + + 2B + + + fr.insee + jL_DEPT-31 + 1.0 + + fr.insee + CA-jL_DEPT-31 + 1.0 + Category + + 30 + + + fr.insee + jL_DEPT-32 + 1.0 + + fr.insee + CA-jL_DEPT-32 + 1.0 + Category + + 31 + + + fr.insee + jL_DEPT-33 + 1.0 + + fr.insee + CA-jL_DEPT-33 + 1.0 + Category + + 32 + + + fr.insee + jL_DEPT-34 + 1.0 + + fr.insee + CA-jL_DEPT-34 + 1.0 + Category + + 33 + + + fr.insee + jL_DEPT-35 + 1.0 + + fr.insee + CA-jL_DEPT-35 + 1.0 + Category + + 34 + + + fr.insee + jL_DEPT-36 + 1.0 + + fr.insee + CA-jL_DEPT-36 + 1.0 + Category + + 35 + + + fr.insee + jL_DEPT-37 + 1.0 + + fr.insee + CA-jL_DEPT-37 + 1.0 + Category + + 36 + + + fr.insee + jL_DEPT-38 + 1.0 + + fr.insee + CA-jL_DEPT-38 + 1.0 + Category + + 37 + + + fr.insee + jL_DEPT-39 + 1.0 + + fr.insee + CA-jL_DEPT-39 + 1.0 + Category + + 38 + + + fr.insee + jL_DEPT-40 + 1.0 + + fr.insee + CA-jL_DEPT-40 + 1.0 + Category + + 39 + + + fr.insee + jL_DEPT-41 + 1.0 + + fr.insee + CA-jL_DEPT-41 + 1.0 + Category + + 40 + + + fr.insee + jL_DEPT-42 + 1.0 + + fr.insee + CA-jL_DEPT-42 + 1.0 + Category + + 41 + + + fr.insee + jL_DEPT-43 + 1.0 + + fr.insee + CA-jL_DEPT-43 + 1.0 + Category + + 42 + + + fr.insee + jL_DEPT-44 + 1.0 + + fr.insee + CA-jL_DEPT-44 + 1.0 + Category + + 43 + + + fr.insee + jL_DEPT-45 + 1.0 + + fr.insee + CA-jL_DEPT-45 + 1.0 + Category + + 44 + + + fr.insee + jL_DEPT-46 + 1.0 + + fr.insee + CA-jL_DEPT-46 + 1.0 + Category + + 45 + + + fr.insee + jL_DEPT-47 + 1.0 + + fr.insee + CA-jL_DEPT-47 + 1.0 + Category + + 46 + + + fr.insee + jL_DEPT-48 + 1.0 + + fr.insee + CA-jL_DEPT-48 + 1.0 + Category + + 47 + + + fr.insee + jL_DEPT-49 + 1.0 + + fr.insee + CA-jL_DEPT-49 + 1.0 + Category + + 48 + + + fr.insee + jL_DEPT-50 + 1.0 + + fr.insee + CA-jL_DEPT-50 + 1.0 + Category + + 49 + + + fr.insee + jL_DEPT-51 + 1.0 + + fr.insee + CA-jL_DEPT-51 + 1.0 + Category + + 50 + + + fr.insee + jL_DEPT-52 + 1.0 + + fr.insee + CA-jL_DEPT-52 + 1.0 + Category + + 51 + + + fr.insee + jL_DEPT-53 + 1.0 + + fr.insee + CA-jL_DEPT-53 + 1.0 + Category + + 52 + + + fr.insee + jL_DEPT-54 + 1.0 + + fr.insee + CA-jL_DEPT-54 + 1.0 + Category + + 53 + + + fr.insee + jL_DEPT-55 + 1.0 + + fr.insee + CA-jL_DEPT-55 + 1.0 + Category + + 54 + + + fr.insee + jL_DEPT-56 + 1.0 + + fr.insee + CA-jL_DEPT-56 + 1.0 + Category + + 55 + + + fr.insee + jL_DEPT-57 + 1.0 + + fr.insee + CA-jL_DEPT-57 + 1.0 + Category + + 56 + + + fr.insee + jL_DEPT-58 + 1.0 + + fr.insee + CA-jL_DEPT-58 + 1.0 + Category + + 57 + + + fr.insee + jL_DEPT-59 + 1.0 + + fr.insee + CA-jL_DEPT-59 + 1.0 + Category + + 58 + + + fr.insee + jL_DEPT-60 + 1.0 + + fr.insee + CA-jL_DEPT-60 + 1.0 + Category + + 59 + + + fr.insee + jL_DEPT-61 + 1.0 + + fr.insee + CA-jL_DEPT-61 + 1.0 + Category + + 60 + + + fr.insee + jL_DEPT-62 + 1.0 + + fr.insee + CA-jL_DEPT-62 + 1.0 + Category + + 61 + + + fr.insee + jL_DEPT-63 + 1.0 + + fr.insee + CA-jL_DEPT-63 + 1.0 + Category + + 62 + + + fr.insee + jL_DEPT-64 + 1.0 + + fr.insee + CA-jL_DEPT-64 + 1.0 + Category + + 63 + + + fr.insee + jL_DEPT-65 + 1.0 + + fr.insee + CA-jL_DEPT-65 + 1.0 + Category + + 64 + + + fr.insee + jL_DEPT-66 + 1.0 + + fr.insee + CA-jL_DEPT-66 + 1.0 + Category + + 65 + + + fr.insee + jL_DEPT-67 + 1.0 + + fr.insee + CA-jL_DEPT-67 + 1.0 + Category + + 66 + + + fr.insee + jL_DEPT-68 + 1.0 + + fr.insee + CA-jL_DEPT-68 + 1.0 + Category + + 67 + + + fr.insee + jL_DEPT-69 + 1.0 + + fr.insee + CA-jL_DEPT-69 + 1.0 + Category + + 68 + + + fr.insee + jL_DEPT-70 + 1.0 + + fr.insee + CA-jL_DEPT-70 + 1.0 + Category + + 69 + + + fr.insee + jL_DEPT-71 + 1.0 + + fr.insee + CA-jL_DEPT-71 + 1.0 + Category + + 70 + + + fr.insee + jL_DEPT-72 + 1.0 + + fr.insee + CA-jL_DEPT-72 + 1.0 + Category + + 71 + + + fr.insee + jL_DEPT-73 + 1.0 + + fr.insee + CA-jL_DEPT-73 + 1.0 + Category + + 72 + + + fr.insee + jL_DEPT-74 + 1.0 + + fr.insee + CA-jL_DEPT-74 + 1.0 + Category + + 73 + + + fr.insee + jL_DEPT-75 + 1.0 + + fr.insee + CA-jL_DEPT-75 + 1.0 + Category + + 74 + + + fr.insee + jL_DEPT-76 + 1.0 + + fr.insee + CA-jL_DEPT-76 + 1.0 + Category + + 75 + + + fr.insee + jL_DEPT-77 + 1.0 + + fr.insee + CA-jL_DEPT-77 + 1.0 + Category + + 76 + + + fr.insee + jL_DEPT-78 + 1.0 + + fr.insee + CA-jL_DEPT-78 + 1.0 + Category + + 77 + + + fr.insee + jL_DEPT-79 + 1.0 + + fr.insee + CA-jL_DEPT-79 + 1.0 + Category + + 78 + + + fr.insee + jL_DEPT-80 + 1.0 + + fr.insee + CA-jL_DEPT-80 + 1.0 + Category + + 79 + + + fr.insee + jL_DEPT-81 + 1.0 + + fr.insee + CA-jL_DEPT-81 + 1.0 + Category + + 80 + + + fr.insee + jL_DEPT-82 + 1.0 + + fr.insee + CA-jL_DEPT-82 + 1.0 + Category + + 81 + + + fr.insee + jL_DEPT-83 + 1.0 + + fr.insee + CA-jL_DEPT-83 + 1.0 + Category + + 82 + + + fr.insee + jL_DEPT-84 + 1.0 + + fr.insee + CA-jL_DEPT-84 + 1.0 + Category + + 83 + + + fr.insee + jL_DEPT-85 + 1.0 + + fr.insee + CA-jL_DEPT-85 + 1.0 + Category + + 84 + + + fr.insee + jL_DEPT-86 + 1.0 + + fr.insee + CA-jL_DEPT-86 + 1.0 + Category + + 85 + + + fr.insee + jL_DEPT-87 + 1.0 + + fr.insee + CA-jL_DEPT-87 + 1.0 + Category + + 86 + + + fr.insee + jL_DEPT-88 + 1.0 + + fr.insee + CA-jL_DEPT-88 + 1.0 + Category + + 87 + + + fr.insee + jL_DEPT-89 + 1.0 + + fr.insee + CA-jL_DEPT-89 + 1.0 + Category + + 88 + + + fr.insee + jL_DEPT-90 + 1.0 + + fr.insee + CA-jL_DEPT-90 + 1.0 + Category + + 89 + + + fr.insee + jL_DEPT-91 + 1.0 + + fr.insee + CA-jL_DEPT-91 + 1.0 + Category + + 90 + + + fr.insee + jL_DEPT-92 + 1.0 + + fr.insee + CA-jL_DEPT-92 + 1.0 + Category + + 91 + + + fr.insee + jL_DEPT-93 + 1.0 + + fr.insee + CA-jL_DEPT-93 + 1.0 + Category + + 92 + + + fr.insee + jL_DEPT-94 + 1.0 + + fr.insee + CA-jL_DEPT-94 + 1.0 + Category + + 93 + + + fr.insee + jL_DEPT-95 + 1.0 + + fr.insee + CA-jL_DEPT-95 + 1.0 + Category + + 94 + + + fr.insee + jL_DEPT-96 + 1.0 + + fr.insee + CA-jL_DEPT-96 + 1.0 + Category + + 95 + + + fr.insee + jL_DEPT-97 + 1.0 + + fr.insee + CA-jL_DEPT-97 + 1.0 + Category + + 971 + + + fr.insee + jL_DEPT-98 + 1.0 + + fr.insee + CA-jL_DEPT-98 + 1.0 + Category + + 972 + + + fr.insee + jL_DEPT-99 + 1.0 + + fr.insee + CA-jL_DEPT-99 + 1.0 + Category + + 973 + + + fr.insee + jL_DEPT-100 + 1.0 + + fr.insee + CA-jL_DEPT-100 + 1.0 + Category + + 974 + + + fr.insee + jL_DEPT-101 + 1.0 + + fr.insee + CA-jL_DEPT-101 + 1.0 + Category + + 976 + + + + fr.insee + jL_PAYS + 1.0 + + L_PAYS + + + fr.insee + jL_PAYS-3 + 1.0 + + fr.insee + CA-jL_PAYS-3 + 1.0 + Category + + 643 + + + fr.insee + jL_PAYS-4 + 1.0 + + fr.insee + CA-jL_PAYS-4 + 1.0 + Category + + 660 + + + fr.insee + jL_PAYS-5 + 1.0 + + fr.insee + CA-jL_PAYS-5 + 1.0 + Category + + 388 + + + fr.insee + jL_PAYS-6 + 1.0 + + fr.insee + CA-jL_PAYS-6 + 1.0 + Category + + 070 + + + fr.insee + jL_PAYS-7 + 1.0 + + fr.insee + CA-jL_PAYS-7 + 1.0 + Category + + 208 + + + fr.insee + jL_PAYS-8 + 1.0 + + fr.insee + CA-jL_PAYS-8 + 1.0 + Category + + 004 + + + fr.insee + jL_PAYS-9 + 1.0 + + fr.insee + CA-jL_PAYS-9 + 1.0 + Category + + 043 + + + fr.insee + jL_PAYS-10 + 1.0 + + fr.insee + CA-jL_PAYS-10 + 1.0 + Category + + 014 + + + fr.insee + jL_PAYS-11 + 1.0 + + fr.insee + CA-jL_PAYS-11 + 1.0 + Category + + 330 + + + fr.insee + jL_PAYS-12 + 1.0 + + fr.insee + CA-jL_PAYS-12 + 1.0 + Category + + 470 + + + fr.insee + jL_PAYS-13 + 1.0 + + fr.insee + CA-jL_PAYS-13 + 1.0 + Category + + 459 + + + fr.insee + jL_PAYS-14 + 1.0 + + fr.insee + CA-jL_PAYS-14 + 1.0 + Category + + 478 + + + fr.insee + jL_PAYS-15 + 1.0 + + fr.insee + CA-jL_PAYS-15 + 1.0 + Category + + 632 + + + fr.insee + jL_PAYS-16 + 1.0 + + fr.insee + CA-jL_PAYS-16 + 1.0 + Category + + 528 + + + fr.insee + jL_PAYS-17 + 1.0 + + fr.insee + CA-jL_PAYS-17 + 1.0 + Category + + 077 + + + fr.insee + jL_PAYS-18 + 1.0 + + fr.insee + CA-jL_PAYS-18 + 1.0 + Category + + 474 + + + fr.insee + jL_PAYS-19 + 1.0 + + fr.insee + CA-jL_PAYS-19 + 1.0 + Category + + 800 + + + fr.insee + jL_PAYS-20 + 1.0 + + fr.insee + CA-jL_PAYS-20 + 1.0 + Category + + 038 + + + fr.insee + jL_PAYS-21 + 1.0 + + fr.insee + CA-jL_PAYS-21 + 1.0 + Category + + 078 + + + fr.insee + jL_PAYS-22 + 1.0 + + fr.insee + CA-jL_PAYS-22 + 1.0 + Category + + 453 + + + fr.insee + jL_PAYS-23 + 1.0 + + fr.insee + CA-jL_PAYS-23 + 1.0 + Category + + 640 + + + fr.insee + jL_PAYS-24 + 1.0 + + fr.insee + CA-jL_PAYS-24 + 1.0 + Category + + 666 + + + fr.insee + jL_PAYS-25 + 1.0 + + fr.insee + CA-jL_PAYS-25 + 1.0 + Category + + 469 + + + fr.insee + jL_PAYS-26 + 1.0 + + fr.insee + CA-jL_PAYS-26 + 1.0 + Category + + 002 + + + fr.insee + jL_PAYS-27 + 1.0 + + fr.insee + CA-jL_PAYS-27 + 1.0 + Category + + 421 + + + fr.insee + jL_PAYS-28 + 1.0 + + fr.insee + CA-jL_PAYS-28 + 1.0 + Category + + 284 + + + fr.insee + jL_PAYS-29 + 1.0 + + fr.insee + CA-jL_PAYS-29 + 1.0 + Category + + 413 + + + fr.insee + jL_PAYS-30 + 1.0 + + fr.insee + CA-jL_PAYS-30 + 1.0 + Category + + 675 + + + fr.insee + jL_PAYS-31 + 1.0 + + fr.insee + CA-jL_PAYS-31 + 1.0 + Category + + 073 + + + fr.insee + jL_PAYS-32 + 1.0 + + fr.insee + CA-jL_PAYS-32 + 1.0 + Category + + 516 + + + fr.insee + jL_PAYS-33 + 1.0 + + fr.insee + CA-jL_PAYS-33 + 1.0 + Category + + 479 + + + fr.insee + jL_PAYS-34 + 1.0 + + fr.insee + CA-jL_PAYS-34 + 1.0 + Category + + 093 + + + fr.insee + jL_PAYS-35 + 1.0 + + fr.insee + CA-jL_PAYS-35 + 1.0 + Category + + 391 + + + fr.insee + jL_PAYS-36 + 1.0 + + fr.insee + CA-jL_PAYS-36 + 1.0 + Category + + 508 + + + fr.insee + jL_PAYS-37 + 1.0 + + fr.insee + CA-jL_PAYS-37 + 1.0 + Category + + 047 + + + fr.insee + jL_PAYS-38 + 1.0 + + fr.insee + CA-jL_PAYS-38 + 1.0 + Category + + 703 + + + fr.insee + jL_PAYS-39 + 1.0 + + fr.insee + CA-jL_PAYS-39 + 1.0 + Category + + 068 + + + fr.insee + jL_PAYS-40 + 1.0 + + fr.insee + CA-jL_PAYS-40 + 1.0 + Category + + 236 + + + fr.insee + jL_PAYS-41 + 1.0 + + fr.insee + CA-jL_PAYS-41 + 1.0 + Category + + 328 + + + fr.insee + jL_PAYS-42 + 1.0 + + fr.insee + CA-jL_PAYS-42 + 1.0 + Category + + 331 + + + fr.insee + jL_PAYS-43 + 1.0 + + fr.insee + CA-jL_PAYS-43 + 1.0 + Category + + 696 + + + fr.insee + jL_PAYS-44 + 1.0 + + fr.insee + CA-jL_PAYS-44 + 1.0 + Category + + 302 + + + fr.insee + jL_PAYS-45 + 1.0 + + fr.insee + CA-jL_PAYS-45 + 1.0 + Category + + 404 + + + fr.insee + jL_PAYS-46 + 1.0 + + fr.insee + CA-jL_PAYS-46 + 1.0 + Category + + 021 + + + fr.insee + jL_PAYS-47 + 1.0 + + fr.insee + CA-jL_PAYS-47 + 1.0 + Category + + 247 + + + fr.insee + jL_PAYS-48 + 1.0 + + fr.insee + CA-jL_PAYS-48 + 1.0 + Category + + 022 + + + fr.insee + jL_PAYS-49 + 1.0 + + fr.insee + CA-jL_PAYS-49 + 1.0 + Category + + 648 + + + fr.insee + jL_PAYS-50 + 1.0 + + fr.insee + CA-jL_PAYS-50 + 1.0 + Category + + 512 + + + fr.insee + jL_PAYS-51 + 1.0 + + fr.insee + CA-jL_PAYS-51 + 1.0 + Category + + 600 + + + fr.insee + jL_PAYS-52 + 1.0 + + fr.insee + CA-jL_PAYS-52 + 1.0 + Category + + 480 + + + fr.insee + jL_PAYS-53 + 1.0 + + fr.insee + CA-jL_PAYS-53 + 1.0 + Category + + 375 + + + fr.insee + jL_PAYS-54 + 1.0 + + fr.insee + CA-jL_PAYS-54 + 1.0 + Category + + 031 + + + fr.insee + jL_PAYS-55 + 1.0 + + fr.insee + CA-jL_PAYS-55 + 1.0 + Category + + 436 + + + fr.insee + jL_PAYS-56 + 1.0 + + fr.insee + CA-jL_PAYS-56 + 1.0 + Category + + 272 + + + fr.insee + jL_PAYS-57 + 1.0 + + fr.insee + CA-jL_PAYS-57 + 1.0 + Category + + 034 + + + fr.insee + jL_PAYS-58 + 1.0 + + fr.insee + CA-jL_PAYS-58 + 1.0 + Category + + 092 + + + fr.insee + jL_PAYS-59 + 1.0 + + fr.insee + CA-jL_PAYS-59 + 1.0 + Category + + 448 + + + fr.insee + jL_PAYS-60 + 1.0 + + fr.insee + CA-jL_PAYS-60 + 1.0 + Category + + 477 + + + fr.insee + jL_PAYS-61 + 1.0 + + fr.insee + CA-jL_PAYS-61 + 1.0 + Category + + 085 + + + fr.insee + jL_PAYS-62 + 1.0 + + fr.insee + CA-jL_PAYS-62 + 1.0 + Category + + 008 + + + fr.insee + jL_PAYS-63 + 1.0 + + fr.insee + CA-jL_PAYS-63 + 1.0 + Category + + 338 + + + fr.insee + jL_PAYS-64 + 1.0 + + fr.insee + CA-jL_PAYS-64 + 1.0 + Category + + 460 + + + fr.insee + jL_PAYS-65 + 1.0 + + fr.insee + CA-jL_PAYS-65 + 1.0 + Category + + 646 + + + fr.insee + jL_PAYS-66 + 1.0 + + fr.insee + CA-jL_PAYS-66 + 1.0 + Category + + 015 + + + fr.insee + jL_PAYS-67 + 1.0 + + fr.insee + CA-jL_PAYS-67 + 1.0 + Category + + 220 + + + fr.insee + jL_PAYS-68 + 1.0 + + fr.insee + CA-jL_PAYS-68 + 1.0 + Category + + 428 + + + fr.insee + jL_PAYS-69 + 1.0 + + fr.insee + CA-jL_PAYS-69 + 1.0 + Category + + 647 + + + fr.insee + jL_PAYS-70 + 1.0 + + fr.insee + CA-jL_PAYS-70 + 1.0 + Category + + 500 + + + fr.insee + jL_PAYS-71 + 1.0 + + fr.insee + CA-jL_PAYS-71 + 1.0 + Category + + 335 + + + fr.insee + jL_PAYS-72 + 1.0 + + fr.insee + CA-jL_PAYS-72 + 1.0 + Category + + 011 + + + fr.insee + jL_PAYS-73 + 1.0 + + fr.insee + CA-jL_PAYS-73 + 1.0 + Category + + 053 + + + fr.insee + jL_PAYS-74 + 1.0 + + fr.insee + CA-jL_PAYS-74 + 1.0 + Category + + 400 + + + fr.insee + jL_PAYS-75 + 1.0 + + fr.insee + CA-jL_PAYS-75 + 1.0 + Category + + 334 + + + fr.insee + jL_PAYS-76 + 1.0 + + fr.insee + CA-jL_PAYS-76 + 1.0 + Category + + 815 + + + fr.insee + jL_PAYS-77 + 1.0 + + fr.insee + CA-jL_PAYS-77 + 1.0 + Category + + 032 + + + fr.insee + jL_PAYS-78 + 1.0 + + fr.insee + CA-jL_PAYS-78 + 1.0 + Category + + 001 + + + fr.insee + jL_PAYS-79 + 1.0 + + fr.insee + CA-jL_PAYS-79 + 1.0 + Category + + 641 + + + fr.insee + jL_PAYS-80 + 1.0 + + fr.insee + CA-jL_PAYS-80 + 1.0 + Category + + 314 + + + fr.insee + jL_PAYS-81 + 1.0 + + fr.insee + CA-jL_PAYS-81 + 1.0 + Category + + 252 + + + fr.insee + jL_PAYS-82 + 1.0 + + fr.insee + CA-jL_PAYS-82 + 1.0 + Category + + 076 + + + fr.insee + jL_PAYS-83 + 1.0 + + fr.insee + CA-jL_PAYS-83 + 1.0 + Category + + 530 + + + fr.insee + jL_PAYS-84 + 1.0 + + fr.insee + CA-jL_PAYS-84 + 1.0 + Category + + 276 + + + fr.insee + jL_PAYS-85 + 1.0 + + fr.insee + CA-jL_PAYS-85 + 1.0 + Category + + 044 + + + fr.insee + jL_PAYS-86 + 1.0 + + fr.insee + CA-jL_PAYS-86 + 1.0 + Category + + 013 + + + fr.insee + jL_PAYS-87 + 1.0 + + fr.insee + CA-jL_PAYS-87 + 1.0 + Category + + 009 + + + fr.insee + jL_PAYS-88 + 1.0 + + fr.insee + CA-jL_PAYS-88 + 1.0 + Category + + 473 + + + fr.insee + jL_PAYS-89 + 1.0 + + fr.insee + CA-jL_PAYS-89 + 1.0 + Category + + 406 + + + fr.insee + jL_PAYS-90 + 1.0 + + fr.insee + CA-jL_PAYS-90 + 1.0 + Category + + 458 + + + fr.insee + jL_PAYS-91 + 1.0 + + fr.insee + CA-jL_PAYS-91 + 1.0 + Category + + 818 + + + fr.insee + jL_PAYS-92 + 1.0 + + fr.insee + CA-jL_PAYS-92 + 1.0 + Category + + 416 + + + fr.insee + jL_PAYS-93 + 1.0 + + fr.insee + CA-jL_PAYS-93 + 1.0 + Category + + 901 + + + fr.insee + jL_PAYS-94 + 1.0 + + fr.insee + CA-jL_PAYS-94 + 1.0 + Category + + 310 + + + fr.insee + jL_PAYS-95 + 1.0 + + fr.insee + CA-jL_PAYS-95 + 1.0 + Category + + 257 + + + fr.insee + jL_PAYS-96 + 1.0 + + fr.insee + CA-jL_PAYS-96 + 1.0 + Category + + 488 + + + fr.insee + jL_PAYS-97 + 1.0 + + fr.insee + CA-jL_PAYS-97 + 1.0 + Category + + 496 + + + fr.insee + jL_PAYS-98 + 1.0 + + fr.insee + CA-jL_PAYS-98 + 1.0 + Category + + 452 + + + fr.insee + jL_PAYS-99 + 1.0 + + fr.insee + CA-jL_PAYS-99 + 1.0 + Category + + 424 + + + fr.insee + jL_PAYS-100 + 1.0 + + fr.insee + CA-jL_PAYS-100 + 1.0 + Category + + 740 + + + fr.insee + jL_PAYS-101 + 1.0 + + fr.insee + CA-jL_PAYS-101 + 1.0 + Category + + 064 + + + fr.insee + jL_PAYS-102 + 1.0 + + fr.insee + CA-jL_PAYS-102 + 1.0 + Category + + 356 + + + fr.insee + jL_PAYS-103 + 1.0 + + fr.insee + CA-jL_PAYS-103 + 1.0 + Category + + 018 + + + fr.insee + jL_PAYS-104 + 1.0 + + fr.insee + CA-jL_PAYS-104 + 1.0 + Category + + 373 + + + fr.insee + jL_PAYS-105 + 1.0 + + fr.insee + CA-jL_PAYS-105 + 1.0 + Category + + 813 + + + fr.insee + jL_PAYS-106 + 1.0 + + fr.insee + CA-jL_PAYS-106 + 1.0 + Category + + 019 + + + fr.insee + jL_PAYS-107 + 1.0 + + fr.insee + CA-jL_PAYS-107 + 1.0 + Category + + 026 + + + fr.insee + jL_PAYS-108 + 1.0 + + fr.insee + CA-jL_PAYS-108 + 1.0 + Category + + 463 + + + fr.insee + jL_PAYS-109 + 1.0 + + fr.insee + CA-jL_PAYS-109 + 1.0 + Category + + 359 + + + fr.insee + jL_PAYS-110 + 1.0 + + fr.insee + CA-jL_PAYS-110 + 1.0 + Category + + 809 + + + fr.insee + jL_PAYS-111 + 1.0 + + fr.insee + CA-jL_PAYS-111 + 1.0 + Category + + 810 + + + fr.insee + jL_PAYS-112 + 1.0 + + fr.insee + CA-jL_PAYS-112 + 1.0 + Category + + 805 + + + fr.insee + jL_PAYS-113 + 1.0 + + fr.insee + CA-jL_PAYS-113 + 1.0 + Category + + 807 + + + fr.insee + jL_PAYS-114 + 1.0 + + fr.insee + CA-jL_PAYS-114 + 1.0 + Category + + 529 + + + fr.insee + jL_PAYS-115 + 1.0 + + fr.insee + CA-jL_PAYS-115 + 1.0 + Category + + 041 + + + fr.insee + jL_PAYS-116 + 1.0 + + fr.insee + CA-jL_PAYS-116 + 1.0 + Category + + 802 + + + fr.insee + jL_PAYS-117 + 1.0 + + fr.insee + CA-jL_PAYS-117 + 1.0 + Category + + 812 + + + fr.insee + jL_PAYS-118 + 1.0 + + fr.insee + CA-jL_PAYS-118 + 1.0 + Category + + 820 + + + fr.insee + jL_PAYS-119 + 1.0 + + fr.insee + CA-jL_PAYS-119 + 1.0 + Category + + 824 + + + fr.insee + jL_PAYS-120 + 1.0 + + fr.insee + CA-jL_PAYS-120 + 1.0 + Category + + 808 + + + fr.insee + jL_PAYS-121 + 1.0 + + fr.insee + CA-jL_PAYS-121 + 1.0 + Category + + 806 + + + fr.insee + jL_PAYS-122 + 1.0 + + fr.insee + CA-jL_PAYS-122 + 1.0 + Category + + 531 + + + fr.insee + jL_PAYS-123 + 1.0 + + fr.insee + CA-jL_PAYS-123 + 1.0 + Category + + 357 + + + fr.insee + jL_PAYS-124 + 1.0 + + fr.insee + CA-jL_PAYS-124 + 1.0 + Category + + 454 + + + fr.insee + jL_PAYS-125 + 1.0 + + fr.insee + CA-jL_PAYS-125 + 1.0 + Category + + 457 + + + fr.insee + jL_PAYS-126 + 1.0 + + fr.insee + CA-jL_PAYS-126 + 1.0 + Category + + 461 + + + fr.insee + jL_PAYS-127 + 1.0 + + fr.insee + CA-jL_PAYS-127 + 1.0 + Category + + 825 + + + fr.insee + jL_PAYS-128 + 1.0 + + fr.insee + CA-jL_PAYS-128 + 1.0 + Category + + 664 + + + fr.insee + jL_PAYS-129 + 1.0 + + fr.insee + CA-jL_PAYS-129 + 1.0 + Category + + 700 + + + fr.insee + jL_PAYS-130 + 1.0 + + fr.insee + CA-jL_PAYS-130 + 1.0 + Category + + 616 + + + fr.insee + jL_PAYS-131 + 1.0 + + fr.insee + CA-jL_PAYS-131 + 1.0 + Category + + 612 + + + fr.insee + jL_PAYS-132 + 1.0 + + fr.insee + CA-jL_PAYS-132 + 1.0 + Category + + 017 + + + fr.insee + jL_PAYS-133 + 1.0 + + fr.insee + CA-jL_PAYS-133 + 1.0 + Category + + 007 + + + fr.insee + jL_PAYS-134 + 1.0 + + fr.insee + CA-jL_PAYS-134 + 1.0 + Category + + 024 + + + fr.insee + jL_PAYS-135 + 1.0 + + fr.insee + CA-jL_PAYS-135 + 1.0 + Category + + 624 + + + fr.insee + jL_PAYS-136 + 1.0 + + fr.insee + CA-jL_PAYS-136 + 1.0 + Category + + 005 + + + fr.insee + jL_PAYS-137 + 1.0 + + fr.insee + CA-jL_PAYS-137 + 1.0 + Category + + 464 + + + fr.insee + jL_PAYS-138 + 1.0 + + fr.insee + CA-jL_PAYS-138 + 1.0 + Category + + 732 + + + fr.insee + jL_PAYS-139 + 1.0 + + fr.insee + CA-jL_PAYS-139 + 1.0 + Category + + 902 + + + fr.insee + jL_PAYS-140 + 1.0 + + fr.insee + CA-jL_PAYS-140 + 1.0 + Category + + 628 + + + fr.insee + jL_PAYS-141 + 1.0 + + fr.insee + CA-jL_PAYS-141 + 1.0 + Category + + 210 + + + fr.insee + jL_PAYS-142 + 1.0 + + fr.insee + CA-jL_PAYS-142 + 1.0 + Category + + 830 + + + fr.insee + jL_PAYS-143 + 1.0 + + fr.insee + CA-jL_PAYS-143 + 1.0 + Category + + 079 + + + fr.insee + jL_PAYS-144 + 1.0 + + fr.insee + CA-jL_PAYS-144 + 1.0 + Category + + 346 + + + fr.insee + jL_PAYS-145 + 1.0 + + fr.insee + CA-jL_PAYS-145 + 1.0 + Category + + 083 + + + fr.insee + jL_PAYS-146 + 1.0 + + fr.insee + CA-jL_PAYS-146 + 1.0 + Category + + 090 + + + fr.insee + jL_PAYS-147 + 1.0 + + fr.insee + CA-jL_PAYS-147 + 1.0 + Category + + 636 + + + fr.insee + jL_PAYS-148 + 1.0 + + fr.insee + CA-jL_PAYS-148 + 1.0 + Category + + 050 + + + fr.insee + jL_PAYS-149 + 1.0 + + fr.insee + CA-jL_PAYS-149 + 1.0 + Category + + 051 + + + fr.insee + jL_PAYS-150 + 1.0 + + fr.insee + CA-jL_PAYS-150 + 1.0 + Category + + 684 + + + fr.insee + jL_PAYS-151 + 1.0 + + fr.insee + CA-jL_PAYS-151 + 1.0 + Category + + 395 + + + fr.insee + jL_PAYS-152 + 1.0 + + fr.insee + CA-jL_PAYS-152 + 1.0 + Category + + 054 + + + fr.insee + jL_PAYS-153 + 1.0 + + fr.insee + CA-jL_PAYS-153 + 1.0 + Category + + 604 + + + fr.insee + jL_PAYS-154 + 1.0 + + fr.insee + CA-jL_PAYS-154 + 1.0 + Category + + 268 + + + fr.insee + jL_PAYS-155 + 1.0 + + fr.insee + CA-jL_PAYS-155 + 1.0 + Category + + 216 + + + fr.insee + jL_PAYS-156 + 1.0 + + fr.insee + CA-jL_PAYS-156 + 1.0 + Category + + 020 + + + fr.insee + jL_PAYS-157 + 1.0 + + fr.insee + CA-jL_PAYS-157 + 1.0 + Category + + 055 + + + fr.insee + jL_PAYS-158 + 1.0 + + fr.insee + CA-jL_PAYS-158 + 1.0 + Category + + 012 + + + fr.insee + jL_PAYS-159 + 1.0 + + fr.insee + CA-jL_PAYS-159 + 1.0 + Category + + 743 + + + fr.insee + jL_PAYS-160 + 1.0 + + fr.insee + CA-jL_PAYS-160 + 1.0 + Category + + 096 + + + fr.insee + jL_PAYS-161 + 1.0 + + fr.insee + CA-jL_PAYS-161 + 1.0 + Category + + 370 + + + fr.insee + jL_PAYS-162 + 1.0 + + fr.insee + CA-jL_PAYS-162 + 1.0 + Category + + 025 + + + fr.insee + jL_PAYS-163 + 1.0 + + fr.insee + CA-jL_PAYS-163 + 1.0 + Category + + 701 + + + fr.insee + jL_PAYS-164 + 1.0 + + fr.insee + CA-jL_PAYS-164 + 1.0 + Category + + 386 + + + fr.insee + jL_PAYS-165 + 1.0 + + fr.insee + CA-jL_PAYS-165 + 1.0 + Category + + 667 + + + fr.insee + jL_PAYS-166 + 1.0 + + fr.insee + CA-jL_PAYS-166 + 1.0 + Category + + 232 + + + fr.insee + jL_PAYS-167 + 1.0 + + fr.insee + CA-jL_PAYS-167 + 1.0 + Category + + 046 + + + fr.insee + jL_PAYS-168 + 1.0 + + fr.insee + CA-jL_PAYS-168 + 1.0 + Category + + 204 + + + fr.insee + jL_PAYS-169 + 1.0 + + fr.insee + CA-jL_PAYS-169 + 1.0 + Category + + 462 + + + fr.insee + jL_PAYS-170 + 1.0 + + fr.insee + CA-jL_PAYS-170 + 1.0 + Category + + 228 + + + fr.insee + jL_PAYS-171 + 1.0 + + fr.insee + CA-jL_PAYS-171 + 1.0 + Category + + 377 + + + fr.insee + jL_PAYS-172 + 1.0 + + fr.insee + CA-jL_PAYS-172 + 1.0 + Category + + 412 + + + fr.insee + jL_PAYS-173 + 1.0 + + fr.insee + CA-jL_PAYS-173 + 1.0 + Category + + 823 + + + fr.insee + jL_PAYS-174 + 1.0 + + fr.insee + CA-jL_PAYS-174 + 1.0 + Category + + 074 + + + fr.insee + jL_PAYS-175 + 1.0 + + fr.insee + CA-jL_PAYS-175 + 1.0 + Category + + 040 + + + fr.insee + jL_PAYS-176 + 1.0 + + fr.insee + CA-jL_PAYS-176 + 1.0 + Category + + 716 + + + fr.insee + jL_PAYS-177 + 1.0 + + fr.insee + CA-jL_PAYS-177 + 1.0 + Category + + 097 + + + fr.insee + jL_PAYS-178 + 1.0 + + fr.insee + CA-jL_PAYS-178 + 1.0 + Category + + 471 + + + fr.insee + jL_PAYS-179 + 1.0 + + fr.insee + CA-jL_PAYS-179 + 1.0 + Category + + 366 + + + fr.insee + jL_PAYS-180 + 1.0 + + fr.insee + CA-jL_PAYS-180 + 1.0 + Category + + 676 + + + fr.insee + jL_PAYS-181 + 1.0 + + fr.insee + CA-jL_PAYS-181 + 1.0 + Category + + 389 + + + fr.insee + jL_PAYS-182 + 1.0 + + fr.insee + CA-jL_PAYS-182 + 1.0 + Category + + 803 + + + fr.insee + jL_PAYS-183 + 1.0 + + fr.insee + CA-jL_PAYS-183 + 1.0 + Category + + 672 + + + fr.insee + jL_PAYS-184 + 1.0 + + fr.insee + CA-jL_PAYS-184 + 1.0 + Category + + 432 + + + fr.insee + jL_PAYS-185 + 1.0 + + fr.insee + CA-jL_PAYS-185 + 1.0 + Category + + 240 + + + fr.insee + jL_PAYS-186 + 1.0 + + fr.insee + CA-jL_PAYS-186 + 1.0 + Category + + 288 + + + fr.insee + jL_PAYS-187 + 1.0 + + fr.insee + CA-jL_PAYS-187 + 1.0 + Category + + 814 + + + fr.insee + jL_PAYS-188 + 1.0 + + fr.insee + CA-jL_PAYS-188 + 1.0 + Category + + 028 + + + fr.insee + jL_PAYS-189 + 1.0 + + fr.insee + CA-jL_PAYS-189 + 1.0 + Category + + 827 + + + fr.insee + jL_PAYS-190 + 1.0 + + fr.insee + CA-jL_PAYS-190 + 1.0 + Category + + 804 + + + fr.insee + jL_PAYS-191 + 1.0 + + fr.insee + CA-jL_PAYS-191 + 1.0 + Category + + 649 + + + fr.insee + jL_PAYS-192 + 1.0 + + fr.insee + CA-jL_PAYS-192 + 1.0 + Category + + 350 + + + fr.insee + jL_PAYS-193 + 1.0 + + fr.insee + CA-jL_PAYS-193 + 1.0 + Category + + 081 + + + fr.insee + jL_PAYS-194 + 1.0 + + fr.insee + CA-jL_PAYS-194 + 1.0 + Category + + 662 + + + fr.insee + jL_PAYS-195 + 1.0 + + fr.insee + CA-jL_PAYS-195 + 1.0 + Category + + 625 + + + fr.insee + jL_PAYS-196 + 1.0 + + fr.insee + CA-jL_PAYS-196 + 1.0 + Category + + 442 + + + fr.insee + jL_PAYS-197 + 1.0 + + fr.insee + CA-jL_PAYS-197 + 1.0 + Category + + 801 + + + fr.insee + jL_PAYS-198 + 1.0 + + fr.insee + CA-jL_PAYS-198 + 1.0 + Category + + 520 + + + fr.insee + jL_PAYS-199 + 1.0 + + fr.insee + CA-jL_PAYS-199 + 1.0 + Category + + 039 + + + fr.insee + jL_PAYS-200 + 1.0 + + fr.insee + CA-jL_PAYS-200 + 1.0 + Category + + 033 + + + fr.insee + jL_PAYS-201 + 1.0 + + fr.insee + CA-jL_PAYS-201 + 1.0 + Category + + 003 + + + fr.insee + jL_PAYS-202 + 1.0 + + fr.insee + CA-jL_PAYS-202 + 1.0 + Category + + 016 + + + fr.insee + jL_PAYS-203 + 1.0 + + fr.insee + CA-jL_PAYS-203 + 1.0 + Category + + 504 + + + fr.insee + jL_PAYS-204 + 1.0 + + fr.insee + CA-jL_PAYS-204 + 1.0 + Category + + 708 + + + fr.insee + jL_PAYS-205 + 1.0 + + fr.insee + CA-jL_PAYS-205 + 1.0 + Category + + 060 + + + fr.insee + jL_PAYS-206 + 1.0 + + fr.insee + CA-jL_PAYS-206 + 1.0 + Category + + 826 + + + fr.insee + jL_PAYS-207 + 1.0 + + fr.insee + CA-jL_PAYS-207 + 1.0 + Category + + 449 + + + fr.insee + jL_PAYS-208 + 1.0 + + fr.insee + CA-jL_PAYS-208 + 1.0 + Category + + 010 + + + fr.insee + jL_PAYS-209 + 1.0 + + fr.insee + CA-jL_PAYS-209 + 1.0 + Category + + 644 + + + fr.insee + jL_PAYS-210 + 1.0 + + fr.insee + CA-jL_PAYS-210 + 1.0 + Category + + 405 + + + fr.insee + jL_PAYS-211 + 1.0 + + fr.insee + CA-jL_PAYS-211 + 1.0 + Category + + 650 + + + fr.insee + jL_PAYS-212 + 1.0 + + fr.insee + CA-jL_PAYS-212 + 1.0 + Category + + 322 + + + fr.insee + jL_PAYS-213 + 1.0 + + fr.insee + CA-jL_PAYS-213 + 1.0 + Category + + 095 + + + fr.insee + jL_PAYS-214 + 1.0 + + fr.insee + CA-jL_PAYS-214 + 1.0 + Category + + 724 + + + fr.insee + jL_PAYS-215 + 1.0 + + fr.insee + CA-jL_PAYS-215 + 1.0 + Category + + 306 + + + fr.insee + jL_PAYS-216 + 1.0 + + fr.insee + CA-jL_PAYS-216 + 1.0 + Category + + 728 + + + fr.insee + jL_PAYS-217 + 1.0 + + fr.insee + CA-jL_PAYS-217 + 1.0 + Category + + 260 + + + fr.insee + jL_PAYS-218 + 1.0 + + fr.insee + CA-jL_PAYS-218 + 1.0 + Category + + 042 + + + fr.insee + jL_PAYS-219 + 1.0 + + fr.insee + CA-jL_PAYS-219 + 1.0 + Category + + 829 + + + fr.insee + jL_PAYS-220 + 1.0 + + fr.insee + CA-jL_PAYS-220 + 1.0 + Category + + 456 + + + fr.insee + jL_PAYS-221 + 1.0 + + fr.insee + CA-jL_PAYS-221 + 1.0 + Category + + 318 + + + fr.insee + jL_PAYS-222 + 1.0 + + fr.insee + CA-jL_PAYS-222 + 1.0 + Category + + 720 + + + fr.insee + jL_PAYS-223 + 1.0 + + fr.insee + CA-jL_PAYS-223 + 1.0 + Category + + 061 + + + fr.insee + jL_PAYS-224 + 1.0 + + fr.insee + CA-jL_PAYS-224 + 1.0 + Category + + 372 + + + fr.insee + jL_PAYS-225 + 1.0 + + fr.insee + CA-jL_PAYS-225 + 1.0 + Category + + 066 + + + fr.insee + jL_PAYS-226 + 1.0 + + fr.insee + CA-jL_PAYS-226 + 1.0 + Category + + 006 + + + fr.insee + jL_PAYS-227 + 1.0 + + fr.insee + CA-jL_PAYS-227 + 1.0 + Category + + 075 + + + fr.insee + jL_PAYS-228 + 1.0 + + fr.insee + CA-jL_PAYS-228 + 1.0 + Category + + 324 + + + fr.insee + jL_PAYS-229 + 1.0 + + fr.insee + CA-jL_PAYS-229 + 1.0 + Category + + 476 + + + fr.insee + jL_PAYS-230 + 1.0 + + fr.insee + CA-jL_PAYS-230 + 1.0 + Category + + 380 + + + fr.insee + jL_PAYS-231 + 1.0 + + fr.insee + CA-jL_PAYS-231 + 1.0 + Category + + 903 + + + fr.insee + jL_PAYS-232 + 1.0 + + fr.insee + CA-jL_PAYS-232 + 1.0 + Category + + 475 + + + fr.insee + jL_PAYS-233 + 1.0 + + fr.insee + CA-jL_PAYS-233 + 1.0 + Category + + 451 + + + fr.insee + jL_PAYS-234 + 1.0 + + fr.insee + CA-jL_PAYS-234 + 1.0 + Category + + 904 + + + fr.insee + jL_PAYS-235 + 1.0 + + fr.insee + CA-jL_PAYS-235 + 1.0 + Category + + 831 + + + fr.insee + jL_PAYS-236 + 1.0 + + fr.insee + CA-jL_PAYS-236 + 1.0 + Category + + 467 + + + fr.insee + jL_PAYS-237 + 1.0 + + fr.insee + CA-jL_PAYS-237 + 1.0 + Category + + 358 + + + fr.insee + jL_PAYS-238 + 1.0 + + fr.insee + CA-jL_PAYS-238 + 1.0 + Category + + 465 + + + fr.insee + jL_PAYS-239 + 1.0 + + fr.insee + CA-jL_PAYS-239 + 1.0 + Category + + 821 + + + fr.insee + jL_PAYS-240 + 1.0 + + fr.insee + CA-jL_PAYS-240 + 1.0 + Category + + 819 + + + fr.insee + jL_PAYS-241 + 1.0 + + fr.insee + CA-jL_PAYS-241 + 1.0 + Category + + 311 + + + fr.insee + jL_PAYS-242 + 1.0 + + fr.insee + CA-jL_PAYS-242 + 1.0 + Category + + 035 + + + fr.insee + jL_PAYS-243 + 1.0 + + fr.insee + CA-jL_PAYS-243 + 1.0 + Category + + 248 + + + fr.insee + jL_PAYS-244 + 1.0 + + fr.insee + CA-jL_PAYS-244 + 1.0 + Category + + 094 + + + fr.insee + jL_PAYS-245 + 1.0 + + fr.insee + CA-jL_PAYS-245 + 1.0 + Category + + 355 + + + fr.insee + jL_PAYS-246 + 1.0 + + fr.insee + CA-jL_PAYS-246 + 1.0 + Category + + 037 + + + fr.insee + jL_PAYS-247 + 1.0 + + fr.insee + CA-jL_PAYS-247 + 1.0 + Category + + 264 + + + fr.insee + jL_PAYS-248 + 1.0 + + fr.insee + CA-jL_PAYS-248 + 1.0 + Category + + 706 + + + fr.insee + jL_PAYS-249 + 1.0 + + fr.insee + CA-jL_PAYS-249 + 1.0 + Category + + 466 + + + fr.insee + jL_PAYS-250 + 1.0 + + fr.insee + CA-jL_PAYS-250 + 1.0 + Category + + 063 + + + fr.insee + jL_PAYS-251 + 1.0 + + fr.insee + CA-jL_PAYS-251 + 1.0 + Category + + 091 + + + fr.insee + jL_PAYS-252 + 1.0 + + fr.insee + CA-jL_PAYS-252 + 1.0 + Category + + 342 + + + fr.insee + jL_PAYS-253 + 1.0 + + fr.insee + CA-jL_PAYS-253 + 1.0 + Category + + 224 + + + fr.insee + jL_PAYS-254 + 1.0 + + fr.insee + CA-jL_PAYS-254 + 1.0 + Category + + 669 + + + fr.insee + jL_PAYS-255 + 1.0 + + fr.insee + CA-jL_PAYS-255 + 1.0 + Category + + 030 + + + fr.insee + jL_PAYS-256 + 1.0 + + fr.insee + CA-jL_PAYS-256 + 1.0 + Category + + 036 + + + fr.insee + jL_PAYS-257 + 1.0 + + fr.insee + CA-jL_PAYS-257 + 1.0 + Category + + 492 + + + fr.insee + jL_PAYS-258 + 1.0 + + fr.insee + CA-jL_PAYS-258 + 1.0 + Category + + 029 + + + fr.insee + jL_PAYS-259 + 1.0 + + fr.insee + CA-jL_PAYS-259 + 1.0 + Category + + 393 + + + fr.insee + jL_PAYS-260 + 1.0 + + fr.insee + CA-jL_PAYS-260 + 1.0 + Category + + 608 + + + fr.insee + jL_PAYS-261 + 1.0 + + fr.insee + CA-jL_PAYS-261 + 1.0 + Category + + 082 + + + fr.insee + jL_PAYS-262 + 1.0 + + fr.insee + CA-jL_PAYS-262 + 1.0 + Category + + 736 + + + fr.insee + jL_PAYS-263 + 1.0 + + fr.insee + CA-jL_PAYS-263 + 1.0 + Category + + 352 + + + fr.insee + jL_PAYS-264 + 1.0 + + fr.insee + CA-jL_PAYS-264 + 1.0 + Category + + 244 + + + fr.insee + jL_PAYS-265 + 1.0 + + fr.insee + CA-jL_PAYS-265 + 1.0 + Category + + 065 + + + fr.insee + jL_PAYS-266 + 1.0 + + fr.insee + CA-jL_PAYS-266 + 1.0 + Category + + 084 + + + fr.insee + jL_PAYS-267 + 1.0 + + fr.insee + CA-jL_PAYS-267 + 1.0 + Category + + 905 + + + fr.insee + jL_PAYS-268 + 1.0 + + fr.insee + CA-jL_PAYS-268 + 1.0 + Category + + 532 + + + fr.insee + jL_PAYS-269 + 1.0 + + fr.insee + CA-jL_PAYS-269 + 1.0 + Category + + 680 + + + fr.insee + jL_PAYS-270 + 1.0 + + fr.insee + CA-jL_PAYS-270 + 1.0 + Category + + 721 + + + fr.insee + jL_PAYS-271 + 1.0 + + fr.insee + CA-jL_PAYS-271 + 1.0 + Category + + 702 + + + fr.insee + jL_PAYS-272 + 1.0 + + fr.insee + CA-jL_PAYS-272 + 1.0 + Category + + 280 + + + fr.insee + jL_PAYS-273 + 1.0 + + fr.insee + CA-jL_PAYS-273 + 1.0 + Category + + 817 + + + fr.insee + jL_PAYS-274 + 1.0 + + fr.insee + CA-jL_PAYS-274 + 1.0 + Category + + 086 + + + fr.insee + jL_PAYS-275 + 1.0 + + fr.insee + CA-jL_PAYS-275 + 1.0 + Category + + 472 + + + fr.insee + jL_PAYS-276 + 1.0 + + fr.insee + CA-jL_PAYS-276 + 1.0 + Category + + 212 + + + fr.insee + jL_PAYS-277 + 1.0 + + fr.insee + CA-jL_PAYS-277 + 1.0 + Category + + 080 + + + fr.insee + jL_PAYS-278 + 1.0 + + fr.insee + CA-jL_PAYS-278 + 1.0 + Category + + 052 + + + fr.insee + jL_PAYS-279 + 1.0 + + fr.insee + CA-jL_PAYS-279 + 1.0 + Category + + 822 + + + fr.insee + jL_PAYS-280 + 1.0 + + fr.insee + CA-jL_PAYS-280 + 1.0 + Category + + 089 + + + fr.insee + jL_PAYS-281 + 1.0 + + fr.insee + CA-jL_PAYS-281 + 1.0 + Category + + 072 + + + fr.insee + jL_PAYS-282 + 1.0 + + fr.insee + CA-jL_PAYS-282 + 1.0 + Category + + 642 + + + fr.insee + jL_PAYS-283 + 1.0 + + fr.insee + CA-jL_PAYS-283 + 1.0 + Category + + 524 + + + fr.insee + jL_PAYS-284 + 1.0 + + fr.insee + CA-jL_PAYS-284 + 1.0 + Category + + 816 + + + fr.insee + jL_PAYS-285 + 1.0 + + fr.insee + CA-jL_PAYS-285 + 1.0 + Category + + 045 + + + fr.insee + jL_PAYS-286 + 1.0 + + fr.insee + CA-jL_PAYS-286 + 1.0 + Category + + 484 + + + fr.insee + jL_PAYS-287 + 1.0 + + fr.insee + CA-jL_PAYS-287 + 1.0 + Category + + 690 + + + fr.insee + jL_PAYS-288 + 1.0 + + fr.insee + CA-jL_PAYS-288 + 1.0 + Category + + 811 + + + fr.insee + jL_PAYS-289 + 1.0 + + fr.insee + CA-jL_PAYS-289 + 1.0 + Category + + 653 + + + fr.insee + jL_PAYS-290 + 1.0 + + fr.insee + CA-jL_PAYS-290 + 1.0 + Category + + 378 + + + fr.insee + jL_PAYS-291 + 1.0 + + fr.insee + CA-jL_PAYS-291 + 1.0 + Category + + 382 + + + + fr.insee + jL_NATIONALITE + 1.0 + + L_NATIONALITE + + + fr.insee + jL_NATIONALITE-1 + 1.0 + + fr.insee + CA-jL_NATIONALITE-1 + 1.0 + Category + + 660 + + + fr.insee + jL_NATIONALITE-2 + 1.0 + + fr.insee + CA-jL_NATIONALITE-2 + 1.0 + Category + + 070 + + + fr.insee + jL_NATIONALITE-3 + 1.0 + + fr.insee + CA-jL_NATIONALITE-3 + 1.0 + Category + + 208 + + + fr.insee + jL_NATIONALITE-4 + 1.0 + + fr.insee + CA-jL_NATIONALITE-4 + 1.0 + Category + + 004 + + + fr.insee + jL_NATIONALITE-5 + 1.0 + + fr.insee + CA-jL_NATIONALITE-5 + 1.0 + Category + + 400 + + + fr.insee + jL_NATIONALITE-6 + 1.0 + + fr.insee + CA-jL_NATIONALITE-6 + 1.0 + Category + + 821 + + + fr.insee + jL_NATIONALITE-7 + 1.0 + + fr.insee + CA-jL_NATIONALITE-7 + 1.0 + Category + + 043 + + + fr.insee + jL_NATIONALITE-8 + 1.0 + + fr.insee + CA-jL_NATIONALITE-8 + 1.0 + Category + + 014 + + + fr.insee + jL_NATIONALITE-9 + 1.0 + + fr.insee + CA-jL_NATIONALITE-9 + 1.0 + Category + + 330 + + + fr.insee + jL_NATIONALITE-10 + 1.0 + + fr.insee + CA-jL_NATIONALITE-10 + 1.0 + Category + + 459 + + + fr.insee + jL_NATIONALITE-11 + 1.0 + + fr.insee + CA-jL_NATIONALITE-11 + 1.0 + Category + + 900 + + + fr.insee + jL_NATIONALITE-12 + 1.0 + + fr.insee + CA-jL_NATIONALITE-12 + 1.0 + Category + + 528 + + + fr.insee + jL_NATIONALITE-13 + 1.0 + + fr.insee + CA-jL_NATIONALITE-13 + 1.0 + Category + + 077 + + + fr.insee + jL_NATIONALITE-14 + 1.0 + + fr.insee + CA-jL_NATIONALITE-14 + 1.0 + Category + + 800 + + + fr.insee + jL_NATIONALITE-15 + 1.0 + + fr.insee + CA-jL_NATIONALITE-15 + 1.0 + Category + + 038 + + + fr.insee + jL_NATIONALITE-16 + 1.0 + + fr.insee + CA-jL_NATIONALITE-16 + 1.0 + Category + + 078 + + + fr.insee + jL_NATIONALITE-17 + 1.0 + + fr.insee + CA-jL_NATIONALITE-17 + 1.0 + Category + + 453 + + + fr.insee + jL_NATIONALITE-18 + 1.0 + + fr.insee + CA-jL_NATIONALITE-18 + 1.0 + Category + + 640 + + + fr.insee + jL_NATIONALITE-19 + 1.0 + + fr.insee + CA-jL_NATIONALITE-19 + 1.0 + Category + + 666 + + + fr.insee + jL_NATIONALITE-20 + 1.0 + + fr.insee + CA-jL_NATIONALITE-20 + 1.0 + Category + + 469 + + + fr.insee + jL_NATIONALITE-21 + 1.0 + + fr.insee + CA-jL_NATIONALITE-21 + 1.0 + Category + + 039 + + + fr.insee + jL_NATIONALITE-22 + 1.0 + + fr.insee + CA-jL_NATIONALITE-22 + 1.0 + Category + + 033 + + + fr.insee + jL_NATIONALITE-23 + 1.0 + + fr.insee + CA-jL_NATIONALITE-23 + 1.0 + Category + + 002 + + + fr.insee + jL_NATIONALITE-24 + 1.0 + + fr.insee + CA-jL_NATIONALITE-24 + 1.0 + Category + + 421 + + + fr.insee + jL_NATIONALITE-25 + 1.0 + + fr.insee + CA-jL_NATIONALITE-25 + 1.0 + Category + + 284 + + + fr.insee + jL_NATIONALITE-26 + 1.0 + + fr.insee + CA-jL_NATIONALITE-26 + 1.0 + Category + + 675 + + + fr.insee + jL_NATIONALITE-27 + 1.0 + + fr.insee + CA-jL_NATIONALITE-27 + 1.0 + Category + + 073 + + + fr.insee + jL_NATIONALITE-28 + 1.0 + + fr.insee + CA-jL_NATIONALITE-28 + 1.0 + Category + + 676 + + + fr.insee + jL_NATIONALITE-29 + 1.0 + + fr.insee + CA-jL_NATIONALITE-29 + 1.0 + Category + + 257 + + + fr.insee + jL_NATIONALITE-30 + 1.0 + + fr.insee + CA-jL_NATIONALITE-30 + 1.0 + Category + + 516 + + + fr.insee + jL_NATIONALITE-31 + 1.0 + + fr.insee + CA-jL_NATIONALITE-31 + 1.0 + Category + + 093 + + + fr.insee + jL_NATIONALITE-32 + 1.0 + + fr.insee + CA-jL_NATIONALITE-32 + 1.0 + Category + + 391 + + + fr.insee + jL_NATIONALITE-33 + 1.0 + + fr.insee + CA-jL_NATIONALITE-33 + 1.0 + Category + + 508 + + + fr.insee + jL_NATIONALITE-34 + 1.0 + + fr.insee + CA-jL_NATIONALITE-34 + 1.0 + Category + + 932 + + + fr.insee + jL_NATIONALITE-35 + 1.0 + + fr.insee + CA-jL_NATIONALITE-35 + 1.0 + Category + + 006 + + + fr.insee + jL_NATIONALITE-36 + 1.0 + + fr.insee + CA-jL_NATIONALITE-36 + 1.0 + Category + + 703 + + + fr.insee + jL_NATIONALITE-37 + 1.0 + + fr.insee + CA-jL_NATIONALITE-37 + 1.0 + Category + + 068 + + + fr.insee + jL_NATIONALITE-38 + 1.0 + + fr.insee + CA-jL_NATIONALITE-38 + 1.0 + Category + + 236 + + + fr.insee + jL_NATIONALITE-39 + 1.0 + + fr.insee + CA-jL_NATIONALITE-39 + 1.0 + Category + + 328 + + + fr.insee + jL_NATIONALITE-40 + 1.0 + + fr.insee + CA-jL_NATIONALITE-40 + 1.0 + Category + + 929 + + + fr.insee + jL_NATIONALITE-41 + 1.0 + + fr.insee + CA-jL_NATIONALITE-41 + 1.0 + Category + + 696 + + + fr.insee + jL_NATIONALITE-42 + 1.0 + + fr.insee + CA-jL_NATIONALITE-42 + 1.0 + Category + + 302 + + + fr.insee + jL_NATIONALITE-43 + 1.0 + + fr.insee + CA-jL_NATIONALITE-43 + 1.0 + Category + + 404 + + + fr.insee + jL_NATIONALITE-44 + 1.0 + + fr.insee + CA-jL_NATIONALITE-44 + 1.0 + Category + + 247 + + + fr.insee + jL_NATIONALITE-45 + 1.0 + + fr.insee + CA-jL_NATIONALITE-45 + 1.0 + Category + + 306 + + + fr.insee + jL_NATIONALITE-46 + 1.0 + + fr.insee + CA-jL_NATIONALITE-46 + 1.0 + Category + + 512 + + + fr.insee + jL_NATIONALITE-47 + 1.0 + + fr.insee + CA-jL_NATIONALITE-47 + 1.0 + Category + + 720 + + + fr.insee + jL_NATIONALITE-48 + 1.0 + + fr.insee + CA-jL_NATIONALITE-48 + 1.0 + Category + + 600 + + + fr.insee + jL_NATIONALITE-49 + 1.0 + + fr.insee + CA-jL_NATIONALITE-49 + 1.0 + Category + + 480 + + + fr.insee + jL_NATIONALITE-50 + 1.0 + + fr.insee + CA-jL_NATIONALITE-50 + 1.0 + Category + + 375 + + + fr.insee + jL_NATIONALITE-51 + 1.0 + + fr.insee + CA-jL_NATIONALITE-51 + 1.0 + Category + + 318 + + + fr.insee + jL_NATIONALITE-52 + 1.0 + + fr.insee + CA-jL_NATIONALITE-52 + 1.0 + Category + + 322 + + + fr.insee + jL_NATIONALITE-53 + 1.0 + + fr.insee + CA-jL_NATIONALITE-53 + 1.0 + Category + + 031 + + + fr.insee + jL_NATIONALITE-54 + 1.0 + + fr.insee + CA-jL_NATIONALITE-54 + 1.0 + Category + + 436 + + + fr.insee + jL_NATIONALITE-55 + 1.0 + + fr.insee + CA-jL_NATIONALITE-55 + 1.0 + Category + + 034 + + + fr.insee + jL_NATIONALITE-56 + 1.0 + + fr.insee + CA-jL_NATIONALITE-56 + 1.0 + Category + + 092 + + + fr.insee + jL_NATIONALITE-57 + 1.0 + + fr.insee + CA-jL_NATIONALITE-57 + 1.0 + Category + + 448 + + + fr.insee + jL_NATIONALITE-58 + 1.0 + + fr.insee + CA-jL_NATIONALITE-58 + 1.0 + Category + + 928 + + + fr.insee + jL_NATIONALITE-59 + 1.0 + + fr.insee + CA-jL_NATIONALITE-59 + 1.0 + Category + + 008 + + + fr.insee + jL_NATIONALITE-60 + 1.0 + + fr.insee + CA-jL_NATIONALITE-60 + 1.0 + Category + + 338 + + + fr.insee + jL_NATIONALITE-61 + 1.0 + + fr.insee + CA-jL_NATIONALITE-61 + 1.0 + Category + + 456 + + + fr.insee + jL_NATIONALITE-62 + 1.0 + + fr.insee + CA-jL_NATIONALITE-62 + 1.0 + Category + + 460 + + + fr.insee + jL_NATIONALITE-63 + 1.0 + + fr.insee + CA-jL_NATIONALITE-63 + 1.0 + Category + + 015 + + + fr.insee + jL_NATIONALITE-64 + 1.0 + + fr.insee + CA-jL_NATIONALITE-64 + 1.0 + Category + + 220 + + + fr.insee + jL_NATIONALITE-65 + 1.0 + + fr.insee + CA-jL_NATIONALITE-65 + 1.0 + Category + + 641 + + + fr.insee + jL_NATIONALITE-66 + 1.0 + + fr.insee + CA-jL_NATIONALITE-66 + 1.0 + Category + + 310 + + + fr.insee + jL_NATIONALITE-67 + 1.0 + + fr.insee + CA-jL_NATIONALITE-67 + 1.0 + Category + + 500 + + + fr.insee + jL_NATIONALITE-68 + 1.0 + + fr.insee + CA-jL_NATIONALITE-68 + 1.0 + Category + + 335 + + + fr.insee + jL_NATIONALITE-69 + 1.0 + + fr.insee + CA-jL_NATIONALITE-69 + 1.0 + Category + + 011 + + + fr.insee + jL_NATIONALITE-70 + 1.0 + + fr.insee + CA-jL_NATIONALITE-70 + 1.0 + Category + + 053 + + + fr.insee + jL_NATIONALITE-71 + 1.0 + + fr.insee + CA-jL_NATIONALITE-71 + 1.0 + Category + + 334 + + + fr.insee + jL_NATIONALITE-72 + 1.0 + + fr.insee + CA-jL_NATIONALITE-72 + 1.0 + Category + + 815 + + + fr.insee + jL_NATIONALITE-73 + 1.0 + + fr.insee + CA-jL_NATIONALITE-73 + 1.0 + Category + + 032 + + + fr.insee + jL_NATIONALITE-74 + 1.0 + + fr.insee + CA-jL_NATIONALITE-74 + 1.0 + Category + + 001 + + + fr.insee + jL_NATIONALITE-75 + 1.0 + + fr.insee + CA-jL_NATIONALITE-75 + 1.0 + Category + + 314 + + + fr.insee + jL_NATIONALITE-76 + 1.0 + + fr.insee + CA-jL_NATIONALITE-76 + 1.0 + Category + + 016 + + + fr.insee + jL_NATIONALITE-77 + 1.0 + + fr.insee + CA-jL_NATIONALITE-77 + 1.0 + Category + + 252 + + + fr.insee + jL_NATIONALITE-78 + 1.0 + + fr.insee + CA-jL_NATIONALITE-78 + 1.0 + Category + + 076 + + + fr.insee + jL_NATIONALITE-79 + 1.0 + + fr.insee + CA-jL_NATIONALITE-79 + 1.0 + Category + + 276 + + + fr.insee + jL_NATIONALITE-80 + 1.0 + + fr.insee + CA-jL_NATIONALITE-80 + 1.0 + Category + + 009 + + + fr.insee + jL_NATIONALITE-81 + 1.0 + + fr.insee + CA-jL_NATIONALITE-81 + 1.0 + Category + + 473 + + + fr.insee + jL_NATIONALITE-82 + 1.0 + + fr.insee + CA-jL_NATIONALITE-82 + 1.0 + Category + + 458 + + + fr.insee + jL_NATIONALITE-83 + 1.0 + + fr.insee + CA-jL_NATIONALITE-83 + 1.0 + Category + + 416 + + + fr.insee + jL_NATIONALITE-84 + 1.0 + + fr.insee + CA-jL_NATIONALITE-84 + 1.0 + Category + + 260 + + + fr.insee + jL_NATIONALITE-85 + 1.0 + + fr.insee + CA-jL_NATIONALITE-85 + 1.0 + Category + + 496 + + + fr.insee + jL_NATIONALITE-86 + 1.0 + + fr.insee + CA-jL_NATIONALITE-86 + 1.0 + Category + + 488 + + + fr.insee + jL_NATIONALITE-87 + 1.0 + + fr.insee + CA-jL_NATIONALITE-87 + 1.0 + Category + + 452 + + + fr.insee + jL_NATIONALITE-88 + 1.0 + + fr.insee + CA-jL_NATIONALITE-88 + 1.0 + Category + + 424 + + + fr.insee + jL_NATIONALITE-89 + 1.0 + + fr.insee + CA-jL_NATIONALITE-89 + 1.0 + Category + + 064 + + + fr.insee + jL_NATIONALITE-90 + 1.0 + + fr.insee + CA-jL_NATIONALITE-90 + 1.0 + Category + + 664 + + + fr.insee + jL_NATIONALITE-91 + 1.0 + + fr.insee + CA-jL_NATIONALITE-91 + 1.0 + Category + + 700 + + + fr.insee + jL_NATIONALITE-92 + 1.0 + + fr.insee + CA-jL_NATIONALITE-92 + 1.0 + Category + + 616 + + + fr.insee + jL_NATIONALITE-93 + 1.0 + + fr.insee + CA-jL_NATIONALITE-93 + 1.0 + Category + + 612 + + + fr.insee + jL_NATIONALITE-94 + 1.0 + + fr.insee + CA-jL_NATIONALITE-94 + 1.0 + Category + + 007 + + + fr.insee + jL_NATIONALITE-95 + 1.0 + + fr.insee + CA-jL_NATIONALITE-95 + 1.0 + Category + + 017 + + + fr.insee + jL_NATIONALITE-96 + 1.0 + + fr.insee + CA-jL_NATIONALITE-96 + 1.0 + Category + + 024 + + + fr.insee + jL_NATIONALITE-97 + 1.0 + + fr.insee + CA-jL_NATIONALITE-97 + 1.0 + Category + + 624 + + + fr.insee + jL_NATIONALITE-98 + 1.0 + + fr.insee + CA-jL_NATIONALITE-98 + 1.0 + Category + + 005 + + + fr.insee + jL_NATIONALITE-99 + 1.0 + + fr.insee + CA-jL_NATIONALITE-99 + 1.0 + Category + + 272 + + + fr.insee + jL_NATIONALITE-100 + 1.0 + + fr.insee + CA-jL_NATIONALITE-100 + 1.0 + Category + + 464 + + + fr.insee + jL_NATIONALITE-101 + 1.0 + + fr.insee + CA-jL_NATIONALITE-101 + 1.0 + Category + + 732 + + + fr.insee + jL_NATIONALITE-102 + 1.0 + + fr.insee + CA-jL_NATIONALITE-102 + 1.0 + Category + + 628 + + + fr.insee + jL_NATIONALITE-103 + 1.0 + + fr.insee + CA-jL_NATIONALITE-103 + 1.0 + Category + + 927 + + + fr.insee + jL_NATIONALITE-104 + 1.0 + + fr.insee + CA-jL_NATIONALITE-104 + 1.0 + Category + + 830 + + + fr.insee + jL_NATIONALITE-105 + 1.0 + + fr.insee + CA-jL_NATIONALITE-105 + 1.0 + Category + + 079 + + + fr.insee + jL_NATIONALITE-106 + 1.0 + + fr.insee + CA-jL_NATIONALITE-106 + 1.0 + Category + + 346 + + + fr.insee + jL_NATIONALITE-107 + 1.0 + + fr.insee + CA-jL_NATIONALITE-107 + 1.0 + Category + + 083 + + + fr.insee + jL_NATIONALITE-108 + 1.0 + + fr.insee + CA-jL_NATIONALITE-108 + 1.0 + Category + + 812 + + + fr.insee + jL_NATIONALITE-109 + 1.0 + + fr.insee + CA-jL_NATIONALITE-109 + 1.0 + Category + + 451 + + + fr.insee + jL_NATIONALITE-110 + 1.0 + + fr.insee + CA-jL_NATIONALITE-110 + 1.0 + Category + + 926 + + + fr.insee + jL_NATIONALITE-111 + 1.0 + + fr.insee + CA-jL_NATIONALITE-111 + 1.0 + Category + + 636 + + + fr.insee + jL_NATIONALITE-112 + 1.0 + + fr.insee + CA-jL_NATIONALITE-112 + 1.0 + Category + + 050 + + + fr.insee + jL_NATIONALITE-113 + 1.0 + + fr.insee + CA-jL_NATIONALITE-113 + 1.0 + Category + + 051 + + + fr.insee + jL_NATIONALITE-114 + 1.0 + + fr.insee + CA-jL_NATIONALITE-114 + 1.0 + Category + + 684 + + + fr.insee + jL_NATIONALITE-115 + 1.0 + + fr.insee + CA-jL_NATIONALITE-115 + 1.0 + Category + + 395 + + + fr.insee + jL_NATIONALITE-116 + 1.0 + + fr.insee + CA-jL_NATIONALITE-116 + 1.0 + Category + + 054 + + + fr.insee + jL_NATIONALITE-117 + 1.0 + + fr.insee + CA-jL_NATIONALITE-117 + 1.0 + Category + + 604 + + + fr.insee + jL_NATIONALITE-118 + 1.0 + + fr.insee + CA-jL_NATIONALITE-118 + 1.0 + Category + + 268 + + + fr.insee + jL_NATIONALITE-119 + 1.0 + + fr.insee + CA-jL_NATIONALITE-119 + 1.0 + Category + + 216 + + + fr.insee + jL_NATIONALITE-120 + 1.0 + + fr.insee + CA-jL_NATIONALITE-120 + 1.0 + Category + + 020 + + + fr.insee + jL_NATIONALITE-121 + 1.0 + + fr.insee + CA-jL_NATIONALITE-121 + 1.0 + Category + + 055 + + + fr.insee + jL_NATIONALITE-122 + 1.0 + + fr.insee + CA-jL_NATIONALITE-122 + 1.0 + Category + + 012 + + + fr.insee + jL_NATIONALITE-123 + 1.0 + + fr.insee + CA-jL_NATIONALITE-123 + 1.0 + Category + + 743 + + + fr.insee + jL_NATIONALITE-124 + 1.0 + + fr.insee + CA-jL_NATIONALITE-124 + 1.0 + Category + + 096 + + + fr.insee + jL_NATIONALITE-125 + 1.0 + + fr.insee + CA-jL_NATIONALITE-125 + 1.0 + Category + + 701 + + + fr.insee + jL_NATIONALITE-126 + 1.0 + + fr.insee + CA-jL_NATIONALITE-126 + 1.0 + Category + + 386 + + + fr.insee + jL_NATIONALITE-127 + 1.0 + + fr.insee + CA-jL_NATIONALITE-127 + 1.0 + Category + + 667 + + + fr.insee + jL_NATIONALITE-128 + 1.0 + + fr.insee + CA-jL_NATIONALITE-128 + 1.0 + Category + + 370 + + + fr.insee + jL_NATIONALITE-129 + 1.0 + + fr.insee + CA-jL_NATIONALITE-129 + 1.0 + Category + + 232 + + + fr.insee + jL_NATIONALITE-130 + 1.0 + + fr.insee + CA-jL_NATIONALITE-130 + 1.0 + Category + + 046 + + + fr.insee + jL_NATIONALITE-131 + 1.0 + + fr.insee + CA-jL_NATIONALITE-131 + 1.0 + Category + + 204 + + + fr.insee + jL_NATIONALITE-132 + 1.0 + + fr.insee + CA-jL_NATIONALITE-132 + 1.0 + Category + + 824 + + + fr.insee + jL_NATIONALITE-133 + 1.0 + + fr.insee + CA-jL_NATIONALITE-133 + 1.0 + Category + + 462 + + + fr.insee + jL_NATIONALITE-134 + 1.0 + + fr.insee + CA-jL_NATIONALITE-134 + 1.0 + Category + + 373 + + + fr.insee + jL_NATIONALITE-135 + 1.0 + + fr.insee + CA-jL_NATIONALITE-135 + 1.0 + Category + + 228 + + + fr.insee + jL_NATIONALITE-136 + 1.0 + + fr.insee + CA-jL_NATIONALITE-136 + 1.0 + Category + + 412 + + + fr.insee + jL_NATIONALITE-137 + 1.0 + + fr.insee + CA-jL_NATIONALITE-137 + 1.0 + Category + + 823 + + + fr.insee + jL_NATIONALITE-138 + 1.0 + + fr.insee + CA-jL_NATIONALITE-138 + 1.0 + Category + + 074 + + + fr.insee + jL_NATIONALITE-139 + 1.0 + + fr.insee + CA-jL_NATIONALITE-139 + 1.0 + Category + + 040 + + + fr.insee + jL_NATIONALITE-140 + 1.0 + + fr.insee + CA-jL_NATIONALITE-140 + 1.0 + Category + + 716 + + + fr.insee + jL_NATIONALITE-141 + 1.0 + + fr.insee + CA-jL_NATIONALITE-141 + 1.0 + Category + + 097 + + + fr.insee + jL_NATIONALITE-142 + 1.0 + + fr.insee + CA-jL_NATIONALITE-142 + 1.0 + Category + + 366 + + + fr.insee + jL_NATIONALITE-143 + 1.0 + + fr.insee + CA-jL_NATIONALITE-143 + 1.0 + Category + + 389 + + + fr.insee + jL_NATIONALITE-144 + 1.0 + + fr.insee + CA-jL_NATIONALITE-144 + 1.0 + Category + + 803 + + + fr.insee + jL_NATIONALITE-145 + 1.0 + + fr.insee + CA-jL_NATIONALITE-145 + 1.0 + Category + + 003 + + + fr.insee + jL_NATIONALITE-146 + 1.0 + + fr.insee + CA-jL_NATIONALITE-146 + 1.0 + Category + + 827 + + + fr.insee + jL_NATIONALITE-147 + 1.0 + + fr.insee + CA-jL_NATIONALITE-147 + 1.0 + Category + + 804 + + + fr.insee + jL_NATIONALITE-148 + 1.0 + + fr.insee + CA-jL_NATIONALITE-148 + 1.0 + Category + + 672 + + + fr.insee + jL_NATIONALITE-149 + 1.0 + + fr.insee + CA-jL_NATIONALITE-149 + 1.0 + Category + + 432 + + + fr.insee + jL_NATIONALITE-150 + 1.0 + + fr.insee + CA-jL_NATIONALITE-150 + 1.0 + Category + + 288 + + + fr.insee + jL_NATIONALITE-151 + 1.0 + + fr.insee + CA-jL_NATIONALITE-151 + 1.0 + Category + + 240 + + + fr.insee + jL_NATIONALITE-152 + 1.0 + + fr.insee + CA-jL_NATIONALITE-152 + 1.0 + Category + + 724 + + + fr.insee + jL_NATIONALITE-153 + 1.0 + + fr.insee + CA-jL_NATIONALITE-153 + 1.0 + Category + + 026 + + + fr.insee + jL_NATIONALITE-154 + 1.0 + + fr.insee + CA-jL_NATIONALITE-154 + 1.0 + Category + + 649 + + + fr.insee + jL_NATIONALITE-155 + 1.0 + + fr.insee + CA-jL_NATIONALITE-155 + 1.0 + Category + + 350 + + + fr.insee + jL_NATIONALITE-156 + 1.0 + + fr.insee + CA-jL_NATIONALITE-156 + 1.0 + Category + + 081 + + + fr.insee + jL_NATIONALITE-157 + 1.0 + + fr.insee + CA-jL_NATIONALITE-157 + 1.0 + Category + + 662 + + + fr.insee + jL_NATIONALITE-158 + 1.0 + + fr.insee + CA-jL_NATIONALITE-158 + 1.0 + Category + + 829 + + + fr.insee + jL_NATIONALITE-159 + 1.0 + + fr.insee + CA-jL_NATIONALITE-159 + 1.0 + Category + + 625 + + + fr.insee + jL_NATIONALITE-160 + 1.0 + + fr.insee + CA-jL_NATIONALITE-160 + 1.0 + Category + + 442 + + + fr.insee + jL_NATIONALITE-161 + 1.0 + + fr.insee + CA-jL_NATIONALITE-161 + 1.0 + Category + + 801 + + + fr.insee + jL_NATIONALITE-162 + 1.0 + + fr.insee + CA-jL_NATIONALITE-162 + 1.0 + Category + + 520 + + + fr.insee + jL_NATIONALITE-163 + 1.0 + + fr.insee + CA-jL_NATIONALITE-163 + 1.0 + Category + + 504 + + + fr.insee + jL_NATIONALITE-164 + 1.0 + + fr.insee + CA-jL_NATIONALITE-164 + 1.0 + Category + + 708 + + + fr.insee + jL_NATIONALITE-165 + 1.0 + + fr.insee + CA-jL_NATIONALITE-165 + 1.0 + Category + + 060 + + + fr.insee + jL_NATIONALITE-166 + 1.0 + + fr.insee + CA-jL_NATIONALITE-166 + 1.0 + Category + + 826 + + + fr.insee + jL_NATIONALITE-167 + 1.0 + + fr.insee + CA-jL_NATIONALITE-167 + 1.0 + Category + + 449 + + + fr.insee + jL_NATIONALITE-168 + 1.0 + + fr.insee + CA-jL_NATIONALITE-168 + 1.0 + Category + + 010 + + + fr.insee + jL_NATIONALITE-169 + 1.0 + + fr.insee + CA-jL_NATIONALITE-169 + 1.0 + Category + + 023 + + + fr.insee + jL_NATIONALITE-170 + 1.0 + + fr.insee + CA-jL_NATIONALITE-170 + 1.0 + Category + + 644 + + + fr.insee + jL_NATIONALITE-171 + 1.0 + + fr.insee + CA-jL_NATIONALITE-171 + 1.0 + Category + + 931 + + + fr.insee + jL_NATIONALITE-172 + 1.0 + + fr.insee + CA-jL_NATIONALITE-172 + 1.0 + Category + + 372 + + + fr.insee + jL_NATIONALITE-173 + 1.0 + + fr.insee + CA-jL_NATIONALITE-173 + 1.0 + Category + + 066 + + + fr.insee + jL_NATIONALITE-174 + 1.0 + + fr.insee + CA-jL_NATIONALITE-174 + 1.0 + Category + + 075 + + + fr.insee + jL_NATIONALITE-175 + 1.0 + + fr.insee + CA-jL_NATIONALITE-175 + 1.0 + Category + + 324 + + + fr.insee + jL_NATIONALITE-176 + 1.0 + + fr.insee + CA-jL_NATIONALITE-176 + 1.0 + Category + + 380 + + + fr.insee + jL_NATIONALITE-177 + 1.0 + + fr.insee + CA-jL_NATIONALITE-177 + 1.0 + Category + + 465 + + + fr.insee + jL_NATIONALITE-178 + 1.0 + + fr.insee + CA-jL_NATIONALITE-178 + 1.0 + Category + + 042 + + + fr.insee + jL_NATIONALITE-179 + 1.0 + + fr.insee + CA-jL_NATIONALITE-179 + 1.0 + Category + + 467 + + + fr.insee + jL_NATIONALITE-180 + 1.0 + + fr.insee + CA-jL_NATIONALITE-180 + 1.0 + Category + + 806 + + + fr.insee + jL_NATIONALITE-181 + 1.0 + + fr.insee + CA-jL_NATIONALITE-181 + 1.0 + Category + + 428 + + + fr.insee + jL_NATIONALITE-182 + 1.0 + + fr.insee + CA-jL_NATIONALITE-182 + 1.0 + Category + + 819 + + + fr.insee + jL_NATIONALITE-183 + 1.0 + + fr.insee + CA-jL_NATIONALITE-183 + 1.0 + Category + + 311 + + + fr.insee + jL_NATIONALITE-184 + 1.0 + + fr.insee + CA-jL_NATIONALITE-184 + 1.0 + Category + + 632 + + + fr.insee + jL_NATIONALITE-185 + 1.0 + + fr.insee + CA-jL_NATIONALITE-185 + 1.0 + Category + + 035 + + + fr.insee + jL_NATIONALITE-186 + 1.0 + + fr.insee + CA-jL_NATIONALITE-186 + 1.0 + Category + + 248 + + + fr.insee + jL_NATIONALITE-187 + 1.0 + + fr.insee + CA-jL_NATIONALITE-187 + 1.0 + Category + + 094 + + + fr.insee + jL_NATIONALITE-188 + 1.0 + + fr.insee + CA-jL_NATIONALITE-188 + 1.0 + Category + + 355 + + + fr.insee + jL_NATIONALITE-189 + 1.0 + + fr.insee + CA-jL_NATIONALITE-189 + 1.0 + Category + + 037 + + + fr.insee + jL_NATIONALITE-190 + 1.0 + + fr.insee + CA-jL_NATIONALITE-190 + 1.0 + Category + + 264 + + + fr.insee + jL_NATIONALITE-191 + 1.0 + + fr.insee + CA-jL_NATIONALITE-191 + 1.0 + Category + + 706 + + + fr.insee + jL_NATIONALITE-192 + 1.0 + + fr.insee + CA-jL_NATIONALITE-192 + 1.0 + Category + + 063 + + + fr.insee + jL_NATIONALITE-193 + 1.0 + + fr.insee + CA-jL_NATIONALITE-193 + 1.0 + Category + + 091 + + + fr.insee + jL_NATIONALITE-194 + 1.0 + + fr.insee + CA-jL_NATIONALITE-194 + 1.0 + Category + + 342 + + + fr.insee + jL_NATIONALITE-195 + 1.0 + + fr.insee + CA-jL_NATIONALITE-195 + 1.0 + Category + + 224 + + + fr.insee + jL_NATIONALITE-196 + 1.0 + + fr.insee + CA-jL_NATIONALITE-196 + 1.0 + Category + + 669 + + + fr.insee + jL_NATIONALITE-197 + 1.0 + + fr.insee + CA-jL_NATIONALITE-197 + 1.0 + Category + + 388 + + + fr.insee + jL_NATIONALITE-198 + 1.0 + + fr.insee + CA-jL_NATIONALITE-198 + 1.0 + Category + + 728 + + + fr.insee + jL_NATIONALITE-199 + 1.0 + + fr.insee + CA-jL_NATIONALITE-199 + 1.0 + Category + + 030 + + + fr.insee + jL_NATIONALITE-200 + 1.0 + + fr.insee + CA-jL_NATIONALITE-200 + 1.0 + Category + + 036 + + + fr.insee + jL_NATIONALITE-201 + 1.0 + + fr.insee + CA-jL_NATIONALITE-201 + 1.0 + Category + + 492 + + + fr.insee + jL_NATIONALITE-202 + 1.0 + + fr.insee + CA-jL_NATIONALITE-202 + 1.0 + Category + + 393 + + + fr.insee + jL_NATIONALITE-203 + 1.0 + + fr.insee + CA-jL_NATIONALITE-203 + 1.0 + Category + + 608 + + + fr.insee + jL_NATIONALITE-204 + 1.0 + + fr.insee + CA-jL_NATIONALITE-204 + 1.0 + Category + + 082 + + + fr.insee + jL_NATIONALITE-205 + 1.0 + + fr.insee + CA-jL_NATIONALITE-205 + 1.0 + Category + + 736 + + + fr.insee + jL_NATIONALITE-206 + 1.0 + + fr.insee + CA-jL_NATIONALITE-206 + 1.0 + Category + + 352 + + + fr.insee + jL_NATIONALITE-207 + 1.0 + + fr.insee + CA-jL_NATIONALITE-207 + 1.0 + Category + + 244 + + + fr.insee + jL_NATIONALITE-208 + 1.0 + + fr.insee + CA-jL_NATIONALITE-208 + 1.0 + Category + + 933 + + + fr.insee + jL_NATIONALITE-209 + 1.0 + + fr.insee + CA-jL_NATIONALITE-209 + 1.0 + Category + + 061 + + + fr.insee + jL_NATIONALITE-210 + 1.0 + + fr.insee + CA-jL_NATIONALITE-210 + 1.0 + Category + + 925 + + + fr.insee + jL_NATIONALITE-211 + 1.0 + + fr.insee + CA-jL_NATIONALITE-211 + 1.0 + Category + + 680 + + + fr.insee + jL_NATIONALITE-212 + 1.0 + + fr.insee + CA-jL_NATIONALITE-212 + 1.0 + Category + + 721 + + + fr.insee + jL_NATIONALITE-213 + 1.0 + + fr.insee + CA-jL_NATIONALITE-213 + 1.0 + Category + + 702 + + + fr.insee + jL_NATIONALITE-214 + 1.0 + + fr.insee + CA-jL_NATIONALITE-214 + 1.0 + Category + + 280 + + + fr.insee + jL_NATIONALITE-215 + 1.0 + + fr.insee + CA-jL_NATIONALITE-215 + 1.0 + Category + + 817 + + + fr.insee + jL_NATIONALITE-216 + 1.0 + + fr.insee + CA-jL_NATIONALITE-216 + 1.0 + Category + + 930 + + + fr.insee + jL_NATIONALITE-217 + 1.0 + + fr.insee + CA-jL_NATIONALITE-217 + 1.0 + Category + + 472 + + + fr.insee + jL_NATIONALITE-218 + 1.0 + + fr.insee + CA-jL_NATIONALITE-218 + 1.0 + Category + + 212 + + + fr.insee + jL_NATIONALITE-219 + 1.0 + + fr.insee + CA-jL_NATIONALITE-219 + 1.0 + Category + + 052 + + + fr.insee + jL_NATIONALITE-220 + 1.0 + + fr.insee + CA-jL_NATIONALITE-220 + 1.0 + Category + + 080 + + + fr.insee + jL_NATIONALITE-221 + 1.0 + + fr.insee + CA-jL_NATIONALITE-221 + 1.0 + Category + + 822 + + + fr.insee + jL_NATIONALITE-222 + 1.0 + + fr.insee + CA-jL_NATIONALITE-222 + 1.0 + Category + + 072 + + + fr.insee + jL_NATIONALITE-223 + 1.0 + + fr.insee + CA-jL_NATIONALITE-223 + 1.0 + Category + + 524 + + + fr.insee + jL_NATIONALITE-224 + 1.0 + + fr.insee + CA-jL_NATIONALITE-224 + 1.0 + Category + + 816 + + + fr.insee + jL_NATIONALITE-225 + 1.0 + + fr.insee + CA-jL_NATIONALITE-225 + 1.0 + Category + + 045 + + + fr.insee + jL_NATIONALITE-226 + 1.0 + + fr.insee + CA-jL_NATIONALITE-226 + 1.0 + Category + + 484 + + + fr.insee + jL_NATIONALITE-227 + 1.0 + + fr.insee + CA-jL_NATIONALITE-227 + 1.0 + Category + + 690 + + + fr.insee + jL_NATIONALITE-228 + 1.0 + + fr.insee + CA-jL_NATIONALITE-228 + 1.0 + Category + + 653 + + + fr.insee + jL_NATIONALITE-229 + 1.0 + + fr.insee + CA-jL_NATIONALITE-229 + 1.0 + Category + + 095 + + + fr.insee + jL_NATIONALITE-230 + 1.0 + + fr.insee + CA-jL_NATIONALITE-230 + 1.0 + Category + + 378 + + + fr.insee + jL_NATIONALITE-231 + 1.0 + + fr.insee + CA-jL_NATIONALITE-231 + 1.0 + Category + + 382 + + + + + fr.insee + VariableScheme-ji4df4oc5 + 1.0 + + Variable Scheme for the survey + + + fr.insee + jpclzvol + 1.0 + + ADMINISTRATION1 + + + nom_admin_1 + + + + fr.insee + jpcm8pzz + 1.0 + + ADMINISTRATION2 + + + nom_admin_2 + + + + fr.insee + jrixzgdt + 1.0 + + ACTADMIN + + + ACTADMIN label + + + fr.insee + ji4dwdtx-QOP-ji4dunra + 1.0 + OutParameter + + + fr.insee + ji4dwdtx + 1.0 + QuestionItem + + + + + fr.insee + jtqzxbhx + 1.0 + + DATEDEP + + + DATEDEP label + + + fr.insee + ji4jt9p2-QOP-ji4l16gl + 1.0 + OutParameter + + + fr.insee + ji4jt9p2 + 1.0 + QuestionItem + + + + + fr.insee + jrixy68u + 1.0 + + RAISONDEP + + + RAISONDEP label + + + fr.insee + ji4jwh9s-QOP-ji4l168h + 1.0 + OutParameter + + + fr.insee + ji4jwh9s + 1.0 + QuestionItem + + + + + fr.insee + jrixwxwu + 1.0 + + ANNEEFORM + + + ANNEEFORM label + + + fr.insee + ji4jutje-QOP-ji4l7t2j + 1.0 + OutParameter + + + fr.insee + ji4jutje + 1.0 + QuestionItem + + + + + fr.insee + jrixxuqn + 1.0 + + DIPL + + + DIPL label + + + fr.insee + ji4kr456-QOP-jn5yikx6 + 1.0 + OutParameter + + + fr.insee + ji4kr456 + 1.0 + QuestionItem + + + + + fr.insee + jriyohhs + 1.0 + + ANNEEREM + + + ANNEEREM label + + + fr.insee + ji4lkkue-QOP-ji4m4qn9 + 1.0 + OutParameter + + + fr.insee + ji4lkkue + 1.0 + QuestionItem + + + + + fr.insee + jriywyk9 + 1.0 + + SECTEUR + + + SECTEUR label + + + fr.insee + ji4ly1lu-QOP-ji4m2n5u + 1.0 + OutParameter + + + fr.insee + ji4ly1lu + 1.0 + QuestionItem + + + + + fr.insee + jriyre5m + 1.0 + + NBEMPL + + + NBEMPL label + + + fr.insee + ji5r2tmo-QOP-ji5s5f83 + 1.0 + OutParameter + + + fr.insee + ji5r2tmo + 1.0 + QuestionItem + + + + + fr.insee + jriyxu34 + 1.0 + + DUREEPRIV + + + DUREEPRIV label + + + fr.insee + ji5rge4j-QOP-ji5rt610 + 1.0 + OutParameter + + + fr.insee + ji5rge4j + 1.0 + QuestionItem + + + + + fr.insee + jriz1ehj + 1.0 + + PERIODCHOM + + + PERIODCHOM label + + + fr.insee + ji5rui6p-QOP-ji5rs7j6 + 1.0 + OutParameter + + + fr.insee + ji5rui6p + 1.0 + QuestionItem + + + + + fr.insee + jriythhc + 1.0 + + NBCHOM + + + NBCHOM label + + + fr.insee + ji5s11e3-QOP-ji5rzked + 1.0 + OutParameter + + + fr.insee + ji5s11e3 + 1.0 + QuestionItem + + + + + fr.insee + jriytcth + 1.0 + + DUREECHOM + + + DUREECHOM label + + + fr.insee + ji5rv55w-QOP-ji5s9zlm + 1.0 + OutParameter + + + fr.insee + ji5rv55w + 1.0 + QuestionItem + + + mois + + + + fr.insee + jrizdkbz + 1.0 + + ANNEEFP + + + ANNEEFP label + + + fr.insee + ji4ml7ax-QOP-ji4mrm8r + 1.0 + OutParameter + + + fr.insee + ji4ml7ax + 1.0 + QuestionItem + + + + + fr.insee + jriz37oh + 1.0 + + FPDEBUT + + + FPDEBUT label + + + fr.insee + ji4mrfyk-QOP-ji4mpo07 + 1.0 + OutParameter + + + fr.insee + ji4mrfyk + 1.0 + QuestionItem + + + + + fr.insee + jriz13w7 + 1.0 + + MOYENENTREE + + + MOYENENTREE label + + + fr.insee + ji5x2loi-QOP-ji5xds58 + 1.0 + OutParameter + + + fr.insee + ji5x2loi + 1.0 + QuestionItem + + + + + fr.insee + jriz0m8d + 1.0 + + STATUTPP + + + STATUTPP label + + + fr.insee + jn64jhtz-QOP-jn6516e0 + 1.0 + OutParameter + + + fr.insee + jn64jhtz + 1.0 + QuestionItem + + + + + fr.insee + jriz2num + 1.0 + + TITUL + + + TITUL label + + + fr.insee + jjfpa81t-QOP-jjfpk302 + 1.0 + OutParameter + + + fr.insee + jjfpa81t + 1.0 + QuestionItem + + + + + fr.insee + jriz9p62 + 1.0 + + MOYTIT + + + MOYTIT label + + + fr.insee + jjfpeiy4-QOP-jjfpj9ii + 1.0 + OutParameter + + + fr.insee + jjfpeiy4 + 1.0 + QuestionItem + + + + + fr.insee + jriz9p62pr + 1.0 + + MOYTIT_AUTRE + + + MOYTIT_AUTRE label + + + fr.insee + jjfpeiy4-QOP-jprecisez + 1.0 + OutParameter + + + fr.insee + jjfpeiy4 + 1.0 + QuestionItem + + + + + + + fr.insee + jrizi14p + 1.0 + + ANNEE_FONC + + + ANNEE_FONC label + + + fr.insee + jn6515od-QOP-jn6559y5 + 1.0 + OutParameter + + + fr.insee + jn6515od + 1.0 + QuestionItem + + + + + fr.insee + jriz6l2y + 1.0 + + CATPP + + + CATPP label + + + fr.insee + jjfparcg-QOP-jjfq0l78 + 1.0 + OutParameter + + + fr.insee + jjfparcg + 1.0 + QuestionItem + + + + + fr.insee + jrizcz14 + 1.0 + + LIEUFP + + + LIEUFP label + + + fr.insee + jm6g69xh-QOP-jm6grla8 + 1.0 + OutParameter + + + fr.insee + jm6g69xh + 1.0 + QuestionItem + + + + + fr.insee + jrizqrph + 1.0 + + DEPTFP + + + DEPTFP label + + + fr.insee + ji5wosav-QOP-jn65gas0 + 1.0 + OutParameter + + + fr.insee + ji5wosav + 1.0 + QuestionItem + + + + + fr.insee + jriztwql + 1.0 + + CATDEC + + + CATDEC label + + + fr.insee + jjfqa4n7-QOP-jjfqw6fz + 1.0 + OutParameter + + + fr.insee + jjfqa4n7 + 1.0 + QuestionItem + + + + + fr.insee + jrizejo7 + 1.0 + + MINPOSTE + + + MINPOSTE label + + + fr.insee + jje9fape-QOP-jje9ac6d + 1.0 + OutParameter + + + fr.insee + jje9fape + 1.0 + QuestionItem + + + + + fr.insee + jrizh4l2 + 1.0 + + FILIEREPOSTE + + + FILIEREPOSTE label + + + fr.insee + jje9bdqm-QOP-jje9sq60 + 1.0 + OutParameter + + + fr.insee + jje9bdqm + 1.0 + QuestionItem + + + + + fr.insee + jrizfxtv + 1.0 + + AUTRE_ACT + + + AUTRE_ACT label + + + fr.insee + joyirwwm-QOP-joyj305n + 1.0 + OutParameter + + + fr.insee + joyirwwm + 1.0 + QuestionItem + + + + + fr.insee + jrizxrxf + 1.0 + + NBDPT + + + NBDPT label + + + fr.insee + jje9mvyn-QOP-jje9i8cz + 1.0 + OutParameter + + + fr.insee + jje9mvyn + 1.0 + QuestionItem + + + + + fr.insee + jrizspa9 + 1.0 + + CHGMT_SOUHAIT + + + CHGMT_SOUHAIT label + + + fr.insee + jo4k1wz1-QOP-jo4jyad7 + 1.0 + OutParameter + + + fr.insee + jo4k1wz1 + 1.0 + QuestionItem + + + + + fr.insee + jrizs1la + 1.0 + + CHGMT_SUIVI + + + CHGMT_SUIVI label + + + fr.insee + jo4khrya-QOP-jo4kkktz + 1.0 + OutParameter + + + fr.insee + jo4khrya + 1.0 + QuestionItem + + + + + fr.insee + jrj03rog + 1.0 + + PROMOTION + + + PROMOTION label + + + fr.insee + jjfq3jkl-QOP-jjfr4jff + 1.0 + OutParameter + + + fr.insee + jjfq3jkl + 1.0 + QuestionItem + + + + + fr.insee + js332eqo + 1.0 + + RAISPROMO_1 + + + RAISPROMO_1 - Grâce à la réussite d’un ou plusieurs + concours ou examens professionnels + + + fr.insee + jjfqblut-QOP-jui26ui6 + 1.0 + OutParameter + + + fr.insee + jjfqblut + 1.0 + QuestionGrid + + + + + fr.insee + js3315pc + 1.0 + + RAISPROMO_2 + + + + RAISPROMO_2 - «Au choix», sur proposition de votre hiérarchie (en + CAP par exemple) + + + + fr.insee + jjfqblut-QOP-jui1nx58 + 1.0 + OutParameter + + + fr.insee + jjfqblut + 1.0 + QuestionGrid + + + + + fr.insee + js32wpbt + 1.0 + + RAISPROMO_3 + + + RAISPROMO_3 - Par protocole d’accord de 1990 « Plan + Durafour » avec passage automatique de D en C + + + fr.insee + jjfqblut-QOP-jui1mbam + 1.0 + OutParameter + + + fr.insee + jjfqblut + 1.0 + QuestionGrid + + + + + fr.insee + js32z2k8 + 1.0 + + RAISPROMO_4 + + + RAISPROMO_4 - Par intégration des instituteurs dans le + corps des professeurs des écoles (passage de B en A) + + + fr.insee + jjfqblut-QOP-jui269od + 1.0 + OutParameter + + + fr.insee + jjfqblut + 1.0 + QuestionGrid + + + + + fr.insee + js33c1nb + 1.0 + + RAISPROMO_A + + + RAISPROMO_A - Autre + + + fr.insee + jjfqblut-QOP-jui228y2 + 1.0 + OutParameter + + + fr.insee + jjfqblut + 1.0 + QuestionGrid + + + + + fr.insee + js33c1nbpr + 1.0 + + RAISONPROMO_A_LIB + + + RAISONPROMO_A_LIB - Précisez + + + fr.insee + jjfqblut-QOP-jprecisez + 1.0 + OutParameter + + + fr.insee + jjfqblut + 1.0 + QuestionGrid + + + + + + + fr.insee + jrizsnze + 1.0 + + TPSPART + + + TPSPART label + + + fr.insee + jjfr67oy-QOP-jjfr9xmw + 1.0 + OutParameter + + + fr.insee + jjfr67oy + 1.0 + QuestionItem + + + + + fr.insee + ju9vtjhf + 1.0 + + TP_CHOISI + + + TP_CHOISI - Vous êtes à l'initiative de cette demande. + + + + fr.insee + joyk2rvl-QOP-jui1zfaf + 1.0 + OutParameter + + + fr.insee + joyk2rvl + 1.0 + QuestionGrid + + + + + fr.insee + ju9w4zfe + 1.0 + + TP_SUBI + + + TP_SUBI - Votre administration vous en a fait la demande + + + + fr.insee + joyk2rvl-QOP-jui1wh9z + 1.0 + OutParameter + + + fr.insee + joyk2rvl + 1.0 + QuestionGrid + + + + + fr.insee + jrj0gfm2 + 1.0 + + DUREETP + + + DUREETP label + + + fr.insee + jjfqtw3t-QOP-jjfrdxhu + 1.0 + OutParameter + + + fr.insee + jjfqtw3t + 1.0 + QuestionItem + + + + + fr.insee + jrizy03b + 1.0 + + TELETRAV + + + TELETRAV label + + + fr.insee + joyke3ob-QOP-joyktgfk + 1.0 + OutParameter + + + fr.insee + joyke3ob + 1.0 + QuestionItem + + + + + fr.insee + jrku8cu6 + 1.0 + + INTERR_1 + + + INTERR_1 - - pour vous occuper de vos enfants ? (hors + congés maternité ou paternité) + + + fr.insee + jjfr6a91-QOP-jui1od9s + 1.0 + OutParameter + + + fr.insee + jjfr6a91 + 1.0 + QuestionGrid + + + + + fr.insee + jrktro9a + 1.0 + + INTERR_2 + + + INTERR_2 - - pour travailler hors de la fonction publique + ? + + + fr.insee + jjfr6a91-QOP-jui1vq3t + 1.0 + OutParameter + + + fr.insee + jjfr6a91 + 1.0 + QuestionGrid + + + + + fr.insee + jrku2lx7 + 1.0 + + INTERR_3 + + + INTERR_3 - - pour une autre raison (hors formations) ? + + + + fr.insee + jjfr6a91-QOP-jui1ue62 + 1.0 + OutParameter + + + fr.insee + jjfr6a91 + 1.0 + QuestionGrid + + + + + fr.insee + jrktwtkr + 1.0 + + DUREEINTERR_1 + + + DUREEINTERR_1 label + + + fr.insee + jjyd137l-QOP-jjyde4pq + 1.0 + OutParameter + + + fr.insee + jjyd137l + 1.0 + QuestionItem + + + + + fr.insee + jrj0w8a9 + 1.0 + + DUREEINTERR_2 + + + DUREEINTERR_2 label + + + fr.insee + jjzcm9q0-QOP-jjzd3d32 + 1.0 + OutParameter + + + fr.insee + jjzcm9q0 + 1.0 + QuestionItem + + + + + fr.insee + jrj0xe8a + 1.0 + + DUREEINTERR_3 + + + DUREEINTERR_3 label + + + fr.insee + jjzcr77v-QOP-jjzcto35 + 1.0 + OutParameter + + + fr.insee + jjzcr77v + 1.0 + QuestionItem + + + + + fr.insee + js33m1bf + 1.0 + + INDIC_ENSEIGN + + + INDIC_ENSEIGN label + + + fr.insee + jjfrrtwf-QOP-jjfrdkf5 + 1.0 + OutParameter + + + fr.insee + jjfrrtwf + 1.0 + QuestionItem + + + + + fr.insee + jrj0tfdl + 1.0 + + PLS_ETAB + + + PLS_ETAB label + + + fr.insee + jozds2b9-QOP-jozdr8rz + 1.0 + OutParameter + + + fr.insee + jozds2b9 + 1.0 + QuestionItem + + + + + fr.insee + jrj16xxu + 1.0 + + TPS_TRAV + + + TPS_TRAV label + + + fr.insee + jozdgt4o-QOP-joze1cs7 + 1.0 + OutParameter + + + fr.insee + jozdgt4o + 1.0 + QuestionItem + + + + + fr.insee + jrj10s3x + 1.0 + + NBHEURPROF + + + NBHEURPROF label + + + fr.insee + jjfscd7k-QOP-jjfsda5p + 1.0 + OutParameter + + + fr.insee + jjfscd7k + 1.0 + QuestionItem + + + + + fr.insee + jrj0wsx3 + 1.0 + + NBHEURPREP + + + NBHEURPREP label + + + fr.insee + jjfsq33z-QOP-jjfswh7r + 1.0 + OutParameter + + + fr.insee + jjfsq33z + 1.0 + QuestionItem + + + + + fr.insee + jrj1c2hy + 1.0 + + NBHEURAUTRE + + + NBHEURAUTRE label + + + fr.insee + jjfspjuz-QOP-jjftfr3f + 1.0 + OutParameter + + + fr.insee + jjfspjuz + 1.0 + QuestionItem + + + + + fr.insee + jrj1c06u + 1.0 + + TPS_PREP_VAC + + + TPS_PREP_VAC label + + + fr.insee + jjfrk62q-QOP-jjfrqgfr + 1.0 + OutParameter + + + fr.insee + jjfrk62q + 1.0 + QuestionItem + + + jour(s) + + + + fr.insee + jrj1dg1k + 1.0 + + TPS_PREP_ETE + + + TPS_PREP_ETE label + + + fr.insee + jjfrtikv-QOP-jjfrr11x + 1.0 + OutParameter + + + fr.insee + jjfrtikv + 1.0 + QuestionItem + + + jour(s) + + + + fr.insee + jrj19f06 + 1.0 + + NBHEURHEBDO + + + NBHEURHEBDO label + + + fr.insee + jozf0haj-QOP-jozfemiz + 1.0 + OutParameter + + + fr.insee + jozf0haj + 1.0 + QuestionItem + + + + + fr.insee + jrj12tiw + 1.0 + + NBJOURHEBDO + + + NBJOURHEBDO label + + + fr.insee + jozf688x-QOP-jozfbisb + 1.0 + OutParameter + + + fr.insee + jozf688x + 1.0 + QuestionItem + + + jour(s) + + + + fr.insee + jrj18mgi + 1.0 + + NBCGE + + + NBCGE label + + + fr.insee + jjfrm2qf-QOP-jjfrqs55 + 1.0 + OutParameter + + + fr.insee + jjfrm2qf + 1.0 + QuestionItem + + + jour(s) + + + + fr.insee + jrj1ga49 + 1.0 + + NBRTT + + + NBRTT label + + + fr.insee + jjfrsfl4-QOP-jjfs11gt + 1.0 + OutParameter + + + fr.insee + jjfrsfl4 + 1.0 + QuestionItem + + + jour(s) + + + + fr.insee + jrj1ghby + 1.0 + + NBCONGPRIS + + + NBCONGPRIS label + + + fr.insee + jjfrzvhu-QOP-jjfs8u5a + 1.0 + OutParameter + + + fr.insee + jjfrzvhu + 1.0 + QuestionItem + + + jour(s) + + + + fr.insee + jrj1d2jk + 1.0 + + NBCET + + + NBCET label + + + fr.insee + jjfs3b3c-QOP-jjfsgm0w + 1.0 + OutParameter + + + fr.insee + jjfs3b3c + 1.0 + QuestionItem + + + jour(s) + + + + fr.insee + jrj1m3ol + 1.0 + + NBCET_PRIS + + + NBCET_PRIS label + + + fr.insee + jozfj20z-QOP-jozfvwah + 1.0 + OutParameter + + + fr.insee + jozfj20z + 1.0 + QuestionItem + + + jour(s) + + + + fr.insee + jrj1jb4k + 1.0 + + STOCK_CET + + + STOCK_CET label + + + fr.insee + jozfsqpe-QOP-jozfitrh + 1.0 + OutParameter + + + fr.insee + jozfsqpe + 1.0 + QuestionItem + + + jour(s) + + + + fr.insee + jrj18fms + 1.0 + + JOURSRECUP + + + JOURSRECUP label + + + fr.insee + jrc3ye5q-QOP-jrc4j6mx + 1.0 + OutParameter + + + fr.insee + jrc3ye5q + 1.0 + QuestionItem + + + jour(s) + + + + fr.insee + jrj19o2d + 1.0 + + NBJOURSABS + + + NBJOURSABS label + + + fr.insee + jjfsdz8f-QOP-jozfxq9v + 1.0 + OutParameter + + + fr.insee + jjfsdz8f + 1.0 + QuestionItem + + + jour(s) + + + + fr.insee + jrj1ge0w + 1.0 + + FORMATION + + + FORMATION label + + + fr.insee + jjzrk79r-QOP-jjzrzk7e + 1.0 + OutParameter + + + fr.insee + jjzrk79r + 1.0 + QuestionItem + + + + + fr.insee + jrj1ncyo + 1.0 + + FORMRAISON + + + FORMRAISON label + + + fr.insee + jj5qtb8v-QOP-jjfuqw8h + 1.0 + OutParameter + + + fr.insee + jj5qtb8v + 1.0 + QuestionItem + + + + + fr.insee + jrj1r6jg + 1.0 + + DUREEFORM + + + DUREEFORM label + + + fr.insee + jj5qwesk-QOP-jjful415 + 1.0 + OutParameter + + + fr.insee + jj5qwesk + 1.0 + QuestionItem + + + + + fr.insee + jrj1ltyd + 1.0 + + COUPLE + + + COUPLE label + + + fr.insee + jozgw4j3-QOP-jozh8iwe + 1.0 + OutParameter + + + fr.insee + jozgw4j3 + 1.0 + QuestionItem + + + + + fr.insee + jrj1tn5l + 1.0 + + EMPLOI_CONJ + + + EMPLOI_CONJ label + + + fr.insee + jjin9pqp-QOP-jjioqv2r + 1.0 + OutParameter + + + fr.insee + jjin9pqp + 1.0 + QuestionItem + + + + + fr.insee + jrj1me2v + 1.0 + + ENFANTS + + + ENFANTS label + + + fr.insee + ji5x49d4-QOP-ji5xoepk + 1.0 + OutParameter + + + fr.insee + ji5x49d4 + 1.0 + QuestionItem + + + + + fr.insee + jrj1nudf + 1.0 + + NBENFANTS + + + NBENFANTS label + + + fr.insee + jjinpzje-QOP-jjioyaql + 1.0 + OutParameter + + + fr.insee + jjinpzje + 1.0 + QuestionItem + + + + + fr.insee + jrj22vpq + 1.0 + + ANNEEJEUNE + + + ANNEEJEUNE label + + + fr.insee + jjio3k4v-QOP-jjiovwol + 1.0 + OutParameter + + + fr.insee + jjio3k4v + 1.0 + QuestionItem + + + + + fr.insee + jrj1qly9 + 1.0 + + ANNEEAINE + + + ANNEEAINE label + + + fr.insee + jjintpi8-QOP-jjioptu5 + 1.0 + OutParameter + + + fr.insee + jjintpi8 + 1.0 + QuestionItem + + + + + fr.insee + jrj1zww2 + 1.0 + + NATIONALITE + + + NATIONALITE label + + + fr.insee + jp2u3e8k-QOP-jp2tp7le + 1.0 + OutParameter + + + fr.insee + jp2u3e8k + 1.0 + QuestionItem + + + + + fr.insee + jrj1zltz + 1.0 + + NATIONAISS + + + NATIONAISS label + + + fr.insee + jjioktcf-QOP-jjip19t2 + 1.0 + OutParameter + + + fr.insee + jjioktcf + 1.0 + QuestionItem + + + + + fr.insee + js32yutn + 1.0 + + LIEUNAISS + + + LIEUNAISS label + + + fr.insee + jjiokcqs-QOP-jjip1s8w + 1.0 + OutParameter + + + fr.insee + jjiokcqs + 1.0 + QuestionItem + + + + + fr.insee + js326djh + 1.0 + + PAYSNAISS + + + PAYSNAISS label + + + fr.insee + js329wn3-QOP-js32r76t + 1.0 + OutParameter + + + fr.insee + js329wn3 + 1.0 + QuestionItem + + + + + fr.insee + jrj24z68 + 1.0 + + LIEUNAISSPAR + + + LIEUNAISSPAR label + + + fr.insee + jjioti5q-QOP-jjip8k3v + 1.0 + OutParameter + + + fr.insee + jjioti5q + 1.0 + QuestionItem + + + + + fr.insee + jub93g5s + 1.0 + + PERE + + + PERE - Votre père + + + fr.insee + jp2tn1vq-QOP-jui1t03s + 1.0 + OutParameter + + + fr.insee + jp2tn1vq + 1.0 + QuestionGrid + + + + + fr.insee + jub8l5jm + 1.0 + + MERE + + + MERE - Votre mère + + + fr.insee + jp2tn1vq-QOP-jui1nr60 + 1.0 + OutParameter + + + fr.insee + jp2tn1vq + 1.0 + QuestionGrid + + + + + + fr.insee + INSEE-SIMPSONS-PIS-1 + 1.0 + + SIMPSONS + + + Processing instructions of the Simpsons + questionnaire + + + + fr.insee + INSEE-SIMPSONS-MRS + 1.0 + + Liste de formats numériques et dates de + l'enquête + Numeric and DateTime list for the survey + + + fr.insee + INSEE-COMMUN-MNR-DateTimedate + 1.0 + jj/mm/aaaa + date + + + fr.insee + INSEE-COMMUN-MNR-DateTimedate-MMAAAA + 1.0 + YYYY-MM + gYearMonth + + + fr.insee + INSEE-COMMUN-MNR-DateTimedate-AAAA + 1.0 + YYYY + gYear + + + fr.insee + INSEE-COMMUN-MNR-DateTimedate-DUREEAAMM + 1.0 + PnYnM + duration + + + fr.insee + INSEE-COMMUN-MNR-DateTimedate-DUREEHHMM + 1.0 + PTnHnM + duration + + + fr.insee + INSEE-COMMUN-MNR-DateTimedate-DUREEMOIS + 1.0 + PnM + duration + + + fr.insee + INSEE-COMMUN-MNR-DateTimedate-DUREEJJ + 1.0 + PnD + duration + + + + + fr.insee + StudyUnit-ji4df4oc5 + 1.0 + + + fr.insee + DataCollection-ji4df4oc5 + 1.0 + + fr.insee + QuestionScheme-ji4df4oc5 + 1.0 + QuestionScheme + + + fr.insee + ControlConstructScheme-ji4df4oc5 + 1.0 + ControlConstructScheme + + + fr.insee + InterviewerInstructionScheme-ji4df4oc5 + 1.0 + InterviewerInstructionScheme + + + fr.insee + InstrumentScheme-ji4df4oc5 + 1.0 + + fr.insee + Instrument-ji4df4oc5 + 1.0 + + v1 + + + Enquête auprès des salariés de l'État en 2018 + questionnaire + + A définir + + fr.insee + Sequence-ji4df4oc5 + 1.0 + Sequence + + + + + + diff --git a/src/test/resources/params/in-to-out/household/fr-specific-treatment.xsl b/src/test/resources/params/in-to-out/household/fr-specific-treatment.xsl new file mode 100644 index 000000000..67b47bd94 --- /dev/null +++ b/src/test/resources/params/in-to-out/household/fr-specific-treatment.xsl @@ -0,0 +1,130 @@ + + + + + + + + Template de racine, on applique les templates de tous les enfants + + + + + + + + Template de base pour tous les éléments et tous les attributs, on recopie + simplement en sortie + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/test/resources/params/in-to-out/household/metadata.xml b/src/test/resources/params/in-to-out/household/metadata.xml new file mode 100644 index 000000000..17b6d0929 --- /dev/null +++ b/src/test/resources/params/in-to-out/household/metadata.xml @@ -0,0 +1,37 @@ + + + FPE + FPE + FPE2018 + Pluriannuelle + 2018 + 01 + 6/05/2019 + 31/05/2019 + Paris + 6/05/2019 + L’ + Institut national de la statistique et des études économiques (Insee) + l’Insee + auprès des salariés de l’État. Cette enquête s’insère dans le dispositif européen d’enquêtes sur le coût de la main-d’œuvre et la structure des salaires. + OUI + de salariés de l’État, travaillant pour des ministères ou des établissements publics nationaux, quel que soit leur statut + une vingtaine de minutes + https://particuliers.stat-publique.fr/fpe + de l’Insee + La directrice des statistiques démographiques et sociales + Chantal Cases + F + 2019X081EC + Ministre de l’économie et des finances + 2019 + oui + 25 juillet 2019 + Insee Grand Est – établissement de Nancy – PENM – 15 rue du Général Hulot – CS 54229 – 54042 Nancy cedex  + vous + non + de 33 000 personnes + oui + Enquête auprès des salariés de l’État en 2018 + L’enquête auprès des salariés de l’État a pour objectif de recueillir des informations sur les salariés de la Fonction publique d’État + \ No newline at end of file diff --git a/src/test/resources/params/in-to-out/household/params.xml b/src/test/resources/params/in-to-out/household/params.xml new file mode 100644 index 000000000..4a115341e --- /dev/null +++ b/src/test/resources/params/in-to-out/household/params.xml @@ -0,0 +1,132 @@ + + + + ddi + fr + + ddi-mapping + ddi-dereferencing + ddi-cleaning + ddi-titling + + fr-insert-generic-questions + fr-browsing + fr-modele-coltrane + fr-edit-patron + + fr-insert-welcome + fr-insert-end + fr-specificTreatment + fr-fix-adherence + + + + + household + + fpe-2019-x00 + + + fr + + + + false + + + + false + true + + + + false + false + true + 7 + + + + + 0 + 1 + + + + 12 + + + + + + 14 + +
+ + manual + + + module + + + ouvertureCOL + + + + + + + + + <!-- no-number ; template ; module ; submodule ; unnumbered-filter --> + <Browsing>template</Browsing> + <Sequence> + <!-- niveau template utile car permet de définir la hiérarchie des séquences, alors même qu'il n'est pas numéroté --> + <Level name="template"/> + <Level name="module"> + <!-- toujours affiché --> + <PreSeq/> + <!-- true ; false --> + <NumParent>false</NumParent> + <!-- Affiché seulement si un numéro est affiché pour le parent --> + <PostNumParentSeq/> + <!-- 1 ; A ; a ; I ; i --> + <StyleNumSeq>I</StyleNumSeq> + <!-- Affiché seulement si un numéro est affiché pour la séquence --> + <PostNumSeq> - </PostNumSeq> + </Level> + <!-- pas de numérotation au niveau submodule = pas d'élément --> + <Level name="submodule"/> + </Sequence> + <Question> + <!-- Question niveau module --> + <Level name="module"> + <!-- toujours affiché --> + <PreQuest>➡ </PreQuest> + <!-- true ; false --> + <NumParent>false</NumParent> + <!-- Affiché seulement si un numéro est affiché pour le parent --> + <PostNumParentQuest/> + <!-- 1 ; A ; a ; I ; i --> + <StyleNumQuest>1</StyleNumQuest> + <!-- Affiché seulement si un numéro est affiché pour la question --> + <PostNumQuest>. </PostNumQuest> + </Level> + <!-- La présentation des questions de niveau module et submodule doit être précisée si les deux sont présents ; elle peut être distincte --> + <!-- Question niveau sous-module --> + <Level name="submodule"> + <PreQuest>➡ </PreQuest> + <NumParent>false</NumParent> + <PostNumParentQuest/> + <StyleNumQuest>1</StyleNumQuest> + <PostNumQuest>. </PostNumQuest> + </Level> + </Question> + + + + diff --git a/src/test/resources/params/valorization/parameters-expected.xml b/src/test/resources/params/valorization/parameters-expected.xml new file mode 100644 index 000000000..c2380a19a --- /dev/null +++ b/src/test/resources/params/valorization/parameters-expected.xml @@ -0,0 +1,101 @@ + + + + ddi + odt + ddi-dereferencing + ddi-cleaning + ddi-titling + ddi-markdownToXhtml + + + household + test + + + de + fr + en + + + + false + + + false + true + + + + true + false + false + 56 + , + + + + + 90 + 1 + + + + 12 + + + + + + 150 + +
+ + manual + + + module + + + cnrCOL + medCOL + + + + + + <Browsing>no-number</Browsing> + <Sequence> + <Level name="template"/> + <Level name="module"> + <PreSeq/> + <NumParent>false</NumParent> + <PostNumParentSeq/> + <StyleNumSeq>I</StyleNumSeq> + <PostNumSeq> - </PostNumSeq> + </Level> + <Level name="submodule"/> + </Sequence> + <Question> + <Level name="module"> + <PreQuest>➡ </PreQuest> + <NumParent>false</NumParent> + <PostNumParentQuest></PostNumParentQuest> + <StyleNumQuest>1</StyleNumQuest> + <PostNumQuest>%***%</PostNumQuest> + </Level> + <Level name="submodule"> + <PreQuest>➡ </PreQuest> + <NumParent>false</NumParent> + <PostNumParentQuest/> + <StyleNumQuest>1</StyleNumQuest> + <PostNumQuest>. </PostNumQuest> + </Level> + </Question> + + + diff --git a/src/test/resources/params/valorization/parameters-input.xml b/src/test/resources/params/valorization/parameters-input.xml new file mode 100644 index 000000000..efb8d4bc1 --- /dev/null +++ b/src/test/resources/params/valorization/parameters-input.xml @@ -0,0 +1,85 @@ + + + + ddi + odt + ddi-dereferencing + ddi-cleaning + ddi-titling + ddi-markdownToXhtml + + + household + test + + de + fr + en + + + false + + + false + true + + + + + true + false + false + 56 + , + + + + 90 + + + + 12 + + + + + + 150 + +
+ + manual + + + module + + + cnrCOL + medCOL + + + + <Browsing>no-number</Browsing> + <Sequence> + <Level name="template"/> + <Level name="module"> + <PreSeq/> + <NumParent>false</NumParent> + <PostNumParentSeq/> + <StyleNumSeq>I</StyleNumSeq> + <PostNumSeq> - </PostNumSeq> + </Level> + <Level name="submodule"/> + </Sequence> + <Question> + <Level name="module"> + <PostNumQuest>%***%</PostNumQuest> + </Level> + </Question> + + + From 5f1cad40e39e5be3bdabbfd836a5013907db4593 Mon Sep 17 00:00:00 2001 From: Laurent Caouissin Date: Thu, 3 Oct 2019 10:47:43 +0200 Subject: [PATCH 211/439] Eno params : add java tests --- .../fr/insee/eno/params/TestValidator.java | 99 +++++++++++++++++++ .../TestParameterizedGenerationServiceFr.java | 63 ++++++++++++ 2 files changed, 162 insertions(+) create mode 100644 src/test/java/fr/insee/eno/params/TestValidator.java create mode 100644 src/test/java/fr/insee/eno/params/fr/TestParameterizedGenerationServiceFr.java diff --git a/src/test/java/fr/insee/eno/params/TestValidator.java b/src/test/java/fr/insee/eno/params/TestValidator.java new file mode 100644 index 000000000..ebc9e54a6 --- /dev/null +++ b/src/test/java/fr/insee/eno/params/TestValidator.java @@ -0,0 +1,99 @@ +package fr.insee.eno.params; + +import java.util.Arrays; +import java.util.List; + +import org.junit.Assert; +import org.junit.Test; + +import fr.insee.eno.parameters.InFormat; +import fr.insee.eno.parameters.OutFormat; +import fr.insee.eno.parameters.Pipeline; +import fr.insee.eno.parameters.PostProcessing; +import fr.insee.eno.parameters.PreProcessing; +import fr.insee.eno.params.validation.ValidationMessage; +import fr.insee.eno.params.validation.Validator; +import fr.insee.eno.params.validation.ValidatorImpl; + +public class TestValidator { + + private Validator validator = new ValidatorImpl(); + + @Test + public void testValidatePreProcessings() { + + List preProcessings = Arrays.asList( + PreProcessing.DDI_DEREFERENCING, + PreProcessing.DDI_CLEANING, + PreProcessing.DDI_TITLING, + PreProcessing.POGUES_XML_GOTO_2_ITE); + + Pipeline pipeline = new Pipeline(); + pipeline.setInFormat(InFormat.DDI); + pipeline.getPreProcessing().addAll(preProcessings); + + ValidationMessage valid = validator.validatePreProcessings(pipeline); + + System.out.println(valid.getMessage()); + Assert.assertFalse(valid.isValid()); + + } + + @Test + public void testValidatePostProcessings() { + + List preProcessings = Arrays.asList( + PreProcessing.DDI_DEREFERENCING); + List postProcessings = Arrays.asList( + PostProcessing.FR_BROWSING, + PostProcessing.FR_MODELE_COLTRANE); + + Pipeline pipeline = new Pipeline(); + pipeline.setInFormat(InFormat.DDI); + pipeline.setOutFormat(OutFormat.FR); + pipeline.getPreProcessing().addAll(preProcessings); + pipeline.getPostProcessing().addAll(postProcessings); + + List preProcessings2 = Arrays.asList( + PreProcessing.DDI_DEREFERENCING); + List postProcessings2 = Arrays.asList( + PostProcessing.FR_BROWSING); + + Pipeline pipeline2 = new Pipeline(); + pipeline2.setInFormat(InFormat.DDI); + pipeline2.setOutFormat(OutFormat.POGUES_XML); + pipeline2.getPreProcessing().addAll(preProcessings2); + pipeline2.getPostProcessing().addAll(postProcessings2); + + ValidationMessage valid = validator.validatePostProcessings(pipeline); + ValidationMessage valid2 = validator.validatePostProcessings(pipeline2); + + + + System.out.println(valid.getMessage()); + Assert.assertTrue(valid.isValid()); + System.out.println(valid2.getMessage()); + Assert.assertFalse(valid2.isValid()); + } + + @Test + public void testValidateIn2Out() { + ValidationMessage valid0 = validator.validateIn2Out(InFormat.DDI, OutFormat.FR); + ValidationMessage valid1 = validator.validateIn2Out(InFormat.POGUES_XML, OutFormat.FR); + ValidationMessage valid2 = validator.validateIn2Out(InFormat.DDI, OutFormat.DDI); + ValidationMessage valid3 = validator.validateIn2Out(InFormat.POGUES_XML, OutFormat.DDI); + ValidationMessage valid4 = validator.validateIn2Out(InFormat.DDI, OutFormat.POGUES_XML); + + System.out.println(valid0.getMessage()); + System.out.println(valid1.getMessage()); + System.out.println(valid2.getMessage()); + System.out.println(valid3.getMessage()); + System.out.println(valid4.getMessage()); + + Assert.assertTrue(valid0.isValid()); + Assert.assertFalse(valid1.isValid()); + Assert.assertTrue(valid2.isValid()); + Assert.assertTrue(valid3.isValid()); + Assert.assertTrue(valid4.isValid()); + } +} diff --git a/src/test/java/fr/insee/eno/params/fr/TestParameterizedGenerationServiceFr.java b/src/test/java/fr/insee/eno/params/fr/TestParameterizedGenerationServiceFr.java new file mode 100644 index 000000000..775d13fb5 --- /dev/null +++ b/src/test/java/fr/insee/eno/params/fr/TestParameterizedGenerationServiceFr.java @@ -0,0 +1,63 @@ +package fr.insee.eno.params.fr; + +import java.io.File; + +import org.junit.Assert; +import org.junit.Test; +import org.xmlunit.diff.Diff; + +import fr.insee.eno.ParameterizedGenerationService; +import fr.insee.eno.test.XMLDiff; + +public class TestParameterizedGenerationServiceFr { + + private ParameterizedGenerationService parameterizedGenerationService = new ParameterizedGenerationService(); + + private XMLDiff xmlDiff = new XMLDiff(); + + + @Test + public void householdTest() { + String basePathDDI = "src/test/resources/params/in-to-out/household"; + File input = new File(String.format("%s/ddi.xml", basePathDDI)); + File params = new File(String.format("%s/params.xml", basePathDDI)); + File metadata = new File(String.format("%s/metadata.xml", basePathDDI)); + File specificTreatment = new File(String.format("%s/fr-specific-treatment.xsl", basePathDDI)); + + try { + File outputFile = parameterizedGenerationService.generateQuestionnaire(input, params, metadata, specificTreatment); + File expectedFile = new File(String.format("%s/form.xhtml", basePathDDI)); + Diff diff = xmlDiff.getDiff(outputFile, expectedFile); + Assert.assertFalse(getDiffMessage(diff, basePathDDI), diff.hasDifferences()); + } catch (Exception e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + } + + @Test + public void businessTest() { + String basePathDDI = "src/test/resources/params/in-to-out/business"; + File input = new File(String.format("%s/ddi.xml", basePathDDI)); + File params = new File(String.format("%s/params.xml", basePathDDI)); + File metadata = new File(String.format("%s/metadata.xml", basePathDDI)); + File specificTreatment = new File(String.format("%s/fr-specific-treatment.xsl", basePathDDI)); + + try { + File outputFile = parameterizedGenerationService.generateQuestionnaire(input, params, metadata, specificTreatment); + File expectedFile = new File(String.format("%s/form.xhtml", basePathDDI)); + Diff diff = xmlDiff.getDiff(outputFile, expectedFile); + Assert.assertFalse(getDiffMessage(diff, basePathDDI), diff.hasDifferences()); + } catch (Exception e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + + private String getDiffMessage(Diff diff, String path) { + return String.format("Transformed output for %s should match expected XML document:\n %s", path, + diff.toString()); + } + +} From f0838f2bb9be96f103a8d1cff50be6650c7cd191 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Laporte?= Date: Thu, 3 Oct 2019 14:55:04 +0200 Subject: [PATCH 212/439] Import of debug feature --- debug.xsl | 177 ++ .../xslt/outputs/odt/models-debug.xsl | 2700 +++++++++++++++++ .../resources/xslt/outputs/odt/models.xsl | 8 - .../transformations/ddi2odt/ddi2odt-fixed.xsl | 8 + src/main/scripts/build-ddi2odt-debug.xml | 315 ++ 5 files changed, 3200 insertions(+), 8 deletions(-) create mode 100644 debug.xsl create mode 100644 src/main/resources/xslt/outputs/odt/models-debug.xsl create mode 100644 src/main/scripts/build-ddi2odt-debug.xml diff --git a/debug.xsl b/debug.xsl new file mode 100644 index 000000000..3f49bfca5 --- /dev/null +++ b/debug.xsl @@ -0,0 +1,177 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/xslt/outputs/odt/models-debug.xsl b/src/main/resources/xslt/outputs/odt/models-debug.xsl new file mode 100644 index 000000000..e876fd5c7 --- /dev/null +++ b/src/main/resources/xslt/outputs/odt/models-debug.xsl @@ -0,0 +1,2700 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/xslt/outputs/odt/models.xsl b/src/main/resources/xslt/outputs/odt/models.xsl index ec75ed7b7..aa7e71b60 100644 --- a/src/main/resources/xslt/outputs/odt/models.xsl +++ b/src/main/resources/xslt/outputs/odt/models.xsl @@ -16,14 +16,6 @@ - - - - - - - - diff --git a/src/main/resources/xslt/transformations/ddi2odt/ddi2odt-fixed.xsl b/src/main/resources/xslt/transformations/ddi2odt/ddi2odt-fixed.xsl index 1c44fa232..31def071b 100644 --- a/src/main/resources/xslt/transformations/ddi2odt/ddi2odt-fixed.xsl +++ b/src/main/resources/xslt/transformations/ddi2odt/ddi2odt-fixed.xsl @@ -25,6 +25,14 @@ + + + + + + + + The parameter file used by the stylesheet. diff --git a/src/main/scripts/build-ddi2odt-debug.xml b/src/main/scripts/build-ddi2odt-debug.xml new file mode 100644 index 000000000..b00785fbb --- /dev/null +++ b/src/main/scripts/build-ddi2odt-debug.xml @@ -0,0 +1,315 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 3b59f5fdb73017605e8a16cbae5b9c01537812ae Mon Sep 17 00:00:00 2001 From: Laurent Caouissin Date: Fri, 4 Oct 2019 09:18:17 +0200 Subject: [PATCH 213/439] Update DDIDereferencingPreprocessor.java --- .../eno/preprocessing/DDIDereferencingPreprocessor.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/fr/insee/eno/preprocessing/DDIDereferencingPreprocessor.java b/src/main/java/fr/insee/eno/preprocessing/DDIDereferencingPreprocessor.java index 2f196e8c3..fdd17d3e0 100644 --- a/src/main/java/fr/insee/eno/preprocessing/DDIDereferencingPreprocessor.java +++ b/src/main/java/fr/insee/eno/preprocessing/DDIDereferencingPreprocessor.java @@ -57,8 +57,10 @@ public boolean accept(File dir, String name) { logger.debug("Searching matching files in : " + sUB_TEMP_FOLDER); for (File file : matchCleaningInput) { - cleaningInput = file.getAbsolutePath(); - logger.debug("Found : " + cleaningInput); + if(!file.isDirectory()) { + cleaningInput = file.getAbsolutePath(); + logger.debug("Found : " + cleaningInput); + } } logger.debug("DDIPreprocessing Dereferencing : END"); From 703ae9582430dc7db9ceda563acb132472a01af7 Mon Sep 17 00:00:00 2001 From: Laurent Caouissin Date: Fri, 4 Oct 2019 11:03:59 +0200 Subject: [PATCH 214/439] Eno params : update default parameters - change structure of Accompanying mail --- .../resources/params/default/parameters.xml | 10 ++-- .../schemas/generation/DDI2PDFGeneration.xsd | 8 +--- .../xslt/util/pdf/accompanying-mails.xsl | 46 +++++++++---------- .../params/TestValorizatorParametersImpl.java | 11 +---- .../params/in-to-out/household/params.xml | 6 +-- .../valorization/parameters-expected.xml | 5 +- .../params/valorization/parameters-input.xml | 5 +- 7 files changed, 34 insertions(+), 57 deletions(-) diff --git a/src/main/resources/params/default/parameters.xml b/src/main/resources/params/default/parameters.xml index da35cd512..a22d21b78 100644 --- a/src/main/resources/params/default/parameters.xml +++ b/src/main/resources/params/default/parameters.xml @@ -22,7 +22,7 @@ default - test + test fr @@ -73,14 +73,12 @@ module - - ouvertureCOL - + - + - + <!-- no-number ; template ; module ; submodule ; unnumbered-filter --> diff --git a/src/main/resources/params/schemas/generation/DDI2PDFGeneration.xsd b/src/main/resources/params/schemas/generation/DDI2PDFGeneration.xsd index ac5d78ec3..8177b9430 100644 --- a/src/main/resources/params/schemas/generation/DDI2PDFGeneration.xsd +++ b/src/main/resources/params/schemas/generation/DDI2PDFGeneration.xsd @@ -10,13 +10,7 @@ <xs:element name="Table" type="Table" minOccurs="0" maxOccurs="1"/> <xs:element name="Capture" type="Capture" minOccurs="0" maxOccurs="1"/> <xs:element name="PageBreakBetween" type="PageBreakBetween" minOccurs="0" maxOccurs="1"/> - <xs:element name="AccompanyingMails" minOccurs="0" maxOccurs="1"> - <xs:complexType> - <xs:sequence> - <xs:element name="AccompanyingMail" type="AccompanyingMail" minOccurs="0" maxOccurs="unbounded"/> - </xs:sequence> - </xs:complexType> - </xs:element> + <xs:element name="AccompanyingMail" type="AccompanyingMail" minOccurs="0" maxOccurs="1"/> </xs:sequence> </xs:complexType> diff --git a/src/main/resources/xslt/util/pdf/accompanying-mails.xsl b/src/main/resources/xslt/util/pdf/accompanying-mails.xsl index 3676aa0ca..d9a7e4e69 100644 --- a/src/main/resources/xslt/util/pdf/accompanying-mails.xsl +++ b/src/main/resources/xslt/util/pdf/accompanying-mails.xsl @@ -45,37 +45,37 @@ <xsl:variable name="accompanying-mails-folder"> - <xsl:choose> - <xsl:when test="$parameters//AccompanyingMails/Folder != ''"> - <xsl:value-of select="$parameters//AccompanyingMails/Folder"/> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="$properties//AccompanyingMails/Folder"/> - </xsl:otherwise> - </xsl:choose> + <xsl:value-of select="$properties//AccompanyingMails/Folder"/> </xsl:variable> - - + + <xd:doc> <xd:desc> <xd:p>Root template.</xd:p> </xd:desc> </xd:doc> <xsl:template match="/"> - <xsl:variable name="root" select="."/> - <xsl:apply-templates select="*" mode="keep-cdata"/> - <xsl:for-each select="$parameters//AccompanyingMail"> - <xsl:variable name="accompanying-mails-adress" select="concat('../../../',$accompanying-mails-folder,'/',.,'.fo')"/> - <xsl:variable name="accompanying-mails-page" select="doc($accompanying-mails-adress)"/> - <xsl:result-document href="../../courrier_type_{replace(replace(concat($survey-name,$form-name),'-',''),'_','')}{.}.fo"> - <xsl:apply-templates select="$root/*" mode="keep-cdata"> - <xsl:with-param name="accompanying-mails-page" select="$accompanying-mails-page" as="node()" tunnel="yes"/> - <xsl:with-param name="accompanying-mail" select="." tunnel="yes"/> - </xsl:apply-templates> - </xsl:result-document> - </xsl:for-each> + <xsl:variable name="AccompanyingMail" select="$parameters//AccompanyingMail"/> + <xsl:variable name="accompanying-mails-adress" select="concat('../../../',$accompanying-mails-folder,'/',$AccompanyingMail,'.fo')"/> + <xsl:variable name="accompanying-mails-page"> + <xsl:choose> + <xsl:when test="$AccompanyingMail!=''"> + <xsl:value-of select="doc($accompanying-mails-adress)"/> + </xsl:when> + <xsl:otherwise> + <Empty/> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + <xsl:apply-templates select="./*" mode="keep-cdata"> + <xsl:with-param name="accompanying-mails-page" select="$accompanying-mails-page" as="node()" tunnel="yes"/> + <xsl:with-param name="accompanying-mail" select="$AccompanyingMail" tunnel="yes"/> + </xsl:apply-templates> + + + </xsl:template> - + <xd:doc> <xd:desc> <xd:p>add accompanying mail and cover page.</xd:p> diff --git a/src/test/java/fr/insee/eno/params/TestValorizatorParametersImpl.java b/src/test/java/fr/insee/eno/params/TestValorizatorParametersImpl.java index 94e6ef535..e75ca0aa4 100644 --- a/src/test/java/fr/insee/eno/params/TestValorizatorParametersImpl.java +++ b/src/test/java/fr/insee/eno/params/TestValorizatorParametersImpl.java @@ -32,7 +32,6 @@ import fr.insee.eno.parameters.Parameters; import fr.insee.eno.parameters.Parameters.Languages; import fr.insee.eno.parameters.PdfParameters; -import fr.insee.eno.parameters.PdfParameters.AccompanyingMails; import fr.insee.eno.parameters.Pipeline; import fr.insee.eno.parameters.PostProcessing; import fr.insee.eno.parameters.StudyUnit; @@ -80,15 +79,9 @@ public void setEnoParameters() throws JAXBException, IOException { Format format = new Format(); format.setOrientation(90); pdfParameters.setTable(table); - pdfParameters.setFormat(format); + pdfParameters.setFormat(format); - AccompanyingMails accompanyingMails = new AccompanyingMails(); - - - accompanyingMails.getAccompanyingMail().add(AccompanyingMail.CNR_COL); - accompanyingMails.getAccompanyingMail().add(AccompanyingMail.MED_COL); - - pdfParameters.setAccompanyingMails(accompanyingMails); + pdfParameters.setAccompanyingMail(AccompanyingMail.CNR_COL); GlobalNumerotation globalNumerotation = new GlobalNumerotation(); globalNumerotation.setBrowsing(BrowsingEnum.NO_NUMBER); diff --git a/src/test/resources/params/in-to-out/household/params.xml b/src/test/resources/params/in-to-out/household/params.xml index 4a115341e..e9894d63a 100644 --- a/src/test/resources/params/in-to-out/household/params.xml +++ b/src/test/resources/params/in-to-out/household/params.xml @@ -29,7 +29,7 @@ <Languages> <Language>fr</Language> </Languages> - + <BeginQuestion> <Identification>false</Identification> </BeginQuestion> @@ -72,9 +72,7 @@ <PageBreakBetween> <pdf>module</pdf> </PageBreakBetween> - <AccompanyingMails> - <AccompanyingMail>ouvertureCOL</AccompanyingMail> - </AccompanyingMails> + <AccompanyingMail>ouvertureCOL</AccompanyingMail> </pdf-parameters> <js-parameters/> diff --git a/src/test/resources/params/valorization/parameters-expected.xml b/src/test/resources/params/valorization/parameters-expected.xml index c2380a19a..8bc249404 100644 --- a/src/test/resources/params/valorization/parameters-expected.xml +++ b/src/test/resources/params/valorization/parameters-expected.xml @@ -60,10 +60,7 @@ <PageBreakBetween> <pdf>module</pdf> </PageBreakBetween> - <AccompanyingMails> - <AccompanyingMail>cnrCOL</AccompanyingMail> - <AccompanyingMail>medCOL</AccompanyingMail> - </AccompanyingMails> + <AccompanyingMail>cnrCOL</AccompanyingMail> </pdf-parameters> <js-parameters/> <odt-parameters/> diff --git a/src/test/resources/params/valorization/parameters-input.xml b/src/test/resources/params/valorization/parameters-input.xml index efb8d4bc1..98d707d98 100644 --- a/src/test/resources/params/valorization/parameters-input.xml +++ b/src/test/resources/params/valorization/parameters-input.xml @@ -57,10 +57,7 @@ <PageBreakBetween> <pdf>module</pdf> </PageBreakBetween> - <AccompanyingMails> - <AccompanyingMail>cnrCOL</AccompanyingMail> - <AccompanyingMail>medCOL</AccompanyingMail> - </AccompanyingMails> + <AccompanyingMail>cnrCOL</AccompanyingMail> </pdf-parameters> <Title> <Browsing>no-number</Browsing> From 0a22af628bf5c339d624d3ddc964aaeaca6800e4 Mon Sep 17 00:00:00 2001 From: Laurent Caouissin <laurent.caouissin@insee.fr> Date: Fri, 4 Oct 2019 11:04:59 +0200 Subject: [PATCH 215/439] Eno params (pdf) : add form-name for default --- src/main/resources/xslt/outputs/pdf/models.xsl | 1 + src/main/resources/xslt/util/pdf/edit-structure-page.xsl | 5 +++++ src/main/resources/xslt/util/pdf/insert-cover-page.xsl | 5 ++--- .../xslt/util/pdf/page-model/page-model-business.fo | 1 + .../resources/xslt/util/pdf/page-model/page-model-default.fo | 1 + .../resources/xslt/util/pdf/page-model/page-model-esa.fo | 1 + .../xslt/util/pdf/page-model/page-model-household.fo | 1 + src/test/resources/ddi-to-fo/out.fo | 5 +++-- 8 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/main/resources/xslt/outputs/pdf/models.xsl b/src/main/resources/xslt/outputs/pdf/models.xsl index 3a85824c2..0cf3c7743 100644 --- a/src/main/resources/xslt/outputs/pdf/models.xsl +++ b/src/main/resources/xslt/outputs/pdf/models.xsl @@ -139,6 +139,7 @@ <fo:root> <xsl:copy-of select="$page-model-default//fo:layout-master-set"/> <fo:page-sequence master-reference="A4" initial-page-number="2" force-page-count="odd"> + <fo:title><xsl:value-of select="$survey-name"/></fo:title> <xsl:copy-of select="$page-model-default//fo:static-content"/> <fo:flow flow-name="xsl-region-body" border-collapse="collapse" font-size="10pt"> <xsl:apply-templates select="eno:child-fields($source-context)" mode="source"> diff --git a/src/main/resources/xslt/util/pdf/edit-structure-page.xsl b/src/main/resources/xslt/util/pdf/edit-structure-page.xsl index a6d76345d..268082721 100644 --- a/src/main/resources/xslt/util/pdf/edit-structure-page.xsl +++ b/src/main/resources/xslt/util/pdf/edit-structure-page.xsl @@ -105,6 +105,7 @@ <xsl:variable name="page-model" select="doc($page-model-file-adress)"/> <xsl:variable name="questionnaire-flow" select="root(.)//fo:flow"/> + <xsl:variable name="questionnaire-title" select="root(.)//fo:title"/> <xd:doc> <xd:desc> @@ -142,4 +143,8 @@ <xsl:copy-of select="$questionnaire-flow"/> </xsl:template> + <xsl:template match="fo:title" mode="display"> + <xsl:copy-of select="$questionnaire-title"/> + </xsl:template> + </xsl:stylesheet> \ No newline at end of file diff --git a/src/main/resources/xslt/util/pdf/insert-cover-page.xsl b/src/main/resources/xslt/util/pdf/insert-cover-page.xsl index e89247f3f..7b1642f07 100644 --- a/src/main/resources/xslt/util/pdf/insert-cover-page.xsl +++ b/src/main/resources/xslt/util/pdf/insert-cover-page.xsl @@ -21,8 +21,7 @@ <xd:p>The properties file used by the stylesheet.</xd:p> </xd:desc> </xd:doc> - <xsl:param name="survey-name"/> - <xsl:param name="form-name"/> + <xsl:variable name="form-name" select="//fo:title/text()"/> <xsl:param name="parameters-file"/> <xsl:param name="properties-file"/> <xsl:param name="parameters-node" as="node()" required="no"> @@ -110,7 +109,7 @@ <xsl:if test="$studyUnit='default'"> <xsl:copy> <xsl:copy-of select="@*"/> - <xsl:value-of select="$survey-name"/> + <xsl:value-of select="$form-name"/> </xsl:copy> </xsl:if> </xsl:template> diff --git a/src/main/resources/xslt/util/pdf/page-model/page-model-business.fo b/src/main/resources/xslt/util/pdf/page-model/page-model-business.fo index 31fbdf07c..825a3b5ce 100644 --- a/src/main/resources/xslt/util/pdf/page-model/page-model-business.fo +++ b/src/main/resources/xslt/util/pdf/page-model/page-model-business.fo @@ -36,6 +36,7 @@ </fo:layout-master-set> <fo:page-sequence master-reference="A4" initial-page-number="2" force-page-count="odd"> + <fo:title/> <fo:static-content flow-name="region-before-odd-business"> <fo:block-container absolute-position="absolute" left="190mm" top="5mm" width="5mm" height="5mm"> <fo:block position="absolute" text-align="right"> diff --git a/src/main/resources/xslt/util/pdf/page-model/page-model-default.fo b/src/main/resources/xslt/util/pdf/page-model/page-model-default.fo index d33b6ff5b..3f40f63bd 100644 --- a/src/main/resources/xslt/util/pdf/page-model/page-model-default.fo +++ b/src/main/resources/xslt/util/pdf/page-model/page-model-default.fo @@ -49,6 +49,7 @@ </fo:layout-master-set> <fo:page-sequence master-reference="A4" initial-page-number="2" force-page-count="odd"> + <fo:title/> <fo:static-content flow-name="region-after-even-default"> <fo:block-container absolute-position="absolute" left="90mm" top="5mm" width="33mm" height="10mm"> <fo:block text-align="center"> diff --git a/src/main/resources/xslt/util/pdf/page-model/page-model-esa.fo b/src/main/resources/xslt/util/pdf/page-model/page-model-esa.fo index 0df6eaa1c..a804ad274 100644 --- a/src/main/resources/xslt/util/pdf/page-model/page-model-esa.fo +++ b/src/main/resources/xslt/util/pdf/page-model/page-model-esa.fo @@ -47,6 +47,7 @@ </fo:layout-master-set> <fo:page-sequence master-reference="A4" initial-page-number="2" force-page-count="odd"> + <fo:title/> <fo:static-content flow-name="region-before-odd-esa"> <fo:block-container text-align="left" absolute-position="absolute" left="180mm" width="90mm" height="5mm" top="0mm"> <fo:block> diff --git a/src/main/resources/xslt/util/pdf/page-model/page-model-household.fo b/src/main/resources/xslt/util/pdf/page-model/page-model-household.fo index 87cfece12..6806af2d3 100644 --- a/src/main/resources/xslt/util/pdf/page-model/page-model-household.fo +++ b/src/main/resources/xslt/util/pdf/page-model/page-model-household.fo @@ -48,6 +48,7 @@ </fo:layout-master-set> <fo:page-sequence master-reference="A4" initial-page-number="2" force-page-count="odd"> + <fo:title/> <fo:static-content flow-name="region-before-odd-household"> <fo:block-container absolute-position="absolute" left="0mm" top="0mm" width="5mm" height="5mm"> <fo:block position="absolute" text-align="left"> diff --git a/src/test/resources/ddi-to-fo/out.fo b/src/test/resources/ddi-to-fo/out.fo index 3480fadfb..642772ad3 100644 --- a/src/test/resources/ddi-to-fo/out.fo +++ b/src/test/resources/ddi-to-fo/out.fo @@ -150,7 +150,7 @@ font-family="Liberation Sans" font-size="16pt" font-weight="bold" - text-align="center">simpsons</fo:block> + text-align="center">Questionnaire SIMPSONS</fo:block> </fo:block-container> <fo:block-container absolute-position="absolute" left="15mm" @@ -178,6 +178,7 @@ <fo:page-sequence master-reference="A4" initial-page-number="2" force-page-count="odd"> + <fo:title>Questionnaire SIMPSONS</fo:title> <fo:static-content flow-name="region-after-even-default"> <fo:block-container absolute-position="absolute" left="90mm" @@ -6233,4 +6234,4 @@ <fo:block id="TheVeryLastPage"/> </fo:flow> </fo:page-sequence> -</fo:root> \ No newline at end of file +</fo:root> From b5fd1607e62964eac9eeee8fcc14a7208176377e Mon Sep 17 00:00:00 2001 From: BulotF <francois.bulot@insee.fr> Date: Fri, 4 Oct 2019 11:57:00 +0200 Subject: [PATCH 216/439] Update ddi32toddi33.xsl Bug : $Variable/text() works in oXygen / ant when the variable is a string. It doesn't work with Java. --- src/main/resources/xslt/util/ddi/ddi32toddi33.xsl | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/resources/xslt/util/ddi/ddi32toddi33.xsl b/src/main/resources/xslt/util/ddi/ddi32toddi33.xsl index 7b651cf38..1a7a2e69b 100644 --- a/src/main/resources/xslt/util/ddi/ddi32toddi33.xsl +++ b/src/main/resources/xslt/util/ddi/ddi32toddi33.xsl @@ -9,6 +9,7 @@ version="2.0"> <!-- useful only for surveys with more than 1 questionnaire and used with ant --> + <xsl:variable name="ant-call" as="xs:boolean" select="false()"/> <!-- the first variable is the address of the temporary folder relative to the ddi32toddi33.xsl folder --> <!-- this program will seach for the file generated par dereferencing.xsl : ${TempFolder}/${survey}/ddi/${questionnaire}.tmp --> <xsl:variable name="dereferenced-temporary-files-folder" select="'../../../../../../../../../coltrane-dev/coltrane-eno/src/main/temp/'"/> @@ -150,7 +151,7 @@ <xsl:variable name="derefenced-questionnaire-address" select="concat($dereferenced-temporary-files-folder,$file-name,'/ddi/',$questionnaire-name,'.tmp')"/> <xsl:variable name="dereferenced-questionnaire" as="node()"> <xsl:choose> - <xsl:when test="unparsed-text-available($derefenced-questionnaire-address)"> + <xsl:when test="$ant-call and unparsed-text-available($derefenced-questionnaire-address)"> <xsl:copy-of select="doc($derefenced-questionnaire-address)"/> </xsl:when> <xsl:otherwise> @@ -201,7 +202,7 @@ </xsl:otherwise> </xsl:choose> </xsl:variable> - <xsl:if test="$is-variable-to-reference/text() != ''"> + <xsl:if test="$is-variable-to-reference != ''"> <xsl:element name="r:VariableReference"> <xsl:element name="r:Agency"><xsl:value-of select="r32:Agency"/></xsl:element> <xsl:element name="r:ID"><xsl:value-of select="$variable-id"/></xsl:element> @@ -227,7 +228,7 @@ </xsl:otherwise> </xsl:choose> </xsl:variable> - <xsl:if test="$is-variablegroup-to-reference/text() != ''"> + <xsl:if test="$is-variablegroup-to-reference != ''"> <xsl:element name="r:VariableGroupReference"> <xsl:element name="r:Agency"><xsl:value-of select="r32:Agency"/></xsl:element> <xsl:element name="r:ID"><xsl:value-of select="$variablegroup-id"/></xsl:element> From d80a9bc0b4d070bc18d15827c77b710e76ee3642 Mon Sep 17 00:00:00 2001 From: Laurent Caouissin <laurent.caouissin@insee.fr> Date: Fri, 4 Oct 2019 12:45:51 +0200 Subject: [PATCH 217/439] Eno params : Refactor overloading parameter --- .../eno/params/ValorizatorParametersImpl.java | 110 +++++++++++------- 1 file changed, 66 insertions(+), 44 deletions(-) diff --git a/src/main/java/fr/insee/eno/params/ValorizatorParametersImpl.java b/src/main/java/fr/insee/eno/params/ValorizatorParametersImpl.java index ca57ff33b..eccc95141 100644 --- a/src/main/java/fr/insee/eno/params/ValorizatorParametersImpl.java +++ b/src/main/java/fr/insee/eno/params/ValorizatorParametersImpl.java @@ -30,7 +30,7 @@ public class ValorizatorParametersImpl implements ValorizatorParameters { - private static final Logger logger = LoggerFactory.getLogger(ValorizatorParametersImpl.class); + private static final Logger LOGGER = LoggerFactory.getLogger(ValorizatorParametersImpl.class); @Override @@ -63,25 +63,23 @@ public File mergeParameters(File enoParameters) throws JAXBException, IllegalArg @Override public ENOParameters mergeEnoParameters(ENOParameters enoParameters) throws JAXBException, IOException, IllegalArgumentException, IllegalAccessException { - logger.info("Merging eno Parameters"); + LOGGER.info("Merging eno Parameters"); ENOParameters enoParametersDefault = getDefaultParameters(); - logger.info("Default parameters read"); + LOGGER.info("Default parameters read"); return mergeEnoParameters(enoParametersDefault, enoParameters); } public <T> T mergeEnoParameters(T enoParamsDefault, T newEnoParams) throws IllegalArgumentException, IllegalAccessException { Class<?> clazz = enoParamsDefault.getClass(); - logger.debug("Name of class "+clazz.getSimpleName()); - Object merged=null; - // List of known "Primitive" java Object and used in xsd model - List<String> PRIMITIVE_JAVA_OBJECT = Arrays.asList("Long", "Long[]", "Integer", "Integer[]", "String", "String[]", "Boolean", "boolean[]", "ArrayList", "LinkedHashMap"); - + LOGGER.debug("Class's name : "+clazz.getSimpleName()); + Object merged; // if the class of the object is a Primitive or similar, or an Enumeration, we do a simple merge otherwise: - if(!(clazz.isPrimitive() || clazz.isEnum() || PRIMITIVE_JAVA_OBJECT.contains(clazz.getSimpleName()))){ + if(isComplexeType(clazz)){ merged = enoParamsDefault; // we recover each fields which constitutes the recovered object - for (Field field : getAllFields(new ArrayList<>(), clazz)) { + String className = field.getType().getSimpleName(); + LOGGER.debug(" Name/Type of field :"+field.getName()+"/"+className); field.setAccessible(true); Object enoParamsDefaultValue; @@ -89,51 +87,54 @@ public <T> T mergeEnoParameters(T enoParamsDefault, T newEnoParams) throws Illeg // we recover the value of each enoParamsDefaultValue = field.get(enoParamsDefault); newEnoParamsValue = newEnoParams!=null ? field.get(newEnoParams) : null; - - // Recursive call except in the case of an ArrayList (if empty we keep default value) - if (enoParamsDefaultValue != null) { - String className = enoParamsDefaultValue.getClass().getSimpleName(); - if(className.equals("ArrayList")) { - if(newEnoParamsValue==null || ((ArrayList) newEnoParamsValue).isEmpty()) { - field.set(merged, enoParamsDefaultValue); - logger.debug("ArrayList : No overloaded, default value"); + + if (className != null) { + if(enoParamsDefaultValue!=null) { + + // Special case for List (if empty we keep default value) + if(className.equals(List.class.getSimpleName())) { + if(newEnoParamsValue==null || ((List) newEnoParamsValue).isEmpty()) { + field.set(merged, enoParamsDefaultValue); + LOGGER.debug("List : No overloaded, default value"); + } + else { + // Special case for LevelQuestion and LevelSequence + Class<?> levelClass = ((List) newEnoParamsValue).get(0).getClass(); + if(levelClass.equals(LevelQuestion.class) || levelClass.equals(LevelSequence.class)) { + field.set(merged, mergeListNumerotation(enoParamsDefaultValue, newEnoParamsValue)); + LOGGER.debug("List : Special overloaded"); + } + else { + field.set(merged, newEnoParamsValue); + LOGGER.debug("List : overloaded, new value"); + } + } } else { - // Special case for LevelQuestion and LevelSequence - Class<?> levelClass = ((ArrayList) newEnoParamsValue).get(0).getClass(); - if(levelClass.equals(LevelQuestion.class) || levelClass.equals(LevelSequence.class)) { - ArrayList<LevelAbstract> mergedList = new ArrayList<>(); - for(LevelAbstract levelDefault : (ArrayList<LevelAbstract>) enoParamsDefaultValue) { - int size = mergedList.size(); - for(LevelAbstract levelNew : (ArrayList<LevelAbstract>) newEnoParamsValue) { - if(levelDefault.getName().equals(levelNew.getName())) { - mergedList.add(this.mergeEnoParameters(levelDefault, levelNew)); - } - } - if(mergedList.size()==size) { - mergedList.add(levelDefault); - } - } - field.set(merged, mergedList); - logger.debug("ArrayList : Special overloaded"); + // Recursive call + if(isComplexeType(field.getType())) { + LOGGER.debug("Merging... : recursive call"); + field.set(merged, this.mergeEnoParameters(enoParamsDefaultValue, newEnoParamsValue)); } + // if field's class is a Primitive or similar, or an Enumeration, we do a simple merge. else { - field.set(merged, newEnoParamsValue); - logger.debug("ArrayList : overloaded, new value"); + LOGGER.debug("Simple merge of field : values merged"); + field.set(merged, (newEnoParamsValue != null) ? newEnoParamsValue : enoParamsDefaultValue); } } } else { - // Recursive call - logger.debug("Merging... : recursive call"); - field.set(merged, this.mergeEnoParameters(enoParamsDefaultValue, newEnoParamsValue)); + // Case if defaultValue of field is null + field.set(merged, newEnoParamsValue); } + + } } } else { // merge simple: new value if it is not null, if not the default one - logger.debug("Merging... : values merged"); + LOGGER.debug("Simple merge of simple class : values merged"); merged = (newEnoParams != null) ? newEnoParams : enoParamsDefault; } return (T) merged; @@ -162,7 +163,7 @@ public ENOParameters getParameters(InputStream inputStream) throws JAXBException if (inputStream == null) return null; - logger.debug("Preparing to translate from XML to java"); + LOGGER.debug("Preparing to translate from XML to java"); @@ -181,7 +182,7 @@ public ENOParameters getParameters(StreamSource xmlStream) throws JAXBException, if (xmlStream == null) return null; - logger.debug("Preparing to translate from XML to java"); + LOGGER.debug("Preparing to translate from XML to java"); JAXBContext context = JAXBContext.newInstance(ENOParameters.class); Unmarshaller unmarshaller = context.createUnmarshaller(); @@ -207,13 +208,34 @@ public void afterUnmarshal(Object target, Object parent) { public List<Field> getAllFields(List<Field> fields, Class<?> type) { fields.addAll(Arrays.asList(type.getDeclaredFields())); - if (type.getSuperclass() != null) { getAllFields(fields, type.getSuperclass()); } return fields; } + + + public List<LevelAbstract> mergeListNumerotation(Object enoParamsDefaultValue, Object newEnoParamsValue) throws IllegalArgumentException, IllegalAccessException { + List<LevelAbstract> mergedList = new ArrayList<>(); + for(LevelAbstract levelDefault : (List<LevelAbstract>) enoParamsDefaultValue) { + int size = mergedList.size(); + for(LevelAbstract levelNew : (List<LevelAbstract>) newEnoParamsValue) { + if(levelDefault.getName().equals(levelNew.getName())) { + mergedList.add(this.mergeEnoParameters(levelDefault, levelNew)); + } + } + if(mergedList.size()==size) { + mergedList.add(levelDefault); + } + } + return mergedList; + } + + public boolean isComplexeType(Class<?> clazz) { + List<String> PRIMITIVE_JAVA_OBJECT = Arrays.asList("Long", "Long[]", "Integer", "Integer[]", "String", "String[]", "Boolean", "boolean[]", "ArrayList", "LinkedHashMap"); + return !(clazz.isPrimitive() || clazz.isEnum() || PRIMITIVE_JAVA_OBJECT.contains(clazz.getSimpleName())); + } } From 2298ee87f73933ec1a95f678c902939671af8ba8 Mon Sep 17 00:00:00 2001 From: Laurent Caouissin <laurent.caouissin@insee.fr> Date: Fri, 4 Oct 2019 12:46:34 +0200 Subject: [PATCH 218/439] Eno params : update default params - add test for overloading parameters --- src/main/resources/params/default/parameters.xml | 2 +- .../fr/insee/eno/params/TestValorizatorParametersImpl.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/resources/params/default/parameters.xml b/src/main/resources/params/default/parameters.xml index a22d21b78..bcfde2e08 100644 --- a/src/main/resources/params/default/parameters.xml +++ b/src/main/resources/params/default/parameters.xml @@ -73,7 +73,7 @@ <PageBreakBetween> <pdf>module</pdf> </PageBreakBetween> - <AccompanyingMail/> + <AccompanyingMail></AccompanyingMail> </pdf-parameters> <js-parameters/> diff --git a/src/test/java/fr/insee/eno/params/TestValorizatorParametersImpl.java b/src/test/java/fr/insee/eno/params/TestValorizatorParametersImpl.java index e75ca0aa4..12a5856cc 100644 --- a/src/test/java/fr/insee/eno/params/TestValorizatorParametersImpl.java +++ b/src/test/java/fr/insee/eno/params/TestValorizatorParametersImpl.java @@ -137,6 +137,9 @@ public void testValorizationJavaParameters() { //StudyUnit Assert.assertEquals(StudyUnit.HOUSEHOLD, enoParametersFinal.getParameters().getStudyUnit()); + //AccompanyingMail + Assert.assertEquals(AccompanyingMail.CNR_COL, enoParametersFinal.getParameters().getPdfParameters().getAccompanyingMail()); + debut = System.currentTimeMillis(); Path outPath = Paths.get(Constants.TEMP_FOLDER_PATH + "/parameters-new.xml"); From 9600f118e346a8a7ff40565a2a00d01b7074fa94 Mon Sep 17 00:00:00 2001 From: Laurent Caouissin <laurent.caouissin@insee.fr> Date: Fri, 4 Oct 2019 12:56:14 +0200 Subject: [PATCH 219/439] Eno params : update name of var --- .../insee/eno/params/ValorizatorParametersImpl.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/fr/insee/eno/params/ValorizatorParametersImpl.java b/src/main/java/fr/insee/eno/params/ValorizatorParametersImpl.java index eccc95141..15f068fb9 100644 --- a/src/main/java/fr/insee/eno/params/ValorizatorParametersImpl.java +++ b/src/main/java/fr/insee/eno/params/ValorizatorParametersImpl.java @@ -70,14 +70,14 @@ public ENOParameters mergeEnoParameters(ENOParameters enoParameters) throws JAXB } public <T> T mergeEnoParameters(T enoParamsDefault, T newEnoParams) throws IllegalArgumentException, IllegalAccessException { - Class<?> clazz = enoParamsDefault.getClass(); - LOGGER.debug("Class's name : "+clazz.getSimpleName()); + Class<?> objectClass = enoParamsDefault.getClass(); + LOGGER.debug("Class's name : "+objectClass.getSimpleName()); Object merged; // if the class of the object is a Primitive or similar, or an Enumeration, we do a simple merge otherwise: - if(isComplexeType(clazz)){ + if(isComplexeType(objectClass)){ merged = enoParamsDefault; // we recover each fields which constitutes the recovered object - for (Field field : getAllFields(new ArrayList<>(), clazz)) { + for (Field field : getAllFields(new ArrayList<>(), objectClass)) { String className = field.getType().getSimpleName(); LOGGER.debug(" Name/Type of field :"+field.getName()+"/"+className); field.setAccessible(true); @@ -232,9 +232,9 @@ public List<LevelAbstract> mergeListNumerotation(Object enoParamsDefaultValue, O return mergedList; } - public boolean isComplexeType(Class<?> clazz) { + public boolean isComplexeType(Class<?> objectClass) { List<String> PRIMITIVE_JAVA_OBJECT = Arrays.asList("Long", "Long[]", "Integer", "Integer[]", "String", "String[]", "Boolean", "boolean[]", "ArrayList", "LinkedHashMap"); - return !(clazz.isPrimitive() || clazz.isEnum() || PRIMITIVE_JAVA_OBJECT.contains(clazz.getSimpleName())); + return !(objectClass.isPrimitive() || objectClass.isEnum() || PRIMITIVE_JAVA_OBJECT.contains(objectClass.getSimpleName())); } From 3afa3eba1e8236c39c9f3ef0411c3e9f5d19a03e Mon Sep 17 00:00:00 2001 From: Laurent Caouissin <laurent.caouissin@insee.fr> Date: Fri, 4 Oct 2019 13:23:17 +0200 Subject: [PATCH 220/439] Eno params : delete useless file --- src/main/resources/params/parameters_full.xml | 108 ------------------ src/main/resources/xslt/util/fr/jointure.xsl | 35 ------ 2 files changed, 143 deletions(-) delete mode 100644 src/main/resources/params/parameters_full.xml delete mode 100644 src/main/resources/xslt/util/fr/jointure.xsl diff --git a/src/main/resources/params/parameters_full.xml b/src/main/resources/params/parameters_full.xml deleted file mode 100644 index 8dd265f88..000000000 --- a/src/main/resources/params/parameters_full.xml +++ /dev/null @@ -1,108 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<Parameters> - <Title> - <!-- no-number ; template ; module ; submodule ; unnumbered-filter --> - <Browsing>module</Browsing> - <Sequence> - <!-- niveau template utile car permet de définir la hiérarchie des séquences, alors même qu'il n'est pas numéroté --> - <Level name="template"/> - <Level name="module"> - <!-- toujours affiché --> - <PreSeq/> - <!-- Y ; N --> - <NumParent>N</NumParent> - <!-- Affiché seulement si un numéro est affiché pour le parent --> - <PostNumParentSeq/> - <!-- 1 ; A ; a ; I ; i --> - <StyleNumSeq>I</StyleNumSeq> - <!-- Affiché seulement si un numéro est affiché pour la séquence --> - <PostNumSeq> - </PostNumSeq> - </Level> - <!-- pas de numérotation au niveau submodule = pas d'élément --> - <Level name="submodule"/> - </Sequence> - <Question> - <Level name="module"> - <!-- toujours affiché --> - <PreQuest>➡ </PreQuest> - <!-- Y ; N --> - <NumParent>N</NumParent> - <!-- Affiché seulement si un numéro est affiché pour le parent --> - <PostNumParentQuest/> - <!-- 1 ; A ; a ; I ; i --> - <StyleNumQuest>1</StyleNumQuest> - <!-- Affiché seulement si un numéro est affiché pour la question --> - <PostNumQuest>. </PostNumQuest> - </Level> - <!-- La présentation des questions de niveau module et submodule doit être précisée si les deux sont présents ; elle peut être distincte --> - <Level name="submodule"> - <PreQuest>➡ </PreQuest> - <NumParent>N</NumParent> - <PostNumParentQuest/> - <StyleNumQuest>1</StyleNumQuest> - <PostNumQuest>. </PostNumQuest> - </Level> - </Question> - - - - fr - - - Yes - - - default - - - 7 - - - - - - - - oui - - - - - 0 - - - - - - 12 - - - - - 14 - -
- - - - manual - - - - module - - - - ouvertureCOL - - - - true - true - - - diff --git a/src/main/resources/xslt/util/fr/jointure.xsl b/src/main/resources/xslt/util/fr/jointure.xsl deleted file mode 100644 index b13237611..000000000 --- a/src/main/resources/xslt/util/fr/jointure.xsl +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - Template de racine - - - - - - - - - - - - - - Template de base pour tous les éléments et tous les attributs, on recopie simplement en sortie - - - - - - - - - From 5069a59a5f473256a2bf4c70b53a38aac11860b1 Mon Sep 17 00:00:00 2001 From: Laurent Caouissin Date: Fri, 4 Oct 2019 13:23:45 +0200 Subject: [PATCH 221/439] Eno params : fix minor errors --- .../java/fr/insee/eno/params/validation/ValidatorImpl.java | 2 +- src/main/java/fr/insee/eno/preprocessing/DDIPreprocessor.java | 3 --- .../java/fr/insee/eno/preprocessing/PoguesXMLPreprocessor.java | 1 + 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/fr/insee/eno/params/validation/ValidatorImpl.java b/src/main/java/fr/insee/eno/params/validation/ValidatorImpl.java index e46cb0efd..73b7da05d 100644 --- a/src/main/java/fr/insee/eno/params/validation/ValidatorImpl.java +++ b/src/main/java/fr/insee/eno/params/validation/ValidatorImpl.java @@ -90,7 +90,7 @@ public ValidationMessage validatePreProcessings(Pipeline pipeline) { message += order ? "" : "PreProcessings are not in the right order. The right order should be : "+preProcessingsCopy; message += consistency ? "" : "PreProcessings are not valid according to the InFormat ('"+inFormat.value()+"') "; - message += mapping ? "" : "The PostProcessing '"+PostProcessing.FR_MODELE_COLTRANE.value()+"', need the PreProcessing '"+PreProcessing.DDI_MAPPING.value()+"' "; + message += mapping ? "" : "The PreProcessing '"+PostProcessing.FR_MODELE_COLTRANE.value()+"', need the PreProcessing '"+PreProcessing.DDI_MAPPING.value()+"' "; } else { diff --git a/src/main/java/fr/insee/eno/preprocessing/DDIPreprocessor.java b/src/main/java/fr/insee/eno/preprocessing/DDIPreprocessor.java index e76ce5e16..d75618659 100644 --- a/src/main/java/fr/insee/eno/preprocessing/DDIPreprocessor.java +++ b/src/main/java/fr/insee/eno/preprocessing/DDIPreprocessor.java @@ -34,9 +34,6 @@ public File process(File inputFile, byte[] parametersFile, String survey, String InputStream isDDI_DEREFERENCING_XSL = Constants.getInputStreamFromPath(Constants.DDI_DEREFERENCING_XSL); InputStream isInputFile = FileUtils.openInputStream(inputFile); OutputStream osTEMP_NULL_TMP = FileUtils.openOutputStream(Constants.tEMP_NULL_TMP(sUB_TEMP_FOLDER)); - if(saxonService==null) { - saxonService=new XslTransformation(); - } saxonService.transformDereferencing(isInputFile, isDDI_DEREFERENCING_XSL, osTEMP_NULL_TMP, Constants.sUB_TEMP_FOLDER_FILE(survey)); // FIXME 4th param // should be a diff --git a/src/main/java/fr/insee/eno/preprocessing/PoguesXMLPreprocessor.java b/src/main/java/fr/insee/eno/preprocessing/PoguesXMLPreprocessor.java index 94d076eb2..80bc7779b 100644 --- a/src/main/java/fr/insee/eno/preprocessing/PoguesXMLPreprocessor.java +++ b/src/main/java/fr/insee/eno/preprocessing/PoguesXMLPreprocessor.java @@ -17,6 +17,7 @@ * See PoguesXMLPreprocessorGoToTreatment for new implementation * A PoguesXML specific preprocessor. */ +@Deprecated public class PoguesXMLPreprocessor implements Preprocessor { private static final Logger logger = LoggerFactory.getLogger(PoguesXMLPreprocessor.class); From fcf52356d090d3536588264b4abbb2832cef1524 Mon Sep 17 00:00:00 2001 From: Laurent Caouissin Date: Fri, 4 Oct 2019 14:42:23 +0200 Subject: [PATCH 222/439] Eno params : refactoring insert-generic-questions --- src/main/resources/xslt/util/ddi/mapping.xsl | 4 +- .../xslt/util/fr/insert-generic-questions.xsl | 123 +++++++++--------- 2 files changed, 62 insertions(+), 65 deletions(-) diff --git a/src/main/resources/xslt/util/ddi/mapping.xsl b/src/main/resources/xslt/util/ddi/mapping.xsl index 20728e015..421f7e8c6 100644 --- a/src/main/resources/xslt/util/ddi/mapping.xsl +++ b/src/main/resources/xslt/util/ddi/mapping.xsl @@ -1,5 +1,7 @@ - + diff --git a/src/main/resources/xslt/util/fr/insert-generic-questions.xsl b/src/main/resources/xslt/util/fr/insert-generic-questions.xsl index cf4dba430..560362e92 100644 --- a/src/main/resources/xslt/util/fr/insert-generic-questions.xsl +++ b/src/main/resources/xslt/util/fr/insert-generic-questions.xsl @@ -80,18 +80,27 @@ - - - - - + + + + + + - - - + + + + + + + + + + + @@ -102,14 +111,8 @@ - - - - - - - - + + @@ -120,16 +123,12 @@ - - - - - - - - - - + + + + + + @@ -319,23 +318,22 @@ - + - - - + + + - - - - + + - - - + + + + @@ -347,11 +345,12 @@ - - - - - + + + + + + @@ -365,9 +364,17 @@ - - - + + + + + + + + + + + @@ -391,14 +398,8 @@ - - - - - - - - + + @@ -422,17 +423,11 @@ - - - - - - - - - - - + + + + + \ No newline at end of file From afbd0b52122030a3f8ef5d3fe90d2def7e0527b7 Mon Sep 17 00:00:00 2001 From: Laurent Caouissin Date: Fri, 4 Oct 2019 15:23:37 +0200 Subject: [PATCH 223/439] Eno params : remove spring dependancies --- pom.xml | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/pom.xml b/pom.xml index 07733bb1f..2d5da9285 100644 --- a/pom.xml +++ b/pom.xml @@ -51,7 +51,6 @@ 2.5 9.7.0-8 2.2 - 5.1.5.RELEASE 3.0.1 3.0.0 UTF-8 @@ -96,27 +95,6 @@ 1.7.25 - - - org.springframework - spring-core - ${spring.version} - - - - org.springframework - spring-context - ${spring.version} - - - - org.springframework - spring-test - ${spring.version} - test - - - org.apache.commons From 5a5eab407a290233ad3a8aaf5d9916f60b601207 Mon Sep 17 00:00:00 2001 From: Laurent Caouissin Date: Fri, 4 Oct 2019 15:37:13 +0200 Subject: [PATCH 224/439] Eno params : Folder reorganization --- .../resources/xslt/{util => post-processing}/ddi/mw2xhtml.xsl | 0 .../xslt/{util => post-processing}/ddi/tweak-xhtml-for-ddi.xsl | 0 src/main/resources/xslt/{util => post-processing}/fr/browsing.xsl | 0 .../resources/xslt/{util => post-processing}/fr/edit-patron.xsl | 0 .../resources/xslt/{util => post-processing}/fr/fix-adherence.xsl | 0 .../xslt/{util => post-processing}/fr/fr-specific-treatment.xsl | 0 .../xslt/{util => post-processing}/fr/identification.xsl | 0 .../resources/xslt/{util => post-processing}/fr/insert-end.xsl | 0 .../{util => post-processing}/fr/insert-generic-questions.xsl | 0 .../xslt/{util => post-processing}/fr/insert-welcome.xsl | 0 .../xslt/{util => post-processing}/fr/modele-coltrane.xsl | 0 .../xslt/{util => post-processing}/js/externalize-variables.xsl | 0 .../xslt/{util => post-processing}/js/sort-components.xsl | 0 .../xslt/{util => post-processing}/pdf/accompanying-mails.xsl | 0 .../pdf/accompanying-mails/accompagnementCOL.fo | 0 .../{util => post-processing}/pdf/accompanying-mails/cnrCOL.fo | 0 .../{util => post-processing}/pdf/accompanying-mails/entreeCOL.fo | 0 .../{util => post-processing}/pdf/accompanying-mails/medCOL.fo | 0 .../pdf/accompanying-mails/ouvertureCOL.fo} | 0 .../pdf/accompanying-mails/relanceCOL.fo | 0 .../pdf/accompanying-mails/relanceCOLEM.fo | 0 .../xslt/{util => post-processing}/pdf/edit-structure-page.xsl | 0 .../pdf/end-question/end-question-business.fo | 0 .../pdf/end-question/end-question-default.fo | 0 .../pdf/end-question/end-question-household.fo | 0 .../xslt/{util => post-processing}/pdf/insert-cover-page.xsl | 0 .../xslt/{util => post-processing}/pdf/insert-end-questions.xsl | 0 .../resources/xslt/{util => post-processing}/pdf/mailing-vtl.xsl | 0 .../pdf/page-first/page-first-business.fo | 0 .../pdf/page-first/page-first-default.fo | 0 .../pdf/page-first/page-first-household.fo | 0 .../pdf/page-model/page-model-business.fo | 0 .../pdf/page-model/page-model-default.fo | 0 .../{util => post-processing}/pdf/page-model/page-model-esa.fo | 0 .../pdf/page-model/page-model-household.fo | 0 .../xslt/{util => post-processing}/pdf/pdf-specific-treatment.xsl | 0 src/main/resources/xslt/{util => pre-processing}/ddi/cleaning.xsl | 0 .../resources/xslt/{util => pre-processing}/ddi/dereferencing.xsl | 0 src/main/resources/xslt/{util => pre-processing}/ddi/mapping.xsl | 0 src/main/resources/xslt/{util => pre-processing}/ddi/titling.xsl | 0 .../xslt/{util => pre-processing}/pogues-xml/2suppressionGoto.xsl | 0 .../{util => pre-processing}/pogues-xml/goto-2-if-then-else.xsl | 0 .../pogues-xml/tweak-to-merge-equivalent-ite.xsl | 0 43 files changed, 0 insertions(+), 0 deletions(-) rename src/main/resources/xslt/{util => post-processing}/ddi/mw2xhtml.xsl (100%) rename src/main/resources/xslt/{util => post-processing}/ddi/tweak-xhtml-for-ddi.xsl (100%) rename src/main/resources/xslt/{util => post-processing}/fr/browsing.xsl (100%) rename src/main/resources/xslt/{util => post-processing}/fr/edit-patron.xsl (100%) rename src/main/resources/xslt/{util => post-processing}/fr/fix-adherence.xsl (100%) rename src/main/resources/xslt/{util => post-processing}/fr/fr-specific-treatment.xsl (100%) rename src/main/resources/xslt/{util => post-processing}/fr/identification.xsl (100%) rename src/main/resources/xslt/{util => post-processing}/fr/insert-end.xsl (100%) rename src/main/resources/xslt/{util => post-processing}/fr/insert-generic-questions.xsl (100%) rename src/main/resources/xslt/{util => post-processing}/fr/insert-welcome.xsl (100%) rename src/main/resources/xslt/{util => post-processing}/fr/modele-coltrane.xsl (100%) rename src/main/resources/xslt/{util => post-processing}/js/externalize-variables.xsl (100%) rename src/main/resources/xslt/{util => post-processing}/js/sort-components.xsl (100%) rename src/main/resources/xslt/{util => post-processing}/pdf/accompanying-mails.xsl (100%) rename src/main/resources/xslt/{util => post-processing}/pdf/accompanying-mails/accompagnementCOL.fo (100%) rename src/main/resources/xslt/{util => post-processing}/pdf/accompanying-mails/cnrCOL.fo (100%) rename src/main/resources/xslt/{util => post-processing}/pdf/accompanying-mails/entreeCOL.fo (100%) rename src/main/resources/xslt/{util => post-processing}/pdf/accompanying-mails/medCOL.fo (100%) rename src/main/resources/xslt/{util/pdf/accompanying-mails/ouvertureCol.fo => post-processing/pdf/accompanying-mails/ouvertureCOL.fo} (100%) rename src/main/resources/xslt/{util => post-processing}/pdf/accompanying-mails/relanceCOL.fo (100%) rename src/main/resources/xslt/{util => post-processing}/pdf/accompanying-mails/relanceCOLEM.fo (100%) rename src/main/resources/xslt/{util => post-processing}/pdf/edit-structure-page.xsl (100%) rename src/main/resources/xslt/{util => post-processing}/pdf/end-question/end-question-business.fo (100%) rename src/main/resources/xslt/{util => post-processing}/pdf/end-question/end-question-default.fo (100%) rename src/main/resources/xslt/{util => post-processing}/pdf/end-question/end-question-household.fo (100%) rename src/main/resources/xslt/{util => post-processing}/pdf/insert-cover-page.xsl (100%) rename src/main/resources/xslt/{util => post-processing}/pdf/insert-end-questions.xsl (100%) rename src/main/resources/xslt/{util => post-processing}/pdf/mailing-vtl.xsl (100%) rename src/main/resources/xslt/{util => post-processing}/pdf/page-first/page-first-business.fo (100%) rename src/main/resources/xslt/{util => post-processing}/pdf/page-first/page-first-default.fo (100%) rename src/main/resources/xslt/{util => post-processing}/pdf/page-first/page-first-household.fo (100%) rename src/main/resources/xslt/{util => post-processing}/pdf/page-model/page-model-business.fo (100%) rename src/main/resources/xslt/{util => post-processing}/pdf/page-model/page-model-default.fo (100%) rename src/main/resources/xslt/{util => post-processing}/pdf/page-model/page-model-esa.fo (100%) rename src/main/resources/xslt/{util => post-processing}/pdf/page-model/page-model-household.fo (100%) rename src/main/resources/xslt/{util => post-processing}/pdf/pdf-specific-treatment.xsl (100%) rename src/main/resources/xslt/{util => pre-processing}/ddi/cleaning.xsl (100%) rename src/main/resources/xslt/{util => pre-processing}/ddi/dereferencing.xsl (100%) rename src/main/resources/xslt/{util => pre-processing}/ddi/mapping.xsl (100%) rename src/main/resources/xslt/{util => pre-processing}/ddi/titling.xsl (100%) rename src/main/resources/xslt/{util => pre-processing}/pogues-xml/2suppressionGoto.xsl (100%) rename src/main/resources/xslt/{util => pre-processing}/pogues-xml/goto-2-if-then-else.xsl (100%) rename src/main/resources/xslt/{util => pre-processing}/pogues-xml/tweak-to-merge-equivalent-ite.xsl (100%) diff --git a/src/main/resources/xslt/util/ddi/mw2xhtml.xsl b/src/main/resources/xslt/post-processing/ddi/mw2xhtml.xsl similarity index 100% rename from src/main/resources/xslt/util/ddi/mw2xhtml.xsl rename to src/main/resources/xslt/post-processing/ddi/mw2xhtml.xsl diff --git a/src/main/resources/xslt/util/ddi/tweak-xhtml-for-ddi.xsl b/src/main/resources/xslt/post-processing/ddi/tweak-xhtml-for-ddi.xsl similarity index 100% rename from src/main/resources/xslt/util/ddi/tweak-xhtml-for-ddi.xsl rename to src/main/resources/xslt/post-processing/ddi/tweak-xhtml-for-ddi.xsl diff --git a/src/main/resources/xslt/util/fr/browsing.xsl b/src/main/resources/xslt/post-processing/fr/browsing.xsl similarity index 100% rename from src/main/resources/xslt/util/fr/browsing.xsl rename to src/main/resources/xslt/post-processing/fr/browsing.xsl diff --git a/src/main/resources/xslt/util/fr/edit-patron.xsl b/src/main/resources/xslt/post-processing/fr/edit-patron.xsl similarity index 100% rename from src/main/resources/xslt/util/fr/edit-patron.xsl rename to src/main/resources/xslt/post-processing/fr/edit-patron.xsl diff --git a/src/main/resources/xslt/util/fr/fix-adherence.xsl b/src/main/resources/xslt/post-processing/fr/fix-adherence.xsl similarity index 100% rename from src/main/resources/xslt/util/fr/fix-adherence.xsl rename to src/main/resources/xslt/post-processing/fr/fix-adherence.xsl diff --git a/src/main/resources/xslt/util/fr/fr-specific-treatment.xsl b/src/main/resources/xslt/post-processing/fr/fr-specific-treatment.xsl similarity index 100% rename from src/main/resources/xslt/util/fr/fr-specific-treatment.xsl rename to src/main/resources/xslt/post-processing/fr/fr-specific-treatment.xsl diff --git a/src/main/resources/xslt/util/fr/identification.xsl b/src/main/resources/xslt/post-processing/fr/identification.xsl similarity index 100% rename from src/main/resources/xslt/util/fr/identification.xsl rename to src/main/resources/xslt/post-processing/fr/identification.xsl diff --git a/src/main/resources/xslt/util/fr/insert-end.xsl b/src/main/resources/xslt/post-processing/fr/insert-end.xsl similarity index 100% rename from src/main/resources/xslt/util/fr/insert-end.xsl rename to src/main/resources/xslt/post-processing/fr/insert-end.xsl diff --git a/src/main/resources/xslt/util/fr/insert-generic-questions.xsl b/src/main/resources/xslt/post-processing/fr/insert-generic-questions.xsl similarity index 100% rename from src/main/resources/xslt/util/fr/insert-generic-questions.xsl rename to src/main/resources/xslt/post-processing/fr/insert-generic-questions.xsl diff --git a/src/main/resources/xslt/util/fr/insert-welcome.xsl b/src/main/resources/xslt/post-processing/fr/insert-welcome.xsl similarity index 100% rename from src/main/resources/xslt/util/fr/insert-welcome.xsl rename to src/main/resources/xslt/post-processing/fr/insert-welcome.xsl diff --git a/src/main/resources/xslt/util/fr/modele-coltrane.xsl b/src/main/resources/xslt/post-processing/fr/modele-coltrane.xsl similarity index 100% rename from src/main/resources/xslt/util/fr/modele-coltrane.xsl rename to src/main/resources/xslt/post-processing/fr/modele-coltrane.xsl diff --git a/src/main/resources/xslt/util/js/externalize-variables.xsl b/src/main/resources/xslt/post-processing/js/externalize-variables.xsl similarity index 100% rename from src/main/resources/xslt/util/js/externalize-variables.xsl rename to src/main/resources/xslt/post-processing/js/externalize-variables.xsl diff --git a/src/main/resources/xslt/util/js/sort-components.xsl b/src/main/resources/xslt/post-processing/js/sort-components.xsl similarity index 100% rename from src/main/resources/xslt/util/js/sort-components.xsl rename to src/main/resources/xslt/post-processing/js/sort-components.xsl diff --git a/src/main/resources/xslt/util/pdf/accompanying-mails.xsl b/src/main/resources/xslt/post-processing/pdf/accompanying-mails.xsl similarity index 100% rename from src/main/resources/xslt/util/pdf/accompanying-mails.xsl rename to src/main/resources/xslt/post-processing/pdf/accompanying-mails.xsl diff --git a/src/main/resources/xslt/util/pdf/accompanying-mails/accompagnementCOL.fo b/src/main/resources/xslt/post-processing/pdf/accompanying-mails/accompagnementCOL.fo similarity index 100% rename from src/main/resources/xslt/util/pdf/accompanying-mails/accompagnementCOL.fo rename to src/main/resources/xslt/post-processing/pdf/accompanying-mails/accompagnementCOL.fo diff --git a/src/main/resources/xslt/util/pdf/accompanying-mails/cnrCOL.fo b/src/main/resources/xslt/post-processing/pdf/accompanying-mails/cnrCOL.fo similarity index 100% rename from src/main/resources/xslt/util/pdf/accompanying-mails/cnrCOL.fo rename to src/main/resources/xslt/post-processing/pdf/accompanying-mails/cnrCOL.fo diff --git a/src/main/resources/xslt/util/pdf/accompanying-mails/entreeCOL.fo b/src/main/resources/xslt/post-processing/pdf/accompanying-mails/entreeCOL.fo similarity index 100% rename from src/main/resources/xslt/util/pdf/accompanying-mails/entreeCOL.fo rename to src/main/resources/xslt/post-processing/pdf/accompanying-mails/entreeCOL.fo diff --git a/src/main/resources/xslt/util/pdf/accompanying-mails/medCOL.fo b/src/main/resources/xslt/post-processing/pdf/accompanying-mails/medCOL.fo similarity index 100% rename from src/main/resources/xslt/util/pdf/accompanying-mails/medCOL.fo rename to src/main/resources/xslt/post-processing/pdf/accompanying-mails/medCOL.fo diff --git a/src/main/resources/xslt/util/pdf/accompanying-mails/ouvertureCol.fo b/src/main/resources/xslt/post-processing/pdf/accompanying-mails/ouvertureCOL.fo similarity index 100% rename from src/main/resources/xslt/util/pdf/accompanying-mails/ouvertureCol.fo rename to src/main/resources/xslt/post-processing/pdf/accompanying-mails/ouvertureCOL.fo diff --git a/src/main/resources/xslt/util/pdf/accompanying-mails/relanceCOL.fo b/src/main/resources/xslt/post-processing/pdf/accompanying-mails/relanceCOL.fo similarity index 100% rename from src/main/resources/xslt/util/pdf/accompanying-mails/relanceCOL.fo rename to src/main/resources/xslt/post-processing/pdf/accompanying-mails/relanceCOL.fo diff --git a/src/main/resources/xslt/util/pdf/accompanying-mails/relanceCOLEM.fo b/src/main/resources/xslt/post-processing/pdf/accompanying-mails/relanceCOLEM.fo similarity index 100% rename from src/main/resources/xslt/util/pdf/accompanying-mails/relanceCOLEM.fo rename to src/main/resources/xslt/post-processing/pdf/accompanying-mails/relanceCOLEM.fo diff --git a/src/main/resources/xslt/util/pdf/edit-structure-page.xsl b/src/main/resources/xslt/post-processing/pdf/edit-structure-page.xsl similarity index 100% rename from src/main/resources/xslt/util/pdf/edit-structure-page.xsl rename to src/main/resources/xslt/post-processing/pdf/edit-structure-page.xsl diff --git a/src/main/resources/xslt/util/pdf/end-question/end-question-business.fo b/src/main/resources/xslt/post-processing/pdf/end-question/end-question-business.fo similarity index 100% rename from src/main/resources/xslt/util/pdf/end-question/end-question-business.fo rename to src/main/resources/xslt/post-processing/pdf/end-question/end-question-business.fo diff --git a/src/main/resources/xslt/util/pdf/end-question/end-question-default.fo b/src/main/resources/xslt/post-processing/pdf/end-question/end-question-default.fo similarity index 100% rename from src/main/resources/xslt/util/pdf/end-question/end-question-default.fo rename to src/main/resources/xslt/post-processing/pdf/end-question/end-question-default.fo diff --git a/src/main/resources/xslt/util/pdf/end-question/end-question-household.fo b/src/main/resources/xslt/post-processing/pdf/end-question/end-question-household.fo similarity index 100% rename from src/main/resources/xslt/util/pdf/end-question/end-question-household.fo rename to src/main/resources/xslt/post-processing/pdf/end-question/end-question-household.fo diff --git a/src/main/resources/xslt/util/pdf/insert-cover-page.xsl b/src/main/resources/xslt/post-processing/pdf/insert-cover-page.xsl similarity index 100% rename from src/main/resources/xslt/util/pdf/insert-cover-page.xsl rename to src/main/resources/xslt/post-processing/pdf/insert-cover-page.xsl diff --git a/src/main/resources/xslt/util/pdf/insert-end-questions.xsl b/src/main/resources/xslt/post-processing/pdf/insert-end-questions.xsl similarity index 100% rename from src/main/resources/xslt/util/pdf/insert-end-questions.xsl rename to src/main/resources/xslt/post-processing/pdf/insert-end-questions.xsl diff --git a/src/main/resources/xslt/util/pdf/mailing-vtl.xsl b/src/main/resources/xslt/post-processing/pdf/mailing-vtl.xsl similarity index 100% rename from src/main/resources/xslt/util/pdf/mailing-vtl.xsl rename to src/main/resources/xslt/post-processing/pdf/mailing-vtl.xsl diff --git a/src/main/resources/xslt/util/pdf/page-first/page-first-business.fo b/src/main/resources/xslt/post-processing/pdf/page-first/page-first-business.fo similarity index 100% rename from src/main/resources/xslt/util/pdf/page-first/page-first-business.fo rename to src/main/resources/xslt/post-processing/pdf/page-first/page-first-business.fo diff --git a/src/main/resources/xslt/util/pdf/page-first/page-first-default.fo b/src/main/resources/xslt/post-processing/pdf/page-first/page-first-default.fo similarity index 100% rename from src/main/resources/xslt/util/pdf/page-first/page-first-default.fo rename to src/main/resources/xslt/post-processing/pdf/page-first/page-first-default.fo diff --git a/src/main/resources/xslt/util/pdf/page-first/page-first-household.fo b/src/main/resources/xslt/post-processing/pdf/page-first/page-first-household.fo similarity index 100% rename from src/main/resources/xslt/util/pdf/page-first/page-first-household.fo rename to src/main/resources/xslt/post-processing/pdf/page-first/page-first-household.fo diff --git a/src/main/resources/xslt/util/pdf/page-model/page-model-business.fo b/src/main/resources/xslt/post-processing/pdf/page-model/page-model-business.fo similarity index 100% rename from src/main/resources/xslt/util/pdf/page-model/page-model-business.fo rename to src/main/resources/xslt/post-processing/pdf/page-model/page-model-business.fo diff --git a/src/main/resources/xslt/util/pdf/page-model/page-model-default.fo b/src/main/resources/xslt/post-processing/pdf/page-model/page-model-default.fo similarity index 100% rename from src/main/resources/xslt/util/pdf/page-model/page-model-default.fo rename to src/main/resources/xslt/post-processing/pdf/page-model/page-model-default.fo diff --git a/src/main/resources/xslt/util/pdf/page-model/page-model-esa.fo b/src/main/resources/xslt/post-processing/pdf/page-model/page-model-esa.fo similarity index 100% rename from src/main/resources/xslt/util/pdf/page-model/page-model-esa.fo rename to src/main/resources/xslt/post-processing/pdf/page-model/page-model-esa.fo diff --git a/src/main/resources/xslt/util/pdf/page-model/page-model-household.fo b/src/main/resources/xslt/post-processing/pdf/page-model/page-model-household.fo similarity index 100% rename from src/main/resources/xslt/util/pdf/page-model/page-model-household.fo rename to src/main/resources/xslt/post-processing/pdf/page-model/page-model-household.fo diff --git a/src/main/resources/xslt/util/pdf/pdf-specific-treatment.xsl b/src/main/resources/xslt/post-processing/pdf/pdf-specific-treatment.xsl similarity index 100% rename from src/main/resources/xslt/util/pdf/pdf-specific-treatment.xsl rename to src/main/resources/xslt/post-processing/pdf/pdf-specific-treatment.xsl diff --git a/src/main/resources/xslt/util/ddi/cleaning.xsl b/src/main/resources/xslt/pre-processing/ddi/cleaning.xsl similarity index 100% rename from src/main/resources/xslt/util/ddi/cleaning.xsl rename to src/main/resources/xslt/pre-processing/ddi/cleaning.xsl diff --git a/src/main/resources/xslt/util/ddi/dereferencing.xsl b/src/main/resources/xslt/pre-processing/ddi/dereferencing.xsl similarity index 100% rename from src/main/resources/xslt/util/ddi/dereferencing.xsl rename to src/main/resources/xslt/pre-processing/ddi/dereferencing.xsl diff --git a/src/main/resources/xslt/util/ddi/mapping.xsl b/src/main/resources/xslt/pre-processing/ddi/mapping.xsl similarity index 100% rename from src/main/resources/xslt/util/ddi/mapping.xsl rename to src/main/resources/xslt/pre-processing/ddi/mapping.xsl diff --git a/src/main/resources/xslt/util/ddi/titling.xsl b/src/main/resources/xslt/pre-processing/ddi/titling.xsl similarity index 100% rename from src/main/resources/xslt/util/ddi/titling.xsl rename to src/main/resources/xslt/pre-processing/ddi/titling.xsl diff --git a/src/main/resources/xslt/util/pogues-xml/2suppressionGoto.xsl b/src/main/resources/xslt/pre-processing/pogues-xml/2suppressionGoto.xsl similarity index 100% rename from src/main/resources/xslt/util/pogues-xml/2suppressionGoto.xsl rename to src/main/resources/xslt/pre-processing/pogues-xml/2suppressionGoto.xsl diff --git a/src/main/resources/xslt/util/pogues-xml/goto-2-if-then-else.xsl b/src/main/resources/xslt/pre-processing/pogues-xml/goto-2-if-then-else.xsl similarity index 100% rename from src/main/resources/xslt/util/pogues-xml/goto-2-if-then-else.xsl rename to src/main/resources/xslt/pre-processing/pogues-xml/goto-2-if-then-else.xsl diff --git a/src/main/resources/xslt/util/pogues-xml/tweak-to-merge-equivalent-ite.xsl b/src/main/resources/xslt/pre-processing/pogues-xml/tweak-to-merge-equivalent-ite.xsl similarity index 100% rename from src/main/resources/xslt/util/pogues-xml/tweak-to-merge-equivalent-ite.xsl rename to src/main/resources/xslt/pre-processing/pogues-xml/tweak-to-merge-equivalent-ite.xsl From 826cd24290f6521affd49ec52813df6ccaf75bbd Mon Sep 17 00:00:00 2001 From: Laurent Caouissin Date: Fri, 4 Oct 2019 15:37:34 +0200 Subject: [PATCH 225/439] Eno params : Folder reorganization in Constants --- src/main/java/fr/insee/eno/Constants.java | 37 ++++++++++++++--------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/src/main/java/fr/insee/eno/Constants.java b/src/main/java/fr/insee/eno/Constants.java index 5e2ac155f..6378cbdc4 100644 --- a/src/main/java/fr/insee/eno/Constants.java +++ b/src/main/java/fr/insee/eno/Constants.java @@ -57,20 +57,27 @@ private Constants() { public static final String LABELS_FOLDER = "/lang/fr/"; - // ----- Files - public static final String DDI_DEREFERENCING_XSL = UTIL_FOLDER_PATH + "/ddi/dereferencing.xsl"; - public static final String PARAMETERS_FILE = "/" + PARAMETERS_XML; - public static final String UTIL_DDI_TITLING_XSL = UTIL_FOLDER_PATH + "/ddi/titling.xsl"; - public static final String UTIL_DDI_MAPPING_XSL = UTIL_FOLDER_PATH + "/ddi/mapping.xsl"; - public static final String UTIL_POGUES_XML_SUPP_GOTO_XSL = UTIL_FOLDER_PATH + "/pogues-xml/2suppressionGoto.xsl"; - public static final String UTIL_POGUES_XML_MERGE_ITE_XSL = UTIL_FOLDER_PATH + "/pogues-xml/tweak-to-merge-equivalent-ite.xsl"; - public static final String UTIL_POGUES_XML_GOTO_ITE_XSL = UTIL_FOLDER_PATH + "/pogues-xml/goto-2-if-then-else.xsl"; - public static final String UTIL_DDI_MW2XHTML_XSL = UTIL_FOLDER_PATH + "/ddi/mw2xhtml.xsl"; - public static final String UTIL_DDI_TWEAK_XHTML_FOR_DDI_XSL = UTIL_FOLDER_PATH + "/ddi/tweak-xhtml-for-ddi.xsl"; - public static final String UTIL_DDI_CLEANING_XSL = UTIL_FOLDER_PATH + "/ddi/cleaning.xsl"; + // ----- Files : pre-processing + public static final String PRE_PROCESSING_FOLDER = "/xslt/pre-processing"; + public static final String DDI_DEREFERENCING_XSL = PRE_PROCESSING_FOLDER + "/ddi/dereferencing.xsl"; + public static final String PARAMETERS_FILE = "/" + PARAMETERS_XML; + + public static final String UTIL_DDI_DEREFERENCING_XSL = UTIL_FOLDER_PATH + "/ddi/dereferencing.xsl"; + public static final String UTIL_DDI_TITLING_XSL = PRE_PROCESSING_FOLDER + "/ddi/titling.xsl"; + public static final String UTIL_DDI_MAPPING_XSL = PRE_PROCESSING_FOLDER + "/ddi/mapping.xsl"; + public static final String UTIL_DDI_CLEANING_XSL = PRE_PROCESSING_FOLDER + "/ddi/cleaning.xsl"; + + public static final String UTIL_POGUES_XML_SUPP_GOTO_XSL = PRE_PROCESSING_FOLDER + "/pogues-xml/2suppressionGoto.xsl"; + public static final String UTIL_POGUES_XML_MERGE_ITE_XSL = PRE_PROCESSING_FOLDER + "/pogues-xml/tweak-to-merge-equivalent-ite.xsl"; + public static final String UTIL_POGUES_XML_GOTO_ITE_XSL = PRE_PROCESSING_FOLDER + "/pogues-xml/goto-2-if-then-else.xsl"; + + // post-processing + public static final String POST_PROCESSING_FOLDER = "/xslt/post-processing"; + public static final String UTIL_DDI_MW2XHTML_XSL = POST_PROCESSING_FOLDER + "/ddi/mw2xhtml.xsl"; + public static final String UTIL_DDI_TWEAK_XHTML_FOR_DDI_XSL = POST_PROCESSING_FOLDER + "/ddi/tweak-xhtml-for-ddi.xsl"; + public static final String UTIL_FODS_PREFORMATTING_XSL = UTIL_FOLDER_PATH + "/fods/preformatting.xsl"; public static final String UTIL_XSL_INCORPORATION_XSL = UTIL_FOLDER_PATH + "/xsl/incorporation.xsl"; - public static final String UTIL_DDI_DEREFERENCING_XSL = UTIL_FOLDER_PATH + "/ddi/dereferencing.xsl"; // public static final String PROPERTIES_FILE_FR = CONFIG_FOLDER + "/ddi2fr.xml"; @@ -139,9 +146,9 @@ private Constants() { // ---------- Post-processing files public static final String OUPUTS_FOLDER = "/xslt/outputs/pdf"; - public static final String POST_PROCESSING_FOLDER_PDF = "/xslt/util/pdf"; - public static final String POST_PROCESSING_FOLDER_JS = "/xslt/util/js"; - public static final String POST_PROCESSING_FOLDER_FR = "/xslt/util/fr"; + public static final String POST_PROCESSING_FOLDER_PDF = "/xslt/post-processing/pdf"; + public static final String POST_PROCESSING_FOLDER_JS = "/xslt/post-processing/js"; + public static final String POST_PROCESSING_FOLDER_FR = "/xslt/post-processing/fr"; public static final String TRANSFORMATIONS_CUSTOMIZATION_FO_4PDF = OUPUTS_FOLDER + "/publipostage.xsl"; // ------------ PDF ----------- public static final String TRANSFORMATIONS_CUSTOMIZATION_FO_4PDF_2 = POST_PROCESSING_FOLDER_PDF + "/mailing-vtl.xsl"; From 3d7489994c310518bd5d7c69c4fd0d9e1c9d9454 Mon Sep 17 00:00:00 2001 From: Laurent Caouissin Date: Fri, 4 Oct 2019 15:37:40 +0200 Subject: [PATCH 226/439] Update TestDDIToJS.java --- src/test/java/fr/insee/eno/test/TestDDIToJS.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/test/java/fr/insee/eno/test/TestDDIToJS.java b/src/test/java/fr/insee/eno/test/TestDDIToJS.java index 85ac1ebb8..f90849c4c 100644 --- a/src/test/java/fr/insee/eno/test/TestDDIToJS.java +++ b/src/test/java/fr/insee/eno/test/TestDDIToJS.java @@ -5,7 +5,6 @@ import org.junit.Assert; import org.junit.Test; -import org.springframework.beans.factory.annotation.Autowired; import org.xmlunit.diff.Diff; import fr.insee.eno.GenerationService; From eb41c08d130af43cf2a19e1afa022c7ae36496ba Mon Sep 17 00:00:00 2001 From: Laurent Caouissin Date: Fri, 4 Oct 2019 16:00:29 +0200 Subject: [PATCH 227/439] Eno params : update ant scripts --- src/main/resources/config/ddi2pdf.xml | 8 ++++---- src/main/resources/xslt/outputs/pdf/models.xsl | 2 +- .../xslt/post-processing/pdf/edit-structure-page.xsl | 9 +-------- src/main/scripts/build-ddi2js.xml | 6 +++--- src/main/scripts/build-ddi2odt.xml | 6 +++--- src/main/scripts/build-ddi2pdf.xml | 6 +++--- src/main/scripts/build-ddi2xforms-prod.xml | 8 ++++---- src/main/scripts/build-ddi2xforms-test.xml | 8 ++++---- src/main/scripts/build-js.xml | 4 ++-- src/main/scripts/build-pdf.xml | 10 +++++----- src/main/scripts/build-pogues-xml2ddi.xml | 6 +++--- 11 files changed, 33 insertions(+), 40 deletions(-) diff --git a/src/main/resources/config/ddi2pdf.xml b/src/main/resources/config/ddi2pdf.xml index e72976006..25a5e6541 100644 --- a/src/main/resources/config/ddi2pdf.xml +++ b/src/main/resources/config/ddi2pdf.xml @@ -17,18 +17,18 @@ default - xslt/util/pdf/page-first + xslt/post-processing/pdf/page-first - xslt/util/pdf/accompanying-mails + xslt/post-processing/pdf/accompanying-mails - xslt/util/pdf/end-question + xslt/post-processing/pdf/end-question true true - xslt/util/pdf/page-model + xslt/post-processing/pdf/page-model