Author: yonik
Date: Thu Feb 2 13:37:12 2006
New Revision: 374513
URL: http://svn.apache.org/viewcvs?rev=374513&view=rev
Log:
move SynonymFilter and SynonymMap to solr package
Added:
incubator/solr/trunk/src/java/org/apache/solr/analysis/SynonymFilter.java
(contents, props changed)
- copied, changed from r373882,
incubator/solr/trunk/src/lucene_extras/org/apache/lucene/analysis/SynonymFilter.java
incubator/solr/trunk/src/java/org/apache/solr/analysis/SynonymMap.java
(contents, props changed)
- copied, changed from r373882,
incubator/solr/trunk/src/lucene_extras/org/apache/lucene/analysis/SynonymMap.java
Removed:
incubator/solr/trunk/src/lucene_extras/org/apache/lucene/analysis/
Modified:
incubator/solr/trunk/src/java/org/apache/solr/analysis/SynonymFilterFactory.java
incubator/solr/trunk/src/test/org/apache/solr/analysis/TestSynonymFilter.java
Copied:
incubator/solr/trunk/src/java/org/apache/solr/analysis/SynonymFilter.java (from
r373882,
incubator/solr/trunk/src/lucene_extras/org/apache/lucene/analysis/SynonymFilter.java)
URL:
http://svn.apache.org/viewcvs/incubator/solr/trunk/src/java/org/apache/solr/analysis/SynonymFilter.java?p2=incubator/solr/trunk/src/java/org/apache/solr/analysis/SynonymFilter.java&p1=incubator/solr/trunk/src/lucene_extras/org/apache/lucene/analysis/SynonymFilter.java&r1=373882&r2=374513&rev=374513&view=diff
==============================================================================
---
incubator/solr/trunk/src/lucene_extras/org/apache/lucene/analysis/SynonymFilter.java
(original)
+++ incubator/solr/trunk/src/java/org/apache/solr/analysis/SynonymFilter.java
Thu Feb 2 13:37:12 2006
@@ -14,10 +14,16 @@
* limitations under the License.
*/
-package org.apache.lucene.analysis;
+package org.apache.solr.analysis;
+
+import org.apache.lucene.analysis.Token;
+import org.apache.lucene.analysis.TokenFilter;
+import org.apache.lucene.analysis.TokenStream;
import java.io.IOException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.LinkedList;
/** SynonymFilter handles multi-token synonyms with variable position
increment offsets.
* <p>
@@ -73,7 +79,7 @@
// common case fast-path of first token not matching anything
Token firstTok = nextTok();
if (firstTok ==null) return null;
- String str = ignoreCase ? firstTok.termText.toLowerCase() :
firstTok.termText;
+ String str = ignoreCase ? firstTok.termText().toLowerCase() :
firstTok.termText();
Object o = map.submap!=null ? map.submap.get(str) : null;
if (o == null) return firstTok;
@@ -106,7 +112,7 @@
for (int i=0; i<result.synonyms.length; i++) {
Token repTok = result.synonyms[i];
- Token newTok = new Token(repTok.termText, firstTok.startOffset,
lastTok.endOffset, firstTok.type);
+ Token newTok = new Token(repTok.termText(), firstTok.startOffset(),
lastTok.endOffset(), firstTok.type());
repPos += repTok.getPositionIncrement();
if (i==0) repPos=origPos; // make position of first token equal to
original
@@ -176,7 +182,7 @@
Token tok = nextTok();
if (tok != null) {
// check for positionIncrement!=1? if>1, should not match, if==0,
check multiple at this level?
- String str = ignoreCase ? tok.termText.toLowerCase() : tok.termText;
+ String str = ignoreCase ? tok.termText().toLowerCase() :
tok.termText();
SynonymMap subMap = (SynonymMap)map.submap.get(str);
Propchange:
incubator/solr/trunk/src/java/org/apache/solr/analysis/SynonymFilter.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
incubator/solr/trunk/src/java/org/apache/solr/analysis/SynonymFilterFactory.java
URL:
http://svn.apache.org/viewcvs/incubator/solr/trunk/src/java/org/apache/solr/analysis/SynonymFilterFactory.java?rev=374513&r1=374512&r2=374513&view=diff
==============================================================================
---
incubator/solr/trunk/src/java/org/apache/solr/analysis/SynonymFilterFactory.java
(original)
+++
incubator/solr/trunk/src/java/org/apache/solr/analysis/SynonymFilterFactory.java
Thu Feb 2 13:37:12 2006
@@ -17,18 +17,14 @@
package org.apache.solr.analysis;
import org.apache.lucene.analysis.TokenStream;
-import org.apache.lucene.analysis.SynonymFilter;
-import org.apache.lucene.analysis.SynonymMap;
+import org.apache.solr.core.Config;
+import org.apache.solr.core.SolrCore;
+import org.apache.solr.util.StrUtils;
-import java.util.Map;
+import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import java.io.IOException;
-
-import org.apache.solr.util.StrUtils;
-import org.apache.solr.analysis.BaseTokenFilterFactory;
-import org.apache.solr.core.Config;
-import org.apache.solr.core.SolrCore;
+import java.util.Map;
/**
* @author yonik
* @version $Id$
Copied: incubator/solr/trunk/src/java/org/apache/solr/analysis/SynonymMap.java
(from r373882,
incubator/solr/trunk/src/lucene_extras/org/apache/lucene/analysis/SynonymMap.java)
URL:
http://svn.apache.org/viewcvs/incubator/solr/trunk/src/java/org/apache/solr/analysis/SynonymMap.java?p2=incubator/solr/trunk/src/java/org/apache/solr/analysis/SynonymMap.java&p1=incubator/solr/trunk/src/lucene_extras/org/apache/lucene/analysis/SynonymMap.java&r1=373882&r2=374513&rev=374513&view=diff
==============================================================================
---
incubator/solr/trunk/src/lucene_extras/org/apache/lucene/analysis/SynonymMap.java
(original)
+++ incubator/solr/trunk/src/java/org/apache/solr/analysis/SynonymMap.java Thu
Feb 2 13:37:12 2006
@@ -14,11 +14,13 @@
* limitations under the License.
*/
-package org.apache.lucene.analysis;
+package org.apache.solr.analysis;
+
+import org.apache.lucene.analysis.Token;
import java.util.*;
-/** Mapping rules for use with [EMAIL PROTECTED] SynonymFilter}
+/** Mapping rules for use with [EMAIL PROTECTED]
org.apache.solr.analysis.SynonymFilter}
*
* @author yonik
* @version $Id: SynonymMap.java,v 1.2 2005/12/13 05:15:08 yonik Exp $
@@ -121,7 +123,7 @@
int pos2 = tok2!=null ? tok2.getPositionIncrement() : 0;
while(tok1!=null || tok2!=null) {
while (tok1 != null && (pos1 <= pos2 || tok2==null)) {
- Token tok = new Token(tok1.termText, tok1.startOffset, tok1.endOffset,
tok1.type);
+ Token tok = new Token(tok1.termText(), tok1.startOffset(),
tok1.endOffset(), tok1.type());
tok.setPositionIncrement(pos1-pos);
result.add(tok);
pos=pos1;
@@ -129,7 +131,7 @@
pos1 += tok1!=null ? tok1.getPositionIncrement() : 0;
}
while (tok2 != null && (pos2 <= pos1 || tok1==null)) {
- Token tok = new Token(tok2.termText, tok2.startOffset, tok2.endOffset,
tok2.type);
+ Token tok = new Token(tok2.termText(), tok2.startOffset(),
tok2.endOffset(), tok2.type());
tok.setPositionIncrement(pos2-pos);
result.add(tok);
pos=pos2;
Propchange:
incubator/solr/trunk/src/java/org/apache/solr/analysis/SynonymMap.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
incubator/solr/trunk/src/test/org/apache/solr/analysis/TestSynonymFilter.java
URL:
http://svn.apache.org/viewcvs/incubator/solr/trunk/src/test/org/apache/solr/analysis/TestSynonymFilter.java?rev=374513&r1=374512&r2=374513&view=diff
==============================================================================
---
incubator/solr/trunk/src/test/org/apache/solr/analysis/TestSynonymFilter.java
(original)
+++
incubator/solr/trunk/src/test/org/apache/solr/analysis/TestSynonymFilter.java
Thu Feb 2 13:37:12 2006
@@ -17,6 +17,8 @@
package org.apache.solr.analysis;
import junit.framework.TestCase;
+import org.apache.lucene.analysis.Token;
+import org.apache.lucene.analysis.TokenStream;
import java.io.IOException;
import java.util.ArrayList;
