You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2011/09/23 12:57:51 UTC
svn commit: r1174650 - in /jackrabbit/branches/1.6: ./
jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/
jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/
Author: jukka
Date: Fri Sep 23 10:57:50 2011
New Revision: 1174650
URL: http://svn.apache.org/viewvc?rev=1174650&view=rev
Log:
1.6: Merged revision 1173196 (JCR-3077)
Modified:
jackrabbit/branches/1.6/ (props changed)
jackrabbit/branches/1.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/DefaultHighlighter.java
jackrabbit/branches/1.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/WeightedHighlighter.java
jackrabbit/branches/1.6/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/ExcerptTest.java
Propchange: jackrabbit/branches/1.6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 23 10:57:50 2011
@@ -2,4 +2,4 @@
/jackrabbit/branches/1.x:801262-801983,812129,812371
/jackrabbit/branches/2.0:899183,900703,958604
/jackrabbit/branches/2.1:955314
-/jackrabbit/trunk:770143-773197,773483,773525-773555,773584,773588,773828,773835-775756,775833,775836,775840,775868,775981,775986,776036,776256,776310,776313,776321-776322,776332,776356-776357,776362,776373,776650-776693,776737,776757,776776-776777,777024,777029,777034,777478,777509,777541,777548,777936,778445,778613,778616,778621,778645,778720,778802,779032,779040,779068-779071,779074,779076,779081,779084,779086-779088,779090-779092,779094-779096,779101,779223,779225,779227-779228,779230,779233-779234,779460,779475-779476,779504,779550,779552,779555,779561,779563,779583,779590,779618,779621-779622,779624,779642,779654,779657-779659,779661,779936,780006,780010,780025,780085,780985,780989,780993,781017,781051,781054,781294-781300,781305-781311,781318,781328,781338,781344,781347,781369,781372,781377,781416-781417,781423,782621-782622,782644,782646,782652,782669,782675,782677,782683,782694,782921,782925,782930,782936,783002,783004-783005,783042-783043,783239,783243,783245,78327
8,783304,783319-783321,783324,783326-783327,783330-783333,783337-783338,783340-783341,783343,783345-783347,783356,783359,783383,783386,783412,783435,783444,783447,783523,783688,783703,783708,783710,783719,783757,783759,783761,783786,783809,784011,784013,784039,784058,784060-784061,784090-784091,784106,784108-784109,784111,784117-784120,784124,784163,784261,784680,784691,784696,784760,784824,785112,785116,785157,785169,785209,785492,785517,785519,785529,785533,785535,785539-785540,785545,785580,785589-785590,785592,785594,785597,785602,785627,785629,785631,785635,785645,785668,785711,785725,785777,785863,785981,786003,786019,786028,786062,786075,786089-786090,786093-786094,786144,786146-786147,786149,786167,786280,786295,786319,786329-786330,786336,786409,786419,786423,786480,786485,786492,786513,786562,786565,786680,786685,787183,787219,787241,787942,787952,787964,787996,788002,788012-788013,788350-788351,788443,788446,788450,789245,789257,789269-789270,789279,789307,789312,
789324,789338,789347,789485,789629,789809,789986,790054,790056,790065-790066,790068,790070-790071,790118,790127,790153,790235-790236,790528,790537,790541,790557-790558,790568,790590,790600,790603,790629,790814,790826,790834,790887,790892,790901,790930,790939,791180,791253,791255,791438-791439,791441,791452,791457,791475,791492,791505,791520,791527,791737,791832,791884,791906,792102,792109,792118,792138,792152,792155-792156,792160,792162,792167-792168,792175,792180-792181,792211,792214,792218,792437,792453,792464,792467,792469,792485,792488,792496,792498,792508-792509,792547-792548,792588-792589,792849,792894-792895,792912,792932,792934,792968,793012-793013,793015-793016,793018,793046-793047,793072,793180,793238,793240,793243,793283,793484-793485,793507,793559,793571,793830,793836,793840,794162,794190,794193,794253,794278,794293-794294,794302,794304,794323,794329,794600,794617,794633,794641,794644,794652,794674,794702,794718,794743,794783,794994,795046,795049,795082,795096,79
5136,795138,795841-795842,795854,795866,796584,796586,796757,796845,796855,796876,796899,796955,796957,797094,797139,797158,797386,797399,797410,797414,797416-797417,797424,797470,797484,797488-797489,797539,797549,797634,797662,797836,798141,798183,798196,798209,798306,798834,798844,798847-798848,798889-798890,798940,798958,799188,799284,799550,799595,799599,799610,800269,800464,800466,800478,800483,800715,800807,800829,800854,800862-800863,801104,801125-801126,801128,801135,801169,801210,801213,801226,801241,801968,801973,802691,802754,811001,812102,812369,815233,816124,818482,819491,820925,825772,829015,830575,830665,881283,889133,892253,899181,900702,923277,923597,925982,926324,927393,933646,935557,936668,944258,953585,955307,955843,955852,965539
+/jackrabbit/trunk:770143-773197,773483,773525-773555,773584,773588,773828,773835-775756,775833,775836,775840,775868,775981,775986,776036,776256,776310,776313,776321-776322,776332,776356-776357,776362,776373,776650-776693,776737,776757,776776-776777,777024,777029,777034,777478,777509,777541,777548,777936,778445,778613,778616,778621,778645,778720,778802,779032,779040,779068-779071,779074,779076,779081,779084,779086-779088,779090-779092,779094-779096,779101,779223,779225,779227-779228,779230,779233-779234,779460,779475-779476,779504,779550,779552,779555,779561,779563,779583,779590,779618,779621-779622,779624,779642,779654,779657-779659,779661,779936,780006,780010,780025,780085,780985,780989,780993,781017,781051,781054,781294-781300,781305-781311,781318,781328,781338,781344,781347,781369,781372,781377,781416-781417,781423,782621-782622,782644,782646,782652,782669,782675,782677,782683,782694,782921,782925,782930,782936,783002,783004-783005,783042-783043,783239,783243,783245,78327
8,783304,783319-783321,783324,783326-783327,783330-783333,783337-783338,783340-783341,783343,783345-783347,783356,783359,783383,783386,783412,783435,783444,783447,783523,783688,783703,783708,783710,783719,783757,783759,783761,783786,783809,784011,784013,784039,784058,784060-784061,784090-784091,784106,784108-784109,784111,784117-784120,784124,784163,784261,784680,784691,784696,784760,784824,785112,785116,785157,785169,785209,785492,785517,785519,785529,785533,785535,785539-785540,785545,785580,785589-785590,785592,785594,785597,785602,785627,785629,785631,785635,785645,785668,785711,785725,785777,785863,785981,786003,786019,786028,786062,786075,786089-786090,786093-786094,786144,786146-786147,786149,786167,786280,786295,786319,786329-786330,786336,786409,786419,786423,786480,786485,786492,786513,786562,786565,786680,786685,787183,787219,787241,787942,787952,787964,787996,788002,788012-788013,788350-788351,788443,788446,788450,789245,789257,789269-789270,789279,789307,789312,
789324,789338,789347,789485,789629,789809,789986,790054,790056,790065-790066,790068,790070-790071,790118,790127,790153,790235-790236,790528,790537,790541,790557-790558,790568,790590,790600,790603,790629,790814,790826,790834,790887,790892,790901,790930,790939,791180,791253,791255,791438-791439,791441,791452,791457,791475,791492,791505,791520,791527,791737,791832,791884,791906,792102,792109,792118,792138,792152,792155-792156,792160,792162,792167-792168,792175,792180-792181,792211,792214,792218,792437,792453,792464,792467,792469,792485,792488,792496,792498,792508-792509,792547-792548,792588-792589,792849,792894-792895,792912,792932,792934,792968,793012-793013,793015-793016,793018,793046-793047,793072,793180,793238,793240,793243,793283,793484-793485,793507,793559,793571,793830,793836,793840,794162,794190,794193,794253,794278,794293-794294,794302,794304,794323,794329,794600,794617,794633,794641,794644,794652,794674,794702,794718,794743,794783,794994,795046,795049,795082,795096,79
5136,795138,795841-795842,795854,795866,796584,796586,796757,796845,796855,796876,796899,796955,796957,797094,797139,797158,797386,797399,797410,797414,797416-797417,797424,797470,797484,797488-797489,797539,797549,797634,797662,797836,798141,798183,798196,798209,798306,798834,798844,798847-798848,798889-798890,798940,798958,799188,799284,799550,799595,799599,799610,800269,800464,800466,800478,800483,800715,800807,800829,800854,800862-800863,801104,801125-801126,801128,801135,801169,801210,801213,801226,801241,801968,801973,802691,802754,811001,812102,812369,815233,816124,818482,819491,820925,825772,829015,830575,830665,881283,889133,892253,899181,900702,923277,923597,925982,926324,927393,933646,935557,936668,944258,953585,955307,955843,955852,965539,1173196
Modified: jackrabbit/branches/1.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/DefaultHighlighter.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/DefaultHighlighter.java?rev=1174650&r1=1174649&r2=1174650&view=diff
==============================================================================
--- jackrabbit/branches/1.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/DefaultHighlighter.java (original)
+++ jackrabbit/branches/1.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/DefaultHighlighter.java Fri Sep 23 10:57:50 2011
@@ -247,8 +247,8 @@ public class DefaultHighlighter {
if (skippedChars > surround) {
skippedChars = surround;
}
- sb.append(Text.encodeIllegalXMLCharacters(
- new String(cbuf, 0, surround - skippedChars)));
+ sb.append(escape(new String(cbuf, 0, surround
+ - skippedChars)));
sb.append(fragmentEnd);
}
}
@@ -295,8 +295,8 @@ public class DefaultHighlighter {
if (!sentenceStart) {
sb.append("... ");
}
- sb.append(Text.encodeIllegalXMLCharacters(
- new String(cbuf, skippedChars, cbuf.length - skippedChars)));
+ sb.append(escape(new String(cbuf, skippedChars, cbuf.length
+ - skippedChars)));
// iterate terms
for (Iterator iter = fi.iterator(); iter.hasNext();) {
@@ -306,8 +306,7 @@ public class DefaultHighlighter {
cbuf = new char[nextStart - pos];
int charsRead = reader.read(cbuf, 0, nextStart - pos);
pos += (nextStart - pos);
- sb.append(Text.encodeIllegalXMLCharacters(
- new String(cbuf, 0, charsRead)));
+ sb.append(escape(new String(cbuf, 0, charsRead)));
}
sb.append(hlStart);
nextStart = ti.getEndOffset();
@@ -315,8 +314,7 @@ public class DefaultHighlighter {
cbuf = new char[nextStart - pos];
reader.read(cbuf, 0, nextStart - pos);
pos += (nextStart - pos);
- sb.append(Text.encodeIllegalXMLCharacters(
- new String(cbuf)));
+ sb.append(escape(new String(cbuf)));
sb.append(hlEnd);
}
}
@@ -342,8 +340,8 @@ public class DefaultHighlighter {
} else {
skippedChars = 0;
}
- sb.append(Text.encodeIllegalXMLCharacters(
- new String(cbuf, 0, EOF ? skip : (surround - skippedChars))));
+ sb.append(escape(new String(cbuf, 0, EOF ? skip
+ : (surround - skippedChars))));
if (!EOF) {
char lastChar = sb.charAt(sb.length() - 1);
if (lastChar != '.' && lastChar != '!' && lastChar != '?') {
@@ -363,7 +361,7 @@ public class DefaultHighlighter {
* @param text the text.
* @param excerptStart the excerpt start.
* @param excerptEnd the excerpt end.
- * @param fragmentStart the fragement start.
+ * @param fragmentStart the fragment start.
* @param fragmentEnd the fragment end.
* @param maxLength the maximum length of the fragment.
* @return a default excerpt.
@@ -392,10 +390,24 @@ public class DefaultHighlighter {
}
}
}
- excerpt.append(Text.encodeIllegalXMLCharacters(tmp.toString()));
+ excerpt.append(escape(tmp.toString()));
excerpt.append(fragmentEnd).append(excerptEnd);
return excerpt.toString();
}
+
+
+ /**
+ * Escapes input text suitable for the output format.
+ * <p>
+ * By default does XML-escaping. Can be overridden for
+ * other formats.
+ *
+ * @param input raw text.
+ * @return text suitably escaped.
+ */
+ protected String escape(String input) {
+ return Text.encodeIllegalXMLCharacters(input);
+ }
private static class FragmentInfo {
ArrayList offsetInfosList;
Modified: jackrabbit/branches/1.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/WeightedHighlighter.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/WeightedHighlighter.java?rev=1174650&r1=1174649&r2=1174650&view=diff
==============================================================================
--- jackrabbit/branches/1.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/WeightedHighlighter.java (original)
+++ jackrabbit/branches/1.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/WeightedHighlighter.java Fri Sep 23 10:57:50 2011
@@ -193,14 +193,17 @@ public class WeightedHighlighter extends
TermVectorOffsetInfo oi = (TermVectorOffsetInfo) fIt.next();
if (lastOffsetInfo != null) {
// fill in text between terms
- sb.append(text.substring(lastOffsetInfo.getEndOffset(), oi.getStartOffset()));
+ sb.append(escape(text.substring(
+ lastOffsetInfo.getEndOffset(), oi.getStartOffset())));
}
sb.append(hlStart);
- sb.append(text.substring(oi.getStartOffset(), oi.getEndOffset()));
+ sb.append(escape(text.substring(oi.getStartOffset(),
+ oi.getEndOffset())));
sb.append(hlEnd);
lastOffsetInfo = oi;
}
- limit = Math.min(text.length(), fi.getStartOffset() - len + (surround * 2));
+ limit = Math.min(text.length(), fi.getStartOffset() - len
+ + (surround * 2));
endFragment(sb, text, fi.getEndOffset(), limit);
sb.append(fragmentEnd);
}
@@ -221,10 +224,10 @@ public class WeightedHighlighter extends
* @return the length of the start fragment that was appended to
* <code>sb</code>.
*/
- private static int startFragment(StringBuffer sb, String text, int offset, int limit) {
+ private int startFragment(StringBuffer sb, String text, int offset, int limit) {
if (limit == 0) {
// append all
- sb.append(text.substring(0, offset));
+ sb.append(escape(text.substring(0, offset)));
return offset;
}
String intro = "... ";
@@ -240,7 +243,7 @@ public class WeightedHighlighter extends
}
}
}
- sb.append(intro).append(text.substring(start, offset));
+ sb.append(intro).append(escape(text.substring(start, offset)));
return offset - start;
}
@@ -254,10 +257,10 @@ public class WeightedHighlighter extends
* @param offset the end offset of the last matching term in the fragment.
* @param limit do not go further than <code>limit</code>.
*/
- private static void endFragment(StringBuffer sb, String text, int offset, int limit) {
+ private void endFragment(StringBuffer sb, String text, int offset, int limit) {
if (limit == text.length()) {
// append all
- sb.append(text.substring(offset));
+ sb.append(escape(text.substring(offset)));
return;
}
int end = offset;
@@ -267,7 +270,7 @@ public class WeightedHighlighter extends
end = i;
}
}
- sb.append(text.substring(offset, end)).append(" ...");
+ sb.append(escape(text.substring(offset, end))).append(" ...");
}
private static class FragmentInfo {
Modified: jackrabbit/branches/1.6/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/ExcerptTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.6/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/ExcerptTest.java?rev=1174650&r1=1174649&r2=1174650&view=diff
==============================================================================
--- jackrabbit/branches/1.6/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/ExcerptTest.java (original)
+++ jackrabbit/branches/1.6/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/ExcerptTest.java Fri Sep 23 10:57:50 2011
@@ -119,6 +119,20 @@ public class ExcerptTest extends Abstrac
assertEquals(excerpt, rows.nextRow().getValue("rep:excerpt(text)").getString());
}
+ public void testEncodeIllegalCharsHighlights() throws RepositoryException {
+ String text = "bla <strong>bla</strong> foo";
+ String excerpt = createExcerpt("bla <strong>bla</strong> <strong>foo</strong>");
+ Node n = testRootNode.addNode(nodeName1);
+ n.setProperty("text", text);
+ superuser.save();
+
+ String stmt = getStatement("foo");
+ QueryResult result = executeQuery(stmt);
+ RowIterator rows = result.getRows();
+ assertEquals(1, rows.getSize());
+ assertEquals(excerpt, rows.nextRow().getValue("rep:excerpt(text)").getString());
+ }
+
private void checkExcerpt(String text, String fragmentText, String terms)
throws RepositoryException {
String excerpt = createExcerpt(fragmentText);