Commit Graph

69 Commits

Author SHA1 Message Date
Uwe Schindler 23d976abbd LUCENE-1825: Incorrect usage of AttributeSource.addAttribute/getAttribute leads to failures when onlyUseNewAPI=true
git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@806844 13f79535-47bb-0310-9956-ffa450edef68
2009-08-22 12:04:35 +00:00
Mark Robert Miller 66c2217a55 improve Highlighter javadocs
git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@805923 13f79535-47bb-0310-9956-ffa450edef68
2009-08-19 18:43:43 +00:00
Mark Robert Miller 39ada16b9c fix some javadoc @returns
git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@805650 13f79535-47bb-0310-9956-ffa450edef68
2009-08-19 02:42:24 +00:00
Mark Robert Miller 124af950a6 Fix duplicate code and one version of getWeightedSpanTerms - should accept a TokenStream now rather than a CachingTokenStream.
Also fixes getWeightedSpanTermsWithScores to intern the fieldname.

git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@805645 13f79535-47bb-0310-9956-ffa450edef68
2009-08-19 01:16:23 +00:00
Mark Robert Miller 395c65ad08 change PositionCheckingMap to use an entry iterator in putAll rather than keyset - faster
git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@804516 13f79535-47bb-0310-9956-ffa450edef68
2009-08-15 19:09:34 +00:00
Mark Robert Miller 835efd0d6c LUCENE-1788: cleanup Highlighter test class
git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@801856 13f79535-47bb-0310-9956-ffa450edef68
2009-08-07 01:30:45 +00:00
Yonik Seeley 7f1319fdf0 LUCENE-1607: String.intern() cache StringHelper.intern()
git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@801344 13f79535-47bb-0310-9956-ffa450edef68
2009-08-05 18:05:06 +00:00
Mark Robert Miller a4c2eae1d4 update javadoc for init(TokenStream) return
git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@800849 13f79535-47bb-0310-9956-ffa450edef68
2009-08-04 15:38:00 +00:00
Mark Robert Miller 10b41d2dce LUCENE-1685: The position aware SpanScorer has become the default scorer for Highlighting. The SpanScorer implementation has replaced QueryScorer and the old term highlighting QueryScorer has been renamed to QueryTermScorer. Multi-term queries are also now expanded by default. If you were previously rewritting the query for multi-term query highlighting, you should no longer do that (unless you switch to using QueryTermScorer). The SpanScorer API (now QueryScorer) has also been improved to more closely match the API of the previous QueryScorer implementation.
git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@800796 13f79535-47bb-0310-9956-ffa450edef68
2009-08-04 13:56:11 +00:00
Mark Robert Miller 3e869d9336 remove system.out and unnecessary next() in tokenstream
git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@799865 13f79535-47bb-0310-9956-ffa450edef68
2009-08-01 14:18:19 +00:00
Mark Robert Miller f73a4f4324 LUCENE-1695: Update the Highlighter to use the new TokenStream API. This issue breaks backwards compatibility with some public classes. If you have implemented custom Fregmenters or Scorers, you will need to adjust them to work with the new TokenStream API. Rather than getting passed a Token at a time, you will be given a TokenStream to init your impl with - store the Attributes you are interested in locally and access them on each call to the method that used to pass a new Token. Look at the included updated impls for examples.
git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@799455 13f79535-47bb-0310-9956-ffa450edef68
2009-07-30 22:00:47 +00:00
Mark Robert Miller afb517e832 LUCENE-1752: Missing highlights when terms were repeated in separate, nested, boolean or disjunction queries.
git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@798976 13f79535-47bb-0310-9956-ffa450edef68
2009-07-29 16:47:05 +00:00
Michael McCandless 228888a882 LUCENE-1644: fix highlighter to rewrite MTQ whenever it's not already a SCORING_BOOLEAN_QUERY
git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@797728 13f79535-47bb-0310-9956-ffa450edef68
2009-07-25 09:31:17 +00:00
Michael McCandless be66120dff LUCENE-1644: enable different rewrite methods for MultiTermQuery
git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@797694 13f79535-47bb-0310-9956-ffa450edef68
2009-07-25 00:03:33 +00:00
Mark Robert Miller ea7e4ad344 LUCENE-1688: Deprecate static final String stop word array in and StopAnalzyer and replace it with an immutable implementation of CharArraySet.
git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@794078 13f79535-47bb-0310-9956-ffa450edef68
2009-07-14 21:39:22 +00:00
Uwe Schindler fed4bba63d LUCENE-1713: Rename RangeQuery -> TermRangeQuery (part 1)
git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@791175 13f79535-47bb-0310-9956-ffa450edef68
2009-07-04 20:14:12 +00:00
Michael McCandless ec8088654d bulk fix svn:eol-style to native for text files
git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@787424 13f79535-47bb-0310-9956-ffa450edef68
2009-06-22 22:18:56 +00:00
Mark Robert Miller 6bcd89a916 fix for LUCENE-1425
git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@770993 13f79535-47bb-0310-9956-ffa450edef68
2009-05-02 22:46:26 +00:00
Mark Robert Miller a1b3fd7240 Add ConstantScore highlighting support to SpanScorer
git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@763856 13f79535-47bb-0310-9956-ffa450edef68
2009-04-10 02:09:46 +00:00
Mark Harwood 73a02ec6fe Fix for Lucene-1500 - new exception added to Highlighter API to handle TokenStreams with Tokens that exceed given text length
git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@758460 13f79535-47bb-0310-9956-ffa450edef68
2009-03-25 23:05:14 +00:00
Michael McCandless d545a46df5 LUCENE-1525: add missing maven dependencies for contrib/{benchmark,highlighter}; fix svn eolstyle to native
git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@736340 13f79535-47bb-0310-9956-ffa450edef68
2009-01-21 16:59:39 +00:00
Michael McCandless 8180700de8 LUCENE-1497: minor code cleanups to SimpleHTMLFormatter
git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@732739 13f79535-47bb-0310-9956-ffa450edef68
2009-01-08 16:11:19 +00:00
Mark Robert Miller c2f7d554a3 LUCENE-1389: SimpleSpanFragmenter can create very short fragments
git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@713569 13f79535-47bb-0310-9956-ffa450edef68
2008-11-13 00:01:43 +00:00
Yonik Seeley 8e8e8ddec4 set svn:eol-style to native on java files
git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@712922 13f79535-47bb-0310-9956-ffa450edef68
2008-11-11 02:35:46 +00:00
Michael McCandless abe6ea0828 LUCENE-1424: enable MultiTermQuery to do constant scoring; refactor Range, Wildcard, Prefix to expose this
git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@712890 13f79535-47bb-0310-9956-ffa450edef68
2008-11-11 00:40:00 +00:00
Michael McCandless f2c988ae2b don't include contrib/memory class files in highlighter's jar
git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@707834 13f79535-47bb-0310-9956-ffa450edef68
2008-10-25 10:19:30 +00:00
Otis Gospodnetic 0195fcd03d LUCENE-1378 - Removed the remaining 199 @author references
git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@695514 13f79535-47bb-0310-9956-ffa450edef68
2008-09-15 15:42:11 +00:00
Michael McCandless 4218996230 LUCENE-1366: rename Field.Index.* options
git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@694004 13f79535-47bb-0310-9956-ffa450edef68
2008-09-10 21:38:52 +00:00
Mark Robert Miller 5147f0563f LUCENE-1357: SpanScorer does not respect ConstantScoreRangeQuery setting
git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@693432 13f79535-47bb-0310-9956-ffa450edef68
2008-09-09 10:52:50 +00:00
Michael McCandless 120d01bb09 remove DOCTYPE declaration in testEncoding (it's causing intermittant false failures in nightly build when xerces has trouble loading the DTD from w3.org)
git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@690914 13f79535-47bb-0310-9956-ffa450edef68
2008-09-01 09:07:16 +00:00
Michael McCandless bb6b711718 LUCENE-1333: improvements to Token reuse API and full cutover to reuse API for all core and contrib analyzers
git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@687357 13f79535-47bb-0310-9956-ffa450edef68
2008-08-20 14:38:07 +00:00
Mark Robert Miller 7675606908 LUCENE-1355: highlighter can incorrectly produce negative idf when index has deletes
git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@687052 13f79535-47bb-0310-9956-ffa450edef68
2008-08-19 13:16:41 +00:00
Mark Robert Miller 943bf37e66 LUCENE-1321: Highlight fragment does not extend to maxDocCharsToAnalyze
git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@673220 13f79535-47bb-0310-9956-ffa450edef68
2008-07-01 21:44:33 +00:00
Mark Robert Miller f32b5a5698 LUCENE-1285: WeightedSpanTermExtractor incorrectly treats the same terms occurring in different query types
git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@659965 13f79535-47bb-0310-9956-ffa450edef68
2008-05-25 11:38:55 +00:00
Otis Gospodnetic b182881092 - Made ant compile-core and build-contrib run again
git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@656110 13f79535-47bb-0310-9956-ffa450edef68
2008-05-14 05:29:57 +00:00
Michael Busch 38d1caf56f LUCENE-1277: Remove println in highlighter
git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@652625 13f79535-47bb-0310-9956-ffa450edef68
2008-05-01 18:59:06 +00:00
Grant Ingersoll afa040e9da LUCENE-1276: Fixed contrib highlighter build
git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@652471 13f79535-47bb-0310-9956-ffa450edef68
2008-05-01 10:34:50 +00:00
Mark Harwood 35c7eb36df Commit of LUCENE-794 patch - adding phrase/span query support to highlighter
git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@652164 13f79535-47bb-0310-9956-ffa450edef68
2008-04-29 22:07:18 +00:00
Grant Ingersoll b95e9a5154 LUCENE-1132: Updated documentation and deprecated bytes references in favor of character references
git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@616305 13f79535-47bb-0310-9956-ffa450edef68
2008-01-29 13:35:13 +00:00
Grant Ingersoll f75f490eb9 LUCENE-1127: added couple of convenience methods to TokenSources
git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@614884 13f79535-47bb-0310-9956-ffa450edef68
2008-01-24 14:36:46 +00:00
Grant Ingersoll ed893f770c LUCENE-1114: Updated example
git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@608126 13f79535-47bb-0310-9956-ffa450edef68
2008-01-02 15:30:40 +00:00
Michael Busch 9c2a036db3 - LUCENE-908: Improvements and simplifications for how the MANIFEST file and the META-INF dir are created.
- LUCENE-935: Various improvements for the maven artifacts. Now the artifacts also include the sources as .jar files. 

git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@568766 13f79535-47bb-0310-9956-ffa450edef68
2007-08-22 23:16:48 +00:00
Grant Ingersoll 82eb074afd LUCENE-974: Removed Author tags from all existing code
git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@564236 13f79535-47bb-0310-9956-ffa450edef68
2007-08-09 15:21:19 +00:00
Michael Busch d955a970b6 LUCENE-622: Add ant target and pom.xml files for building maven artifacts of the Lucene core and the contrib modules.
git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@547860 13f79535-47bb-0310-9956-ffa450edef68
2007-06-16 04:45:13 +00:00
Michael Busch df0a188415 LUCENE-931: adding missing license headers to various files
git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@545696 13f79535-47bb-0310-9956-ffa450edef68
2007-06-09 06:09:46 +00:00
Mark Harwood 1877f9e3dc Fixed Junit failure due to recent change in QueryParser default behaviour. Needed to explicitly require old style of RangeQuery implementation rather than new default of RangeFilters
git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@529417 13f79535-47bb-0310-9956-ffa450edef68
2007-04-16 22:04:07 +00:00
Yonik Seeley 7ca20ee19f new ASF licenses header
git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@472959 13f79535-47bb-0310-9956-ffa450edef68
2006-11-09 16:21:50 +00:00
Mark Harwood d516bf50d8 Fix for http://issues.apache.org/jira/browse/LUCENE-645 with added Junit tests for this bug and related problem where last fragment can be huge if highlighting huge documents.
git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@432042 13f79535-47bb-0310-9956-ffa450edef68
2006-08-16 21:42:18 +00:00
Mark Harwood 482ad148f9 Added Yonik's patch for overlapping token support See http://issues.apache.org/jira/browse/LUCENE-627?page=comments#action_12421332
git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@422302 13f79535-47bb-0310-9956-ffa450edef68
2006-07-15 22:20:29 +00:00
Mark Harwood 5f7214b023 Added Yonik's patch to deal with overlapping tokens - see http://issues.apache.org/jira/browse/LUCENE-627?page=comments#action_12421332
git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@422301 13f79535-47bb-0310-9956-ffa450edef68
2006-07-15 22:19:51 +00:00