Author: otis
Date: Thu Jul 19 06:45:12 2007
New Revision: 557622
URL: http://svn.apache.org/viewvc?view=rev&rev=557622
Log:
- SOLR-307: Added Factories for NGram Filters.
Added:
lucene/solr/trunk/src/java/org/apache/solr/analysis/EdgeNGramFilterFactory.java
lucene/solr/trunk/src/java/org/apache/solr/analysis/NGramFilterFactory.java
Modified:
lucene/solr/trunk/CHANGES.txt
Modified: lucene/solr/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/lucene/solr/trunk/CHANGES.txt?view=diff&rev=557622&r1=557621&r2=557622
==============================================================================
--- lucene/solr/trunk/CHANGES.txt (original)
+++ lucene/solr/trunk/CHANGES.txt Thu Jul 19 06:45:12 2007
@@ -103,7 +103,10 @@
17. SOLR-248: Added CapitalizationFilterFactory that creates tokens with
normalized capitalization. This filter is useful for facet display,
but will not work with a prefix query. (ryan)
-
+
+18. SOLR-307: Added NGramFilterFactory and EdgeNGramFilterFactory.
+ (Thomas Peuss via Otis Gospodnetic)
+
Changes in runtime behavior
Optimizations
Added:
lucene/solr/trunk/src/java/org/apache/solr/analysis/EdgeNGramFilterFactory.java
URL:
http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/analysis/EdgeNGramFilterFactory.java?view=auto&rev=557622
==============================================================================
---
lucene/solr/trunk/src/java/org/apache/solr/analysis/EdgeNGramFilterFactory.java
(added)
+++
lucene/solr/trunk/src/java/org/apache/solr/analysis/EdgeNGramFilterFactory.java
Thu Jul 19 06:45:12 2007
@@ -0,0 +1,55 @@
+package org.apache.solr.analysis;
+
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import java.util.Map;
+
+import org.apache.lucene.analysis.TokenStream;
+import org.apache.lucene.analysis.ngram.EdgeNGramTokenFilter;
+
+/**
+ * Creates new instances of [EMAIL PROTECTED] EdgeNGramTokenFilter}.
+ */
+public class EdgeNGramFilterFactory extends BaseTokenFilterFactory {
+ private int maxGramSize = 0;
+
+ private int minGramSize = 0;
+
+ private String side;
+
+ @Override
+ public void init(Map<String, String> args) {
+ super.init(args);
+ String maxArg = args.get("maxGramSize");
+ maxGramSize = (maxArg != null ? Integer.parseInt(maxArg)
+ : EdgeNGramTokenFilter.DEFAULT_MAX_GRAM_SIZE);
+
+ String minArg = args.get("minGramSize");
+ minGramSize = (minArg != null ? Integer.parseInt(minArg)
+ : EdgeNGramTokenFilter.DEFAULT_MIN_GRAM_SIZE);
+
+ side = args.get("side");
+ if (side == null) {
+ side = EdgeNGramTokenFilter.Side.FRONT.getLabel();
+ }
+ }
+
+ public TokenStream create(TokenStream input) {
+ return new EdgeNGramTokenFilter(input, side, minGramSize, maxGramSize);
+ }
+}
Added:
lucene/solr/trunk/src/java/org/apache/solr/analysis/NGramFilterFactory.java
URL:
http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/analysis/NGramFilterFactory.java?view=auto&rev=557622
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/analysis/NGramFilterFactory.java
(added)
+++ lucene/solr/trunk/src/java/org/apache/solr/analysis/NGramFilterFactory.java
Thu Jul 19 06:45:12 2007
@@ -0,0 +1,49 @@
+package org.apache.solr.analysis;
+
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import java.util.Map;
+
+import org.apache.lucene.analysis.TokenStream;
+import org.apache.lucene.analysis.ngram.NGramTokenFilter;
+
+/**
+ * Creates new instances of [EMAIL PROTECTED] NGramTokenFilter}.
+ */
+public class NGramFilterFactory extends BaseTokenFilterFactory {
+ private int maxGramSize = 0;
+
+ private int minGramSize = 0;
+
+ /** Initializes the n-gram min and max sizes and the side from which one
should start tokenizing. */
+ @Override
+ public void init(Map<String, String> args) {
+ super.init(args);
+ String maxArg = args.get("maxGramSize");
+ maxGramSize = (maxArg != null ? Integer.parseInt(maxArg)
+ : NGramTokenFilter.DEFAULT_MAX_NGRAM_SIZE);
+
+ String minArg = args.get("minGramSize");
+ minGramSize = (minArg != null ? Integer.parseInt(minArg)
+ : NGramTokenFilter.DEFAULT_MIN_NGRAM_SIZE);
+ }
+
+ public TokenStream create(TokenStream input) {
+ return new NGramTokenFilter(input, minGramSize, maxGramSize);
+ }
+}
