lucene-solr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yo...@apache.org
Subject svn commit: r814329 - in /lucene/solr/trunk: ./ lib/ src/java/org/apache/solr/analysis/
Date Sun, 13 Sep 2009 15:08:43 GMT
Author: yonik
Date: Sun Sep 13 15:08:42 2009
New Revision: 814329

URL: http://svn.apache.org/viewvc?rev=814329&view=rev
Log:
upgrade to lucene 2.9-rc4

Added:
    lucene/solr/trunk/lib/lucene-analyzers-2.9.0-rc4.jar   (with props)
    lucene/solr/trunk/lib/lucene-core-2.9.0-rc4.jar   (with props)
    lucene/solr/trunk/lib/lucene-highlighter-2.9.0-rc4.jar   (with props)
    lucene/solr/trunk/lib/lucene-memory-2.9.0-rc4.jar   (with props)
    lucene/solr/trunk/lib/lucene-misc-2.9.0-rc4.jar   (with props)
    lucene/solr/trunk/lib/lucene-queries-2.9.0-rc4.jar   (with props)
    lucene/solr/trunk/lib/lucene-snowball-2.9.0-rc4.jar   (with props)
    lucene/solr/trunk/lib/lucene-spellchecker-2.9.0-rc4.jar   (with props)
Removed:
    lucene/solr/trunk/lib/lucene-analyzers-2.9.0-rc2.jar
    lucene/solr/trunk/lib/lucene-core-2.9.0-rc2.jar
    lucene/solr/trunk/lib/lucene-highlighter-2.9.0-rc2.jar
    lucene/solr/trunk/lib/lucene-memory-2.9.0-rc2.jar
    lucene/solr/trunk/lib/lucene-misc-2.9.0-rc2.jar
    lucene/solr/trunk/lib/lucene-queries-2.9.0-rc2.jar
    lucene/solr/trunk/lib/lucene-snowball-2.9.0-rc2.jar
    lucene/solr/trunk/lib/lucene-spellchecker-2.9.0-rc2.jar
Modified:
    lucene/solr/trunk/CHANGES.txt
    lucene/solr/trunk/src/java/org/apache/solr/analysis/PatternTokenizerFactory.java

Modified: lucene/solr/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/CHANGES.txt?rev=814329&r1=814328&r2=814329&view=diff
==============================================================================
--- lucene/solr/trunk/CHANGES.txt (original)
+++ lucene/solr/trunk/CHANGES.txt Sun Sep 13 15:08:42 2009
@@ -61,7 +61,7 @@
 
 Versions of Major Components
 ----------------------------
-Apache Lucene 2.9.0-rc2
+Apache Lucene 2.9.0-rc4
 Apache Tika 0.4
 
 Detailed Change List

Added: lucene/solr/trunk/lib/lucene-analyzers-2.9.0-rc4.jar
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/lib/lucene-analyzers-2.9.0-rc4.jar?rev=814329&view=auto
==============================================================================
Binary file - no diff available.

Propchange: lucene/solr/trunk/lib/lucene-analyzers-2.9.0-rc4.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: lucene/solr/trunk/lib/lucene-core-2.9.0-rc4.jar
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/lib/lucene-core-2.9.0-rc4.jar?rev=814329&view=auto
==============================================================================
Binary file - no diff available.

Propchange: lucene/solr/trunk/lib/lucene-core-2.9.0-rc4.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: lucene/solr/trunk/lib/lucene-highlighter-2.9.0-rc4.jar
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/lib/lucene-highlighter-2.9.0-rc4.jar?rev=814329&view=auto
==============================================================================
Binary file - no diff available.

Propchange: lucene/solr/trunk/lib/lucene-highlighter-2.9.0-rc4.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: lucene/solr/trunk/lib/lucene-memory-2.9.0-rc4.jar
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/lib/lucene-memory-2.9.0-rc4.jar?rev=814329&view=auto
==============================================================================
Binary file - no diff available.

Propchange: lucene/solr/trunk/lib/lucene-memory-2.9.0-rc4.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: lucene/solr/trunk/lib/lucene-misc-2.9.0-rc4.jar
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/lib/lucene-misc-2.9.0-rc4.jar?rev=814329&view=auto
==============================================================================
Binary file - no diff available.

Propchange: lucene/solr/trunk/lib/lucene-misc-2.9.0-rc4.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: lucene/solr/trunk/lib/lucene-queries-2.9.0-rc4.jar
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/lib/lucene-queries-2.9.0-rc4.jar?rev=814329&view=auto
==============================================================================
Binary file - no diff available.

Propchange: lucene/solr/trunk/lib/lucene-queries-2.9.0-rc4.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: lucene/solr/trunk/lib/lucene-snowball-2.9.0-rc4.jar
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/lib/lucene-snowball-2.9.0-rc4.jar?rev=814329&view=auto
==============================================================================
Binary file - no diff available.

Propchange: lucene/solr/trunk/lib/lucene-snowball-2.9.0-rc4.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: lucene/solr/trunk/lib/lucene-spellchecker-2.9.0-rc4.jar
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/lib/lucene-spellchecker-2.9.0-rc4.jar?rev=814329&view=auto
==============================================================================
Binary file - no diff available.

Propchange: lucene/solr/trunk/lib/lucene-spellchecker-2.9.0-rc4.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: lucene/solr/trunk/src/java/org/apache/solr/analysis/PatternTokenizerFactory.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/analysis/PatternTokenizerFactory.java?rev=814329&r1=814328&r2=814329&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/analysis/PatternTokenizerFactory.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/analysis/PatternTokenizerFactory.java Sun Sep
13 15:08:42 2009
@@ -164,7 +164,7 @@
    * This behaves just like String.split( ), but returns a list of Tokens
    * rather then an array of strings
    */
-  public static List<Token> split( Matcher matcher, String input, CharStream stream
)
+  public static List<Token> split( Matcher matcher, String input, Reader stream )
   {
     int index = 0;
     int lastNonEmptySize = Integer.MAX_VALUE;
@@ -210,7 +210,7 @@
   /**
    * Create tokens from the matches in a matcher 
    */
-  public static List<Token> group( Matcher matcher, String input, int group, CharStream
stream )
+  public static List<Token> group( Matcher matcher, String input, int group, Reader
stream )
   {
     ArrayList<Token> matchList = new ArrayList<Token>();
     while(matcher.find()) {
@@ -223,12 +223,14 @@
     return matchList;
   }
   
-  private static Token newToken( CharStream stream, String text, int start, int end ){
-    Token token = null;
-    if( stream != null )
+  private static Token newToken(Reader reader, String text, int start, int end ){
+    Token token;
+    if( reader instanceof CharStream) {
+      CharStream stream = (CharStream)reader;
       token = new Token( text, stream.correctOffset( start ), stream.correctOffset( end )
);
-    else
+    } else {
       token = new Token( text, start, end );
+    }
     return token;
   }
 }



Mime
View raw message