[Mxquery-commit] SF.net SVN: mxquery:[4511] trunk/MXQuery/src/ch/ethz/mxquery

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

Revision: 4511
          http://mxquery.svn.sourceforge.net/mxquery/?rev=4511&view=rev
Author:   pm_fischer
Date:     2012-02-01 13:10:51 +0000 (Wed, 01 Feb 2012)
Log Message:
-----------
- within XSP, use global Context to store base URI
- root context base URI is only set to system base URI if not already set

Modified Paths:
--------------
    trunk/MXQuery/src/ch/ethz/mxquery/contextConfig/Context.java
    trunk/MXQuery/src/ch/ethz/mxquery/query/webservice/XSPMain.java

Modified: trunk/MXQuery/src/ch/ethz/mxquery/contextConfig/Context.java
===================================================================
--- trunk/MXQuery/src/ch/ethz/mxquery/contextConfig/Context.java	2011-12-22 11:00:23 UTC (rev 4510)
+++ trunk/MXQuery/src/ch/ethz/mxquery/contextConfig/Context.java	2012-02-01 13:10:51 UTC (rev 4511)
@@ -325,7 +325,8 @@
 		rootContext.storeSet = stores;
 	    else
 		rootContext.storeSet = new LLStoreSet();
-	    rootContext.setBaseURI(IOLib.getSystemBaseUri());
+	    if (rootContext.getBaseURI() == null)
+        	    rootContext.setBaseURI(IOLib.getSystemBaseUri());
 
 	} else {
 	    this.parent = parent;

Modified: trunk/MXQuery/src/ch/ethz/mxquery/query/webservice/XSPMain.java
===================================================================
--- trunk/MXQuery/src/ch/ethz/mxquery/query/webservice/XSPMain.java	2011-12-22 11:00:23 UTC (rev 4510)
+++ trunk/MXQuery/src/ch/ethz/mxquery/query/webservice/XSPMain.java	2012-02-01 13:10:51 UTC (rev 4511)
@@ -181,7 +181,7 @@
 		// Initialize context
 		Context ctx = new Context();
 		File dir = new File(getServletContext().getRealPath("."));
-		ctx.setBaseURI(dir.toURI().toString());
+		Context.getGlobalContext().setBaseURI(dir.toURI().toString());
 		CompilerOptions co = new CompilerOptions();
 		co.setSchemaAwareness(true);
 		co.setXquery11(true);
@@ -360,4 +360,4 @@
 		queryResult.append("</pre></div>");
 		queryResult.append("</body></html>");
 	}
-}
\ No newline at end of file
+}

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