some more Xapian stuff (doc, test fixes)

Author: Richard Jones

TODO.txt

@@ -5,10 +5,6 @@ Required:
   - write up security model used in classic tracker
   - ensure classic template actually implements the model detailed
 - "Web Access" revocation needs work - the context should not be rendered
-- should redefinitions of a permission keyed off (name, classname) generate
-  an error or a warning? Something needs to be generated, as such
-  occurrances are an error in the schema...
-- check that the Provisional User example actually works as advertised
 
 Optionally:
 - clean up roundup.cgi (switch to config file, use proper logging, remove

doc/installation.txt

@@ -22,7 +22,7 @@ Roundup trackers
  `choosing your template`_.
 
 Roundup support code
- Installed into your Python install's lib directory
+ Installed into your Python install's lib directory.
 
 Roundup scripts
  These include the email gateway, the roundup
@@ -46,19 +46,25 @@ http://starship.python.net/crew/mhammond/win32/).
 Optional Components
 ===================
 
-You may optionall install and use:
+You may optionally install and use:
 
 An RDBMS
   Sqlite, MySQL and Postgresql are all supported by Roundup and will be
   used if available. One of these is recommended if you are anticipating a
   large user base (see `choosing your backend`_ below).
+
 Xapian full-text indexer
   The Xapian_ full-text indexer is also supported and will be used by
   default if it is available. This is strongly recommended if you are
   anticipating a large number of issues (> 1000).
 
+  You may install Xapian at any time, even after a tracker has been
+  installed and used. You will need to run the "roundup-admin reindex"
+  command if the tracker has existing data.
+
 .. _Xapian: http://www.xapian.org/
 
+
 Getting Roundup
 ===============
 

test/test_indexer.py

@@ -18,18 +18,22 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-# $Id: test_indexer.py,v 1.7 2005-04-28 00:21:42 richard Exp $
+# $Id: test_indexer.py,v 1.8 2005-04-28 09:06:09 richard Exp $
 
 import os, unittest, shutil
 
+class db:
+    class config:
+        DATABASE = 'test-index'
+
 class IndexerTest(unittest.TestCase):
     def setUp(self):
         if os.path.exists('test-index'):
             shutil.rmtree('test-index')
         os.mkdir('test-index')
         os.mkdir('test-index/files')
         from roundup.backends.indexer_dbm import Indexer
-        self.dex = Indexer('test-index')
+        self.dex = Indexer(db)
         self.dex.load_index()
 
     def test_basics(self):
@@ -45,12 +49,13 @@ def tearDown(self):
 
 class XapianIndexerTest(IndexerTest):
     def setUp(self):
-        if os.path.exists('text-index'):
-            shutil.rmtree('text-index')
+        if os.path.exists('test-index'):
+            shutil.rmtree('test-index')
+        os.mkdir('test-index')
         from roundup.backends.indexer_xapian import Indexer
-        self.dex = Indexer('.')
+        self.dex = Indexer(db)
     def tearDown(self):
-        shutil.rmtree('text-index')
+        shutil.rmtree('test-index')
 
 def test_suite():
     suite = unittest.TestSuite()