|
From: <pm_...@us...> - 2012-02-07 08:45:03
|
Revision: 4515
http://mxquery.svn.sourceforge.net/mxquery/?rev=4515&view=rev
Author: pm_fischer
Date: 2012-02-07 08:44:57 +0000 (Tue, 07 Feb 2012)
Log Message:
-----------
more merge resolving
Modified Paths:
--------------
trunk/MXQuery/src/ch/ethz/mxquery/iterators/ChildIterator.java
trunk/MXQuery_Testing/ProjectionTests/queries/Cond1.xq
trunk/MXQuery_Testing/ProjectionTests/queries/XMark01.xq
Modified: trunk/MXQuery/src/ch/ethz/mxquery/iterators/ChildIterator.java
===================================================================
--- trunk/MXQuery/src/ch/ethz/mxquery/iterators/ChildIterator.java 2012-02-07 08:43:19 UTC (rev 4514)
+++ trunk/MXQuery/src/ch/ethz/mxquery/iterators/ChildIterator.java 2012-02-07 08:44:57 UTC (rev 4515)
@@ -288,4 +288,6 @@
}
return new ObjectObjectPair(returned, paths.getSecond());
}
+
+
}
Modified: trunk/MXQuery_Testing/ProjectionTests/queries/Cond1.xq
===================================================================
--- trunk/MXQuery_Testing/ProjectionTests/queries/Cond1.xq 2012-02-07 08:43:19 UTC (rev 4514)
+++ trunk/MXQuery_Testing/ProjectionTests/queries/Cond1.xq 2012-02-07 08:44:57 UTC (rev 4515)
@@ -1,3 +1,3 @@
if(true())
then doc("xmark.xml")/site/people/person
-else doc("xmark.xml")/site/open_auctions/open_auction
\ No newline at end of file
+else doc("xmark.xml")/site/open_auctions/open_auction
Modified: trunk/MXQuery_Testing/ProjectionTests/queries/XMark01.xq
===================================================================
--- trunk/MXQuery_Testing/ProjectionTests/queries/XMark01.xq 2012-02-07 08:43:19 UTC (rev 4514)
+++ trunk/MXQuery_Testing/ProjectionTests/queries/XMark01.xq 2012-02-07 08:44:57 UTC (rev 4515)
@@ -1,4 +1,4 @@
let $auction := doc("xmark.xml")
return for $b in $auction/site/people/person
where $b/@id = 'person0'
-return $b/name/text()
\ No newline at end of file
+return $b/name/text()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|