mxquery-commit

[Mxquery-commit] SF.net SVN: mxquery:[4529] trunk/MXQuery/src/ch/ethz/mxquery/xdmio/ xmlAdapters/XDMImportAdapter.java

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

Revision: 4529
          http://mxquery.svn.sourceforge.net/mxquery/?rev=4529&view=rev
Author:   pm_fischer
Date:     2012-02-08 16:19:00 +0000 (Wed, 08 Feb 2012)
Log Message:
-----------
one more build blocker on MIDP

Modified Paths:
--------------
    trunk/MXQuery/src/ch/ethz/mxquery/xdmio/xmlAdapters/XDMImportAdapter.java

Modified: trunk/MXQuery/src/ch/ethz/mxquery/xdmio/xmlAdapters/XDMImportAdapter.java
===================================================================
--- trunk/MXQuery/src/ch/ethz/mxquery/xdmio/xmlAdapters/XDMImportAdapter.java	2012-02-08 15:43:03 UTC (rev 4528)
+++ trunk/MXQuery/src/ch/ethz/mxquery/xdmio/xmlAdapters/XDMImportAdapter.java	2012-02-08 16:19:00 UTC (rev 4529)
@@ -15,7 +15,6 @@
 
 package ch.ethz.mxquery.xdmio.xmlAdapters;
 
-import java.util.ArrayList;
 import java.util.Vector;
 
 import ch.ethz.mxquery.bindings.WindowFactory;

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

[Mxquery-commit] SF.net SVN: mxquery:[4538] trunk/MXQuery/src/ch/ethz/mxquery/xdmio/ xmlAdapters/XDMImportAdapter.java

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

Revision: 4538
          http://mxquery.svn.sourceforge.net/mxquery/?rev=4538&view=rev
Author:   pm_fischer
Date:     2012-03-12 14:44:11 +0000 (Mon, 12 Mar 2012)
Log Message:
-----------
revert change on XDMImportAdapter to create stores when materialization
is needed

Modified Paths:
--------------
    trunk/MXQuery/src/ch/ethz/mxquery/xdmio/xmlAdapters/XDMImportAdapter.java

Modified: trunk/MXQuery/src/ch/ethz/mxquery/xdmio/xmlAdapters/XDMImportAdapter.java
===================================================================
--- trunk/MXQuery/src/ch/ethz/mxquery/xdmio/xmlAdapters/XDMImportAdapter.java	2012-03-12 14:00:53 UTC (rev 4537)
+++ trunk/MXQuery/src/ch/ethz/mxquery/xdmio/xmlAdapters/XDMImportAdapter.java	2012-03-12 14:44:11 UTC (rev 4538)
@@ -310,9 +310,10 @@
 	}
 
 	public XDMIterator require(int requiredOptions) throws MXQueryException {
-	   if ((requiredOptions & DataflowAnalysis.NODEID_ORDER) != 0)
+	   if ((requiredOptions & DataflowAnalysis.NODEID_ORDER) != 0 && 
+		   (requiredOptions & DataflowAnalysis.MATERIALIZATION_SUPPORT) == 0)
 	       generateNodeIds = true;
-	    return this;
+	    return super.require(requiredOptions);
 	}
 	
 	

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