unico 2004/09/06 05:40:51
Modified: src/stores/org/apache/slide/index
TextContainsExpressionFactory.java
TextContainsExpression.java
Log:
- fix bugzilla bug 31042: 'make TextContainsExpression respect query scope'
thanks to Guido Casper (gcasper <at> s-und-n.de)
Revision Changes Path
1.2 +2 -3
jakarta-slide/src/stores/org/apache/slide/index/TextContainsExpressionFactory.java
Index: TextContainsExpressionFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/stores/org/apache/slide/index/TextContainsExpressionFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TextContainsExpressionFactory.java 29 Jun 2004 08:10:58 -0000 1.1
+++ TextContainsExpressionFactory.java 6 Sep 2004 12:40:51 -0000 1.2
@@ -34,7 +34,6 @@
import java.util.Collection;
/**
- * Author: Ryan Rhodes
* Date: Jun 24, 2004
* Time: 11:42:35 PM
*/
1.2 +8 -5
jakarta-slide/src/stores/org/apache/slide/index/TextContainsExpression.java
Index: TextContainsExpression.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/stores/org/apache/slide/index/TextContainsExpression.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TextContainsExpression.java 29 Jun 2004 08:10:58 -0000 1.1
+++ TextContainsExpression.java 6 Sep 2004 12:40:51 -0000 1.2
@@ -44,7 +44,6 @@
import java.util.Collection;
/**
- * Author: Ryan Rhodes
* Date: Jun 24, 2004
* Time: 11:45:30 PM
*/
@@ -120,8 +119,12 @@
Document doc = hits.doc(i);
String uri = doc.get(TextContentIndexer.URI_FIELD);
- RequestedResource resource = createResource(uri);
- result.add (resource);
+ IBasicQuery q = factory.getQuery();
+ String scope =
q.getSearchToken().getSlideContext().getSlidePath(q.getScope().getHref());
+ if (uri.startsWith(scope)) {
+ RequestedResource resource = createResource(uri);
+ result.add (resource);
+ }
}
}
catch (Exception e)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
