X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/6d80d9682f0487d7858d5a18221cbe68e41d38ad..0e9ce396fab5cdfc2f1806bae43f05de77cb1e21:/apps/search/management/commands/reindex.py

diff --git a/apps/search/management/commands/reindex.py b/apps/search/management/commands/reindex.py
index 3b6517f2e..4941354ce 100755
--- a/apps/search/management/commands/reindex.py
+++ b/apps/search/management/commands/reindex.py
@@ -1,6 +1,44 @@
+# -*- coding: utf-8 -*-
+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#
+import sys
 from django.core.management.base import BaseCommand
 
 from optparse import make_option
+
+def query_yes_no(question, default="yes"):
+    """Ask a yes/no question via raw_input() and return their answer.
+
+    "question" is a string that is presented to the user.
+    "default" is the presumed answer if the user just hits <Enter>.
+        It must be "yes" (the default), "no" or None (meaning
+        an answer is required of the user).
+
+    The "answer" return value is one of "yes" or "no".
+    """
+    valid = {"yes":True,   "y":True,  "ye":True,
+             "no":False,     "n":False}
+    if default == None:
+        prompt = " [y/n] "
+    elif default == "yes":
+        prompt = " [Y/n] "
+    elif default == "no":
+        prompt = " [y/N] "
+    else:
+        raise ValueError("invalid default answer: '%s'" % default)
+
+    while True:
+        sys.stdout.write(question + prompt)
+        choice = raw_input().lower()
+        if default is not None and choice == '':
+            return valid[default]
+        elif choice in valid:
+            return valid[choice]
+        else:
+            sys.stdout.write("Please respond with 'yes' or 'no' "\
+                             "(or 'y' or 'n').\n")
+
 class Command(BaseCommand):
     help = 'Reindex everything.'
     args = ''
@@ -13,10 +51,9 @@ class Command(BaseCommand):
     )
     def handle(self, *args, **opts):
         from catalogue.models import Book
-        import search
-        idx = search.ReusableIndex()
-        idx.open()
-
+        from search.index import Index
+        idx = Index()
+        
         if not opts['just_tags']:
             if args:
                 books = []
@@ -26,11 +63,26 @@ class Command(BaseCommand):
                     else:
                         books += Book.objects.filter(slug=a).all()
             else:
-                books = Book.objects.all()
-                
-            for b in books:
-                print b.title
-                idx.index_book(b)
+                books = list(Book.objects.all())
+
+            while books:
+                try:
+                    b = books[0]
+                    print b.title
+                    idx.index_book(b)
+                    idx.index.commit()
+                    books.pop(0)
+                except Exception, e:
+                    print "Error occured: %s" % e
+                    try:
+                        # we might not be able to rollback
+                        idx.index.rollback()
+                    except:
+                        pass
+                    retry = query_yes_no("Retry?")
+                    if not retry:
+                        break
+
         print 'Reindexing tags.'
         idx.index_tags()
-        idx.close()
+        idx.index.commit()