You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by va...@apache.org on 2009/11/25 05:08:18 UTC
svn commit: r883975 [1/3] - in /lucene/pylucene/trunk: ./
java/org/apache/pylucene/search/ jcc/ samples/LuceneInAction/
samples/LuceneInAction/lia/advsearching/ samples/LuceneInAction/lia/analysis/
samples/LuceneInAction/lia/analysis/i18n/ samples/Luce...
Author: vajda
Date: Wed Nov 25 04:08:13 2009
New Revision: 883975
URL: http://svn.apache.org/viewvc?rev=883975&view=rev
Log:
- "Lucene in Action" samples converted to new Lucene 3.0 API
Added:
lucene/pylucene/trunk/samples/LuceneInAction/CollectorTest.py
- copied, changed from r820102, lucene/pylucene/trunk/samples/LuceneInAction/HitCollectorTest.py
lucene/pylucene/trunk/samples/LuceneInAction/MultiPhraseQueryTest.py
- copied, changed from r820102, lucene/pylucene/trunk/samples/LuceneInAction/PhrasePrefixQueryTest.py
lucene/pylucene/trunk/samples/LuceneInAction/NumericRangeQueryTest.py (with props)
lucene/pylucene/trunk/samples/LuceneInAction/TermRangeQueryTest.py
- copied, changed from r820102, lucene/pylucene/trunk/samples/LuceneInAction/RangeQueryTest.py
lucene/pylucene/trunk/samples/LuceneInAction/lia/advsearching/MultiPhraseQueryTest.py
- copied, changed from r820102, lucene/pylucene/trunk/samples/LuceneInAction/lia/advsearching/PhrasePrefixQueryTest.py
lucene/pylucene/trunk/samples/LuceneInAction/lia/extsearch/collector/
lucene/pylucene/trunk/samples/LuceneInAction/lia/extsearch/collector/BookLinkCollector.py (with props)
lucene/pylucene/trunk/samples/LuceneInAction/lia/extsearch/collector/CollectorTest.py (with props)
lucene/pylucene/trunk/samples/LuceneInAction/lia/extsearch/collector/__init__.py (with props)
lucene/pylucene/trunk/samples/LuceneInAction/lia/extsearch/filters/TestSpecialsAccessor.py
- copied, changed from r820102, lucene/pylucene/trunk/samples/LuceneInAction/lia/extsearch/filters/MockSpecialsAccessor.py
lucene/pylucene/trunk/samples/LuceneInAction/lia/searching/NumericRangeQueryTest.py (with props)
lucene/pylucene/trunk/samples/LuceneInAction/lia/searching/TermRangeQueryTest.py
- copied, changed from r820102, lucene/pylucene/trunk/samples/LuceneInAction/lia/searching/RangeQueryTest.py
Removed:
lucene/pylucene/trunk/samples/LuceneInAction/HitCollectorTest.py
lucene/pylucene/trunk/samples/LuceneInAction/PhrasePrefixQueryTest.py
lucene/pylucene/trunk/samples/LuceneInAction/RangeQueryTest.py
lucene/pylucene/trunk/samples/LuceneInAction/lia/advsearching/PhrasePrefixQueryTest.py
lucene/pylucene/trunk/samples/LuceneInAction/lia/extsearch/filters/MockSpecialsAccessor.py
lucene/pylucene/trunk/samples/LuceneInAction/lia/extsearch/hitcollector/
lucene/pylucene/trunk/samples/LuceneInAction/lia/searching/RangeQueryTest.py
Modified:
lucene/pylucene/trunk/CHANGES
lucene/pylucene/trunk/Makefile
lucene/pylucene/trunk/java/org/apache/pylucene/search/PythonFilter.java
lucene/pylucene/trunk/jcc/CHANGES
lucene/pylucene/trunk/samples/LuceneInAction/AdvancedQueryParserTest.py
lucene/pylucene/trunk/samples/LuceneInAction/AnalysisParalysisTest.py
lucene/pylucene/trunk/samples/LuceneInAction/AnalyzerDemo.py
lucene/pylucene/trunk/samples/LuceneInAction/AnalyzerUtils.py
lucene/pylucene/trunk/samples/LuceneInAction/BasicSearchingTest.py
lucene/pylucene/trunk/samples/LuceneInAction/BerkeleyDbIndexer.py
lucene/pylucene/trunk/samples/LuceneInAction/BerkeleyDbSearcher.py
lucene/pylucene/trunk/samples/LuceneInAction/BooksLikeThis.py
lucene/pylucene/trunk/samples/LuceneInAction/BooleanQueryTest.py
lucene/pylucene/trunk/samples/LuceneInAction/CategorizerTest.py
lucene/pylucene/trunk/samples/LuceneInAction/ChineseTest.py
lucene/pylucene/trunk/samples/LuceneInAction/CompoundVersusMultiFileIndexTest.py
lucene/pylucene/trunk/samples/LuceneInAction/DistanceSortingTest.py
lucene/pylucene/trunk/samples/LuceneInAction/DocumentDeleteTest.py
lucene/pylucene/trunk/samples/LuceneInAction/DocumentUpdateTest.py
lucene/pylucene/trunk/samples/LuceneInAction/Explainer.py
lucene/pylucene/trunk/samples/LuceneInAction/FS2RAMDirectoryTest.py
lucene/pylucene/trunk/samples/LuceneInAction/FSversusRAMDirectoryTest.py
lucene/pylucene/trunk/samples/LuceneInAction/FieldLengthTest.py
lucene/pylucene/trunk/samples/LuceneInAction/FileIndexer.py
lucene/pylucene/trunk/samples/LuceneInAction/FilterTest.py
lucene/pylucene/trunk/samples/LuceneInAction/HighlightIt.py
lucene/pylucene/trunk/samples/LuceneInAction/HighlightTest.py
lucene/pylucene/trunk/samples/LuceneInAction/IndexTuningDemo.py
lucene/pylucene/trunk/samples/LuceneInAction/Indexer.py
lucene/pylucene/trunk/samples/LuceneInAction/KeywordAnalyzerTest.py
lucene/pylucene/trunk/samples/LuceneInAction/LockTest.py
lucene/pylucene/trunk/samples/LuceneInAction/MultiFieldQueryParserTest.py
lucene/pylucene/trunk/samples/LuceneInAction/MultiSearcherTest.py
lucene/pylucene/trunk/samples/LuceneInAction/PhraseQueryTest.py
lucene/pylucene/trunk/samples/LuceneInAction/PositionalPorterStopAnalyzerTest.py
lucene/pylucene/trunk/samples/LuceneInAction/PrefixQueryTest.py
lucene/pylucene/trunk/samples/LuceneInAction/QueryParserTest.py
lucene/pylucene/trunk/samples/LuceneInAction/ScoreTest.py
lucene/pylucene/trunk/samples/LuceneInAction/Searcher.py
lucene/pylucene/trunk/samples/LuceneInAction/SecurityFilterTest.py
lucene/pylucene/trunk/samples/LuceneInAction/SnowballTest.py
lucene/pylucene/trunk/samples/LuceneInAction/SortingExample.py
lucene/pylucene/trunk/samples/LuceneInAction/SpanQueryTest.py
lucene/pylucene/trunk/samples/LuceneInAction/SpecialsFilterTest.py
lucene/pylucene/trunk/samples/LuceneInAction/StopAnalyzerAlternativeTest.py
lucene/pylucene/trunk/samples/LuceneInAction/StopAnalyzerTest.py
lucene/pylucene/trunk/samples/LuceneInAction/SynonymAnalyzerTest.py
lucene/pylucene/trunk/samples/LuceneInAction/SynonymAnalyzerViewer.py
lucene/pylucene/trunk/samples/LuceneInAction/T9er.py
lucene/pylucene/trunk/samples/LuceneInAction/VerboseIndexing.py
lucene/pylucene/trunk/samples/LuceneInAction/index.py
lucene/pylucene/trunk/samples/LuceneInAction/lia/advsearching/CategorizerTest.py
lucene/pylucene/trunk/samples/LuceneInAction/lia/advsearching/FilterTest.py
lucene/pylucene/trunk/samples/LuceneInAction/lia/advsearching/MultiFieldQueryParserTest.py
lucene/pylucene/trunk/samples/LuceneInAction/lia/advsearching/MultiSearcherTest.py
lucene/pylucene/trunk/samples/LuceneInAction/lia/advsearching/SecurityFilterTest.py
lucene/pylucene/trunk/samples/LuceneInAction/lia/advsearching/SpanQueryTest.py
lucene/pylucene/trunk/samples/LuceneInAction/lia/analysis/AnalyzerUtils.py
lucene/pylucene/trunk/samples/LuceneInAction/lia/analysis/i18n/ChineseTest.py
lucene/pylucene/trunk/samples/LuceneInAction/lia/analysis/keyword/KeywordAnalyzerTest.py
lucene/pylucene/trunk/samples/LuceneInAction/lia/analysis/positional/PositionalPorterStopAnalyzer.py
lucene/pylucene/trunk/samples/LuceneInAction/lia/analysis/positional/PositionalPorterStopAnalyzerTest.py
lucene/pylucene/trunk/samples/LuceneInAction/lia/analysis/queryparser/AnalysisParalysisTest.py
lucene/pylucene/trunk/samples/LuceneInAction/lia/analysis/stopanalyzer/StopAnalyzer2.py
lucene/pylucene/trunk/samples/LuceneInAction/lia/analysis/stopanalyzer/StopAnalyzerAlternativeTest.py
lucene/pylucene/trunk/samples/LuceneInAction/lia/analysis/stopanalyzer/StopAnalyzerFlawed.py
lucene/pylucene/trunk/samples/LuceneInAction/lia/analysis/stopanalyzer/StopAnalyzerTest.py
lucene/pylucene/trunk/samples/LuceneInAction/lia/analysis/synonym/SynonymAnalyzer.py
lucene/pylucene/trunk/samples/LuceneInAction/lia/analysis/synonym/SynonymAnalyzerTest.py
lucene/pylucene/trunk/samples/LuceneInAction/lia/analysis/synonym/SynonymFilter.py
lucene/pylucene/trunk/samples/LuceneInAction/lia/common/LiaTestCase.py
lucene/pylucene/trunk/samples/LuceneInAction/lia/common/TestDataDocumentHandler.py
lucene/pylucene/trunk/samples/LuceneInAction/lia/extsearch/filters/SpecialsFilter.py
lucene/pylucene/trunk/samples/LuceneInAction/lia/extsearch/filters/SpecialsFilterTest.py
lucene/pylucene/trunk/samples/LuceneInAction/lia/extsearch/queryparser/AdvancedQueryParserTest.py
lucene/pylucene/trunk/samples/LuceneInAction/lia/extsearch/queryparser/CustomQueryParser.py
lucene/pylucene/trunk/samples/LuceneInAction/lia/extsearch/sorting/DistanceComparatorSource.py
lucene/pylucene/trunk/samples/LuceneInAction/lia/extsearch/sorting/DistanceSortingTest.py
lucene/pylucene/trunk/samples/LuceneInAction/lia/indexing/BaseIndexingTestCase.py
lucene/pylucene/trunk/samples/LuceneInAction/lia/indexing/CompoundVersusMultiFileIndexTest.py
lucene/pylucene/trunk/samples/LuceneInAction/lia/indexing/DocumentDeleteTest.py
lucene/pylucene/trunk/samples/LuceneInAction/lia/indexing/DocumentUpdateTest.py
lucene/pylucene/trunk/samples/LuceneInAction/lia/indexing/FS2RAMDirectoryTest.py
lucene/pylucene/trunk/samples/LuceneInAction/lia/indexing/FSversusRAMDirectoryTest.py
lucene/pylucene/trunk/samples/LuceneInAction/lia/indexing/FieldLengthTest.py
lucene/pylucene/trunk/samples/LuceneInAction/lia/indexing/LockTest.py
lucene/pylucene/trunk/samples/LuceneInAction/lia/searching/BasicSearchingTest.py
lucene/pylucene/trunk/samples/LuceneInAction/lia/searching/BooleanQueryTest.py
lucene/pylucene/trunk/samples/LuceneInAction/lia/searching/PhraseQueryTest.py
lucene/pylucene/trunk/samples/LuceneInAction/lia/searching/PrefixQueryTest.py
lucene/pylucene/trunk/samples/LuceneInAction/lia/searching/QueryParserTest.py
lucene/pylucene/trunk/samples/LuceneInAction/lia/searching/ScoreTest.py
lucene/pylucene/trunk/samples/LuceneInAction/lia/tools/HighlightTest.py
lucene/pylucene/trunk/samples/LuceneInAction/lia/tools/SnowballTest.py
lucene/pylucene/trunk/test/test_Similarity.py
Modified: lucene/pylucene/trunk/CHANGES
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/CHANGES?rev=883975&r1=883974&r2=883975&view=diff
==============================================================================
--- lucene/pylucene/trunk/CHANGES (original)
+++ lucene/pylucene/trunk/CHANGES Wed Nov 25 04:08:13 2009
@@ -1,10 +1,11 @@
-Version 2.9.0 ->
+Version 2.9.0 -> 3.0.0
----------------------
- unit tests ported to new API
- removed InstantiatedIndex contrib from default build
- with (partial) JCC Java generics support, a lot less downcasting is needed
- Java Lucene sources now included in PyLucene source distribution
+ - "Lucene in Action" samples converted to new Lucene 3.0 API
-
Version 2.4.1 -> 2.9.0
Modified: lucene/pylucene/trunk/Makefile
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/Makefile?rev=883975&r1=883974&r2=883975&view=diff
==============================================================================
--- lucene/pylucene/trunk/Makefile (original)
+++ lucene/pylucene/trunk/Makefile Wed Nov 25 04:08:13 2009
@@ -15,9 +15,9 @@
#
VERSION=3.0.0-0
-LUCENE_SVN_VER=HEAD
+LUCENE_SVN_VER=883080
LUCENE_VER=3.0.0
-LUCENE_SVN=http://svn.apache.org/repos/asf/lucene/java/trunk
+LUCENE_SVN=http://svn.apache.org/repos/asf/lucene/java/branches/lucene_3_0
PYLUCENE:=$(shell pwd)
LUCENE=lucene-java-$(LUCENE_VER)
@@ -253,7 +253,7 @@
test: install-test samples/LuceneInAction/index
find test -name 'test_*.py' | PYTHONPATH=$(BUILD_TEST) xargs -t -n 1 $(PYTHON)
-# ls samples/LuceneInAction/*Test.py | PYTHONPATH=$(BUILD_TEST) xargs -t -n 1 $(PYTHON)
+ ls samples/LuceneInAction/*Test.py | PYTHONPATH=$(BUILD_TEST) xargs -t -n 1 $(PYTHON)
ARCHIVE=pylucene-$(VERSION)-src.tar.gz
Modified: lucene/pylucene/trunk/java/org/apache/pylucene/search/PythonFilter.java
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/java/org/apache/pylucene/search/PythonFilter.java?rev=883975&r1=883974&r2=883975&view=diff
==============================================================================
--- lucene/pylucene/trunk/java/org/apache/pylucene/search/PythonFilter.java (original)
+++ lucene/pylucene/trunk/java/org/apache/pylucene/search/PythonFilter.java Wed Nov 25 04:08:13 2009
@@ -18,8 +18,8 @@
import java.io.IOException;
import org.apache.lucene.search.Filter;
+import org.apache.lucene.search.DocIdSet;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.util.DocIdBitSet;
public class PythonFilter extends Filter {
@@ -46,6 +46,6 @@
}
public native void pythonDecRef();
- public native DocIdBitSet getDocIdSet(IndexReader reader)
+ public native DocIdSet getDocIdSet(IndexReader reader)
throws IOException;
}
Modified: lucene/pylucene/trunk/jcc/CHANGES
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/CHANGES?rev=883975&r1=883974&r2=883975&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/CHANGES (original)
+++ lucene/pylucene/trunk/jcc/CHANGES Wed Nov 25 04:08:13 2009
@@ -1,5 +1,5 @@
-Version 2.4 ->
+Version 2.4 -> 2.5
------------------
- added env.jni_version for the JNI version as returned by JNI's GetVersion()
- added env.java_version for java.lang.System.getProperty('java.version')
Modified: lucene/pylucene/trunk/samples/LuceneInAction/AdvancedQueryParserTest.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/samples/LuceneInAction/AdvancedQueryParserTest.py?rev=883975&r1=883974&r2=883975&view=diff
==============================================================================
--- lucene/pylucene/trunk/samples/LuceneInAction/AdvancedQueryParserTest.py (original)
+++ lucene/pylucene/trunk/samples/LuceneInAction/AdvancedQueryParserTest.py Wed Nov 25 04:08:13 2009
@@ -1,6 +1,6 @@
import os, sys, unittest, lucene
-lucene.initVM(lucene.CLASSPATH)
+lucene.initVM()
sys.path.append(os.path.dirname(os.path.abspath(sys.argv[0])))
Modified: lucene/pylucene/trunk/samples/LuceneInAction/AnalysisParalysisTest.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/samples/LuceneInAction/AnalysisParalysisTest.py?rev=883975&r1=883974&r2=883975&view=diff
==============================================================================
--- lucene/pylucene/trunk/samples/LuceneInAction/AnalysisParalysisTest.py (original)
+++ lucene/pylucene/trunk/samples/LuceneInAction/AnalysisParalysisTest.py Wed Nov 25 04:08:13 2009
@@ -1,6 +1,6 @@
import os, sys, unittest, lucene
-lucene.initVM(lucene.CLASSPATH)
+lucene.initVM()
baseDir = os.path.dirname(os.path.abspath(sys.argv[0]))
sys.path.append(baseDir)
Modified: lucene/pylucene/trunk/samples/LuceneInAction/AnalyzerDemo.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/samples/LuceneInAction/AnalyzerDemo.py?rev=883975&r1=883974&r2=883975&view=diff
==============================================================================
--- lucene/pylucene/trunk/samples/LuceneInAction/AnalyzerDemo.py (original)
+++ lucene/pylucene/trunk/samples/LuceneInAction/AnalyzerDemo.py Wed Nov 25 04:08:13 2009
@@ -1,6 +1,6 @@
import os, sys, lucene
-lucene.initVM(lucene.CLASSPATH)
+lucene.initVM()
sys.path.append(os.path.dirname(os.path.abspath(sys.argv[0])))
Modified: lucene/pylucene/trunk/samples/LuceneInAction/AnalyzerUtils.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/samples/LuceneInAction/AnalyzerUtils.py?rev=883975&r1=883974&r2=883975&view=diff
==============================================================================
--- lucene/pylucene/trunk/samples/LuceneInAction/AnalyzerUtils.py (original)
+++ lucene/pylucene/trunk/samples/LuceneInAction/AnalyzerUtils.py Wed Nov 25 04:08:13 2009
@@ -1,6 +1,6 @@
import os, sys, lucene
-lucene.initVM(lucene.CLASSPATH)
+lucene.initVM()
sys.path.append(os.path.dirname(os.path.abspath(sys.argv[0])))
Modified: lucene/pylucene/trunk/samples/LuceneInAction/BasicSearchingTest.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/samples/LuceneInAction/BasicSearchingTest.py?rev=883975&r1=883974&r2=883975&view=diff
==============================================================================
--- lucene/pylucene/trunk/samples/LuceneInAction/BasicSearchingTest.py (original)
+++ lucene/pylucene/trunk/samples/LuceneInAction/BasicSearchingTest.py Wed Nov 25 04:08:13 2009
@@ -1,6 +1,6 @@
import os, sys, unittest, lucene
-lucene.initVM(lucene.CLASSPATH)
+lucene.initVM()
baseDir = os.path.dirname(os.path.abspath(sys.argv[0]))
sys.path.append(baseDir)
Modified: lucene/pylucene/trunk/samples/LuceneInAction/BerkeleyDbIndexer.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/samples/LuceneInAction/BerkeleyDbIndexer.py?rev=883975&r1=883974&r2=883975&view=diff
==============================================================================
--- lucene/pylucene/trunk/samples/LuceneInAction/BerkeleyDbIndexer.py (original)
+++ lucene/pylucene/trunk/samples/LuceneInAction/BerkeleyDbIndexer.py Wed Nov 25 04:08:13 2009
@@ -1,6 +1,6 @@
import os, sys, lucene
-lucene.initVM(lucene.CLASSPATH)
+lucene.initVM()
sys.path.append(os.path.dirname(os.path.abspath(sys.argv[0])))
Modified: lucene/pylucene/trunk/samples/LuceneInAction/BerkeleyDbSearcher.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/samples/LuceneInAction/BerkeleyDbSearcher.py?rev=883975&r1=883974&r2=883975&view=diff
==============================================================================
--- lucene/pylucene/trunk/samples/LuceneInAction/BerkeleyDbSearcher.py (original)
+++ lucene/pylucene/trunk/samples/LuceneInAction/BerkeleyDbSearcher.py Wed Nov 25 04:08:13 2009
@@ -1,6 +1,6 @@
import os, sys, lucene
-lucene.initVM(lucene.CLASSPATH)
+lucene.initVM()
sys.path.append(os.path.dirname(os.path.abspath(sys.argv[0])))
Modified: lucene/pylucene/trunk/samples/LuceneInAction/BooksLikeThis.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/samples/LuceneInAction/BooksLikeThis.py?rev=883975&r1=883974&r2=883975&view=diff
==============================================================================
--- lucene/pylucene/trunk/samples/LuceneInAction/BooksLikeThis.py (original)
+++ lucene/pylucene/trunk/samples/LuceneInAction/BooksLikeThis.py Wed Nov 25 04:08:13 2009
@@ -1,6 +1,6 @@
import os, sys, lucene
-lucene.initVM(lucene.CLASSPATH)
+lucene.initVM()
baseDir = os.path.dirname(os.path.abspath(sys.argv[0]))
sys.path.append(baseDir)
Modified: lucene/pylucene/trunk/samples/LuceneInAction/BooleanQueryTest.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/samples/LuceneInAction/BooleanQueryTest.py?rev=883975&r1=883974&r2=883975&view=diff
==============================================================================
--- lucene/pylucene/trunk/samples/LuceneInAction/BooleanQueryTest.py (original)
+++ lucene/pylucene/trunk/samples/LuceneInAction/BooleanQueryTest.py Wed Nov 25 04:08:13 2009
@@ -1,6 +1,6 @@
import os, sys, unittest, lucene
-lucene.initVM(lucene.CLASSPATH)
+lucene.initVM()
baseDir = os.path.dirname(os.path.abspath(sys.argv[0]))
sys.path.append(baseDir)
Modified: lucene/pylucene/trunk/samples/LuceneInAction/CategorizerTest.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/samples/LuceneInAction/CategorizerTest.py?rev=883975&r1=883974&r2=883975&view=diff
==============================================================================
--- lucene/pylucene/trunk/samples/LuceneInAction/CategorizerTest.py (original)
+++ lucene/pylucene/trunk/samples/LuceneInAction/CategorizerTest.py Wed Nov 25 04:08:13 2009
@@ -1,6 +1,6 @@
import os, sys, unittest, lucene
-lucene.initVM(lucene.CLASSPATH)
+lucene.initVM()
baseDir = os.path.dirname(os.path.abspath(sys.argv[0]))
sys.path.append(baseDir)
Modified: lucene/pylucene/trunk/samples/LuceneInAction/ChineseTest.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/samples/LuceneInAction/ChineseTest.py?rev=883975&r1=883974&r2=883975&view=diff
==============================================================================
--- lucene/pylucene/trunk/samples/LuceneInAction/ChineseTest.py (original)
+++ lucene/pylucene/trunk/samples/LuceneInAction/ChineseTest.py Wed Nov 25 04:08:13 2009
@@ -1,6 +1,6 @@
import os, sys, unittest, lucene
-lucene.initVM(lucene.CLASSPATH)
+lucene.initVM()
baseDir = os.path.dirname(os.path.abspath(sys.argv[0]))
sys.path.append(baseDir)
Copied: lucene/pylucene/trunk/samples/LuceneInAction/CollectorTest.py (from r820102, lucene/pylucene/trunk/samples/LuceneInAction/HitCollectorTest.py)
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/samples/LuceneInAction/CollectorTest.py?p2=lucene/pylucene/trunk/samples/LuceneInAction/CollectorTest.py&p1=lucene/pylucene/trunk/samples/LuceneInAction/HitCollectorTest.py&r1=820102&r2=883975&rev=883975&view=diff
==============================================================================
--- lucene/pylucene/trunk/samples/LuceneInAction/HitCollectorTest.py (original)
+++ lucene/pylucene/trunk/samples/LuceneInAction/CollectorTest.py Wed Nov 25 04:08:13 2009
@@ -1,12 +1,12 @@
import os, sys, unittest, lucene
-lucene.initVM(lucene.CLASSPATH)
+lucene.initVM()
baseDir = os.path.dirname(os.path.abspath(sys.argv[0]))
sys.path.append(baseDir)
-import lia.extsearch.hitcollector.HitCollectorTest
+import lia.extsearch.collector.CollectorTest
from lucene import System
System.setProperty("index.dir", os.path.join(baseDir, 'index'))
-unittest.main(lia.extsearch.hitcollector.HitCollectorTest)
+unittest.main(lia.extsearch.collector.CollectorTest)
Modified: lucene/pylucene/trunk/samples/LuceneInAction/CompoundVersusMultiFileIndexTest.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/samples/LuceneInAction/CompoundVersusMultiFileIndexTest.py?rev=883975&r1=883974&r2=883975&view=diff
==============================================================================
--- lucene/pylucene/trunk/samples/LuceneInAction/CompoundVersusMultiFileIndexTest.py (original)
+++ lucene/pylucene/trunk/samples/LuceneInAction/CompoundVersusMultiFileIndexTest.py Wed Nov 25 04:08:13 2009
@@ -1,6 +1,6 @@
import os, sys, unittest, lucene
-lucene.initVM(lucene.CLASSPATH)
+lucene.initVM()
sys.path.append(os.path.dirname(os.path.abspath(sys.argv[0])))
Modified: lucene/pylucene/trunk/samples/LuceneInAction/DistanceSortingTest.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/samples/LuceneInAction/DistanceSortingTest.py?rev=883975&r1=883974&r2=883975&view=diff
==============================================================================
--- lucene/pylucene/trunk/samples/LuceneInAction/DistanceSortingTest.py (original)
+++ lucene/pylucene/trunk/samples/LuceneInAction/DistanceSortingTest.py Wed Nov 25 04:08:13 2009
@@ -1,6 +1,6 @@
import os, sys, unittest, lucene
-lucene.initVM(lucene.CLASSPATH)
+lucene.initVM()
sys.path.append(os.path.dirname(os.path.abspath(sys.argv[0])))
Modified: lucene/pylucene/trunk/samples/LuceneInAction/DocumentDeleteTest.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/samples/LuceneInAction/DocumentDeleteTest.py?rev=883975&r1=883974&r2=883975&view=diff
==============================================================================
--- lucene/pylucene/trunk/samples/LuceneInAction/DocumentDeleteTest.py (original)
+++ lucene/pylucene/trunk/samples/LuceneInAction/DocumentDeleteTest.py Wed Nov 25 04:08:13 2009
@@ -1,6 +1,6 @@
import os, sys, unittest, lucene
-lucene.initVM(lucene.CLASSPATH)
+lucene.initVM()
sys.path.append(os.path.dirname(os.path.abspath(sys.argv[0])))
Modified: lucene/pylucene/trunk/samples/LuceneInAction/DocumentUpdateTest.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/samples/LuceneInAction/DocumentUpdateTest.py?rev=883975&r1=883974&r2=883975&view=diff
==============================================================================
--- lucene/pylucene/trunk/samples/LuceneInAction/DocumentUpdateTest.py (original)
+++ lucene/pylucene/trunk/samples/LuceneInAction/DocumentUpdateTest.py Wed Nov 25 04:08:13 2009
@@ -1,6 +1,6 @@
import os, sys, unittest, lucene
-lucene.initVM(lucene.CLASSPATH)
+lucene.initVM()
sys.path.append(os.path.dirname(os.path.abspath(sys.argv[0])))
Modified: lucene/pylucene/trunk/samples/LuceneInAction/Explainer.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/samples/LuceneInAction/Explainer.py?rev=883975&r1=883974&r2=883975&view=diff
==============================================================================
--- lucene/pylucene/trunk/samples/LuceneInAction/Explainer.py (original)
+++ lucene/pylucene/trunk/samples/LuceneInAction/Explainer.py Wed Nov 25 04:08:13 2009
@@ -1,6 +1,6 @@
import os, sys, lucene
-lucene.initVM(lucene.CLASSPATH)
+lucene.initVM()
sys.path.append(os.path.dirname(os.path.abspath(sys.argv[0])))
Modified: lucene/pylucene/trunk/samples/LuceneInAction/FS2RAMDirectoryTest.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/samples/LuceneInAction/FS2RAMDirectoryTest.py?rev=883975&r1=883974&r2=883975&view=diff
==============================================================================
--- lucene/pylucene/trunk/samples/LuceneInAction/FS2RAMDirectoryTest.py (original)
+++ lucene/pylucene/trunk/samples/LuceneInAction/FS2RAMDirectoryTest.py Wed Nov 25 04:08:13 2009
@@ -1,6 +1,6 @@
import os, sys, unittest, lucene
-lucene.initVM(lucene.CLASSPATH)
+lucene.initVM()
sys.path.append(os.path.dirname(os.path.abspath(sys.argv[0])))
Modified: lucene/pylucene/trunk/samples/LuceneInAction/FSversusRAMDirectoryTest.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/samples/LuceneInAction/FSversusRAMDirectoryTest.py?rev=883975&r1=883974&r2=883975&view=diff
==============================================================================
--- lucene/pylucene/trunk/samples/LuceneInAction/FSversusRAMDirectoryTest.py (original)
+++ lucene/pylucene/trunk/samples/LuceneInAction/FSversusRAMDirectoryTest.py Wed Nov 25 04:08:13 2009
@@ -1,6 +1,6 @@
import os, sys, unittest, lucene
-lucene.initVM(lucene.CLASSPATH)
+lucene.initVM()
sys.path.append(os.path.dirname(os.path.abspath(sys.argv[0])))
Modified: lucene/pylucene/trunk/samples/LuceneInAction/FieldLengthTest.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/samples/LuceneInAction/FieldLengthTest.py?rev=883975&r1=883974&r2=883975&view=diff
==============================================================================
--- lucene/pylucene/trunk/samples/LuceneInAction/FieldLengthTest.py (original)
+++ lucene/pylucene/trunk/samples/LuceneInAction/FieldLengthTest.py Wed Nov 25 04:08:13 2009
@@ -1,6 +1,6 @@
import os, sys, unittest, lucene
-lucene.initVM(lucene.CLASSPATH)
+lucene.initVM()
sys.path.append(os.path.dirname(os.path.abspath(sys.argv[0])))
Modified: lucene/pylucene/trunk/samples/LuceneInAction/FileIndexer.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/samples/LuceneInAction/FileIndexer.py?rev=883975&r1=883974&r2=883975&view=diff
==============================================================================
--- lucene/pylucene/trunk/samples/LuceneInAction/FileIndexer.py (original)
+++ lucene/pylucene/trunk/samples/LuceneInAction/FileIndexer.py Wed Nov 25 04:08:13 2009
@@ -1,6 +1,6 @@
import os, sys, lucene
-lucene.initVM(lucene.CLASSPATH)
+lucene.initVM()
sys.path.append(os.path.dirname(os.path.abspath(sys.argv[0])))
Modified: lucene/pylucene/trunk/samples/LuceneInAction/FilterTest.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/samples/LuceneInAction/FilterTest.py?rev=883975&r1=883974&r2=883975&view=diff
==============================================================================
--- lucene/pylucene/trunk/samples/LuceneInAction/FilterTest.py (original)
+++ lucene/pylucene/trunk/samples/LuceneInAction/FilterTest.py Wed Nov 25 04:08:13 2009
@@ -1,14 +1,14 @@
# sample needs to be rewritten to use RangeFilter
-#import os, sys, unittest, lucene
-#lucene.initVM(lucene.CLASSPATH)
-#
-#baseDir = os.path.dirname(os.path.abspath(sys.argv[0]))
-#sys.path.append(baseDir)
-#
-#import lia.advsearching.FilterTest
-#from lucene import System
-#
-#System.setProperty("index.dir", os.path.join(baseDir, 'index'))
-#unittest.main(lia.advsearching.FilterTest)
+import os, sys, unittest, lucene
+lucene.initVM()
+
+baseDir = os.path.dirname(os.path.abspath(sys.argv[0]))
+sys.path.append(baseDir)
+
+import lia.advsearching.FilterTest
+from lucene import System
+
+System.setProperty("index.dir", os.path.join(baseDir, 'index'))
+unittest.main(lia.advsearching.FilterTest)
Modified: lucene/pylucene/trunk/samples/LuceneInAction/HighlightIt.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/samples/LuceneInAction/HighlightIt.py?rev=883975&r1=883974&r2=883975&view=diff
==============================================================================
--- lucene/pylucene/trunk/samples/LuceneInAction/HighlightIt.py (original)
+++ lucene/pylucene/trunk/samples/LuceneInAction/HighlightIt.py Wed Nov 25 04:08:13 2009
@@ -1,6 +1,6 @@
import os, sys, lucene
-lucene.initVM(lucene.CLASSPATH)
+lucene.initVM()
sys.path.append(os.path.dirname(os.path.abspath(sys.argv[0])))
Modified: lucene/pylucene/trunk/samples/LuceneInAction/HighlightTest.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/samples/LuceneInAction/HighlightTest.py?rev=883975&r1=883974&r2=883975&view=diff
==============================================================================
--- lucene/pylucene/trunk/samples/LuceneInAction/HighlightTest.py (original)
+++ lucene/pylucene/trunk/samples/LuceneInAction/HighlightTest.py Wed Nov 25 04:08:13 2009
@@ -1,6 +1,6 @@
import os, sys, unittest, lucene
-lucene.initVM(lucene.CLASSPATH)
+lucene.initVM()
baseDir = os.path.dirname(os.path.abspath(sys.argv[0]))
sys.path.append(baseDir)
Modified: lucene/pylucene/trunk/samples/LuceneInAction/IndexTuningDemo.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/samples/LuceneInAction/IndexTuningDemo.py?rev=883975&r1=883974&r2=883975&view=diff
==============================================================================
--- lucene/pylucene/trunk/samples/LuceneInAction/IndexTuningDemo.py (original)
+++ lucene/pylucene/trunk/samples/LuceneInAction/IndexTuningDemo.py Wed Nov 25 04:08:13 2009
@@ -1,6 +1,6 @@
import os, sys, lucene
-lucene.initVM(lucene.CLASSPATH)
+lucene.initVM()
sys.path.append(os.path.dirname(os.path.abspath(sys.argv[0])))
Modified: lucene/pylucene/trunk/samples/LuceneInAction/Indexer.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/samples/LuceneInAction/Indexer.py?rev=883975&r1=883974&r2=883975&view=diff
==============================================================================
--- lucene/pylucene/trunk/samples/LuceneInAction/Indexer.py (original)
+++ lucene/pylucene/trunk/samples/LuceneInAction/Indexer.py Wed Nov 25 04:08:13 2009
@@ -1,6 +1,6 @@
import os, sys, lucene
-lucene.initVM(lucene.CLASSPATH)
+lucene.initVM()
sys.path.append(os.path.dirname(os.path.abspath(sys.argv[0])))
Modified: lucene/pylucene/trunk/samples/LuceneInAction/KeywordAnalyzerTest.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/samples/LuceneInAction/KeywordAnalyzerTest.py?rev=883975&r1=883974&r2=883975&view=diff
==============================================================================
--- lucene/pylucene/trunk/samples/LuceneInAction/KeywordAnalyzerTest.py (original)
+++ lucene/pylucene/trunk/samples/LuceneInAction/KeywordAnalyzerTest.py Wed Nov 25 04:08:13 2009
@@ -1,6 +1,6 @@
import os, sys, unittest, lucene
-lucene.initVM(lucene.CLASSPATH)
+lucene.initVM()
sys.path.append(os.path.dirname(os.path.abspath(sys.argv[0])))
Modified: lucene/pylucene/trunk/samples/LuceneInAction/LockTest.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/samples/LuceneInAction/LockTest.py?rev=883975&r1=883974&r2=883975&view=diff
==============================================================================
--- lucene/pylucene/trunk/samples/LuceneInAction/LockTest.py (original)
+++ lucene/pylucene/trunk/samples/LuceneInAction/LockTest.py Wed Nov 25 04:08:13 2009
@@ -1,6 +1,6 @@
import os, sys, unittest, lucene
-lucene.initVM(lucene.CLASSPATH)
+lucene.initVM()
sys.path.append(os.path.dirname(os.path.abspath(sys.argv[0])))
Modified: lucene/pylucene/trunk/samples/LuceneInAction/MultiFieldQueryParserTest.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/samples/LuceneInAction/MultiFieldQueryParserTest.py?rev=883975&r1=883974&r2=883975&view=diff
==============================================================================
--- lucene/pylucene/trunk/samples/LuceneInAction/MultiFieldQueryParserTest.py (original)
+++ lucene/pylucene/trunk/samples/LuceneInAction/MultiFieldQueryParserTest.py Wed Nov 25 04:08:13 2009
@@ -1,6 +1,6 @@
import os, sys, unittest, lucene
-lucene.initVM(lucene.CLASSPATH)
+lucene.initVM()
baseDir = os.path.dirname(os.path.abspath(sys.argv[0]))
sys.path.append(baseDir)
Copied: lucene/pylucene/trunk/samples/LuceneInAction/MultiPhraseQueryTest.py (from r820102, lucene/pylucene/trunk/samples/LuceneInAction/PhrasePrefixQueryTest.py)
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/samples/LuceneInAction/MultiPhraseQueryTest.py?p2=lucene/pylucene/trunk/samples/LuceneInAction/MultiPhraseQueryTest.py&p1=lucene/pylucene/trunk/samples/LuceneInAction/PhrasePrefixQueryTest.py&r1=820102&r2=883975&rev=883975&view=diff
==============================================================================
--- lucene/pylucene/trunk/samples/LuceneInAction/PhrasePrefixQueryTest.py (original)
+++ lucene/pylucene/trunk/samples/LuceneInAction/MultiPhraseQueryTest.py Wed Nov 25 04:08:13 2009
@@ -1,10 +1,8 @@
-# sample needs to be rewritten to use MultiPhraseQuery
+import os, sys, unittest, lucene
+lucene.initVM()
-#import os, sys, unittest, lucene
-#lucene.initVM(lucene.CLASSPATH)
-#
-#sys.path.append(os.path.dirname(os.path.abspath(sys.argv[0])))
-#
-#import lia.advsearching.PhrasePrefixQueryTest
-#unittest.main(lia.advsearching.PhrasePrefixQueryTest)
+sys.path.append(os.path.dirname(os.path.abspath(sys.argv[0])))
+
+import lia.advsearching.MultiPhraseQueryTest
+unittest.main(lia.advsearching.MultiPhraseQueryTest)
Modified: lucene/pylucene/trunk/samples/LuceneInAction/MultiSearcherTest.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/samples/LuceneInAction/MultiSearcherTest.py?rev=883975&r1=883974&r2=883975&view=diff
==============================================================================
--- lucene/pylucene/trunk/samples/LuceneInAction/MultiSearcherTest.py (original)
+++ lucene/pylucene/trunk/samples/LuceneInAction/MultiSearcherTest.py Wed Nov 25 04:08:13 2009
@@ -1,6 +1,6 @@
import os, sys, unittest, lucene
-lucene.initVM(lucene.CLASSPATH)
+lucene.initVM()
sys.path.append(os.path.dirname(os.path.abspath(sys.argv[0])))
Added: lucene/pylucene/trunk/samples/LuceneInAction/NumericRangeQueryTest.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/samples/LuceneInAction/NumericRangeQueryTest.py?rev=883975&view=auto
==============================================================================
--- lucene/pylucene/trunk/samples/LuceneInAction/NumericRangeQueryTest.py (added)
+++ lucene/pylucene/trunk/samples/LuceneInAction/NumericRangeQueryTest.py Wed Nov 25 04:08:13 2009
@@ -0,0 +1,12 @@
+
+import os, sys, unittest, lucene
+lucene.initVM()
+
+baseDir = os.path.dirname(os.path.abspath(sys.argv[0]))
+sys.path.append(baseDir)
+
+import lia.searching.NumericRangeQueryTest
+from lucene import System
+
+System.setProperty("index.dir", os.path.join(baseDir, 'index'))
+unittest.main(lia.searching.NumericRangeQueryTest)
Propchange: lucene/pylucene/trunk/samples/LuceneInAction/NumericRangeQueryTest.py
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: lucene/pylucene/trunk/samples/LuceneInAction/NumericRangeQueryTest.py
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: lucene/pylucene/trunk/samples/LuceneInAction/PhraseQueryTest.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/samples/LuceneInAction/PhraseQueryTest.py?rev=883975&r1=883974&r2=883975&view=diff
==============================================================================
--- lucene/pylucene/trunk/samples/LuceneInAction/PhraseQueryTest.py (original)
+++ lucene/pylucene/trunk/samples/LuceneInAction/PhraseQueryTest.py Wed Nov 25 04:08:13 2009
@@ -1,6 +1,6 @@
import os, sys, unittest, lucene
-lucene.initVM(lucene.CLASSPATH)
+lucene.initVM()
sys.path.append(os.path.dirname(os.path.abspath(sys.argv[0])))
Modified: lucene/pylucene/trunk/samples/LuceneInAction/PositionalPorterStopAnalyzerTest.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/samples/LuceneInAction/PositionalPorterStopAnalyzerTest.py?rev=883975&r1=883974&r2=883975&view=diff
==============================================================================
--- lucene/pylucene/trunk/samples/LuceneInAction/PositionalPorterStopAnalyzerTest.py (original)
+++ lucene/pylucene/trunk/samples/LuceneInAction/PositionalPorterStopAnalyzerTest.py Wed Nov 25 04:08:13 2009
@@ -1,6 +1,6 @@
import os, sys, unittest, lucene
-lucene.initVM(lucene.CLASSPATH)
+lucene.initVM()
sys.path.append(os.path.dirname(os.path.abspath(sys.argv[0])))
Modified: lucene/pylucene/trunk/samples/LuceneInAction/PrefixQueryTest.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/samples/LuceneInAction/PrefixQueryTest.py?rev=883975&r1=883974&r2=883975&view=diff
==============================================================================
--- lucene/pylucene/trunk/samples/LuceneInAction/PrefixQueryTest.py (original)
+++ lucene/pylucene/trunk/samples/LuceneInAction/PrefixQueryTest.py Wed Nov 25 04:08:13 2009
@@ -1,6 +1,6 @@
import os, sys, unittest, lucene
-lucene.initVM(lucene.CLASSPATH)
+lucene.initVM()
baseDir = os.path.dirname(os.path.abspath(sys.argv[0]))
sys.path.append(baseDir)
Modified: lucene/pylucene/trunk/samples/LuceneInAction/QueryParserTest.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/samples/LuceneInAction/QueryParserTest.py?rev=883975&r1=883974&r2=883975&view=diff
==============================================================================
--- lucene/pylucene/trunk/samples/LuceneInAction/QueryParserTest.py (original)
+++ lucene/pylucene/trunk/samples/LuceneInAction/QueryParserTest.py Wed Nov 25 04:08:13 2009
@@ -1,6 +1,6 @@
import os, sys, unittest, lucene
-lucene.initVM(lucene.CLASSPATH)
+lucene.initVM()
baseDir = os.path.dirname(os.path.abspath(sys.argv[0]))
sys.path.append(baseDir)
Modified: lucene/pylucene/trunk/samples/LuceneInAction/ScoreTest.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/samples/LuceneInAction/ScoreTest.py?rev=883975&r1=883974&r2=883975&view=diff
==============================================================================
--- lucene/pylucene/trunk/samples/LuceneInAction/ScoreTest.py (original)
+++ lucene/pylucene/trunk/samples/LuceneInAction/ScoreTest.py Wed Nov 25 04:08:13 2009
@@ -1,6 +1,6 @@
import os, sys, unittest, lucene
-lucene.initVM(lucene.CLASSPATH)
+lucene.initVM()
baseDir = os.path.dirname(os.path.abspath(sys.argv[0]))
sys.path.append(baseDir)
Modified: lucene/pylucene/trunk/samples/LuceneInAction/Searcher.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/samples/LuceneInAction/Searcher.py?rev=883975&r1=883974&r2=883975&view=diff
==============================================================================
--- lucene/pylucene/trunk/samples/LuceneInAction/Searcher.py (original)
+++ lucene/pylucene/trunk/samples/LuceneInAction/Searcher.py Wed Nov 25 04:08:13 2009
@@ -1,6 +1,6 @@
import os, sys, lucene
-lucene.initVM(lucene.CLASSPATH)
+lucene.initVM()
sys.path.append(os.path.dirname(os.path.abspath(sys.argv[0])))
Modified: lucene/pylucene/trunk/samples/LuceneInAction/SecurityFilterTest.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/samples/LuceneInAction/SecurityFilterTest.py?rev=883975&r1=883974&r2=883975&view=diff
==============================================================================
--- lucene/pylucene/trunk/samples/LuceneInAction/SecurityFilterTest.py (original)
+++ lucene/pylucene/trunk/samples/LuceneInAction/SecurityFilterTest.py Wed Nov 25 04:08:13 2009
@@ -1,6 +1,6 @@
import os, sys, unittest, lucene
-lucene.initVM(lucene.CLASSPATH)
+lucene.initVM()
sys.path.append(os.path.dirname(os.path.abspath(sys.argv[0])))
Modified: lucene/pylucene/trunk/samples/LuceneInAction/SnowballTest.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/samples/LuceneInAction/SnowballTest.py?rev=883975&r1=883974&r2=883975&view=diff
==============================================================================
--- lucene/pylucene/trunk/samples/LuceneInAction/SnowballTest.py (original)
+++ lucene/pylucene/trunk/samples/LuceneInAction/SnowballTest.py Wed Nov 25 04:08:13 2009
@@ -1,6 +1,6 @@
import os, sys, unittest, lucene
-lucene.initVM(lucene.CLASSPATH)
+lucene.initVM()
sys.path.append(os.path.dirname(os.path.abspath(sys.argv[0])))
Modified: lucene/pylucene/trunk/samples/LuceneInAction/SortingExample.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/samples/LuceneInAction/SortingExample.py?rev=883975&r1=883974&r2=883975&view=diff
==============================================================================
--- lucene/pylucene/trunk/samples/LuceneInAction/SortingExample.py (original)
+++ lucene/pylucene/trunk/samples/LuceneInAction/SortingExample.py Wed Nov 25 04:08:13 2009
@@ -1,6 +1,6 @@
import os, sys, lucene
-lucene.initVM(lucene.CLASSPATH)
+lucene.initVM()
baseDir = os.path.dirname(os.path.abspath(sys.argv[0]))
sys.path.append(baseDir)
Modified: lucene/pylucene/trunk/samples/LuceneInAction/SpanQueryTest.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/samples/LuceneInAction/SpanQueryTest.py?rev=883975&r1=883974&r2=883975&view=diff
==============================================================================
--- lucene/pylucene/trunk/samples/LuceneInAction/SpanQueryTest.py (original)
+++ lucene/pylucene/trunk/samples/LuceneInAction/SpanQueryTest.py Wed Nov 25 04:08:13 2009
@@ -1,6 +1,6 @@
import os, sys, unittest, lucene
-lucene.initVM(lucene.CLASSPATH)
+lucene.initVM()
sys.path.append(os.path.dirname(os.path.abspath(sys.argv[0])))
Modified: lucene/pylucene/trunk/samples/LuceneInAction/SpecialsFilterTest.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/samples/LuceneInAction/SpecialsFilterTest.py?rev=883975&r1=883974&r2=883975&view=diff
==============================================================================
--- lucene/pylucene/trunk/samples/LuceneInAction/SpecialsFilterTest.py (original)
+++ lucene/pylucene/trunk/samples/LuceneInAction/SpecialsFilterTest.py Wed Nov 25 04:08:13 2009
@@ -1,6 +1,6 @@
import os, sys, unittest, lucene
-lucene.initVM(lucene.CLASSPATH)
+lucene.initVM()
baseDir = os.path.dirname(os.path.abspath(sys.argv[0]))
sys.path.append(baseDir)
Modified: lucene/pylucene/trunk/samples/LuceneInAction/StopAnalyzerAlternativeTest.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/samples/LuceneInAction/StopAnalyzerAlternativeTest.py?rev=883975&r1=883974&r2=883975&view=diff
==============================================================================
--- lucene/pylucene/trunk/samples/LuceneInAction/StopAnalyzerAlternativeTest.py (original)
+++ lucene/pylucene/trunk/samples/LuceneInAction/StopAnalyzerAlternativeTest.py Wed Nov 25 04:08:13 2009
@@ -1,6 +1,6 @@
import os, sys, unittest, lucene
-lucene.initVM(lucene.CLASSPATH)
+lucene.initVM()
sys.path.append(os.path.dirname(os.path.abspath(sys.argv[0])))
Modified: lucene/pylucene/trunk/samples/LuceneInAction/StopAnalyzerTest.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/samples/LuceneInAction/StopAnalyzerTest.py?rev=883975&r1=883974&r2=883975&view=diff
==============================================================================
--- lucene/pylucene/trunk/samples/LuceneInAction/StopAnalyzerTest.py (original)
+++ lucene/pylucene/trunk/samples/LuceneInAction/StopAnalyzerTest.py Wed Nov 25 04:08:13 2009
@@ -1,6 +1,6 @@
import os, sys, unittest, lucene
-lucene.initVM(lucene.CLASSPATH)
+lucene.initVM()
sys.path.append(os.path.dirname(os.path.abspath(sys.argv[0])))
Modified: lucene/pylucene/trunk/samples/LuceneInAction/SynonymAnalyzerTest.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/samples/LuceneInAction/SynonymAnalyzerTest.py?rev=883975&r1=883974&r2=883975&view=diff
==============================================================================
--- lucene/pylucene/trunk/samples/LuceneInAction/SynonymAnalyzerTest.py (original)
+++ lucene/pylucene/trunk/samples/LuceneInAction/SynonymAnalyzerTest.py Wed Nov 25 04:08:13 2009
@@ -1,6 +1,6 @@
import os, sys, unittest, lucene
-lucene.initVM(lucene.CLASSPATH)
+lucene.initVM()
sys.path.append(os.path.dirname(os.path.abspath(sys.argv[0])))
Modified: lucene/pylucene/trunk/samples/LuceneInAction/SynonymAnalyzerViewer.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/samples/LuceneInAction/SynonymAnalyzerViewer.py?rev=883975&r1=883974&r2=883975&view=diff
==============================================================================
--- lucene/pylucene/trunk/samples/LuceneInAction/SynonymAnalyzerViewer.py (original)
+++ lucene/pylucene/trunk/samples/LuceneInAction/SynonymAnalyzerViewer.py Wed Nov 25 04:08:13 2009
@@ -1,6 +1,6 @@
import os, sys, lucene
-lucene.initVM(lucene.CLASSPATH)
+lucene.initVM()
baseDir = os.path.dirname(os.path.abspath(sys.argv[0]))
sys.path.append(baseDir)
Modified: lucene/pylucene/trunk/samples/LuceneInAction/T9er.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/samples/LuceneInAction/T9er.py?rev=883975&r1=883974&r2=883975&view=diff
==============================================================================
--- lucene/pylucene/trunk/samples/LuceneInAction/T9er.py (original)
+++ lucene/pylucene/trunk/samples/LuceneInAction/T9er.py Wed Nov 25 04:08:13 2009
@@ -1,6 +1,6 @@
import os, sys, lucene
-lucene.initVM(lucene.CLASSPATH)
+lucene.initVM()
sys.path.append(os.path.dirname(os.path.abspath(sys.argv[0])))
Copied: lucene/pylucene/trunk/samples/LuceneInAction/TermRangeQueryTest.py (from r820102, lucene/pylucene/trunk/samples/LuceneInAction/RangeQueryTest.py)
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/samples/LuceneInAction/TermRangeQueryTest.py?p2=lucene/pylucene/trunk/samples/LuceneInAction/TermRangeQueryTest.py&p1=lucene/pylucene/trunk/samples/LuceneInAction/RangeQueryTest.py&r1=820102&r2=883975&rev=883975&view=diff
==============================================================================
--- lucene/pylucene/trunk/samples/LuceneInAction/RangeQueryTest.py (original)
+++ lucene/pylucene/trunk/samples/LuceneInAction/TermRangeQueryTest.py Wed Nov 25 04:08:13 2009
@@ -1,12 +1,12 @@
import os, sys, unittest, lucene
-lucene.initVM(lucene.CLASSPATH)
+lucene.initVM()
baseDir = os.path.dirname(os.path.abspath(sys.argv[0]))
sys.path.append(baseDir)
-import lia.searching.RangeQueryTest
+import lia.searching.TermRangeQueryTest
from lucene import System
System.setProperty("index.dir", os.path.join(baseDir, 'index'))
-unittest.main(lia.searching.RangeQueryTest)
+unittest.main(lia.searching.TermRangeQueryTest)
Modified: lucene/pylucene/trunk/samples/LuceneInAction/VerboseIndexing.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/samples/LuceneInAction/VerboseIndexing.py?rev=883975&r1=883974&r2=883975&view=diff
==============================================================================
--- lucene/pylucene/trunk/samples/LuceneInAction/VerboseIndexing.py (original)
+++ lucene/pylucene/trunk/samples/LuceneInAction/VerboseIndexing.py Wed Nov 25 04:08:13 2009
@@ -1,6 +1,6 @@
import os, sys, lucene
-lucene.initVM(lucene.CLASSPATH)
+lucene.initVM()
sys.path.append(os.path.dirname(os.path.abspath(sys.argv[0])))
Modified: lucene/pylucene/trunk/samples/LuceneInAction/index.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/samples/LuceneInAction/index.py?rev=883975&r1=883974&r2=883975&view=diff
==============================================================================
--- lucene/pylucene/trunk/samples/LuceneInAction/index.py (original)
+++ lucene/pylucene/trunk/samples/LuceneInAction/index.py Wed Nov 25 04:08:13 2009
@@ -1,6 +1,6 @@
import os, sys, tarfile, lucene
-lucene.initVM(lucene.CLASSPATH)
+lucene.initVM()
baseDir = os.path.dirname(os.path.abspath(sys.argv[0]))
sys.path.append(baseDir)
Modified: lucene/pylucene/trunk/samples/LuceneInAction/lia/advsearching/CategorizerTest.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/samples/LuceneInAction/lia/advsearching/CategorizerTest.py?rev=883975&r1=883974&r2=883975&view=diff
==============================================================================
--- lucene/pylucene/trunk/samples/LuceneInAction/lia/advsearching/CategorizerTest.py (original)
+++ lucene/pylucene/trunk/samples/LuceneInAction/lia/advsearching/CategorizerTest.py Wed Nov 25 04:08:13 2009
@@ -44,7 +44,7 @@
def buildCategoryVectors(self):
- reader = IndexReader.open(self.directory)
+ reader = IndexReader.open(self.directory, True)
for id in xrange(reader.maxDoc()):
doc = reader.document(id)
Modified: lucene/pylucene/trunk/samples/LuceneInAction/lia/advsearching/FilterTest.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/samples/LuceneInAction/lia/advsearching/FilterTest.py?rev=883975&r1=883974&r2=883975&view=diff
==============================================================================
--- lucene/pylucene/trunk/samples/LuceneInAction/lia/advsearching/FilterTest.py (original)
+++ lucene/pylucene/trunk/samples/LuceneInAction/lia/advsearching/FilterTest.py Wed Nov 25 04:08:13 2009
@@ -14,9 +14,11 @@
from lia.common.LiaTestCase import LiaTestCase
-from lucene import \
- Term, BooleanQuery, IndexSearcher, TermQuery, DateField, \
- CachingWrapperFilter, DateFilter, RangeQuery, QueryFilter, BooleanClause
+from lucene import Integer, \
+ IndexSearcher, Term, TermQuery, MatchAllDocsQuery, \
+ BooleanQuery, BooleanClause, CachingWrapperFilter, \
+ TermRangeFilter, NumericRangeFilter, FieldCacheRangeFilter, \
+ FieldCacheTermsFilter, QueryWrapperFilter, PrefixFilter
class FilterTest(LiaTestCase):
@@ -25,34 +27,62 @@
super(FilterTest, self).setUp()
- self.allBooks = RangeQuery(Term("pubmonth", "190001"),
- Term("pubmonth", "200512"), True)
- self.searcher = IndexSearcher(self.directory)
- hits = self.searcher.search(self.allBooks)
- self.numAllBooks = len(hits)
+ self.allBooks = MatchAllDocsQuery()
+ self.searcher = IndexSearcher(self.directory, True)
+ scoreDocs = self.searcher.search(self.allBooks, 50).scoreDocs
+ self.numAllBooks = len(scoreDocs)
+
+ def testTermRangeFilter(self):
+
+ filter = TermRangeFilter("title2", "d", "j", True, True)
+ scoreDocs = self.searcher.search(self.allBooks, filter, 50).scoreDocs
+ self.assertEqual(3, len(scoreDocs))
+
+ def testNumericDateFilter(self):
+
+ filter = NumericRangeFilter.newIntRange("pubmonth",
+ Integer(198805),
+ Integer(198810),
+ True, True)
+ scoreDocs = self.searcher.search(self.allBooks, filter, 50).scoreDocs
+ self.assertEqual(1, len(scoreDocs))
+
+ def testFieldCacheRangeFilter(self):
+
+ filter = FieldCacheRangeFilter.newStringRange("title2", "d", "j",
+ True, True)
+ scoreDocs = self.searcher.search(self.allBooks, filter, 50).scoreDocs
+ self.assertEqual(3, len(scoreDocs))
+
+ filter = FieldCacheRangeFilter.newIntRange("pubmonth",
+ Integer(198805),
+ Integer(198810),
+ True, True)
+ scoreDocs = self.searcher.search(self.allBooks, filter, 50).scoreDocs
+ self.assertEqual(1, len(scoreDocs))
+
+ def testFieldCacheTermsFilter(self):
+
+ filter = FieldCacheTermsFilter("category",
+ ["/health/alternative/chinese",
+ "/technology/computers/ai",
+ "/technology/computers/programming"])
+ scoreDocs = self.searcher.search(self.allBooks, filter, 50).scoreDocs
+ self.assertEqual(7, len(scoreDocs), "expected 7 hits")
- def testDateFilter(self):
-
- jan1 = self.parseDate("2004-01-01")
- jan31 = self.parseDate("2004-01-31")
- dec31 = self.parseDate("2004-12-31")
-
- filter = DateFilter("modified", jan1, dec31)
-
- hits = self.searcher.search(self.allBooks, filter)
- self.assertEqual(self.numAllBooks, len(hits), "all modified in 2004")
-
- filter = DateFilter("modified", jan1, jan31)
- hits = self.searcher.search(self.allBooks, filter)
- self.assertEqual(0, len(hits), "none modified in January")
-
- def testQueryFilter(self):
+ def testQueryWrapperFilter(self):
categoryQuery = TermQuery(Term("category", "/philosophy/eastern"))
- categoryFilter = QueryFilter(categoryQuery)
+ categoryFilter = QueryWrapperFilter(categoryQuery)
+ scoreDocs = self.searcher.search(self.allBooks, categoryFilter, 50).scoreDocs
+ self.assertEqual(1, len(scoreDocs), "only tao te ching")
- hits = self.searcher.search(self.allBooks, categoryFilter)
- self.assertEqual(1, len(hits), "only tao te ching")
+ def testSpanQueryFilter(self):
+
+ categoryQuery = TermQuery(Term("category", "/philosophy/eastern"))
+ categoryFilter = QueryWrapperFilter(categoryQuery)
+ scoreDocs = self.searcher.search(self.allBooks, categoryFilter, 50).scoreDocs
+ self.assertEqual(1, len(scoreDocs), "only tao te ching")
def testFilterAlternative(self):
@@ -62,30 +92,19 @@
constrainedQuery.add(self.allBooks, BooleanClause.Occur.MUST)
constrainedQuery.add(categoryQuery, BooleanClause.Occur.MUST)
- hits = self.searcher.search(constrainedQuery)
- self.assertEqual(1, len(hits), "only tao te ching")
+ scoreDocs = self.searcher.search(constrainedQuery, 50).scoreDocs
+ self.assertEqual(1, len(scoreDocs), "only tao te ching")
- def testQueryFilterWithRangeQuery(self):
+ def testPrefixFilter(self):
- jan1 = self.parseDate("2004-01-01")
- dec31 = self.parseDate("2004-12-31")
-
- start = Term("modified", DateField.dateToString(jan1))
- end = Term("modified", DateField.dateToString(dec31))
-
- rangeQuery = RangeQuery(start, end, True)
-
- filter = QueryFilter(rangeQuery)
- hits = self.searcher.search(self.allBooks, filter)
- self.assertEqual(self.numAllBooks, len(hits), "all of 'em")
+ prefixFilter = PrefixFilter(Term("category", "/technology/computers"))
+ scoreDocs = self.searcher.search(self.allBooks, prefixFilter, 50).scoreDocs
+ self.assertEqual(8, len(scoreDocs),
+ "only /technology/computers/* books")
def testCachingWrapper(self):
- jan1 = self.parseDate("2004-01-01")
- dec31 = self.parseDate("2004-12-31")
-
- dateFilter = DateFilter("modified", jan1, dec31)
- cachingFilter = CachingWrapperFilter(dateFilter)
-
- hits = self.searcher.search(self.allBooks, cachingFilter)
- self.assertEqual(self.numAllBooks, len(hits), "all of 'em")
+ filter = TermRangeFilter("title2", "d", "j", True, True)
+ cachingFilter = CachingWrapperFilter(filter)
+ scoreDocs = self.searcher.search(self.allBooks, cachingFilter, 50).scoreDocs
+ self.assertEqual(3, len(scoreDocs))
Modified: lucene/pylucene/trunk/samples/LuceneInAction/lia/advsearching/MultiFieldQueryParserTest.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/samples/LuceneInAction/lia/advsearching/MultiFieldQueryParserTest.py?rev=883975&r1=883974&r2=883975&view=diff
==============================================================================
--- lucene/pylucene/trunk/samples/LuceneInAction/lia/advsearching/MultiFieldQueryParserTest.py (original)
+++ lucene/pylucene/trunk/samples/LuceneInAction/lia/advsearching/MultiFieldQueryParserTest.py Wed Nov 25 04:08:13 2009
@@ -15,7 +15,8 @@
from lia.common.LiaTestCase import LiaTestCase
from lucene import \
- SimpleAnalyzer, MultiFieldQueryParser, IndexSearcher, BooleanClause
+ SimpleAnalyzer, MultiFieldQueryParser, IndexSearcher, BooleanClause, \
+ Version
class MultiFieldQueryParserTest(LiaTestCase):
@@ -23,29 +24,32 @@
def testDefaultOperator(self):
SHOULD = BooleanClause.Occur.SHOULD
- query = MultiFieldQueryParser.parse("development",
- ["title", "subject"],
+ query = MultiFieldQueryParser.parse(Version.LUCENE_CURRENT,
+ "development", ["title", "subject"],
[SHOULD, SHOULD],
SimpleAnalyzer())
- searcher = IndexSearcher(self.directory)
- hits = searcher.search(query)
+ searcher = IndexSearcher(self.directory, True)
+ scoreDocs = searcher.search(query, 50).scoreDocs
- self.assertHitsIncludeTitle(hits, "Java Development with Ant")
+ self.assertHitsIncludeTitle(searcher, scoreDocs,
+ "Java Development with Ant")
# has "development" in the subject field
- self.assertHitsIncludeTitle(hits, "Extreme Programming Explained")
+ self.assertHitsIncludeTitle(searcher, scoreDocs,
+ "Extreme Programming Explained")
def testSpecifiedOperator(self):
MUST = BooleanClause.Occur.MUST
- query = MultiFieldQueryParser.parse("development",
- ["title", "subject"],
+ query = MultiFieldQueryParser.parse(Version.LUCENE_CURRENT,
+ "development", ["title", "subject"],
[MUST, MUST],
SimpleAnalyzer())
- searcher = IndexSearcher(self.directory)
- hits = searcher.search(query)
+ searcher = IndexSearcher(self.directory, True)
+ scoreDocs = searcher.search(query, 50).scoreDocs
- self.assertHitsIncludeTitle(hits, "Java Development with Ant")
- self.assertEqual(1, hits.length(), "one and only one")
+ self.assertHitsIncludeTitle(searcher, scoreDocs,
+ "Java Development with Ant")
+ self.assertEqual(1, len(scoreDocs), "one and only one")
Copied: lucene/pylucene/trunk/samples/LuceneInAction/lia/advsearching/MultiPhraseQueryTest.py (from r820102, lucene/pylucene/trunk/samples/LuceneInAction/lia/advsearching/PhrasePrefixQueryTest.py)
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/samples/LuceneInAction/lia/advsearching/MultiPhraseQueryTest.py?p2=lucene/pylucene/trunk/samples/LuceneInAction/lia/advsearching/MultiPhraseQueryTest.py&p1=lucene/pylucene/trunk/samples/LuceneInAction/lia/advsearching/PhrasePrefixQueryTest.py&r1=820102&r2=883975&rev=883975&view=diff
==============================================================================
--- lucene/pylucene/trunk/samples/LuceneInAction/lia/advsearching/PhrasePrefixQueryTest.py (original)
+++ lucene/pylucene/trunk/samples/LuceneInAction/lia/advsearching/MultiPhraseQueryTest.py Wed Nov 25 04:08:13 2009
@@ -15,42 +15,44 @@
from unittest import TestCase
from lucene import \
WhitespaceAnalyzer, Document, Field, IndexWriter, Term, BooleanQuery, \
- IndexSearcher, PhrasePrefixQuery, PhraseQuery, RAMDirectory, BooleanClause
+ IndexSearcher, MultiPhraseQuery, PhraseQuery, RAMDirectory, BooleanClause
-class PhrasePrefixQueryTest(TestCase):
+class MultiPhraseQueryTest(TestCase):
def setUp(self):
directory = RAMDirectory()
- writer = IndexWriter(directory, WhitespaceAnalyzer(), True)
+ writer = IndexWriter(directory, WhitespaceAnalyzer(), True,
+ IndexWriter.MaxFieldLength.UNLIMITED)
doc1 = Document()
doc1.add(Field("field", "the quick brown fox jumped over the lazy dog",
- Field.Store.YES, Field.Index.TOKENIZED))
+ Field.Store.YES, Field.Index.ANALYZED))
writer.addDocument(doc1)
doc2 = Document()
doc2.add(Field("field", "the fast fox hopped over the hound",
- Field.Store.YES, Field.Index.TOKENIZED))
+ Field.Store.YES, Field.Index.ANALYZED))
writer.addDocument(doc2)
writer.close()
- self.searcher = IndexSearcher(directory)
+ self.searcher = IndexSearcher(directory, True)
def testBasic(self):
- query = PhrasePrefixQuery()
- query.add([Term("field", "quick"), Term("field", "fast")])
+ query = MultiPhraseQuery()
+ query.add([Term("field", "quick"),
+ Term("field", "fast")])
query.add(Term("field", "fox"))
print query
- hits = self.searcher.search(query)
- self.assertEqual(1, len(hits), "fast fox match")
+ topDocs = self.searcher.search(query, 10)
+ self.assertEqual(1, topDocs.totalHits, "fast fox match")
- query.setSlop(1)
- hits = self.searcher.search(query)
- self.assertEqual(2, len(hits), "both match")
+ query.setSlop(1);
+ topDocs = self.searcher.search(query, 10)
+ self.assertEqual(2, topDocs.totalHits, "both match");
def testAgainstOR(self):
@@ -66,8 +68,8 @@
query = BooleanQuery()
query.add(quickFox, BooleanClause.Occur.SHOULD)
query.add(fastFox, BooleanClause.Occur.SHOULD)
- hits = self.searcher.search(query)
- self.assertEqual(2, len(hits))
+ topDocs = self.searcher.search(query, 10)
+ self.assertEqual(2, topDocs.totalHits)
def debug(self, hits):
Modified: lucene/pylucene/trunk/samples/LuceneInAction/lia/advsearching/MultiSearcherTest.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/samples/LuceneInAction/lia/advsearching/MultiSearcherTest.py?rev=883975&r1=883974&r2=883975&view=diff
==============================================================================
--- lucene/pylucene/trunk/samples/LuceneInAction/lia/advsearching/MultiSearcherTest.py (original)
+++ lucene/pylucene/trunk/samples/LuceneInAction/lia/advsearching/MultiSearcherTest.py Wed Nov 25 04:08:13 2009
@@ -15,7 +15,7 @@
from unittest import TestCase
from lucene import \
WhitespaceAnalyzer, Document, Field, IndexWriter, Term, MultiSearcher, \
- RangeQuery, RAMDirectory, IndexSearcher
+ TermRangeQuery, RAMDirectory, IndexSearcher
class MultiSearcherTest(TestCase):
@@ -35,13 +35,15 @@
aTOmDirectory = RAMDirectory()
nTOzDirectory = RAMDirectory()
- aTOmWriter = IndexWriter(aTOmDirectory, analyzer, True)
- nTOzWriter = IndexWriter(nTOzDirectory, analyzer, True)
+ aTOmWriter = IndexWriter(aTOmDirectory, analyzer, True,
+ IndexWriter.MaxFieldLength.UNLIMITED)
+ nTOzWriter = IndexWriter(nTOzDirectory, analyzer, True,
+ IndexWriter.MaxFieldLength.UNLIMITED)
for animal in animals:
doc = Document()
doc.add(Field("animal", animal,
- Field.Store.YES, Field.Index.UN_TOKENIZED))
+ Field.Store.YES, Field.Index.NOT_ANALYZED))
if animal[0].lower() < "n":
aTOmWriter.addDocument(doc)
@@ -59,7 +61,7 @@
searcher = MultiSearcher(self.searchers)
# range spans documents across both indexes
- query = RangeQuery(Term("animal", "h"), Term("animal", "t"), True)
+ query = TermRangeQuery("animal", "h", "t", True, True)
- hits = searcher.search(query)
- self.assertEqual(12, hits.length(), "tarantula not included")
+ scoreDocs = searcher.search(query, 50).scoreDocs
+ self.assertEqual(12, len(scoreDocs), "tarantula not included")
Modified: lucene/pylucene/trunk/samples/LuceneInAction/lia/advsearching/SecurityFilterTest.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/samples/LuceneInAction/lia/advsearching/SecurityFilterTest.py?rev=883975&r1=883974&r2=883975&view=diff
==============================================================================
--- lucene/pylucene/trunk/samples/LuceneInAction/lia/advsearching/SecurityFilterTest.py (original)
+++ lucene/pylucene/trunk/samples/LuceneInAction/lia/advsearching/SecurityFilterTest.py Wed Nov 25 04:08:13 2009
@@ -14,8 +14,8 @@
from unittest import TestCase
from lucene import \
- WhitespaceAnalyzer, Document, Field, IndexWriter, Term, MultiSearcher, \
- QueryFilter, RAMDirectory, IndexSearcher, TermQuery
+ WhitespaceAnalyzer, Document, Field, IndexWriter, Term, \
+ QueryWrapperFilter, RAMDirectory, IndexSearcher, TermQuery
class SecurityFilterTest(TestCase):
@@ -23,22 +23,23 @@
def setUp(self):
self.directory = RAMDirectory()
- writer = IndexWriter(self.directory, WhitespaceAnalyzer(), True)
+ writer = IndexWriter(self.directory, WhitespaceAnalyzer(), True,
+ IndexWriter.MaxFieldLength.UNLIMITED)
# Elwood
document = Document()
document.add(Field("owner", "elwood",
- Field.Store.YES, Field.Index.UN_TOKENIZED))
+ Field.Store.YES, Field.Index.NOT_ANALYZED))
document.add(Field("keywords", "elwoods sensitive info",
- Field.Store.YES, Field.Index.TOKENIZED))
+ Field.Store.YES, Field.Index.ANALYZED))
writer.addDocument(document)
# Jake
document = Document()
document.add(Field("owner", "jake",
- Field.Store.YES, Field.Index.UN_TOKENIZED))
+ Field.Store.YES, Field.Index.NOT_ANALYZED))
document.add(Field("keywords", "jakes sensitive info",
- Field.Store.YES, Field.Index.TOKENIZED))
+ Field.Store.YES, Field.Index.ANALYZED))
writer.addDocument(document)
writer.close()
@@ -47,13 +48,14 @@
query = TermQuery(Term("keywords", "info"))
- searcher = IndexSearcher(self.directory)
- hits = searcher.search(query)
- self.assertEqual(2, len(hits), "Both documents match")
-
- jakeFilter = QueryFilter(TermQuery(Term("owner", "jake")))
-
- hits = searcher.search(query, jakeFilter)
- self.assertEqual(1, len(hits))
- self.assertEqual("jakes sensitive info", hits[0].get("keywords"),
+ searcher = IndexSearcher(self.directory, True)
+ topDocs = searcher.search(query, 50)
+ self.assertEqual(2, topDocs.totalHits, "Both documents match")
+
+ jakeFilter = QueryWrapperFilter(TermQuery(Term("owner", "jake")))
+
+ scoreDocs = searcher.search(query, jakeFilter, 50).scoreDocs
+ self.assertEqual(1, len(scoreDocs))
+ self.assertEqual("jakes sensitive info",
+ searcher.doc(scoreDocs[0].doc).get("keywords"),
"elwood is safe")
Modified: lucene/pylucene/trunk/samples/LuceneInAction/lia/advsearching/SpanQueryTest.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/samples/LuceneInAction/lia/advsearching/SpanQueryTest.py?rev=883975&r1=883974&r2=883975&view=diff
==============================================================================
--- lucene/pylucene/trunk/samples/LuceneInAction/lia/advsearching/SpanQueryTest.py (original)
+++ lucene/pylucene/trunk/samples/LuceneInAction/lia/advsearching/SpanQueryTest.py Wed Nov 25 04:08:13 2009
@@ -18,7 +18,7 @@
from lucene import \
WhitespaceAnalyzer, Document, Field, IndexReader, IndexWriter, Term, \
IndexSearcher, PhraseQuery, SpanFirstQuery, SpanNearQuery, SpanNotQuery, \
- SpanOrQuery, SpanTermQuery, RAMDirectory, Hit
+ SpanOrQuery, SpanTermQuery, RAMDirectory, TermAttribute, StringReader
from lia.analysis.AnalyzerUtils import AnalyzerUtils
@@ -30,22 +30,23 @@
self.directory = RAMDirectory()
self.analyzer = WhitespaceAnalyzer()
- writer = IndexWriter(self.directory, self.analyzer, True)
+ writer = IndexWriter(self.directory, self.analyzer, True,
+ IndexWriter.MaxFieldLength.UNLIMITED)
doc = Document()
doc.add(Field("f", "the quick brown fox jumps over the lazy dog",
- Field.Store.YES, Field.Index.TOKENIZED))
+ Field.Store.YES, Field.Index.ANALYZED))
writer.addDocument(doc)
doc = Document()
doc.add(Field("f", "the quick red fox jumps over the sleepy cat",
- Field.Store.YES, Field.Index.TOKENIZED))
+ Field.Store.YES, Field.Index.ANALYZED))
writer.addDocument(doc)
writer.close()
- self.searcher = IndexSearcher(self.directory)
- self.reader = IndexReader.open(self.directory)
+ self.searcher = IndexSearcher(self.directory, True)
+ self.reader = IndexReader.open(self.directory, True)
self.quick = SpanTermQuery(Term("f", "quick"))
self.brown = SpanTermQuery(Term("f", "brown"))
@@ -58,19 +59,19 @@
def assertOnlyBrownFox(self, query):
- hits = self.searcher.search(query)
- self.assertEqual(1, len(hits))
- self.assertEqual(0, hits.id(0), "wrong doc")
+ topDocs = self.searcher.search(query, 50)
+ self.assertEqual(1, topDocs.totalHits)
+ self.assertEqual(0, topDocs.scoreDocs[0].doc, "wrong doc")
def assertBothFoxes(self, query):
- hits = self.searcher.search(query)
- self.assertEqual(2, len(hits))
+ topDocs = self.searcher.search(query, 50)
+ self.assertEqual(2, topDocs.totalHits)
def assertNoMatches(self, query):
- hits = self.searcher.search(query)
- self.assertEquals(0, len(hits))
+ topDocs = self.searcher.search(query, 50)
+ self.assertEquals(0, topDocs.totalHits)
def testSpanTermQuery(self):
@@ -169,11 +170,10 @@
print "%s:" % query
numSpans = 0
- hits = self.searcher.search(query)
+ scoreDocs = self.searcher.search(query, 50).scoreDocs
scores = [0, 0]
- for hit in hits:
- hit = Hit.cast_(hit)
- scores[hit.getId()] = hit.getScore()
+ for scoreDoc in scoreDocs:
+ scores[scoreDoc.doc] = scoreDoc.score
while spans.next():
numSpans += 1
@@ -183,16 +183,19 @@
# for simplicity - assume tokens are in sequential,
# positions, starting from 0
- tokens = AnalyzerUtils.tokensFromAnalysis(self.analyzer, doc["f"])
+ stream = self.analyzer.tokenStream("contents",
+ StringReader(doc.get("f")))
+ term = stream.addAttribute(TermAttribute.class_)
+
buffer = StringIO()
buffer.write(" ")
i = 0
- for token in tokens:
+ while stream.incrementToken():
if i == spans.start():
buffer.write("<")
- buffer.write(token.termText())
+ buffer.write(term.term())
if i + 1 == spans.end():
buffer.write(">")
Modified: lucene/pylucene/trunk/samples/LuceneInAction/lia/analysis/AnalyzerUtils.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/samples/LuceneInAction/lia/analysis/AnalyzerUtils.py?rev=883975&r1=883974&r2=883975&view=diff
==============================================================================
--- lucene/pylucene/trunk/samples/LuceneInAction/lia/analysis/AnalyzerUtils.py (original)
+++ lucene/pylucene/trunk/samples/LuceneInAction/lia/analysis/AnalyzerUtils.py Wed Nov 25 04:08:13 2009
@@ -13,7 +13,8 @@
# ====================================================================
from lucene import \
- SimpleAnalyzer, Token, TokenStream, StandardAnalyzer, StringReader
+ SimpleAnalyzer, StandardAnalyzer, StringReader, Version, \
+ TermAttribute, PositionIncrementAttribute, TypeAttribute, OffsetAttribute
class AnalyzerUtils(object):
@@ -26,58 +27,104 @@
print "\n----"
print "StandardAnalyzer"
- cls.displayTokensWithFullDetails(StandardAnalyzer(),
- "I'll e-mail you at xyz@example.com")
+ cls.displayTokensWithFullDetails(StandardAnalyzer(Version.LUCENE_CURRENT), "I'll e-mail you at xyz@example.com")
- def tokensFromAnalysis(cls, analyzer, text):
- return [token for token in analyzer.tokenStream("contents", StringReader(text))]
+ def setPositionIncrement(cls, source, posIncr):
+ attr = source.addAttribute(PositionIncrementAttribute.class_)
+ attr.setPositionIncrement(posIncr)
+
+ def getPositionIncrement(cls, source):
+ attr = source.addAttribute(PositionIncrementAttribute.class_)
+ return attr.getPositionIncrement()
+
+ def setTerm(cls, source, term):
+ attr = source.addAttribute(TermAttribute.class_)
+ attr.setTermBuffer(term)
+
+ def getTerm(cls, source):
+ attr = source.addAttribute(TermAttribute.class_)
+ return attr.term()
+
+ def setType(cls, source, type):
+ attr = source.addAttribute(TypeAttribute.class_)
+ attr.setType(type)
+
+ def getType(cls, source):
+ attr = source.addAttribute(TypeAttribute.class_)
+ return attr.type()
def displayTokens(cls, analyzer, text):
- for token in cls.tokensFromAnalysis(analyzer, text):
- print "[%s]" %(token.termText()),
+ tokenStream = analyzer.tokenStream("contents", StringReader(text))
+ term = tokenStream.addAttribute(TermAttribute.class_)
+
+ while tokenStream.incrementToken():
+ print "[%s]" %(term.term())
def displayTokensWithPositions(cls, analyzer, text):
+ stream = analyzer.tokenStream("contents", StringReader(text))
+ term = stream.addAttribute(TermAttribute.class_)
+ posIncr = stream.addAttribute(PositionIncrementAttribute.class_)
+
position = 0
- for token in cls.tokensFromAnalysis(analyzer, text):
- increment = token.getPositionIncrement()
+ while stream.incrementToken():
+ increment = posIncr.getPositionIncrement()
if increment > 0:
- position += increment
+ position = position + increment
print "\n%d:" %(position),
- print "[%s]" %(token.termText()),
+ print "[%s]" %(term.term()),
+ print
def displayTokensWithFullDetails(cls, analyzer, text):
- position = 0
- for token in cls.tokensFromAnalysis(analyzer, text):
- increment = token.getPositionIncrement()
+ stream = analyzer.tokenStream("contents", StringReader(text))
+
+ term = stream.addAttribute(TermAttribute.class_)
+ posIncr = stream.addAttribute(PositionIncrementAttribute.class_)
+ offset = stream.addAttribute(OffsetAttribute.class_)
+ type = stream.addAttribute(TypeAttribute.class_)
+ position = 0
+ while stream.incrementToken():
+ increment = posIncr.getPositionIncrement()
if increment > 0:
- position += increment
- print "\n%s:" %(position),
+ position = position + increment
+ print "\n%d:" %(position),
+
+ print "[%s:%d->%d:%s]" %(term.term(),
+ offset.startOffset(),
+ offset.endOffset(),
+ type.type()),
+ print
+
+ def assertAnalyzesTo(cls, analyzer, input, outputs):
+
+ stream = analyzer.tokenStream("field", StringReader(input))
+ termAttr = stream.addAttribute(TermAttribute.class_)
+ for output in outputs:
+ if not stream.incrementToken():
+ raise AssertionError, 'stream.incremementToken()'
+ if output != termAttr.term():
+ raise AssertionError, 'output == termAttr.term())'
+
+ if stream.incrementToken():
+ raise AssertionError, 'not stream.incremementToken()'
- print "[%s:%d->%d:%s]" %(token.termText(),
- token.startOffset(),
- token.endOffset(),
- token.type()),
-
- def assertTokensEqual(cls, unittest, tokens, strings):
-
- unittest.assertEqual(len(strings), len(tokens))
-
- i = 0
- for token in tokens:
- unittest.assertEqual(strings[i], token.termText(), "index %d" %(i))
- i += 1
+ stream.close()
main = classmethod(main)
- tokensFromAnalysis = classmethod(tokensFromAnalysis)
+ setPositionIncrement = classmethod(setPositionIncrement)
+ getPositionIncrement = classmethod(getPositionIncrement)
+ setTerm = classmethod(setTerm)
+ getTerm = classmethod(getTerm)
+ setType = classmethod(setType)
+ getType = classmethod(getType)
displayTokens = classmethod(displayTokens)
displayTokensWithPositions = classmethod(displayTokensWithPositions)
displayTokensWithFullDetails = classmethod(displayTokensWithFullDetails)
- assertTokensEqual = classmethod(assertTokensEqual)
+ assertAnalyzesTo = classmethod(assertAnalyzesTo)
if __name__ == "__main__":
Modified: lucene/pylucene/trunk/samples/LuceneInAction/lia/analysis/i18n/ChineseTest.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/samples/LuceneInAction/lia/analysis/i18n/ChineseTest.py?rev=883975&r1=883974&r2=883975&view=diff
==============================================================================
--- lucene/pylucene/trunk/samples/LuceneInAction/lia/analysis/i18n/ChineseTest.py (original)
+++ lucene/pylucene/trunk/samples/LuceneInAction/lia/analysis/i18n/ChineseTest.py Wed Nov 25 04:08:13 2009
@@ -21,7 +21,8 @@
def testChinese(self):
- searcher = IndexSearcher(self.directory)
- hits = searcher.search(TermQuery(Term("contents", "é")))
+ searcher = IndexSearcher(self.directory, True)
+ query = TermQuery(Term("contents", "é"))
+ scoreDocs = searcher.search(query, 50).scoreDocs
- self.assertEqual(1, hits.length(), "tao")
+ self.assertEqual(1, len(scoreDocs), "tao")
Modified: lucene/pylucene/trunk/samples/LuceneInAction/lia/analysis/keyword/KeywordAnalyzerTest.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/samples/LuceneInAction/lia/analysis/keyword/KeywordAnalyzerTest.py?rev=883975&r1=883974&r2=883975&view=diff
==============================================================================
--- lucene/pylucene/trunk/samples/LuceneInAction/lia/analysis/keyword/KeywordAnalyzerTest.py (original)
+++ lucene/pylucene/trunk/samples/LuceneInAction/lia/analysis/keyword/KeywordAnalyzerTest.py Wed Nov 25 04:08:13 2009
@@ -17,7 +17,8 @@
from lucene import \
IndexWriter, Term, SimpleAnalyzer, PerFieldAnalyzerWrapper, \
RAMDirectory, Document, Field, IndexSearcher, TermQuery, \
- QueryParser, Analyzer, StringReader, Token, JavaError
+ QueryParser, Analyzer, StringReader, Token, JavaError, \
+ Version
from lia.analysis.keyword.KeywordAnalyzer import KeywordAnalyzer
from lia.analysis.keyword.SimpleKeywordAnalyzer import SimpleKeywordAnalyzer
@@ -28,53 +29,44 @@
def setUp(self):
self.directory = RAMDirectory()
- writer = IndexWriter(self.directory, SimpleAnalyzer(), True)
+ writer = IndexWriter(self.directory, SimpleAnalyzer(), True,
+ IndexWriter.MaxFieldLength.UNLIMITED)
doc = Document()
doc.add(Field("partnum", "Q36",
- Field.Store.YES, Field.Index.UN_TOKENIZED))
+ Field.Store.YES, Field.Index.NOT_ANALYZED))
doc.add(Field("description", "Illidium Space Modulator",
- Field.Store.YES, Field.Index.TOKENIZED))
+ Field.Store.YES, Field.Index.ANALYZED))
writer.addDocument(doc)
writer.close()
- self.searcher = IndexSearcher(self.directory)
+ self.searcher = IndexSearcher(self.directory, True)
def testTermQuery(self):
query = TermQuery(Term("partnum", "Q36"))
- hits = self.searcher.search(query)
- self.assertEqual(1, hits.length())
+ scoreDocs = self.searcher.search(query, 50).scoreDocs
+ self.assertEqual(1, len(scoreDocs))
def testBasicQueryParser(self):
-
- query = QueryParser("description",
- SimpleAnalyzer()).parse("partnum:Q36 AND SPACE")
- hits = self.searcher.search(query)
+ analyzer = SimpleAnalyzer()
+ query = QueryParser(Version.LUCENE_CURRENT, "description",
+ analyzer).parse("partnum:Q36 AND SPACE")
+
+ scoreDocs = self.searcher.search(query, 50).scoreDocs
self.assertEqual("+partnum:q +space", query.toString("description"),
"note Q36 -> q")
- self.assertEqual(0, hits.length(), "doc not found :(")
+ self.assertEqual(0, len(scoreDocs), "doc not found :(")
def testPerFieldAnalyzer(self):
analyzer = PerFieldAnalyzerWrapper(SimpleAnalyzer())
analyzer.addAnalyzer("partnum", KeywordAnalyzer())
- query = QueryParser("description",
+ query = QueryParser(Version.LUCENE_CURRENT, "description",
analyzer).parse("partnum:Q36 AND SPACE")
- hits = self.searcher.search(query)
-
- self.assertEqual("+partnum:Q36 +space", query.toString("description"),
- "Q36 kept as-is")
- self.assertEqual(1, hits.length(), "doc found!")
-
- def testSimpleKeywordAnalyzer(self):
-
- analyzer = SimpleKeywordAnalyzer()
+ scoreDocs = self.searcher.search(query, 50).scoreDocs
- input = "Hello World"
- ts = analyzer.tokenStream("dummy", StringReader(input))
- self.assertEqual(ts.next().termText(), input)
- self.assert_(not list(ts) is None)
- ts.close()
+ #self.assertEqual("+partnum:Q36 +space", query.toString("description"))
+ self.assertEqual(1, len(scoreDocs), "doc found!")
Modified: lucene/pylucene/trunk/samples/LuceneInAction/lia/analysis/positional/PositionalPorterStopAnalyzer.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/samples/LuceneInAction/lia/analysis/positional/PositionalPorterStopAnalyzer.py?rev=883975&r1=883974&r2=883975&view=diff
==============================================================================
--- lucene/pylucene/trunk/samples/LuceneInAction/lia/analysis/positional/PositionalPorterStopAnalyzer.py (original)
+++ lucene/pylucene/trunk/samples/LuceneInAction/lia/analysis/positional/PositionalPorterStopAnalyzer.py Wed Nov 25 04:08:13 2009
@@ -36,13 +36,14 @@
super(PositionalPorterStopAnalyzer, self).__init__()
if stopWords is None:
- stopWords = StopAnalyzer.ENGLISH_STOP_WORDS
-
- self.stopWords = set(stopWords)
+ self.stopWords = StopAnalyzer.ENGLISH_STOP_WORDS_SET
+ else:
+ self.stopWords = set(stopWords)
def tokenStream(self, fieldName, reader):
- tokenStream = LowerCaseTokenizer(reader)
- stopFilter = PositionalStopFilter(tokenStream, self.stopWords)
+ stopFilter = StopFilter(True, LowerCaseTokenizer(reader),
+ self.stopWords)
+ stopFilter.setEnablePositionIncrements(True)
return PorterStemFilter(stopFilter)
Modified: lucene/pylucene/trunk/samples/LuceneInAction/lia/analysis/positional/PositionalPorterStopAnalyzerTest.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/samples/LuceneInAction/lia/analysis/positional/PositionalPorterStopAnalyzerTest.py?rev=883975&r1=883974&r2=883975&view=diff
==============================================================================
--- lucene/pylucene/trunk/samples/LuceneInAction/lia/analysis/positional/PositionalPorterStopAnalyzerTest.py (original)
+++ lucene/pylucene/trunk/samples/LuceneInAction/lia/analysis/positional/PositionalPorterStopAnalyzerTest.py Wed Nov 25 04:08:13 2009
@@ -16,7 +16,7 @@
from lucene import \
IndexWriter, Term, RAMDirectory, Document, Field, \
- IndexSearcher, QueryParser
+ IndexSearcher, QueryParser, Version
from lia.analysis.AnalyzerUtils import AnalyzerUtils
from lia.analysis.positional.PositionalPorterStopAnalyzer import \
@@ -30,49 +30,52 @@
def setUp(self):
self.directory = RAMDirectory()
- writer = IndexWriter(self.directory, self.porterAnalyzer, True)
+ writer = IndexWriter(self.directory, self.porterAnalyzer, True,
+ IndexWriter.MaxFieldLength.UNLIMITED)
doc = Document()
doc.add(Field("contents",
"The quick brown fox jumps over the lazy dogs",
- Field.Store.YES, Field.Index.TOKENIZED))
+ Field.Store.YES, Field.Index.ANALYZED))
writer.addDocument(doc)
writer.close()
def testStems(self):
searcher = IndexSearcher(self.directory)
- query = QueryParser("contents", self.porterAnalyzer).parse("laziness")
- hits = searcher.search(query)
+ query = QueryParser(Version.LUCENE_CURRENT, "contents",
+ self.porterAnalyzer).parse("laziness")
+ topDocs = searcher.search(query, 50)
- self.assertEqual(1, hits.length(), "lazi")
+ self.assertEqual(1, topDocs.totalHits, "lazi")
- query = QueryParser("contents",
+ query = QueryParser(Version.LUCENE_CURRENT, "contents",
self.porterAnalyzer).parse('"fox jumped"')
- hits = searcher.search(query)
+ topDocs = searcher.search(query, 50)
- self.assertEqual(1, hits.length(), "jump jumps jumped jumping")
+ self.assertEqual(1, topDocs.totalHits, "jump jumps jumped jumping")
def testExactPhrase(self):
- searcher = IndexSearcher(self.directory)
- query = QueryParser("contents",
+ searcher = IndexSearcher(self.directory, True)
+ query = QueryParser(Version.LUCENE_24, "contents",
self.porterAnalyzer).parse('"over the lazy"')
- hits = searcher.search(query)
+ topDocs = searcher.search(query, 50)
- self.assertEqual(0, hits.length(), "exact match not found!")
+ self.assertEqual(0, topDocs.totalHits, "exact match not found!")
def testWithSlop(self):
- searcher = IndexSearcher(self.directory)
+ searcher = IndexSearcher(self.directory, True)
- parser = QueryParser("contents", self.porterAnalyzer)
+ parser = QueryParser(Version.LUCENE_CURRENT, "contents",
+ self.porterAnalyzer)
parser.setPhraseSlop(1)
query = parser.parse('"over the lazy"')
- hits = searcher.search(query)
+ topDocs = searcher.search(query, 50)
- self.assertEqual(1, hits.length(), "hole accounted for")
+ self.assertEqual(1, topDocs.totalHits, "hole accounted for")
def main(cls):