genre for pictures

[wolnelektury.git] / apps / catalogue / management / commands / importbooks.py

diff --git a/apps/catalogue/management/commands/importbooks.py b/apps/catalogue/management/commands/importbooks.py
index 637e214..323755e 100644 (file)
--- a/apps/catalogue/management/commands/importbooks.py
+++ b/apps/catalogue/management/commands/importbooks.py
@@ -10,12 +10,16 @@ from django.conf import settings
 from django.core.management.base import BaseCommand
 from django.core.management.color import color_style
 from django.core.files import File
+from catalogue.utils import trim_query_log
+
+from wolnelektury_core.management.profile import profile
 
 from catalogue.models import Book
 from picture.models import Picture
 
 from search import Index
 
+
 class Command(BaseCommand):
     option_list = BaseCommand.option_list + (
         make_option('-q', '--quiet', action='store_false', dest='verbose', default=True,
@@ -44,8 +48,6 @@ class Command(BaseCommand):
         file_base, ext = os.path.splitext(file_path)
         book = Book.from_xml_file(file_path, overwrite=options.get('force'),
                                   dont_build=dont_build,
-                                  search_index=options.get('search_index'),
-                                  search_index_reuse=True,
                                   search_index_tags=False)
         for ebook_format in Book.ebook_formats:
             if os.path.isfile(file_base + '.' + ebook_format):
@@ -62,11 +64,12 @@ class Command(BaseCommand):
         picture = Picture.from_xml_file(file_path, overwrite=options.get('force'))
         return picture
 
+    #    @profile
     def handle(self, *directories, **options):
         from django.db import transaction
 
         self.style = color_style()
-
+        
         verbose = options.get('verbose')
         force = options.get('force')
         show_traceback = options.get('traceback', False)
@@ -80,13 +83,15 @@ class Command(BaseCommand):
                     time.strftime('%Y-%m-%d %H:%M:%S',
                     time.localtime(wait_until)), wait_until - time.time())
 
+        index = None
         if options.get('search_index') and not settings.NO_SEARCH_INDEX:
             index = Index()
-            index.open()
             try:
                 index.index_tags()
-            finally:
-                index.close()
+                index.index.commit()
+            except Exception, e:
+                index.index.rollback()
+                raise e
 
         # Start transaction management.
         transaction.commit_unless_managed()
@@ -95,7 +100,7 @@ class Command(BaseCommand):
 
         files_imported = 0
         files_skipped = 0
-        
+
         for dir_name in directories:
             if not os.path.isdir(dir_name):
                 print self.style.ERROR("%s: Not a directory. Skipping." % dir_name)
@@ -104,6 +109,7 @@ class Command(BaseCommand):
                 files = sorted(os.listdir(dir_name))
                 postponed = {}
                 while files:
+                    trim_query_log(0)
                     file_name = files.pop(0)
                     file_path = os.path.join(dir_name, file_name)
                     file_base, ext = os.path.splitext(file_path)
@@ -124,6 +130,7 @@ class Command(BaseCommand):
                             self.import_picture(file_path, options)
                         else:
                             self.import_book(file_path, options)
+
                         files_imported += 1
                         transaction.commit()
                         
@@ -158,4 +165,3 @@ class Command(BaseCommand):
 
         transaction.commit()
         transaction.leave_transaction_management()
-