You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@vxquery.apache.org by pr...@apache.org on 2015/04/03 00:22:24 UTC
[8/8] vxquery git commit: Initial XMark patch based on Shivani Mall's
patch.
Initial XMark patch based on Shivani Mall's patch.
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/d7fcc0e7
Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/d7fcc0e7
Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/d7fcc0e7
Branch: refs/heads/prestonc/xmark
Commit: d7fcc0e76fcce30e7813ca1e25655f3cb97495e6
Parents: c4008e7
Author: Eldon Carman <ec...@ucr.edu>
Authored: Wed Apr 1 12:53:18 2015 -0700
Committer: Eldon Carman <ec...@ucr.edu>
Committed: Wed Apr 1 12:53:18 2015 -0700
----------------------------------------------------------------------
.../org/apache/vxquery/xtest/TestRunner.java | 4 +-
.../org/apache/vxquery/xtest/XTestOptions.java | 3 +
.../ExpectedTestResults/XMark/Modified/q01.txt | 1 +
.../ExpectedTestResults/XMark/Modified/q02.txt | 25 +
.../ExpectedTestResults/XMark/Modified/q03.txt | 8 +
.../ExpectedTestResults/XMark/Modified/q04.txt | 1 +
.../ExpectedTestResults/XMark/Modified/q05.txt | 1 +
.../ExpectedTestResults/XMark/Modified/q06.txt | 1 +
.../ExpectedTestResults/XMark/Modified/q07.txt | 1 +
.../ExpectedTestResults/XMark/Modified/q08.txt | 53 +
.../ExpectedTestResults/XMark/Modified/q09.txt | 83 +
.../ExpectedTestResults/XMark/Modified/q10.txt | 440 ++
.../ExpectedTestResults/XMark/Modified/q11.txt | 53 +
.../ExpectedTestResults/XMark/Modified/q12.txt | 12 +
.../ExpectedTestResults/XMark/Modified/q13.txt | 55 +
.../ExpectedTestResults/XMark/Modified/q14.txt | 1 +
.../ExpectedTestResults/XMark/Modified/q15.txt | 3 +
.../ExpectedTestResults/XMark/Modified/q16.txt | 1 +
.../ExpectedTestResults/XMark/Modified/q17.txt | 27 +
.../ExpectedTestResults/XMark/Modified/q18.txt | 1 +
.../ExpectedTestResults/XMark/Modified/q19.txt | 44 +
.../ExpectedTestResults/XMark/Modified/q20.txt | 6 +
.../ExpectedTestResults/XMark/Original/q01.txt | 1 +
.../ExpectedTestResults/XMark/Original/q02.txt | 25 +
.../ExpectedTestResults/XMark/Original/q03.txt | 8 +
.../ExpectedTestResults/XMark/Original/q04.txt | 1 +
.../ExpectedTestResults/XMark/Original/q05.txt | 1 +
.../ExpectedTestResults/XMark/Original/q06.txt | 1 +
.../ExpectedTestResults/XMark/Original/q07.txt | 1 +
.../ExpectedTestResults/XMark/Original/q08.txt | 53 +
.../ExpectedTestResults/XMark/Original/q09.txt | 83 +
.../ExpectedTestResults/XMark/Original/q10.txt | 440 ++
.../ExpectedTestResults/XMark/Original/q11.txt | 53 +
.../ExpectedTestResults/XMark/Original/q12.txt | 12 +
.../ExpectedTestResults/XMark/Original/q13.txt | 55 +
.../ExpectedTestResults/XMark/Original/q14.txt | 1 +
.../ExpectedTestResults/XMark/Original/q15.txt | 3 +
.../ExpectedTestResults/XMark/Original/q16.txt | 1 +
.../ExpectedTestResults/XMark/Original/q17.txt | 27 +
.../ExpectedTestResults/XMark/Original/q18.txt | 1 +
.../ExpectedTestResults/XMark/Original/q19.txt | 44 +
.../ExpectedTestResults/XMark/Original/q20.txt | 6 +
.../XMark/Original/simple_query1.txt | 1 +
.../XMark/Original/simple_query2.txt | 4 +
.../Queries/XQuery/XMark/Modified/q01.xq | 23 +
.../Queries/XQuery/XMark/Modified/q02.xq | 22 +
.../Queries/XQuery/XMark/Modified/q03.xq | 26 +
.../Queries/XQuery/XMark/Modified/q04.xq | 26 +
.../Queries/XQuery/XMark/Modified/q05.xq | 25 +
.../Queries/XQuery/XMark/Modified/q06.xq | 22 +
.../Queries/XQuery/XMark/Modified/q07.xq | 22 +
.../Queries/XQuery/XMark/Modified/q08.xq | 28 +
.../Queries/XQuery/XMark/Modified/q09.xq | 33 +
.../Queries/XQuery/XMark/Modified/q10.xq | 46 +
.../Queries/XQuery/XMark/Modified/q11.xq | 27 +
.../Queries/XQuery/XMark/Modified/q12.xq | 28 +
.../Queries/XQuery/XMark/Modified/q13.xq | 22 +
.../Queries/XQuery/XMark/Modified/q14.xq | 23 +
.../Queries/XQuery/XMark/Modified/q15.xq | 29 +
.../Queries/XQuery/XMark/Modified/q16.xq | 30 +
.../Queries/XQuery/XMark/Modified/q17.xq | 23 +
.../Queries/XQuery/XMark/Modified/q18.xq | 28 +
.../Queries/XQuery/XMark/Modified/q19.xq | 24 +
.../Queries/XQuery/XMark/Modified/q20.xq | 58 +
.../Queries/XQuery/XMark/Original/q01.xq | 27 +
.../Queries/XQuery/XMark/Original/q02.xq | 22 +
.../Queries/XQuery/XMark/Original/q03.xq | 26 +
.../Queries/XQuery/XMark/Original/q04.xq | 27 +
.../Queries/XQuery/XMark/Original/q05.xq | 25 +
.../Queries/XQuery/XMark/Original/q06.xq | 21 +
.../Queries/XQuery/XMark/Original/q07.xq | 23 +
.../Queries/XQuery/XMark/Original/q08.xq | 26 +
.../Queries/XQuery/XMark/Original/q09.xq | 31 +
.../Queries/XQuery/XMark/Original/q10.xq | 46 +
.../Queries/XQuery/XMark/Original/q11.xq | 26 +
.../Queries/XQuery/XMark/Original/q12.xq | 27 +
.../Queries/XQuery/XMark/Original/q13.xq | 22 +
.../Queries/XQuery/XMark/Original/q14.xq | 23 +
.../Queries/XQuery/XMark/Original/q15.xq | 30 +
.../Queries/XQuery/XMark/Original/q16.xq | 30 +
.../Queries/XQuery/XMark/Original/q17.xq | 23 +
.../Queries/XQuery/XMark/Original/q18.xq | 28 +
.../Queries/XQuery/XMark/Original/q19.xq | 24 +
.../Queries/XQuery/XMark/Original/q20.xq | 45 +
.../XQuery/XMark/Original/simple_query1.xq | 22 +
.../XQuery/XMark/Original/simple_query2.xq | 22 +
.../TestSources/XMark/SingleFile/auction.xml | 5760 ++++++++++++++++++
.../SplitFiles/categories/micro_categories.xml | 56 +
.../SplitFiles/catgraph/micro_catgraph.xml | 23 +
.../closed_auctions/micro_closed_auctions.xml | 1192 ++++
.../open_auctions/micro_open_auctions.xml | 1944 ++++++
.../XMark/SplitFiles/people/micro_people.xml | 855 +++
.../XMark/SplitFiles/regions/micro_regions.xml | 2365 +++++++
.../resources/VXQuerySingleAlternateCatalog.xml | 3 +-
.../src/test/resources/VXQuerySingleCatalog.xml | 2 +-
.../src/test/resources/VXQueryXMarkCatalog.xml | 77 +
.../src/test/resources/XMarkCatalog.xml | 74 +
.../test/resources/cat/XMarkOriginalQueries.xml | 133 +
.../src/test/resources/cat/XMarkQueries.xml | 123 +
99 files changed, 15409 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/vxquery/blob/d7fcc0e7/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestRunner.java
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestRunner.java b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestRunner.java
index a5f0ba1..facc698 100644
--- a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestRunner.java
+++ b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestRunner.java
@@ -52,8 +52,6 @@ import edu.uci.ics.hyracks.control.nc.NodeControllerService;
import edu.uci.ics.hyracks.dataflow.common.comm.io.ResultFrameTupleAccessor;
public class TestRunner {
- private static final int FRAME_SIZE = 65536;
-
private static final Pattern EMBEDDED_SYSERROR_PATTERN = Pattern
.compile("org\\.apache\\.vxquery\\.exceptions\\.SystemException: (\\p{javaUpperCase}{4}\\d{4})");
@@ -104,7 +102,7 @@ public class TestRunner {
long start = System.currentTimeMillis();
try {
try {
- XMLQueryCompiler compiler = new XMLQueryCompiler(null, new String[] { "nc1" }, FRAME_SIZE);
+ XMLQueryCompiler compiler = new XMLQueryCompiler(null, new String[] { "nc1" }, opts.frameSize);
Reader in = new InputStreamReader(new FileInputStream(testCase.getXQueryFile()), "UTF-8");
CompilerControlBlock ccb = new CompilerControlBlock(new StaticContextImpl(
RootStaticContextImpl.INSTANCE), new ResultSetId(testCase.getXQueryDisplayName().hashCode()),
http://git-wip-us.apache.org/repos/asf/vxquery/blob/d7fcc0e7/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/XTestOptions.java
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/XTestOptions.java b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/XTestOptions.java
index 2b7b508..10dfa1c 100644
--- a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/XTestOptions.java
+++ b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/XTestOptions.java
@@ -20,6 +20,9 @@ public class XTestOptions {
@Option(name = "-O", required = false, usage = "Optimization Level")
int optimizationLevel = Integer.MAX_VALUE;
+ @Option(name = "-frameSize", required = false, usage = "Setting frame size")
+ int frameSize = 65536;
+
@Option(name = "-port", required = false, usage = "Port for web server to listen on")
int port;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/d7fcc0e7/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q01.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q01.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q01.txt
new file mode 100644
index 0000000..3e91592
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q01.txt
@@ -0,0 +1 @@
+Vincent Ingolfsdottir
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/d7fcc0e7/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q02.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q02.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q02.txt
new file mode 100644
index 0000000..b00aaf1
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q02.txt
@@ -0,0 +1,25 @@
+<increase>19.50</increase>
+<increase>4.50</increase>
+<increase>3.00</increase>
+<increase>10.50</increase>
+<increase>4.50</increase>
+<increase>4.50</increase>
+<increase>24.00</increase>
+<increase>13.50</increase>
+<increase>19.50</increase>
+<increase>76.50</increase>
+<increase>6.00</increase>
+<increase>1.50</increase>
+<increase>6.00</increase>
+<increase>24.00</increase>
+<increase>6.00</increase>
+<increase>18.00</increase>
+<increase>12.00</increase>
+<increase>7.50</increase>
+<increase>9.00</increase>
+<increase>3.00</increase>
+<increase>36.00</increase>
+<increase>4.50</increase>
+<increase>21.00</increase>
+<increase>10.50</increase>
+<increase>4.50</increase>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/d7fcc0e7/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q03.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q03.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q03.txt
new file mode 100644
index 0000000..7a3eddf
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q03.txt
@@ -0,0 +1,8 @@
+<increase first="19.50" last="54.00"/>
+<increase first="4.50" last="52.50"/>
+<increase first="6.00" last="12.00"/>
+<increase first="1.50" last="7.50"/>
+<increase first="6.00" last="18.00"/>
+<increase first="12.00" last="39.00"/>
+<increase first="3.00" last="7.50"/>
+<increase first="10.50" last="21.00"/>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/d7fcc0e7/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q04.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q04.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q04.txt
new file mode 100644
index 0000000..8959aba
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q04.txt
@@ -0,0 +1 @@
+<history>832.08</history>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/d7fcc0e7/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q05.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q05.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q05.txt
new file mode 100644
index 0000000..3cacc0b
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q05.txt
@@ -0,0 +1 @@
+12
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/d7fcc0e7/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q06.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q06.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q06.txt
new file mode 100644
index 0000000..d2e1cef
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q06.txt
@@ -0,0 +1 @@
+44
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/d7fcc0e7/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q07.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q07.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q07.txt
new file mode 100644
index 0000000..e3e1916
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q07.txt
@@ -0,0 +1 @@
+187
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/d7fcc0e7/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q08.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q08.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q08.txt
new file mode 100644
index 0000000..32c5460
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q08.txt
@@ -0,0 +1,53 @@
+<item person="Vincent Ingolfsdottir">0</item>
+<item person="Greger Ohsie">0</item>
+<item person="Chikako Womann">0</item>
+<item person="Tsz Kugler">0</item>
+<item person="Yongguang Haahr">0</item>
+<item person="Hatim Legato">0</item>
+<item person="Dunren Lotfi">0</item>
+<item person="Kasidit Munke">0</item>
+<item person="Pedro Beeferman">0</item>
+<item person="Esteban Aalborg">0</item>
+<item person="Gururaj Pouyioutas">0</item>
+<item person="Helaman Eves">0</item>
+<item person="Arivind Pletch">0</item>
+<item person="Mohan Ginesta">0</item>
+<item person="Sakti Bein">0</item>
+<item person="Minkoo Couvreur">0</item>
+<item person="Daryl Paddon">0</item>
+<item person="Shauying Goullioud">0</item>
+<item person="Amar Takano">1</item>
+<item person="Hrant Blumrich">3</item>
+<item person="Mingsen Parisotto">0</item>
+<item person="Isamu Yeun">1</item>
+<item person="Seshu Messick">2</item>
+<item person="Bjorn Berc">0</item>
+<item person="Charlotte Larab">1</item>
+<item person="Antoinette Byrne">1</item>
+<item person="Shui Roison">2</item>
+<item person="Wee Jupin">4</item>
+<item person="Goo Hartrumpf">2</item>
+<item person="Mehrdad Shackell">1</item>
+<item person="Jozo Rest">0</item>
+<item person="Debin Takano">1</item>
+<item person="Timo Bals">0</item>
+<item person="Burra Souillard">0</item>
+<item person="Taokuan Sigal">0</item>
+<item person="Keith Buford">0</item>
+<item person="Joydeep Ghandeharizadeh">0</item>
+<item person="Jani Vecchi">0</item>
+<item person="Hideko Kodaira">0</item>
+<item person="Maria Marceau">0</item>
+<item person="Burke Bierbaum">0</item>
+<item person="Bokyung Biancardi">0</item>
+<item person="Chu Takano">0</item>
+<item person="Srinivasa d'Argence">0</item>
+<item person="Williaam Seress">0</item>
+<item person="Violaine Sabharwal">0</item>
+<item person="Piyush Hardjono">0</item>
+<item person="Thang Murrill">0</item>
+<item person="Gnanamalar Laemmer">0</item>
+<item person="Jerri Keirsey">0</item>
+<item person="Tibor Lease">0</item>
+<item person="Hiroakira Mynard">0</item>
+<item person="Ravindranath Cappi">0</item>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/d7fcc0e7/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q09.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q09.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q09.txt
new file mode 100644
index 0000000..35e7053
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q09.txt
@@ -0,0 +1,83 @@
+<person name="Vincent Ingolfsdottir"/>
+<person name="Greger Ohsie"/>
+<person name="Chikako Womann"/>
+<person name="Tsz Kugler"/>
+<person name="Yongguang Haahr"/>
+<person name="Hatim Legato"/>
+<person name="Dunren Lotfi"/>
+<person name="Kasidit Munke"/>
+<person name="Pedro Beeferman"/>
+<person name="Esteban Aalborg"/>
+<person name="Gururaj Pouyioutas"/>
+<person name="Helaman Eves"/>
+<person name="Arivind Pletch"/>
+<person name="Mohan Ginesta"/>
+<person name="Sakti Bein"/>
+<person name="Minkoo Couvreur"/>
+<person name="Daryl Paddon"/>
+<person name="Shauying Goullioud"/>
+<person name="Amar Takano">
+ <item/>
+</person>
+<person name="Hrant Blumrich">
+ <item/>
+ <item>blots killed tyrannous</item>
+ <item/>
+</person>
+<person name="Mingsen Parisotto"/>
+<person name="Isamu Yeun">
+ <item/>
+</person>
+<person name="Seshu Messick">
+ <item/>
+ <item/>
+</person>
+<person name="Bjorn Berc"/>
+<person name="Charlotte Larab">
+ <item>nearest sighs</item>
+</person>
+<person name="Antoinette Byrne">
+ <item/>
+</person>
+<person name="Shui Roison">
+ <item/>
+ <item>ears wall phrase composition</item>
+</person>
+<person name="Wee Jupin">
+ <item/>
+ <item/>
+ <item/>
+ <item/>
+</person>
+<person name="Goo Hartrumpf">
+ <item/>
+ <item/>
+</person>
+<person name="Mehrdad Shackell">
+ <item>made his third</item>
+</person>
+<person name="Jozo Rest"/>
+<person name="Debin Takano">
+ <item/>
+</person>
+<person name="Timo Bals"/>
+<person name="Burra Souillard"/>
+<person name="Taokuan Sigal"/>
+<person name="Keith Buford"/>
+<person name="Joydeep Ghandeharizadeh"/>
+<person name="Jani Vecchi"/>
+<person name="Hideko Kodaira"/>
+<person name="Maria Marceau"/>
+<person name="Burke Bierbaum"/>
+<person name="Bokyung Biancardi"/>
+<person name="Chu Takano"/>
+<person name="Srinivasa d'Argence"/>
+<person name="Williaam Seress"/>
+<person name="Violaine Sabharwal"/>
+<person name="Piyush Hardjono"/>
+<person name="Thang Murrill"/>
+<person name="Gnanamalar Laemmer"/>
+<person name="Jerri Keirsey"/>
+<person name="Tibor Lease"/>
+<person name="Hiroakira Mynard"/>
+<person name="Ravindranath Cappi"/>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/d7fcc0e7/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q10.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q10.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q10.txt
new file mode 100644
index 0000000..15400fd
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q10.txt
@@ -0,0 +1,440 @@
+<categorie>
+ <id>category0</id>
+ <personne>
+ <statistiques>
+ <sexe/>
+ <age>36</age>
+ <education>High School</education>
+ <revenu>31043.87</revenu>
+ </statistiques>
+ <coordonnees>
+ <nom>Chikako Womann</nom>
+ <rue/>
+ <ville/>
+ <pays/>
+ <reseau>
+ <courrier>mailto:Womann@dec.com</courrier>
+ <pagePerso/>
+ </reseau>
+ </coordonnees>
+ <cartePaiement/>
+ </personne>
+ <personne>
+ <statistiques>
+ <sexe/>
+ <age>19</age>
+ <education>Other</education>
+ <revenu>25994.41</revenu>
+ </statistiques>
+ <coordonnees>
+ <nom>Tsz Kugler</nom>
+ <rue/>
+ <ville/>
+ <pays/>
+ <reseau>
+ <courrier>mailto:Kugler@cti.gr</courrier>
+ <pagePerso>http://www.cti.gr/~Kugler</pagePerso>
+ </reseau>
+ </coordonnees>
+ <cartePaiement/>
+ </personne>
+ <personne>
+ <statistiques>
+ <sexe>male</sexe>
+ <age>53</age>
+ <education/>
+ <revenu>59200.52</revenu>
+ </statistiques>
+ <coordonnees>
+ <nom>Kasidit Munke</nom>
+ <rue/>
+ <ville/>
+ <pays/>
+ <reseau>
+ <courrier>mailto:Munke@cnr.it</courrier>
+ <pagePerso>http://www.cnr.it/~Munke</pagePerso>
+ </reseau>
+ </coordonnees>
+ <cartePaiement>9741 9130 7082 9728</cartePaiement>
+ </personne>
+ <personne>
+ <statistiques>
+ <sexe>female</sexe>
+ <age/>
+ <education>Other</education>
+ <revenu>25613.63</revenu>
+ </statistiques>
+ <coordonnees>
+ <nom>Gururaj Pouyioutas</nom>
+ <rue>7 Podkolzin St</rue>
+ <ville>Richmond</ville>
+ <pays>United States</pays>
+ <reseau>
+ <courrier>mailto:Pouyioutas@airmail.net</courrier>
+ <pagePerso>http://www.airmail.net/~Pouyioutas</pagePerso>
+ </reseau>
+ </coordonnees>
+ <cartePaiement/>
+ </personne>
+ <personne>
+ <statistiques>
+ <sexe/>
+ <age/>
+ <education>College</education>
+ <revenu>12502.99</revenu>
+ </statistiques>
+ <coordonnees>
+ <nom>Sakti Bein</nom>
+ <rue>50 Cornelio St</rue>
+ <ville>Greenville</ville>
+ <pays>United States</pays>
+ <reseau>
+ <courrier>mailto:Bein@uregina.ca</courrier>
+ <pagePerso>http://www.uregina.ca/~Bein</pagePerso>
+ </reseau>
+ </coordonnees>
+ <cartePaiement/>
+ </personne>
+ <personne>
+ <statistiques>
+ <sexe>male</sexe>
+ <age>18</age>
+ <education/>
+ <revenu>32375.45</revenu>
+ </statistiques>
+ <coordonnees>
+ <nom>Amar Takano</nom>
+ <rue/>
+ <ville/>
+ <pays/>
+ <reseau>
+ <courrier>mailto:Takano@msn.com</courrier>
+ <pagePerso/>
+ </reseau>
+ </coordonnees>
+ <cartePaiement>4771 6210 1031 5181</cartePaiement>
+ </personne>
+ <personne>
+ <statistiques>
+ <sexe>male</sexe>
+ <age/>
+ <education/>
+ <revenu>73015.33</revenu>
+ </statistiques>
+ <coordonnees>
+ <nom>Mingsen Parisotto</nom>
+ <rue/>
+ <ville/>
+ <pays/>
+ <reseau>
+ <courrier>mailto:Parisotto@wisc.edu</courrier>
+ <pagePerso/>
+ </reseau>
+ </coordonnees>
+ <cartePaiement/>
+ </personne>
+ <personne>
+ <statistiques>
+ <sexe>male</sexe>
+ <age/>
+ <education>Graduate School</education>
+ <revenu>77899.19</revenu>
+ </statistiques>
+ <coordonnees>
+ <nom>Isamu Yeun</nom>
+ <rue>95 Bleistein St</rue>
+ <ville>Newburgh</ville>
+ <pays>United States</pays>
+ <reseau>
+ <courrier>mailto:Yeun@ou.edu</courrier>
+ <pagePerso>http://www.ou.edu/~Yeun</pagePerso>
+ </reseau>
+ </coordonnees>
+ <cartePaiement/>
+ </personne>
+ <personne>
+ <statistiques>
+ <sexe>male</sexe>
+ <age/>
+ <education>Graduate School</education>
+ <revenu>36962.42</revenu>
+ </statistiques>
+ <coordonnees>
+ <nom>Bjorn Berc</nom>
+ <rue>72 Erdi St</rue>
+ <ville>Palm</ville>
+ <pays>United States</pays>
+ <reseau>
+ <courrier>mailto:Berc@cas.cz</courrier>
+ <pagePerso/>
+ </reseau>
+ </coordonnees>
+ <cartePaiement/>
+ </personne>
+ <personne>
+ <statistiques>
+ <sexe>female</sexe>
+ <age>20</age>
+ <education/>
+ <revenu>102237.41</revenu>
+ </statistiques>
+ <coordonnees>
+ <nom>Shui Roison</nom>
+ <rue/>
+ <ville/>
+ <pays/>
+ <reseau>
+ <courrier>mailto:Roison@infomix.com</courrier>
+ <pagePerso/>
+ </reseau>
+ </coordonnees>
+ <cartePaiement/>
+ </personne>
+ <personne>
+ <statistiques>
+ <sexe>male</sexe>
+ <age/>
+ <education/>
+ <revenu>9876.00</revenu>
+ </statistiques>
+ <coordonnees>
+ <nom>Wee Jupin</nom>
+ <rue/>
+ <ville/>
+ <pays/>
+ <reseau>
+ <courrier>mailto:Jupin@edu.hk</courrier>
+ <pagePerso/>
+ </reseau>
+ </coordonnees>
+ <cartePaiement/>
+ </personne>
+ <personne>
+ <statistiques>
+ <sexe/>
+ <age>43</age>
+ <education>College</education>
+ <revenu>57699.99</revenu>
+ </statistiques>
+ <coordonnees>
+ <nom>Jozo Rest</nom>
+ <rue/>
+ <ville/>
+ <pays/>
+ <reseau>
+ <courrier>mailto:Rest@lante.com</courrier>
+ <pagePerso>http://www.lante.com/~Rest</pagePerso>
+ </reseau>
+ </coordonnees>
+ <cartePaiement>3018 2384 5732 4659</cartePaiement>
+ </personne>
+ <personne>
+ <statistiques>
+ <sexe>female</sexe>
+ <age>27</age>
+ <education>College</education>
+ <revenu>59655.87</revenu>
+ </statistiques>
+ <coordonnees>
+ <nom>Burra Souillard</nom>
+ <rue>34 Androutsopoulos St</rue>
+ <ville>Gulfport</ville>
+ <pays>United States</pays>
+ <reseau>
+ <courrier>mailto:Souillard@ucdavis.edu</courrier>
+ <pagePerso>http://www.ucdavis.edu/~Souillard</pagePerso>
+ </reseau>
+ </coordonnees>
+ <cartePaiement/>
+ </personne>
+ <personne>
+ <statistiques>
+ <sexe>male</sexe>
+ <age/>
+ <education>College</education>
+ <revenu>67696.29</revenu>
+ </statistiques>
+ <coordonnees>
+ <nom>Taokuan Sigal</nom>
+ <rue>27 Kacprzyk St</rue>
+ <ville>Tri</ville>
+ <pays>United States</pays>
+ <reseau>
+ <courrier>mailto:Sigal@savera.com</courrier>
+ <pagePerso/>
+ </reseau>
+ </coordonnees>
+ <cartePaiement>6329 1596 7682 8704</cartePaiement>
+ </personne>
+ <personne>
+ <statistiques>
+ <sexe>male</sexe>
+ <age/>
+ <education>Other</education>
+ <revenu>9876.00</revenu>
+ </statistiques>
+ <coordonnees>
+ <nom>Hideko Kodaira</nom>
+ <rue/>
+ <ville/>
+ <pays/>
+ <reseau>
+ <courrier>mailto:Kodaira@filemaker.com</courrier>
+ <pagePerso>http://www.filemaker.com/~Kodaira</pagePerso>
+ </reseau>
+ </coordonnees>
+ <cartePaiement/>
+ </personne>
+ <personne>
+ <statistiques>
+ <sexe>male</sexe>
+ <age>36</age>
+ <education>College</education>
+ <revenu>81288.98</revenu>
+ </statistiques>
+ <coordonnees>
+ <nom>Maria Marceau</nom>
+ <rue/>
+ <ville/>
+ <pays/>
+ <reseau>
+ <courrier>mailto:Marceau@uni-mannheim.de</courrier>
+ <pagePerso/>
+ </reseau>
+ </coordonnees>
+ <cartePaiement>7617 7057 8043 7327</cartePaiement>
+ </personne>
+ <personne>
+ <statistiques>
+ <sexe/>
+ <age/>
+ <education>High School</education>
+ <revenu>90986.66</revenu>
+ </statistiques>
+ <coordonnees>
+ <nom>Bokyung Biancardi</nom>
+ <rue/>
+ <ville/>
+ <pays/>
+ <reseau>
+ <courrier>mailto:Biancardi@mitre.org</courrier>
+ <pagePerso>http://www.mitre.org/~Biancardi</pagePerso>
+ </reseau>
+ </coordonnees>
+ <cartePaiement>6362 7558 4605 7344</cartePaiement>
+ </personne>
+ <personne>
+ <statistiques>
+ <sexe>female</sexe>
+ <age>42</age>
+ <education>Graduate School</education>
+ <revenu>9876.00</revenu>
+ </statistiques>
+ <coordonnees>
+ <nom>Srinivasa d'Argence</nom>
+ <rue/>
+ <ville/>
+ <pays/>
+ <reseau>
+ <courrier>mailto:d'Argence@umkc.edu</courrier>
+ <pagePerso/>
+ </reseau>
+ </coordonnees>
+ <cartePaiement>6450 7871 1768 8470</cartePaiement>
+ </personne>
+ <personne>
+ <statistiques>
+ <sexe/>
+ <age>39</age>
+ <education/>
+ <revenu>64262.77</revenu>
+ </statistiques>
+ <coordonnees>
+ <nom>Violaine Sabharwal</nom>
+ <rue>12 Forcade St</rue>
+ <ville>Rio</ville>
+ <pays>United States</pays>
+ <reseau>
+ <courrier>mailto:Sabharwal@evergreen.edu</courrier>
+ <pagePerso/>
+ </reseau>
+ </coordonnees>
+ <cartePaiement/>
+ </personne>
+ <personne>
+ <statistiques>
+ <sexe>male</sexe>
+ <age>19</age>
+ <education/>
+ <revenu>26393.54</revenu>
+ </statistiques>
+ <coordonnees>
+ <nom>Piyush Hardjono</nom>
+ <rue>43 Kriewall St</rue>
+ <ville>Toronto</ville>
+ <pays>Burkina Faso</pays>
+ <reseau>
+ <courrier>mailto:Hardjono@forth.gr</courrier>
+ <pagePerso>http://www.forth.gr/~Hardjono</pagePerso>
+ </reseau>
+ </coordonnees>
+ <cartePaiement/>
+ </personne>
+ <personne>
+ <statistiques>
+ <sexe/>
+ <age/>
+ <education/>
+ <revenu>22790.42</revenu>
+ </statistiques>
+ <coordonnees>
+ <nom>Gnanamalar Laemmer</nom>
+ <rue/>
+ <ville/>
+ <pays/>
+ <reseau>
+ <courrier>mailto:Laemmer@csufresno.edu</courrier>
+ <pagePerso>http://www.csufresno.edu/~Laemmer</pagePerso>
+ </reseau>
+ </coordonnees>
+ <cartePaiement/>
+ </personne>
+ <personne>
+ <statistiques>
+ <sexe>male</sexe>
+ <age/>
+ <education>College</education>
+ <revenu>28888.68</revenu>
+ </statistiques>
+ <coordonnees>
+ <nom>Tibor Lease</nom>
+ <rue>27 Desiderio St</rue>
+ <ville>Cody</ville>
+ <pays>United States</pays>
+ <reseau>
+ <courrier>mailto:Lease@gatech.edu</courrier>
+ <pagePerso/>
+ </reseau>
+ </coordonnees>
+ <cartePaiement>6700 1398 1554 3577</cartePaiement>
+ </personne>
+ <personne>
+ <statistiques>
+ <sexe/>
+ <age/>
+ <education>High School</education>
+ <revenu>15590.68</revenu>
+ </statistiques>
+ <coordonnees>
+ <nom>Ravindranath Cappi</nom>
+ <rue/>
+ <ville/>
+ <pays/>
+ <reseau>
+ <courrier>mailto:Cappi@ogi.edu</courrier>
+ <pagePerso>http://www.ogi.edu/~Cappi</pagePerso>
+ </reseau>
+ </coordonnees>
+ <cartePaiement/>
+ </personne>
+</categorie>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/d7fcc0e7/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q11.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q11.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q11.txt
new file mode 100644
index 0000000..63f4330
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q11.txt
@@ -0,0 +1,53 @@
+<items name="Vincent Ingolfsdottir">0</items>
+<items name="Greger Ohsie">0</items>
+<items name="Chikako Womann">1</items>
+<items name="Tsz Kugler">1</items>
+<items name="Yongguang Haahr">0</items>
+<items name="Hatim Legato">0</items>
+<items name="Dunren Lotfi">0</items>
+<items name="Kasidit Munke">3</items>
+<items name="Pedro Beeferman">0</items>
+<items name="Esteban Aalborg">0</items>
+<items name="Gururaj Pouyioutas">1</items>
+<items name="Helaman Eves">3</items>
+<items name="Arivind Pletch">0</items>
+<items name="Mohan Ginesta">0</items>
+<items name="Sakti Bein">0</items>
+<items name="Minkoo Couvreur">0</items>
+<items name="Daryl Paddon">0</items>
+<items name="Shauying Goullioud">0</items>
+<items name="Amar Takano">1</items>
+<items name="Hrant Blumrich">0</items>
+<items name="Mingsen Parisotto">4</items>
+<items name="Isamu Yeun">6</items>
+<items name="Seshu Messick">0</items>
+<items name="Bjorn Berc">1</items>
+<items name="Charlotte Larab">0</items>
+<items name="Antoinette Byrne">0</items>
+<items name="Shui Roison">7</items>
+<items name="Wee Jupin">0</items>
+<items name="Goo Hartrumpf">7</items>
+<items name="Mehrdad Shackell">0</items>
+<items name="Jozo Rest">3</items>
+<items name="Debin Takano">0</items>
+<items name="Timo Bals">0</items>
+<items name="Burra Souillard">3</items>
+<items name="Taokuan Sigal">3</items>
+<items name="Keith Buford">0</items>
+<items name="Joydeep Ghandeharizadeh">0</items>
+<items name="Jani Vecchi">0</items>
+<items name="Hideko Kodaira">0</items>
+<items name="Maria Marceau">7</items>
+<items name="Burke Bierbaum">0</items>
+<items name="Bokyung Biancardi">7</items>
+<items name="Chu Takano">0</items>
+<items name="Srinivasa d'Argence">0</items>
+<items name="Williaam Seress">0</items>
+<items name="Violaine Sabharwal">3</items>
+<items name="Piyush Hardjono">1</items>
+<items name="Thang Murrill">0</items>
+<items name="Gnanamalar Laemmer">0</items>
+<items name="Jerri Keirsey">0</items>
+<items name="Tibor Lease">1</items>
+<items name="Hiroakira Mynard">0</items>
+<items name="Ravindranath Cappi">0</items>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/d7fcc0e7/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q12.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q12.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q12.txt
new file mode 100644
index 0000000..cbc7013
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q12.txt
@@ -0,0 +1,12 @@
+<items person="59200.52">3</items>
+<items person="60275.75">3</items>
+<items person="73015.33">4</items>
+<items person="77899.19">6</items>
+<items person="102237.41">7</items>
+<items person="95921.73">7</items>
+<items person="57699.99">3</items>
+<items person="59655.87">3</items>
+<items person="67696.29">3</items>
+<items person="81288.98">7</items>
+<items person="90986.66">7</items>
+<items person="64262.77">3</items>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/d7fcc0e7/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q13.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q13.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q13.txt
new file mode 100644
index 0000000..6b7bf95
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q13.txt
@@ -0,0 +1,55 @@
+<item name="cockatrice approves money">
+ <description>
+ <text>clothes edmund doubtful fool torments ropes contrive lecher ardea
+ happiness fertile treads constable defences<keyword>lion
+ neighbour ourself</keyword>marshal disordered moderate venus
+ afeard article rot hazards craft crowns<emph>plainness patient</emph>lying knowledge diseases meritorious medicine</text>
+ </description>
+</item>
+<item name="answer misdoubt">
+ <description>
+ <text>delay brutish rage alexandria trumpet god wet resolve pursue colour
+ body walk month writing beside profane left declining coach through
+ protectorship congruent confusion favours following populous
+ exercise timon shoots function fourscore mangled favorably slain
+ secretly vice distinguish bardolph content hence boy worse bring
+ usurers stew beard longed creep hid pursuivant beholders senators
+ son mercutio woo bestow trumpet excess muffler pick ugly felt
+ causes remove adding tear often rounds underbearing tree purer
+ kibes endless women benefit throw<emph>claim firmness<keyword>arrived sees wrestled multitude repent preventions infamy reproof
+ shalt hearted prais knave doubtless</keyword>deny</emph>merely
+ grave voluble late loath digest horn slave hunger stronger amazed
+ salt killing ross cry dry tongue kiss yields auspicious quietness
+ perpetual ways<keyword>began leg running unjust court mean
+ returning brook creatures appointed paunches henry sights west
+ prunes flutes regiment seems bed</keyword>musicians slumber post
+ friendship prevention abreast wouldst words vexation builds unfelt
+ holly walk inform moods deck bulk begin action school nobles
+ antique people unkennel stomach into petitions jack assail yongrey
+ ages betimes golden sink droop kernel hoppedance perfection weight<emph>whining safe english rod other featur</emph>
+ </text>
+ </description>
+</item>
+<item name="prosperity dine yon debate">
+ <description>
+ <text>visitation strangely mab spirit forgot bargain holds</text>
+ </description>
+</item>
+<item name="congeal pawned alack">
+ <description>
+ <text>white obey<bold>calling neighbour office afternoon drum embowell
+ touch sue lifeless leapt shun called</bold>weary congregation
+ yield check falling wives challenge mental fatal hard ancient
+ stands cor dishes therein gramercy discipline farewell dire tricks
+ protest cut horatio brother speech sleeping adultress pitch cave
+ liv nurse drink state plants combating desired requir rebellion
+ afraid repented tree scald stopp wine advise undermine norfolk
+ vilely whet scars companions hanging foolish scene musty fruitful
+ unburthen teacher garments betimes sight now for oaths vouchsafe
+ particulars globe laertes afflictions rouse once news humanity buck
+ destroy military lucius lap<keyword>considered forc mourning
+ verona</keyword>waters triumphing officer hastily<emph>resign
+ subject figure hay thwart written signs gout bred distance period
+ glove players change folly</emph>going wat lost</text>
+ </description>
+</item>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/d7fcc0e7/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q14.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q14.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q14.txt
new file mode 100644
index 0000000..d201f0a
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q14.txt
@@ -0,0 +1 @@
+condemnanswer misdoubtnearest sighswronged revels swell coz
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/d7fcc0e7/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q15.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q15.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q15.txt
new file mode 100644
index 0000000..72b97f6
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q15.txt
@@ -0,0 +1,3 @@
+<text>west avail griefs took allowed
+ singing request following frost steeds invincible cow turk
+ esteem</text>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/d7fcc0e7/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q16.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q16.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q16.txt
new file mode 100644
index 0000000..fefb61e
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q16.txt
@@ -0,0 +1 @@
+<person id="person33"/>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/d7fcc0e7/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q17.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q17.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q17.txt
new file mode 100644
index 0000000..52e32b9
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q17.txt
@@ -0,0 +1,27 @@
+<person name="Vincent Ingolfsdottir"/>
+<person name="Greger Ohsie"/>
+<person name="Chikako Womann"/>
+<person name="Yongguang Haahr"/>
+<person name="Esteban Aalborg"/>
+<person name="Helaman Eves"/>
+<person name="Arivind Pletch"/>
+<person name="Amar Takano"/>
+<person name="Mingsen Parisotto"/>
+<person name="Seshu Messick"/>
+<person name="Bjorn Berc"/>
+<person name="Shui Roison"/>
+<person name="Wee Jupin"/>
+<person name="Goo Hartrumpf"/>
+<person name="Debin Takano"/>
+<person name="Timo Bals"/>
+<person name="Taokuan Sigal"/>
+<person name="Joydeep Ghandeharizadeh"/>
+<person name="Jani Vecchi"/>
+<person name="Maria Marceau"/>
+<person name="Chu Takano"/>
+<person name="Srinivasa d'Argence"/>
+<person name="Williaam Seress"/>
+<person name="Violaine Sabharwal"/>
+<person name="Thang Murrill"/>
+<person name="Tibor Lease"/>
+<person name="Hiroakira Mynard"/>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/d7fcc0e7/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q18.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q18.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q18.txt
new file mode 100644
index 0000000..b5bd2c6
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q18.txt
@@ -0,0 +1 @@
+390.3431523 1248.9967167 172.6606785 14.3681892 652.4524197 92.0710038 128.4101817 319.9125807 141.2798481 235.5104877 251.7297933 66.7283388 1332.4291773 1741.1071968 1187.7115416 1833.6630168
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/d7fcc0e7/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q19.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q19.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q19.txt
new file mode 100644
index 0000000..0159a82
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q19.txt
@@ -0,0 +1,44 @@
+<item name="spied torn">Cacos Islands</item>
+<item name="romeo">Cape Verde</item>
+<item name="cover">Guinea</item>
+<item name="sole claim">Hong Kong</item>
+<item name="cockatrice approves money">Madagascar</item>
+<item name="sin">Morocco</item>
+<item name="strong umpires became caius">Saint Kitts</item>
+<item name="ears wall phrase composition">Saudi Arabia</item>
+<item name="nose ago author preventions">Tunisia</item>
+<item name="duteous nine eighteen">United States</item>
+<item name="condemn">United States</item>
+<item name="earnestly subtle spotted attend">United States</item>
+<item name="poisons">United States</item>
+<item name="thought inland different">United States</item>
+<item name="answer misdoubt">United States</item>
+<item name="prosperity dine yon debate">United States</item>
+<item name="congeal pawned alack">United States</item>
+<item name="made his third">United States</item>
+<item name="sounds ope extemporal">United States</item>
+<item name="patient set trespasses simplicity">United States</item>
+<item name="blots killed tyrannous">United States</item>
+<item name="boundeth thickest wight">United States</item>
+<item name="weeping allegiance rogue ladies">United States</item>
+<item name="nearest sighs">United States</item>
+<item name="augurers">United States</item>
+<item name="humility">United States</item>
+<item name="hear strength infinite have">United States</item>
+<item name="whilst shakespeare">United States</item>
+<item name="win">United States</item>
+<item name="confident shut incur">United States</item>
+<item name="aid derive ventidius briber">United States</item>
+<item name="tested empress dance sought">United States</item>
+<item name="trade">United States</item>
+<item name="contemplation frighted fury sins">United States</item>
+<item name="posteriors orlando">United States</item>
+<item name="concealment pit">United States</item>
+<item name="guarded eve">United States</item>
+<item name="wronged revels swell coz">United States</item>
+<item name="assurance amiable cover poniards">United States</item>
+<item name="fires trees hers ber">United States</item>
+<item name="rosaline modern cleft fame">United States</item>
+<item name="impotent arras">United States</item>
+<item name="fortunes hastings">United States</item>
+<item name="cutpurses">United States</item>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/d7fcc0e7/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q20.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q20.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q20.txt
new file mode 100644
index 0000000..298461f
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Modified/q20.txt
@@ -0,0 +1,6 @@
+<result>
+ <preferred>1</preferred>
+ <standard>14</standard>
+ <challenge>10</challenge>
+ <na>28</na>
+</result>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/d7fcc0e7/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q01.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q01.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q01.txt
new file mode 100644
index 0000000..3e91592
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q01.txt
@@ -0,0 +1 @@
+Vincent Ingolfsdottir
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/d7fcc0e7/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q02.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q02.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q02.txt
new file mode 100644
index 0000000..b00aaf1
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q02.txt
@@ -0,0 +1,25 @@
+<increase>19.50</increase>
+<increase>4.50</increase>
+<increase>3.00</increase>
+<increase>10.50</increase>
+<increase>4.50</increase>
+<increase>4.50</increase>
+<increase>24.00</increase>
+<increase>13.50</increase>
+<increase>19.50</increase>
+<increase>76.50</increase>
+<increase>6.00</increase>
+<increase>1.50</increase>
+<increase>6.00</increase>
+<increase>24.00</increase>
+<increase>6.00</increase>
+<increase>18.00</increase>
+<increase>12.00</increase>
+<increase>7.50</increase>
+<increase>9.00</increase>
+<increase>3.00</increase>
+<increase>36.00</increase>
+<increase>4.50</increase>
+<increase>21.00</increase>
+<increase>10.50</increase>
+<increase>4.50</increase>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/d7fcc0e7/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q03.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q03.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q03.txt
new file mode 100644
index 0000000..7a3eddf
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q03.txt
@@ -0,0 +1,8 @@
+<increase first="19.50" last="54.00"/>
+<increase first="4.50" last="52.50"/>
+<increase first="6.00" last="12.00"/>
+<increase first="1.50" last="7.50"/>
+<increase first="6.00" last="18.00"/>
+<increase first="12.00" last="39.00"/>
+<increase first="3.00" last="7.50"/>
+<increase first="10.50" last="21.00"/>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/d7fcc0e7/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q04.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q04.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q04.txt
new file mode 100644
index 0000000..8959aba
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q04.txt
@@ -0,0 +1 @@
+<history>832.08</history>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/d7fcc0e7/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q05.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q05.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q05.txt
new file mode 100644
index 0000000..3cacc0b
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q05.txt
@@ -0,0 +1 @@
+12
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/d7fcc0e7/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q06.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q06.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q06.txt
new file mode 100644
index 0000000..d2e1cef
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q06.txt
@@ -0,0 +1 @@
+44
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/d7fcc0e7/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q07.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q07.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q07.txt
new file mode 100644
index 0000000..e3e1916
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q07.txt
@@ -0,0 +1 @@
+187
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/d7fcc0e7/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q08.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q08.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q08.txt
new file mode 100644
index 0000000..32c5460
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q08.txt
@@ -0,0 +1,53 @@
+<item person="Vincent Ingolfsdottir">0</item>
+<item person="Greger Ohsie">0</item>
+<item person="Chikako Womann">0</item>
+<item person="Tsz Kugler">0</item>
+<item person="Yongguang Haahr">0</item>
+<item person="Hatim Legato">0</item>
+<item person="Dunren Lotfi">0</item>
+<item person="Kasidit Munke">0</item>
+<item person="Pedro Beeferman">0</item>
+<item person="Esteban Aalborg">0</item>
+<item person="Gururaj Pouyioutas">0</item>
+<item person="Helaman Eves">0</item>
+<item person="Arivind Pletch">0</item>
+<item person="Mohan Ginesta">0</item>
+<item person="Sakti Bein">0</item>
+<item person="Minkoo Couvreur">0</item>
+<item person="Daryl Paddon">0</item>
+<item person="Shauying Goullioud">0</item>
+<item person="Amar Takano">1</item>
+<item person="Hrant Blumrich">3</item>
+<item person="Mingsen Parisotto">0</item>
+<item person="Isamu Yeun">1</item>
+<item person="Seshu Messick">2</item>
+<item person="Bjorn Berc">0</item>
+<item person="Charlotte Larab">1</item>
+<item person="Antoinette Byrne">1</item>
+<item person="Shui Roison">2</item>
+<item person="Wee Jupin">4</item>
+<item person="Goo Hartrumpf">2</item>
+<item person="Mehrdad Shackell">1</item>
+<item person="Jozo Rest">0</item>
+<item person="Debin Takano">1</item>
+<item person="Timo Bals">0</item>
+<item person="Burra Souillard">0</item>
+<item person="Taokuan Sigal">0</item>
+<item person="Keith Buford">0</item>
+<item person="Joydeep Ghandeharizadeh">0</item>
+<item person="Jani Vecchi">0</item>
+<item person="Hideko Kodaira">0</item>
+<item person="Maria Marceau">0</item>
+<item person="Burke Bierbaum">0</item>
+<item person="Bokyung Biancardi">0</item>
+<item person="Chu Takano">0</item>
+<item person="Srinivasa d'Argence">0</item>
+<item person="Williaam Seress">0</item>
+<item person="Violaine Sabharwal">0</item>
+<item person="Piyush Hardjono">0</item>
+<item person="Thang Murrill">0</item>
+<item person="Gnanamalar Laemmer">0</item>
+<item person="Jerri Keirsey">0</item>
+<item person="Tibor Lease">0</item>
+<item person="Hiroakira Mynard">0</item>
+<item person="Ravindranath Cappi">0</item>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/d7fcc0e7/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q09.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q09.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q09.txt
new file mode 100644
index 0000000..35e7053
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q09.txt
@@ -0,0 +1,83 @@
+<person name="Vincent Ingolfsdottir"/>
+<person name="Greger Ohsie"/>
+<person name="Chikako Womann"/>
+<person name="Tsz Kugler"/>
+<person name="Yongguang Haahr"/>
+<person name="Hatim Legato"/>
+<person name="Dunren Lotfi"/>
+<person name="Kasidit Munke"/>
+<person name="Pedro Beeferman"/>
+<person name="Esteban Aalborg"/>
+<person name="Gururaj Pouyioutas"/>
+<person name="Helaman Eves"/>
+<person name="Arivind Pletch"/>
+<person name="Mohan Ginesta"/>
+<person name="Sakti Bein"/>
+<person name="Minkoo Couvreur"/>
+<person name="Daryl Paddon"/>
+<person name="Shauying Goullioud"/>
+<person name="Amar Takano">
+ <item/>
+</person>
+<person name="Hrant Blumrich">
+ <item/>
+ <item>blots killed tyrannous</item>
+ <item/>
+</person>
+<person name="Mingsen Parisotto"/>
+<person name="Isamu Yeun">
+ <item/>
+</person>
+<person name="Seshu Messick">
+ <item/>
+ <item/>
+</person>
+<person name="Bjorn Berc"/>
+<person name="Charlotte Larab">
+ <item>nearest sighs</item>
+</person>
+<person name="Antoinette Byrne">
+ <item/>
+</person>
+<person name="Shui Roison">
+ <item/>
+ <item>ears wall phrase composition</item>
+</person>
+<person name="Wee Jupin">
+ <item/>
+ <item/>
+ <item/>
+ <item/>
+</person>
+<person name="Goo Hartrumpf">
+ <item/>
+ <item/>
+</person>
+<person name="Mehrdad Shackell">
+ <item>made his third</item>
+</person>
+<person name="Jozo Rest"/>
+<person name="Debin Takano">
+ <item/>
+</person>
+<person name="Timo Bals"/>
+<person name="Burra Souillard"/>
+<person name="Taokuan Sigal"/>
+<person name="Keith Buford"/>
+<person name="Joydeep Ghandeharizadeh"/>
+<person name="Jani Vecchi"/>
+<person name="Hideko Kodaira"/>
+<person name="Maria Marceau"/>
+<person name="Burke Bierbaum"/>
+<person name="Bokyung Biancardi"/>
+<person name="Chu Takano"/>
+<person name="Srinivasa d'Argence"/>
+<person name="Williaam Seress"/>
+<person name="Violaine Sabharwal"/>
+<person name="Piyush Hardjono"/>
+<person name="Thang Murrill"/>
+<person name="Gnanamalar Laemmer"/>
+<person name="Jerri Keirsey"/>
+<person name="Tibor Lease"/>
+<person name="Hiroakira Mynard"/>
+<person name="Ravindranath Cappi"/>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/d7fcc0e7/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q10.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q10.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q10.txt
new file mode 100644
index 0000000..15400fd
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q10.txt
@@ -0,0 +1,440 @@
+<categorie>
+ <id>category0</id>
+ <personne>
+ <statistiques>
+ <sexe/>
+ <age>36</age>
+ <education>High School</education>
+ <revenu>31043.87</revenu>
+ </statistiques>
+ <coordonnees>
+ <nom>Chikako Womann</nom>
+ <rue/>
+ <ville/>
+ <pays/>
+ <reseau>
+ <courrier>mailto:Womann@dec.com</courrier>
+ <pagePerso/>
+ </reseau>
+ </coordonnees>
+ <cartePaiement/>
+ </personne>
+ <personne>
+ <statistiques>
+ <sexe/>
+ <age>19</age>
+ <education>Other</education>
+ <revenu>25994.41</revenu>
+ </statistiques>
+ <coordonnees>
+ <nom>Tsz Kugler</nom>
+ <rue/>
+ <ville/>
+ <pays/>
+ <reseau>
+ <courrier>mailto:Kugler@cti.gr</courrier>
+ <pagePerso>http://www.cti.gr/~Kugler</pagePerso>
+ </reseau>
+ </coordonnees>
+ <cartePaiement/>
+ </personne>
+ <personne>
+ <statistiques>
+ <sexe>male</sexe>
+ <age>53</age>
+ <education/>
+ <revenu>59200.52</revenu>
+ </statistiques>
+ <coordonnees>
+ <nom>Kasidit Munke</nom>
+ <rue/>
+ <ville/>
+ <pays/>
+ <reseau>
+ <courrier>mailto:Munke@cnr.it</courrier>
+ <pagePerso>http://www.cnr.it/~Munke</pagePerso>
+ </reseau>
+ </coordonnees>
+ <cartePaiement>9741 9130 7082 9728</cartePaiement>
+ </personne>
+ <personne>
+ <statistiques>
+ <sexe>female</sexe>
+ <age/>
+ <education>Other</education>
+ <revenu>25613.63</revenu>
+ </statistiques>
+ <coordonnees>
+ <nom>Gururaj Pouyioutas</nom>
+ <rue>7 Podkolzin St</rue>
+ <ville>Richmond</ville>
+ <pays>United States</pays>
+ <reseau>
+ <courrier>mailto:Pouyioutas@airmail.net</courrier>
+ <pagePerso>http://www.airmail.net/~Pouyioutas</pagePerso>
+ </reseau>
+ </coordonnees>
+ <cartePaiement/>
+ </personne>
+ <personne>
+ <statistiques>
+ <sexe/>
+ <age/>
+ <education>College</education>
+ <revenu>12502.99</revenu>
+ </statistiques>
+ <coordonnees>
+ <nom>Sakti Bein</nom>
+ <rue>50 Cornelio St</rue>
+ <ville>Greenville</ville>
+ <pays>United States</pays>
+ <reseau>
+ <courrier>mailto:Bein@uregina.ca</courrier>
+ <pagePerso>http://www.uregina.ca/~Bein</pagePerso>
+ </reseau>
+ </coordonnees>
+ <cartePaiement/>
+ </personne>
+ <personne>
+ <statistiques>
+ <sexe>male</sexe>
+ <age>18</age>
+ <education/>
+ <revenu>32375.45</revenu>
+ </statistiques>
+ <coordonnees>
+ <nom>Amar Takano</nom>
+ <rue/>
+ <ville/>
+ <pays/>
+ <reseau>
+ <courrier>mailto:Takano@msn.com</courrier>
+ <pagePerso/>
+ </reseau>
+ </coordonnees>
+ <cartePaiement>4771 6210 1031 5181</cartePaiement>
+ </personne>
+ <personne>
+ <statistiques>
+ <sexe>male</sexe>
+ <age/>
+ <education/>
+ <revenu>73015.33</revenu>
+ </statistiques>
+ <coordonnees>
+ <nom>Mingsen Parisotto</nom>
+ <rue/>
+ <ville/>
+ <pays/>
+ <reseau>
+ <courrier>mailto:Parisotto@wisc.edu</courrier>
+ <pagePerso/>
+ </reseau>
+ </coordonnees>
+ <cartePaiement/>
+ </personne>
+ <personne>
+ <statistiques>
+ <sexe>male</sexe>
+ <age/>
+ <education>Graduate School</education>
+ <revenu>77899.19</revenu>
+ </statistiques>
+ <coordonnees>
+ <nom>Isamu Yeun</nom>
+ <rue>95 Bleistein St</rue>
+ <ville>Newburgh</ville>
+ <pays>United States</pays>
+ <reseau>
+ <courrier>mailto:Yeun@ou.edu</courrier>
+ <pagePerso>http://www.ou.edu/~Yeun</pagePerso>
+ </reseau>
+ </coordonnees>
+ <cartePaiement/>
+ </personne>
+ <personne>
+ <statistiques>
+ <sexe>male</sexe>
+ <age/>
+ <education>Graduate School</education>
+ <revenu>36962.42</revenu>
+ </statistiques>
+ <coordonnees>
+ <nom>Bjorn Berc</nom>
+ <rue>72 Erdi St</rue>
+ <ville>Palm</ville>
+ <pays>United States</pays>
+ <reseau>
+ <courrier>mailto:Berc@cas.cz</courrier>
+ <pagePerso/>
+ </reseau>
+ </coordonnees>
+ <cartePaiement/>
+ </personne>
+ <personne>
+ <statistiques>
+ <sexe>female</sexe>
+ <age>20</age>
+ <education/>
+ <revenu>102237.41</revenu>
+ </statistiques>
+ <coordonnees>
+ <nom>Shui Roison</nom>
+ <rue/>
+ <ville/>
+ <pays/>
+ <reseau>
+ <courrier>mailto:Roison@infomix.com</courrier>
+ <pagePerso/>
+ </reseau>
+ </coordonnees>
+ <cartePaiement/>
+ </personne>
+ <personne>
+ <statistiques>
+ <sexe>male</sexe>
+ <age/>
+ <education/>
+ <revenu>9876.00</revenu>
+ </statistiques>
+ <coordonnees>
+ <nom>Wee Jupin</nom>
+ <rue/>
+ <ville/>
+ <pays/>
+ <reseau>
+ <courrier>mailto:Jupin@edu.hk</courrier>
+ <pagePerso/>
+ </reseau>
+ </coordonnees>
+ <cartePaiement/>
+ </personne>
+ <personne>
+ <statistiques>
+ <sexe/>
+ <age>43</age>
+ <education>College</education>
+ <revenu>57699.99</revenu>
+ </statistiques>
+ <coordonnees>
+ <nom>Jozo Rest</nom>
+ <rue/>
+ <ville/>
+ <pays/>
+ <reseau>
+ <courrier>mailto:Rest@lante.com</courrier>
+ <pagePerso>http://www.lante.com/~Rest</pagePerso>
+ </reseau>
+ </coordonnees>
+ <cartePaiement>3018 2384 5732 4659</cartePaiement>
+ </personne>
+ <personne>
+ <statistiques>
+ <sexe>female</sexe>
+ <age>27</age>
+ <education>College</education>
+ <revenu>59655.87</revenu>
+ </statistiques>
+ <coordonnees>
+ <nom>Burra Souillard</nom>
+ <rue>34 Androutsopoulos St</rue>
+ <ville>Gulfport</ville>
+ <pays>United States</pays>
+ <reseau>
+ <courrier>mailto:Souillard@ucdavis.edu</courrier>
+ <pagePerso>http://www.ucdavis.edu/~Souillard</pagePerso>
+ </reseau>
+ </coordonnees>
+ <cartePaiement/>
+ </personne>
+ <personne>
+ <statistiques>
+ <sexe>male</sexe>
+ <age/>
+ <education>College</education>
+ <revenu>67696.29</revenu>
+ </statistiques>
+ <coordonnees>
+ <nom>Taokuan Sigal</nom>
+ <rue>27 Kacprzyk St</rue>
+ <ville>Tri</ville>
+ <pays>United States</pays>
+ <reseau>
+ <courrier>mailto:Sigal@savera.com</courrier>
+ <pagePerso/>
+ </reseau>
+ </coordonnees>
+ <cartePaiement>6329 1596 7682 8704</cartePaiement>
+ </personne>
+ <personne>
+ <statistiques>
+ <sexe>male</sexe>
+ <age/>
+ <education>Other</education>
+ <revenu>9876.00</revenu>
+ </statistiques>
+ <coordonnees>
+ <nom>Hideko Kodaira</nom>
+ <rue/>
+ <ville/>
+ <pays/>
+ <reseau>
+ <courrier>mailto:Kodaira@filemaker.com</courrier>
+ <pagePerso>http://www.filemaker.com/~Kodaira</pagePerso>
+ </reseau>
+ </coordonnees>
+ <cartePaiement/>
+ </personne>
+ <personne>
+ <statistiques>
+ <sexe>male</sexe>
+ <age>36</age>
+ <education>College</education>
+ <revenu>81288.98</revenu>
+ </statistiques>
+ <coordonnees>
+ <nom>Maria Marceau</nom>
+ <rue/>
+ <ville/>
+ <pays/>
+ <reseau>
+ <courrier>mailto:Marceau@uni-mannheim.de</courrier>
+ <pagePerso/>
+ </reseau>
+ </coordonnees>
+ <cartePaiement>7617 7057 8043 7327</cartePaiement>
+ </personne>
+ <personne>
+ <statistiques>
+ <sexe/>
+ <age/>
+ <education>High School</education>
+ <revenu>90986.66</revenu>
+ </statistiques>
+ <coordonnees>
+ <nom>Bokyung Biancardi</nom>
+ <rue/>
+ <ville/>
+ <pays/>
+ <reseau>
+ <courrier>mailto:Biancardi@mitre.org</courrier>
+ <pagePerso>http://www.mitre.org/~Biancardi</pagePerso>
+ </reseau>
+ </coordonnees>
+ <cartePaiement>6362 7558 4605 7344</cartePaiement>
+ </personne>
+ <personne>
+ <statistiques>
+ <sexe>female</sexe>
+ <age>42</age>
+ <education>Graduate School</education>
+ <revenu>9876.00</revenu>
+ </statistiques>
+ <coordonnees>
+ <nom>Srinivasa d'Argence</nom>
+ <rue/>
+ <ville/>
+ <pays/>
+ <reseau>
+ <courrier>mailto:d'Argence@umkc.edu</courrier>
+ <pagePerso/>
+ </reseau>
+ </coordonnees>
+ <cartePaiement>6450 7871 1768 8470</cartePaiement>
+ </personne>
+ <personne>
+ <statistiques>
+ <sexe/>
+ <age>39</age>
+ <education/>
+ <revenu>64262.77</revenu>
+ </statistiques>
+ <coordonnees>
+ <nom>Violaine Sabharwal</nom>
+ <rue>12 Forcade St</rue>
+ <ville>Rio</ville>
+ <pays>United States</pays>
+ <reseau>
+ <courrier>mailto:Sabharwal@evergreen.edu</courrier>
+ <pagePerso/>
+ </reseau>
+ </coordonnees>
+ <cartePaiement/>
+ </personne>
+ <personne>
+ <statistiques>
+ <sexe>male</sexe>
+ <age>19</age>
+ <education/>
+ <revenu>26393.54</revenu>
+ </statistiques>
+ <coordonnees>
+ <nom>Piyush Hardjono</nom>
+ <rue>43 Kriewall St</rue>
+ <ville>Toronto</ville>
+ <pays>Burkina Faso</pays>
+ <reseau>
+ <courrier>mailto:Hardjono@forth.gr</courrier>
+ <pagePerso>http://www.forth.gr/~Hardjono</pagePerso>
+ </reseau>
+ </coordonnees>
+ <cartePaiement/>
+ </personne>
+ <personne>
+ <statistiques>
+ <sexe/>
+ <age/>
+ <education/>
+ <revenu>22790.42</revenu>
+ </statistiques>
+ <coordonnees>
+ <nom>Gnanamalar Laemmer</nom>
+ <rue/>
+ <ville/>
+ <pays/>
+ <reseau>
+ <courrier>mailto:Laemmer@csufresno.edu</courrier>
+ <pagePerso>http://www.csufresno.edu/~Laemmer</pagePerso>
+ </reseau>
+ </coordonnees>
+ <cartePaiement/>
+ </personne>
+ <personne>
+ <statistiques>
+ <sexe>male</sexe>
+ <age/>
+ <education>College</education>
+ <revenu>28888.68</revenu>
+ </statistiques>
+ <coordonnees>
+ <nom>Tibor Lease</nom>
+ <rue>27 Desiderio St</rue>
+ <ville>Cody</ville>
+ <pays>United States</pays>
+ <reseau>
+ <courrier>mailto:Lease@gatech.edu</courrier>
+ <pagePerso/>
+ </reseau>
+ </coordonnees>
+ <cartePaiement>6700 1398 1554 3577</cartePaiement>
+ </personne>
+ <personne>
+ <statistiques>
+ <sexe/>
+ <age/>
+ <education>High School</education>
+ <revenu>15590.68</revenu>
+ </statistiques>
+ <coordonnees>
+ <nom>Ravindranath Cappi</nom>
+ <rue/>
+ <ville/>
+ <pays/>
+ <reseau>
+ <courrier>mailto:Cappi@ogi.edu</courrier>
+ <pagePerso>http://www.ogi.edu/~Cappi</pagePerso>
+ </reseau>
+ </coordonnees>
+ <cartePaiement/>
+ </personne>
+</categorie>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/d7fcc0e7/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q11.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q11.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q11.txt
new file mode 100644
index 0000000..63f4330
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q11.txt
@@ -0,0 +1,53 @@
+<items name="Vincent Ingolfsdottir">0</items>
+<items name="Greger Ohsie">0</items>
+<items name="Chikako Womann">1</items>
+<items name="Tsz Kugler">1</items>
+<items name="Yongguang Haahr">0</items>
+<items name="Hatim Legato">0</items>
+<items name="Dunren Lotfi">0</items>
+<items name="Kasidit Munke">3</items>
+<items name="Pedro Beeferman">0</items>
+<items name="Esteban Aalborg">0</items>
+<items name="Gururaj Pouyioutas">1</items>
+<items name="Helaman Eves">3</items>
+<items name="Arivind Pletch">0</items>
+<items name="Mohan Ginesta">0</items>
+<items name="Sakti Bein">0</items>
+<items name="Minkoo Couvreur">0</items>
+<items name="Daryl Paddon">0</items>
+<items name="Shauying Goullioud">0</items>
+<items name="Amar Takano">1</items>
+<items name="Hrant Blumrich">0</items>
+<items name="Mingsen Parisotto">4</items>
+<items name="Isamu Yeun">6</items>
+<items name="Seshu Messick">0</items>
+<items name="Bjorn Berc">1</items>
+<items name="Charlotte Larab">0</items>
+<items name="Antoinette Byrne">0</items>
+<items name="Shui Roison">7</items>
+<items name="Wee Jupin">0</items>
+<items name="Goo Hartrumpf">7</items>
+<items name="Mehrdad Shackell">0</items>
+<items name="Jozo Rest">3</items>
+<items name="Debin Takano">0</items>
+<items name="Timo Bals">0</items>
+<items name="Burra Souillard">3</items>
+<items name="Taokuan Sigal">3</items>
+<items name="Keith Buford">0</items>
+<items name="Joydeep Ghandeharizadeh">0</items>
+<items name="Jani Vecchi">0</items>
+<items name="Hideko Kodaira">0</items>
+<items name="Maria Marceau">7</items>
+<items name="Burke Bierbaum">0</items>
+<items name="Bokyung Biancardi">7</items>
+<items name="Chu Takano">0</items>
+<items name="Srinivasa d'Argence">0</items>
+<items name="Williaam Seress">0</items>
+<items name="Violaine Sabharwal">3</items>
+<items name="Piyush Hardjono">1</items>
+<items name="Thang Murrill">0</items>
+<items name="Gnanamalar Laemmer">0</items>
+<items name="Jerri Keirsey">0</items>
+<items name="Tibor Lease">1</items>
+<items name="Hiroakira Mynard">0</items>
+<items name="Ravindranath Cappi">0</items>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/d7fcc0e7/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q12.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q12.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q12.txt
new file mode 100644
index 0000000..cbc7013
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q12.txt
@@ -0,0 +1,12 @@
+<items person="59200.52">3</items>
+<items person="60275.75">3</items>
+<items person="73015.33">4</items>
+<items person="77899.19">6</items>
+<items person="102237.41">7</items>
+<items person="95921.73">7</items>
+<items person="57699.99">3</items>
+<items person="59655.87">3</items>
+<items person="67696.29">3</items>
+<items person="81288.98">7</items>
+<items person="90986.66">7</items>
+<items person="64262.77">3</items>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/d7fcc0e7/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q13.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q13.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q13.txt
new file mode 100644
index 0000000..6b7bf95
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q13.txt
@@ -0,0 +1,55 @@
+<item name="cockatrice approves money">
+ <description>
+ <text>clothes edmund doubtful fool torments ropes contrive lecher ardea
+ happiness fertile treads constable defences<keyword>lion
+ neighbour ourself</keyword>marshal disordered moderate venus
+ afeard article rot hazards craft crowns<emph>plainness patient</emph>lying knowledge diseases meritorious medicine</text>
+ </description>
+</item>
+<item name="answer misdoubt">
+ <description>
+ <text>delay brutish rage alexandria trumpet god wet resolve pursue colour
+ body walk month writing beside profane left declining coach through
+ protectorship congruent confusion favours following populous
+ exercise timon shoots function fourscore mangled favorably slain
+ secretly vice distinguish bardolph content hence boy worse bring
+ usurers stew beard longed creep hid pursuivant beholders senators
+ son mercutio woo bestow trumpet excess muffler pick ugly felt
+ causes remove adding tear often rounds underbearing tree purer
+ kibes endless women benefit throw<emph>claim firmness<keyword>arrived sees wrestled multitude repent preventions infamy reproof
+ shalt hearted prais knave doubtless</keyword>deny</emph>merely
+ grave voluble late loath digest horn slave hunger stronger amazed
+ salt killing ross cry dry tongue kiss yields auspicious quietness
+ perpetual ways<keyword>began leg running unjust court mean
+ returning brook creatures appointed paunches henry sights west
+ prunes flutes regiment seems bed</keyword>musicians slumber post
+ friendship prevention abreast wouldst words vexation builds unfelt
+ holly walk inform moods deck bulk begin action school nobles
+ antique people unkennel stomach into petitions jack assail yongrey
+ ages betimes golden sink droop kernel hoppedance perfection weight<emph>whining safe english rod other featur</emph>
+ </text>
+ </description>
+</item>
+<item name="prosperity dine yon debate">
+ <description>
+ <text>visitation strangely mab spirit forgot bargain holds</text>
+ </description>
+</item>
+<item name="congeal pawned alack">
+ <description>
+ <text>white obey<bold>calling neighbour office afternoon drum embowell
+ touch sue lifeless leapt shun called</bold>weary congregation
+ yield check falling wives challenge mental fatal hard ancient
+ stands cor dishes therein gramercy discipline farewell dire tricks
+ protest cut horatio brother speech sleeping adultress pitch cave
+ liv nurse drink state plants combating desired requir rebellion
+ afraid repented tree scald stopp wine advise undermine norfolk
+ vilely whet scars companions hanging foolish scene musty fruitful
+ unburthen teacher garments betimes sight now for oaths vouchsafe
+ particulars globe laertes afflictions rouse once news humanity buck
+ destroy military lucius lap<keyword>considered forc mourning
+ verona</keyword>waters triumphing officer hastily<emph>resign
+ subject figure hay thwart written signs gout bred distance period
+ glove players change folly</emph>going wat lost</text>
+ </description>
+</item>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/d7fcc0e7/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q14.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q14.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q14.txt
new file mode 100644
index 0000000..d201f0a
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q14.txt
@@ -0,0 +1 @@
+condemnanswer misdoubtnearest sighswronged revels swell coz
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/d7fcc0e7/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q15.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q15.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q15.txt
new file mode 100644
index 0000000..72b97f6
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q15.txt
@@ -0,0 +1,3 @@
+<text>west avail griefs took allowed
+ singing request following frost steeds invincible cow turk
+ esteem</text>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/d7fcc0e7/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q16.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q16.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q16.txt
new file mode 100644
index 0000000..fefb61e
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q16.txt
@@ -0,0 +1 @@
+<person id="person33"/>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/d7fcc0e7/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q17.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q17.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q17.txt
new file mode 100644
index 0000000..52e32b9
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q17.txt
@@ -0,0 +1,27 @@
+<person name="Vincent Ingolfsdottir"/>
+<person name="Greger Ohsie"/>
+<person name="Chikako Womann"/>
+<person name="Yongguang Haahr"/>
+<person name="Esteban Aalborg"/>
+<person name="Helaman Eves"/>
+<person name="Arivind Pletch"/>
+<person name="Amar Takano"/>
+<person name="Mingsen Parisotto"/>
+<person name="Seshu Messick"/>
+<person name="Bjorn Berc"/>
+<person name="Shui Roison"/>
+<person name="Wee Jupin"/>
+<person name="Goo Hartrumpf"/>
+<person name="Debin Takano"/>
+<person name="Timo Bals"/>
+<person name="Taokuan Sigal"/>
+<person name="Joydeep Ghandeharizadeh"/>
+<person name="Jani Vecchi"/>
+<person name="Maria Marceau"/>
+<person name="Chu Takano"/>
+<person name="Srinivasa d'Argence"/>
+<person name="Williaam Seress"/>
+<person name="Violaine Sabharwal"/>
+<person name="Thang Murrill"/>
+<person name="Tibor Lease"/>
+<person name="Hiroakira Mynard"/>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/d7fcc0e7/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q18.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q18.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q18.txt
new file mode 100644
index 0000000..b5bd2c6
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q18.txt
@@ -0,0 +1 @@
+390.3431523 1248.9967167 172.6606785 14.3681892 652.4524197 92.0710038 128.4101817 319.9125807 141.2798481 235.5104877 251.7297933 66.7283388 1332.4291773 1741.1071968 1187.7115416 1833.6630168
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/d7fcc0e7/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q19.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q19.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q19.txt
new file mode 100644
index 0000000..0159a82
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q19.txt
@@ -0,0 +1,44 @@
+<item name="spied torn">Cacos Islands</item>
+<item name="romeo">Cape Verde</item>
+<item name="cover">Guinea</item>
+<item name="sole claim">Hong Kong</item>
+<item name="cockatrice approves money">Madagascar</item>
+<item name="sin">Morocco</item>
+<item name="strong umpires became caius">Saint Kitts</item>
+<item name="ears wall phrase composition">Saudi Arabia</item>
+<item name="nose ago author preventions">Tunisia</item>
+<item name="duteous nine eighteen">United States</item>
+<item name="condemn">United States</item>
+<item name="earnestly subtle spotted attend">United States</item>
+<item name="poisons">United States</item>
+<item name="thought inland different">United States</item>
+<item name="answer misdoubt">United States</item>
+<item name="prosperity dine yon debate">United States</item>
+<item name="congeal pawned alack">United States</item>
+<item name="made his third">United States</item>
+<item name="sounds ope extemporal">United States</item>
+<item name="patient set trespasses simplicity">United States</item>
+<item name="blots killed tyrannous">United States</item>
+<item name="boundeth thickest wight">United States</item>
+<item name="weeping allegiance rogue ladies">United States</item>
+<item name="nearest sighs">United States</item>
+<item name="augurers">United States</item>
+<item name="humility">United States</item>
+<item name="hear strength infinite have">United States</item>
+<item name="whilst shakespeare">United States</item>
+<item name="win">United States</item>
+<item name="confident shut incur">United States</item>
+<item name="aid derive ventidius briber">United States</item>
+<item name="tested empress dance sought">United States</item>
+<item name="trade">United States</item>
+<item name="contemplation frighted fury sins">United States</item>
+<item name="posteriors orlando">United States</item>
+<item name="concealment pit">United States</item>
+<item name="guarded eve">United States</item>
+<item name="wronged revels swell coz">United States</item>
+<item name="assurance amiable cover poniards">United States</item>
+<item name="fires trees hers ber">United States</item>
+<item name="rosaline modern cleft fame">United States</item>
+<item name="impotent arras">United States</item>
+<item name="fortunes hastings">United States</item>
+<item name="cutpurses">United States</item>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/d7fcc0e7/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q20.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q20.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q20.txt
new file mode 100644
index 0000000..298461f
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/q20.txt
@@ -0,0 +1,6 @@
+<result>
+ <preferred>1</preferred>
+ <standard>14</standard>
+ <challenge>10</challenge>
+ <na>28</na>
+</result>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/d7fcc0e7/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/simple_query1.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/simple_query1.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/simple_query1.txt
new file mode 100644
index 0000000..9043899
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/simple_query1.txt
@@ -0,0 +1 @@
+TestSources/XMark/SingleFile/auction.xml
http://git-wip-us.apache.org/repos/asf/vxquery/blob/d7fcc0e7/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/simple_query2.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/simple_query2.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/simple_query2.txt
new file mode 100644
index 0000000..d8f9c8a
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/XMark/Original/simple_query2.txt
@@ -0,0 +1,4 @@
+<catgraph>
+ <edge from="category0" to="category0"/>
+ <edge from="category0" to="category0"/>
+</catgraph>
http://git-wip-us.apache.org/repos/asf/vxquery/blob/d7fcc0e7/vxquery-xtest/src/test/resources/Queries/XQuery/XMark/Modified/q01.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/XMark/Modified/q01.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/XMark/Modified/q01.xq
new file mode 100644
index 0000000..338453b
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/XMark/Modified/q01.xq
@@ -0,0 +1,23 @@
+(: Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License. :)
+
+(: XMark Query see README.md for full details. :)
+
+let $collection := "people"
+for $b in collection($collection)/site/people/person
+where $b/@id = "person0"
+return $b/name/text()
http://git-wip-us.apache.org/repos/asf/vxquery/blob/d7fcc0e7/vxquery-xtest/src/test/resources/Queries/XQuery/XMark/Modified/q02.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/XMark/Modified/q02.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/XMark/Modified/q02.xq
new file mode 100644
index 0000000..9b04dbe
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/XMark/Modified/q02.xq
@@ -0,0 +1,22 @@
+(: Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License. :)
+
+(: XMark Query see README.md for full details. :)
+
+let $collection := "open_auctions"
+for $b in collection($collection)/site/open_auctions/open_auction
+return <increase>{$b/bidder[1]/increase/text()}</increase>
http://git-wip-us.apache.org/repos/asf/vxquery/blob/d7fcc0e7/vxquery-xtest/src/test/resources/Queries/XQuery/XMark/Modified/q03.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/XMark/Modified/q03.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/XMark/Modified/q03.xq
new file mode 100644
index 0000000..3d25a18
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/XMark/Modified/q03.xq
@@ -0,0 +1,26 @@
+(: Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License. :)
+
+(: XMark Query see README.md for full details. :)
+
+let $collection := "open_auctions"
+for $b in collection($collection)/site/open_auctions/open_auction
+where zero-or-one($b/bidder[1]/increase/text()) * 2 <= $b/bidder[last()]/increase/text()
+return
+ <increase
+ first="{$b/bidder[1]/increase/text()}"
+ last="{$b/bidder[last()]/increase/text()}"/>