[Exist-commits] eXist-1.0/src/org/exist/xquery/functions FunDoc.java,1.4,1.5 ExtDocument.java,1.4,1.5 ExtCollection.java,1.4,1.5

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

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

Modified Files:
	FunDoc.java ExtDocument.java ExtCollection.java 
Log Message:
Fixed some node kind tests.

Index: ExtDocument.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/functions/ExtDocument.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ExtDocument.java	2 Jun 2004 11:34:36 -0000	1.4
--- ExtDocument.java	23 Jun 2004 12:46:35 -0000	1.5
***************
*** 45,48 ****
--- 45,49 ----
  import org.exist.xquery.value.SequenceType;
  import org.exist.xquery.value.Type;
+ import org.w3c.dom.Node;
  
  /**
***************
*** 139,143 ****
  			    result = new ExtArrayNodeSet(docs.getLength(), 1);
  				for (Iterator i = docs.iterator(); i.hasNext();) {
! 					result.add(new NodeProxy((DocumentImpl) i.next(), -1));
  				}
  			}
--- 140,144 ----
  			    result = new ExtArrayNodeSet(docs.getLength(), 1);
  				for (Iterator i = docs.iterator(); i.hasNext();) {
! 					result.add(new NodeProxy((DocumentImpl) i.next(), -1, Node.DOCUMENT_NODE));
  				}
  			}

Index: FunDoc.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/functions/FunDoc.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FunDoc.java	2 Jun 2004 11:34:36 -0000	1.4
--- FunDoc.java	23 Jun 2004 12:46:35 -0000	1.5
***************
*** 39,42 ****
--- 39,43 ----
  import org.exist.xquery.value.SequenceType;
  import org.exist.xquery.value.Type;
+ import org.w3c.dom.Node;
  
  /**
***************
*** 114,118 ****
  		    dlock.acquire(Lock.READ_LOCK);
  			cachedPath = path;
! 			cachedNode = new NodeProxy(doc, -1);
  			return cachedNode;
  		} catch (PermissionDeniedException e) {
--- 115,119 ----
  		    dlock.acquire(Lock.READ_LOCK);
  			cachedPath = path;
! 			cachedNode = new NodeProxy(doc, -1, Node.DOCUMENT_NODE);
  			return cachedNode;
  		} catch (PermissionDeniedException e) {

Index: ExtCollection.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/functions/ExtCollection.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ExtCollection.java	2 Jun 2004 11:34:36 -0000	1.4
--- ExtCollection.java	23 Jun 2004 12:46:35 -0000	1.5
***************
*** 46,49 ****
--- 46,50 ----
  import org.exist.xquery.value.SequenceType;
  import org.exist.xquery.value.Type;
+ import org.w3c.dom.Node;
  
  /**
***************
*** 115,119 ****
  		    try {
  		        dlock.acquire(Lock.READ_LOCK);
! 		        result.add(new NodeProxy(doc, -1));
  		    } catch (LockException e) {
                  LOG.info("Could not acquire read lock on document " + doc.getFileName());
--- 116,120 ----
  		    try {
  		        dlock.acquire(Lock.READ_LOCK);
! 		        result.add(new NodeProxy(doc, -1, Node.DOCUMENT_NODE));
  		    } catch (LockException e) {
                  LOG.info("Could not acquire read lock on document " + doc.getFileName());