svn commit: r922964 - in /lucene/solr/branches/solr/src/java/org/apache/solr/analysis: GreekLowerCaseFilterFactory.java RussianLetterTokenizerFactory.java RussianLowerCaseFilterFactory.java

[rm...@apache.org]

Author: rmuir
Date: Sun Mar 14 21:16:47 2010
New Revision: 922964

URL: http://svn.apache.org/viewvc?rev=922964&view=rev
Log:
give the error message we promised in Solr 1.4 if you use these charsets

Modified:
    lucene/solr/branches/solr/src/java/org/apache/solr/analysis/GreekLowerCaseFilterFactory.java
    lucene/solr/branches/solr/src/java/org/apache/solr/analysis/RussianLetterTokenizerFactory.java
    lucene/solr/branches/solr/src/java/org/apache/solr/analysis/RussianLowerCaseFilterFactory.java

Modified: lucene/solr/branches/solr/src/java/org/apache/solr/analysis/GreekLowerCaseFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/solr/src/java/org/apache/solr/analysis/GreekLowerCaseFilterFactory.java?rev=922964&r1=922963&r2=922964&view=diff
==============================================================================
--- lucene/solr/branches/solr/src/java/org/apache/solr/analysis/GreekLowerCaseFilterFactory.java (original)
+++ lucene/solr/branches/solr/src/java/org/apache/solr/analysis/GreekLowerCaseFilterFactory.java Sun Mar 14 21:16:47 2010
@@ -19,26 +19,25 @@
 
 package org.apache.solr.analysis;
 
-import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.el.GreekLowerCaseFilter;
 import org.apache.solr.common.SolrException;
 import org.apache.solr.common.SolrException.ErrorCode;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 public class GreekLowerCaseFilterFactory extends BaseTokenFilterFactory 
 {
-
-  private static Logger logger = LoggerFactory.getLogger(GreekLowerCaseFilterFactory.class);
-  
+ 
   @Override
   public void init(Map<String, String> args) {
     super.init(args);
-
+    if (args.containsKey("charset"))
+      throw new SolrException(ErrorCode.SERVER_ERROR,
+          "The charset parameter is no longer supported.  "
+          + "Please process your documents as Unicode instead.");
   }
+
   public GreekLowerCaseFilter create(TokenStream in) {
     return new GreekLowerCaseFilter(in);
   }

Modified: lucene/solr/branches/solr/src/java/org/apache/solr/analysis/RussianLetterTokenizerFactory.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/solr/src/java/org/apache/solr/analysis/RussianLetterTokenizerFactory.java?rev=922964&r1=922963&r2=922964&view=diff
==============================================================================
--- lucene/solr/branches/solr/src/java/org/apache/solr/analysis/RussianLetterTokenizerFactory.java (original)
+++ lucene/solr/branches/solr/src/java/org/apache/solr/analysis/RussianLetterTokenizerFactory.java Sun Mar 14 21:16:47 2010
@@ -21,9 +21,19 @@ import java.io.Reader;
 import java.util.Map;
 
 import org.apache.lucene.analysis.ru.RussianLetterTokenizer;
+import org.apache.solr.common.SolrException;
+import org.apache.solr.common.SolrException.ErrorCode;
 
 public class RussianLetterTokenizerFactory extends BaseTokenizerFactory {
 
+  @Override
+  public void init(Map<String, String> args) {
+    super.init(args);
+    if (args.containsKey("charset"))
+      throw new SolrException(ErrorCode.SERVER_ERROR,
+          "The charset parameter is no longer supported.  "
+          + "Please process your documents as Unicode instead.");
+  }
 
   public RussianLetterTokenizer create(Reader in) {
     return new RussianLetterTokenizer(in);

Modified: lucene/solr/branches/solr/src/java/org/apache/solr/analysis/RussianLowerCaseFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/solr/src/java/org/apache/solr/analysis/RussianLowerCaseFilterFactory.java?rev=922964&r1=922963&r2=922964&view=diff
==============================================================================
--- lucene/solr/branches/solr/src/java/org/apache/solr/analysis/RussianLowerCaseFilterFactory.java (original)
+++ lucene/solr/branches/solr/src/java/org/apache/solr/analysis/RussianLowerCaseFilterFactory.java Sun Mar 14 21:16:47 2010
@@ -21,9 +21,20 @@ import java.util.Map;
 
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.ru.RussianLowerCaseFilter;
+import org.apache.solr.common.SolrException;
+import org.apache.solr.common.SolrException.ErrorCode;
 
 public class RussianLowerCaseFilterFactory extends BaseTokenFilterFactory {
 
+  @Override
+  public void init(Map<String, String> args) {
+    super.init(args);
+    if (args.containsKey("charset"))
+      throw new SolrException(ErrorCode.SERVER_ERROR,
+          "The charset parameter is no longer supported.  "
+          + "Please process your documents as Unicode instead.");
+  }
+
   public RussianLowerCaseFilter create(TokenStream in) {
     return new RussianLowerCaseFilter(in);
   }