You are viewing a plain text version of this content. The canonical link for it is here.
Posted to solr-commits@lucene.apache.org by ry...@apache.org on 2007/07/03 08:29:51 UTC
svn commit: r552689 - in /lucene/solr/trunk/src/java/org/apache/solr:
common/params/HighlightParams.java util/HighlightingUtils.java
Author: ryan
Date: Mon Jul 2 23:29:50 2007
New Revision: 552689
URL: http://svn.apache.org/viewvc?view=rev&rev=552689
Log:
SOLR-225 - style changes and HighlightUtils.emptyArray() change
Modified:
lucene/solr/trunk/src/java/org/apache/solr/common/params/HighlightParams.java
lucene/solr/trunk/src/java/org/apache/solr/util/HighlightingUtils.java
Modified: lucene/solr/trunk/src/java/org/apache/solr/common/params/HighlightParams.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/common/params/HighlightParams.java?view=diff&rev=552689&r1=552688&r2=552689
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/common/params/HighlightParams.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/common/params/HighlightParams.java Mon Jul 2 23:29:50 2007
@@ -18,26 +18,26 @@
package org.apache.solr.common.params;
/**
- *
- * @author ryan
* @version $Id$
* @since solr 1.3
*/
public interface HighlightParams {
-
- public static final String SIMPLE = "simple";
-
public static final String HIGHLIGHT = "hl";
- public static final String PREFIX = "hl.";
- public static final String FIELDS = PREFIX+"fl";
- public static final String SNIPPETS = PREFIX+"snippets";
- public static final String FRAGSIZE = PREFIX+"fragsize";
- public static final String INCREMENT = PREFIX+"increment";
- public static final String SLOP = PREFIX+"slop";
- public static final String MAX_CHARS = PREFIX+"maxAnalyzedChars";
- public static final String FORMATTER = PREFIX+"formatter";
- public static final String FRAGMENTER = PREFIX+"fragmenter";
- public static final String SIMPLE_PRE = PREFIX+SIMPLE+".pre";
- public static final String SIMPLE_POST = PREFIX+SIMPLE+".post";
- public static final String FIELD_MATCH = PREFIX+"requireFieldMatch";
+ public static final String FIELDS = HIGHLIGHT+".fl";
+ public static final String SNIPPETS = HIGHLIGHT+".snippets";
+ public static final String FRAGSIZE = HIGHLIGHT+".fragsize";
+ public static final String INCREMENT = HIGHLIGHT+".increment";
+ public static final String MAX_CHARS = HIGHLIGHT+".maxAnalyzedChars";
+ public static final String FORMATTER = HIGHLIGHT+".formatter";
+ public static final String FRAGMENTER = HIGHLIGHT+".fragmenter";
+ public static final String FIELD_MATCH = HIGHLIGHT+".requireFieldMatch";
+
+ // Formatter
+ public static final String SIMPLE = "simple";
+ public static final String SIMPLE_PRE = HIGHLIGHT+"."+SIMPLE+".pre";
+ public static final String SIMPLE_POST = HIGHLIGHT+"."+SIMPLE+".post";
+
+ // Regex fragmenter
+ public static final String REGEX = "regex";
+ public static final String SLOP = HIGHLIGHT+"."+REGEX+".slop";
}
Modified: lucene/solr/trunk/src/java/org/apache/solr/util/HighlightingUtils.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/util/HighlightingUtils.java?view=diff&rev=552689&r1=552688&r2=552689
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/util/HighlightingUtils.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/util/HighlightingUtils.java Mon Jul 2 23:29:50 2007
@@ -22,7 +22,6 @@
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import java.util.List;
import java.util.LinkedList;
import java.util.ArrayList;
import java.util.ListIterator;
@@ -135,7 +134,8 @@
}
private static boolean emptyArray(String[] arr) {
- return (arr == null || arr.length == 0 || arr[0] == null || arr[0].trim().length() == 0);
+ return (arr == null || arr.length == 0 ||
+ (arr.length == 1 && (arr[0] == null || arr[0].trim().length() == 0)));
}
/**
@@ -191,6 +191,7 @@
* @return NamedList containing a NamedList for each document, which in
* turns contains sets (field, summary) pairs.
*/
+ @SuppressWarnings("unchecked")
public static NamedList doHighlighting(DocList docs, Query query, SolrQueryRequest req, String[] defaultFields) throws IOException {
if (!isHighlightingEnabled(req))
return null;
@@ -257,7 +258,7 @@
}
summaries = fragTexts.toArray(new String[0]);
if (summaries.length > 0)
- docSummaries.add(fieldName, summaries);
+ docSummaries.add(fieldName, summaries);
}
}
String printId = searcher.getSchema().printableUniqueKey(doc);
@@ -298,6 +299,7 @@
}
/** Returns the next token in the stream, or null at EOS. */
+ @Override
public Token next() throws IOException {
int extra = 0;
if(currentStream == null) {
@@ -364,6 +366,7 @@
/* (non-Javadoc)
* @see org.apache.lucene.search.highlight.TextFragmenter#start(java.lang.String)
*/
+ @Override
public void start(String originalText) {
fragOffsetAccum = 0;
}
@@ -371,6 +374,7 @@
/* (non-Javadoc)
* @see org.apache.lucene.search.highlight.TextFragmenter#isNewFragment(org.apache.lucene.analysis.Token)
*/
+ @Override
public boolean isNewFragment(Token token) {
boolean isNewFrag =
token.endOffset() >= fragOffsetAccum + getFragmentSize() ||
@@ -397,6 +401,7 @@
this.windowSize = windowSize;
}
+ @Override
public Token next() throws IOException {
while (!done && queue.size() < windowSize) {
Token newTok = input.next();