Librarian in regular requirements.

[redakcja.git] / apps / catalogue / management / commands / import_wl.py

diff --git a/apps/catalogue/management/commands/import_wl.py b/apps/catalogue/management/commands/import_wl.py
old mode 100755 (executable)
new mode 100644 (file)
index 4f15cef..45c9e33
--- a/apps/catalogue/management/commands/import_wl.py
+++ b/apps/catalogue/management/commands/import_wl.py
@@ -31,9 +31,7 @@ class Command(BaseCommand):
         verbose = options.get('verbose')
 
         # Start transaction management.
-        transaction.commit_unless_managed()
         transaction.enter_transaction_management()
-        transaction.managed(True)
 
         if verbose:
             print 'Reading currently managed files (skipping hidden ones).'
@@ -43,26 +41,12 @@ class Command(BaseCommand):
                 print b.slug
             text = b.materialize().encode('utf-8')
             try:
-                info = BookInfo.from_string(text)
+                info = BookInfo.from_bytes(text)
             except (ParseError, ValidationError):
                 pass
             else:
                 slugs[info.slug].append(b)
 
-        #~ conflicts = []
-        #~ for slug, book_list in slugs.items():
-            #~ if len(book_list) > 1:
-                #~ conflicts.append((slug, book_list))
-        #~ if conflicts:
-            #~ print self.style.ERROR("There is more than one book "
-                    #~ "with the same slug in dc:url. "
-                    #~ "Merge or hide them before proceeding.")
-            #~ for slug, book_list in sorted(conflicts):
-                #~ print slug
-                #~ print "\n".join(b.slug for b in book_list)
-                #~ print
-            #~ return
-
         book_count = 0
         commit_args = {
             "author_name": 'Platforma',
@@ -72,10 +56,10 @@ class Command(BaseCommand):
 
         if verbose:
             print 'Opening books list'
-        for book in json.load(urllib2.urlopen(WL_API))[:10]:
+        for book in json.load(urllib2.urlopen(WL_API)):
             book_detail = json.load(urllib2.urlopen(book['href']))
             xml_text = urllib2.urlopen(book_detail['xml']).read()
-            info = BookInfo.from_string(xml_text)
+            info = BookInfo.from_bytes(xml_text)
             previous_books = slugs.get(info.slug)
             if previous_books:
                 if len(previous_books) > 1:
@@ -87,8 +71,8 @@ class Command(BaseCommand):
                 previous_book = None
                 comm = '*'
             print book_count, info.slug , '-->', comm
-            Book.import_xml_text(xml_text, title=info.title,
-                slug=info.slug, previous_book=previous_book,
+            Book.import_xml_text(xml_text, title=info.title[:255],
+                slug=info.slug[:128], previous_book=previous_book,
                 commit_args=commit_args)
             book_count += 1