You are viewing a plain text version of this content. The canonical link for it is here.
Posted to solr-commits@lucene.apache.org by yo...@apache.org on 2006/02/02 23:06:38 UTC
svn commit: r374526 - in /incubator/solr/trunk/src:
java/org/apache/solr/schema/ java/org/apache/solr/search/
java/org/apache/solr/search/function/ lucene_extras/org/apache/lucene/search/
lucene_extras/org/apache/lucene/search/function/
Author: yonik
Date: Thu Feb 2 14:06:28 2006
New Revision: 374526
URL: http://svn.apache.org/viewcvs?rev=374526&view=rev
Log:
move FunctionQuery and ConstantScorePrefixQuery to solr package
Added:
incubator/solr/trunk/src/java/org/apache/solr/search/ConstantScorePrefixQuery.java (contents, props changed)
- copied, changed from r373882, incubator/solr/trunk/src/lucene_extras/org/apache/lucene/search/ConstantScorePrefixQuery.java
incubator/solr/trunk/src/java/org/apache/solr/search/PrefixFilter.java
incubator/solr/trunk/src/java/org/apache/solr/search/function/
- copied from r373882, incubator/solr/trunk/src/lucene_extras/org/apache/lucene/search/function/
Removed:
incubator/solr/trunk/src/java/org/apache/solr/search/function/function.zip
incubator/solr/trunk/src/lucene_extras/org/apache/lucene/search/ConstantScorePrefixQuery.java
incubator/solr/trunk/src/lucene_extras/org/apache/lucene/search/PrefixFilter.java
incubator/solr/trunk/src/lucene_extras/org/apache/lucene/search/function/
Modified:
incubator/solr/trunk/src/java/org/apache/solr/schema/BCDIntField.java
incubator/solr/trunk/src/java/org/apache/solr/schema/BoolField.java
incubator/solr/trunk/src/java/org/apache/solr/schema/DateField.java
incubator/solr/trunk/src/java/org/apache/solr/schema/DoubleField.java
incubator/solr/trunk/src/java/org/apache/solr/schema/FieldType.java
incubator/solr/trunk/src/java/org/apache/solr/schema/FloatField.java
incubator/solr/trunk/src/java/org/apache/solr/schema/IntField.java
incubator/solr/trunk/src/java/org/apache/solr/schema/LongField.java
incubator/solr/trunk/src/java/org/apache/solr/schema/SortableDoubleField.java
incubator/solr/trunk/src/java/org/apache/solr/schema/SortableFloatField.java
incubator/solr/trunk/src/java/org/apache/solr/schema/SortableIntField.java
incubator/solr/trunk/src/java/org/apache/solr/schema/SortableLongField.java
incubator/solr/trunk/src/java/org/apache/solr/search/QueryParsing.java
incubator/solr/trunk/src/java/org/apache/solr/search/function/DocValues.java
incubator/solr/trunk/src/java/org/apache/solr/search/function/FieldCacheSource.java
incubator/solr/trunk/src/java/org/apache/solr/search/function/FloatFieldSource.java
incubator/solr/trunk/src/java/org/apache/solr/search/function/FunctionQuery.java
incubator/solr/trunk/src/java/org/apache/solr/search/function/IntFieldSource.java
incubator/solr/trunk/src/java/org/apache/solr/search/function/LinearFloatFunction.java
incubator/solr/trunk/src/java/org/apache/solr/search/function/OrdFieldSource.java
incubator/solr/trunk/src/java/org/apache/solr/search/function/ReciprocalFloatFunction.java
incubator/solr/trunk/src/java/org/apache/solr/search/function/ReverseOrdFieldSource.java
incubator/solr/trunk/src/java/org/apache/solr/search/function/ValueSource.java
Modified: incubator/solr/trunk/src/java/org/apache/solr/schema/BCDIntField.java
URL: http://svn.apache.org/viewcvs/incubator/solr/trunk/src/java/org/apache/solr/schema/BCDIntField.java?rev=374526&r1=374525&r2=374526&view=diff
==============================================================================
--- incubator/solr/trunk/src/java/org/apache/solr/schema/BCDIntField.java (original)
+++ incubator/solr/trunk/src/java/org/apache/solr/schema/BCDIntField.java Thu Feb 2 14:06:28 2006
@@ -17,7 +17,7 @@
package org.apache.solr.schema;
import org.apache.lucene.search.SortField;
-import org.apache.lucene.search.function.ValueSource;
+import org.apache.solr.search.function.ValueSource;
import org.apache.lucene.document.Field;
import org.apache.solr.util.BCDUtils;
import org.apache.solr.request.XMLWriter;
Modified: incubator/solr/trunk/src/java/org/apache/solr/schema/BoolField.java
URL: http://svn.apache.org/viewcvs/incubator/solr/trunk/src/java/org/apache/solr/schema/BoolField.java?rev=374526&r1=374525&r2=374526&view=diff
==============================================================================
--- incubator/solr/trunk/src/java/org/apache/solr/schema/BoolField.java (original)
+++ incubator/solr/trunk/src/java/org/apache/solr/schema/BoolField.java Thu Feb 2 14:06:28 2006
@@ -17,8 +17,8 @@
package org.apache.solr.schema;
import org.apache.lucene.search.SortField;
-import org.apache.lucene.search.function.ValueSource;
-import org.apache.lucene.search.function.OrdFieldSource;
+import org.apache.solr.search.function.ValueSource;
+import org.apache.solr.search.function.OrdFieldSource;
import org.apache.lucene.analysis.Token;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.TokenStream;
Modified: incubator/solr/trunk/src/java/org/apache/solr/schema/DateField.java
URL: http://svn.apache.org/viewcvs/incubator/solr/trunk/src/java/org/apache/solr/schema/DateField.java?rev=374526&r1=374525&r2=374526&view=diff
==============================================================================
--- incubator/solr/trunk/src/java/org/apache/solr/schema/DateField.java (original)
+++ incubator/solr/trunk/src/java/org/apache/solr/schema/DateField.java Thu Feb 2 14:06:28 2006
@@ -20,8 +20,8 @@
import org.apache.solr.request.XMLWriter;
import org.apache.lucene.document.Field;
import org.apache.lucene.search.SortField;
-import org.apache.lucene.search.function.ValueSource;
-import org.apache.lucene.search.function.OrdFieldSource;
+import org.apache.solr.search.function.ValueSource;
+import org.apache.solr.search.function.OrdFieldSource;
import java.util.Map;
import java.io.IOException;
Modified: incubator/solr/trunk/src/java/org/apache/solr/schema/DoubleField.java
URL: http://svn.apache.org/viewcvs/incubator/solr/trunk/src/java/org/apache/solr/schema/DoubleField.java?rev=374526&r1=374525&r2=374526&view=diff
==============================================================================
--- incubator/solr/trunk/src/java/org/apache/solr/schema/DoubleField.java (original)
+++ incubator/solr/trunk/src/java/org/apache/solr/schema/DoubleField.java Thu Feb 2 14:06:28 2006
@@ -17,8 +17,8 @@
package org.apache.solr.schema;
import org.apache.lucene.search.SortField;
-import org.apache.lucene.search.function.ValueSource;
-import org.apache.lucene.search.function.FloatFieldSource;
+import org.apache.solr.search.function.ValueSource;
+import org.apache.solr.search.function.FloatFieldSource;
import org.apache.lucene.document.Field;
import org.apache.solr.request.XMLWriter;
Modified: incubator/solr/trunk/src/java/org/apache/solr/schema/FieldType.java
URL: http://svn.apache.org/viewcvs/incubator/solr/trunk/src/java/org/apache/solr/schema/FieldType.java?rev=374526&r1=374525&r2=374526&view=diff
==============================================================================
--- incubator/solr/trunk/src/java/org/apache/solr/schema/FieldType.java (original)
+++ incubator/solr/trunk/src/java/org/apache/solr/schema/FieldType.java Thu Feb 2 14:06:28 2006
@@ -22,8 +22,8 @@
import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.Token;
import org.apache.lucene.search.SortField;
-import org.apache.lucene.search.function.ValueSource;
-import org.apache.lucene.search.function.OrdFieldSource;
+import org.apache.solr.search.function.ValueSource;
+import org.apache.solr.search.function.OrdFieldSource;
import org.apache.solr.search.Sorting;
import org.apache.solr.request.XMLWriter;
Modified: incubator/solr/trunk/src/java/org/apache/solr/schema/FloatField.java
URL: http://svn.apache.org/viewcvs/incubator/solr/trunk/src/java/org/apache/solr/schema/FloatField.java?rev=374526&r1=374525&r2=374526&view=diff
==============================================================================
--- incubator/solr/trunk/src/java/org/apache/solr/schema/FloatField.java (original)
+++ incubator/solr/trunk/src/java/org/apache/solr/schema/FloatField.java Thu Feb 2 14:06:28 2006
@@ -17,8 +17,8 @@
package org.apache.solr.schema;
import org.apache.lucene.search.SortField;
-import org.apache.lucene.search.function.ValueSource;
-import org.apache.lucene.search.function.FloatFieldSource;
+import org.apache.solr.search.function.ValueSource;
+import org.apache.solr.search.function.FloatFieldSource;
import org.apache.lucene.document.Field;
import org.apache.solr.request.XMLWriter;
Modified: incubator/solr/trunk/src/java/org/apache/solr/schema/IntField.java
URL: http://svn.apache.org/viewcvs/incubator/solr/trunk/src/java/org/apache/solr/schema/IntField.java?rev=374526&r1=374525&r2=374526&view=diff
==============================================================================
--- incubator/solr/trunk/src/java/org/apache/solr/schema/IntField.java (original)
+++ incubator/solr/trunk/src/java/org/apache/solr/schema/IntField.java Thu Feb 2 14:06:28 2006
@@ -17,8 +17,8 @@
package org.apache.solr.schema;
import org.apache.lucene.search.SortField;
-import org.apache.lucene.search.function.ValueSource;
-import org.apache.lucene.search.function.IntFieldSource;
+import org.apache.solr.search.function.ValueSource;
+import org.apache.solr.search.function.IntFieldSource;
import org.apache.lucene.document.Field;
import org.apache.solr.request.XMLWriter;
Modified: incubator/solr/trunk/src/java/org/apache/solr/schema/LongField.java
URL: http://svn.apache.org/viewcvs/incubator/solr/trunk/src/java/org/apache/solr/schema/LongField.java?rev=374526&r1=374525&r2=374526&view=diff
==============================================================================
--- incubator/solr/trunk/src/java/org/apache/solr/schema/LongField.java (original)
+++ incubator/solr/trunk/src/java/org/apache/solr/schema/LongField.java Thu Feb 2 14:06:28 2006
@@ -17,8 +17,8 @@
package org.apache.solr.schema;
import org.apache.lucene.search.SortField;
-import org.apache.lucene.search.function.ValueSource;
-import org.apache.lucene.search.function.IntFieldSource;
+import org.apache.solr.search.function.ValueSource;
+import org.apache.solr.search.function.IntFieldSource;
import org.apache.lucene.document.Field;
import org.apache.solr.request.XMLWriter;
Modified: incubator/solr/trunk/src/java/org/apache/solr/schema/SortableDoubleField.java
URL: http://svn.apache.org/viewcvs/incubator/solr/trunk/src/java/org/apache/solr/schema/SortableDoubleField.java?rev=374526&r1=374525&r2=374526&view=diff
==============================================================================
--- incubator/solr/trunk/src/java/org/apache/solr/schema/SortableDoubleField.java (original)
+++ incubator/solr/trunk/src/java/org/apache/solr/schema/SortableDoubleField.java Thu Feb 2 14:06:28 2006
@@ -18,9 +18,9 @@
import org.apache.lucene.search.SortField;
import org.apache.lucene.search.FieldCache;
-import org.apache.lucene.search.function.ValueSource;
-import org.apache.lucene.search.function.FieldCacheSource;
-import org.apache.lucene.search.function.DocValues;
+import org.apache.solr.search.function.ValueSource;
+import org.apache.solr.search.function.FieldCacheSource;
+import org.apache.solr.search.function.DocValues;
import org.apache.lucene.document.Field;
import org.apache.lucene.index.IndexReader;
import org.apache.solr.util.NumberUtils;
Modified: incubator/solr/trunk/src/java/org/apache/solr/schema/SortableFloatField.java
URL: http://svn.apache.org/viewcvs/incubator/solr/trunk/src/java/org/apache/solr/schema/SortableFloatField.java?rev=374526&r1=374525&r2=374526&view=diff
==============================================================================
--- incubator/solr/trunk/src/java/org/apache/solr/schema/SortableFloatField.java (original)
+++ incubator/solr/trunk/src/java/org/apache/solr/schema/SortableFloatField.java Thu Feb 2 14:06:28 2006
@@ -18,9 +18,9 @@
import org.apache.lucene.search.SortField;
import org.apache.lucene.search.FieldCache;
-import org.apache.lucene.search.function.ValueSource;
-import org.apache.lucene.search.function.FieldCacheSource;
-import org.apache.lucene.search.function.DocValues;
+import org.apache.solr.search.function.ValueSource;
+import org.apache.solr.search.function.FieldCacheSource;
+import org.apache.solr.search.function.DocValues;
import org.apache.lucene.document.Field;
import org.apache.lucene.index.IndexReader;
import org.apache.solr.util.NumberUtils;
Modified: incubator/solr/trunk/src/java/org/apache/solr/schema/SortableIntField.java
URL: http://svn.apache.org/viewcvs/incubator/solr/trunk/src/java/org/apache/solr/schema/SortableIntField.java?rev=374526&r1=374525&r2=374526&view=diff
==============================================================================
--- incubator/solr/trunk/src/java/org/apache/solr/schema/SortableIntField.java (original)
+++ incubator/solr/trunk/src/java/org/apache/solr/schema/SortableIntField.java Thu Feb 2 14:06:28 2006
@@ -18,9 +18,9 @@
import org.apache.lucene.search.SortField;
import org.apache.lucene.search.FieldCache;
-import org.apache.lucene.search.function.ValueSource;
-import org.apache.lucene.search.function.FieldCacheSource;
-import org.apache.lucene.search.function.DocValues;
+import org.apache.solr.search.function.ValueSource;
+import org.apache.solr.search.function.FieldCacheSource;
+import org.apache.solr.search.function.DocValues;
import org.apache.lucene.document.Field;
import org.apache.lucene.index.IndexReader;
import org.apache.solr.util.NumberUtils;
Modified: incubator/solr/trunk/src/java/org/apache/solr/schema/SortableLongField.java
URL: http://svn.apache.org/viewcvs/incubator/solr/trunk/src/java/org/apache/solr/schema/SortableLongField.java?rev=374526&r1=374525&r2=374526&view=diff
==============================================================================
--- incubator/solr/trunk/src/java/org/apache/solr/schema/SortableLongField.java (original)
+++ incubator/solr/trunk/src/java/org/apache/solr/schema/SortableLongField.java Thu Feb 2 14:06:28 2006
@@ -18,9 +18,9 @@
import org.apache.lucene.search.SortField;
import org.apache.lucene.search.FieldCache;
-import org.apache.lucene.search.function.ValueSource;
-import org.apache.lucene.search.function.FieldCacheSource;
-import org.apache.lucene.search.function.DocValues;
+import org.apache.solr.search.function.ValueSource;
+import org.apache.solr.search.function.FieldCacheSource;
+import org.apache.solr.search.function.DocValues;
import org.apache.lucene.document.Field;
import org.apache.lucene.index.IndexReader;
import org.apache.solr.util.NumberUtils;
Copied: incubator/solr/trunk/src/java/org/apache/solr/search/ConstantScorePrefixQuery.java (from r373882, incubator/solr/trunk/src/lucene_extras/org/apache/lucene/search/ConstantScorePrefixQuery.java)
URL: http://svn.apache.org/viewcvs/incubator/solr/trunk/src/java/org/apache/solr/search/ConstantScorePrefixQuery.java?p2=incubator/solr/trunk/src/java/org/apache/solr/search/ConstantScorePrefixQuery.java&p1=incubator/solr/trunk/src/lucene_extras/org/apache/lucene/search/ConstantScorePrefixQuery.java&r1=373882&r2=374526&rev=374526&view=diff
==============================================================================
--- incubator/solr/trunk/src/lucene_extras/org/apache/lucene/search/ConstantScorePrefixQuery.java (original)
+++ incubator/solr/trunk/src/java/org/apache/solr/search/ConstantScorePrefixQuery.java Thu Feb 2 14:06:28 2006
@@ -14,10 +14,12 @@
* limitations under the License.
*/
-package org.apache.lucene.search;
+package org.apache.solr.search;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.Term;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.search.ConstantScoreQuery;
import java.io.IOException;
Propchange: incubator/solr/trunk/src/java/org/apache/solr/search/ConstantScorePrefixQuery.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/solr/trunk/src/java/org/apache/solr/search/PrefixFilter.java
URL: http://svn.apache.org/viewcvs/incubator/solr/trunk/src/java/org/apache/solr/search/PrefixFilter.java?rev=374526&view=auto
==============================================================================
--- incubator/solr/trunk/src/java/org/apache/solr/search/PrefixFilter.java (added)
+++ incubator/solr/trunk/src/java/org/apache/solr/search/PrefixFilter.java Thu Feb 2 14:06:28 2006
@@ -0,0 +1,79 @@
+package org.apache.solr.search;
+
+import org.apache.lucene.search.Filter;
+import org.apache.lucene.index.Term;
+import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.index.TermEnum;
+import org.apache.lucene.index.TermDocs;
+
+import java.util.BitSet;
+import java.io.IOException;
+
+/**
+ * @author yonik
+ * @version $Id: PrefixFilter.java,v 1.1 2005/06/10 05:47:32 yonik Exp $
+ */
+public class PrefixFilter extends Filter {
+ protected final Term prefix;
+
+ PrefixFilter(Term prefix) {
+ this.prefix = prefix;
+ }
+
+ Term getPrefix() { return prefix; }
+
+ public BitSet bits(IndexReader reader) throws IOException {
+ final BitSet bitSet = new BitSet(reader.maxDoc());
+ new PrefixGenerator(prefix) {
+ public void handleDoc(int doc) {
+ bitSet.set(doc);
+ }
+ }.generate(reader);
+ return bitSet;
+ }
+}
+
+// keep this protected until I decide if it's a good way
+// to separate id generation from collection (or should
+// I just reuse hitcollector???)
+interface IdGenerator {
+ public void generate(IndexReader reader) throws IOException;
+ public void handleDoc(int doc);
+}
+
+
+abstract class PrefixGenerator implements IdGenerator {
+ protected final Term prefix;
+
+ PrefixGenerator(Term prefix) {
+ this.prefix = prefix;
+ }
+
+ public void generate(IndexReader reader) throws IOException {
+ TermEnum enumerator = reader.terms(prefix);
+ TermDocs termDocs = reader.termDocs();
+
+ try {
+
+ String prefixText = prefix.text();
+ String prefixField = prefix.field();
+ do {
+ Term term = enumerator.term();
+ if (term != null &&
+ term.text().startsWith(prefixText) &&
+ term.field() == prefixField)
+ {
+ termDocs.seek(term);
+ while (termDocs.next()) {
+ handleDoc(termDocs.doc());
+ }
+ } else {
+ break;
+ }
+ } while (enumerator.next());
+ } finally {
+ termDocs.close();
+ enumerator.close();
+ }
+ }
+}
Modified: incubator/solr/trunk/src/java/org/apache/solr/search/QueryParsing.java
URL: http://svn.apache.org/viewcvs/incubator/solr/trunk/src/java/org/apache/solr/search/QueryParsing.java?rev=374526&r1=374525&r2=374526&view=diff
==============================================================================
--- incubator/solr/trunk/src/java/org/apache/solr/search/QueryParsing.java (original)
+++ incubator/solr/trunk/src/java/org/apache/solr/search/QueryParsing.java Thu Feb 2 14:06:28 2006
@@ -17,7 +17,7 @@
package org.apache.solr.search;
import org.apache.lucene.search.*;
-import org.apache.lucene.search.function.*;
+import org.apache.solr.search.function.*;
import org.apache.lucene.queryParser.ParseException;
import org.apache.lucene.document.Field;
import org.apache.lucene.index.Term;
Modified: incubator/solr/trunk/src/java/org/apache/solr/search/function/DocValues.java
URL: http://svn.apache.org/viewcvs/incubator/solr/trunk/src/java/org/apache/solr/search/function/DocValues.java?rev=374526&r1=373882&r2=374526&view=diff
==============================================================================
--- incubator/solr/trunk/src/java/org/apache/solr/search/function/DocValues.java (original)
+++ incubator/solr/trunk/src/java/org/apache/solr/search/function/DocValues.java Thu Feb 2 14:06:28 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.lucene.search.function;
+package org.apache.solr.search.function;
import org.apache.lucene.search.Explanation;
Modified: incubator/solr/trunk/src/java/org/apache/solr/search/function/FieldCacheSource.java
URL: http://svn.apache.org/viewcvs/incubator/solr/trunk/src/java/org/apache/solr/search/function/FieldCacheSource.java?rev=374526&r1=373882&r2=374526&view=diff
==============================================================================
--- incubator/solr/trunk/src/java/org/apache/solr/search/function/FieldCacheSource.java (original)
+++ incubator/solr/trunk/src/java/org/apache/solr/search/function/FieldCacheSource.java Thu Feb 2 14:06:28 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.lucene.search.function;
+package org.apache.solr.search.function;
import org.apache.lucene.search.FieldCache;
Modified: incubator/solr/trunk/src/java/org/apache/solr/search/function/FloatFieldSource.java
URL: http://svn.apache.org/viewcvs/incubator/solr/trunk/src/java/org/apache/solr/search/function/FloatFieldSource.java?rev=374526&r1=373882&r2=374526&view=diff
==============================================================================
--- incubator/solr/trunk/src/java/org/apache/solr/search/function/FloatFieldSource.java (original)
+++ incubator/solr/trunk/src/java/org/apache/solr/search/function/FloatFieldSource.java Thu Feb 2 14:06:28 2006
@@ -14,11 +14,10 @@
* limitations under the License.
*/
-package org.apache.lucene.search.function;
+package org.apache.solr.search.function;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.search.function.DocValues;
-import org.apache.lucene.search.function.ValueSource;
+import org.apache.solr.search.function.DocValues;
import org.apache.lucene.search.FieldCache;
import java.io.IOException;
Modified: incubator/solr/trunk/src/java/org/apache/solr/search/function/FunctionQuery.java
URL: http://svn.apache.org/viewcvs/incubator/solr/trunk/src/java/org/apache/solr/search/function/FunctionQuery.java?rev=374526&r1=373882&r2=374526&view=diff
==============================================================================
--- incubator/solr/trunk/src/java/org/apache/solr/search/function/FunctionQuery.java (original)
+++ incubator/solr/trunk/src/java/org/apache/solr/search/function/FunctionQuery.java Thu Feb 2 14:06:28 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.lucene.search.function;
+package org.apache.solr.search.function;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.search.*;
Modified: incubator/solr/trunk/src/java/org/apache/solr/search/function/IntFieldSource.java
URL: http://svn.apache.org/viewcvs/incubator/solr/trunk/src/java/org/apache/solr/search/function/IntFieldSource.java?rev=374526&r1=373882&r2=374526&view=diff
==============================================================================
--- incubator/solr/trunk/src/java/org/apache/solr/search/function/IntFieldSource.java (original)
+++ incubator/solr/trunk/src/java/org/apache/solr/search/function/IntFieldSource.java Thu Feb 2 14:06:28 2006
@@ -14,11 +14,10 @@
* limitations under the License.
*/
-package org.apache.lucene.search.function;
+package org.apache.solr.search.function;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.search.function.DocValues;
-import org.apache.lucene.search.function.ValueSource;
+import org.apache.solr.search.function.DocValues;
import org.apache.lucene.search.FieldCache;
import java.io.IOException;
Modified: incubator/solr/trunk/src/java/org/apache/solr/search/function/LinearFloatFunction.java
URL: http://svn.apache.org/viewcvs/incubator/solr/trunk/src/java/org/apache/solr/search/function/LinearFloatFunction.java?rev=374526&r1=373882&r2=374526&view=diff
==============================================================================
--- incubator/solr/trunk/src/java/org/apache/solr/search/function/LinearFloatFunction.java (original)
+++ incubator/solr/trunk/src/java/org/apache/solr/search/function/LinearFloatFunction.java Thu Feb 2 14:06:28 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.lucene.search.function;
+package org.apache.solr.search.function;
import org.apache.lucene.index.IndexReader;
Modified: incubator/solr/trunk/src/java/org/apache/solr/search/function/OrdFieldSource.java
URL: http://svn.apache.org/viewcvs/incubator/solr/trunk/src/java/org/apache/solr/search/function/OrdFieldSource.java?rev=374526&r1=373882&r2=374526&view=diff
==============================================================================
--- incubator/solr/trunk/src/java/org/apache/solr/search/function/OrdFieldSource.java (original)
+++ incubator/solr/trunk/src/java/org/apache/solr/search/function/OrdFieldSource.java Thu Feb 2 14:06:28 2006
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-package org.apache.lucene.search.function;
+package org.apache.solr.search.function;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.search.function.DocValues;
-import org.apache.lucene.search.function.ValueSource;
+import org.apache.solr.search.function.DocValues;
+import org.apache.solr.search.function.ValueSource;
import org.apache.lucene.search.FieldCache;
import java.io.IOException;
Modified: incubator/solr/trunk/src/java/org/apache/solr/search/function/ReciprocalFloatFunction.java
URL: http://svn.apache.org/viewcvs/incubator/solr/trunk/src/java/org/apache/solr/search/function/ReciprocalFloatFunction.java?rev=374526&r1=373882&r2=374526&view=diff
==============================================================================
--- incubator/solr/trunk/src/java/org/apache/solr/search/function/ReciprocalFloatFunction.java (original)
+++ incubator/solr/trunk/src/java/org/apache/solr/search/function/ReciprocalFloatFunction.java Thu Feb 2 14:06:28 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.lucene.search.function;
+package org.apache.solr.search.function;
import org.apache.lucene.index.IndexReader;
@@ -22,7 +22,7 @@
/**
* <code>ReciprocalFloatFunction</code> implements a reciprocal function f(x) = a/(mx+b), based on
- * the float value of a field as exported by {@link org.apache.lucene.search.function.ValueSource}.
+ * the float value of a field as exported by {@link org.apache.solr.search.function.ValueSource}.
* <br>
*
* When a and b are equal, and x>=0, this function has a maximum value of 1 that drops as x increases.
Modified: incubator/solr/trunk/src/java/org/apache/solr/search/function/ReverseOrdFieldSource.java
URL: http://svn.apache.org/viewcvs/incubator/solr/trunk/src/java/org/apache/solr/search/function/ReverseOrdFieldSource.java?rev=374526&r1=373882&r2=374526&view=diff
==============================================================================
--- incubator/solr/trunk/src/java/org/apache/solr/search/function/ReverseOrdFieldSource.java (original)
+++ incubator/solr/trunk/src/java/org/apache/solr/search/function/ReverseOrdFieldSource.java Thu Feb 2 14:06:28 2006
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-package org.apache.lucene.search.function;
+package org.apache.solr.search.function;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.search.function.DocValues;
-import org.apache.lucene.search.function.ValueSource;
+import org.apache.solr.search.function.DocValues;
+import org.apache.solr.search.function.ValueSource;
import org.apache.lucene.search.FieldCache;
import java.io.IOException;
Modified: incubator/solr/trunk/src/java/org/apache/solr/search/function/ValueSource.java
URL: http://svn.apache.org/viewcvs/incubator/solr/trunk/src/java/org/apache/solr/search/function/ValueSource.java?rev=374526&r1=373882&r2=374526&view=diff
==============================================================================
--- incubator/solr/trunk/src/java/org/apache/solr/search/function/ValueSource.java (original)
+++ incubator/solr/trunk/src/java/org/apache/solr/search/function/ValueSource.java Thu Feb 2 14:06:28 2006
@@ -14,16 +14,16 @@
* limitations under the License.
*/
-package org.apache.lucene.search.function;
+package org.apache.solr.search.function;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.search.function.DocValues;
+import org.apache.solr.search.function.DocValues;
import java.io.IOException;
import java.io.Serializable;
/**
- * Instantiates {@link org.apache.lucene.search.function.DocValues} for a particular reader.
+ * Instantiates {@link org.apache.solr.search.function.DocValues} for a particular reader.
* <br>
* Often used when creating a {@link FunctionQuery}.
*