reenabling some lines of code

[cdmlib.git] / cdmlib-services / src / main / java / eu / etaxonomy / cdm / api / service / search / SearchResultHighligther.java

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/search/SearchResultHighligther.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/search/SearchResultHighligther.java
index 9e3894013659ba21cd52a50df770c52e4727a061..c29bc91a4b51d30813430f8f43dcb0a708f18933 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/search/SearchResultHighligther.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/search/SearchResultHighligther.java
@@ -17,7 +17,6 @@ import java.util.Map;
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.analysis.CachingTokenFilter;
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.document.Document;
 import org.apache.lucene.index.CorruptIndexException;
@@ -29,20 +28,9 @@ import org.apache.lucene.search.highlight.InvalidTokenOffsetsException;
 import org.apache.lucene.search.highlight.QueryScorer;
 import org.apache.lucene.search.highlight.Scorer;
 import org.apache.lucene.search.highlight.SimpleFragmenter;
-import org.apache.lucene.search.highlight.SimpleSpanFragmenter;
 import org.apache.lucene.search.highlight.TokenSources;
 
 /**
- * This SearchResultHighligther is using the
- * QueryScorer by default even if the SpanScorer is meant to be the new default scorer in Lucene,
- * see https://issues.apache.org/jira/browse/LUCENE-1685 and https://issues.apache.org/jira/browse/LUCENE-2013.
- * The SpanScorer was causing problems with phrase queries (see https://dev.e-taxonomy.eu/trac/ticket/2961)
- * whereas the QueryScorer was returning good results.
- * <p>
- * This SearchResultHighligther can be switched to use the SpanScorer: {@link #setUseSpanScorer(boolean)}
- * <p>
- * Based on work of Nicholas Hrycan
- * see http://code.google.com/p/hrycan-blog/source/browse/trunk/lucene-highlight/src/com/hrycan/search/HighlighterUtil.java
  *
  *
  * @author Andreas Kohlbecker
@@ -52,16 +40,6 @@ public class SearchResultHighligther {
 
     public static final Logger logger = Logger.getLogger(SearchResultHighligther.class);
 
-    private boolean useSpanScorer = true;
-
-    public boolean isUseSpanScorer() {
-        return useSpanScorer;
-    }
-
-    public void setUseSpanScorer(boolean useSpanScorer) {
-        this.useSpanScorer = useSpanScorer;
-    }
-
     public Map<String,String[]> getFragmentsWithHighlightedTerms(Analyzer analyzer, Query query, String[] fieldNames,  Document doc,  int fragmentNumber, int fragmentSize){
 
         Map<String,String[]> fieldHighlightMap = new HashMap<String, String[]>();
@@ -144,32 +122,10 @@ public class SearchResultHighligther {
     private String[] getFragmentsWithHighlightedTerms(TokenStream stream, Query query, String fieldName, String fieldContents, int fragmentNumber,
             int fragmentSize) throws IOException {
 
-        /*
-         * for (int i = 0; i < hits.length(); i++) {
-       String text = hits.doc(i).get(FIELD_NAME);
-       CachingTokenFilter tokenStream = new CachingTokenFilter(analyzer.tokenStream(FIELD_NAME,
-           new StringReader(text)));
-       Highlighter highlighter = new Highlighter(this, new SpanScorer(query, FIELD_NAME, tokenStream));
-       highlighter.setTextFragmenter(new SimpleFragmenter(40));
-       tokenStream.reset();
-
-       String result = highlighter.getBestFragments(tokenStream, text, maxNumFragmentsRequired,
-           "...");
-         */
-
-        Fragmenter fragmenter = null;
-        Highlighter highlighter = null;
-        if(false && useSpanScorer){
-//            new CachingTokenFilter(stream);
-//            SpanScorer scorer = new SpanScorer(query, fieldName);
-//            highlighter = null;// new Highlighter(this, scorer);
-//            fragmenter = null; //new SimpleSpanFragmenter((SpanScorer)scorer, fragmentSize);
-        } else {
-            Scorer scorer;
-            scorer = new QueryScorer(query, fieldName);
-            fragmenter = new SimpleFragmenter(fragmentSize);
-            highlighter = new Highlighter(scorer);
-        }
+
+        Scorer scorer = new QueryScorer(query, fieldName);
+        Fragmenter fragmenter = new SimpleFragmenter(fragmentSize);
+        Highlighter highlighter = new Highlighter(scorer);
 
         highlighter.setTextFragmenter(fragmenter);
         highlighter.setMaxDocCharsToAnalyze(Integer.MAX_VALUE);
@@ -178,8 +134,8 @@ public class SearchResultHighligther {
         try {
             fragments = highlighter.getBestFragments(stream, fieldContents, fragmentNumber);
         } catch (InvalidTokenOffsetsException e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
+            //should never happen
+            logger.error("InvalidTokenOffsetsException", e);
         }
         return fragments;
     }