cleaned up the indexer code:

 - it splits more words out (much simpler, faster splitter)
 - removed code we'll never use (roundup.roundup_indexer has the full
   implementation, and replaces roundup.indexer)
 - only index text/plain and rfc822/message (ideas for other text formats to
   index are welcome)
 - added simple unit test for indexer. Needs more tests for regression.

Author: Richard Jones

CHANGES.txt

@@ -1,10 +1,18 @@
 This file contains the changes to the Roundup system over time. The entries
 are given with the most recent entry first.
 
-2002-??-?? 0.?.?
+2002-??-?? 0.5.0
 Fixed:
  . #576086 ] dumb copying mistake (frontends/ZRoundup.py)
  . installation instructions now mention "python2" in "testing your python".
+ . cleaned up the indexer code:
+   - it splits more words out
+   - removed code we'll never use (roundup.roundup_indexer has the full
+     implementation, and replaces roundup.indexer)
+   - only index text/plain and rfc822/message (ideas for other text formats to
+     index are welcome)
+   - added simple unit test for indexer. Needs more tests for regression.
+ . made the unit tests run again - they were quite b0rken
 
 
 2002-06-24 0.4.2

roundup/backends/back_anydbm.py

@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-#$Id: back_anydbm.py,v 1.37 2002-06-20 23:52:35 richard Exp $
+#$Id: back_anydbm.py,v 1.38 2002-07-08 06:58:15 richard Exp $
 '''
 This module defines a backend that saves the hyperdatabase in a database
 chosen by anydbm. It is guaranteed to always be available in python
@@ -26,7 +26,7 @@
 import whichdb, anydbm, os, marshal
 from roundup import hyperdb, date
 from blobfiles import FileStorage
-from roundup.roundup_indexer import RoundupIndexer
+from roundup.indexer import Indexer
 from locking import acquire_lock, release_lock
 
 #
@@ -62,7 +62,7 @@ def __init__(self, config, journaltag=None):
         self.dirtynodes = {}    # keep track of the dirty nodes by class
         self.newnodes = {}      # keep track of the new nodes by class
         self.transactions = []
-        self.indexer = RoundupIndexer(self.dir)
+        self.indexer = Indexer(self.dir)
         # ensure files are group readable and writable
         os.umask(0002)
 
@@ -160,7 +160,7 @@ def _opendb(self, name, mode):
         except ImportError:
             raise hyperdb.DatabaseError, \
                 "Couldn't open database - the required module '%s'"\
-                "is not available"%db_type
+                " is not available"%db_type
         if __debug__:
             print >>hyperdb.DEBUG, "_opendb %r.open(%r, %r)"%(db_type, path,
                 mode)
@@ -486,6 +486,9 @@ def rollback(self):
 
 #
 #$Log: not supported by cvs2svn $
+#Revision 1.37  2002/06/20 23:52:35  richard
+#More informative error message
+#
 #Revision 1.36  2002/06/19 03:07:19  richard
 #Moved the file storage commit into blobfiles where it belongs.
 #

roundup/backends/blobfiles.py

@@ -15,13 +15,13 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-#$Id: blobfiles.py,v 1.4 2002-06-19 03:07:19 richard Exp $
+#$Id: blobfiles.py,v 1.5 2002-07-08 06:58:15 richard Exp $
 '''
 This module exports file storage for roundup backends.
 Files are stored into a directory hierarchy.
 '''
 
-import os, os.path
+import os
 
 def files_in_dir(dir):       
     if not os.path.exists(dir):
@@ -106,11 +106,13 @@ def _doStoreFile(self, name, **databases):
         '''
         # the file is currently ".tmp" - move it to its real name to commit
         os.rename(name+".tmp", name)
-        pattern = name.split('/')[-1]
-        self.indexer.add_files(dir=os.path.dirname(name), pattern=pattern)
+        self.indexer.add_file(name)
         self.indexer.save_index()
 
 # $Log: not supported by cvs2svn $
+# Revision 1.4  2002/06/19 03:07:19  richard
+# Moved the file storage commit into blobfiles where it belongs.
+#
 # Revision 1.3  2002/02/27 07:33:34  grubert
 #  . add, vim line and cvs log key.
 #