Commits

Matt Chaput committed a37c137 Merge

Pulling bug fixes from default branch.

  • Participants
  • Parent commits 72eb99e, 7fd740c
  • Branches dawg

Comments (0)

Files changed (3)

File src/whoosh/filedb/filewriting.py

 
 class SegmentWriter(IndexWriter):
     def __init__(self, ix, poolclass=None, procs=0, blocklimit=128,
-                 timeout=0.0, delay=0.1, name=None, _l=True, **poolargs):
+                 timeout=0.0, delay=0.1, name=None, _lk=True, **poolargs):
         
         self.writelock = None
-        if _l:
+        if _lk:
             self.writelock = ix.lock("WRITELOCK")
             if not try_for(self.writelock.acquire, timeout=timeout, delay=delay):
                 raise LockError

File src/whoosh/searching.py

         :param normalize: whether to normalize term weights.
         """
         
-        return self.searcher.more_like(self.docnum, text=text, top=top,
-                                       numterms=numterms, model=model,
+        return self.searcher.more_like(self.docnum, fieldname, text=text,
+                                       top=top, numterms=numterms, model=model,
                                        normalize=normalize)
     
     def __repr__(self):

File src/whoosh/writing.py

         writer = self.writer
         while writer is None:
             try:
-                writer = self.writerfn(**self.writerargs)
+                writer = self.index.writer(**self.writerargs)
             except LockError:
                 time.sleep(self.delay)
         for method, args, kwargs in self.events: