Added small test code to dcparser.

[wolnelektury.git] / catalogue / models.py

diff --git a/catalogue/models.py b/catalogue/models.py
index e9c8928..0d3df16 100644 (file)
--- a/catalogue/models.py
+++ b/catalogue/models.py
@@ -49,7 +49,7 @@ class Tag(TagBase):
 
     @permalink
     def get_absolute_url(self):
 
     @permalink
     def get_absolute_url(self):

-        return ('catalogue.views.tagged_book_list', [self.slug])
+        return ('catalogue.views.tagged_object_list', [self.slug])

     
     class Meta:
         ordering = ('sort_key',)
     
     class Meta:
         ordering = ('sort_key',)


@@ -130,7 +130,6 @@ class Book(models.Model):
         from slughifi import slughifi
         import dcparser
         from markupstring import MarkupString
         from slughifi import slughifi
         import dcparser
         from markupstring import MarkupString

-        import re

         
         # Read book metadata
         book_info = dcparser.parse(xml_file)
         
         # Read book metadata
         book_info = dcparser.parse(xml_file)


@@ -163,8 +162,8 @@ class Book(models.Model):
         for fragment in closed_fragments.values():
             text = fragment.to_string()
             short_text = ''
         for fragment in closed_fragments.values():
             text = fragment.to_string()
             short_text = ''

-            if (len(re.sub(r'</?.*?>', '', text)) > 400):
-                short_text = MarkupString(text)[:240]
+            if (len(MarkupString(text)) > 240):
+                short_text = MarkupString(text)[:160]

             new_fragment = Fragment(text=text, short_text=short_text, anchor=fragment.id, book=book)
                 
             theme_names = [s.strip() for s in fragment.themes.split(',')]
             new_fragment = Fragment(text=text, short_text=short_text, anchor=fragment.id, book=book)
                 
             theme_names = [s.strip() for s in fragment.themes.split(',')]