Some cleanup:

* indexer_rdbms.Indexer now subclasses from indexer_common.Indexer instead of
  indexer_dbm.Indexer
* rdbms_common doesn't call save_index anymore
* so we can remove save_index from indexer_rdbms and back_tsearch2
* indexer_rdbms.Indexer.rollback() wasn't used at all, so remove it
* move is_stopword code to indexer_common

Author: Johannes Gijsbers

roundup/backends/back_tsearch2.py

@@ -1,4 +1,4 @@
-#$Id: back_tsearch2.py,v 1.8 2005-01-08 11:25:23 jlgijsbers Exp $
+#$Id: back_tsearch2.py,v 1.9 2005-01-08 16:16:59 jlgijsbers Exp $
 
 # Note: this backend is EXPERIMENTAL. Do not use if you value your data.
 import re
@@ -134,9 +134,6 @@ def tsearchQuery(self, classname, search_terms):
     # These only exist to satisfy the interface that's expected from indexers.
     def force_reindex(self):
         pass
-    
-    def save_index(self):
-        pass
 
     def add_text(self, identifier, text, mime_type=None):
         pass

roundup/backends/indexer_common.py

@@ -1,8 +1,21 @@
-#$Id: indexer_common.py,v 1.3 2005-01-08 11:25:23 jlgijsbers Exp $
+#$Id: indexer_common.py,v 1.4 2005-01-08 16:16:59 jlgijsbers Exp $
 import re
 
 from roundup import hyperdb
 
+stopwords = [
+"A", "AND", "ARE", "AS", "AT", "BE", "BUT", "BY",
+"FOR", "IF", "IN", "INTO", "IS", "IT",
+"NO", "NOT", "OF", "ON", "OR", "SUCH",
+"THAT", "THE", "THEIR", "THEN", "THERE", "THESE",
+"THEY", "THIS", "TO", "WAS", "WILL", "WITH" 
+]
+
+is_stopword = {}
+for word in stopwords:
+    is_stopword[word] = None
+is_stopword = is_stopword.has_key
+
 def _isLink(propclass):
     return (isinstance(propclass, hyperdb.Link) or
             isinstance(propclass, hyperdb.Multilink))

roundup/backends/indexer_dbm.py

@@ -14,7 +14,7 @@
 #     that promote freedom, but obviously am giving up any rights
 #     to compel such.
 # 
-#$Id: indexer_dbm.py,v 1.4 2005-01-05 22:14:21 jlgijsbers Exp $
+#$Id: indexer_dbm.py,v 1.5 2005-01-08 16:16:59 jlgijsbers Exp $
 '''This module provides an indexer class, RoundupIndexer, that stores text
 indices in a roundup instance.  This class makes searching the content of
 messages, string properties and text files possible.
@@ -23,19 +23,7 @@
 
 import os, shutil, re, mimetypes, marshal, zlib, errno
 from roundup.hyperdb import Link, Multilink
-from roundup.backends.indexer_common import Indexer
-
-stopwords = [
-"A", "AND", "ARE", "AS", "AT", "BE", "BUT", "BY",
-"FOR", "IF", "IN", "INTO", "IS", "IT",
-"NO", "NOT", "OF", "ON", "OR", "SUCH",
-"THAT", "THE", "THEIR", "THEN", "THERE", "THESE",
-"THEY", "THIS", "TO", "WAS", "WILL", "WITH" 
-]
-is_stopword = {}
-for word in stopwords:
-    is_stopword[word] = None
-is_stopword = is_stopword.has_key
+from roundup.backends.indexer_common import Indexer, is_stopword
 
 class Indexer(Indexer):
     '''Indexes information from roundup's hyperdb to allow efficient

roundup/backends/indexer_rdbms.py

@@ -1,11 +1,11 @@
-#$Id: indexer_rdbms.py,v 1.7 2005-01-08 11:25:23 jlgijsbers Exp $
+#$Id: indexer_rdbms.py,v 1.8 2005-01-08 16:16:59 jlgijsbers Exp $
 ''' This implements the full-text indexer over two RDBMS tables. The first
 is a mapping of words to occurance IDs. The second maps the IDs to (Class,
 propname, itemid) instances.
 '''
 import re
 
-from indexer_dbm import Indexer, is_stopword
+from indexer_common import Indexer, is_stopword
 
 class Indexer(Indexer):
     def __init__(self, db):
@@ -129,11 +129,3 @@ def find(self, wordlist):
 
         return self.db.cursor.fetchall()
 
-    def save_index(self):
-        # the normal RDBMS backend transaction mechanisms will handle this
-        pass
-
-    def rollback(self):
-        # the normal RDBMS backend transaction mechanisms will handle this
-        pass
-

roundup/backends/rdbms_common.py

@@ -1,4 +1,4 @@
-# $Id: rdbms_common.py,v 1.145 2005-01-06 17:35:34 a1s Exp $
+# $Id: rdbms_common.py,v 1.146 2005-01-08 16:16:59 jlgijsbers Exp $
 ''' Relational database (SQL) backend common code.
 
 Basics:
@@ -320,7 +320,6 @@ def reindex(self, classname=None):
         for klass in classes:
             for nodeid in klass.list():
                 klass.index(nodeid)
-        self.indexer.save_index()
 
     hyperdb_to_sql_datatypes = {
         hyperdb.String : 'TEXT',
@@ -1176,9 +1175,6 @@ def commit(self):
         for method, args in self.transactions:
             method(*args)
 
-        # save the indexer state
-        self.indexer.save_index()
-
         # clear out the transactions
         self.transactions = []