update to 0.2.1

patch provided by Michal Pasternak in PR pkg/25611

Release 0.2.1

11 May 2004

Minor bugfixes and test improvements.
Release 0.2.0

20 Feb 2004

Reorganized code into modules; converted some iteration constructs to Python
iterators and generators. All text processing internally is now handled as
Unicode. Analyzers are back as generators of tokens.

The changes to the code to make it more pythonic appear to have resulted in
trading time for space: preliminary tests indicate about a 5% speedup on one
dataset in exchange for a 20% increase in memory usage.

3 files changed, 54 insertions, 217 deletions

diff --git a/textproc/py-Lupy/Makefile b/textproc/py-Lupy/Makefile
index c46442f2a9b..4ee66245ca5 100644
--- a/textproc/py-Lupy/Makefile
+++ b/textproc/py-Lupy/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2004/03/09 21:31:16 recht Exp $
+# $NetBSD: Makefile,v 1.3 2004/05/18 12:44:05 recht Exp $
 #
 
-DISTNAME=		Lupy-0.1.5.5.1
+DISTNAME=		Lupy-0.2.1
 PKGNAME=		${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=		textproc
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=lupy/}
diff --git a/textproc/py-Lupy/PLIST b/textproc/py-Lupy/PLIST
index 78149207884..592167eb9a2 100644
--- a/textproc/py-Lupy/PLIST
+++ b/textproc/py-Lupy/PLIST
@@ -1,230 +1,67 @@
-@comment $NetBSD: PLIST,v 1.2 2004/03/09 21:31:16 recht Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/05/18 12:44:05 recht Exp $
 ${PYSITELIB}/lupy/__init__.py
-${PYSITELIB}/lupy/__init__.pyc
-${PYSITELIB}/lupy/__init__.pyo
-${PYSITELIB}/lupy/analysis/__init__.py
-${PYSITELIB}/lupy/analysis/__init__.pyc
-${PYSITELIB}/lupy/analysis/__init__.pyo
-${PYSITELIB}/lupy/analysis/analyzer.py
-${PYSITELIB}/lupy/analysis/analyzer.pyc
-${PYSITELIB}/lupy/analysis/analyzer.pyo
-${PYSITELIB}/lupy/analysis/chartokenizer.py
-${PYSITELIB}/lupy/analysis/chartokenizer.pyc
-${PYSITELIB}/lupy/analysis/chartokenizer.pyo
-${PYSITELIB}/lupy/analysis/lettertokenizer.py
-${PYSITELIB}/lupy/analysis/lettertokenizer.pyc
-${PYSITELIB}/lupy/analysis/lettertokenizer.pyo
-${PYSITELIB}/lupy/analysis/lowercasetokenizer.py
-${PYSITELIB}/lupy/analysis/lowercasetokenizer.pyc
-${PYSITELIB}/lupy/analysis/lowercasetokenizer.pyo
-${PYSITELIB}/lupy/analysis/simpleanalyzer.py
-${PYSITELIB}/lupy/analysis/simpleanalyzer.pyc
-${PYSITELIB}/lupy/analysis/simpleanalyzer.pyo
-${PYSITELIB}/lupy/analysis/splitter.py
-${PYSITELIB}/lupy/analysis/splitter.pyc
-${PYSITELIB}/lupy/analysis/splitter.pyo
-${PYSITELIB}/lupy/analysis/token.py
-${PYSITELIB}/lupy/analysis/token.pyc
-${PYSITELIB}/lupy/analysis/token.pyo
-${PYSITELIB}/lupy/analysis/tokenizer.py
-${PYSITELIB}/lupy/analysis/tokenizer.pyc
-${PYSITELIB}/lupy/analysis/tokenizer.pyo
-${PYSITELIB}/lupy/document/__init__.py
-${PYSITELIB}/lupy/document/__init__.pyc
-${PYSITELIB}/lupy/document/__init__.pyo
-${PYSITELIB}/lupy/document/datefield.py
-${PYSITELIB}/lupy/document/datefield.pyc
-${PYSITELIB}/lupy/document/datefield.pyo
-${PYSITELIB}/lupy/document/document.py
-${PYSITELIB}/lupy/document/document.pyc
-${PYSITELIB}/lupy/document/document.pyo
-${PYSITELIB}/lupy/document/documentfieldenumeration.py
-${PYSITELIB}/lupy/document/documentfieldenumeration.pyc
-${PYSITELIB}/lupy/document/documentfieldenumeration.pyo
-${PYSITELIB}/lupy/document/documentfieldlist.py
-${PYSITELIB}/lupy/document/documentfieldlist.pyc
-${PYSITELIB}/lupy/document/documentfieldlist.pyo
-${PYSITELIB}/lupy/document/field.py
-${PYSITELIB}/lupy/document/field.pyc
-${PYSITELIB}/lupy/document/field.pyo
+${PYSITELIB}/lupy/document.py
+${PYSITELIB}/lupy/indexer.py
+${PYSITELIB}/lupy/newstore.py
+${PYSITELIB}/lupy/store.py
+${PYSITELIB}/lupy/util.py
 ${PYSITELIB}/lupy/index/__init__.py
-${PYSITELIB}/lupy/index/__init__.pyc
-${PYSITELIB}/lupy/index/__init__.pyo
 ${PYSITELIB}/lupy/index/documentwriter.py
-${PYSITELIB}/lupy/index/documentwriter.pyc
-${PYSITELIB}/lupy/index/documentwriter.pyo
-${PYSITELIB}/lupy/index/fieldinfo.py
-${PYSITELIB}/lupy/index/fieldinfo.pyc
-${PYSITELIB}/lupy/index/fieldinfo.pyo
-${PYSITELIB}/lupy/index/fieldinfos.py
-${PYSITELIB}/lupy/index/fieldinfos.pyc
-${PYSITELIB}/lupy/index/fieldinfos.pyo
-${PYSITELIB}/lupy/index/fieldsreader.py
-${PYSITELIB}/lupy/index/fieldsreader.pyc
-${PYSITELIB}/lupy/index/fieldsreader.pyo
-${PYSITELIB}/lupy/index/fieldswriter.py
-${PYSITELIB}/lupy/index/fieldswriter.pyc
-${PYSITELIB}/lupy/index/fieldswriter.pyo
-${PYSITELIB}/lupy/index/indexreader.py
-${PYSITELIB}/lupy/index/indexreader.pyc
-${PYSITELIB}/lupy/index/indexreader.pyo
+${PYSITELIB}/lupy/index/field.py
 ${PYSITELIB}/lupy/index/indexwriter.py
-${PYSITELIB}/lupy/index/indexwriter.pyc
-${PYSITELIB}/lupy/index/indexwriter.pyo
-${PYSITELIB}/lupy/index/segmentinfo.py
-${PYSITELIB}/lupy/index/segmentinfo.pyc
-${PYSITELIB}/lupy/index/segmentinfo.pyo
-${PYSITELIB}/lupy/index/segmentinfos.py
-${PYSITELIB}/lupy/index/segmentinfos.pyc
-${PYSITELIB}/lupy/index/segmentinfos.pyo
-${PYSITELIB}/lupy/index/segmentmergeinfo.py
-${PYSITELIB}/lupy/index/segmentmergeinfo.pyc
-${PYSITELIB}/lupy/index/segmentmergeinfo.pyo
-${PYSITELIB}/lupy/index/segmentmergequeue.py
-${PYSITELIB}/lupy/index/segmentmergequeue.pyc
-${PYSITELIB}/lupy/index/segmentmergequeue.pyo
+${PYSITELIB}/lupy/index/segment.py
 ${PYSITELIB}/lupy/index/segmentmerger.py
-${PYSITELIB}/lupy/index/segmentmerger.pyc
-${PYSITELIB}/lupy/index/segmentmerger.pyo
-${PYSITELIB}/lupy/index/segmentreader.py
-${PYSITELIB}/lupy/index/segmentreader.pyc
-${PYSITELIB}/lupy/index/segmentreader.pyo
-${PYSITELIB}/lupy/index/segmentsreader.py
-${PYSITELIB}/lupy/index/segmentsreader.pyc
-${PYSITELIB}/lupy/index/segmentsreader.pyo
-${PYSITELIB}/lupy/index/segmenttermdocs.py
-${PYSITELIB}/lupy/index/segmenttermdocs.pyc
-${PYSITELIB}/lupy/index/segmenttermdocs.pyo
-${PYSITELIB}/lupy/index/segmenttermenum.py
-${PYSITELIB}/lupy/index/segmenttermenum.pyc
-${PYSITELIB}/lupy/index/segmenttermenum.pyo
-${PYSITELIB}/lupy/index/segmenttermpositions.py
-${PYSITELIB}/lupy/index/segmenttermpositions.pyc
-${PYSITELIB}/lupy/index/segmenttermpositions.pyo
 ${PYSITELIB}/lupy/index/term.py
-${PYSITELIB}/lupy/index/term.pyc
-${PYSITELIB}/lupy/index/term.pyo
-${PYSITELIB}/lupy/index/termdocs.py
-${PYSITELIB}/lupy/index/termdocs.pyc
-${PYSITELIB}/lupy/index/termdocs.pyo
-${PYSITELIB}/lupy/index/termenum.py
-${PYSITELIB}/lupy/index/termenum.pyc
-${PYSITELIB}/lupy/index/termenum.pyo
 ${PYSITELIB}/lupy/index/terminfo.py
+${PYSITELIB}/lupy/index/__init__.pyc
+${PYSITELIB}/lupy/index/documentwriter.pyc
+${PYSITELIB}/lupy/index/field.pyc
+${PYSITELIB}/lupy/index/indexwriter.pyc
+${PYSITELIB}/lupy/index/segment.pyc
+${PYSITELIB}/lupy/index/segmentmerger.pyc
+${PYSITELIB}/lupy/index/term.pyc
 ${PYSITELIB}/lupy/index/terminfo.pyc
+${PYSITELIB}/lupy/index/__init__.pyo
+${PYSITELIB}/lupy/index/documentwriter.pyo
+${PYSITELIB}/lupy/index/field.pyo
+${PYSITELIB}/lupy/index/indexwriter.pyo
+${PYSITELIB}/lupy/index/segment.pyo
+${PYSITELIB}/lupy/index/segmentmerger.pyo
+${PYSITELIB}/lupy/index/term.pyo
 ${PYSITELIB}/lupy/index/terminfo.pyo
-${PYSITELIB}/lupy/index/terminfosreader.py
-${PYSITELIB}/lupy/index/terminfosreader.pyc
-${PYSITELIB}/lupy/index/terminfosreader.pyo
-${PYSITELIB}/lupy/index/terminfoswriter.py
-${PYSITELIB}/lupy/index/terminfoswriter.pyc
-${PYSITELIB}/lupy/index/terminfoswriter.pyo
-${PYSITELIB}/lupy/index/termpositions.py
-${PYSITELIB}/lupy/index/termpositions.pyc
-${PYSITELIB}/lupy/index/termpositions.pyo
-${PYSITELIB}/lupy/indexer.py
-${PYSITELIB}/lupy/indexer.pyc
-${PYSITELIB}/lupy/indexer.pyo
 ${PYSITELIB}/lupy/search/__init__.py
-${PYSITELIB}/lupy/search/__init__.pyc
-${PYSITELIB}/lupy/search/__init__.pyo
-${PYSITELIB}/lupy/search/booleanclause.py
-${PYSITELIB}/lupy/search/booleanclause.pyc
-${PYSITELIB}/lupy/search/booleanclause.pyo
-${PYSITELIB}/lupy/search/booleanquery.py
-${PYSITELIB}/lupy/search/booleanquery.pyc
-${PYSITELIB}/lupy/search/booleanquery.pyo
-${PYSITELIB}/lupy/search/booleanscorer.py
-${PYSITELIB}/lupy/search/booleanscorer.pyc
-${PYSITELIB}/lupy/search/booleanscorer.pyo
-${PYSITELIB}/lupy/search/exactphrasescorer.py
-${PYSITELIB}/lupy/search/exactphrasescorer.pyc
-${PYSITELIB}/lupy/search/exactphrasescorer.pyo
-${PYSITELIB}/lupy/search/hitcollector.py
-${PYSITELIB}/lupy/search/hitcollector.pyc
-${PYSITELIB}/lupy/search/hitcollector.pyo
-${PYSITELIB}/lupy/search/hitdoc.py
-${PYSITELIB}/lupy/search/hitdoc.pyc
-${PYSITELIB}/lupy/search/hitdoc.pyo
-${PYSITELIB}/lupy/search/hitqueue.py
-${PYSITELIB}/lupy/search/hitqueue.pyc
-${PYSITELIB}/lupy/search/hitqueue.pyo
+${PYSITELIB}/lupy/search/boolean.py
 ${PYSITELIB}/lupy/search/hits.py
-${PYSITELIB}/lupy/search/hits.pyc
-${PYSITELIB}/lupy/search/hits.pyo
 ${PYSITELIB}/lupy/search/indexsearcher.py
-${PYSITELIB}/lupy/search/indexsearcher.pyc
-${PYSITELIB}/lupy/search/indexsearcher.pyo
-${PYSITELIB}/lupy/search/phrasepositions.py
-${PYSITELIB}/lupy/search/phrasepositions.pyc
-${PYSITELIB}/lupy/search/phrasepositions.pyo
-${PYSITELIB}/lupy/search/phrasequery.py
-${PYSITELIB}/lupy/search/phrasequery.pyc
-${PYSITELIB}/lupy/search/phrasequery.pyo
-${PYSITELIB}/lupy/search/phrasequeue.py
-${PYSITELIB}/lupy/search/phrasequeue.pyc
-${PYSITELIB}/lupy/search/phrasequeue.pyo
-${PYSITELIB}/lupy/search/phrasescorer.py
-${PYSITELIB}/lupy/search/phrasescorer.pyc
-${PYSITELIB}/lupy/search/phrasescorer.pyo
-${PYSITELIB}/lupy/search/query.py
-${PYSITELIB}/lupy/search/query.pyc
-${PYSITELIB}/lupy/search/query.pyo
-${PYSITELIB}/lupy/search/scoredoc.py
-${PYSITELIB}/lupy/search/scoredoc.pyc
-${PYSITELIB}/lupy/search/scoredoc.pyo
-${PYSITELIB}/lupy/search/scorer.py
-${PYSITELIB}/lupy/search/scorer.pyc
-${PYSITELIB}/lupy/search/scorer.pyo
-${PYSITELIB}/lupy/search/searcher.py
-${PYSITELIB}/lupy/search/searcher.pyc
-${PYSITELIB}/lupy/search/searcher.pyo
+${PYSITELIB}/lupy/search/phrase.py
 ${PYSITELIB}/lupy/search/similarity.py
+${PYSITELIB}/lupy/search/term.py
+${PYSITELIB}/lupy/search/__init__.pyc
+${PYSITELIB}/lupy/search/boolean.pyc
+${PYSITELIB}/lupy/search/hits.pyc
+${PYSITELIB}/lupy/search/indexsearcher.pyc
+${PYSITELIB}/lupy/search/phrase.pyc
 ${PYSITELIB}/lupy/search/similarity.pyc
+${PYSITELIB}/lupy/search/term.pyc
+${PYSITELIB}/lupy/search/__init__.pyo
+${PYSITELIB}/lupy/search/boolean.pyo
+${PYSITELIB}/lupy/search/hits.pyo
+${PYSITELIB}/lupy/search/indexsearcher.pyo
+${PYSITELIB}/lupy/search/phrase.pyo
 ${PYSITELIB}/lupy/search/similarity.pyo
-${PYSITELIB}/lupy/search/termquery.py
-${PYSITELIB}/lupy/search/termquery.pyc
-${PYSITELIB}/lupy/search/termquery.pyo
-${PYSITELIB}/lupy/search/termscorer.py
-${PYSITELIB}/lupy/search/termscorer.pyc
-${PYSITELIB}/lupy/search/termscorer.pyo
-${PYSITELIB}/lupy/search/topdocs.py
-${PYSITELIB}/lupy/search/topdocs.pyc
-${PYSITELIB}/lupy/search/topdocs.pyo
-${PYSITELIB}/lupy/store/__init__.py
-${PYSITELIB}/lupy/store/__init__.pyc
-${PYSITELIB}/lupy/store/__init__.pyo
-${PYSITELIB}/lupy/store/directory.py
-${PYSITELIB}/lupy/store/directory.pyc
-${PYSITELIB}/lupy/store/directory.pyo
-${PYSITELIB}/lupy/store/fsdirectory.py
-${PYSITELIB}/lupy/store/fsdirectory.pyc
-${PYSITELIB}/lupy/store/fsdirectory.pyo
-${PYSITELIB}/lupy/store/inputstream.py
-${PYSITELIB}/lupy/store/inputstream.pyc
-${PYSITELIB}/lupy/store/inputstream.pyo
-${PYSITELIB}/lupy/store/outputstream.py
-${PYSITELIB}/lupy/store/outputstream.pyc
-${PYSITELIB}/lupy/store/outputstream.pyo
-${PYSITELIB}/lupy/store/ramdirectory.py
-${PYSITELIB}/lupy/store/ramdirectory.pyc
-${PYSITELIB}/lupy/store/ramdirectory.pyo
-${PYSITELIB}/lupy/util/__init__.py
-${PYSITELIB}/lupy/util/__init__.pyc
-${PYSITELIB}/lupy/util/__init__.pyo
-${PYSITELIB}/lupy/util/bitvector.py
-${PYSITELIB}/lupy/util/bitvector.pyc
-${PYSITELIB}/lupy/util/bitvector.pyo
-${PYSITELIB}/lupy/util/locker.py
-${PYSITELIB}/lupy/util/locker.pyc
-${PYSITELIB}/lupy/util/locker.pyo
-${PYSITELIB}/lupy/util/priorityqueue.py
-${PYSITELIB}/lupy/util/priorityqueue.pyc
-${PYSITELIB}/lupy/util/priorityqueue.pyo
-@dirrm ${PYSITELIB}/lupy/util
-@dirrm ${PYSITELIB}/lupy/store
+${PYSITELIB}/lupy/search/term.pyo
+${PYSITELIB}/lupy/__init__.pyc
+${PYSITELIB}/lupy/document.pyc
+${PYSITELIB}/lupy/indexer.pyc
+${PYSITELIB}/lupy/newstore.pyc
+${PYSITELIB}/lupy/store.pyc
+${PYSITELIB}/lupy/util.pyc
+${PYSITELIB}/lupy/__init__.pyo
+${PYSITELIB}/lupy/document.pyo
+${PYSITELIB}/lupy/indexer.pyo
+${PYSITELIB}/lupy/newstore.pyo
+${PYSITELIB}/lupy/store.pyo
+${PYSITELIB}/lupy/util.pyo
 @dirrm ${PYSITELIB}/lupy/search
 @dirrm ${PYSITELIB}/lupy/index
-@dirrm ${PYSITELIB}/lupy/document
-@dirrm ${PYSITELIB}/lupy/analysis
 @dirrm ${PYSITELIB}/lupy
diff --git a/textproc/py-Lupy/distinfo b/textproc/py-Lupy/distinfo
index 070556c10b3..8396e89ec77 100644
--- a/textproc/py-Lupy/distinfo
+++ b/textproc/py-Lupy/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/12/06 19:39:45 recht Exp $
+$NetBSD: distinfo,v 1.2 2004/05/18 12:44:05 recht Exp $
 
-SHA1 (Lupy-0.1.5.5.1.tar.gz) = b647fabc4fc13af94344eca7df088ab007e64d4f
-Size (Lupy-0.1.5.5.1.tar.gz) = 86448 bytes
+SHA1 (Lupy-0.2.1.tar.gz) = 764b217c77d951de0c2e6d895c3d7a15ac7af007
+Size (Lupy-0.2.1.tar.gz) = 52269 bytes