exist-commits Mailing List for eXist-db

Hi,

please check

http://wiki.exist-db.org:80/space/XQuery

This explains how to return only a distinct subset of the query results. User 
sessions can be supported by storing the result set to the HTTP session 
object. Please have a look at the supplied examples in webapp/xquery, 
especially biblio.xq.

Wolfgang

On Friday 28 May 2004 15:08, Hicham BOUSRAOU wrote:
> Hi:
>
> I have many files in database eXist -1200 XML files-.
>
> I want to create a xquery request witch bring me only
> the ten first results. In the next research i want get
> only  the ten next response,etc. I mean the system of
> pagination.
> Any suggestions please
> Regards;)

Hi:

I have many files in database eXist -1200 XML files-.

I want to=
 create a xquery request witch bring me only
the ten first results. In t=
he next research i want get
only  the ten next response,etc. I mean the =
system of
pagination.  
Any suggestions please
Regards;)

Update of /cvsroot/exist/eXist-1.0/.externalToolBuilders
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24065/.externalToolBuilders

Modified Files:
	Ant builder.launch 
Log Message:
Removing a document did not correctly remove all text tokens, so some index 
entries remained in the index. Fixed.

Index: Ant builder.launch
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/.externalToolBuilders/Ant builder.launch,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Ant builder.launch	1 Apr 2004 14:12:44 -0000	1.1
--- Ant builder.launch	28 May 2004 10:54:22 -0000	1.2
***************
*** 4,12 ****
  <booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
  <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
- <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.ui.antsupport.InternalAntRunner"/>
- <stringAttribute key="org.eclipse.jdt.launching.VM_INSTALL_TYPE_ID" value="org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType"/>
- <stringAttribute key="org.eclipse.jdt.launching.VM_INSTALL_NAME" value="j2sdk1.4.2"/>
  <stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,"/>
  <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx128M"/>
  <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/eXist-1.0/build.xml}"/>
  <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="/home/wolf/Devel/eXist/eXist-1.0"/>
--- 4,10 ----
  <booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
  <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
  <stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,"/>
  <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx128M"/>
+ <stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/eXist-1.0}"/>
  <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/eXist-1.0/build.xml}"/>
  <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="/home/wolf/Devel/eXist/eXist-1.0"/>

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

Modified Files:
	RequestParameterNames.java RequestModule.java 
	SetSessionAttribute.java RedirectTo.java CreateSession.java 
	SessionAttributes.java EncodeURL.java GetSessionAttribute.java 
	RequestURI.java 
Log Message:
Removing a document did not correctly remove all text tokens, so some index 
entries remained in the index. Fixed.

Index: RedirectTo.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/functions/request/RedirectTo.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RedirectTo.java	29 Jan 2004 15:06:45 -0000	1.1
--- RedirectTo.java	28 May 2004 10:54:20 -0000	1.2
***************
*** 60,64 ****
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xpath.BasicFunction#eval(org.exist.xpath.value.Sequence[], org.exist.xpath.value.Sequence)
  	 */
  	public Sequence eval(Sequence[] args, Sequence contextSequence)
--- 60,64 ----
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xquery.BasicFunction#eval(org.exist.xquery.value.Sequence[], org.exist.xquery.value.Sequence)
  	 */
  	public Sequence eval(Sequence[] args, Sequence contextSequence)

Index: RequestParameterNames.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/functions/request/RequestParameterNames.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RequestParameterNames.java	29 Jan 2004 15:06:45 -0000	1.1
--- RequestParameterNames.java	28 May 2004 10:54:20 -0000	1.2
***************
*** 64,68 ****
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xpath.BasicFunction#eval(org.exist.xpath.value.Sequence[], org.exist.xpath.value.Sequence)
  	 */
  	public Sequence eval(Sequence[] args, Sequence contextSequence)
--- 64,68 ----
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xquery.BasicFunction#eval(org.exist.xquery.value.Sequence[], org.exist.xquery.value.Sequence)
  	 */
  	public Sequence eval(Sequence[] args, Sequence contextSequence)

Index: SetSessionAttribute.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/functions/request/SetSessionAttribute.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SetSessionAttribute.java	29 Jan 2004 15:06:45 -0000	1.1
--- SetSessionAttribute.java	28 May 2004 10:54:20 -0000	1.2
***************
*** 57,61 ****
  	
  	/* (non-Javadoc)
! 	 * @see org.exist.xpath.Expression#eval(org.exist.dom.DocumentSet, org.exist.xpath.value.Sequence, org.exist.xpath.value.Item)
  	 */
  	public Sequence eval(
--- 57,61 ----
  	
  	/* (non-Javadoc)
! 	 * @see org.exist.xquery.Expression#eval(org.exist.dom.DocumentSet, org.exist.xquery.value.Sequence, org.exist.xquery.value.Item)
  	 */
  	public Sequence eval(

Index: EncodeURL.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/functions/request/EncodeURL.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** EncodeURL.java	29 Jan 2004 15:06:45 -0000	1.1
--- EncodeURL.java	28 May 2004 10:54:20 -0000	1.2
***************
*** 56,60 ****
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xpath.Function#eval(org.exist.dom.DocumentSet, org.exist.xpath.value.Sequence, org.exist.xpath.value.Item)
  	 */
  	public Sequence eval(
--- 56,60 ----
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xquery.Function#eval(org.exist.dom.DocumentSet, org.exist.xquery.value.Sequence, org.exist.xquery.value.Item)
  	 */
  	public Sequence eval(

Index: RequestModule.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/functions/request/RequestModule.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** RequestModule.java	13 May 2004 12:33:08 -0000	1.3
--- RequestModule.java	28 May 2004 10:54:20 -0000	1.4
***************
*** 59,63 ****
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xpath.Module#getNamespaceURI()
  	 */
  	public String getNamespaceURI() {
--- 59,63 ----
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xquery.Module#getNamespaceURI()
  	 */
  	public String getNamespaceURI() {
***************
*** 66,70 ****
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xpath.Module#getDefaultPrefix()
  	 */
  	public String getDefaultPrefix() {
--- 66,70 ----
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xquery.Module#getDefaultPrefix()
  	 */
  	public String getDefaultPrefix() {

Index: RequestURI.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/functions/request/RequestURI.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RequestURI.java	29 Jan 2004 15:06:45 -0000	1.1
--- RequestURI.java	28 May 2004 10:54:20 -0000	1.2
***************
*** 58,62 ****
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xpath.BasicFunction#eval(org.exist.xpath.value.Sequence[], org.exist.xpath.value.Sequence)
  	 */
  	public Sequence eval(Sequence[] args, Sequence contextSequence)
--- 58,62 ----
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xquery.BasicFunction#eval(org.exist.xquery.value.Sequence[], org.exist.xquery.value.Sequence)
  	 */
  	public Sequence eval(Sequence[] args, Sequence contextSequence)

Index: CreateSession.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/functions/request/CreateSession.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CreateSession.java	29 Jan 2004 15:06:45 -0000	1.1
--- CreateSession.java	28 May 2004 10:54:20 -0000	1.2
***************
*** 58,62 ****
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xpath.BasicFunction#eval(org.exist.xpath.value.Sequence[], org.exist.xpath.value.Sequence)
  	 */
  	public Sequence eval(Sequence[] args, Sequence contextSequence)
--- 58,62 ----
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xquery.BasicFunction#eval(org.exist.xquery.value.Sequence[], org.exist.xquery.value.Sequence)
  	 */
  	public Sequence eval(Sequence[] args, Sequence contextSequence)

Index: SessionAttributes.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/functions/request/SessionAttributes.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SessionAttributes.java	29 Jan 2004 15:06:45 -0000	1.1
--- SessionAttributes.java	28 May 2004 10:54:20 -0000	1.2
***************
*** 65,69 ****
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xpath.BasicFunction#eval(org.exist.xpath.value.Sequence[], org.exist.xpath.value.Sequence)
  	 */
  	public Sequence eval(Sequence[] args, Sequence contextSequence)
--- 65,69 ----
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xquery.BasicFunction#eval(org.exist.xquery.value.Sequence[], org.exist.xquery.value.Sequence)
  	 */
  	public Sequence eval(Sequence[] args, Sequence contextSequence)

Index: GetSessionAttribute.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/functions/request/GetSessionAttribute.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** GetSessionAttribute.java	16 Feb 2004 13:02:35 -0000	1.2
--- GetSessionAttribute.java	28 May 2004 10:54:20 -0000	1.3
***************
*** 61,65 ****
  	
  	/* (non-Javadoc)
! 	 * @see org.exist.xpath.Expression#eval(org.exist.dom.DocumentSet, org.exist.xpath.value.Sequence, org.exist.xpath.value.Item)
  	 */
  	public Sequence eval(
--- 61,65 ----
  	
  	/* (non-Javadoc)
! 	 * @see org.exist.xquery.Expression#eval(org.exist.dom.DocumentSet, org.exist.xquery.value.Sequence, org.exist.xquery.value.Item)
  	 */
  	public Sequence eval(

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

Modified Files:
	EvalFunction.java BuiltinFunctions.java ModuleImpl.java 
	DescribeFunction.java MD5.java 
Log Message:
Removing a document did not correctly remove all text tokens, so some index 
entries remained in the index. Fixed.

Index: MD5.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/functions/util/MD5.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MD5.java	29 Jan 2004 15:06:46 -0000	1.1
--- MD5.java	28 May 2004 10:54:21 -0000	1.2
***************
*** 56,60 ****
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xpath.Expression#eval(org.exist.dom.DocumentSet, org.exist.xpath.value.Sequence, org.exist.xpath.value.Item)
  	 */
  	public Sequence eval(
--- 56,60 ----
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xquery.Expression#eval(org.exist.dom.DocumentSet, org.exist.xquery.value.Sequence, org.exist.xquery.value.Item)
  	 */
  	public Sequence eval(

Index: BuiltinFunctions.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/functions/util/BuiltinFunctions.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** BuiltinFunctions.java	29 Jan 2004 15:06:46 -0000	1.1
--- BuiltinFunctions.java	28 May 2004 10:54:21 -0000	1.2
***************
*** 60,64 ****
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xpath.Expression#eval(org.exist.dom.DocumentSet, org.exist.xpath.value.Sequence, org.exist.xpath.value.Item)
  	 */
  	public Sequence eval(
--- 60,64 ----
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xquery.Expression#eval(org.exist.dom.DocumentSet, org.exist.xquery.value.Sequence, org.exist.xquery.value.Item)
  	 */
  	public Sequence eval(

Index: EvalFunction.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/functions/util/EvalFunction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** EvalFunction.java	17 May 2004 09:52:00 -0000	1.3
--- EvalFunction.java	28 May 2004 10:54:21 -0000	1.4
***************
*** 79,83 ****
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xpath.Expression#eval(org.exist.dom.DocumentSet, org.exist.xpath.value.Sequence, org.exist.xpath.value.Item)
  	 */
  	public Sequence eval(
--- 79,83 ----
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xquery.Expression#eval(org.exist.dom.DocumentSet, org.exist.xquery.value.Sequence, org.exist.xquery.value.Item)
  	 */
  	public Sequence eval(

Index: DescribeFunction.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/functions/util/DescribeFunction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DescribeFunction.java	16 Feb 2004 15:59:37 -0000	1.2
--- DescribeFunction.java	28 May 2004 10:54:21 -0000	1.3
***************
*** 61,65 ****
  	
  	/* (non-Javadoc)
! 	 * @see org.exist.xpath.Expression#eval(org.exist.dom.DocumentSet, org.exist.xpath.value.Sequence, org.exist.xpath.value.Item)
  	 */
  	public Sequence eval(
--- 61,65 ----
  	
  	/* (non-Javadoc)
! 	 * @see org.exist.xquery.Expression#eval(org.exist.dom.DocumentSet, org.exist.xquery.value.Sequence, org.exist.xquery.value.Item)
  	 */
  	public Sequence eval(

Index: ModuleImpl.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/functions/util/ModuleImpl.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ModuleImpl.java	17 May 2004 09:52:00 -0000	1.5
--- ModuleImpl.java	28 May 2004 10:54:21 -0000	1.6
***************
*** 52,56 ****
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xpath.Module#getNamespaceURI()
  	 */
  	public String getNamespaceURI() {
--- 52,56 ----
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xquery.Module#getNamespaceURI()
  	 */
  	public String getNamespaceURI() {
***************
*** 59,63 ****
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xpath.Module#getDefaultPrefix()
  	 */
  	public String getDefaultPrefix() {
--- 59,63 ----
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xquery.Module#getDefaultPrefix()
  	 */
  	public String getDefaultPrefix() {

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

Modified Files:
	BFile.java 
Log Message:
Removing a document did not correctly remove all text tokens, so some index 
entries remained in the index. Fixed.

Index: BFile.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/storage/store/BFile.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** BFile.java	17 May 2004 09:54:41 -0000	1.22
--- BFile.java	28 May 2004 10:54:20 -0000	1.23
***************
*** 400,404 ****
          try {
              final long p = findValue(key);
!             if (p == KEY_NOT_FOUND) return null;
              final long pnum = StorageAddress.pageFromPointer(p);
              final DataPage page = getDataPage(pnum);
--- 400,407 ----
          try {
              final long p = findValue(key);
!             if (p == KEY_NOT_FOUND) {
!                 LOG.debug("key not found");
!                 return null;
!             }
              final long pnum = StorageAddress.pageFromPointer(p);
              final DataPage page = getDataPage(pnum);

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

Modified Files:
	AVLTreeNodeSet.java TextSearchResult.java ArraySet.java 
	SortedNodeSet.java ElementImpl.java NodeProxy.java 
	ExtArrayNodeSet.java AbstractNodeSet.java 
Log Message:
Removing a document did not correctly remove all text tokens, so some index 
entries remained in the index. Fixed.

Index: AbstractNodeSet.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/dom/AbstractNodeSet.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** AbstractNodeSet.java	10 May 2004 11:22:39 -0000	1.15
--- AbstractNodeSet.java	28 May 2004 10:54:15 -0000	1.16
***************
*** 35,39 ****
  /**
   * Abstract base class for all node set implementations. A node set is a special type of sequence,
!  * which contains only nodes. Class NodeSet thus implements the {@link org.exist.xpath.value.Sequence} 
   * as well as the DOM {@link org.w3c.dom.NodeList} interfaces.
   * 
--- 35,39 ----
  /**
   * Abstract base class for all node set implementations. A node set is a special type of sequence,
!  * which contains only nodes. Class NodeSet thus implements the {@link org.exist.xquery.value.Sequence} 
   * as well as the DOM {@link org.w3c.dom.NodeList} interfaces.
   * 
***************
*** 58,72 ****
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xpath.value.Sequence#iterate()
  	 */
  	public abstract SequenceIterator iterate();
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xpath.value.Sequence#unorderedIterator()
  	 */
  	public abstract SequenceIterator unorderedIterator();
  	
  	/* (non-Javadoc)
! 	 * @see org.exist.xpath.value.Sequence#getItemType()
  	 */
  	public int getItemType() {
--- 58,72 ----
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xquery.value.Sequence#iterate()
  	 */
  	public abstract SequenceIterator iterate();
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xquery.value.Sequence#unorderedIterator()
  	 */
  	public abstract SequenceIterator unorderedIterator();
  	
  	/* (non-Javadoc)
! 	 * @see org.exist.xquery.value.Sequence#getItemType()
  	 */
  	public int getItemType() {

Index: ArraySet.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/dom/ArraySet.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** ArraySet.java	8 Mar 2004 11:21:21 -0000	1.30
--- ArraySet.java	28 May 2004 10:54:14 -0000	1.31
***************
*** 721,725 ****
  
  		/* (non-Javadoc)
! 		 * @see org.exist.xpath.value.SequenceIterator#nextItem()
  		 */
  		public Item nextItem() {
--- 721,725 ----
  
  		/* (non-Javadoc)
! 		 * @see org.exist.xquery.value.SequenceIterator#nextItem()
  		 */
  		public Item nextItem() {

Index: NodeProxy.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/dom/NodeProxy.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** NodeProxy.java	10 May 2004 11:22:39 -0000	1.29
--- NodeProxy.java	28 May 2004 10:54:15 -0000	1.30
***************
*** 51,55 ****
   * 
   * All sets of type NodeSet operate on NodeProxys. A node set is a special type of 
!  * sequence, so NodeProxy does also implement {@link org.exist.xpath.value.Item} and
   * can thus be an item in a sequence. Since, according to XPath 2, a single node is also 
   * a sequence, NodeProxy does itself extend NodeSet. It thus represents a node set containing
--- 51,55 ----
   * 
   * All sets of type NodeSet operate on NodeProxys. A node set is a special type of 
!  * sequence, so NodeProxy does also implement {@link org.exist.xquery.value.Item} and
   * can thus be an item in a sequence. Since, according to XPath 2, a single node is also 
   * a sequence, NodeProxy does itself extend NodeSet. It thus represents a node set containing
***************
*** 142,146 ****
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xpath.value.NodeValue#getImplementation()
  	 */
  	public int getImplementationType() {
--- 142,146 ----
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xquery.value.NodeValue#getImplementation()
  	 */
  	public int getImplementationType() {
***************
*** 437,441 ****
  	 * information is preserved through all following steps.
  	 * 
! 	 * To process the predicate expression, {@link org.exist.xpath.Predicate} will take the
  	 * context nodes returned by the filter expression and compare them to its context
  	 * node set.
--- 437,441 ----
  	 * information is preserved through all following steps.
  	 * 
! 	 * To process the predicate expression, {@link org.exist.xquery.Predicate} will take the
  	 * context nodes returned by the filter expression and compare them to its context
  	 * node set.
***************
*** 485,489 ****
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xpath.value.Item#getType()
  	 */
  	public int getType() {
--- 485,489 ----
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xquery.value.Item#getType()
  	 */
  	public int getType() {
***************
*** 505,509 ****
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xpath.value.Item#toSequence()
  	 */
  	public Sequence toSequence() {
--- 505,509 ----
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xquery.value.Item#toSequence()
  	 */
  	public Sequence toSequence() {
***************
*** 512,516 ****
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xpath.value.Item#getStringValue()
  	 */
  	public String getStringValue() {
--- 512,516 ----
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xquery.value.Item#getStringValue()
  	 */
  	public String getStringValue() {
***************
*** 519,523 ****
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xpath.value.Item#convertTo(int)
  	 */
  	public AtomicValue convertTo(int requiredType) throws XPathException {
--- 519,523 ----
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xquery.value.Item#convertTo(int)
  	 */
  	public AtomicValue convertTo(int requiredType) throws XPathException {
***************
*** 526,530 ****
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xpath.value.Item#atomize()
  	 */
  	public AtomicValue atomize() throws XPathException {
--- 526,530 ----
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xquery.value.Item#atomize()
  	 */
  	public AtomicValue atomize() throws XPathException {
***************
*** 551,555 ****
  	
  	/* (non-Javadoc)
! 	 * @see org.exist.xpath.value.Sequence#unorderedIterator()
  	 */
  	public SequenceIterator unorderedIterator() {
--- 551,555 ----
  	
  	/* (non-Javadoc)
! 	 * @see org.exist.xquery.value.Sequence#unorderedIterator()
  	 */
  	public SequenceIterator unorderedIterator() {
***************
*** 598,602 ****
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xpath.value.Sequence#itemAt(int)
  	 */
  	public Item itemAt(int pos) {
--- 598,602 ----
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xquery.value.Sequence#itemAt(int)
  	 */
  	public Item itemAt(int pos) {
***************
*** 644,648 ****
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xpath.value.Item#conversionPreference(java.lang.Class)
  	 */
  	public int conversionPreference(Class javaClass) {
--- 644,648 ----
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xquery.value.Item#conversionPreference(java.lang.Class)
  	 */
  	public int conversionPreference(Class javaClass) {
***************
*** 676,680 ****
  	
  	/* (non-Javadoc)
! 	 * @see org.exist.xpath.value.Item#toJavaObject(java.lang.Class)
  	 */
  	public Object toJavaObject(Class target) throws XPathException {
--- 676,680 ----
  	
  	/* (non-Javadoc)
! 	 * @see org.exist.xquery.value.Item#toJavaObject(java.lang.Class)
  	 */
  	public Object toJavaObject(Class target) throws XPathException {
***************
*** 717,721 ****
  
  		/* (non-Javadoc)
! 		 * @see org.exist.xpath.value.SequenceIterator#nextItem()
  		 */
  		public Item nextItem() {
--- 717,721 ----
  
  		/* (non-Javadoc)
! 		 * @see org.exist.xquery.value.SequenceIterator#nextItem()
  		 */
  		public Item nextItem() {

Index: TextSearchResult.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/dom/TextSearchResult.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TextSearchResult.java	29 Jan 2004 15:06:46 -0000	1.3
--- TextSearchResult.java	28 May 2004 10:54:14 -0000	1.4
***************
*** 214,218 ****
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xpath.value.Sequence#itemAt(int)
  	 */
  	public Item itemAt(int pos) {
--- 214,218 ----
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xquery.value.Sequence#itemAt(int)
  	 */
  	public Item itemAt(int pos) {

Index: ElementImpl.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/dom/ElementImpl.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** ElementImpl.java	10 May 2004 11:22:39 -0000	1.33
--- ElementImpl.java	28 May 2004 10:54:14 -0000	1.34
***************
*** 787,790 ****
--- 787,794 ----
  	}
  
+ 	public int getPrefixCount() {
+ 	    return namespaceMappings.size();
+ 	}
+ 	
  	public void toSAX(
  		ContentHandler contentHandler,

Index: AVLTreeNodeSet.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/dom/AVLTreeNodeSet.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** AVLTreeNodeSet.java	29 Jan 2004 15:06:46 -0000	1.5
--- AVLTreeNodeSet.java	28 May 2004 10:54:14 -0000	1.6
***************
*** 66,70 ****
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xpath.value.Sequence#itemAt(int)
  	 */
  	public Item itemAt(int pos) {
--- 66,70 ----
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xquery.value.Sequence#itemAt(int)
  	 */
  	public Item itemAt(int pos) {
***************
*** 417,421 ****
  
  		/* (non-Javadoc)
! 		 * @see org.exist.xpath.value.SequenceIterator#nextItem()
  		 */
  		public Item nextItem() {
--- 417,421 ----
  
  		/* (non-Javadoc)
! 		 * @see org.exist.xquery.value.SequenceIterator#nextItem()
  		 */
  		public Item nextItem() {

Index: ExtArrayNodeSet.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/dom/ExtArrayNodeSet.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** ExtArrayNodeSet.java	25 May 2004 09:26:12 -0000	1.18
--- ExtArrayNodeSet.java	28 May 2004 10:54:15 -0000	1.19
***************
*** 151,155 ****
  	 * (non-Javadoc)
  	 * 
! 	 * @see org.exist.xpath.value.Sequence#iterate()
  	 */
  	public SequenceIterator iterate() {
--- 151,155 ----
  	 * (non-Javadoc)
  	 * 
! 	 * @see org.exist.xquery.value.Sequence#iterate()
  	 */
  	public SequenceIterator iterate() {
***************
*** 211,215 ****
  	 * (non-Javadoc)
  	 * 
! 	 * @see org.exist.xpath.value.Sequence#getLength()
  	 */
  	public int getLength() {
--- 211,215 ----
  	 * (non-Javadoc)
  	 * 
! 	 * @see org.exist.xquery.value.Sequence#getLength()
  	 */
  	public int getLength() {
***************
*** 270,274 ****
  	 * (non-Javadoc)
  	 * 
! 	 * @see org.exist.xpath.value.Sequence#itemAt(int)
  	 */
  	public Item itemAt(int pos) {
--- 270,274 ----
  	 * (non-Javadoc)
  	 * 
! 	 * @see org.exist.xquery.value.Sequence#itemAt(int)
  	 */
  	public Item itemAt(int pos) {
***************
*** 342,346 ****
  	 * (non-Javadoc)
  	 * 
! 	 * @see org.exist.xpath.value.AbstractSequence#setSelfAsContext()
  	 */
  	public void setSelfAsContext() {
--- 342,346 ----
  	 * (non-Javadoc)
  	 * 
! 	 * @see org.exist.xquery.value.AbstractSequence#setSelfAsContext()
  	 */
  	public void setSelfAsContext() {
***************
*** 701,705 ****
  		 * (non-Javadoc)
  		 * 
! 		 * @see org.exist.xpath.value.SequenceIterator#nextItem()
  		 */
  		public Item nextItem() {
--- 701,705 ----
  		 * (non-Javadoc)
  		 * 
! 		 * @see org.exist.xquery.value.SequenceIterator#nextItem()
  		 */
  		public Item nextItem() {

Index: SortedNodeSet.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/dom/SortedNodeSet.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** SortedNodeSet.java	29 Jan 2004 15:06:46 -0000	1.18
--- SortedNodeSet.java	28 May 2004 10:54:14 -0000	1.19
***************
*** 194,198 ****
  
  		/* (non-Javadoc)
! 		 * @see org.exist.xpath.value.SequenceIterator#nextItem()
  		 */
  		public Item nextItem() {
--- 194,198 ----
  
  		/* (non-Javadoc)
! 		 * @see org.exist.xquery.value.SequenceIterator#nextItem()
  		 */
  		public Item nextItem() {

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

Modified Files:
	Indexer.java 
Log Message:
Removing a document did not correctly remove all text tokens, so some index 
entries remained in the index. Fixed.

Index: Indexer.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/Indexer.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Indexer.java	10 May 2004 11:22:52 -0000	1.8
--- Indexer.java	28 May 2004 10:54:17 -0000	1.9
***************
*** 247,256 ****
  			} else {
  				document.setOwnerDocument(document);
! 				if (broker.getDatabaseType() == DBBroker.DBM
! 					|| broker.getDatabaseType() == DBBroker.NATIVE) {
! 					if (last.getChildCount() > 0)
! 						broker.update(last);
! 				} else
! 					broker.store(last, currentPath);
  			}
  			level--;
--- 247,252 ----
  			} else {
  				document.setOwnerDocument(document);
! 				if (last.getChildCount() > 0)
! 					broker.update(last);
  			}
  			level--;

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

Modified Files:
	DocumentImpl.java NodeImpl.java MemTreeBuilder.java 
Log Message:
Removing a document did not correctly remove all text tokens, so some index 
entries remained in the index. Fixed.

Index: NodeImpl.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/memtree/NodeImpl.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** NodeImpl.java	3 May 2004 13:08:43 -0000	1.13
--- NodeImpl.java	28 May 2004 10:54:11 -0000	1.14
***************
*** 63,67 ****
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xpath.value.NodeValue#getImplementation()
  	 */
  	public int getImplementationType() {
--- 63,67 ----
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xquery.value.NodeValue#getImplementation()
  	 */
  	public int getImplementationType() {
***************
*** 70,74 ****
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xpath.value.NodeValue#getNode()
  	 */
  	public Node getNode() {
--- 70,74 ----
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xquery.value.NodeValue#getNode()
  	 */
  	public Node getNode() {
***************
*** 160,164 ****
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xpath.value.NodeValue#equals(org.exist.xpath.value.NodeValue)
  	 */
  	public boolean equals(NodeValue other) throws XPathException {
--- 160,164 ----
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xquery.value.NodeValue#equals(org.exist.xquery.value.NodeValue)
  	 */
  	public boolean equals(NodeValue other) throws XPathException {
***************
*** 169,173 ****
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xpath.value.NodeValue#after(org.exist.xpath.value.NodeValue)
  	 */
  	public boolean after(NodeValue other) throws XPathException {
--- 169,173 ----
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xquery.value.NodeValue#after(org.exist.xquery.value.NodeValue)
  	 */
  	public boolean after(NodeValue other) throws XPathException {
***************
*** 178,182 ****
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xpath.value.NodeValue#before(org.exist.xpath.value.NodeValue)
  	 */
  	public boolean before(NodeValue other) throws XPathException {
--- 178,182 ----
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xquery.value.NodeValue#before(org.exist.xquery.value.NodeValue)
  	 */
  	public boolean before(NodeValue other) throws XPathException {
***************
*** 238,241 ****
--- 238,245 ----
  	}
  
+ 	public DocumentImpl getDocument() {
+ 	    return document;
+ 	}
+ 	
  	/* (non-Javadoc)
  	 * @see org.w3c.dom.Node#insertBefore(org.w3c.dom.Node, org.w3c.dom.Node)
***************
*** 341,345 ****
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xpath.value.Item#getType()
  	 */
  	public int getType() {
--- 345,349 ----
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xquery.value.Item#getType()
  	 */
  	public int getType() {
***************
*** 364,368 ****
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xpath.value.Item#getStringValue()
  	 */
  	public String getStringValue() {
--- 368,372 ----
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xquery.value.Item#getStringValue()
  	 */
  	public String getStringValue() {
***************
*** 385,389 ****
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xpath.value.Item#toSequence()
  	 */
  	public Sequence toSequence() {
--- 389,393 ----
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xquery.value.Item#toSequence()
  	 */
  	public Sequence toSequence() {
***************
*** 392,396 ****
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xpath.value.Item#convertTo(int)
  	 */
  	public AtomicValue convertTo(int requiredType) throws XPathException {
--- 396,400 ----
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xquery.value.Item#convertTo(int)
  	 */
  	public AtomicValue convertTo(int requiredType) throws XPathException {
***************
*** 399,403 ****
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xpath.value.Item#atomize()
  	 */
  	public AtomicValue atomize() throws XPathException {
--- 403,407 ----
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xquery.value.Item#atomize()
  	 */
  	public AtomicValue atomize() throws XPathException {
***************
*** 410,414 ****
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xpath.value.Sequence#add(org.exist.xpath.value.Item)
  	 */
  	public void add(Item item) throws XPathException {
--- 414,418 ----
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xquery.value.Sequence#add(org.exist.xquery.value.Item)
  	 */
  	public void add(Item item) throws XPathException {
***************
*** 416,420 ****
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xpath.value.Sequence#addAll(org.exist.xpath.value.Sequence)
  	 */
  	public void addAll(Sequence other) throws XPathException {
--- 420,424 ----
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xquery.value.Sequence#addAll(org.exist.xquery.value.Sequence)
  	 */
  	public void addAll(Sequence other) throws XPathException {
***************
*** 422,426 ****
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xpath.value.Sequence#getItemType()
  	 */
  	public int getItemType() {
--- 426,430 ----
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xquery.value.Sequence#getItemType()
  	 */
  	public int getItemType() {
***************
*** 429,433 ****
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xpath.value.Sequence#iterate()
  	 */
  	public SequenceIterator iterate() {
--- 433,437 ----
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xquery.value.Sequence#iterate()
  	 */
  	public SequenceIterator iterate() {
***************
*** 436,440 ****
  	
  	/* (non-Javadoc)
! 	 * @see org.exist.xpath.value.Sequence#unorderedIterator()
  	 */
  	public SequenceIterator unorderedIterator() {
--- 440,444 ----
  	
  	/* (non-Javadoc)
! 	 * @see org.exist.xquery.value.Sequence#unorderedIterator()
  	 */
  	public SequenceIterator unorderedIterator() {
***************
*** 443,447 ****
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xpath.value.Sequence#getLength()
  	 */
  	public int getLength() {
--- 447,451 ----
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xquery.value.Sequence#getLength()
  	 */
  	public int getLength() {
***************
*** 458,462 ****
  	
  	/* (non-Javadoc)
! 	 * @see org.exist.xpath.value.Sequence#itemAt(int)
  	 */
  	public Item itemAt(int pos) {
--- 462,466 ----
  	
  	/* (non-Javadoc)
! 	 * @see org.exist.xquery.value.Sequence#itemAt(int)
  	 */
  	public Item itemAt(int pos) {
***************
*** 465,469 ****
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xpath.value.Sequence#effectiveBooleanValue()
  	 */
  	public boolean effectiveBooleanValue() throws XPathException {
--- 469,473 ----
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xquery.value.Sequence#effectiveBooleanValue()
  	 */
  	public boolean effectiveBooleanValue() throws XPathException {
***************
*** 472,476 ****
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xpath.value.Sequence#toNodeSet()
  	 */
  	public NodeSet toNodeSet() throws XPathException {
--- 476,480 ----
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xquery.value.Sequence#toNodeSet()
  	 */
  	public NodeSet toNodeSet() throws XPathException {
***************
*** 487,491 ****
  
  		/* (non-Javadoc)
! 		 * @see org.exist.xpath.value.SequenceIterator#hasNext()
  		 */
  		public boolean hasNext() {
--- 491,495 ----
  
  		/* (non-Javadoc)
! 		 * @see org.exist.xquery.value.SequenceIterator#hasNext()
  		 */
  		public boolean hasNext() {
***************
*** 494,498 ****
  
  		/* (non-Javadoc)
! 		 * @see org.exist.xpath.value.SequenceIterator#nextItem()
  		 */
  		public Item nextItem() {
--- 498,502 ----
  
  		/* (non-Javadoc)
! 		 * @see org.exist.xquery.value.SequenceIterator#nextItem()
  		 */
  		public Item nextItem() {
***************
*** 505,509 ****
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xpath.value.Item#toSAX(org.exist.storage.DBBroker, org.xml.sax.ContentHandler)
  	 */
  	public void toSAX(DBBroker broker, ContentHandler handler) throws SAXException {
--- 509,513 ----
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xquery.value.Item#toSAX(org.exist.storage.DBBroker, org.xml.sax.ContentHandler)
  	 */
  	public void toSAX(DBBroker broker, ContentHandler handler) throws SAXException {
***************
*** 530,534 ****
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xpath.value.Item#conversionPreference(java.lang.Class)
  	 */
  	public int conversionPreference(Class javaClass) {
--- 534,538 ----
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xquery.value.Item#conversionPreference(java.lang.Class)
  	 */
  	public int conversionPreference(Class javaClass) {
***************
*** 562,566 ****
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xpath.value.Item#toJavaObject(java.lang.Class)
  	 */
  	public Object toJavaObject(Class target) throws XPathException {
--- 566,570 ----
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xquery.value.Item#toJavaObject(java.lang.Class)
  	 */
  	public Object toJavaObject(Class target) throws XPathException {
***************
*** 578,582 ****
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xpath.value.Sequence#setSelfAsContext()
  	 */
  	public void setSelfAsContext() {
--- 582,586 ----
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xquery.value.Sequence#setSelfAsContext()
  	 */
  	public void setSelfAsContext() {

Index: DocumentImpl.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/memtree/DocumentImpl.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** DocumentImpl.java	17 May 2004 09:59:41 -0000	1.8
--- DocumentImpl.java	28 May 2004 10:54:11 -0000	1.9
***************
*** 31,34 ****
--- 31,35 ----
  import org.w3c.dom.DOMException;
  import org.w3c.dom.DOMImplementation;
+ import org.w3c.dom.Document;
  import org.w3c.dom.DocumentFragment;
  import org.w3c.dom.DocumentType;
***************
*** 39,43 ****
  import org.w3c.dom.ProcessingInstruction;
  import org.w3c.dom.Text;
- import org.w3c.dom.Document;
  import org.xml.sax.SAXException;
  
--- 40,43 ----
***************
*** 88,92 ****
  
      protected int nextRef = 0;
! 
      private final static int NODE_SIZE = 128;
      private final static int ATTR_SIZE = 64;
--- 88,92 ----
  
      protected int nextRef = 0;
!     
      private final static int NODE_SIZE = 128;
      private final static int ATTR_SIZE = 64;
***************
*** 195,199 ****
          return size - 1;
      }
! 
      private void grow() {
          int newSize = (size * 3) / 2;
--- 195,199 ----
          return size - 1;
      }
!     
      private void grow() {
          int newSize = (size * 3) / 2;

Index: MemTreeBuilder.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/memtree/MemTreeBuilder.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** MemTreeBuilder.java	17 May 2004 09:59:41 -0000	1.9
--- MemTreeBuilder.java	28 May 2004 10:54:11 -0000	1.10
***************
*** 28,32 ****
  import org.exist.dom.QName;
  import org.exist.xquery.XQueryContext;
- import org.w3c.dom.Document;
  import org.w3c.dom.Node;
  import org.xml.sax.Attributes;
--- 28,31 ----

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

Modified Files:
	SimpleTokenizer.java 
Log Message:
Removing a document did not correctly remove all text tokens, so some index 
entries remained in the index. Fixed.

Index: SimpleTokenizer.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/storage/analysis/SimpleTokenizer.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** SimpleTokenizer.java	14 Apr 2004 12:17:23 -0000	1.8
--- SimpleTokenizer.java	28 May 2004 10:54:14 -0000	1.9
***************
*** 54,58 ****
  				}
  				break;
! 			} else if (Character.isLetter(ch) || nonBreakingChar(ch) || (allowWildcards && isWildcard(ch))) {
  				token.consumeNext();
  				consume();
--- 54,58 ----
  				}
  				break;
! 			} else if (Character.isLetter(ch) || is_mark(ch) || nonBreakingChar(ch) || (allowWildcards && isWildcard(ch))) {
  				token.consumeNext();
  				consume();
***************
*** 119,123 ****
  		if (ch == (char) - 1)
  			return eof();
! 		if (Character.isLetter(ch) || nonBreakingChar(ch)
  			|| singleCharToken(ch) 
  			|| (wildcards && isWildcard(ch))) {
--- 119,123 ----
  		if (ch == (char) - 1)
  			return eof();
! 		if (Character.isLetter(ch) || is_mark(ch) || nonBreakingChar(ch)
  			|| singleCharToken(ch) 
  			|| (wildcards && isWildcard(ch))) {
***************
*** 341,344 ****
--- 341,348 ----
  	}
  	
+ 	private final boolean is_mark(char ch) {
+         return (ch > '\u093d' && ch < '\u094c');
+     }
+ 	
  	public static void main(String args[]) {
  		String t1 = "\u30A8\u30FB\u31A1\uACFF\u2FAA\u312A\u3045";

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

Modified Files:
	RemoteIndexQueryService.java IndexQueryService.java 
	LocalIndexQueryService.java 
Log Message:
Removing a document did not correctly remove all text tokens, so some index 
entries remained in the index. Fixed.

Index: LocalIndexQueryService.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xmldb/LocalIndexQueryService.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** LocalIndexQueryService.java	3 May 2004 12:58:11 -0000	1.5
--- LocalIndexQueryService.java	28 May 2004 10:54:13 -0000	1.6
***************
*** 26,29 ****
--- 26,48 ----
  	}
  
+ 	
+     /* (non-Javadoc)
+      * @see org.exist.xmldb.IndexQueryService#reindexCollection()
+      */
+     public void reindexCollection() throws XMLDBException {
+         DBBroker broker = null;
+         try {
+             broker = pool.get(user);
+             broker.reindex(parent.getCollection().getName());
+             broker.sync();
+         } catch (PermissionDeniedException e) {
+             throw new XMLDBException(ErrorCodes.PERMISSION_DENIED, e.getMessage(), e);
+         } catch (EXistException e) {
+             throw new XMLDBException(ErrorCodes.VENDOR_ERROR, e.getMessage(), e);
+         } finally {
+             pool.release(broker);
+         }
+     }
+     
  	/* (non-Javadoc)
  	 * @see org.exist.xmldb.IndexQueryService#getIndexedElements(boolean)

Index: IndexQueryService.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xmldb/IndexQueryService.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** IndexQueryService.java	11 Mar 2003 08:31:14 -0000	1.1
--- IndexQueryService.java	28 May 2004 10:54:13 -0000	1.2
***************
*** 7,10 ****
--- 7,12 ----
  public interface IndexQueryService extends Service {
  
+     public void reindexCollection() throws XMLDBException;
+     
  	public Occurrences[] getIndexedElements(boolean inclusive) throws XMLDBException;
  	

Index: RemoteIndexQueryService.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xmldb/RemoteIndexQueryService.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** RemoteIndexQueryService.java	14 Apr 2004 12:17:22 -0000	1.4
--- RemoteIndexQueryService.java	28 May 2004 10:54:13 -0000	1.5
***************
*** 33,36 ****
--- 33,44 ----
  	}
  
+ 	
+     /* (non-Javadoc)
+      * @see org.exist.xmldb.IndexQueryService#reindexCollection()
+      */
+     public void reindexCollection() throws XMLDBException {
+         throw new XMLDBException(ErrorCodes.NOT_IMPLEMENTED);
+     }
+     
  	/* (non-Javadoc)
  	 * @see org.exist.xmldb.IndexQueryService#getIndexedElements(boolean)

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

Modified Files:
	.classpath build.xml .project build.properties 
Log Message:
Removing a document did not correctly remove all text tokens, so some index 
entries remained in the index. Fixed.

Index: .project
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/.project,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** .project	1 Apr 2004 14:12:45 -0000	1.3
--- .project	28 May 2004 10:54:12 -0000	1.4
***************
*** 16,26 ****
  		</buildCommand>
  		<buildCommand>
! 			<name>org.eclipse.jdt.core.javabuilder</name>
  			<arguments>
  			</arguments>
  		</buildCommand>
  		<buildCommand>
! 			<name>org.antlr.eclipse.core.antlrbuilder</name>
  			<arguments>
  			</arguments>
  		</buildCommand>
--- 16,34 ----
  		</buildCommand>
  		<buildCommand>
! 			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
  			<arguments>
+ 				<dictionary>
+ 					<key>LaunchConfigHandle</key>
+ 					<value>org.eclipse.jdt.core.javabuilder.launch</value>
+ 				</dictionary>
  			</arguments>
  		</buildCommand>
  		<buildCommand>
! 			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
  			<arguments>
+ 				<dictionary>
+ 					<key>LaunchConfigHandle</key>
+ 					<value>org.antlr.eclipse.core.antlrbuilder.launch</value>
+ 				</dictionary>
  			</arguments>
  		</buildCommand>

Index: build.xml
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/build.xml,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** build.xml	25 May 2004 09:25:45 -0000	1.49
--- build.xml	28 May 2004 10:54:12 -0000	1.50
***************
*** 227,245 ****
      </target>
  
- 	<target name="standalone" depends="jar">
- 		<echo message="Creating exist-standalone.jar ..."/>
- 		<jar basedir="${build.classes}" compress="true" 
- 			jarfile="exist-standalone.jar">
-        		<exclude name="org/exist/start/**"/>
-             <exclude name="org/exist/soap/**"/>
-             <exclude name="org/exist/ant/**"/>
-             <exclude name="org/exist/http/servlets/**"/>
-             <exclude name="org/exist/xquery/functions/request/**"/>
-             <exclude name="org/exist/cocoon/**"/>
- 			<exclude name="org/exist/*.xsl"/>
- 			<exclude name="org/exist/client/**"/>
- 			<exclude name="org/exist/backup/**"/>
- 		</jar>
- 	</target>
      <!-- ================================================================== -->
      <!-- Build all                                                                                                                                        -->
--- 227,230 ----

Index: build.properties
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/build.properties,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** build.properties	25 May 2004 09:25:45 -0000	1.21
--- build.properties	28 May 2004 10:54:12 -0000	1.22
***************
*** 1,4 ****
  project.name = eXist
! project.version = 20040521
  
  # build settings
--- 1,4 ----
  project.name = eXist
! project.version = 1.0-dev
  
  # build settings

Index: .classpath
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/.classpath,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** .classpath	17 May 2004 09:59:42 -0000	1.20
--- .classpath	28 May 2004 10:54:11 -0000	1.21
***************
*** 59,66 ****
  	<classpathentry kind="lib" path="lib/optional/excalibur-component-20040122.jar"/>
  	<classpathentry kind="lib" path="lib/optional/excalibur-store-1.0-dev-20040206.jar"/>
- 	<classpathentry kind="lib" path="lib/optional/javacApi-0.9.jar"/>
- 	<classpathentry kind="lib" path="lib/optional/javacImpl-0.9.jar"/>
  	<classpathentry kind="lib" path="lib/optional/jdtcore-2.1.0.jar"/>
  	<classpathentry kind="lib" path="lib/optional/xml-commons-resolver-1.1.jar"/>
  	<classpathentry kind="output" path="build/classes"/>
  </classpath>
--- 59,66 ----
  	<classpathentry kind="lib" path="lib/optional/excalibur-component-20040122.jar"/>
  	<classpathentry kind="lib" path="lib/optional/excalibur-store-1.0-dev-20040206.jar"/>
  	<classpathentry kind="lib" path="lib/optional/jdtcore-2.1.0.jar"/>
  	<classpathentry kind="lib" path="lib/optional/xml-commons-resolver-1.1.jar"/>
+ 	<classpathentry kind="lib" path="/home/wolf/Java/jakarta-tomcat-5.0.19/common/lib/jmx.jar"/>
+ 	<classpathentry kind="lib" path="/home/wolf/Java/jakarta-tomcat-5.0.19/common/lib/catalina.jar"/>
  	<classpathentry kind="output" path="build/classes"/>
  </classpath>

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

Modified Files:
	AllTests.java 
Log Message:
Removing a document did not correctly remove all text tokens, so some index 
entries remained in the index. Fixed.

Index: AllTests.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/test/AllTests.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AllTests.java	29 Jan 2004 15:06:42 -0000	1.1
--- AllTests.java	28 May 2004 10:54:24 -0000	1.2
***************
*** 36,40 ****
  
  	public static Test suite() {
! 		TestSuite suite = new TestSuite("Test for org.exist.xpath.test");
  		//$JUnit-BEGIN$
  		suite.addTestSuite(LexerTest.class);
--- 36,40 ----
  
  	public static Test suite() {
! 		TestSuite suite = new TestSuite("Test for org.exist.xquery.test");
  		//$JUnit-BEGIN$
  		suite.addTestSuite(LexerTest.class);

Update of /cvsroot/exist/eXist-1.0/installer
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24065/installer

Modified Files:
	install.xml install.xml.tmpl 
Log Message:
Removing a document did not correctly remove all text tokens, so some index 
entries remained in the index. Fixed.

Index: install.xml
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/installer/install.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** install.xml	25 May 2004 09:26:13 -0000	1.15
--- install.xml	28 May 2004 10:54:25 -0000	1.16
***************
*** 47,52 ****
                  <include name="examples.jar"/>
                  <include name="examples-setup.xml"/>
!                 <include name="Jetty*/"/>
!                 <include name="Jetty*/logs/"/>
              	<include name="lib/"/>
              	<include name="samples/**"/>
--- 47,51 ----
                  <include name="examples.jar"/>
                  <include name="examples-setup.xml"/>
!                 <include name="Jetty*/**"/>
              	<include name="lib/"/>
              	<include name="samples/**"/>

Index: install.xml.tmpl
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/installer/install.xml.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** install.xml.tmpl	25 May 2004 09:26:13 -0000	1.1
--- install.xml.tmpl	28 May 2004 10:54:25 -0000	1.2
***************
*** 47,52 ****
                  <include name="examples.jar"/>
                  <include name="examples-setup.xml"/>
!                 <include name="Jetty*/"/>
!                 <include name="Jetty*/logs/"/>
              	<include name="lib/"/>
              	<include name="samples/**"/>
--- 47,51 ----
                  <include name="examples.jar"/>
                  <include name="examples-setup.xml"/>
!                 <include name="Jetty*/**"/>
              	<include name="lib/"/>
              	<include name="samples/**"/>

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

Modified Files:
	sitemap.xmap 
Log Message:
Removing a document did not correctly remove all text tokens, so some index 
entries remained in the index. Fixed.

Index: sitemap.xmap
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/webapp/xquery/sitemap.xmap,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** sitemap.xmap	25 May 2004 09:26:09 -0000	1.14
--- sitemap.xmap	28 May 2004 10:54:23 -0000	1.15
***************
*** 47,51 ****
              <map:match pattern="process.xq">
  				<map:generate src="process.xq" type="xquery">
- 					<map:parameter name="expand-xincludes" value="true"/>
  				</map:generate>
                  <map:transform type="xinclude"/>
--- 47,50 ----

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

Modified Files:
	ModuleImpl.java Transform.java 
Log Message:
Removing a document did not correctly remove all text tokens, so some index 
entries remained in the index. Fixed.

Index: Transform.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/functions/transform/Transform.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Transform.java	23 Apr 2004 13:07:48 -0000	1.6
--- Transform.java	28 May 2004 10:54:23 -0000	1.7
***************
*** 98,102 ****
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xpath.BasicFunction#eval(org.exist.xpath.value.Sequence[], org.exist.xpath.value.Sequence)
  	 */
  	public Sequence eval(Sequence[] args, Sequence contextSequence) throws XPathException {
--- 98,102 ----
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xquery.BasicFunction#eval(org.exist.xquery.value.Sequence[], org.exist.xquery.value.Sequence)
  	 */
  	public Sequence eval(Sequence[] args, Sequence contextSequence) throws XPathException {

Index: ModuleImpl.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/functions/transform/ModuleImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ModuleImpl.java	29 Jan 2004 15:06:48 -0000	1.1
--- ModuleImpl.java	28 May 2004 10:54:23 -0000	1.2
***************
*** 44,48 ****
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xpath.Module#getNamespaceURI()
  	 */
  	public String getNamespaceURI() {
--- 44,48 ----
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xquery.Module#getNamespaceURI()
  	 */
  	public String getNamespaceURI() {
***************
*** 51,55 ****
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xpath.Module#getDefaultPrefix()
  	 */
  	public String getDefaultPrefix() {
--- 51,55 ----
  
  	/* (non-Javadoc)
! 	 * @see org.exist.xquery.Module#getDefaultPrefix()
  	 */
  	public String getDefaultPrefix() {

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

Modified Files:
	CompareDocuments.java XUpdateTest.java 
Log Message:
Removing a document did not correctly remove all text tokens, so some index 
entries remained in the index. Fixed.

Index: CompareDocuments.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xupdate/test/CompareDocuments.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CompareDocuments.java	29 Oct 2003 14:47:06 -0000	1.2
--- CompareDocuments.java	28 May 2004 10:54:22 -0000	1.3
***************
*** 86,90 ****
                  default:
              }
!             System.err.print(node1 + "[" + node1.getNodeType() + "] <==> "); 
              switch (node2.getNodeType()) {
                  case Node.ATTRIBUTE_NODE:
--- 86,90 ----
                  default:
              }
!             System.err.print(node1 + "[" + node1.getChildNodes().getLength() + "] <==> "); 
              switch (node2.getNodeType()) {
                  case Node.ATTRIBUTE_NODE:
***************
*** 92,96 ****
                  default:
              }
!             System.err.println(node2 + "[" + node2.getNodeType() + "]");
          }
          if (node1.getNodeType()!=node2.getNodeType()) {
--- 92,96 ----
                  default:
              }
!             System.err.println(node2 + "[" + node2.getChildNodes().getLength() + "]");
          }
          if (node1.getNodeType()!=node2.getNodeType()) {
***************
*** 129,133 ****
          NodeList list2 = node2.getChildNodes();
          if (list1.getLength()!=list2.getLength()) {
!             throw new Exception("different child node counts(" +
                      list1.getLength() + "!=" + list2.getLength() + ")...");
          }
--- 129,133 ----
          NodeList list2 = node2.getChildNodes();
          if (list1.getLength()!=list2.getLength()) {
!             throw new Exception("different child node counts for node " + node1.getNodeName() + " (" +
                      list1.getLength() + "!=" + list2.getLength() + ")...");
          }

Index: XUpdateTest.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xupdate/test/XUpdateTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** XUpdateTest.java	2 Sep 2003 13:20:14 -0000	1.3
--- XUpdateTest.java	28 May 2004 10:54:22 -0000	1.4
***************
*** 93,96 ****
--- 93,97 ----
          
  		//compare
+ 		System.out.println("\n");
          new CompareDocuments().compare(referenceXML, xupdateResult);
          

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

Modified Files:
	NativeBroker.java 
Log Message:
WebDAV MOVE now includes sub collections.

Index: NativeBroker.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/storage/NativeBroker.java,v
retrieving revision 1.74
retrieving revision 1.75
diff -C2 -d -r1.74 -r1.75
*** NativeBroker.java	25 May 2004 12:57:13 -0000	1.74
--- NativeBroker.java	25 May 2004 13:21:09 -0000	1.75
***************
*** 1878,1882 ****
  	        String name = collection.getName();
  	        Collection parent = collection.getParent(this);
! 	        parent.removeCollection(name.substring(name.lastIndexOf("/") + 1));
  		    
  	        collectionsDb.getCollectionCache().remove(collection);
--- 1878,1883 ----
  	        String name = collection.getName();
  	        Collection parent = collection.getParent(this);
! 	        if(parent != null)
! 	            parent.removeCollection(name.substring(name.lastIndexOf("/") + 1));
  		    
  	        collectionsDb.getCollectionCache().remove(collection);
***************
*** 1889,1902 ****
  			collectionsDb.remove(key);
  			
! 			name = destination.getName() + '/' + newName;
! 		    collection.setName(name);
  		    collection.setCreationTime(System.currentTimeMillis());
  		    collection.correctResourcePaths();
  		    
  		    destination.addCollection(collection);
! 		    saveCollection(parent);
  		    if(parent != destination)
  		        saveCollection(destination);
  		    saveCollection(collection);
  	    } catch (ReadOnlyException e) {
              throw new PermissionDeniedException(DATABASE_IS_READ_ONLY);
--- 1890,1914 ----
  			collectionsDb.remove(key);
  			
! 		    collection.setName(destination.getName() + '/' + newName);
  		    collection.setCreationTime(System.currentTimeMillis());
  		    collection.correctResourcePaths();
  		    
  		    destination.addCollection(collection);
! 		    if(parent != null)
! 		        saveCollection(parent);
  		    if(parent != destination)
  		        saveCollection(destination);
  		    saveCollection(collection);
+ 		    
+ 		    String childName;
+ 		    Collection child;
+ 		    for(Iterator i = collection.collectionIterator(); i.hasNext(); ) {
+ 		        childName = (String)i.next();
+ 		        child = getCollection(name + '/' + childName);
+ 		        if(child == null)
+ 		            LOG.warn("Child collection " + childName + " not found");
+ 		        else
+ 		            moveCollection(child, collection, childName);
+ 		    }
  	    } catch (ReadOnlyException e) {
              throw new PermissionDeniedException(DATABASE_IS_READ_ONLY);

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

Modified Files:
	XMLDBStoreTask.java 
Log Message:
Added Darren's fix for XMLDBStoreTask.

Index: XMLDBStoreTask.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/ant/XMLDBStoreTask.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** XMLDBStoreTask.java	29 Jan 2004 15:06:50 -0000	1.2
--- XMLDBStoreTask.java	25 May 2004 13:00:54 -0000	1.3
***************
*** 104,108 ****
  						prevDir = relDir;
  					}
! 				}
  				resourceType = type.equals("binary") ? "BinaryResource" : "XMLResource";
  				res = collection.createResource(file.getName(), resourceType);
--- 104,109 ----
  						prevDir = relDir;
  					}
! 				} else
! 				    collection = root;
  				resourceType = type.equals("binary") ? "BinaryResource" : "XMLResource";
  				res = collection.createResource(file.getName(), resourceType);

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

Modified Files:
	NativeBroker.java 
Log Message:
Removed log statement.

Index: NativeBroker.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/storage/NativeBroker.java,v
retrieving revision 1.73
retrieving revision 1.74
diff -C2 -d -r1.73 -r1.74
*** NativeBroker.java	25 May 2004 12:52:03 -0000	1.73
--- NativeBroker.java	25 May 2004 12:57:13 -0000	1.74
***************
*** 577,581 ****
  			collection = collectionsDb.getCollectionCache().get(name);
  			if (collection != null) {
- 			    LOG.debug("Collection " + name + " found in cache");
  				return collection;
  			}
--- 577,580 ----

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

Modified Files:
	DBBroker.java NativeBroker.java 
Log Message:
Added partial support for WebDAV MOVE method.

Index: NativeBroker.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/storage/NativeBroker.java,v
retrieving revision 1.72
retrieving revision 1.73
diff -C2 -d -r1.72 -r1.73
*** NativeBroker.java	25 May 2004 09:26:10 -0000	1.72
--- NativeBroker.java	25 May 2004 12:52:03 -0000	1.73
***************
*** 577,584 ****
  			collection = collectionsDb.getCollectionCache().get(name);
  			if (collection != null) {
  				return collection;
  			}
- 			if(name.equals("/db/collection-31/collection-31-1"))
- 			    LOG.debug("loading collection " + name);
  			collection = new Collection(collectionsDb, name);
  			try {
--- 577,583 ----
  			collection = collectionsDb.getCollectionCache().get(name);
  			if (collection != null) {
+ 			    LOG.debug("Collection " + name + " found in cache");
  				return collection;
  			}
  			collection = new Collection(collectionsDb, name);
  			try {
***************
*** 1686,1702 ****
  				    NodeImpl node = (NodeImpl)doc.getFirstChild();
  					domDb.removeAll(node.getInternalAddress());
- //					NodeList children = doc.getChildNodes();
- //					NodeImpl node;
- //					for (int i = 0; i < children.getLength(); i++) {
- //						node = (NodeImpl) children.item(i);
- //						Iterator j =
- //							getDOMIterator(
- //								new NodeProxy(
- //									doc,
- //									node.getGID(),
- //									node.getInternalAddress()));
- //						removeNodes(j);
- //					}
- //					domDb.remove(doc.getAddress());
  					return null;
  				}
--- 1685,1688 ----
***************
*** 1736,1757 ****
  	}
  
- 	private void removeNodes(Iterator domIterator) {
- 		final Value next = (Value) domIterator.next();
- 		if (next == null)
- 			return;
- 		final byte[] data = next.data();
- 		final short type = Signatures.getType(data[next.start()]);
- 		switch (type) {
- 			case Node.ELEMENT_NODE :
- 				int children = ByteConversion.byteToInt(data, next.start() + 1);
- 				domIterator.remove();
- 				for (int i = 0; i < children; i++)
- 					removeNodes(domIterator);
- 				break;
- 			default :
- 				domIterator.remove();
- 		}
- 	}
- 
  	public void removeNode(final NodeImpl node, String currentPath) {
  		final IndexPaths idx =
--- 1722,1725 ----
***************
*** 1879,1887 ****
  				}
  				collection.setAddress(addr);
- //				if (!name.equals(ROOT_COLLECTION)) {
- //					Collection parent = collection.getParent(this);
- //					parent.update(collection);
- //					saveCollection(parent);
- //				}
  				collectionsDb.getCollectionCache().add(collection);
  				ostream.close();
--- 1847,1850 ----
***************
*** 1898,1901 ****
--- 1861,1910 ----
  	}
  
+ 	public void moveCollection(Collection collection, Collection destination, String newName) 
+ 	throws PermissionDeniedException, LockException {
+ 	    if (readOnly)
+ 			throw new PermissionDeniedException(DATABASE_IS_READ_ONLY);
+ 	    if(collection.getName().equals(ROOT_COLLECTION))
+ 	        throw new PermissionDeniedException("Cannot move the db root collection");
+ 	    if(!collection.getPermissions().validate(user, Permission.WRITE))
+ 	        throw new PermissionDeniedException("Insufficient privileges to move collection " +
+ 	                collection.getName());
+ 	    if(!destination.getPermissions().validate(user, Permission.WRITE))
+ 	        throw new PermissionDeniedException("Insufficient privileges on target collection " +
+ 	                destination.getName());
+ 	    Lock lock = null;
+ 	    try {
+ 	        lock = collectionsDb.getLock();
+ 	        lock.acquire(Lock.WRITE_LOCK);
+ 	        String name = collection.getName();
+ 	        Collection parent = collection.getParent(this);
+ 	        parent.removeCollection(name.substring(name.lastIndexOf("/") + 1));
+ 		    
+ 	        collectionsDb.getCollectionCache().remove(collection);
+ 		    Value key;
+ 			try {
+ 				key = new Value(name.getBytes("UTF-8"));
+ 			} catch (UnsupportedEncodingException uee) {
+ 				key = new Value(name.getBytes());
+ 			}	
+ 			collectionsDb.remove(key);
+ 			
+ 			name = destination.getName() + '/' + newName;
+ 		    collection.setName(name);
+ 		    collection.setCreationTime(System.currentTimeMillis());
+ 		    collection.correctResourcePaths();
+ 		    
+ 		    destination.addCollection(collection);
+ 		    saveCollection(parent);
+ 		    if(parent != destination)
+ 		        saveCollection(destination);
+ 		    saveCollection(collection);
+ 	    } catch (ReadOnlyException e) {
+             throw new PermissionDeniedException(DATABASE_IS_READ_ONLY);
+         } finally {
+ 	        lock.release();
+ 	    }
+ 	}
+ 	
  	/**
  	 *  Do a sequential search through the DOM-file.
***************
*** 1917,1927 ****
  		NodeProxy p;
  		String content;
- 		// StringBuffer buf = new StringBuffer(128);
- 		// byte[] data;
- 		// long filePos;
- 		// int offset;
- 		// NodeRef nodeRef;
  		String cmp;
- 		// Iterator domIterator = null;
  		Pattern regexp = null;
  		if (relation == Constants.REGEXP)
--- 1926,1930 ----

Index: DBBroker.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/storage/DBBroker.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** DBBroker.java	25 May 2004 09:26:11 -0000	1.28
--- DBBroker.java	25 May 2004 12:52:02 -0000	1.29
***************
*** 49,52 ****
--- 49,53 ----
  import org.exist.storage.serializers.Serializer;
  import org.exist.util.Configuration;
+ import org.exist.util.LockException;
  import org.exist.util.Occurrences;
  import org.exist.xquery.NodeSelector;
***************
*** 507,510 ****
--- 508,514 ----
  	
  	public abstract void removeBinaryResource(final BinaryDocument blob) throws PermissionDeniedException;
+ 
+ 	public abstract void moveCollection(Collection collection, Collection destination, String newName) 
+ 	throws PermissionDeniedException, LockException;
  	
  	public void sync() {

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

Modified Files:
	WebDAVMethodFactory.java 
Log Message:
Added partial support for WebDAV MOVE method.

Index: WebDAVMethodFactory.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/http/webdav/WebDAVMethodFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** WebDAVMethodFactory.java	21 May 2004 08:35:42 -0000	1.1
--- WebDAVMethodFactory.java	25 May 2004 12:52:02 -0000	1.2
***************
*** 27,30 ****
--- 27,31 ----
  import org.exist.http.webdav.methods.Head;
  import org.exist.http.webdav.methods.Mkcol;
+ import org.exist.http.webdav.methods.Move;
  import org.exist.http.webdav.methods.Options;
  import org.exist.http.webdav.methods.Propfind;
***************
*** 56,59 ****
--- 57,62 ----
          else if(method.equals("PROPFIND"))
              return new Propfind(pool);
+         else if(method.equals("MOVE"))
+             return new Move(pool);
          else return null;
      }

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

Modified Files:
	Collection.java CollectionCache.java 
Log Message:
Added partial support for WebDAV MOVE method.

Index: CollectionCache.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/collections/CollectionCache.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CollectionCache.java	3 May 2004 13:08:44 -0000	1.5
--- CollectionCache.java	25 May 2004 12:52:01 -0000	1.6
***************
*** 2,6 ****
  
  import org.exist.storage.cache.Cacheable;
- import org.exist.storage.cache.ClockCache;
  import org.exist.storage.cache.LRDCache;
  import org.exist.util.hashtable.Object2LongHashMap;
--- 2,5 ----
***************
*** 51,53 ****
--- 50,56 ----
  	}
  
+     public void remove(Cacheable item) {
+         super.remove(item);
+         names.remove(((Collection)item).getName());
+     }
  }

Index: Collection.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/collections/Collection.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** Collection.java	25 May 2004 09:26:13 -0000	1.24
--- Collection.java	25 May 2004 12:52:00 -0000	1.25
***************
*** 33,36 ****
--- 33,37 ----
  import java.util.Iterator;
  import java.util.List;
+ import java.util.Map;
  import java.util.Observable;
  import java.util.Observer;
***************
*** 95,102 ****
  	private int validation = VALIDATION_AUTO;
  
  	private short collectionId = -1;
  
  	// the documents contained in this collection
! 	private TreeMap documents = new TreeMap();
  
  	// the name of this collection
--- 96,104 ----
  	private int validation = VALIDATION_AUTO;
  
+ 	// the unique internal id to identify this collection
  	private short collectionId = -1;
  
  	// the documents contained in this collection
! 	private Map documents = new TreeMap();
  
  	// the name of this collection
***************
*** 122,125 ****
--- 124,128 ----
  	private boolean triggersEnabled = true;
  
+ 	// fields required by the collections cache
  	private int refCount = 0;
  	private int timestamp = 0;
***************
*** 133,136 ****
--- 136,143 ----
  	}
  
+ 	public void setName(String name) {
+ 	    this.name = name;
+ 	}
+ 	
  	/**
  	 *  Add a new sub-collection to the collection.
***************
*** 143,150 ****
  		if (!subcollections.contains(childName))
  			subcollections.add(childName);
- 		if(name.equals("/db/collection-31/collection-31-1")) {
- 		    LOG.debug("adding collection " + childName + "; count = " + subcollections.size() +
- 		            "; id = " + this);
- 		}
  	}
  
--- 150,153 ----
***************
*** 1266,1269 ****
--- 1269,1287 ----
  	}
  
+ 	public void correctResourcePaths() {
+ 	    Map newMap = new TreeMap();
+ 	    DocumentImpl childDoc;
+ 	    String path;
+ 	    for(Iterator i = documents.values().iterator(); i.hasNext(); ) {
+ 	        childDoc = (DocumentImpl)i.next();
+ 	        path = childDoc.getFileName();
+ 	        path = path.substring(path.lastIndexOf('/') + 1);
+ 	        childDoc.setFileName(getName() + '/' + path);
+ 	        LOG.debug("Moved " + childDoc.getFileName());
+ 	        newMap.put(childDoc.getFileName(), childDoc);
+ 	    }
+ 	    documents = newMap;
+ 	}
+ 	
  	private CollectionConfiguration getConfiguration(DBBroker broker) {
  		if (configuration == null)

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

Modified Files:
	Mkcol.java 
Added Files:
	Move.java 
Log Message:
Added partial support for WebDAV MOVE method.

--- NEW FILE: Move.java ---
/*
 *  eXist Open Source Native XML Database
 *  Copyright (C) 2001-04 Wolfgang M. Meier
 *  wol...@ex...
 *  http://exist-db.org
 *
 *  This program is free software; you can redistribute it and/or
 *  modify it under the terms of the GNU Lesser General Public License
 *  as published by the Free Software Foundation; either version 2
 *  of the License, or (at your option) any later version.
 *
 *  This program is distributed in the hope that it will be useful,
 *  but WITHOUT ANY WARRANTY; without even the implied warranty of
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 *  GNU Lesser General Public License for more details.
 *
 *  You should have received a copy of the GNU Lesser General Public License
 *  along with this program; if not, write to the Free Software
 *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 * 
 *  $Id: Move.java,v 1.1 2004/05/25 12:52:02 wolfgang_m Exp $
 */
package org.exist.http.webdav.methods;

import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;

import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import org.exist.EXistException;
import org.exist.collections.Collection;
import org.exist.dom.DocumentImpl;
import org.exist.http.webdav.WebDAVMethod;
import org.exist.security.PermissionDeniedException;
import org.exist.security.User;
import org.exist.storage.BrokerPool;
import org.exist.storage.DBBroker;
import org.exist.util.LockException;

/**
 * Implements the WebDAV move method.
 * @author wolf
 */
public class Move implements WebDAVMethod {

    private BrokerPool pool;
    
    public Move(BrokerPool pool) {
        this.pool = pool;
    }
    
    /* (non-Javadoc)
     * @see org.exist.http.webdav.WebDAVMethod#process(org.exist.security.User, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, org.exist.collections.Collection, org.exist.dom.DocumentImpl)
     */
    public void process(User user, HttpServletRequest request,
            HttpServletResponse response, Collection collection,
            DocumentImpl resource) throws ServletException, IOException {
        if(resource != null) {
            response.sendError(HttpServletResponse.SC_NOT_IMPLEMENTED,
                    "Move is not yet implemented for resources");
            return;
        }
        String destination = request.getHeader("Destination");
        String path = null;
        try {
            URI uri = new URI(destination);
            String host = uri.getHost();
            int port = uri.getPort();
            if(!(host.equals(request.getServerName()) && port == request.getServerPort())) {
                response.sendError(HttpServletResponse.SC_NOT_IMPLEMENTED,
                        "Moving to a different server is not yet implemented");
                return;
            }
            path = uri.getPath();
            if(path.startsWith(request.getContextPath()))
                path = path.substring(request.getContextPath().length());
            if(path.startsWith(request.getServletPath()))
                path = path.substring(request.getServletPath().length());
        } catch (URISyntaxException e) {
            response.sendError(HttpServletResponse.SC_BAD_REQUEST, "Malformed URL in destination header");
        }
        LOG.debug("Moving " + collection.getName() + " to " + path);
        moveCollection(user, response, collection, path);
    }

    private void moveCollection(User user, HttpServletResponse response, 
            Collection collection, String destination) throws ServletException, IOException {
        if(collection.getName().equals(destination)) {
            response.sendError(HttpServletResponse.SC_FORBIDDEN,
                    "Source and destination are the same");
            return;
        }
        DBBroker broker = null;
        try {
            broker = pool.get(user);
            Collection destCollection = broker.getCollection(destination);
            if(destCollection != null) {
                response.sendError(HttpServletResponse.SC_PRECONDITION_FAILED,
                        "Destination collection exists");
                return;
            }
            int p = destination.lastIndexOf('/');
            if(p < 0) {
                response.sendError(HttpServletResponse.SC_BAD_REQUEST,
                        "Bad destination: " + destination);
                return;
            }
            String parentPath = destination.substring(0, p);
            String newCollectionName = destination.substring(p + 1);
            LOG.debug("parent = " + parentPath + "; new name = " + newCollectionName);
            Collection parent = broker.getCollection(parentPath);
            if(parent == null) {
                response.sendError(HttpServletResponse.SC_CONFLICT,
                        "No parent collection: " + parentPath);
                return;
            }
            broker.moveCollection(collection, parent, newCollectionName);
            response.setStatus(HttpServletResponse.SC_CREATED);
        } catch (EXistException e) {
            throw new ServletException(e.getMessage(), e);
        } catch (PermissionDeniedException e) {
            response.sendError(HttpServletResponse.SC_FORBIDDEN, e.getMessage());
        } catch (LockException e) {
            response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, e.getMessage());
        } finally {
            pool.release(broker);
        }
    }
}

Index: Mkcol.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/http/webdav/methods/Mkcol.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Mkcol.java	21 May 2004 08:35:42 -0000	1.2
--- Mkcol.java	25 May 2004 12:52:01 -0000	1.3
***************
*** 76,79 ****
--- 76,81 ----
              return;
          }
+         if(path.endsWith("/"))
+             path = path.substring(0, path.length() - 1);
          int p = path.lastIndexOf('/');
          String parentPath = -1 < p ? path.substring(0, p) : "/db";
***************
*** 84,87 ****
--- 86,90 ----
              Collection parent = broker.getCollection(parentPath);
              if(parent == null) {
+                 LOG.debug("parent collection " + parentPath + " not found");
                  response.sendError(HttpServletResponse.SC_CONFLICT,
                          "parent collection not found");

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

Modified Files:
	sitemap.xmap 
Log Message:
* Improved caching of intermediate expression results in XQuery; much improved 
performance for cross-document joins.

* Partial fix for XUpdate concurrency issues.

* Added estimated content size to resources (some WebDAV clients require this).

* Fixed union and intersection expressions (exceptions occured if one operand had
been empty).

Index: sitemap.xmap
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/webapp/xquery/sitemap.xmap,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** sitemap.xmap	21 May 2004 08:40:56 -0000	1.13
--- sitemap.xmap	25 May 2004 09:26:09 -0000	1.14
***************
*** 46,50 ****
  
              <map:match pattern="process.xq">
!                 <map:generate src="process.xq" type="xquery"/>
                  <map:transform type="xinclude"/>
                  <map:transform src="context://stylesheets/doc2html-2.xsl"/>
--- 46,52 ----
  
              <map:match pattern="process.xq">
! 				<map:generate src="process.xq" type="xquery">
! 					<map:parameter name="expand-xincludes" value="true"/>
! 				</map:generate>
                  <map:transform type="xinclude"/>
                  <map:transform src="context://stylesheets/doc2html-2.xsl"/>