diff options
| author | Benjamin Saller <bcsaller@objectrealms.net> | 2007-08-16 19:40:38 (GMT) |
|---|---|---|
| committer | Benjamin Saller <bcsaller@objectrealms.net> | 2007-08-16 19:40:38 (GMT) |
| commit | cdd7de6018c6fbd21f4cc53519cfba6e92b3f57c (patch) | |
| tree | e6d45e91820b6a94c109e6e69d546661a2c14ab3 | |
| parent | 029629e7c79bdaf33191a07f2769e37e93bcc7fb (diff) | |
old argument passing bug for mimetype in indexThread
| -rw-r--r-- | src/olpc/datastore/converter.py | 1 | ||||
| -rw-r--r-- | src/olpc/datastore/xapianindex.py | 3 | ||||
| -rw-r--r-- | tests/test_model.py | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/olpc/datastore/converter.py b/src/olpc/datastore/converter.py index 75f7568..730613a 100644 --- a/src/olpc/datastore/converter.py +++ b/src/olpc/datastore/converter.py @@ -64,6 +64,7 @@ class subprocessconverter(object): def __call__(self, filename): data = {} + data['source'] = filename if self.require_target: # XXX: methods that return something bad here diff --git a/src/olpc/datastore/xapianindex.py b/src/olpc/datastore/xapianindex.py index 4aa4632..f8a26b4 100644 --- a/src/olpc/datastore/xapianindex.py +++ b/src/olpc/datastore/xapianindex.py @@ -193,7 +193,6 @@ class IndexManager(object): with self._write_lock: for item in data: uid, vid, doc, operation, filestuff = item - if operation is DELETE: self.write_index.delete(uid) logger.info("deleted content %s" % (uid,)) @@ -215,7 +214,7 @@ class IndexManager(object): " indexing at %s. Not" " Found" % filename) - fp = converter(filename, mimetype) + fp = converter(filename, mimetype=mimetype) if fp: # read in at a fixed block size, try to # conserve memory. If this doesn't work diff --git a/tests/test_model.py b/tests/test_model.py index 6d171c1..5de0b45 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -6,6 +6,8 @@ from olpc.datastore import model, backingstore import datetime import os +import logging +logging.basicConfig() DEFAULT_STORE = '/tmp/test_ds' |