Added new staticmethod from_xml_file to Book model and reimplemented importbooks...

[wolnelektury.git] / catalogue / views.py

diff --git a/catalogue/views.py b/catalogue/views.py
index 2f4b30f..49f4196 100644 (file)
--- a/catalogue/views.py
+++ b/catalogue/views.py
@@ -6,13 +6,19 @@ from django.core.urlresolvers import reverse
 from django.db.models import Q
 from django.contrib.auth.decorators import login_required
 from django.utils.datastructures import SortedDict
 from django.db.models import Q
 from django.contrib.auth.decorators import login_required
 from django.utils.datastructures import SortedDict

-from django.views.decorators.http import require_GET, require_POST
+from django.views.decorators.http import require_POST

 from django.contrib import auth
 from django.contrib.auth.forms import UserCreationForm, AuthenticationForm
 from django.utils import simplejson
 from django.utils.functional import Promise
 from django.utils.encoding import force_unicode
 
 from django.contrib import auth
 from django.contrib.auth.forms import UserCreationForm, AuthenticationForm
 from django.utils import simplejson
 from django.utils.functional import Promise
 from django.utils.encoding import force_unicode
 

+from newtagging.views import tagged_object_list
+from catalogue import models
+from catalogue import forms
+from catalogue.utils import split_tags
+
+

 class LazyEncoder(simplejson.JSONEncoder):
     def default(self, obj):
         if isinstance(obj, Promise):
 class LazyEncoder(simplejson.JSONEncoder):
     def default(self, obj):
         if isinstance(obj, Promise):


@@ -20,25 +26,26 @@ class LazyEncoder(simplejson.JSONEncoder):
         return obj
 
 
         return obj
 
 

-from catalogue import models
-from catalogue import forms
-from catalogue.utils import split_tags
-
-
-def catalogue_redirect(request, tags=''):
-    if len(request.GET['q']) > 0:
+def search(request):
+    query = request.GET.get('q', '')
+    tags = request.GET.get('tags', '')
+    if tags == '':
+        tags = []
+    
+    try:
+        tag_list = models.Tag.get_tag_list(tags)
+        tag = models.Tag.objects.get(name=query)
+    except models.Tag.DoesNotExist:

         try:
         try:

-            tag = models.Tag.objects.get(name=request.GET['q'])
-            if len(tags):
-                tags += '/'
-            tags = tags + tag.slug
-        except models.Tag.DoesNotExist:
-            book = get_object_or_404(models.Book, title=request.GET['q'])
+            book = models.Book.objects.get(title=query)

             return HttpResponseRedirect(book.get_absolute_url())
             return HttpResponseRedirect(book.get_absolute_url())

-    if len(tags) > 0:
-        return HttpResponseRedirect(reverse('catalogue.views.tagged_book_list', kwargs=dict(tags=tags)))
+        except models.Book.DoesNotExist:
+            return HttpResponseRedirect(reverse('catalogue.views.main_page'))

     else:
     else:

-        return HttpResponseRedirect(reverse('catalogue.views.main_page'))
+        tag_list.append(tag)
+        return HttpResponseRedirect(reverse('catalogue.views.tagged_book_list', 
+            kwargs={'tags': '/'.join(tag.slug for tag in tag_list)}
+        ))

 
 
 def tags_starting_with(request):
 
 
 def tags_starting_with(request):


@@ -62,10 +69,7 @@ def tags_starting_with(request):
         return HttpResponse('')
 
 
         return HttpResponse('')
 
 

-def main_page(request):
-    if 'q' in request.GET:
-        return catalogue_redirect(request)
-    
+def main_page(request):    

     if request.user.is_authenticated():
         extra_where = '(NOT catalogue_tag.category = "set" OR catalogue_tag.user_id = %d)' % request.user.id
     else:
     if request.user.is_authenticated():
         extra_where = '(NOT catalogue_tag.category = "set" OR catalogue_tag.user_id = %d)' % request.user.id
     else:


@@ -79,9 +83,6 @@ def main_page(request):
 
 
 def book_list(request):
 
 
 def book_list(request):

-    if 'q' in request.GET:
-        return catalogue_redirect(request)
-        

     books = models.Book.objects.all()
     form = forms.SearchForm()
     
     books = models.Book.objects.all()
     form = forms.SearchForm()
     


@@ -94,41 +95,32 @@ def book_list(request):
 
 
 def tagged_book_list(request, tags=''):
 
 
 def tagged_book_list(request, tags=''):

-    if 'q' in request.GET:
-        return catalogue_redirect(request, tags)
-    
-    choices_split = tags.split('/')
-    tags = []
-    for tag in choices_split:
-        tag = get_object_or_404(models.Tag, slug=tag)
-        if tag.category == 'set' and (not request.user.is_authenticated() or request.user != tag.user):
-            raise Http404
-        tags.append(tag)
+    try:
+        tags = models.Tag.get_tag_list(tags)
+    except models.Tag.DoesNotExist:
+        raise Http404

         
         

-    books = models.Book.objects.with_all(tags)
-    

     if request.user.is_authenticated():
         extra_where = '(NOT catalogue_tag.category = "set" OR catalogue_tag.user_id = %d)' % request.user.id
     else:
         extra_where = 'NOT catalogue_tag.category = "set"'
     related_tags = models.Tag.objects.related_for_model(tags, models.Book, counts=True, extra={'where': [extra_where]})
     categories = split_tags(related_tags)
     if request.user.is_authenticated():
         extra_where = '(NOT catalogue_tag.category = "set" OR catalogue_tag.user_id = %d)' % request.user.id
     else:
         extra_where = 'NOT catalogue_tag.category = "set"'
     related_tags = models.Tag.objects.related_for_model(tags, models.Book, counts=True, extra={'where': [extra_where]})
     categories = split_tags(related_tags)

-    
-    form = forms.SearchForm()
-    
-    return render_to_response('catalogue/tagged_book_list.html', dict(
+
+    return tagged_object_list(
+        request,
+        tag_model=models.Tag,
+        queryset_or_model=models.Book,

         tags=tags,
         tags=tags,

-        form=form,
-        books=books,
-        categories=categories,
-    ), context_instance=RequestContext(request))
+        template_name='catalogue/tagged_book_list.html',
+        extra_context = {'categories': categories },
+    )

 
 
 def book_detail(request, slug):
     book = get_object_or_404(models.Book, slug=slug)
     tags = list(book.tags.filter(~Q(category='set')))
     categories = split_tags(tags)
 
 
 def book_detail(request, slug):
     book = get_object_or_404(models.Book, slug=slug)
     tags = list(book.tags.filter(~Q(category='set')))
     categories = split_tags(tags)

-    search_form = forms.SearchForm()

     
     return render_to_response('catalogue/book_detail.html', locals(),
         context_instance=RequestContext(request))
     
     return render_to_response('catalogue/book_detail.html', locals(),
         context_instance=RequestContext(request))