Changed "has description" to "description" in Book.has_pdf_file method description.

[wolnelektury.git] / catalogue / models.py

diff --git a/catalogue/models.py b/catalogue/models.py
index 5e5dddf..1e54ffe 100644 (file)
--- a/catalogue/models.py
+++ b/catalogue/models.py
@@ -83,7 +83,7 @@ class Book(models.Model):
     
     def has_description(self):
         return len(self.description) > 0
     
     def has_description(self):
         return len(self.description) > 0

-    has_description.short_description = _('Has description')
+    has_description.short_description = _('description')

     has_description.boolean = True
     
     def has_pdf_file(self):
     has_description.boolean = True
     
     def has_pdf_file(self):


@@ -124,12 +124,33 @@ class Book(models.Model):
             book_tags.append(tag)
         book.tags = book_tags
         
             book_tags.append(tag)
         book.tags = book_tags
         

+        # Save XML and HTML files

         book.xml_file.save('%s.xml' % book.slug, File(file(xml_file)), save=False)
         
         html_file = NamedTemporaryFile()
         html.transform(book.xml_file.path, html_file)
         book.html_file.save('%s.html' % book.slug, File(html_file), save=False)
         
         book.xml_file.save('%s.xml' % book.slug, File(file(xml_file)), save=False)
         
         html_file = NamedTemporaryFile()
         html.transform(book.xml_file.path, html_file)
         book.html_file.save('%s.html' % book.slug, File(html_file), save=False)
         

+        # Extract fragments
+        closed_fragments, open_fragments = html.extract_fragments(book.html_file.path)
+        book_themes = []
+        for fragment in closed_fragments.values():
+            new_fragment = Fragment(html=fragment.to_string(), short_html=fragment.to_string(),
+                anchor=fragment.id, book=book)
+                
+            theme_names = [s.strip() for s in fragment.themes.split(',')]
+            themes = []
+            for theme_name in theme_names:
+                tag, created = Tag.objects.get_or_create(name=theme_name,
+                    slug=slughifi(theme_name), sort_key=slughifi(theme_name), category='theme')
+                tag.save()
+                themes.append(tag)
+            new_fragment.save()
+            new_fragment.tags = list(book.tags) + themes
+            book_themes += themes
+        
+        book_themes = set(book_themes)
+        book.tags = list(book.tags) + list(book_themes)

         return book.save()
     
     @permalink
         return book.save()
     
     @permalink


@@ -146,10 +167,10 @@ class Book(models.Model):
 
 
 class Fragment(models.Model):
 
 
 class Fragment(models.Model):

-    text = models.TextField()
-    short_text = models.TextField()
+    html = models.TextField()
+    short_html = models.TextField()

     anchor = models.IntegerField()
     anchor = models.IntegerField()

-    book = models.ForeignKey(Book)
+    book = models.ForeignKey(Book, related_name='fragments')

     
     objects = managers.ModelTaggedItemManager(Tag)
     tags = managers.TagDescriptor(Tag)
     
     objects = managers.ModelTaggedItemManager(Tag)
     tags = managers.TagDescriptor(Tag)


@@ -157,5 +178,5 @@ class Fragment(models.Model):
     class Meta:
         ordering = ('book', 'anchor',)
         verbose_name = _('fragment')
     class Meta:
         ordering = ('book', 'anchor',)
         verbose_name = _('fragment')

-        verbose_name_plural = _('fragment')
+        verbose_name_plural = _('fragments')