Adding upstream version 0.19.2.upstream/0.19.2upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

16 files changed, 435 insertions, 0 deletions

diff --git a/test/xml-mapped/nested-repeats-2/check-nomap.txt b/test/xml-mapped/nested-repeats-2/check-nomap.txt
new file mode 100644
index 0000000..029c983
--- /dev/null
+++ b/test/xml-mapped/nested-repeats-2/check-nomap.txt
@@ -0,0 +1,31 @@
+range-0/0/0:string:"name"
+range-0/0/1:string:"id"
+range-0/0/2:string:"ref"
+range-0/1/0:string:"foo"
+range-0/1/1:string:"A"
+range-0/1/2:numeric:123456789
+range-0/2/0:string:"foo"
+range-0/2/1:string:"A"
+range-0/2/2:numeric:987654321
+range-0/3/0:string:"foo"
+range-0/3/1:string:"B"
+range-0/3/2:numeric:1
+range-0/4/0:string:"foo"
+range-0/4/1:string:"B"
+range-0/4/2:numeric:2
+range-0/5/0:string:"foo"
+range-0/5/1:string:"B"
+range-0/5/2:numeric:3
+range-0/6/0:string:"foo"
+range-0/6/1:string:"C"
+range-0/6/2:numeric:1.1
+range-0/7/0:string:"foo"
+range-0/7/1:string:"C"
+range-0/7/2:numeric:2.2
+range-0/8/0:string:"foo"
+range-0/8/1:string:"C"
+range-0/8/2:numeric:3.3
+range-0/9/0:string:"foo"
+range-0/9/1:string:"C"
+range-0/9/2:numeric:4.4
+range-0/10/0:string:"bah"
diff --git a/test/xml-mapped/nested-repeats-2/check.txt b/test/xml-mapped/nested-repeats-2/check.txt
new file mode 100644
index 0000000..adbe04a
--- /dev/null
+++ b/test/xml-mapped/nested-repeats-2/check.txt
@@ -0,0 +1,31 @@
+data/0/0:string:"name"
+data/0/1:string:"id"
+data/0/2:string:"ref"
+data/1/0:string:"foo"
+data/1/1:string:"A"
+data/1/2:numeric:123456789
+data/2/0:string:"foo"
+data/2/1:string:"A"
+data/2/2:numeric:987654321
+data/3/0:string:"foo"
+data/3/1:string:"B"
+data/3/2:numeric:1
+data/4/0:string:"foo"
+data/4/1:string:"B"
+data/4/2:numeric:2
+data/5/0:string:"foo"
+data/5/1:string:"B"
+data/5/2:numeric:3
+data/6/0:string:"foo"
+data/6/1:string:"C"
+data/6/2:numeric:1.1
+data/7/0:string:"foo"
+data/7/1:string:"C"
+data/7/2:numeric:2.2
+data/8/0:string:"foo"
+data/8/1:string:"C"
+data/8/2:numeric:3.3
+data/9/0:string:"foo"
+data/9/1:string:"C"
+data/9/2:numeric:4.4
+data/10/0:string:"bah"
diff --git a/test/xml-mapped/nested-repeats-2/input.xml b/test/xml-mapped/nested-repeats-2/input.xml
new file mode 100644
index 0000000..325dc82
--- /dev/null
+++ b/test/xml-mapped/nested-repeats-2/input.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<osm version="0.6">
+    <parent name="foo">
+        <way id="A">
+            <nd ref="123456789"/>
+            <nd ref="987654321"/>
+        </way>
+        <way id="B">
+            <nd ref="1"/>
+            <nd ref="2"/>
+            <nd ref="3"/>
+        </way>
+        <way id="C">
+            <nd ref="1.1"/>
+            <nd ref="2.2"/>
+            <nd ref="3.3"/>
+            <nd ref="4.4"/>
+        </way>
+    </parent>
+    <parent name="bah"/>
+</osm>
diff --git a/test/xml-mapped/nested-repeats-2/map.xml b/test/xml-mapped/nested-repeats-2/map.xml
new file mode 100644
index 0000000..3a03807
--- /dev/null
+++ b/test/xml-mapped/nested-repeats-2/map.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<map xmlns="http://gitorious.org/orcus/xml-map">
+    <sheet name="data"/>
+    <range row="0" column="0" sheet="data">
+        <field path="/osm/parent/@name"/>
+        <field path="/osm/parent/way/@id"/>
+        <field path="/osm/parent/way/nd/@ref"/>
+        <row-group path="/osm/parent"/>
+        <row-group path="/osm/parent/way"/>
+        <row-group path="/osm/parent/way/nd"/>
+    </range>
+</map>
diff --git a/test/xml-mapped/nested-repeats-3/check-nomap.txt b/test/xml-mapped/nested-repeats-3/check-nomap.txt
new file mode 100644
index 0000000..e7e0703
--- /dev/null
+++ b/test/xml-mapped/nested-repeats-3/check-nomap.txt
@@ -0,0 +1,44 @@
+range-0/0/0:string:"id"
+range-0/0/1:string:"first_name"
+range-0/0/2:string:"last_name"
+range-0/0/3:string:"gender"
+range-0/0/4:string:"score"
+range-0/1/0:numeric:1
+range-0/1/1:string:"Mace"
+range-0/1/2:string:"Stainton"
+range-0/1/3:string:"Male"
+range-0/1/4:numeric:39
+range-0/2/0:numeric:1
+range-0/2/1:string:"Mace"
+range-0/2/2:string:"Stainton"
+range-0/2/3:string:"Male"
+range-0/2/4:numeric:42
+range-0/3/0:numeric:1
+range-0/3/1:string:"Mace"
+range-0/3/2:string:"Stainton"
+range-0/3/3:string:"Male"
+range-0/3/4:numeric:58
+range-0/4/0:numeric:2
+range-0/4/1:string:"Kelley"
+range-0/4/2:string:"Schelle"
+range-0/4/3:string:"Female"
+range-0/4/4:numeric:96
+range-0/5/0:numeric:2
+range-0/5/1:string:"Kelley"
+range-0/5/2:string:"Schelle"
+range-0/5/3:string:"Female"
+range-0/5/4:numeric:158
+range-0/6/0:numeric:2
+range-0/6/1:string:"Kelley"
+range-0/6/2:string:"Schelle"
+range-0/6/3:string:"Female"
+range-0/6/4:numeric:23
+range-0/7/0:numeric:2
+range-0/7/1:string:"Kelley"
+range-0/7/2:string:"Schelle"
+range-0/7/3:string:"Female"
+range-0/7/4:numeric:44
+range-0/8/0:numeric:3
+range-0/8/1:string:"Ashbey"
+range-0/8/2:string:"Fishly"
+range-0/8/3:string:"Male"
diff --git a/test/xml-mapped/nested-repeats-3/check.txt b/test/xml-mapped/nested-repeats-3/check.txt
new file mode 100644
index 0000000..33bc184
--- /dev/null
+++ b/test/xml-mapped/nested-repeats-3/check.txt
@@ -0,0 +1,44 @@
+data/0/0:string:"id"
+data/0/1:string:"first_name"
+data/0/2:string:"last_name"
+data/0/3:string:"gender"
+data/0/4:string:"score"
+data/1/0:numeric:1
+data/1/1:string:"Mace"
+data/1/2:string:"Stainton"
+data/1/3:string:"Male"
+data/1/4:numeric:39
+data/2/0:numeric:1
+data/2/1:string:"Mace"
+data/2/2:string:"Stainton"
+data/2/3:string:"Male"
+data/2/4:numeric:42
+data/3/0:numeric:1
+data/3/1:string:"Mace"
+data/3/2:string:"Stainton"
+data/3/3:string:"Male"
+data/3/4:numeric:58
+data/4/0:numeric:2
+data/4/1:string:"Kelley"
+data/4/2:string:"Schelle"
+data/4/3:string:"Female"
+data/4/4:numeric:96
+data/5/0:numeric:2
+data/5/1:string:"Kelley"
+data/5/2:string:"Schelle"
+data/5/3:string:"Female"
+data/5/4:numeric:158
+data/6/0:numeric:2
+data/6/1:string:"Kelley"
+data/6/2:string:"Schelle"
+data/6/3:string:"Female"
+data/6/4:numeric:23
+data/7/0:numeric:2
+data/7/1:string:"Kelley"
+data/7/2:string:"Schelle"
+data/7/3:string:"Female"
+data/7/4:numeric:44
+data/8/0:numeric:3
+data/8/1:string:"Ashbey"
+data/8/2:string:"Fishly"
+data/8/3:string:"Male"
diff --git a/test/xml-mapped/nested-repeats-3/input.xml b/test/xml-mapped/nested-repeats-3/input.xml
new file mode 100644
index 0000000..883142d
--- /dev/null
+++ b/test/xml-mapped/nested-repeats-3/input.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<dataset>
+  <record>
+    <id>1</id>
+    <first_name>Mace</first_name>
+    <last_name>Stainton</last_name>
+    <gender>Male</gender>
+    <scores>
+        <score>39</score>
+        <score>42</score>
+        <score>58</score>
+    </scores>
+  </record>
+  <record>
+    <id>2</id>
+    <first_name>Kelley</first_name>
+    <last_name>Schelle</last_name>
+    <gender>Female</gender>
+    <scores>
+        <score>96</score>
+        <score>158</score>
+        <score>23</score>
+        <score>44</score>
+    </scores>
+  </record>
+  <record>
+    <id>3</id>
+    <first_name>Ashbey</first_name>
+    <last_name>Fishly</last_name>
+    <gender>Male</gender>
+  </record>
+</dataset>
diff --git a/test/xml-mapped/nested-repeats-3/map.xml b/test/xml-mapped/nested-repeats-3/map.xml
new file mode 100644
index 0000000..ec0fdef
--- /dev/null
+++ b/test/xml-mapped/nested-repeats-3/map.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<map xmlns="http://gitorious.org/orcus/xml-map">
+    <sheet name="data"/>
+    <range row="0" column="0" sheet="data">
+        <field path="/dataset/record/id"/>
+        <field path="/dataset/record/first_name"/>
+        <field path="/dataset/record/last_name"/>
+        <field path="/dataset/record/gender"/>
+        <field path="/dataset/record/scores/score"/>
+        <row-group path="/dataset/record"/>
+        <row-group path="/dataset/record/scores/score"/>
+    </range>
+</map>
diff --git a/test/xml-mapped/nested-repeats-4/check-nomap.txt b/test/xml-mapped/nested-repeats-4/check-nomap.txt
new file mode 100644
index 0000000..5b6d8ff
--- /dev/null
+++ b/test/xml-mapped/nested-repeats-4/check-nomap.txt
@@ -0,0 +1,44 @@
+range-0/0/0:string:"id"
+range-0/0/1:string:"first"
+range-0/0/2:string:"last"
+range-0/0/3:string:"gender"
+range-0/0/4:string:"score"
+range-0/1/0:numeric:1
+range-0/1/1:string:"Mace"
+range-0/1/2:string:"Stainton"
+range-0/1/3:string:"Male"
+range-0/1/4:numeric:39
+range-0/2/0:numeric:1
+range-0/2/1:string:"Mace"
+range-0/2/2:string:"Stainton"
+range-0/2/3:string:"Male"
+range-0/2/4:numeric:42
+range-0/3/0:numeric:1
+range-0/3/1:string:"Mace"
+range-0/3/2:string:"Stainton"
+range-0/3/3:string:"Male"
+range-0/3/4:numeric:58
+range-0/4/0:numeric:2
+range-0/4/1:string:"Kelley"
+range-0/4/2:string:"Schelle"
+range-0/4/3:string:"Female"
+range-0/4/4:numeric:96
+range-0/5/0:numeric:2
+range-0/5/1:string:"Kelley"
+range-0/5/2:string:"Schelle"
+range-0/5/3:string:"Female"
+range-0/5/4:numeric:158
+range-0/6/0:numeric:2
+range-0/6/1:string:"Kelley"
+range-0/6/2:string:"Schelle"
+range-0/6/3:string:"Female"
+range-0/6/4:numeric:23
+range-0/7/0:numeric:2
+range-0/7/1:string:"Kelley"
+range-0/7/2:string:"Schelle"
+range-0/7/3:string:"Female"
+range-0/7/4:numeric:44
+range-0/8/0:numeric:3
+range-0/8/1:string:"Ashbey"
+range-0/8/2:string:"Fishly"
+range-0/8/3:string:"Male"
diff --git a/test/xml-mapped/nested-repeats-4/check.txt b/test/xml-mapped/nested-repeats-4/check.txt
new file mode 100644
index 0000000..a576382
--- /dev/null
+++ b/test/xml-mapped/nested-repeats-4/check.txt
@@ -0,0 +1,44 @@
+data/0/0:string:"id"
+data/0/1:string:"first"
+data/0/2:string:"last"
+data/0/3:string:"gender"
+data/0/4:string:"score"
+data/1/0:numeric:1
+data/1/1:string:"Mace"
+data/1/2:string:"Stainton"
+data/1/3:string:"Male"
+data/1/4:numeric:39
+data/2/0:numeric:1
+data/2/1:string:"Mace"
+data/2/2:string:"Stainton"
+data/2/3:string:"Male"
+data/2/4:numeric:42
+data/3/0:numeric:1
+data/3/1:string:"Mace"
+data/3/2:string:"Stainton"
+data/3/3:string:"Male"
+data/3/4:numeric:58
+data/4/0:numeric:2
+data/4/1:string:"Kelley"
+data/4/2:string:"Schelle"
+data/4/3:string:"Female"
+data/4/4:numeric:96
+data/5/0:numeric:2
+data/5/1:string:"Kelley"
+data/5/2:string:"Schelle"
+data/5/3:string:"Female"
+data/5/4:numeric:158
+data/6/0:numeric:2
+data/6/1:string:"Kelley"
+data/6/2:string:"Schelle"
+data/6/3:string:"Female"
+data/6/4:numeric:23
+data/7/0:numeric:2
+data/7/1:string:"Kelley"
+data/7/2:string:"Schelle"
+data/7/3:string:"Female"
+data/7/4:numeric:44
+data/8/0:numeric:3
+data/8/1:string:"Ashbey"
+data/8/2:string:"Fishly"
+data/8/3:string:"Male"
diff --git a/test/xml-mapped/nested-repeats-4/input.xml b/test/xml-mapped/nested-repeats-4/input.xml
new file mode 100644
index 0000000..4f50b59
--- /dev/null
+++ b/test/xml-mapped/nested-repeats-4/input.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<dataset>
+  <record>
+    <id>1</id>
+    <name>
+        <first>Mace</first>
+        <last>Stainton</last>
+    </name>
+    <gender>Male</gender>
+    <scores>
+        <score>39</score>
+        <score>42</score>
+        <score>58</score>
+    </scores>
+  </record>
+  <record>
+    <id>2</id>
+    <name>
+        <first>Kelley</first>
+        <last>Schelle</last>
+    </name>
+    <gender>Female</gender>
+    <scores>
+        <score>96</score>
+        <score>158</score>
+        <score>23</score>
+        <score>44</score>
+    </scores>
+  </record>
+  <record>
+    <id>3</id>
+    <name>
+        <first>Ashbey</first>
+        <last>Fishly</last>
+    </name>
+    <gender>Male</gender>
+  </record>
+</dataset>
diff --git a/test/xml-mapped/nested-repeats-4/map.xml b/test/xml-mapped/nested-repeats-4/map.xml
new file mode 100644
index 0000000..284bffe
--- /dev/null
+++ b/test/xml-mapped/nested-repeats-4/map.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<map xmlns="http://gitorious.org/orcus/xml-map">
+    <sheet name="data"/>
+    <range row="0" column="0" sheet="data">
+        <field path="/dataset/record/id"/>
+        <field path="/dataset/record/name/first"/>
+        <field path="/dataset/record/name/last"/>
+        <field path="/dataset/record/gender"/>
+        <field path="/dataset/record/scores/score"/>
+        <row-group path="/dataset/record"/>
+        <row-group path="/dataset/record/scores/score"/>
+    </range>
+</map>
diff --git a/test/xml-mapped/nested-repeats/check-nomap.txt b/test/xml-mapped/nested-repeats/check-nomap.txt
new file mode 100644
index 0000000..2afd080
--- /dev/null
+++ b/test/xml-mapped/nested-repeats/check-nomap.txt
@@ -0,0 +1,20 @@
+range-0/0/0:string:"id"
+range-0/0/1:string:"ref"
+range-0/1/0:string:"A"
+range-0/1/1:numeric:123456789
+range-0/2/0:string:"A"
+range-0/2/1:numeric:987654321
+range-0/3/0:string:"B"
+range-0/3/1:numeric:1
+range-0/4/0:string:"B"
+range-0/4/1:numeric:2
+range-0/5/0:string:"B"
+range-0/5/1:numeric:3
+range-0/6/0:string:"C"
+range-0/6/1:numeric:1.1
+range-0/7/0:string:"C"
+range-0/7/1:numeric:2.2
+range-0/8/0:string:"C"
+range-0/8/1:numeric:3.3
+range-0/9/0:string:"C"
+range-0/9/1:numeric:4.4
diff --git a/test/xml-mapped/nested-repeats/check.txt b/test/xml-mapped/nested-repeats/check.txt
new file mode 100644
index 0000000..9672007
--- /dev/null
+++ b/test/xml-mapped/nested-repeats/check.txt
@@ -0,0 +1,20 @@
+data/0/0:string:"id"
+data/0/1:string:"ref"
+data/1/0:string:"A"
+data/1/1:numeric:123456789
+data/2/0:string:"A"
+data/2/1:numeric:987654321
+data/3/0:string:"B"
+data/3/1:numeric:1
+data/4/0:string:"B"
+data/4/1:numeric:2
+data/5/0:string:"B"
+data/5/1:numeric:3
+data/6/0:string:"C"
+data/6/1:numeric:1.1
+data/7/0:string:"C"
+data/7/1:numeric:2.2
+data/8/0:string:"C"
+data/8/1:numeric:3.3
+data/9/0:string:"C"
+data/9/1:numeric:4.4
diff --git a/test/xml-mapped/nested-repeats/input.xml b/test/xml-mapped/nested-repeats/input.xml
new file mode 100644
index 0000000..8828369
--- /dev/null
+++ b/test/xml-mapped/nested-repeats/input.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<osm version="0.6">
+    <way id="A">
+        <nd ref="123456789"/>
+        <nd ref="987654321"/>
+    </way>
+    <way id="B">
+        <nd ref="1"/>
+        <nd ref="2"/>
+        <nd ref="3"/>
+    </way>
+    <way id="C">
+        <nd ref="1.1"/>
+        <nd ref="2.2"/>
+        <nd ref="3.3"/>
+        <nd ref="4.4"/>
+    </way>
+</osm>
diff --git a/test/xml-mapped/nested-repeats/map.xml b/test/xml-mapped/nested-repeats/map.xml
new file mode 100644
index 0000000..60b1743
--- /dev/null
+++ b/test/xml-mapped/nested-repeats/map.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<map xmlns="http://gitorious.org/orcus/xml-map">
+    <sheet name="data"/>
+    <range row="0" column="0" sheet="data">
+        <field path="/osm/way/@id"/>
+        <field path="/osm/way/nd/@ref"/>
+        <row-group path="/osm/way"/>
+        <row-group path="/osm/way/nd"/>
+    </range>
+</map>