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

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

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

Modified Files:
	Union.java CombiningExpression.java 
Log Message:
Added copyResource method to DBBroker.

Index: Union.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/Union.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Union.java	25 May 2004 09:25:43 -0000	1.2
--- Union.java	21 Jun 2004 15:27:32 -0000	1.3
***************
*** 21,24 ****
--- 21,25 ----
  package org.exist.xquery;
  
+ import org.apache.log4j.Logger;
  import org.exist.dom.NodeSet;
  import org.exist.xquery.value.Item;
***************
*** 28,31 ****
--- 29,34 ----
  public class Union extends CombiningExpression {
  
+ 	private final static Logger LOG = Logger.getLogger(Union.class);
+ 	
      public Union(XQueryContext context, PathExpr left, PathExpr right) {
          super(context, left, right);
***************
*** 35,38 ****
--- 38,42 ----
  		Sequence lval = left.eval(contextSequence, contextItem);
  		Sequence rval = right.eval(contextSequence, contextItem);
+ 		long start = System.currentTimeMillis();
  		if(lval.getLength() == 0)
  		    return rval;
***************
*** 42,45 ****
--- 46,50 ----
  			throw new XPathException("union operand is not a node sequence");
          NodeSet result = lval.toNodeSet().union(rval.toNodeSet());
+         LOG.debug("Union took " + (System.currentTimeMillis() - start));
  		return result;
  	}

Index: CombiningExpression.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/CombiningExpression.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CombiningExpression.java	28 May 2004 10:54:13 -0000	1.2
--- CombiningExpression.java	21 Jun 2004 15:27:32 -0000	1.3
***************
*** 35,39 ****
  public abstract class CombiningExpression extends AbstractExpression {
  
! 	protected PathExpr left, right;
  	
  	/**
--- 35,40 ----
  public abstract class CombiningExpression extends AbstractExpression {
  
! 	protected PathExpr left;
! 	protected PathExpr right;
  	
  	/**