Now importing a book that already exists in our database doesn't duplicate it's fragm...

diff --git a/apps/catalogue/models.py b/apps/catalogue/models.py
index b658676..133440b 100644 (file)
--- a/apps/catalogue/models.py
+++ b/apps/catalogue/models.py
@@ -202,7 +202,8 @@ class Book(models.Model):
                 short_text = ''
                 if (len(MarkupString(text)) > 240):
                     short_text = unicode(MarkupString(text)[:160])
                 short_text = ''
                 if (len(MarkupString(text)) > 240):
                     short_text = unicode(MarkupString(text)[:160])

-                new_fragment = Fragment(text=text, short_text=short_text, anchor=fragment.id, book=book)
+                new_fragment, created = Fragment.objects.get_or_create(anchor=fragment.id, book=book, 
+                    defaults={'text': text, 'short_text': short_text})

                 
                 try:
                     theme_names = [s.strip() for s in fragment.themes.split(',')]
                 
                 try:
                     theme_names = [s.strip() for s in fragment.themes.split(',')]

diff --git a/wolnelektury/settings.py b/wolnelektury/settings.py
index 3afa9dd..ab9a40f 100644 (file)
--- a/wolnelektury/settings.py
+++ b/wolnelektury/settings.py
@@ -77,8 +77,8 @@ MIDDLEWARE_CLASSES = [
 ]
 
 # If DEBUG is enabled add query log to bottom of every template
 ]
 
 # If DEBUG is enabled add query log to bottom of every template

-# if DEBUG:
-#     MIDDLEWARE_CLASSES.append('middleware.ProfileMiddleware')
+if DEBUG:
+    MIDDLEWARE_CLASSES.append('middleware.ProfileMiddleware')

 
 ROOT_URLCONF = 'urls'
 
 
 ROOT_URLCONF = 'urls'