Revision: 38902
Author: uhommes
Date: 2013-03-25 10:31:56 +0100 (Mon, 25 Mar 2013)
Log Message:
-----------
REPO-637 bump jackrabbit version, workaround for JCR+3539 can be removed
Modified Paths:
--------------
hippo-cms7/repository/branches/hippo-repository-2.24.xx/engine/src/main/java/org/hippoecm/repository/query/lucene/HippoIndexSearcher.java
hippo-cms7/repository/branches/hippo-repository-2.24.xx/pom.xml
Modified:
hippo-cms7/repository/branches/hippo-repository-2.24.xx/engine/src/main/java/org/hippoecm/repository/query/lucene/HippoIndexSearcher.java
===================================================================
---
hippo-cms7/repository/branches/hippo-repository-2.24.xx/engine/src/main/java/org/hippoecm/repository/query/lucene/HippoIndexSearcher.java
2013-03-25 09:17:03 UTC (rev 38901)
+++
hippo-cms7/repository/branches/hippo-repository-2.24.xx/engine/src/main/java/org/hippoecm/repository/query/lucene/HippoIndexSearcher.java
2013-03-25 09:31:56 UTC (rev 38902)
@@ -24,13 +24,8 @@
import org.apache.jackrabbit.core.query.lucene.QueryHits;
import org.apache.jackrabbit.core.state.ItemStateManager;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.search.DocIdSetIterator;
-import org.apache.lucene.search.Filter;
-import org.apache.lucene.search.HitCollector;
import org.apache.lucene.search.Query;
-import org.apache.lucene.search.Scorer;
import org.apache.lucene.search.Sort;
-import org.apache.lucene.search.Weight;
public class HippoIndexSearcher extends JackrabbitIndexSearcher {
@@ -63,36 +58,4 @@
return hits;
}
- @Override
- public void search(Weight weight, Filter filter,
- final HitCollector results) throws IOException {
-
- Scorer scorer = weight.scorer(reader);
- if (scorer == null)
- return;
-
- if (filter == null) {
- scorer.score(results);
- return;
}
-
- DocIdSetIterator filterDocIdIterator =
filter.getDocIdSet(reader).iterator();
-
- boolean more = filterDocIdIterator.next() && scorer.next();
- while (more) {
- int filterDocId = filterDocIdIterator.doc();
- if (filterDocId > scorer.doc() && !scorer.skipTo(filterDocId)) {
- more = false;
- } else {
- int scorerDocId = scorer.doc();
- if (scorerDocId == filterDocId) { // permitted by filter
- results.collect(scorerDocId, scorer.score());
- more = filterDocIdIterator.next();
- } else {
- more = filterDocIdIterator.skipTo(scorerDocId);
- }
- }
- }
- }
-
-}
Modified: hippo-cms7/repository/branches/hippo-repository-2.24.xx/pom.xml
===================================================================
--- hippo-cms7/repository/branches/hippo-repository-2.24.xx/pom.xml
2013-03-25 09:17:03 UTC (rev 38901)
+++ hippo-cms7/repository/branches/hippo-repository-2.24.xx/pom.xml
2013-03-25 09:31:56 UTC (rev 38902)
@@ -85,7 +85,7 @@
<lucene.version>2.2.0</lucene.version>
<tika.version>0.9</tika.version>
<pdfbox.version>1.7.1</pdfbox.version>
- <jackrabbit.patched.version>2.2.13-h8</jackrabbit.patched.version>
+ <jackrabbit.patched.version>2.2.13-h9</jackrabbit.patched.version>
<jackrabbit.version>2.2.13</jackrabbit.version>
<quartz.version>1.8.5</quartz.version>
<json-lib.version>2.2.2</json-lib.version>
_______________________________________________
Hippocms-svn mailing list
[email protected]
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
