You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ko...@apache.org on 2012/01/15 14:50:55 UTC
svn commit: r1231665 - in /lucene/dev/trunk/solr: CHANGES.txt
core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java
Author: koji
Date: Sun Jan 15 13:50:55 2012
New Revision: 1231665
URL: http://svn.apache.org/viewvc?rev=1231665&view=rev
Log:
SOLR-2603: Encoding of alternate fields in highlighting
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1231665&r1=1231664&r2=1231665&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Sun Jan 15 13:50:55 2012
@@ -434,6 +434,8 @@ New Features
* SOLR-3036: Ability to specify overwrite=false on the URL for XML updates.
(Sami Siren via yonik)
+* SOLR-2603: Add the encoding function for alternate fields in highlighting.
+ (Massimo Schiavon, koji)
Optimizations
----------------------
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java?rev=1231665&r1=1231664&r2=1231665&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java Sun Jan 15 13:50:55 2012
@@ -577,21 +577,23 @@ public class DefaultSolrHighlighter exte
String[] altTexts = listFields.toArray(new String[listFields.size()]);
if (altTexts != null && altTexts.length > 0){
+ Encoder encoder = getEncoder(fieldName, params);
int alternateFieldLen = params.getFieldInt(fieldName, HighlightParams.ALTERNATE_FIELD_LENGTH,0);
- if( alternateFieldLen <= 0 ){
- docSummaries.add(fieldName, altTexts);
- }
- else{
- List<String> altList = new ArrayList<String>();
- int len = 0;
- for( String altText: altTexts ){
+ List<String> altList = new ArrayList<String>();
+ int len = 0;
+ for( String altText: altTexts ){
+ if( alternateFieldLen <= 0 ){
+ altList.add(encoder.encodeText(altText));
+ }
+ else{
altList.add( len + altText.length() > alternateFieldLen ?
- new String(altText.substring( 0, alternateFieldLen - len )) : altText );
+ encoder.encodeText(new String(altText.substring( 0, alternateFieldLen - len ))) :
+ encoder.encodeText(altText) );
len += altText.length();
if( len >= alternateFieldLen ) break;
}
- docSummaries.add(fieldName, altList);
}
+ docSummaries.add(fieldName, altList);
}
}
}