merged in my branch 'resources', which is not aptly named anymore since it no longer...

[zzz-floof.git] / floof / controllers / search.py

diff --git a/floof/controllers/search.py b/floof/controllers/search.py
index abedd16..57ff4d2 100644 (file)
--- a/floof/controllers/search.py
+++ b/floof/controllers/search.py
@@ -1,28 +1,48 @@
 import logging
 
 import logging
 

-from pylons import request, response, session, tmpl_context as c
-from pylons.controllers.util import abort, redirect_to
+from pylons import request, response, session, tmpl_context as c, h
+from pylons.controllers.util import abort, redirect
+from pylons import url

 
 from floof.lib.base import BaseController, render
 
 from floof.lib.base import BaseController, render

+from floof.lib.search import do_search

 
 log = logging.getLogger(__name__)
 
 from floof.model.art import Art, Tag, TagText
 
 log = logging.getLogger(__name__)
 
 from floof.model.art import Art, Tag, TagText

+from floof.model.search import SavedSearch, GalleryWidget

 import elixir
 
 class SearchController(BaseController):
 
     def index(self):
 import elixir
 
 class SearchController(BaseController):
 
     def index(self):

-        """Search, implemented the stupid way!"""
-        query = request.params.get('query', '')
-        tags = query.split()
+        if request.params.get('button') == 'Save':
+            return self.save()

         
         

-        tagtexts = TagText.query.filter(TagText.text.in_(tags))
-        tagtext_ids = [_.id for _ in tagtexts]
-
-        # Fetch art that has all the tags
-        c.artwork = Art.query.join(Tag) \
-                       .filter(Tag.tagtext_id.in_(tagtext_ids)) \
-                       .all()
-
-        return render('/index.mako')
\ No newline at end of file
+        c.query = request.params.get('query', '')
+        c.artwork = do_search(c.query)
+        return render('/index.mako')
+        
+    # TODO: login required
+    def save(self):
+        c.query = request.params.get('query', '')
+        saved_search = SavedSearch(author=c.user, string=c.query)
+        elixir.session.commit()
+        redirect(url('saved_searches'))
+        # TODO: do something better than this.
+        
+    
+    # TODO: login required
+    def list(self):
+        c.searches = c.user.searches
+        return render('/searches.mako')
+    
+    # TODO: login required
+    def display(self, id):
+        c.search = h.get_object_or_404(SavedSearch, id=id)
+        c.gallery = GalleryWidget(search=c.search, page=c.user.primary_page)
+        elixir.session.commit()
+        redirect(url(controller="users", action="view", name=c.user.name))
+        
+        
+        
\ No newline at end of file