[Mxquery-commit] SF.net SVN: mxquery:[4517] trunk

[<pm_...@us...>]

Revision: 4517
          http://mxquery.svn.sourceforge.net/mxquery/?rev=4517&view=rev
Author:   pm_fischer
Date:     2012-02-07 08:47:38 +0000 (Tue, 07 Feb 2012)
Log Message:
-----------
continue merging

Modified Paths:
--------------
    trunk/MXQuery/src/ch/ethz/mxquery/query/parser/Parser.java
    trunk/MXQuery_Testing/ProjectionTests/queries/XMark01.xq

Modified: trunk/MXQuery/src/ch/ethz/mxquery/query/parser/Parser.java
===================================================================
--- trunk/MXQuery/src/ch/ethz/mxquery/query/parser/Parser.java	2012-02-07 08:46:05 UTC (rev 4516)
+++ trunk/MXQuery/src/ch/ethz/mxquery/query/parser/Parser.java	2012-02-07 08:47:38 UTC (rev 4517)
@@ -3916,6 +3916,7 @@
 	    // orderedVars[i].setResettable(true);
 	}
 	extendCurrentContextScope();
+
 	for (int i = 0; i < inscopevars.length; i++) {
 	    getCurrentContext().registerVariable(inscopevars[i], true);
 	}

Modified: trunk/MXQuery_Testing/ProjectionTests/queries/XMark01.xq
===================================================================
--- trunk/MXQuery_Testing/ProjectionTests/queries/XMark01.xq	2012-02-07 08:46:05 UTC (rev 4516)
+++ trunk/MXQuery_Testing/ProjectionTests/queries/XMark01.xq	2012-02-07 08:47:38 UTC (rev 4517)
@@ -1,3 +1,4 @@
+let $auction := doc() 
 let $auction := doc("xmark.xml") 
 return for $b in $auction/site/people/person
 where $b/@id = 'person0' 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.