exist-commits — Receive notifications about CVS commits.

[Exist-commits] eXist-1.0/webapp/xquery process.xq,1.3,1.4

[<jm...@us...>]

Update of /cvsroot/exist/eXist-1.0/webapp/xquery
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27532/webapp/xquery

Modified Files:
	process.xq 
Log Message:
avoid having twice the same query in history

Index: process.xq
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/webapp/xquery/process.xq,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** process.xq	2 Feb 2004 15:30:35 -0000	1.3
--- process.xq	7 Mar 2004 09:34:11 -0000	1.4
***************
*** 106,109 ****
--- 106,129 ----
  };
  
+ (: Auxiliary function called in add-to-history()
+    to avoid having twice the same query in history
+ :)
+ declare function f:string-list-union(
+    $list as xs:string*,
+    $s as xs:string ) as xs:string*
+ {
+   let $contains :=
+     for $ss in $list
+       return
+         if ( $ss = $s ) then true
+         else ""
+ 
+   return
+     if ( $contains ) then
+       $list
+     else
+       ( $list, $s )
+ };
+ 
  (:  Add the last query to the query-history. The history is
      stored in the session as an XQuery sequence.
***************
*** 113,117 ****
      let $history := request:get-session-attribute("history")
      return
!         request:set-session-attribute("history", ($history, $query))
  };
  
--- 133,138 ----
      let $history := request:get-session-attribute("history")
      return
!         request:set-session-attribute( "history",
!                                        f:string-list-union($history, $query) )
  };
  
***************
*** 161,165 ****
  
          <section title="Query Results">
-         
          { f:main() }
  
--- 182,185 ----

[Exist-commits] eXist-1.0/src/org/exist/xmldb RemoteResourceSet.java,1.2,1.3

[<wol...@us...>]

Update of /cvsroot/exist/eXist-1.0/src/org/exist/xmldb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv757/src/org/exist/xmldb

Modified Files:
	RemoteResourceSet.java 
Log Message:
Fixed bug in the processing of logical operators "and", "or".

Index: RemoteResourceSet.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xmldb/RemoteResourceSet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** RemoteResourceSet.java	3 Feb 2004 08:33:51 -0000	1.2
--- RemoteResourceSet.java	5 Mar 2004 16:15:48 -0000	1.3
***************
*** 113,117 ****
  	 */
  	protected void finalize() throws Throwable {
- 		System.err.println("releasing query results");
  		try {
  			Vector params = new Vector(1);
--- 113,116 ----

[Exist-commits] eXist-1.0/src/org/exist/xquery OpAnd.java,1.1,1.2

[<wol...@us...>]

Update of /cvsroot/exist/eXist-1.0/src/org/exist/xquery
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv757/src/org/exist/xquery

Modified Files:
	OpAnd.java 
Log Message:
Fixed bug in the processing of logical operators "and", "or".

Index: OpAnd.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/OpAnd.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** OpAnd.java	29 Jan 2004 15:06:42 -0000	1.1
--- OpAnd.java	5 Mar 2004 16:15:48 -0000	1.2
***************
*** 59,63 ****
  			rr = rr.getContextNodes(inPredicate);
  			rl =
! 				rl.intersection(rr);
  			return rl;
  		} else {
--- 59,63 ----
  			rr = rr.getContextNodes(inPredicate);
  			rl =
! 				rr.intersection(rl);
  			return rl;
  		} else {

[Exist-commits] eXist-1.0/src/org/exist/dom AbstractNodeSet.java,1.12,1.13 ArraySet.java,1.28,1.29

[<wol...@us...>]

Update of /cvsroot/exist/eXist-1.0/src/org/exist/dom
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv757/src/org/exist/dom

Modified Files:
	AbstractNodeSet.java ArraySet.java 
Log Message:
Fixed bug in the processing of logical operators "and", "or".

Index: AbstractNodeSet.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/dom/AbstractNodeSet.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** AbstractNodeSet.java	1 Mar 2004 21:30:20 -0000	1.12
--- AbstractNodeSet.java	5 Mar 2004 16:15:47 -0000	1.13
***************
*** 840,844 ****
  	 */
  	public NodeSet getContextNodes(NodeSet contextNodes, boolean rememberContext) {
! 		NodeSet result = new ArraySet(getLength());
  		NodeProxy current, context, item;
  		ContextItem contextNode;
--- 840,844 ----
  	 */
  	public NodeSet getContextNodes(NodeSet contextNodes, boolean rememberContext) {
! 		ArraySet result = new ArraySet(getLength());
  		NodeProxy current, context, item;
  		ContextItem contextNode;
***************
*** 867,871 ****
  		NodeProxy current, context;
  		ContextItem contextNode;
! 		NodeSet result = new ArraySet(getLength());
  		for (Iterator i = iterator(); i.hasNext();) {
  			current = (NodeProxy) i.next();
--- 867,872 ----
  		NodeProxy current, context;
  		ContextItem contextNode;
! 		ExtArrayNodeSet result = new ExtArrayNodeSet();
! 		DocumentImpl lastDoc = null;
  		for (Iterator i = iterator(); i.hasNext();) {
  			current = (NodeProxy) i.next();
***************
*** 877,881 ****
  					if (rememberContext)
  						context.addContextNode(context);
! 					result.add(context);
  				}
  				contextNode = contextNode.getNextItem();
--- 878,886 ----
  					if (rememberContext)
  						context.addContextNode(context);
! 					if(lastDoc != null && lastDoc.getDocId() != context.doc.getDocId()) {
! 						lastDoc = context.doc;
! 						result.add(context, getSizeHint(lastDoc));
! 					} else
! 						result.add(context);
  				}
  				contextNode = contextNode.getNextItem();

Index: ArraySet.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/dom/ArraySet.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** ArraySet.java	1 Mar 2004 21:30:20 -0000	1.28
--- ArraySet.java	5 Mar 2004 16:15:48 -0000	1.29
***************
*** 203,206 ****
--- 203,207 ----
  			nodes[counter++] = proxy;
  		}
+ 		sorted = false;
  	}
  
***************
*** 241,246 ****
  		sort();
  		int pos = search(nodes, 0, counter - 1, p);
! 		if (pos < 0)
  			return null;
  		return nodes[pos];
  	}
--- 242,249 ----
  		sort();
  		int pos = search(nodes, 0, counter - 1, p);
! 		if (pos < 0) {
! 			System.out.println(p.gid + " not found");
  			return null;
+ 		}
  		return nodes[pos];
  	}

[Exist-commits] eXist-1.0/src/org/exist/storage NativeTextEngine.java,1.41,1.42 BrokerPool.java,1.17,1.18

[<wol...@us...>]

Update of /cvsroot/exist/eXist-1.0/src/org/exist/storage
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv757/src/org/exist/storage

Modified Files:
	NativeTextEngine.java BrokerPool.java 
Log Message:
Fixed bug in the processing of logical operators "and", "or".

Index: NativeTextEngine.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/storage/NativeTextEngine.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** NativeTextEngine.java	1 Mar 2004 13:20:35 -0000	1.41
--- NativeTextEngine.java	5 Mar 2004 16:15:47 -0000	1.42
***************
*** 291,295 ****
  		if (stoplist.contains(expr))
  			return null;
! 		//		long start = System.currentTimeMillis();
  		DocumentImpl doc;
  		Value ref;
--- 291,295 ----
  		if (stoplist.contains(expr))
  			return null;
! 				long start = System.currentTimeMillis();
  		DocumentImpl doc;
  		Value ref;
***************
*** 370,384 ****
  		if (context != null)
  			((ExtArrayNodeSet) result).sort();
! 		//		LOG.debug(
! 		//			"found "
! 		//				+ expr
! 		//				+ ": "
! 		//				+ result.getLength()
! 		//				+ " ("
! 		//				+ count
! 		//				+ ") "
! 		//				+ " in "
! 		//				+ (System.currentTimeMillis() - start)
! 		//				+ "ms.");
  		return result;
  	}
--- 370,384 ----
  		if (context != null)
  			((ExtArrayNodeSet) result).sort();
! 				LOG.debug(
! 					"found "
! 						+ expr
! 						+ ": "
! 						+ result.getLength()
! 						+ " ("
! 						+ count
! 						+ ") "
! 						+ " in "
! 						+ (System.currentTimeMillis() - start)
! 						+ "ms.");
  		return result;
  	}

Index: BrokerPool.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/storage/BrokerPool.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** BrokerPool.java	5 Mar 2004 11:15:28 -0000	1.17
--- BrokerPool.java	5 Mar 2004 16:15:47 -0000	1.18
***************
*** 17,21 ****
   *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
   * 
!  *  $Id:
   */
  package org.exist.storage;
--- 17,21 ----
   *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
   * 
!  *  $Id$
   */
  package org.exist.storage;

[Exist-commits] eXist-1.0/samples/xquery display-collections.xq,1.2,1.3

[<wol...@us...>]

Update of /cvsroot/exist/eXist-1.0/samples/xquery
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5368/samples/xquery

Modified Files:
	display-collections.xq 
Log Message:
Fixed some synchronization issues in the XQuery engine:

* Compiled XQuery expressions are no longer shared between 
different threads. The XQuery cache in XQueryServlet and
XQueryGenerator is declared as thread local now.

* The XQueryContext of a compiled XQuery now gets the correct
database broker object set.

Index: display-collections.xq
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/samples/xquery/display-collections.xq,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** display-collections.xq	16 Feb 2004 13:02:44 -0000	1.2
--- display-collections.xq	5 Mar 2004 11:15:27 -0000	1.3
***************
*** 19,27 ****
  				{
  					for $r in $resources
-                     let $d := document(concat(coll:get-name($collection), "/", $r))
  					return
! 						<resource name="{$r}">
!                             {$d}
!                         </resource>
  				}
  			</resources>
--- 19,24 ----
  				{
  					for $r in $resources
  					return
! 						<resource name="{$r}"/>
  				}
  			</resources>

[Exist-commits] eXist-1.0/src/org/exist/http/servlets XQueryServlet.java,1.5,1.6

[<wol...@us...>]

Update of /cvsroot/exist/eXist-1.0/src/org/exist/http/servlets
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5368/src/org/exist/http/servlets

Modified Files:
	XQueryServlet.java 
Log Message:
Fixed some synchronization issues in the XQuery engine:

* Compiled XQuery expressions are no longer shared between 
different threads. The XQuery cache in XQueryServlet and
XQueryGenerator is declared as thread local now.

* The XQueryContext of a compiled XQuery now gets the correct
database broker object set.

Index: XQueryServlet.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/http/servlets/XQueryServlet.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** XQueryServlet.java	16 Feb 2004 13:02:17 -0000	1.5
--- XQueryServlet.java	5 Mar 2004 11:15:29 -0000	1.6
***************
*** 99,103 ****
  	private String encoding = null;
  	
! 	private Map cache = new HashMap();
  	
  	/* (non-Javadoc)
--- 99,111 ----
  	private String encoding = null;
  	
! 	private ThreadLocal cache = new ThreadLocal() {
! 		
! 		/* (non-Javadoc)
! 		 * @see java.lang.ThreadLocal#initialValue()
! 		 */
! 		protected Object initialValue() {
! 			return new HashMap();
! 		}
! 	};
  	
  	/* (non-Javadoc)
***************
*** 210,221 ****
  						
  			CompiledExpression compiled;
! 			CachedQuery cached = (CachedQuery)cache.get(path);
  			if(cached == null || (!cached.isValid())) {
  				String xquery = readQuery(f);
  				compiled = service.compile(xquery);
  				cached = new CachedQuery(f, compiled);
! 				cache.put(path, cached);
! 			} else
  				compiled = cached.getExpression();
  			ResourceSet result = service.execute(compiled);
  			for(ResourceIterator i = result.getIterator(); i.hasMoreResources(); ) {
--- 218,230 ----
  						
  			CompiledExpression compiled;
! 			CachedQuery cached = (CachedQuery)((Map)cache.get()).get(path);
  			if(cached == null || (!cached.isValid())) {
  				String xquery = readQuery(f);
  				compiled = service.compile(xquery);
  				cached = new CachedQuery(f, compiled);
! 				((Map)cache.get()).put(path, cached);
! 			} else {
  				compiled = cached.getExpression();
+ 			}
  			ResourceSet result = service.execute(compiled);
  			for(ResourceIterator i = result.getIterator(); i.hasMoreResources(); ) {

[Exist-commits] eXist-1.0/src/org/exist/storage BrokerPool.java,1.16,1.17 NativeBroker.java,1.58,1.59

[<wol...@us...>]

Update of /cvsroot/exist/eXist-1.0/src/org/exist/storage
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5368/src/org/exist/storage

Modified Files:
	BrokerPool.java NativeBroker.java 
Log Message:
Fixed some synchronization issues in the XQuery engine:

* Compiled XQuery expressions are no longer shared between 
different threads. The XQuery cache in XQueryServlet and
XQueryGenerator is declared as thread local now.

* The XQueryContext of a compiled XQuery now gets the correct
database broker object set.

Index: BrokerPool.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/storage/BrokerPool.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** BrokerPool.java	3 Feb 2004 11:08:24 -0000	1.16
--- BrokerPool.java	5 Mar 2004 11:15:28 -0000	1.17
***************
*** 218,221 ****
--- 218,222 ----
  	protected DBBroker createBroker() throws EXistException {
  		DBBroker broker = BrokerFactory.getInstance(this, conf);
+ 		//Thread.dumpStack();
  		LOG.debug(
  			"database " + instanceId + ": creating new instance of " + broker.getClass().getName());

Index: NativeBroker.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/storage/NativeBroker.java,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** NativeBroker.java	3 Mar 2004 09:45:16 -0000	1.58
--- NativeBroker.java	5 Mar 2004 11:15:28 -0000	1.59
***************
*** 1017,1020 ****
--- 1017,1021 ----
  			NodeIndexListener listener = doc.getIndexListener();
  			// jmv if ((listener = doc.getIndexListener()) != null)
+ 			if(listener != null)
  				listener.nodeChanged(node);
  			if (nodeType == Node.ELEMENT_NODE && level <= depth) {

[Exist-commits] eXist-1.0/src/org/exist/xmldb LocalXPathQueryService.java,1.33,1.34 LocalCollectionManagementService.java,1.7,1.8

[<wol...@us...>]

Update of /cvsroot/exist/eXist-1.0/src/org/exist/xmldb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5368/src/org/exist/xmldb

Modified Files:
	LocalXPathQueryService.java 
	LocalCollectionManagementService.java 
Log Message:
Fixed some synchronization issues in the XQuery engine:

* Compiled XQuery expressions are no longer shared between 
different threads. The XQuery cache in XQueryServlet and
XQueryGenerator is declared as thread local now.

* The XQueryContext of a compiled XQuery now gets the correct
database broker object set.

Index: LocalXPathQueryService.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xmldb/LocalXPathQueryService.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** LocalXPathQueryService.java	25 Feb 2004 15:31:58 -0000	1.33
--- LocalXPathQueryService.java	5 Mar 2004 11:15:27 -0000	1.34
***************
*** 119,160 ****
  
  	public ResourceSet execute(CompiledExpression expression) throws XMLDBException {
  		DBBroker broker = null;
! 		DocumentSet docs = null;
  		try {
  			broker = brokerPool.get(user);
! 			docs = collection.collection.allDocs(broker, new DocumentSet(), true);
  		} catch (EXistException e) {
! 			throw new XMLDBException(
! 				ErrorCodes.UNKNOWN_ERROR,
! 				"error while loading documents: " + e.getMessage(),
! 				e);
  		} finally {
  			brokerPool.release(broker);
  		}
! 		expression.reset();
! 		XQueryContext context = ((PathExpr)expression).getContext();
! 		context.setBackwardsCompatibility(xpathCompatible);
! 		context.setStaticallyKnownDocuments(docs);
! 		
! 		Map.Entry entry;
! 		// declare namespace/prefix mappings
! 		for (Iterator i = namespaceDecls.entrySet().iterator(); i.hasNext();) {
! 			entry = (Map.Entry) i.next();
! 			context.declareNamespace((String) entry.getKey(), (String) entry.getValue());
! 		}
! 		// declare static variables
! 		for (Iterator i = variableDecls.entrySet().iterator(); i.hasNext();) {
! 			entry = (Map.Entry) i.next();
! 			try {
! 				context.declareVariable((String) entry.getKey(), entry.getValue());
! 			} catch (XPathException e) {
! 				throw new XMLDBException(ErrorCodes.VENDOR_ERROR, e.getMessage(), e);
! 			}
! 		}
! 		return doQuery(expression, docs, null, null);
  	}
  
  	public CompiledExpression compile(String query) throws XMLDBException {
- 		//LOG.debug("compiling " + query);
  		DBBroker broker = null;
  		try {
--- 119,172 ----
  
  	public ResourceSet execute(CompiledExpression expression) throws XMLDBException {
+ 		return execute(null, null, expression, null);
+ 	}
+ 	
+ 	private ResourceSet execute(DocumentSet docs, 
+ 		NodeSet contextSet, CompiledExpression expression, String sortExpr) 
+ 	throws XMLDBException {
  		DBBroker broker = null;
! 		Sequence result;
  		try {
  			broker = brokerPool.get(user);
! 			if(docs == null)
! 				docs = collection.collection.allDocs(broker, new DocumentSet(), true);
! 		
! 			expression.reset();
! 			XQueryContext context = ((PathExpr)expression).getContext();
! 			context.setBroker(broker);
! 			context.setBackwardsCompatibility(xpathCompatible);
! 			context.setStaticallyKnownDocuments(docs);
! 			
! 			Map.Entry entry;
! 			// declare namespace/prefix mappings
! 			for (Iterator i = namespaceDecls.entrySet().iterator(); i.hasNext();) {
! 				entry = (Map.Entry) i.next();
! 				context.declareNamespace((String) entry.getKey(), (String) entry.getValue());
! 			}
! 			// declare static variables
! 			for (Iterator i = variableDecls.entrySet().iterator(); i.hasNext();) {
! 				entry = (Map.Entry) i.next();
! 				try {
! 					context.declareVariable((String) entry.getKey(), entry.getValue());
! 				} catch (XPathException e) {
! 					throw new XMLDBException(ErrorCodes.VENDOR_ERROR, e.getMessage(), e);
! 				}
! 			}
! 			result = ((PathExpr)expression).eval(contextSet, null);
! 			expression.reset();
  		} catch (EXistException e) {
! 			throw new XMLDBException(ErrorCodes.VENDOR_ERROR, e.getMessage(), e);
! 		} catch (XPathException e) {
! 			throw new XMLDBException(ErrorCodes.VENDOR_ERROR, e.getMessage(), e);
  		} finally {
  			brokerPool.release(broker);
  		}
! 		if(result != null)
! 			return new LocalResourceSet(user, brokerPool, collection, properties, result, sortExpr);
! 		else
! 			return null;
  	}
  
  	public CompiledExpression compile(String query) throws XMLDBException {
  		DBBroker broker = null;
  		try {
***************
*** 168,172 ****
  			for (Iterator i = namespaceDecls.entrySet().iterator(); i.hasNext();) {
  				entry = (Map.Entry) i.next();
- 				LOG.debug("prefix " + entry.getKey() + " = " + entry.getValue());
  				context.declareNamespace(
  					(String) entry.getKey(),
--- 180,183 ----
***************
*** 191,195 ****
  
  			AST ast = parser.getAST();
- 			LOG.debug("generated AST: " + ast.toStringList());
  
  			PathExpr expr = new PathExpr(context);
--- 202,205 ----
***************
*** 225,232 ****
  		throws XMLDBException {
  		CompiledExpression expr = compile(query);
! 		return doQuery(expr, docs, contextSet, sortExpr);
  	}
  
! 	protected ResourceSet doQuery(
  		CompiledExpression compiled,
  		DocumentSet docs,
--- 235,242 ----
  		throws XMLDBException {
  		CompiledExpression expr = compile(query);
! 		return execute(docs, contextSet, expr, sortExpr);
  	}
  
! /*	protected ResourceSet doQuery(
  		CompiledExpression compiled,
  		DocumentSet docs,
***************
*** 253,257 ****
  			throw new XMLDBException(ErrorCodes.VENDOR_ERROR, e.getMessage(), e);
  		}
! 	}
  
  	public ResourceSet queryResource(String resource, String query)
--- 263,267 ----
  			throw new XMLDBException(ErrorCodes.VENDOR_ERROR, e.getMessage(), e);
  		}
! 	} */
  
  	public ResourceSet queryResource(String resource, String query)

Index: LocalCollectionManagementService.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xmldb/LocalCollectionManagementService.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** LocalCollectionManagementService.java	16 Sep 2003 12:34:08 -0000	1.7
--- LocalCollectionManagementService.java	5 Mar 2004 11:15:27 -0000	1.8
***************
*** 21,31 ****
          Category.getInstance( LocalCollection.class.getName() );
          
-     /**
-      *  Constructor for the LocalCollectionManagementService object
-      *
-      *@param  pool    Description of the Parameter
-      *@param  parent  Description of the Parameter
-      *@param  user    Description of the Parameter
-      */
      public LocalCollectionManagementService( User user, BrokerPool pool,
                                               LocalCollection parent ) {
--- 21,24 ----
***************
*** 37,48 ****
      }
  
- 
-     /**
-      *  Description of the Method
-      *
-      *@param  collName            Description of the Parameter
-      *@return                     Description of the Return Value
-      *@exception  XMLDBException  Description of the Exception
-      */
      public Collection createCollection( String collName ) throws XMLDBException {
          collName = parent.getPath() + '/' + collName;
--- 30,33 ----
***************
*** 83,128 ****
      }
  
- 
-     /**
-      *  Gets the name attribute of the LocalCollectionManagementService object
-      *
-      *@return                     The name value
-      *@exception  XMLDBException  Description of the Exception
-      */
      public String getName() throws XMLDBException {
          return "CollectionManagementService";
      }
  
- 
-     /**
-      *  Gets the property attribute of the LocalCollectionManagementService
-      *  object
-      *
-      *@param  property  Description of the Parameter
-      *@return           The property value
-      */
      public String getProperty( String property ) {
          return null;
      }
  
- 
-     /**
-      *  Gets the version attribute of the LocalCollectionManagementService
-      *  object
-      *
-      *@return                     The version value
-      *@exception  XMLDBException  Description of the Exception
-      */
      public String getVersion() throws XMLDBException {
          return "1.0";
      }
  
- 
-     /**
-      *  Description of the Method
-      *
-      *@param  collName            Description of the Parameter
-      *@exception  XMLDBException  Description of the Exception
-      */
      public void removeCollection( String collName ) throws XMLDBException {
      	String path = (collName.startsWith("/db") ? collName : 
--- 68,83 ----
***************
*** 145,168 ****
      }
  
- 
-     /**
-      *  Sets the collection attribute of the LocalCollectionManagementService
-      *  object
-      *
-      *@param  parent              The new collection value
-      *@exception  XMLDBException  Description of the Exception
-      */
      public void setCollection( Collection parent ) throws XMLDBException {
          this.parent = (LocalCollection) parent;
      }
  
- 
-     /**
-      *  Sets the property attribute of the LocalCollectionManagementService
-      *  object
-      *
-      *@param  property  The new property value
-      *@param  value     The new property value
-      */
      public void setProperty( String property,
                               String value ) {
--- 100,107 ----

[Exist-commits] eXist-1.0/src/org/exist/xquery XQueryContext.java,1.6,1.7

[<wol...@us...>]

Update of /cvsroot/exist/eXist-1.0/src/org/exist/xquery
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5368/src/org/exist/xquery

Modified Files:
	XQueryContext.java 
Log Message:
Fixed some synchronization issues in the XQuery engine:

* Compiled XQuery expressions are no longer shared between 
different threads. The XQuery cache in XQueryServlet and
XQueryGenerator is declared as thread local now.

* The XQueryContext of a compiled XQuery now gets the correct
database broker object set.

Index: XQueryContext.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/XQueryContext.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** XQueryContext.java	1 Mar 2004 13:20:35 -0000	1.6
--- XQueryContext.java	5 Mar 2004 11:15:29 -0000	1.7
***************
*** 519,522 ****
--- 519,526 ----
  	}
  
+ 	public void setBroker(DBBroker broker) {
+ 		this.broker = broker;
+ 	}
+ 	
  	/**
  	 * Get the user which executes the current query.

[Exist-commits] eXist-1.0/src/org/exist/xmlrpc RpcConnection.java,1.46,1.47

[<wol...@us...>]

Update of /cvsroot/exist/eXist-1.0/src/org/exist/xmlrpc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5368/src/org/exist/xmlrpc

Modified Files:
	RpcConnection.java 
Log Message:
Fixed some synchronization issues in the XQuery engine:

* Compiled XQuery expressions are no longer shared between 
different threads. The XQuery cache in XQueryServlet and
XQueryGenerator is declared as thread local now.

* The XQueryContext of a compiled XQuery now gets the correct
database broker object set.

Index: RpcConnection.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xmlrpc/RpcConnection.java,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** RpcConnection.java	25 Feb 2004 15:31:58 -0000	1.46
--- RpcConnection.java	5 Mar 2004 11:15:28 -0000	1.47
***************
*** 37,43 ****
  import org.exist.dom.SortedNodeSet;
  import org.exist.memtree.NodeImpl;
- import org.exist.xquery.parser.XQueryLexer;
- import org.exist.xquery.parser.XQueryParser;
- import org.exist.xquery.parser.XQueryTreeParser;
  import org.exist.security.Permission;
  import org.exist.security.PermissionDeniedException;
--- 37,40 ----
***************
*** 56,59 ****
--- 53,59 ----
  import org.exist.xquery.XPathException;
  import org.exist.xquery.XQueryContext;
+ import org.exist.xquery.parser.XQueryLexer;
+ import org.exist.xquery.parser.XQueryParser;
+ import org.exist.xquery.parser.XQueryTreeParser;
  import org.exist.xquery.value.Item;
  import org.exist.xquery.value.NodeValue;
***************
*** 152,159 ****
  		if(namespaces != null && namespaces.size() > 0) {
  			context.declareNamespaces(namespaces);
- //			for(Iterator i = namespaces.entrySet().iterator(); i.hasNext(); ) {
- //				Map.Entry entry = (Map.Entry)i.next();
- //				context.declareNamespace((String)entry.getKey(), (String)entry.getValue());
- //			}
  		}
  		LOG.debug("compiling " + xquery);
--- 152,155 ----
***************
*** 203,207 ****
  		context.setBaseURI(baseURI);
  		context.setStaticallyKnownDocuments(docs);
! 		
  		long start = System.currentTimeMillis();
  		Sequence result = expr.eval(contextSet, null);
--- 199,208 ----
  		context.setBaseURI(baseURI);
  		context.setStaticallyKnownDocuments(docs);
! 		Hashtable namespaces = (Hashtable)parameters.get(RpcAPI.NAMESPACES);
! 		if(namespaces != null && namespaces.size() > 0) {
! 			context.declareNamespaces(namespaces);
! 		}
! 		// set the current broker object when reusing a compiled query:
! 		context.setBroker(broker);
  		long start = System.currentTimeMillis();
  		Sequence result = expr.eval(contextSet, null);

[Exist-commits] eXist-1.0/src/org/exist/cocoon XQueryGenerator.java,1.10,1.11

[<wol...@us...>]

Update of /cvsroot/exist/eXist-1.0/src/org/exist/cocoon
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5368/src/org/exist/cocoon

Modified Files:
	XQueryGenerator.java 
Log Message:
Fixed some synchronization issues in the XQuery engine:

* Compiled XQuery expressions are no longer shared between 
different threads. The XQuery cache in XQueryServlet and
XQueryGenerator is declared as thread local now.

* The XQueryContext of a compiled XQuery now gets the correct
database broker object set.

Index: XQueryGenerator.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/cocoon/XQueryGenerator.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** XQueryGenerator.java	23 Feb 2004 09:36:11 -0000	1.10
--- XQueryGenerator.java	5 Mar 2004 11:15:28 -0000	1.11
***************
*** 86,90 ****
  	private String defaultPassword = null;
  	private Map optionalParameters;
! 	private Map cache = new HashMap();
  	private class CachedExpression {
  
--- 86,100 ----
  	private String defaultPassword = null;
  	private Map optionalParameters;
! 	
! 	private ThreadLocal cache = new ThreadLocal() {
! 		
! 		/* (non-Javadoc)
! 		 * @see java.lang.ThreadLocal#initialValue()
! 		 */
! 		protected Object initialValue() {
! 			return new HashMap();
! 		}
! 	};
! 	
  	private class CachedExpression {
  
***************
*** 207,212 ****
  			CompiledExpression expr;
  			CachedExpression cached;
! 			synchronized (cache) {
! 				cached = (CachedExpression) cache.get(uri);
  				if (cached != null) {
  					// check if source is valid or should be reloaded
--- 217,221 ----
  			CompiledExpression expr;
  			CachedExpression cached;
! 				cached = (CachedExpression) ((Map)cache.get()).get(uri);
  				if (cached != null) {
  					// check if source is valid or should be reloaded
***************
*** 216,220 ****
  								.getValidity());
  					if (valid != SourceValidity.VALID) {
! 						cache.remove(uri);
  						cached = null;
  					}
--- 225,229 ----
  								.getValidity());
  					if (valid != SourceValidity.VALID) {
! 						((Map)cache.get()).remove(uri);
  						cached = null;
  					}
***************
*** 225,232 ****
  					cached = new CachedExpression(inputSource.getValidity(),
  							expr);
! 					cache.put(uri, cached);
! 				} else
  					expr = cached.expr;
! 			}
  			ResourceSet result = service.execute(expr);
  			XMLResource resource;
--- 234,241 ----
  					cached = new CachedExpression(inputSource.getValidity(),
  							expr);
! 					((Map)cache.get()).put(uri, cached);
! 				} else {
  					expr = cached.expr;
! 				}
  			ResourceSet result = service.execute(expr);
  			XMLResource resource;

[Exist-commits] eXist-1.0/src/org/exist/http HttpServer.java,1.4,1.5

[<wol...@us...>]

Update of /cvsroot/exist/eXist-1.0/src/org/exist/http
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5368/src/org/exist/http

Modified Files:
	HttpServer.java 
Log Message:
Fixed some synchronization issues in the XQuery engine:

* Compiled XQuery expressions are no longer shared between 
different threads. The XQuery cache in XQueryServlet and
XQueryGenerator is declared as thread local now.

* The XQueryContext of a compiled XQuery now gets the correct
database broker object set.

Index: HttpServer.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/http/HttpServer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** HttpServer.java	29 Jan 2004 15:06:46 -0000	1.4
--- HttpServer.java	5 Mar 2004 11:15:28 -0000	1.5
***************
*** 235,239 ****
  
      private static void printNotice() {
!         System.out.println( "eXist version 0.9.2, Copyright (C) 2001 Wolfgang M. Meier" );
          System.out.println( "eXist comes with ABSOLUTELY NO WARRANTY." );
          System.out.println(
--- 235,239 ----
  
      private static void printNotice() {
!         System.out.println( "eXist version 1.0beta1, Copyright (C) 2001 Wolfgang M. Meier" );
          System.out.println( "eXist comes with ABSOLUTELY NO WARRANTY." );
          System.out.println(

[Exist-commits] eXist-1.0/src/org/exist/xquery/functions ExtFulltext.java,1.2,1.3

[<wol...@us...>]

Update of /cvsroot/exist/eXist-1.0/src/org/exist/xquery/functions
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1146/src/org/exist/xquery/functions

Modified Files:
	ExtFulltext.java 
Log Message:
Fixed REST server returning wrong result count.

Index: ExtFulltext.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/functions/ExtFulltext.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ExtFulltext.java	25 Feb 2004 15:31:58 -0000	1.2
--- ExtFulltext.java	4 Mar 2004 10:09:34 -0000	1.3
***************
*** 205,209 ****
  		if (terms == null)
  			throw new RuntimeException("no search terms");
- //		if(contextSet instanceof VirtualNodeSet) {
  			NodeSet hits[] = new NodeSet[terms.length];
  			for (int k = 0; k < terms.length; k++) {
--- 205,208 ----
***************
*** 224,246 ****
  			} else
  				return NodeSet.EMPTY_SET;
- //		} else {
- //			NodeSet result = null, hits;
- //			for (int k = 0; k < terms.length; k++) {
- //				hits =
- //					context.getBroker().getTextEngine().getNodesContaining(
- //						contextSet.getDocumentSet(),
- //						contextSet,
- //						terms[k]);
- //				if(hits != null) {
- //					if(result == null)
- //						result = hits;
- //					else if(type == Constants.FULLTEXT_AND)
- //						result = result.intersection(hits);
- //					else
- //						result.addAll(hits);
- //				}
- //			}
- //			return result == null ? NodeSet.EMPTY_SET : result;
- //		}
  	}
  
--- 223,226 ----

[Exist-commits] eXist-1.0/src/org/exist/dom ExtArrayNodeSet.java,1.11,1.12

[<wol...@us...>]

Update of /cvsroot/exist/eXist-1.0/src/org/exist/dom
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1146/src/org/exist/dom

Modified Files:
	ExtArrayNodeSet.java 
Log Message:
Fixed REST server returning wrong result count.

Index: ExtArrayNodeSet.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/dom/ExtArrayNodeSet.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** ExtArrayNodeSet.java	3 Mar 2004 09:45:06 -0000	1.11
--- ExtArrayNodeSet.java	4 Mar 2004 10:09:37 -0000	1.12
***************
*** 210,213 ****
--- 210,214 ----
  	 */
  	public int getLength() {
+ 		sort();	// sort to remove duplicates
  		return size;
  	}