kallithea Changeset - e01a85f9fc90

Changeset - e01a85f9fc90

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Marcin Kuzminski - 15 years ago 2010-09-08 01:33:38
marcin@python-works.com

fixed initial whoosh indexer. Build full index on first run even with incremental flag

1 file changed with 7 insertions and 1 deletions:

pylons_app/lib/indexers/daemon.py

0 comments (0 inline, 0 general)

pylons_app/lib/indexers/daemon.py

➞

Show inline comments

@@ @@ -47,24 +47,30 @@ import logging.config @@
 logging.config.fileConfig(jn(project_path, 'development.ini'))
 log = logging.getLogger('whooshIndexer')
 def scan_paths(root_location):
     return HgModel.repo_scan('/', root_location, None, True)
 class WhooshIndexingDaemon(object):
     """Deamon for atomic jobs"""
     def __init__(self, indexname='HG_INDEX', repo_location=None):
         self.indexname = indexname
         self.repo_location = repo_location
         self.initial = False
         if not os.path.isdir(IDX_LOCATION):
             os.mkdir(IDX_LOCATION)
             log.info('Cannot run incremental index since it does not'
                      ' yet exist running full build')
             self.initial = True
     def get_paths(self, root_dir):
         """recursive walk in root dir and return a set of all path in that dir
         excluding files in .hg dir"""
         index_paths_ = set()
         for path, dirs, files in os.walk(root_dir):
             if path.find('.hg') == -1:
                 for f in files:
                     index_paths_.add(jn(path, f))
         return index_paths_
@@ @@ -169,25 +175,25 @@ class WhooshIndexingDaemon(object): @@
                 if path in to_index or path not in indexed_paths:
                     # This is either a file that's changed, or a new file
                     # that wasn't indexed before. So index it!
                     self.add_doc(writer, path, repo)
                     log.debug('reindexing %s' % path)
         writer.commit(merge=True)
         #idx.optimize()
         log.debug('>>> FINISHED <<<')
     def run(self, full_index=False):
         """Run daemon"""
         if full_index:
+        if full_index or self.initial:
             self.build_index()
         else:
             self.update_index()
 if __name__ == "__main__":
     arg = sys.argv[1:]
     if len(arg) != 2:
         sys.stderr.write('Please specify indexing type [full|incremental]'
                          'and path to repositories as script args \n')
         sys.exit()

0 comments (0 inline, 0 general)