From 159af5799566eec4d6ce201bf5824f6bb3482bf5 Mon Sep 17 00:00:00 2001
From: Bridger Maxwell <bridger@mit.edu>
Date: Wed, 8 Feb 2012 21:37:24 -0500
Subject: [PATCH] Removed codehilite from wiki. It was throwing errors and
 wasn't used. Should be fixed later?

---
 simplewiki/settings.py |  2 +-
 simplewiki/views.py    | 25 +++++++++++++++----------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/simplewiki/settings.py b/simplewiki/settings.py
index 2afc4528e6..88363901a8 100644
--- a/simplewiki/settings.py
+++ b/simplewiki/settings.py
@@ -85,7 +85,7 @@ WIKI_MARKDOWN_EXTENSIONS = getattr(settings, 'SIMPLE_WIKI_MARKDOWN_EXTENSIONS',
                             'headerid',
                             'fenced_code',
                             'def_list',
-                            'codehilite',
+                            #'codehilite', #This was throwing errors
                             'abbr',
                             'toc',
                             'mathjax',
diff --git a/simplewiki/views.py b/simplewiki/views.py
index d9d2047b15..4766b4f270 100644
--- a/simplewiki/views.py
+++ b/simplewiki/views.py
@@ -311,9 +311,17 @@ def search_articles(request):
         querystring = request.POST['value'].strip()
     else:
         querystring = ""
+        
+        
+    results = Article.objects.all()
+    
+    if request.user.is_superuser:
+        results = results.order_by('current_revision__deleted')
+    else:
+        results = results.filter(current_revision__deleted = 0)
+    
 
     if querystring:
-        results = Article.objects.all()
         for queryword in querystring.split():
             # Basic negation is as fancy as we get right now
             if queryword[0] == '-' and len(queryword) > 1:
@@ -324,18 +332,15 @@ def search_articles(request):
                     
             results = results._search(Q(current_revision__contents__icontains = queryword) | \
                                       Q(title__icontains = queryword))
-    else:
-        # Need to throttle results by splitting them into pages...
-        results = Article.objects.all()
         
-    if request.user.is_superuser:
-        results = results.order_by('current_revision__deleted')
-    else:
-        results = results.filter(current_revision__deleted = 0)
+    results.select_related('current_revision__deleted')
+        
+    print [(article.title.lower(), article.get_url()) for article in results]
+    results = sorted(results, key=lambda article: (article.current_revision.deleted, article.get_url().lower()) )
 
-    if results.count() == 1 and querystring:
+    if len(results) == 1 and querystring:
         return HttpResponseRedirect(reverse('wiki_view', args=(results[0].get_url(),)))
-    else:        
+    else:
         d = {'wiki_search_results': results,
             	'wiki_search_query': querystring,}
         d.update(csrf(request))