From fb4d0412327e816c049478f5a4d0890e5e5bfb5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20S=C3=A9nave?=
<59770457+nsenave@users.noreply.github.com>
Date: Wed, 3 Apr 2024 14:39:46 +0200
Subject: [PATCH] refactor: fix typo in 'inputted' (#185)
---
docs/fr/components/Variables.md | 13 +-
docs/fr/data/README.md | 4 +-
pom.xml | 2 +-
src/main/resources/xsd/LunaticModel.xsd | 8 +-
src/main/resources/xsd/LunaticModelFlat.xsd | 8 +-
src/main/resources/xslt/data/generate-xsd.xsl | 4 +-
src/main/resources/xslt/json-cleaner.xsl | 4 +-
.../questionnaire-suggester-xml-h.xml | 8 +-
src/test/resources/data/in/data.json | 46 +-
src/test/resources/data/in/data.xml | 2 +-
src/test/resources/data/out/data.json | 101 +-
src/test/resources/data/out/data.xml | 2 +-
.../data/out/questionnaire-data.json | 264 ++--
.../resources/data/out/questionnaire-data.xml | 280 ++--
src/test/resources/dummy/form.xml | 280 ++--
src/test/resources/dummy/form_flat.xml | 280 ++--
src/test/resources/examples/simpsons.json | 264 ++--
.../resources/examples/xmlf-2-jsonf/out.json | 264 ++--
.../resources/examples/xmlh-2-jsonf/out.json | 264 ++--
.../resources/examples/xmlh-2-jsonh/out.json | 264 ++--
.../resources/examples/xmlh-2-xmlf/out.xml | 280 ++--
.../label-type-issue/form-hierarchical.xml | 16 +-
.../resources/pairwise/pairwise-flat.json | 1294 +++++++++--------
src/test/resources/pairwise/pairwise-flat.xml | 20 +-
.../pairwise/pairwise-hierarchical-test.xml | 20 +-
.../lb3ei722-lunatic-expected.json | 10 +-
.../lb3ei722-lunatic-hierarchical.xml | 18 +-
27 files changed, 2096 insertions(+), 1924 deletions(-)
diff --git a/docs/fr/components/Variables.md b/docs/fr/components/Variables.md
index 45a2ffa5..b13e484c 100644
--- a/docs/fr/components/Variables.md
+++ b/docs/fr/components/Variables.md
@@ -1,7 +1,6 @@
### Les variables
-Les variables sont toutes externalisées dans un tableau `variables`.
-Elles sont de trois types :
+Les variables sont toutes externalisées dans un tableau `variables`. Elles sont de trois types :
- `EXTERNAL` : variable externe à valoriser
- `COLLECTED` : référence à une variable collectée (issue des `response` dans les composants)
@@ -21,11 +20,11 @@ Strucure du tableau `variables` :
"name": "FAVOURITE_CHARACTERS",
"componentRef": "FAVOURITE_CHARACTERS_COMPONENT",
"values": {
- "PREVIOUS": null,
- "COLLECTED": null,
- "FORCED": null,
- "EDITED": null,
- "INPUTED": null
+ "PREVIOUS": null,
+ "COLLECTED": null,
+ "FORCED": null,
+ "EDITED": null,
+ "INPUTTED": null
}
},
{
diff --git a/docs/fr/data/README.md b/docs/fr/data/README.md
index b55e612b..7517799d 100644
--- a/docs/fr/data/README.md
+++ b/docs/fr/data/README.md
@@ -10,7 +10,7 @@
"COLLECTED": "Collected",
"FORCED": null,
"EDITED": 34,
- "INPUTED": "Inputed"
+ "INPUTTED": "Inputted"
},
"variable2": {
"PREVIOUS": ["previous individu1", "previous individu2"],
@@ -57,7 +57,7 @@
Collected
34
- Inputed
+ Inputted
diff --git a/pom.xml b/pom.xml
index 6be29fd1..09ffe63b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
4.0.0
fr.insee.lunatic
lunatic-model
- 2.5.2
+ 2.6.0
jar
diff --git a/src/main/resources/xsd/LunaticModel.xsd b/src/main/resources/xsd/LunaticModel.xsd
index 2cc10d47..e4f2f5ad 100644
--- a/src/main/resources/xsd/LunaticModel.xsd
+++ b/src/main/resources/xsd/LunaticModel.xsd
@@ -304,9 +304,9 @@
-
+
-
+
@@ -316,7 +316,7 @@
-
+
@@ -326,7 +326,7 @@
-
+
diff --git a/src/main/resources/xsd/LunaticModelFlat.xsd b/src/main/resources/xsd/LunaticModelFlat.xsd
index ec86ac8f..4eb68c87 100644
--- a/src/main/resources/xsd/LunaticModelFlat.xsd
+++ b/src/main/resources/xsd/LunaticModelFlat.xsd
@@ -293,9 +293,9 @@
-
+
-
+
@@ -305,7 +305,7 @@
-
+
@@ -315,7 +315,7 @@
-
+
diff --git a/src/main/resources/xslt/data/generate-xsd.xsl b/src/main/resources/xslt/data/generate-xsd.xsl
index 3d5cb754..8c5d70b4 100644
--- a/src/main/resources/xslt/data/generate-xsd.xsl
+++ b/src/main/resources/xslt/data/generate-xsd.xsl
@@ -7,7 +7,7 @@
-
+
-
+
diff --git a/src/main/resources/xslt/json-cleaner.xsl b/src/main/resources/xslt/json-cleaner.xsl
index a9e80e91..24f15245 100644
--- a/src/main/resources/xslt/json-cleaner.xsl
+++ b/src/main/resources/xslt/json-cleaner.xsl
@@ -25,14 +25,14 @@
-
+
-
+
diff --git a/src/test/resources/conversion/questionnaire-suggester-xml-h.xml b/src/test/resources/conversion/questionnaire-suggester-xml-h.xml
index 5c09201f..248fa564 100644
--- a/src/test/resources/conversion/questionnaire-suggester-xml-h.xml
+++ b/src/test/resources/conversion/questionnaire-suggester-xml-h.xml
@@ -192,7 +192,7 @@
-
+
@@ -202,7 +202,7 @@
-
+
@@ -212,7 +212,7 @@
-
+
@@ -222,7 +222,7 @@
-
+
diff --git a/src/test/resources/data/in/data.json b/src/test/resources/data/in/data.json
index ef18ffe4..f1b0b7ae 100644
--- a/src/test/resources/data/in/data.json
+++ b/src/test/resources/data/in/data.json
@@ -5,20 +5,56 @@
"COLLECTED": "Collected",
"FORCED": null,
"EDITED": 34,
- "INPUTED": "Inputed"
+ "INPUTTED": "Inputted"
},
"variable2": {
- "COLLECTED": ["individu1","individu2"]
+ "COLLECTED": [
+ "individu1",
+ "individu2"
+ ]
},
"variable3": {
- "COLLECTED": [["individu1","individu2"],["individu3","individu4"]]
+ "COLLECTED": [
+ [
+ "individu1",
+ "individu2"
+ ],
+ [
+ "individu3",
+ "individu4"
+ ]
+ ]
},
"variable4": {
- "COLLECTED": [[[true,true],["individu3","individu4"]],[["individu5","individu6"],["individu7","individu8"]]]
+ "COLLECTED": [
+ [
+ [
+ true,
+ true
+ ],
+ [
+ "individu3",
+ "individu4"
+ ]
+ ],
+ [
+ [
+ "individu5",
+ "individu6"
+ ],
+ [
+ "individu7",
+ "individu8"
+ ]
+ ]
+ ]
}
},
"EXTERNAL": {
- "variableExt1": ["External var","External var2"],
+ "variableExt1": [
+ "External var",
+ "External var2"
+ ],
"variableExt2": "External var2"
}
}
\ No newline at end of file
diff --git a/src/test/resources/data/in/data.xml b/src/test/resources/data/in/data.xml
index 09dd52fe..f74da042 100644
--- a/src/test/resources/data/in/data.xml
+++ b/src/test/resources/data/in/data.xml
@@ -6,7 +6,7 @@
Collected
34
- Inputed
+ Inputted
diff --git a/src/test/resources/data/out/data.json b/src/test/resources/data/out/data.json
index 2768ea06..16f1746a 100644
--- a/src/test/resources/data/out/data.json
+++ b/src/test/resources/data/out/data.json
@@ -1,41 +1,60 @@
-
- { "COLLECTED" :
- { "variable1" :
- { "PREVIOUS" : "Previous",
- "COLLECTED" : "Collected",
- "FORCED" : null,
- "EDITED" : 34,
- "INPUTED" : "Inputed" },
- "variable2" :
- { "COLLECTED" :
- [ "individu1",
- "individu2" ] },
- "variable3" :
- { "COLLECTED" :
- [
- [ "individu1",
- "individu2" ],
-
- [ "individu3",
- "individu4" ] ] },
- "variable4" :
- { "COLLECTED" :
- [
- [
- [ true,
- true ],
-
- [ "individu3",
- "individu4" ] ],
-
- [
- [ "individu5",
- "individu6" ],
-
- [ "individu7",
- "individu8" ] ] ] } },
- "EXTERNAL" :
- { "variableExt1" :
- [ "External var",
- "External var2" ],
- "variableExt2" : "External var2" } }
\ No newline at end of file
+{
+ "COLLECTED": {
+ "variable1": {
+ "PREVIOUS": "Previous",
+ "COLLECTED": "Collected",
+ "FORCED": null,
+ "EDITED": 34,
+ "INPUTTED": "Inputted"
+ },
+ "variable2": {
+ "COLLECTED": [
+ "individu1",
+ "individu2"
+ ]
+ },
+ "variable3": {
+ "COLLECTED": [
+ [
+ "individu1",
+ "individu2"
+ ],
+ [
+ "individu3",
+ "individu4"
+ ]
+ ]
+ },
+ "variable4": {
+ "COLLECTED": [
+ [
+ [
+ true,
+ true
+ ],
+ [
+ "individu3",
+ "individu4"
+ ]
+ ],
+ [
+ [
+ "individu5",
+ "individu6"
+ ],
+ [
+ "individu7",
+ "individu8"
+ ]
+ ]
+ ]
+ }
+ },
+ "EXTERNAL": {
+ "variableExt1": [
+ "External var",
+ "External var2"
+ ],
+ "variableExt2": "External var2"
+ }
+}
\ No newline at end of file
diff --git a/src/test/resources/data/out/data.xml b/src/test/resources/data/out/data.xml
index 5d6395ea..3b8c6315 100644
--- a/src/test/resources/data/out/data.xml
+++ b/src/test/resources/data/out/data.xml
@@ -6,7 +6,7 @@
Collected
34
- Inputed
+ Inputted
diff --git a/src/test/resources/data/out/questionnaire-data.json b/src/test/resources/data/out/questionnaire-data.json
index 047fcd88..5ba74671 100644
--- a/src/test/resources/data/out/questionnaire-data.json
+++ b/src/test/resources/data/out/questionnaire-data.json
@@ -5,763 +5,763 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"FAVOURITE_CHAR2_1_2" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"FAVOURITE_CHAR3_1_3" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"FAVOURITE_CHAR1_2_1" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"FAVOURITE_CHAR2_2_2" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"FAVOURITE_CHAR3_2_3" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"FAVOURITE_CHAR1_3_1" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"FAVOURITE_CHAR2_3_2" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"FAVOURITE_CHAR3_3_3" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"FAVOURITE_CHAR1_4_1" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"FAVOURITE_CHAR2_4_2" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"FAVOURITE_CHAR3_4_3" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"FAVOURITE_CHAR1_5_1" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"FAVOURITE_CHAR2_5_2" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"FAVOURITE_CHAR3_5_3" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"FAVOURITE_CHAR1_6_1" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"FAVOURITE_CHAR2_6_2" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"FAVOURITE_CHAR3_6_3" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"FAVOURITE_CHAR1_7_1" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"FAVOURITE_CHAR2_7_2" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"FAVOURITE_CHAR3_7_3" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"FAVOURITE_CHAR1_8_1" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"FAVOURITE_CHAR2_8_2" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"FAVOURITE_CHAR3_8_3" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"FAVOURITE_CHAR1_9_1" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"FAVOURITE_CHAR2_9_2" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"FAVOURITE_CHAR3_9_3" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"FAVOURITE_CHAR1_10_1" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"FAVOURITE_CHAR2_10_2" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"FAVOURITE_CHAR3_10_3" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"COMMENT" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"READY" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"PRODUCER" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"SEASON_NUMBER" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"DATEFIRST" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"DATEYYYYMM" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"DATEYYYY" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"DURATIONH" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"DURATIOND" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"DURATIONM" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"DURATIONY" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"AUDIENCE_SHARE" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"CITY" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"MAYOR" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"STATE" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"PET1" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"PET2" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"PET3" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"PET4" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"ICE_FLAVOUR1" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"ICE_FLAVOUR2" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"ICE_FLAVOUR3" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"ICE_FLAVOUR4" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"NUCLEAR_CHARACTER1" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"NUCLEAR_CHARACTER2" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"NUCLEAR_CHARACTER3" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"NUCLEAR_CHARACTER4" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"BIRTH_CHARACTER1" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"BIRTH_CHARACTER2" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"BIRTH_CHARACTER3" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"BIRTH_CHARACTER4" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"BIRTH_CHARACTER5" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"PERCENTAGE_EXPENSES11" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"PERCENTAGE_EXPENSES21" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"PERCENTAGE_EXPENSES31" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"PERCENTAGE_EXPENSES41" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"PERCENTAGE_EXPENSES51" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"PERCENTAGE_EXPENSES61" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"PERCENTAGE_EXPENSES71" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"LAST_FOOD_SHOPPING11" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"LAST_FOOD_SHOPPING21" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"LAST_FOOD_SHOPPING31" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"LAST_FOOD_SHOPPING41" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"LAST_FOOD_SHOPPING51" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"LAST_FOOD_SHOPPING61" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"LAST_FOOD_SHOPPING71" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"LAST_FOOD_SHOPPING81" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"CLOWNING11" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"CLOWNING12" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"CLOWNING21" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"CLOWNING22" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"CLOWNING31" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"CLOWNING32" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"CLOWNING41" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"CLOWNING42" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"TRAVEL11" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"TRAVEL12" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"TRAVEL13" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"TRAVEL14" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"TRAVEL15" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"TRAVEL16" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"TRAVEL21" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"TRAVEL22" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"TRAVEL23" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"TRAVEL24" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"TRAVEL25" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"TRAVEL26" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"TRAVEL31" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"TRAVEL32" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"TRAVEL33" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"TRAVEL34" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"TRAVEL35" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"TRAVEL36" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"TRAVEL41" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"TRAVEL42" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"TRAVEL43" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"TRAVEL44" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"TRAVEL45" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"TRAVEL46" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"FAVOURITE_CHAR1" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"FAVOURITE_CHAR2" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"FAVOURITE_CHAR3" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"FEELCHAREV1" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"FEELCHAREV2" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"FEELCHAREV3" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"FEELCHAREV4" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"LEAVDURATION11" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"LEAVDURATION12" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"LEAVDURATION21" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"LEAVDURATION22" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"LEAVDURATION31" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"LEAVDURATION32" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"LEAVDURATION41" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"LEAVDURATION42" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"LEAVDURATION51" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"LEAVDURATION52" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"NB_CHAR" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null },
+ "INPUTTED" : null },
"NAME_CHAR" :
{ "PREVIOUS" :
[ null ],
@@ -771,7 +771,7 @@
[ null ],
"EDITED" :
[ null ],
- "INPUTED" :
+ "INPUTTED" :
[ null ] },
"AGE_CHAR" :
{ "PREVIOUS" :
@@ -782,7 +782,7 @@
[ null ],
"EDITED" :
[ null ],
- "INPUTED" :
+ "INPUTTED" :
[ null ] },
"FAVCHAR" :
{ "PREVIOUS" :
@@ -793,7 +793,7 @@
[ null ],
"EDITED" :
[ null ],
- "INPUTED" :
+ "INPUTTED" :
[ null ] },
"MEMORY_CHAR" :
{ "PREVIOUS" :
@@ -804,14 +804,14 @@
[ null ],
"EDITED" :
[ null ],
- "INPUTED" :
+ "INPUTTED" :
[ null ] },
"SURVEY_COMMENT" :
{ "PREVIOUS" : null,
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
"EXTERNAL" :
{ "LAST_BROADCAST" : null },
"CALCULATED" :
diff --git a/src/test/resources/data/out/questionnaire-data.xml b/src/test/resources/data/out/questionnaire-data.xml
index 9fa95b26..18bcaa94 100644
--- a/src/test/resources/data/out/questionnaire-data.xml
+++ b/src/test/resources/data/out/questionnaire-data.xml
@@ -6,889 +6,889 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -903,9 +903,9 @@
-
-
-
+
+
+
@@ -920,9 +920,9 @@
-
-
-
+
+
+
@@ -937,9 +937,9 @@
-
-
-
+
+
+
@@ -954,16 +954,16 @@
-
-
-
+
+
+
-
+
diff --git a/src/test/resources/dummy/form.xml b/src/test/resources/dummy/form.xml
index c913ad56..b4c5989d 100644
--- a/src/test/resources/dummy/form.xml
+++ b/src/test/resources/dummy/form.xml
@@ -3757,7 +3757,7 @@
-
+
@@ -3768,7 +3768,7 @@
-
+
@@ -3779,7 +3779,7 @@
-
+
@@ -3790,7 +3790,7 @@
-
+
@@ -3801,7 +3801,7 @@
-
+
@@ -3812,7 +3812,7 @@
-
+
@@ -3823,7 +3823,7 @@
-
+
@@ -3834,7 +3834,7 @@
-
+
@@ -3845,7 +3845,7 @@
-
+
@@ -3856,7 +3856,7 @@
-
+
@@ -3867,7 +3867,7 @@
-
+
@@ -3878,7 +3878,7 @@
-
+
@@ -3889,7 +3889,7 @@
-
+
@@ -3900,7 +3900,7 @@
-
+
@@ -3911,7 +3911,7 @@
-
+
@@ -3922,7 +3922,7 @@
-
+
@@ -3933,7 +3933,7 @@
-
+
@@ -3944,7 +3944,7 @@
-
+
@@ -3955,7 +3955,7 @@
-
+
@@ -3966,7 +3966,7 @@
-
+
@@ -3977,7 +3977,7 @@
-
+
@@ -3988,7 +3988,7 @@
-
+
@@ -3999,7 +3999,7 @@
-
+
@@ -4010,7 +4010,7 @@
-
+
@@ -4021,7 +4021,7 @@
-
+
@@ -4032,7 +4032,7 @@
-
+
@@ -4043,7 +4043,7 @@
-
+
@@ -4054,7 +4054,7 @@
-
+
@@ -4065,7 +4065,7 @@
-
+
@@ -4076,7 +4076,7 @@
-
+
@@ -4091,7 +4091,7 @@
-
+
@@ -4102,7 +4102,7 @@
-
+
@@ -4113,7 +4113,7 @@
-
+
@@ -4124,7 +4124,7 @@
-
+
@@ -4135,7 +4135,7 @@
-
+
@@ -4146,7 +4146,7 @@
-
+
@@ -4157,7 +4157,7 @@
-
+
@@ -4168,7 +4168,7 @@
-
+
@@ -4179,7 +4179,7 @@
-
+
@@ -4190,7 +4190,7 @@
-
+
@@ -4201,7 +4201,7 @@
-
+
@@ -4212,7 +4212,7 @@
-
+
@@ -4223,7 +4223,7 @@
-
+
@@ -4234,7 +4234,7 @@
-
+
@@ -4245,7 +4245,7 @@
-
+
@@ -4256,7 +4256,7 @@
-
+
@@ -4267,7 +4267,7 @@
-
+
@@ -4278,7 +4278,7 @@
-
+
@@ -4289,7 +4289,7 @@
-
+
@@ -4300,7 +4300,7 @@
-
+
@@ -4311,7 +4311,7 @@
-
+
@@ -4322,7 +4322,7 @@
-
+
@@ -4333,7 +4333,7 @@
-
+
@@ -4344,7 +4344,7 @@
-
+
@@ -4355,7 +4355,7 @@
-
+
@@ -4366,7 +4366,7 @@
-
+
@@ -4377,7 +4377,7 @@
-
+
@@ -4388,7 +4388,7 @@
-
+
@@ -4399,7 +4399,7 @@
-
+
@@ -4410,7 +4410,7 @@
-
+
@@ -4421,7 +4421,7 @@
-
+
@@ -4432,7 +4432,7 @@
-
+
@@ -4443,7 +4443,7 @@
-
+
@@ -4454,7 +4454,7 @@
-
+
@@ -4465,7 +4465,7 @@
-
+
@@ -4476,7 +4476,7 @@
-
+
@@ -4487,7 +4487,7 @@
-
+
@@ -4498,7 +4498,7 @@
-
+
@@ -4509,7 +4509,7 @@
-
+
@@ -4520,7 +4520,7 @@
-
+
@@ -4531,7 +4531,7 @@
-
+
@@ -4542,7 +4542,7 @@
-
+
@@ -4553,7 +4553,7 @@
-
+
@@ -4564,7 +4564,7 @@
-
+
@@ -4575,7 +4575,7 @@
-
+
@@ -4586,7 +4586,7 @@
-
+
@@ -4597,7 +4597,7 @@
-
+
@@ -4608,7 +4608,7 @@
-
+
@@ -4619,7 +4619,7 @@
-
+
@@ -4630,7 +4630,7 @@
-
+
@@ -4641,7 +4641,7 @@
-
+
@@ -4652,7 +4652,7 @@
-
+
@@ -4663,7 +4663,7 @@
-
+
@@ -4674,7 +4674,7 @@
-
+
@@ -4685,7 +4685,7 @@
-
+
@@ -4696,7 +4696,7 @@
-
+
@@ -4707,7 +4707,7 @@
-
+
@@ -4718,7 +4718,7 @@
-
+
@@ -4729,7 +4729,7 @@
-
+
@@ -4740,7 +4740,7 @@
-
+
@@ -4751,7 +4751,7 @@
-
+
@@ -4762,7 +4762,7 @@
-
+
@@ -4773,7 +4773,7 @@
-
+
@@ -4784,7 +4784,7 @@
-
+
@@ -4795,7 +4795,7 @@
-
+
@@ -4806,7 +4806,7 @@
-
+
@@ -4817,7 +4817,7 @@
-
+
@@ -4828,7 +4828,7 @@
-
+
@@ -4839,7 +4839,7 @@
-
+
@@ -4850,7 +4850,7 @@
-
+
@@ -4861,7 +4861,7 @@
-
+
@@ -4872,7 +4872,7 @@
-
+
@@ -4883,7 +4883,7 @@
-
+
@@ -4894,7 +4894,7 @@
-
+
@@ -4905,7 +4905,7 @@
-
+
@@ -4916,7 +4916,7 @@
-
+
@@ -4927,7 +4927,7 @@
-
+
@@ -4938,7 +4938,7 @@
-
+
@@ -4949,7 +4949,7 @@
-
+
@@ -4960,7 +4960,7 @@
-
+
@@ -4971,7 +4971,7 @@
-
+
@@ -4982,7 +4982,7 @@
-
+
@@ -4993,7 +4993,7 @@
-
+
@@ -5004,7 +5004,7 @@
-
+
@@ -5015,7 +5015,7 @@
-
+
@@ -5026,7 +5026,7 @@
-
+
@@ -5037,7 +5037,7 @@
-
+
@@ -5048,7 +5048,7 @@
-
+
@@ -5059,7 +5059,7 @@
-
+
@@ -5070,7 +5070,7 @@
-
+
@@ -5081,7 +5081,7 @@
-
+
@@ -5092,7 +5092,7 @@
-
+
@@ -5103,7 +5103,7 @@
-
+
@@ -5114,7 +5114,7 @@
-
+
@@ -5125,7 +5125,7 @@
-
+
@@ -5136,7 +5136,7 @@
-
+
@@ -5147,7 +5147,7 @@
-
+
@@ -5166,9 +5166,9 @@
-
-
-
+
+
+
@@ -5187,9 +5187,9 @@
-
-
-
+
+
+
@@ -5208,9 +5208,9 @@
-
-
-
+
+
+
@@ -5229,9 +5229,9 @@
-
-
-
+
+
+
@@ -5242,7 +5242,7 @@
-
+
diff --git a/src/test/resources/dummy/form_flat.xml b/src/test/resources/dummy/form_flat.xml
index ab7fd1a1..e84575b1 100644
--- a/src/test/resources/dummy/form_flat.xml
+++ b/src/test/resources/dummy/form_flat.xml
@@ -3757,7 +3757,7 @@
-
+
@@ -3768,7 +3768,7 @@
-
+
@@ -3779,7 +3779,7 @@
-
+
@@ -3790,7 +3790,7 @@
-
+
@@ -3801,7 +3801,7 @@
-
+
@@ -3812,7 +3812,7 @@
-
+
@@ -3823,7 +3823,7 @@
-
+
@@ -3834,7 +3834,7 @@
-
+
@@ -3845,7 +3845,7 @@
-
+
@@ -3856,7 +3856,7 @@
-
+
@@ -3867,7 +3867,7 @@
-
+
@@ -3878,7 +3878,7 @@
-
+
@@ -3889,7 +3889,7 @@
-
+
@@ -3900,7 +3900,7 @@
-
+
@@ -3911,7 +3911,7 @@
-
+
@@ -3922,7 +3922,7 @@
-
+
@@ -3933,7 +3933,7 @@
-
+
@@ -3944,7 +3944,7 @@
-
+
@@ -3955,7 +3955,7 @@
-
+
@@ -3966,7 +3966,7 @@
-
+
@@ -3977,7 +3977,7 @@
-
+
@@ -3988,7 +3988,7 @@
-
+
@@ -3999,7 +3999,7 @@
-
+
@@ -4010,7 +4010,7 @@
-
+
@@ -4021,7 +4021,7 @@
-
+
@@ -4032,7 +4032,7 @@
-
+
@@ -4043,7 +4043,7 @@
-
+
@@ -4054,7 +4054,7 @@
-
+
@@ -4065,7 +4065,7 @@
-
+
@@ -4076,7 +4076,7 @@
-
+
@@ -4091,7 +4091,7 @@
-
+
@@ -4102,7 +4102,7 @@
-
+
@@ -4113,7 +4113,7 @@
-
+
@@ -4124,7 +4124,7 @@
-
+
@@ -4135,7 +4135,7 @@
-
+
@@ -4146,7 +4146,7 @@
-
+
@@ -4157,7 +4157,7 @@
-
+
@@ -4168,7 +4168,7 @@
-
+
@@ -4179,7 +4179,7 @@
-
+
@@ -4190,7 +4190,7 @@
-
+
@@ -4201,7 +4201,7 @@
-
+
@@ -4212,7 +4212,7 @@
-
+
@@ -4223,7 +4223,7 @@
-
+
@@ -4234,7 +4234,7 @@
-
+
@@ -4245,7 +4245,7 @@
-
+
@@ -4256,7 +4256,7 @@
-
+
@@ -4267,7 +4267,7 @@
-
+
@@ -4278,7 +4278,7 @@
-
+
@@ -4289,7 +4289,7 @@
-
+
@@ -4300,7 +4300,7 @@
-
+
@@ -4311,7 +4311,7 @@
-
+
@@ -4322,7 +4322,7 @@
-
+
@@ -4333,7 +4333,7 @@
-
+
@@ -4344,7 +4344,7 @@
-
+
@@ -4355,7 +4355,7 @@
-
+
@@ -4366,7 +4366,7 @@
-
+
@@ -4377,7 +4377,7 @@
-
+
@@ -4388,7 +4388,7 @@
-
+
@@ -4399,7 +4399,7 @@
-
+
@@ -4410,7 +4410,7 @@
-
+
@@ -4421,7 +4421,7 @@
-
+
@@ -4432,7 +4432,7 @@
-
+
@@ -4443,7 +4443,7 @@
-
+
@@ -4454,7 +4454,7 @@
-
+
@@ -4465,7 +4465,7 @@
-
+
@@ -4476,7 +4476,7 @@
-
+
@@ -4487,7 +4487,7 @@
-
+
@@ -4498,7 +4498,7 @@
-
+
@@ -4509,7 +4509,7 @@
-
+
@@ -4520,7 +4520,7 @@
-
+
@@ -4531,7 +4531,7 @@
-
+
@@ -4542,7 +4542,7 @@
-
+
@@ -4553,7 +4553,7 @@
-
+
@@ -4564,7 +4564,7 @@
-
+
@@ -4575,7 +4575,7 @@
-
+
@@ -4586,7 +4586,7 @@
-
+
@@ -4597,7 +4597,7 @@
-
+
@@ -4608,7 +4608,7 @@
-
+
@@ -4619,7 +4619,7 @@
-
+
@@ -4630,7 +4630,7 @@
-
+
@@ -4641,7 +4641,7 @@
-
+
@@ -4652,7 +4652,7 @@
-
+
@@ -4663,7 +4663,7 @@
-
+
@@ -4674,7 +4674,7 @@
-
+
@@ -4685,7 +4685,7 @@
-
+
@@ -4696,7 +4696,7 @@
-
+
@@ -4707,7 +4707,7 @@
-
+
@@ -4718,7 +4718,7 @@
-
+
@@ -4729,7 +4729,7 @@
-
+
@@ -4740,7 +4740,7 @@
-
+
@@ -4751,7 +4751,7 @@
-
+
@@ -4762,7 +4762,7 @@
-
+
@@ -4773,7 +4773,7 @@
-
+
@@ -4784,7 +4784,7 @@
-
+
@@ -4795,7 +4795,7 @@
-
+
@@ -4806,7 +4806,7 @@
-
+
@@ -4817,7 +4817,7 @@
-
+
@@ -4828,7 +4828,7 @@
-
+
@@ -4839,7 +4839,7 @@
-
+
@@ -4850,7 +4850,7 @@
-
+
@@ -4861,7 +4861,7 @@
-
+
@@ -4872,7 +4872,7 @@
-
+
@@ -4883,7 +4883,7 @@
-
+
@@ -4894,7 +4894,7 @@
-
+
@@ -4905,7 +4905,7 @@
-
+
@@ -4916,7 +4916,7 @@
-
+
@@ -4927,7 +4927,7 @@
-
+
@@ -4938,7 +4938,7 @@
-
+
@@ -4949,7 +4949,7 @@
-
+
@@ -4960,7 +4960,7 @@
-
+
@@ -4971,7 +4971,7 @@
-
+
@@ -4982,7 +4982,7 @@
-
+
@@ -4993,7 +4993,7 @@
-
+
@@ -5004,7 +5004,7 @@
-
+
@@ -5015,7 +5015,7 @@
-
+
@@ -5026,7 +5026,7 @@
-
+
@@ -5037,7 +5037,7 @@
-
+
@@ -5048,7 +5048,7 @@
-
+
@@ -5059,7 +5059,7 @@
-
+
@@ -5070,7 +5070,7 @@
-
+
@@ -5081,7 +5081,7 @@
-
+
@@ -5092,7 +5092,7 @@
-
+
@@ -5103,7 +5103,7 @@
-
+
@@ -5114,7 +5114,7 @@
-
+
@@ -5125,7 +5125,7 @@
-
+
@@ -5136,7 +5136,7 @@
-
+
@@ -5147,7 +5147,7 @@
-
+
@@ -5166,9 +5166,9 @@
-
-
-
+
+
+
@@ -5187,9 +5187,9 @@
-
-
-
+
+
+
@@ -5208,9 +5208,9 @@
-
-
-
+
+
+
@@ -5229,9 +5229,9 @@
-
-
-
+
+
+
@@ -5242,7 +5242,7 @@
-
+
diff --git a/src/test/resources/examples/simpsons.json b/src/test/resources/examples/simpsons.json
index 324d3873..9fcb754d 100644
--- a/src/test/resources/examples/simpsons.json
+++ b/src/test/resources/examples/simpsons.json
@@ -2765,7 +2765,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR2_1_2",
@@ -2775,7 +2775,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR3_1_3",
@@ -2785,7 +2785,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR1_2_1",
@@ -2795,7 +2795,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR2_2_2",
@@ -2805,7 +2805,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR3_2_3",
@@ -2815,7 +2815,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR1_3_1",
@@ -2825,7 +2825,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR2_3_2",
@@ -2835,7 +2835,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR3_3_3",
@@ -2845,7 +2845,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR1_4_1",
@@ -2855,7 +2855,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR2_4_2",
@@ -2865,7 +2865,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR3_4_3",
@@ -2875,7 +2875,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR1_5_1",
@@ -2885,7 +2885,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR2_5_2",
@@ -2895,7 +2895,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR3_5_3",
@@ -2905,7 +2905,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR1_6_1",
@@ -2915,7 +2915,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR2_6_2",
@@ -2925,7 +2925,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR3_6_3",
@@ -2935,7 +2935,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR1_7_1",
@@ -2945,7 +2945,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR2_7_2",
@@ -2955,7 +2955,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR3_7_3",
@@ -2965,7 +2965,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR1_8_1",
@@ -2975,7 +2975,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR2_8_2",
@@ -2985,7 +2985,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR3_8_3",
@@ -2995,7 +2995,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR1_9_1",
@@ -3005,7 +3005,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR2_9_2",
@@ -3015,7 +3015,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR3_9_3",
@@ -3025,7 +3025,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR1_10_1",
@@ -3035,7 +3035,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR2_10_2",
@@ -3045,7 +3045,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR3_10_3",
@@ -3055,7 +3055,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "EXTERNAL",
"name" : "LAST_BROADCAST",
@@ -3069,7 +3069,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "READY",
@@ -3079,7 +3079,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "PRODUCER",
@@ -3089,7 +3089,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "SEASON_NUMBER",
@@ -3099,7 +3099,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "DATEFIRST",
@@ -3109,7 +3109,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "DATEYYYYMM",
@@ -3119,7 +3119,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "DATEYYYY",
@@ -3129,7 +3129,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "DURATIONH",
@@ -3139,7 +3139,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "DURATIOND",
@@ -3149,7 +3149,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "DURATIONM",
@@ -3159,7 +3159,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "DURATIONY",
@@ -3169,7 +3169,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "AUDIENCE_SHARE",
@@ -3179,7 +3179,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "CITY",
@@ -3189,7 +3189,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "MAYOR",
@@ -3199,7 +3199,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "STATE",
@@ -3209,7 +3209,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "PET1",
@@ -3219,7 +3219,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "PET2",
@@ -3229,7 +3229,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "PET3",
@@ -3239,7 +3239,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "PET4",
@@ -3249,7 +3249,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "ICE_FLAVOUR1",
@@ -3259,7 +3259,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "ICE_FLAVOUR2",
@@ -3269,7 +3269,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "ICE_FLAVOUR3",
@@ -3279,7 +3279,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "ICE_FLAVOUR4",
@@ -3289,7 +3289,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "NUCLEAR_CHARACTER1",
@@ -3299,7 +3299,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "NUCLEAR_CHARACTER2",
@@ -3309,7 +3309,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "NUCLEAR_CHARACTER3",
@@ -3319,7 +3319,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "NUCLEAR_CHARACTER4",
@@ -3329,7 +3329,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "BIRTH_CHARACTER1",
@@ -3339,7 +3339,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "BIRTH_CHARACTER2",
@@ -3349,7 +3349,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "BIRTH_CHARACTER3",
@@ -3359,7 +3359,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "BIRTH_CHARACTER4",
@@ -3369,7 +3369,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "BIRTH_CHARACTER5",
@@ -3379,7 +3379,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "PERCENTAGE_EXPENSES11",
@@ -3389,7 +3389,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "PERCENTAGE_EXPENSES21",
@@ -3399,7 +3399,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "PERCENTAGE_EXPENSES31",
@@ -3409,7 +3409,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "PERCENTAGE_EXPENSES41",
@@ -3419,7 +3419,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "PERCENTAGE_EXPENSES51",
@@ -3429,7 +3429,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "PERCENTAGE_EXPENSES61",
@@ -3439,7 +3439,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "PERCENTAGE_EXPENSES71",
@@ -3449,7 +3449,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "LAST_FOOD_SHOPPING11",
@@ -3459,7 +3459,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "LAST_FOOD_SHOPPING21",
@@ -3469,7 +3469,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "LAST_FOOD_SHOPPING31",
@@ -3479,7 +3479,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "LAST_FOOD_SHOPPING41",
@@ -3489,7 +3489,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "LAST_FOOD_SHOPPING51",
@@ -3499,7 +3499,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "LAST_FOOD_SHOPPING61",
@@ -3509,7 +3509,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "LAST_FOOD_SHOPPING71",
@@ -3519,7 +3519,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "LAST_FOOD_SHOPPING81",
@@ -3529,7 +3529,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "CLOWNING11",
@@ -3539,7 +3539,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "CLOWNING12",
@@ -3549,7 +3549,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "CLOWNING21",
@@ -3559,7 +3559,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "CLOWNING22",
@@ -3569,7 +3569,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "CLOWNING31",
@@ -3579,7 +3579,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "CLOWNING32",
@@ -3589,7 +3589,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "CLOWNING41",
@@ -3599,7 +3599,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "CLOWNING42",
@@ -3609,7 +3609,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL11",
@@ -3619,7 +3619,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL12",
@@ -3629,7 +3629,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL13",
@@ -3639,7 +3639,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL14",
@@ -3649,7 +3649,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL15",
@@ -3659,7 +3659,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL16",
@@ -3669,7 +3669,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL21",
@@ -3679,7 +3679,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL22",
@@ -3689,7 +3689,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL23",
@@ -3699,7 +3699,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL24",
@@ -3709,7 +3709,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL25",
@@ -3719,7 +3719,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL26",
@@ -3729,7 +3729,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL31",
@@ -3739,7 +3739,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL32",
@@ -3749,7 +3749,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL33",
@@ -3759,7 +3759,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL34",
@@ -3769,7 +3769,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL35",
@@ -3779,7 +3779,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL36",
@@ -3789,7 +3789,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL41",
@@ -3799,7 +3799,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL42",
@@ -3809,7 +3809,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL43",
@@ -3819,7 +3819,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL44",
@@ -3829,7 +3829,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL45",
@@ -3839,7 +3839,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL46",
@@ -3849,7 +3849,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR1",
@@ -3859,7 +3859,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR2",
@@ -3869,7 +3869,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR3",
@@ -3879,7 +3879,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FEELCHAREV1",
@@ -3889,7 +3889,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FEELCHAREV2",
@@ -3899,7 +3899,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FEELCHAREV3",
@@ -3909,7 +3909,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FEELCHAREV4",
@@ -3919,7 +3919,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "LEAVDURATION11",
@@ -3929,7 +3929,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "LEAVDURATION12",
@@ -3939,7 +3939,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "LEAVDURATION21",
@@ -3949,7 +3949,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "LEAVDURATION22",
@@ -3959,7 +3959,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "LEAVDURATION31",
@@ -3969,7 +3969,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "LEAVDURATION32",
@@ -3979,7 +3979,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "LEAVDURATION41",
@@ -3989,7 +3989,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "LEAVDURATION42",
@@ -3999,7 +3999,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "LEAVDURATION51",
@@ -4009,7 +4009,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "LEAVDURATION52",
@@ -4019,7 +4019,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "NB_CHAR",
@@ -4029,7 +4029,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "NAME_CHAR",
@@ -4043,7 +4043,7 @@
[ null ],
"EDITED" :
[ null ],
- "INPUTED" :
+ "INPUTTED" :
[ null ] } },
{ "variableType" : "COLLECTED",
@@ -4058,7 +4058,7 @@
[ null ],
"EDITED" :
[ null ],
- "INPUTED" :
+ "INPUTTED" :
[ null ] } },
{ "variableType" : "COLLECTED",
@@ -4073,7 +4073,7 @@
[ null ],
"EDITED" :
[ null ],
- "INPUTED" :
+ "INPUTTED" :
[ null ] } },
{ "variableType" : "COLLECTED",
@@ -4088,7 +4088,7 @@
[ null ],
"EDITED" :
[ null ],
- "INPUTED" :
+ "INPUTTED" :
[ null ] } },
{ "variableType" : "COLLECTED",
@@ -4099,4 +4099,4 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } } ] }
\ No newline at end of file
+ "INPUTTED" : null } } ] }
\ No newline at end of file
diff --git a/src/test/resources/examples/xmlf-2-jsonf/out.json b/src/test/resources/examples/xmlf-2-jsonf/out.json
index 9c6c6ee4..5ea22e43 100644
--- a/src/test/resources/examples/xmlf-2-jsonf/out.json
+++ b/src/test/resources/examples/xmlf-2-jsonf/out.json
@@ -3516,7 +3516,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR2_1_2",
@@ -3526,7 +3526,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR3_1_3",
@@ -3536,7 +3536,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR1_2_1",
@@ -3546,7 +3546,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR2_2_2",
@@ -3556,7 +3556,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR3_2_3",
@@ -3566,7 +3566,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR1_3_1",
@@ -3576,7 +3576,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR2_3_2",
@@ -3586,7 +3586,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR3_3_3",
@@ -3596,7 +3596,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR1_4_1",
@@ -3606,7 +3606,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR2_4_2",
@@ -3616,7 +3616,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR3_4_3",
@@ -3626,7 +3626,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR1_5_1",
@@ -3636,7 +3636,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR2_5_2",
@@ -3646,7 +3646,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR3_5_3",
@@ -3656,7 +3656,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR1_6_1",
@@ -3666,7 +3666,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR2_6_2",
@@ -3676,7 +3676,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR3_6_3",
@@ -3686,7 +3686,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR1_7_1",
@@ -3696,7 +3696,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR2_7_2",
@@ -3706,7 +3706,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR3_7_3",
@@ -3716,7 +3716,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR1_8_1",
@@ -3726,7 +3726,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR2_8_2",
@@ -3736,7 +3736,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR3_8_3",
@@ -3746,7 +3746,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR1_9_1",
@@ -3756,7 +3756,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR2_9_2",
@@ -3766,7 +3766,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR3_9_3",
@@ -3776,7 +3776,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR1_10_1",
@@ -3786,7 +3786,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR2_10_2",
@@ -3796,7 +3796,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR3_10_3",
@@ -3806,7 +3806,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "EXTERNAL",
"name" : "LAST_BROADCAST",
@@ -3820,7 +3820,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "READY",
@@ -3830,7 +3830,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "PRODUCER",
@@ -3840,7 +3840,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "SEASON_NUMBER",
@@ -3850,7 +3850,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "DATEFIRST",
@@ -3860,7 +3860,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "DATEYYYYMM",
@@ -3870,7 +3870,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "DATEYYYY",
@@ -3880,7 +3880,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "DURATIONH",
@@ -3890,7 +3890,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "DURATIOND",
@@ -3900,7 +3900,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "DURATIONM",
@@ -3910,7 +3910,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "DURATIONY",
@@ -3920,7 +3920,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "AUDIENCE_SHARE",
@@ -3930,7 +3930,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "CITY",
@@ -3940,7 +3940,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "MAYOR",
@@ -3950,7 +3950,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "STATE",
@@ -3960,7 +3960,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "PET1",
@@ -3970,7 +3970,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "PET2",
@@ -3980,7 +3980,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "PET3",
@@ -3990,7 +3990,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "PET4",
@@ -4000,7 +4000,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "ICE_FLAVOUR1",
@@ -4010,7 +4010,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "ICE_FLAVOUR2",
@@ -4020,7 +4020,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "ICE_FLAVOUR3",
@@ -4030,7 +4030,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "ICE_FLAVOUR4",
@@ -4040,7 +4040,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "NUCLEAR_CHARACTER1",
@@ -4050,7 +4050,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "NUCLEAR_CHARACTER2",
@@ -4060,7 +4060,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "NUCLEAR_CHARACTER3",
@@ -4070,7 +4070,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "NUCLEAR_CHARACTER4",
@@ -4080,7 +4080,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "BIRTH_CHARACTER1",
@@ -4090,7 +4090,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "BIRTH_CHARACTER2",
@@ -4100,7 +4100,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "BIRTH_CHARACTER3",
@@ -4110,7 +4110,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "BIRTH_CHARACTER4",
@@ -4120,7 +4120,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "BIRTH_CHARACTER5",
@@ -4130,7 +4130,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "PERCENTAGE_EXPENSES11",
@@ -4140,7 +4140,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "PERCENTAGE_EXPENSES21",
@@ -4150,7 +4150,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "PERCENTAGE_EXPENSES31",
@@ -4160,7 +4160,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "PERCENTAGE_EXPENSES41",
@@ -4170,7 +4170,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "PERCENTAGE_EXPENSES51",
@@ -4180,7 +4180,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "PERCENTAGE_EXPENSES61",
@@ -4190,7 +4190,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "PERCENTAGE_EXPENSES71",
@@ -4200,7 +4200,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "LAST_FOOD_SHOPPING11",
@@ -4210,7 +4210,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "LAST_FOOD_SHOPPING21",
@@ -4220,7 +4220,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "LAST_FOOD_SHOPPING31",
@@ -4230,7 +4230,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "LAST_FOOD_SHOPPING41",
@@ -4240,7 +4240,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "LAST_FOOD_SHOPPING51",
@@ -4250,7 +4250,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "LAST_FOOD_SHOPPING61",
@@ -4260,7 +4260,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "LAST_FOOD_SHOPPING71",
@@ -4270,7 +4270,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "LAST_FOOD_SHOPPING81",
@@ -4280,7 +4280,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "CLOWNING11",
@@ -4290,7 +4290,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "CLOWNING12",
@@ -4300,7 +4300,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "CLOWNING21",
@@ -4310,7 +4310,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "CLOWNING22",
@@ -4320,7 +4320,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "CLOWNING31",
@@ -4330,7 +4330,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "CLOWNING32",
@@ -4340,7 +4340,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "CLOWNING41",
@@ -4350,7 +4350,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "CLOWNING42",
@@ -4360,7 +4360,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL11",
@@ -4370,7 +4370,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL12",
@@ -4380,7 +4380,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL13",
@@ -4390,7 +4390,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL14",
@@ -4400,7 +4400,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL15",
@@ -4410,7 +4410,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL16",
@@ -4420,7 +4420,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL21",
@@ -4430,7 +4430,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL22",
@@ -4440,7 +4440,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL23",
@@ -4450,7 +4450,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL24",
@@ -4460,7 +4460,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL25",
@@ -4470,7 +4470,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL26",
@@ -4480,7 +4480,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL31",
@@ -4490,7 +4490,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL32",
@@ -4500,7 +4500,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL33",
@@ -4510,7 +4510,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL34",
@@ -4520,7 +4520,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL35",
@@ -4530,7 +4530,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL36",
@@ -4540,7 +4540,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL41",
@@ -4550,7 +4550,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL42",
@@ -4560,7 +4560,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL43",
@@ -4570,7 +4570,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL44",
@@ -4580,7 +4580,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL45",
@@ -4590,7 +4590,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL46",
@@ -4600,7 +4600,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR1",
@@ -4610,7 +4610,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR2",
@@ -4620,7 +4620,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR3",
@@ -4630,7 +4630,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FEELCHAREV1",
@@ -4640,7 +4640,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FEELCHAREV2",
@@ -4650,7 +4650,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FEELCHAREV3",
@@ -4660,7 +4660,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FEELCHAREV4",
@@ -4670,7 +4670,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "LEAVDURATION11",
@@ -4680,7 +4680,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "LEAVDURATION12",
@@ -4690,7 +4690,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "LEAVDURATION21",
@@ -4700,7 +4700,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "LEAVDURATION22",
@@ -4710,7 +4710,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "LEAVDURATION31",
@@ -4720,7 +4720,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "LEAVDURATION32",
@@ -4730,7 +4730,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "LEAVDURATION41",
@@ -4740,7 +4740,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "LEAVDURATION42",
@@ -4750,7 +4750,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "LEAVDURATION51",
@@ -4760,7 +4760,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "LEAVDURATION52",
@@ -4770,7 +4770,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "NB_CHAR",
@@ -4780,7 +4780,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "NAME_CHAR",
@@ -4794,7 +4794,7 @@
[ null ],
"EDITED" :
[ null ],
- "INPUTED" :
+ "INPUTTED" :
[ null ] } },
{ "variableType" : "COLLECTED",
@@ -4809,7 +4809,7 @@
[ null ],
"EDITED" :
[ null ],
- "INPUTED" :
+ "INPUTTED" :
[ null ] } },
{ "variableType" : "COLLECTED",
@@ -4824,7 +4824,7 @@
[ null ],
"EDITED" :
[ null ],
- "INPUTED" :
+ "INPUTTED" :
[ null ] } },
{ "variableType" : "COLLECTED",
@@ -4839,7 +4839,7 @@
[ null ],
"EDITED" :
[ null ],
- "INPUTED" :
+ "INPUTTED" :
[ null ] } },
{ "variableType" : "COLLECTED",
@@ -4850,4 +4850,4 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } } ] }
\ No newline at end of file
+ "INPUTTED" : null } } ] }
\ No newline at end of file
diff --git a/src/test/resources/examples/xmlh-2-jsonf/out.json b/src/test/resources/examples/xmlh-2-jsonf/out.json
index 253042f5..56bf5fa0 100644
--- a/src/test/resources/examples/xmlh-2-jsonf/out.json
+++ b/src/test/resources/examples/xmlh-2-jsonf/out.json
@@ -3516,7 +3516,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR2_1_2",
@@ -3526,7 +3526,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR3_1_3",
@@ -3536,7 +3536,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR1_2_1",
@@ -3546,7 +3546,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR2_2_2",
@@ -3556,7 +3556,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR3_2_3",
@@ -3566,7 +3566,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR1_3_1",
@@ -3576,7 +3576,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR2_3_2",
@@ -3586,7 +3586,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR3_3_3",
@@ -3596,7 +3596,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR1_4_1",
@@ -3606,7 +3606,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR2_4_2",
@@ -3616,7 +3616,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR3_4_3",
@@ -3626,7 +3626,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR1_5_1",
@@ -3636,7 +3636,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR2_5_2",
@@ -3646,7 +3646,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR3_5_3",
@@ -3656,7 +3656,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR1_6_1",
@@ -3666,7 +3666,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR2_6_2",
@@ -3676,7 +3676,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR3_6_3",
@@ -3686,7 +3686,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR1_7_1",
@@ -3696,7 +3696,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR2_7_2",
@@ -3706,7 +3706,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR3_7_3",
@@ -3716,7 +3716,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR1_8_1",
@@ -3726,7 +3726,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR2_8_2",
@@ -3736,7 +3736,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR3_8_3",
@@ -3746,7 +3746,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR1_9_1",
@@ -3756,7 +3756,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR2_9_2",
@@ -3766,7 +3766,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR3_9_3",
@@ -3776,7 +3776,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR1_10_1",
@@ -3786,7 +3786,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR2_10_2",
@@ -3796,7 +3796,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR3_10_3",
@@ -3806,7 +3806,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "EXTERNAL",
"name" : "LAST_BROADCAST",
@@ -3820,7 +3820,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "READY",
@@ -3830,7 +3830,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "PRODUCER",
@@ -3840,7 +3840,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "SEASON_NUMBER",
@@ -3850,7 +3850,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "DATEFIRST",
@@ -3860,7 +3860,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "DATEYYYYMM",
@@ -3870,7 +3870,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "DATEYYYY",
@@ -3880,7 +3880,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "DURATIONH",
@@ -3890,7 +3890,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "DURATIOND",
@@ -3900,7 +3900,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "DURATIONM",
@@ -3910,7 +3910,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "DURATIONY",
@@ -3920,7 +3920,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "AUDIENCE_SHARE",
@@ -3930,7 +3930,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "CITY",
@@ -3940,7 +3940,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "MAYOR",
@@ -3950,7 +3950,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "STATE",
@@ -3960,7 +3960,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "PET1",
@@ -3970,7 +3970,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "PET2",
@@ -3980,7 +3980,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "PET3",
@@ -3990,7 +3990,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "PET4",
@@ -4000,7 +4000,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "ICE_FLAVOUR1",
@@ -4010,7 +4010,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "ICE_FLAVOUR2",
@@ -4020,7 +4020,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "ICE_FLAVOUR3",
@@ -4030,7 +4030,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "ICE_FLAVOUR4",
@@ -4040,7 +4040,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "NUCLEAR_CHARACTER1",
@@ -4050,7 +4050,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "NUCLEAR_CHARACTER2",
@@ -4060,7 +4060,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "NUCLEAR_CHARACTER3",
@@ -4070,7 +4070,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "NUCLEAR_CHARACTER4",
@@ -4080,7 +4080,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "BIRTH_CHARACTER1",
@@ -4090,7 +4090,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "BIRTH_CHARACTER2",
@@ -4100,7 +4100,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "BIRTH_CHARACTER3",
@@ -4110,7 +4110,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "BIRTH_CHARACTER4",
@@ -4120,7 +4120,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "BIRTH_CHARACTER5",
@@ -4130,7 +4130,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "PERCENTAGE_EXPENSES11",
@@ -4140,7 +4140,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "PERCENTAGE_EXPENSES21",
@@ -4150,7 +4150,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "PERCENTAGE_EXPENSES31",
@@ -4160,7 +4160,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "PERCENTAGE_EXPENSES41",
@@ -4170,7 +4170,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "PERCENTAGE_EXPENSES51",
@@ -4180,7 +4180,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "PERCENTAGE_EXPENSES61",
@@ -4190,7 +4190,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "PERCENTAGE_EXPENSES71",
@@ -4200,7 +4200,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "LAST_FOOD_SHOPPING11",
@@ -4210,7 +4210,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "LAST_FOOD_SHOPPING21",
@@ -4220,7 +4220,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "LAST_FOOD_SHOPPING31",
@@ -4230,7 +4230,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "LAST_FOOD_SHOPPING41",
@@ -4240,7 +4240,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "LAST_FOOD_SHOPPING51",
@@ -4250,7 +4250,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "LAST_FOOD_SHOPPING61",
@@ -4260,7 +4260,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "LAST_FOOD_SHOPPING71",
@@ -4270,7 +4270,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "LAST_FOOD_SHOPPING81",
@@ -4280,7 +4280,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "CLOWNING11",
@@ -4290,7 +4290,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "CLOWNING12",
@@ -4300,7 +4300,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "CLOWNING21",
@@ -4310,7 +4310,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "CLOWNING22",
@@ -4320,7 +4320,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "CLOWNING31",
@@ -4330,7 +4330,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "CLOWNING32",
@@ -4340,7 +4340,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "CLOWNING41",
@@ -4350,7 +4350,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "CLOWNING42",
@@ -4360,7 +4360,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL11",
@@ -4370,7 +4370,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL12",
@@ -4380,7 +4380,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL13",
@@ -4390,7 +4390,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL14",
@@ -4400,7 +4400,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL15",
@@ -4410,7 +4410,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL16",
@@ -4420,7 +4420,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL21",
@@ -4430,7 +4430,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL22",
@@ -4440,7 +4440,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL23",
@@ -4450,7 +4450,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL24",
@@ -4460,7 +4460,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL25",
@@ -4470,7 +4470,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL26",
@@ -4480,7 +4480,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL31",
@@ -4490,7 +4490,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL32",
@@ -4500,7 +4500,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL33",
@@ -4510,7 +4510,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL34",
@@ -4520,7 +4520,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL35",
@@ -4530,7 +4530,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL36",
@@ -4540,7 +4540,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL41",
@@ -4550,7 +4550,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL42",
@@ -4560,7 +4560,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL43",
@@ -4570,7 +4570,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL44",
@@ -4580,7 +4580,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL45",
@@ -4590,7 +4590,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL46",
@@ -4600,7 +4600,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR1",
@@ -4610,7 +4610,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR2",
@@ -4620,7 +4620,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR3",
@@ -4630,7 +4630,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FEELCHAREV1",
@@ -4640,7 +4640,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FEELCHAREV2",
@@ -4650,7 +4650,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FEELCHAREV3",
@@ -4660,7 +4660,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FEELCHAREV4",
@@ -4670,7 +4670,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "LEAVDURATION11",
@@ -4680,7 +4680,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "LEAVDURATION12",
@@ -4690,7 +4690,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "LEAVDURATION21",
@@ -4700,7 +4700,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "LEAVDURATION22",
@@ -4710,7 +4710,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "LEAVDURATION31",
@@ -4720,7 +4720,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "LEAVDURATION32",
@@ -4730,7 +4730,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "LEAVDURATION41",
@@ -4740,7 +4740,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "LEAVDURATION42",
@@ -4750,7 +4750,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "LEAVDURATION51",
@@ -4760,7 +4760,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "LEAVDURATION52",
@@ -4770,7 +4770,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "NB_CHAR",
@@ -4780,7 +4780,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "NAME_CHAR",
@@ -4794,7 +4794,7 @@
[ null ],
"EDITED" :
[ null ],
- "INPUTED" :
+ "INPUTTED" :
[ null ] } },
{ "variableType" : "COLLECTED",
@@ -4809,7 +4809,7 @@
[ null ],
"EDITED" :
[ null ],
- "INPUTED" :
+ "INPUTTED" :
[ null ] } },
{ "variableType" : "COLLECTED",
@@ -4824,7 +4824,7 @@
[ null ],
"EDITED" :
[ null ],
- "INPUTED" :
+ "INPUTTED" :
[ null ] } },
{ "variableType" : "COLLECTED",
@@ -4839,7 +4839,7 @@
[ null ],
"EDITED" :
[ null ],
- "INPUTED" :
+ "INPUTTED" :
[ null ] } },
{ "variableType" : "COLLECTED",
@@ -4850,4 +4850,4 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } } ] }
\ No newline at end of file
+ "INPUTTED" : null } } ] }
\ No newline at end of file
diff --git a/src/test/resources/examples/xmlh-2-jsonh/out.json b/src/test/resources/examples/xmlh-2-jsonh/out.json
index a77e73cc..ad0d2b2c 100644
--- a/src/test/resources/examples/xmlh-2-jsonh/out.json
+++ b/src/test/resources/examples/xmlh-2-jsonh/out.json
@@ -3529,7 +3529,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR2_1_2",
@@ -3539,7 +3539,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR3_1_3",
@@ -3549,7 +3549,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR1_2_1",
@@ -3559,7 +3559,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR2_2_2",
@@ -3569,7 +3569,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR3_2_3",
@@ -3579,7 +3579,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR1_3_1",
@@ -3589,7 +3589,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR2_3_2",
@@ -3599,7 +3599,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR3_3_3",
@@ -3609,7 +3609,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR1_4_1",
@@ -3619,7 +3619,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR2_4_2",
@@ -3629,7 +3629,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR3_4_3",
@@ -3639,7 +3639,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR1_5_1",
@@ -3649,7 +3649,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR2_5_2",
@@ -3659,7 +3659,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR3_5_3",
@@ -3669,7 +3669,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR1_6_1",
@@ -3679,7 +3679,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR2_6_2",
@@ -3689,7 +3689,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR3_6_3",
@@ -3699,7 +3699,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR1_7_1",
@@ -3709,7 +3709,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR2_7_2",
@@ -3719,7 +3719,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR3_7_3",
@@ -3729,7 +3729,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR1_8_1",
@@ -3739,7 +3739,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR2_8_2",
@@ -3749,7 +3749,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR3_8_3",
@@ -3759,7 +3759,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR1_9_1",
@@ -3769,7 +3769,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR2_9_2",
@@ -3779,7 +3779,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR3_9_3",
@@ -3789,7 +3789,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR1_10_1",
@@ -3799,7 +3799,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR2_10_2",
@@ -3809,7 +3809,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR3_10_3",
@@ -3819,7 +3819,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "EXTERNAL",
"name" : "LAST_BROADCAST",
@@ -3833,7 +3833,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "READY",
@@ -3843,7 +3843,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "PRODUCER",
@@ -3853,7 +3853,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "SEASON_NUMBER",
@@ -3863,7 +3863,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "DATEFIRST",
@@ -3873,7 +3873,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "DATEYYYYMM",
@@ -3883,7 +3883,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "DATEYYYY",
@@ -3893,7 +3893,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "DURATIONH",
@@ -3903,7 +3903,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "DURATIOND",
@@ -3913,7 +3913,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "DURATIONM",
@@ -3923,7 +3923,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "DURATIONY",
@@ -3933,7 +3933,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "AUDIENCE_SHARE",
@@ -3943,7 +3943,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "CITY",
@@ -3953,7 +3953,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "MAYOR",
@@ -3963,7 +3963,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "STATE",
@@ -3973,7 +3973,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "PET1",
@@ -3983,7 +3983,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "PET2",
@@ -3993,7 +3993,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "PET3",
@@ -4003,7 +4003,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "PET4",
@@ -4013,7 +4013,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "ICE_FLAVOUR1",
@@ -4023,7 +4023,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "ICE_FLAVOUR2",
@@ -4033,7 +4033,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "ICE_FLAVOUR3",
@@ -4043,7 +4043,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "ICE_FLAVOUR4",
@@ -4053,7 +4053,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "NUCLEAR_CHARACTER1",
@@ -4063,7 +4063,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "NUCLEAR_CHARACTER2",
@@ -4073,7 +4073,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "NUCLEAR_CHARACTER3",
@@ -4083,7 +4083,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "NUCLEAR_CHARACTER4",
@@ -4093,7 +4093,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "BIRTH_CHARACTER1",
@@ -4103,7 +4103,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "BIRTH_CHARACTER2",
@@ -4113,7 +4113,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "BIRTH_CHARACTER3",
@@ -4123,7 +4123,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "BIRTH_CHARACTER4",
@@ -4133,7 +4133,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "BIRTH_CHARACTER5",
@@ -4143,7 +4143,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "PERCENTAGE_EXPENSES11",
@@ -4153,7 +4153,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "PERCENTAGE_EXPENSES21",
@@ -4163,7 +4163,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "PERCENTAGE_EXPENSES31",
@@ -4173,7 +4173,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "PERCENTAGE_EXPENSES41",
@@ -4183,7 +4183,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "PERCENTAGE_EXPENSES51",
@@ -4193,7 +4193,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "PERCENTAGE_EXPENSES61",
@@ -4203,7 +4203,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "PERCENTAGE_EXPENSES71",
@@ -4213,7 +4213,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "LAST_FOOD_SHOPPING11",
@@ -4223,7 +4223,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "LAST_FOOD_SHOPPING21",
@@ -4233,7 +4233,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "LAST_FOOD_SHOPPING31",
@@ -4243,7 +4243,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "LAST_FOOD_SHOPPING41",
@@ -4253,7 +4253,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "LAST_FOOD_SHOPPING51",
@@ -4263,7 +4263,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "LAST_FOOD_SHOPPING61",
@@ -4273,7 +4273,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "LAST_FOOD_SHOPPING71",
@@ -4283,7 +4283,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "LAST_FOOD_SHOPPING81",
@@ -4293,7 +4293,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "CLOWNING11",
@@ -4303,7 +4303,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "CLOWNING12",
@@ -4313,7 +4313,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "CLOWNING21",
@@ -4323,7 +4323,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "CLOWNING22",
@@ -4333,7 +4333,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "CLOWNING31",
@@ -4343,7 +4343,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "CLOWNING32",
@@ -4353,7 +4353,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "CLOWNING41",
@@ -4363,7 +4363,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "CLOWNING42",
@@ -4373,7 +4373,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL11",
@@ -4383,7 +4383,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL12",
@@ -4393,7 +4393,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL13",
@@ -4403,7 +4403,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL14",
@@ -4413,7 +4413,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL15",
@@ -4423,7 +4423,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL16",
@@ -4433,7 +4433,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL21",
@@ -4443,7 +4443,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL22",
@@ -4453,7 +4453,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL23",
@@ -4463,7 +4463,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL24",
@@ -4473,7 +4473,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL25",
@@ -4483,7 +4483,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL26",
@@ -4493,7 +4493,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL31",
@@ -4503,7 +4503,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL32",
@@ -4513,7 +4513,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL33",
@@ -4523,7 +4523,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL34",
@@ -4533,7 +4533,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL35",
@@ -4543,7 +4543,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL36",
@@ -4553,7 +4553,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL41",
@@ -4563,7 +4563,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL42",
@@ -4573,7 +4573,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL43",
@@ -4583,7 +4583,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL44",
@@ -4593,7 +4593,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL45",
@@ -4603,7 +4603,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "TRAVEL46",
@@ -4613,7 +4613,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR1",
@@ -4623,7 +4623,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR2",
@@ -4633,7 +4633,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FAVOURITE_CHAR3",
@@ -4643,7 +4643,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FEELCHAREV1",
@@ -4653,7 +4653,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FEELCHAREV2",
@@ -4663,7 +4663,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FEELCHAREV3",
@@ -4673,7 +4673,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "FEELCHAREV4",
@@ -4683,7 +4683,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "LEAVDURATION11",
@@ -4693,7 +4693,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "LEAVDURATION12",
@@ -4703,7 +4703,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "LEAVDURATION21",
@@ -4713,7 +4713,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "LEAVDURATION22",
@@ -4723,7 +4723,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "LEAVDURATION31",
@@ -4733,7 +4733,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "LEAVDURATION32",
@@ -4743,7 +4743,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "LEAVDURATION41",
@@ -4753,7 +4753,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "LEAVDURATION42",
@@ -4763,7 +4763,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "LEAVDURATION51",
@@ -4773,7 +4773,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "LEAVDURATION52",
@@ -4783,7 +4783,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "NB_CHAR",
@@ -4793,7 +4793,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "NAME_CHAR",
@@ -4807,7 +4807,7 @@
[ null ],
"EDITED" :
[ null ],
- "INPUTED" :
+ "INPUTTED" :
[ null ] } },
{ "variableType" : "COLLECTED",
@@ -4822,7 +4822,7 @@
[ null ],
"EDITED" :
[ null ],
- "INPUTED" :
+ "INPUTTED" :
[ null ] } },
{ "variableType" : "COLLECTED",
@@ -4837,7 +4837,7 @@
[ null ],
"EDITED" :
[ null ],
- "INPUTED" :
+ "INPUTTED" :
[ null ] } },
{ "variableType" : "COLLECTED",
@@ -4852,7 +4852,7 @@
[ null ],
"EDITED" :
[ null ],
- "INPUTED" :
+ "INPUTTED" :
[ null ] } },
{ "variableType" : "COLLECTED",
@@ -4863,4 +4863,4 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } } ] }
\ No newline at end of file
+ "INPUTTED" : null } } ] }
\ No newline at end of file
diff --git a/src/test/resources/examples/xmlh-2-xmlf/out.xml b/src/test/resources/examples/xmlh-2-xmlf/out.xml
index 235c4b37..8895f752 100644
--- a/src/test/resources/examples/xmlh-2-xmlf/out.xml
+++ b/src/test/resources/examples/xmlh-2-xmlf/out.xml
@@ -3757,7 +3757,7 @@
-
+
@@ -3768,7 +3768,7 @@
-
+
@@ -3779,7 +3779,7 @@
-
+
@@ -3790,7 +3790,7 @@
-
+
@@ -3801,7 +3801,7 @@
-
+
@@ -3812,7 +3812,7 @@
-
+
@@ -3823,7 +3823,7 @@
-
+
@@ -3834,7 +3834,7 @@
-
+
@@ -3845,7 +3845,7 @@
-
+
@@ -3856,7 +3856,7 @@
-
+
@@ -3867,7 +3867,7 @@
-
+
@@ -3878,7 +3878,7 @@
-
+
@@ -3889,7 +3889,7 @@
-
+
@@ -3900,7 +3900,7 @@
-
+
@@ -3911,7 +3911,7 @@
-
+
@@ -3922,7 +3922,7 @@
-
+
@@ -3933,7 +3933,7 @@
-
+
@@ -3944,7 +3944,7 @@
-
+
@@ -3955,7 +3955,7 @@
-
+
@@ -3966,7 +3966,7 @@
-
+
@@ -3977,7 +3977,7 @@
-
+
@@ -3988,7 +3988,7 @@
-
+
@@ -3999,7 +3999,7 @@
-
+
@@ -4010,7 +4010,7 @@
-
+
@@ -4021,7 +4021,7 @@
-
+
@@ -4032,7 +4032,7 @@
-
+
@@ -4043,7 +4043,7 @@
-
+
@@ -4054,7 +4054,7 @@
-
+
@@ -4065,7 +4065,7 @@
-
+
@@ -4076,7 +4076,7 @@
-
+
@@ -4091,7 +4091,7 @@
-
+
@@ -4102,7 +4102,7 @@
-
+
@@ -4113,7 +4113,7 @@
-
+
@@ -4124,7 +4124,7 @@
-
+
@@ -4135,7 +4135,7 @@
-
+
@@ -4146,7 +4146,7 @@
-
+
@@ -4157,7 +4157,7 @@
-
+
@@ -4168,7 +4168,7 @@
-
+
@@ -4179,7 +4179,7 @@
-
+
@@ -4190,7 +4190,7 @@
-
+
@@ -4201,7 +4201,7 @@
-
+
@@ -4212,7 +4212,7 @@
-
+
@@ -4223,7 +4223,7 @@
-
+
@@ -4234,7 +4234,7 @@
-
+
@@ -4245,7 +4245,7 @@
-
+
@@ -4256,7 +4256,7 @@
-
+
@@ -4267,7 +4267,7 @@
-
+
@@ -4278,7 +4278,7 @@
-
+
@@ -4289,7 +4289,7 @@
-
+
@@ -4300,7 +4300,7 @@
-
+
@@ -4311,7 +4311,7 @@
-
+
@@ -4322,7 +4322,7 @@
-
+
@@ -4333,7 +4333,7 @@
-
+
@@ -4344,7 +4344,7 @@
-
+
@@ -4355,7 +4355,7 @@
-
+
@@ -4366,7 +4366,7 @@
-
+
@@ -4377,7 +4377,7 @@
-
+
@@ -4388,7 +4388,7 @@
-
+
@@ -4399,7 +4399,7 @@
-
+
@@ -4410,7 +4410,7 @@
-
+
@@ -4421,7 +4421,7 @@
-
+
@@ -4432,7 +4432,7 @@
-
+
@@ -4443,7 +4443,7 @@
-
+
@@ -4454,7 +4454,7 @@
-
+
@@ -4465,7 +4465,7 @@
-
+
@@ -4476,7 +4476,7 @@
-
+
@@ -4487,7 +4487,7 @@
-
+
@@ -4498,7 +4498,7 @@
-
+
@@ -4509,7 +4509,7 @@
-
+
@@ -4520,7 +4520,7 @@
-
+
@@ -4531,7 +4531,7 @@
-
+
@@ -4542,7 +4542,7 @@
-
+
@@ -4553,7 +4553,7 @@
-
+
@@ -4564,7 +4564,7 @@
-
+
@@ -4575,7 +4575,7 @@
-
+
@@ -4586,7 +4586,7 @@
-
+
@@ -4597,7 +4597,7 @@
-
+
@@ -4608,7 +4608,7 @@
-
+
@@ -4619,7 +4619,7 @@
-
+
@@ -4630,7 +4630,7 @@
-
+
@@ -4641,7 +4641,7 @@
-
+
@@ -4652,7 +4652,7 @@
-
+
@@ -4663,7 +4663,7 @@
-
+
@@ -4674,7 +4674,7 @@
-
+
@@ -4685,7 +4685,7 @@
-
+
@@ -4696,7 +4696,7 @@
-
+
@@ -4707,7 +4707,7 @@
-
+
@@ -4718,7 +4718,7 @@
-
+
@@ -4729,7 +4729,7 @@
-
+
@@ -4740,7 +4740,7 @@
-
+
@@ -4751,7 +4751,7 @@
-
+
@@ -4762,7 +4762,7 @@
-
+
@@ -4773,7 +4773,7 @@
-
+
@@ -4784,7 +4784,7 @@
-
+
@@ -4795,7 +4795,7 @@
-
+
@@ -4806,7 +4806,7 @@
-
+
@@ -4817,7 +4817,7 @@
-
+
@@ -4828,7 +4828,7 @@
-
+
@@ -4839,7 +4839,7 @@
-
+
@@ -4850,7 +4850,7 @@
-
+
@@ -4861,7 +4861,7 @@
-
+
@@ -4872,7 +4872,7 @@
-
+
@@ -4883,7 +4883,7 @@
-
+
@@ -4894,7 +4894,7 @@
-
+
@@ -4905,7 +4905,7 @@
-
+
@@ -4916,7 +4916,7 @@
-
+
@@ -4927,7 +4927,7 @@
-
+
@@ -4938,7 +4938,7 @@
-
+
@@ -4949,7 +4949,7 @@
-
+
@@ -4960,7 +4960,7 @@
-
+
@@ -4971,7 +4971,7 @@
-
+
@@ -4982,7 +4982,7 @@
-
+
@@ -4993,7 +4993,7 @@
-
+
@@ -5004,7 +5004,7 @@
-
+
@@ -5015,7 +5015,7 @@
-
+
@@ -5026,7 +5026,7 @@
-
+
@@ -5037,7 +5037,7 @@
-
+
@@ -5048,7 +5048,7 @@
-
+
@@ -5059,7 +5059,7 @@
-
+
@@ -5070,7 +5070,7 @@
-
+
@@ -5081,7 +5081,7 @@
-
+
@@ -5092,7 +5092,7 @@
-
+
@@ -5103,7 +5103,7 @@
-
+
@@ -5114,7 +5114,7 @@
-
+
@@ -5125,7 +5125,7 @@
-
+
@@ -5136,7 +5136,7 @@
-
+
@@ -5147,7 +5147,7 @@
-
+
@@ -5166,9 +5166,9 @@
-
-
-
+
+
+
@@ -5187,9 +5187,9 @@
-
-
-
+
+
+
@@ -5208,9 +5208,9 @@
-
-
-
+
+
+
@@ -5229,9 +5229,9 @@
-
-
-
+
+
+
@@ -5242,7 +5242,7 @@
-
+
diff --git a/src/test/resources/pairwise/label-type-issue/form-hierarchical.xml b/src/test/resources/pairwise/label-type-issue/form-hierarchical.xml
index 4bf585af..76209ec0 100644
--- a/src/test/resources/pairwise/label-type-issue/form-hierarchical.xml
+++ b/src/test/resources/pairwise/label-type-issue/form-hierarchical.xml
@@ -245,9 +245,9 @@
-
-
-
+
+
+
@@ -273,11 +273,11 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/src/test/resources/pairwise/pairwise-flat.json b/src/test/resources/pairwise/pairwise-flat.json
index b14cc015..6658dea7 100644
--- a/src/test/resources/pairwise/pairwise-flat.json
+++ b/src/test/resources/pairwise/pairwise-flat.json
@@ -1,643 +1,761 @@
{
- "id" : "lcswhwa1",
- "modele" : "L2A2_LOOP",
- "enoCoreVersion" : "2.4.1-pairwise-dev-pairwise",
- "lunaticModelVersion" : "2.3.2-rc4",
- "generatingDate" : "30-01-2023 21:23:48",
- "missing" : false,
- "pagination" : "question",
- "maxPage" : "7",
- "label" : {
- "value" : "Recette liens deux à deux --- Boucle",
- "type" : "VTL|MD"
+ "id": "lcswhwa1",
+ "modele": "L2A2_LOOP",
+ "enoCoreVersion": "2.4.1-pairwise-dev-pairwise",
+ "lunaticModelVersion": "2.3.2-rc4",
+ "generatingDate": "30-01-2023 21:23:48",
+ "missing": false,
+ "pagination": "question",
+ "maxPage": "7",
+ "label": {
+ "value": "Recette liens deux à deux --- Boucle",
+ "type": "VTL|MD"
},
- "components" : [ {
- "id" : "lcswhkve",
- "componentType" : "Sequence",
- "page" : "1",
- "type" : "Sequence",
- "label" : {
- "value" : "\"I - \" || \"Composition du ménage\"",
- "type" : "VTL|MD"
- },
- "conditionFilter" : {
- "value" : "true",
- "type" : "VTL"
- },
- "hierarchy" : {
- "sequence" : {
- "id" : "lcswhkve",
- "page" : "1",
- "label" : {
- "value" : "\"I - \" || \"Composition du ménage\"",
- "type" : "VTL|MD"
+ "components": [
+ {
+ "id": "lcswhkve",
+ "componentType": "Sequence",
+ "page": "1",
+ "type": "Sequence",
+ "label": {
+ "value": "\"I - \" || \"Composition du ménage\"",
+ "type": "VTL|MD"
+ },
+ "conditionFilter": {
+ "value": "true",
+ "type": "VTL"
+ },
+ "hierarchy": {
+ "sequence": {
+ "id": "lcswhkve",
+ "page": "1",
+ "label": {
+ "value": "\"I - \" || \"Composition du ménage\"",
+ "type": "VTL|MD"
+ }
}
}
- }
- }, {
- "id" : "lcswldsp",
- "componentType" : "InputNumber",
- "mandatory" : false,
- "page" : "2",
- "min" : 1.0,
- "max" : 10.0,
- "decimals" : 0,
- "type" : "InputNumber",
- "label" : {
- "value" : "\"➡ \" || \"Combien de personnes dans votre ménage ?\"",
- "type" : "VTL|MD"
},
- "conditionFilter" : {
- "value" : "true",
- "type" : "VTL"
- },
- "controls" : [ {
- "id" : "lcswldsp-format-borne-inf-sup",
- "typeOfControl" : "FORMAT",
- "criticality" : "ERROR",
- "control" : {
- "value" : "not(not(isnull(NB)) and (1>NB or 10NB)",
- "type" : "VTL"
+ "conditionFilter": {
+ "value": "true",
+ "type": "VTL"
},
- "errorMessage" : {
- "value" : "\"Le nombre doit comporter au maximum 0 chiffre(s) après la virgule.\"",
- "type" : "VTL|MD"
- }
- } ],
- "hierarchy" : {
- "sequence" : {
- "id" : "lcswhkve",
- "page" : "1",
- "label" : {
- "value" : "\"I - \" || \"Composition du ménage\"",
- "type" : "VTL|MD"
+ "controls": [
+ {
+ "id": "lcswldsp-format-borne-inf-sup",
+ "typeOfControl": "FORMAT",
+ "criticality": "ERROR",
+ "control": {
+ "value": "not(not(isnull(NB)) and (1>NB or 10NB)",
+ "type": "VTL"
+ },
+ "errorMessage": {
+ "value": "\"Le nombre doit comporter au maximum 0 chiffre(s) après la virgule.\"",
+ "type": "VTL|MD"
+ }
}
- }
- },
- "bindingDependencies" : [ "NB" ],
- "response" : {
- "name" : "NB"
- }
- }, {
- "id" : "lcswrct3",
- "componentType" : "Loop",
- "page" : "3",
- "depth" : 1,
- "paginatedLoop" : false,
- "type" : "Loop",
- "conditionFilter" : {
- "value" : "true",
- "type" : "VTL"
- },
- "hierarchy" : {
- "sequence" : {
- "id" : "lcswhkve",
- "page" : "1",
- "label" : {
- "value" : "\"I - \" || \"Composition du ménage\"",
- "type" : "VTL|MD"
+ ],
+ "hierarchy": {
+ "sequence": {
+ "id": "lcswhkve",
+ "page": "1",
+ "label": {
+ "value": "\"I - \" || \"Composition du ménage\"",
+ "type": "VTL|MD"
+ }
}
- }
- },
- "bindingDependencies" : [ "NB", "PRENOM" ],
- "loopDependencies" : [ "NB" ],
- "lines" : {
- "min" : {
- "value" : "nvl(NB, 1)",
- "type" : "VTL"
},
- "max" : {
- "value" : "nvl(NB, 1)",
- "type" : "VTL"
+ "bindingDependencies": [
+ "NB"
+ ],
+ "response": {
+ "name": "NB"
}
},
- "components" : [ {
- "id" : "lcswbr49",
- "componentType" : "Subsequence",
- "page" : "3",
- "goToPage" : "3",
- "type" : "Subsequence",
- "label" : {
- "value" : "Prénoms",
- "type" : "VTL|MD"
- },
- "conditionFilter" : {
- "value" : "true",
- "type" : "VTL"
+ {
+ "id": "lcswrct3",
+ "componentType": "Loop",
+ "page": "3",
+ "depth": 1,
+ "paginatedLoop": false,
+ "type": "Loop",
+ "conditionFilter": {
+ "value": "true",
+ "type": "VTL"
},
- "hierarchy" : {
- "sequence" : {
- "id" : "lcswhkve",
- "page" : "1",
- "label" : {
- "value" : "\"I - \" || \"Composition du ménage\"",
- "type" : "VTL|MD"
+ "hierarchy": {
+ "sequence": {
+ "id": "lcswhkve",
+ "page": "1",
+ "label": {
+ "value": "\"I - \" || \"Composition du ménage\"",
+ "type": "VTL|MD"
}
+ }
+ },
+ "bindingDependencies": [
+ "NB",
+ "PRENOM"
+ ],
+ "loopDependencies": [
+ "NB"
+ ],
+ "lines": {
+ "min": {
+ "value": "nvl(NB, 1)",
+ "type": "VTL"
},
- "subSequence" : {
- "id" : "lcswbr49",
- "page" : "3",
- "label" : {
- "value" : "Prénoms",
- "type" : "VTL|MD"
- }
+ "max": {
+ "value": "nvl(NB, 1)",
+ "type": "VTL"
}
},
- "bindingDependencies" : [ "NB" ]
- }, {
- "id" : "lcswmnod",
- "componentType" : "Input",
- "mandatory" : false,
- "page" : "3",
- "maxLength" : 249,
- "type" : "Input",
- "label" : {
- "value" : "\"➡ \" || \"Prénom ?\"",
- "type" : "VTL|MD"
+ "components": [
+ {
+ "id": "lcswbr49",
+ "componentType": "Subsequence",
+ "page": "3",
+ "goToPage": "3",
+ "type": "Subsequence",
+ "label": {
+ "value": "Prénoms",
+ "type": "VTL|MD"
+ },
+ "conditionFilter": {
+ "value": "true",
+ "type": "VTL"
+ },
+ "hierarchy": {
+ "sequence": {
+ "id": "lcswhkve",
+ "page": "1",
+ "label": {
+ "value": "\"I - \" || \"Composition du ménage\"",
+ "type": "VTL|MD"
+ }
+ },
+ "subSequence": {
+ "id": "lcswbr49",
+ "page": "3",
+ "label": {
+ "value": "Prénoms",
+ "type": "VTL|MD"
+ }
+ }
+ },
+ "bindingDependencies": [
+ "NB"
+ ]
+ },
+ {
+ "id": "lcswmnod",
+ "componentType": "Input",
+ "mandatory": false,
+ "page": "3",
+ "maxLength": 249,
+ "type": "Input",
+ "label": {
+ "value": "\"➡ \" || \"Prénom ?\"",
+ "type": "VTL|MD"
+ },
+ "conditionFilter": {
+ "value": "true",
+ "type": "VTL"
+ },
+ "hierarchy": {
+ "sequence": {
+ "id": "lcswhkve",
+ "page": "1",
+ "label": {
+ "value": "\"I - \" || \"Composition du ménage\"",
+ "type": "VTL|MD"
+ }
+ },
+ "subSequence": {
+ "id": "lcswbr49",
+ "page": "3",
+ "label": {
+ "value": "Prénoms",
+ "type": "VTL|MD"
+ }
+ }
+ },
+ "bindingDependencies": [
+ "PRENOM",
+ "NB"
+ ],
+ "response": {
+ "name": "PRENOM"
+ }
+ }
+ ]
+ },
+ {
+ "id": "lcswo5m5",
+ "componentType": "Subsequence",
+ "goToPage": "4",
+ "type": "Subsequence",
+ "label": {
+ "value": "Liens deux à deux",
+ "type": "VTL|MD"
},
- "conditionFilter" : {
- "value" : "true",
- "type" : "VTL"
+ "conditionFilter": {
+ "value": "true",
+ "type": "VTL"
},
- "hierarchy" : {
- "sequence" : {
- "id" : "lcswhkve",
- "page" : "1",
- "label" : {
- "value" : "\"I - \" || \"Composition du ménage\"",
- "type" : "VTL|MD"
+ "hierarchy": {
+ "sequence": {
+ "id": "lcswhkve",
+ "page": "1",
+ "label": {
+ "value": "\"I - \" || \"Composition du ménage\"",
+ "type": "VTL|MD"
}
},
- "subSequence" : {
- "id" : "lcswbr49",
- "page" : "3",
- "label" : {
- "value" : "Prénoms",
- "type" : "VTL|MD"
+ "subSequence": {
+ "id": "lcswo5m5",
+ "page": "4",
+ "label": {
+ "value": "Liens deux à deux",
+ "type": "VTL|MD"
}
}
- },
- "bindingDependencies" : [ "PRENOM", "NB" ],
- "response" : {
- "name" : "PRENOM"
}
- } ]
- }, {
- "id" : "lcswo5m5",
- "componentType" : "Subsequence",
- "goToPage" : "4",
- "type" : "Subsequence",
- "label" : {
- "value" : "Liens deux à deux",
- "type" : "VTL|MD"
- },
- "conditionFilter" : {
- "value" : "true",
- "type" : "VTL"
},
- "hierarchy" : {
- "sequence" : {
- "id" : "lcswhkve",
- "page" : "1",
- "label" : {
- "value" : "\"I - \" || \"Composition du ménage\"",
- "type" : "VTL|MD"
+ {
+ "id": "lcsxm1eu",
+ "componentType": "PairwiseLinks",
+ "mandatory": false,
+ "page": "4",
+ "type": "PairwiseLinks",
+ "conditionFilter": {
+ "value": "true",
+ "type": "VTL"
+ },
+ "hierarchy": {
+ "sequence": {
+ "id": "lcswhkve",
+ "page": "1",
+ "label": {
+ "value": "\"I - \" || \"Composition du ménage\"",
+ "type": "VTL|MD"
+ }
+ },
+ "subSequence": {
+ "id": "lcswo5m5",
+ "page": "4",
+ "label": {
+ "value": "Liens deux à deux",
+ "type": "VTL|MD"
+ }
}
},
- "subSequence" : {
- "id" : "lcswo5m5",
- "page" : "4",
- "label" : {
- "value" : "Liens deux à deux",
- "type" : "VTL|MD"
+ "bindingDependencies": [
+ "LIENS"
+ ],
+ "xAxisIterations": {
+ "value": "count(PRENOM)",
+ "type": "VTL"
+ },
+ "yAxisIterations": {
+ "value": "count(PRENOM)",
+ "type": "VTL"
+ },
+ "components": [
+ {
+ "id": "lcsxm1eu-pairwise-dropdown",
+ "componentType": "Dropdown",
+ "mandatory": false,
+ "page": "5",
+ "type": "Dropdown",
+ "label": {
+ "value": "\"➡ \" || \"Quels sont vos liens ?\"",
+ "type": "VTL|MD"
+ },
+ "conditionFilter": {
+ "value": "xAxis <> yAxis",
+ "type": "VTL"
+ },
+ "bindingDependencies": [
+ "LIENS"
+ ],
+ "options": [
+ {
+ "value": "1",
+ "label": {
+ "value": "Son conjoint, sa conjointe",
+ "type": "VTL|MD"
+ }
+ },
+ {
+ "value": "2",
+ "label": {
+ "value": "Sa mère, son père",
+ "type": "VTL|MD"
+ }
+ },
+ {
+ "value": "3",
+ "label": {
+ "value": "Sa fille, son fils",
+ "type": "VTL|MD"
+ }
+ },
+ {
+ "value": "4",
+ "label": {
+ "value": "Sa soeur, son frère (y compris demi et quasi)",
+ "type": "VTL|MD"
+ }
+ },
+ {
+ "value": "5",
+ "label": {
+ "value": "Sa belle-mère, son beau-père (conjoint.e d’un des parents)",
+ "type": "VTL|MD"
+ }
+ },
+ {
+ "value": "6",
+ "label": {
+ "value": "L’enfant du conjoint (belle-fille, beau-fils)",
+ "type": "VTL|MD"
+ }
+ },
+ {
+ "value": "7",
+ "label": {
+ "value": "Sa belle-mère, son beau-père (parent du conjoint)",
+ "type": "VTL|MD"
+ }
+ },
+ {
+ "value": "8",
+ "label": {
+ "value": "Sa belle-fille, son beau-fils (conjoint.e d’un enfant)",
+ "type": "VTL|MD"
+ }
+ },
+ {
+ "value": "9",
+ "label": {
+ "value": "Sa grand-mère, son grand-père",
+ "type": "VTL|MD"
+ }
+ },
+ {
+ "value": "10",
+ "label": {
+ "value": "Sa petite-fille, petit-fils",
+ "type": "VTL|MD"
+ }
+ },
+ {
+ "value": "11",
+ "label": {
+ "value": "Sa tante, son oncle",
+ "type": "VTL|MD"
+ }
+ },
+ {
+ "value": "12",
+ "label": {
+ "value": "Sa cousine, son cousin",
+ "type": "VTL|MD"
+ }
+ },
+ {
+ "value": "13",
+ "label": {
+ "value": "Sa nièce, son neveu",
+ "type": "VTL|MD"
+ }
+ },
+ {
+ "value": "14",
+ "label": {
+ "value": "Un enfant placé en famille d’accueil",
+ "type": "VTL|MD"
+ }
+ },
+ {
+ "value": "15",
+ "label": {
+ "value": "Sa belle-soeur, son beau-frère",
+ "type": "VTL|MD"
+ }
+ },
+ {
+ "value": "16",
+ "label": {
+ "value": "Un autre lien familial",
+ "type": "VTL|MD"
+ }
+ },
+ {
+ "value": "17",
+ "label": {
+ "value": "Autre lien (employé de maison, salarié logé, jeune au pair …)",
+ "type": "VTL|MD"
+ }
+ }
+ ],
+ "response": {
+ "name": "LIENS"
+ }
}
+ ],
+ "symLinks": {
+ "name": "LIENS",
+ "LINK": [
+ {
+ "source": "1",
+ "target": "1"
+ },
+ {
+ "source": "2",
+ "target": "3"
+ },
+ {
+ "source": "3",
+ "target": "2"
+ },
+ {
+ "source": "4",
+ "target": "4"
+ },
+ {
+ "source": "5",
+ "target": "6"
+ },
+ {
+ "source": "6",
+ "target": "5"
+ },
+ {
+ "source": "7",
+ "target": "8"
+ },
+ {
+ "source": "8",
+ "target": "7"
+ },
+ {
+ "source": "9",
+ "target": "10"
+ },
+ {
+ "source": "10",
+ "target": "9"
+ },
+ {
+ "source": "11",
+ "target": "13"
+ },
+ {
+ "source": "12",
+ "target": "12"
+ },
+ {
+ "source": "13",
+ "target": "11"
+ },
+ {
+ "source": "14",
+ "target": "null"
+ },
+ {
+ "source": "15",
+ "target": "null"
+ },
+ {
+ "source": "16",
+ "target": "16"
+ },
+ {
+ "source": "17",
+ "target": "17"
+ },
+ {
+ "source": "18",
+ "target": "18"
+ }
+ ]
}
- }
- }, {
- "id" : "lcsxm1eu",
- "componentType" : "PairwiseLinks",
- "mandatory" : false,
- "page" : "4",
- "type" : "PairwiseLinks",
- "conditionFilter" : {
- "value" : "true",
- "type" : "VTL"
},
- "hierarchy" : {
- "sequence" : {
- "id" : "lcswhkve",
- "page" : "1",
- "label" : {
- "value" : "\"I - \" || \"Composition du ménage\"",
- "type" : "VTL|MD"
- }
+ {
+ "id": "COMMENT-SEQ",
+ "componentType": "Sequence",
+ "page": "6",
+ "type": "Sequence",
+ "label": {
+ "value": "\"Commentaire\"",
+ "type": "VTL|MD"
},
- "subSequence" : {
- "id" : "lcswo5m5",
- "page" : "4",
- "label" : {
- "value" : "Liens deux à deux",
- "type" : "VTL|MD"
+ "conditionFilter": {
+ "value": "true",
+ "type": "VTL"
+ },
+ "hierarchy": {
+ "sequence": {
+ "id": "COMMENT-SEQ",
+ "page": "6",
+ "label": {
+ "value": "\"Commentaire\"",
+ "type": "VTL|MD"
+ }
}
}
},
- "bindingDependencies" : [ "LIENS" ],
- "xAxisIterations" : {
- "value" : "count(PRENOM)",
- "type" : "VTL"
- },
- "yAxisIterations" : {
- "value" : "count(PRENOM)",
- "type" : "VTL"
- },
- "components" : [ {
- "id" : "lcsxm1eu-pairwise-dropdown",
- "componentType" : "Dropdown",
- "mandatory" : false,
- "page" : "5",
- "type" : "Dropdown",
- "label" : {
- "value" : "\"➡ \" || \"Quels sont vos liens ?\"",
- "type" : "VTL|MD"
+ {
+ "id": "COMMENT-QUESTION",
+ "componentType": "Textarea",
+ "mandatory": false,
+ "page": "7",
+ "maxLength": 2000,
+ "type": "Textarea",
+ "label": {
+ "value": "\"Avez-vous des remarques concernant l'enquête ou des commentaires ?\"",
+ "type": "VTL|MD"
},
- "conditionFilter" : {
- "value" : "xAxis <> yAxis",
- "type" : "VTL"
+ "conditionFilter": {
+ "value": "true",
+ "type": "VTL"
},
- "bindingDependencies" : [ "LIENS" ],
- "options" : [ {
- "value" : "1",
- "label" : {
- "value" : "Son conjoint, sa conjointe",
- "type" : "VTL|MD"
- }
- }, {
- "value" : "2",
- "label" : {
- "value" : "Sa mère, son père",
- "type" : "VTL|MD"
- }
- }, {
- "value" : "3",
- "label" : {
- "value" : "Sa fille, son fils",
- "type" : "VTL|MD"
- }
- }, {
- "value" : "4",
- "label" : {
- "value" : "Sa soeur, son frère (y compris demi et quasi)",
- "type" : "VTL|MD"
- }
- }, {
- "value" : "5",
- "label" : {
- "value" : "Sa belle-mère, son beau-père (conjoint.e d’un des parents)",
- "type" : "VTL|MD"
- }
- }, {
- "value" : "6",
- "label" : {
- "value" : "L’enfant du conjoint (belle-fille, beau-fils)",
- "type" : "VTL|MD"
- }
- }, {
- "value" : "7",
- "label" : {
- "value" : "Sa belle-mère, son beau-père (parent du conjoint)",
- "type" : "VTL|MD"
- }
- }, {
- "value" : "8",
- "label" : {
- "value" : "Sa belle-fille, son beau-fils (conjoint.e d’un enfant)",
- "type" : "VTL|MD"
- }
- }, {
- "value" : "9",
- "label" : {
- "value" : "Sa grand-mère, son grand-père",
- "type" : "VTL|MD"
- }
- }, {
- "value" : "10",
- "label" : {
- "value" : "Sa petite-fille, petit-fils",
- "type" : "VTL|MD"
- }
- }, {
- "value" : "11",
- "label" : {
- "value" : "Sa tante, son oncle",
- "type" : "VTL|MD"
- }
- }, {
- "value" : "12",
- "label" : {
- "value" : "Sa cousine, son cousin",
- "type" : "VTL|MD"
- }
- }, {
- "value" : "13",
- "label" : {
- "value" : "Sa nièce, son neveu",
- "type" : "VTL|MD"
- }
- }, {
- "value" : "14",
- "label" : {
- "value" : "Un enfant placé en famille d’accueil",
- "type" : "VTL|MD"
- }
- }, {
- "value" : "15",
- "label" : {
- "value" : "Sa belle-soeur, son beau-frère",
- "type" : "VTL|MD"
- }
- }, {
- "value" : "16",
- "label" : {
- "value" : "Un autre lien familial",
- "type" : "VTL|MD"
- }
- }, {
- "value" : "17",
- "label" : {
- "value" : "Autre lien (employé de maison, salarié logé, jeune au pair …)",
- "type" : "VTL|MD"
+ "hierarchy": {
+ "sequence": {
+ "id": "COMMENT-SEQ",
+ "page": "6",
+ "label": {
+ "value": "\"Commentaire\"",
+ "type": "VTL|MD"
+ }
}
- } ],
- "response" : {
- "name" : "LIENS"
+ },
+ "bindingDependencies": [
+ "COMMENT_QE"
+ ],
+ "response": {
+ "name": "COMMENT_QE"
}
- } ],
- "symLinks" : {
- "name" : "LIENS",
- "LINK" : [ {
- "source" : "1",
- "target" : "1"
- }, {
- "source" : "2",
- "target" : "3"
- }, {
- "source" : "3",
- "target" : "2"
- }, {
- "source" : "4",
- "target" : "4"
- }, {
- "source" : "5",
- "target" : "6"
- }, {
- "source" : "6",
- "target" : "5"
- }, {
- "source" : "7",
- "target" : "8"
- }, {
- "source" : "8",
- "target" : "7"
- }, {
- "source" : "9",
- "target" : "10"
- }, {
- "source" : "10",
- "target" : "9"
- }, {
- "source" : "11",
- "target" : "13"
- }, {
- "source" : "12",
- "target" : "12"
- }, {
- "source" : "13",
- "target" : "11"
- }, {
- "source" : "14",
- "target" : "null"
- }, {
- "source" : "15",
- "target" : "null"
- }, {
- "source" : "16",
- "target" : "16"
- }, {
- "source" : "17",
- "target" : "17"
- }, {
- "source" : "18",
- "target" : "18"
- } ]
}
- }, {
- "id" : "COMMENT-SEQ",
- "componentType" : "Sequence",
- "page" : "6",
- "type" : "Sequence",
- "label" : {
- "value" : "\"Commentaire\"",
- "type" : "VTL|MD"
+ ],
+ "variables": [
+ {
+ "variableType": "COLLECTED",
+ "type": "VariableType",
+ "name": "COMMENT_QE",
+ "values": {
+ "PREVIOUS": null,
+ "COLLECTED": null,
+ "FORCED": null,
+ "EDITED": null,
+ "INPUTTED": null
+ }
},
- "conditionFilter" : {
- "value" : "true",
- "type" : "VTL"
+ {
+ "variableType": "COLLECTED",
+ "type": "VariableType",
+ "name": "NB",
+ "values": {
+ "PREVIOUS": null,
+ "COLLECTED": null,
+ "FORCED": null,
+ "EDITED": null,
+ "INPUTTED": null
+ }
},
- "hierarchy" : {
- "sequence" : {
- "id" : "COMMENT-SEQ",
- "page" : "6",
- "label" : {
- "value" : "\"Commentaire\"",
- "type" : "VTL|MD"
+ {
+ "variableType": "COLLECTED",
+ "type": "VariableTypeArray",
+ "name": "PRENOM",
+ "values": {
+ "PREVIOUS": {
+ "PREVIOUS": [
+ null
+ ]
+ },
+ "COLLECTED": {
+ "COLLECTED": [
+ null
+ ]
+ },
+ "FORCED": {
+ "FORCED": [
+ null
+ ]
+ },
+ "EDITED": {
+ "EDITED": [
+ null
+ ]
+ },
+ "INPUTTED": {
+ "INPUTTED": [
+ null
+ ]
}
}
- }
- }, {
- "id" : "COMMENT-QUESTION",
- "componentType" : "Textarea",
- "mandatory" : false,
- "page" : "7",
- "maxLength" : 2000,
- "type" : "Textarea",
- "label" : {
- "value" : "\"Avez-vous des remarques concernant l'enquête ou des commentaires ?\"",
- "type" : "VTL|MD"
},
- "conditionFilter" : {
- "value" : "true",
- "type" : "VTL"
- },
- "hierarchy" : {
- "sequence" : {
- "id" : "COMMENT-SEQ",
- "page" : "6",
- "label" : {
- "value" : "\"Commentaire\"",
- "type" : "VTL|MD"
+ {
+ "variableType": "COLLECTED",
+ "type": "VariableTypeArray",
+ "name": "LIENS",
+ "values": {
+ "PREVIOUS": {
+ "PREVIOUS": [
+ {
+ "type": "PREVIOUSArray",
+ "PREVIOUS": [
+ null
+ ]
+ }
+ ]
+ },
+ "COLLECTED": {
+ "COLLECTED": [
+ {
+ "type": "COLLECTEDArray",
+ "COLLECTED": [
+ null
+ ]
+ }
+ ]
+ },
+ "FORCED": {
+ "FORCED": [
+ {
+ "type": "FORCEDArray",
+ "FORCED": [
+ null
+ ]
+ }
+ ]
+ },
+ "EDITED": {
+ "EDITED": [
+ {
+ "type": "EDITEDArray",
+ "EDITED": [
+ null
+ ]
+ }
+ ]
+ },
+ "INPUTTED": {
+ "INPUTTED": [
+ {
+ "type": "INPUTTEDArray",
+ "INPUTTED": [
+ null
+ ]
+ }
+ ]
}
}
},
- "bindingDependencies" : [ "COMMENT_QE" ],
- "response" : {
- "name" : "COMMENT_QE"
- }
- } ],
- "variables" : [ {
- "variableType" : "COLLECTED",
- "type" : "VariableType",
- "name" : "COMMENT_QE",
- "values" : {
- "PREVIOUS" : null,
- "COLLECTED" : null,
- "FORCED" : null,
- "EDITED" : null,
- "INPUTED" : null
- }
- }, {
- "variableType" : "COLLECTED",
- "type" : "VariableType",
- "name" : "NB",
- "values" : {
- "PREVIOUS" : null,
- "COLLECTED" : null,
- "FORCED" : null,
- "EDITED" : null,
- "INPUTED" : null
- }
- }, {
- "variableType" : "COLLECTED",
- "type" : "VariableTypeArray",
- "name" : "PRENOM",
- "values" : {
- "PREVIOUS" : {
- "PREVIOUS" : [ null ]
- },
- "COLLECTED" : {
- "COLLECTED" : [ null ]
+ {
+ "variableType": "CALCULATED",
+ "type": "VariableType",
+ "name": "FILTER_RESULT_NB",
+ "expression": {
+ "value": "true",
+ "type": "VTL"
},
- "FORCED" : {
- "FORCED" : [ null ]
- },
- "EDITED" : {
- "EDITED" : [ null ]
- },
- "INPUTED" : {
- "INPUTED" : [ null ]
- }
- }
- }, {
- "variableType" : "COLLECTED",
- "type" : "VariableTypeArray",
- "name" : "LIENS",
- "values" : {
- "PREVIOUS" : {
- "PREVIOUS" : [ {
- "type" : "PREVIOUSArray",
- "PREVIOUS" : [ null ]
- } ]
+ "inFilter": "false"
+ },
+ {
+ "variableType": "CALCULATED",
+ "type": "VariableType",
+ "name": "FILTER_RESULT_PRENOM",
+ "expression": {
+ "value": "true",
+ "type": "VTL"
},
- "COLLECTED" : {
- "COLLECTED" : [ {
- "type" : "COLLECTEDArray",
- "COLLECTED" : [ null ]
- } ]
+ "shapeFrom": "PRENOM",
+ "inFilter": "false"
+ },
+ {
+ "variableType": "CALCULATED",
+ "type": "VariableType",
+ "name": "FILTER_RESULT_LIENS",
+ "expression": {
+ "value": "xAxis <> yAxis",
+ "type": "VTL"
},
- "FORCED" : {
- "FORCED" : [ {
- "type" : "FORCEDArray",
- "FORCED" : [ null ]
- } ]
+ "inFilter": "false"
+ },
+ {
+ "variableType": "CALCULATED",
+ "type": "VariableType",
+ "name": "xAxis",
+ "expression": {
+ "value": "PRENOM",
+ "type": "VTL"
},
- "EDITED" : {
- "EDITED" : [ {
- "type" : "EDITEDArray",
- "EDITED" : [ null ]
- } ]
+ "bindingDependencies": [
+ "PRENOM"
+ ],
+ "shapeFrom": "PRENOM",
+ "inFilter": "true"
+ },
+ {
+ "variableType": "CALCULATED",
+ "type": "VariableType",
+ "name": "yAxis",
+ "expression": {
+ "value": "PRENOM",
+ "type": "VTL"
},
- "INPUTED" : {
- "INPUTED" : [ {
- "type" : "INPUTEDArray",
- "INPUTED" : [ null ]
- } ]
- }
+ "bindingDependencies": [
+ "PRENOM"
+ ],
+ "shapeFrom": "PRENOM",
+ "inFilter": "true"
}
- }, {
- "variableType" : "CALCULATED",
- "type" : "VariableType",
- "name" : "FILTER_RESULT_NB",
- "expression" : {
- "value" : "true",
- "type" : "VTL"
- },
- "inFilter" : "false"
- }, {
- "variableType" : "CALCULATED",
- "type" : "VariableType",
- "name" : "FILTER_RESULT_PRENOM",
- "expression" : {
- "value" : "true",
- "type" : "VTL"
- },
- "shapeFrom" : "PRENOM",
- "inFilter" : "false"
- }, {
- "variableType" : "CALCULATED",
- "type" : "VariableType",
- "name" : "FILTER_RESULT_LIENS",
- "expression" : {
- "value" : "xAxis <> yAxis",
- "type" : "VTL"
- },
- "inFilter" : "false"
- }, {
- "variableType" : "CALCULATED",
- "type" : "VariableType",
- "name" : "xAxis",
- "expression" : {
- "value" : "PRENOM",
- "type" : "VTL"
- },
- "bindingDependencies" : [ "PRENOM" ],
- "shapeFrom" : "PRENOM",
- "inFilter" : "true"
- }, {
- "variableType" : "CALCULATED",
- "type" : "VariableType",
- "name" : "yAxis",
- "expression" : {
- "value" : "PRENOM",
- "type" : "VTL"
- },
- "bindingDependencies" : [ "PRENOM" ],
- "shapeFrom" : "PRENOM",
- "inFilter" : "true"
- } ],
- "cleaning" : {
- },
- "resizing" : {
- "NB" : [ {
- "size" : "nvl(NB, 1)",
- "variables" : "PRENOM",
- "value" : "\n "
- } ],
- "PRENOM" : [ {
- "sizeForLinksVariables" : "count(PRENOM)",
- "sizeForLinksVariables" : "count(PRENOM)",
- "linksVariables" : "LIENS",
- "value" : "\n "
- } ]
+ ],
+ "cleaning": {},
+ "resizing": {
+ "NB": [
+ {
+ "size": "nvl(NB, 1)",
+ "variables": "PRENOM",
+ "value": "\n "
+ }
+ ],
+ "PRENOM": [
+ {
+ "sizeForLinksVariables": "count(PRENOM)",
+ "sizeForLinksVariables": "count(PRENOM)",
+ "linksVariables": "LIENS",
+ "value": "\n "
+ }
+ ]
}
}
\ No newline at end of file
diff --git a/src/test/resources/pairwise/pairwise-flat.xml b/src/test/resources/pairwise/pairwise-flat.xml
index d0e5a40d..e68550ea 100644
--- a/src/test/resources/pairwise/pairwise-flat.xml
+++ b/src/test/resources/pairwise/pairwise-flat.xml
@@ -499,7 +499,7 @@
-
+
@@ -509,7 +509,7 @@
-
+
@@ -527,9 +527,9 @@
-
-
-
+
+
+
@@ -555,11 +555,11 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/src/test/resources/pairwise/pairwise-hierarchical-test.xml b/src/test/resources/pairwise/pairwise-hierarchical-test.xml
index 603e8ac4..54a1c53c 100644
--- a/src/test/resources/pairwise/pairwise-hierarchical-test.xml
+++ b/src/test/resources/pairwise/pairwise-hierarchical-test.xml
@@ -499,7 +499,7 @@
-
+
@@ -509,7 +509,7 @@
-
+
@@ -527,9 +527,9 @@
-
-
-
+
+
+
@@ -555,11 +555,11 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/src/test/resources/pairwise/resizing-issue/lb3ei722-lunatic-expected.json b/src/test/resources/pairwise/resizing-issue/lb3ei722-lunatic-expected.json
index 98295d71..cedbf0f2 100644
--- a/src/test/resources/pairwise/resizing-issue/lb3ei722-lunatic-expected.json
+++ b/src/test/resources/pairwise/resizing-issue/lb3ei722-lunatic-expected.json
@@ -517,7 +517,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "NB",
@@ -526,7 +526,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "COLLECTED",
"name" : "PRENOM",
@@ -539,7 +539,7 @@
[ null ],
"EDITED" :
[ null ],
- "INPUTED" :
+ "INPUTTED" :
[ null ] } },
{ "variableType" : "COLLECTED",
@@ -553,7 +553,7 @@
[ null ],
"EDITED" :
[ null ],
- "INPUTED" :
+ "INPUTTED" :
[ null ] } },
{ "variableType" : "COLLECTED",
@@ -563,7 +563,7 @@
"COLLECTED" : null,
"FORCED" : null,
"EDITED" : null,
- "INPUTED" : null } },
+ "INPUTTED" : null } },
{ "variableType" : "CALCULATED",
"name" : "FILTER_RESULT_NB",
diff --git a/src/test/resources/pairwise/resizing-issue/lb3ei722-lunatic-hierarchical.xml b/src/test/resources/pairwise/resizing-issue/lb3ei722-lunatic-hierarchical.xml
index 22d3ce25..398da039 100644
--- a/src/test/resources/pairwise/resizing-issue/lb3ei722-lunatic-hierarchical.xml
+++ b/src/test/resources/pairwise/resizing-issue/lb3ei722-lunatic-hierarchical.xml
@@ -560,7 +560,7 @@
-
+
@@ -570,7 +570,7 @@
-
+
@@ -588,9 +588,9 @@
-
-
-
+
+
+
@@ -608,9 +608,9 @@
-
-
-
+
+
+
@@ -620,7 +620,7 @@
-
+