exist-commits — Receive notifications about CVS commits.

[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;
  	}