error message must accept None, so %d->%s

diff --git a/apps/search/index.py b/apps/search/index.py
index f09a42e..822429e 100644 (file)
--- a/apps/search/index.py
+++ b/apps/search/index.py
@@ -830,11 +830,10 @@ class Search(SolrIndex):
                 idx += 1
 
         except IOError, e:
                 idx += 1
 
         except IOError, e:

-            log.error("Cannot open snippet file for book id = %d [rev=%d], %s" % (book_id, revision, e))
+            log.error("Cannot open snippet file for book id = %d [rev=%s], %s" % (book_id, revision, e))

             return []
         finally:
             return []
         finally:

-            if snippets:
-                snippets.close()
+            snippets.close()

 
             # remove verse end markers..
         snips = map(lambda s: s and s.replace("/\n", "\n"), snips)
 
             # remove verse end markers..
         snips = map(lambda s: s and s.replace("/\n", "\n"), snips)