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

[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-serv1248/src/org/exist/xquery

Modified Files:
	GeneralComparison.java 
Log Message:
Applied patch by Christian Mayrhuber concerning large attribute string values.

Index: GeneralComparison.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/GeneralComparison.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** GeneralComparison.java	12 Sep 2004 09:25:14 -0000	1.6
--- GeneralComparison.java	12 Sep 2004 10:40:14 -0000	1.7
***************
*** 31,34 ****
--- 31,35 ----
  import org.exist.dom.NodeProxy;
  import org.exist.dom.NodeSet;
+ import org.exist.storage.NativeTextEngine;
  import org.exist.storage.IndexPaths;
  import org.exist.storage.analysis.SimpleTokenizer;
***************
*** 237,245 ****
  			return nodeSetCompare(nodes, contextSequence);
  		Sequence rightSeq = getRight().eval(contextSequence);
! 		if (rightSeq.getLength() > 1)
  			// fall back to nodeSetCompare
  			return nodeSetCompare(nodes, contextSequence);
  		DocumentSet docs = nodes.getDocumentSet();
- 		String cmp = rightSeq.getStringValue();
  		switch(truncation) {
  			case Constants.TRUNC_RIGHT:
--- 238,248 ----
  			return nodeSetCompare(nodes, contextSequence);
  		Sequence rightSeq = getRight().eval(contextSequence);
! 		String cmp = rightSeq.getStringValue();
! 		if (rightSeq.getLength() > 1 ||
! 				cmp.length() > NativeTextEngine.MAX_WORD_LENGTH)
  			// fall back to nodeSetCompare
  			return nodeSetCompare(nodes, contextSequence);
+ 		LOG.debug("quick compare: " + cmp.length());
  		DocumentSet docs = nodes.getDocumentSet();
  		switch(truncation) {
  			case Constants.TRUNC_RIGHT: