merged suff, commented out some of my own

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

diff --git a/floof/controllers/search.py b/floof/controllers/search.py
index 4e92a6d..8617966 100644 (file)
--- a/floof/controllers/search.py
+++ b/floof/controllers/search.py
@@ -1,16 +1,17 @@
 import logging
 
-from pylons import request, response, session, tmpl_context as c, h
+from pylons import request, response, session, tmpl_context as c
 from pylons.controllers.util import abort, redirect
 from pylons import url
 
+from floof.lib import helpers as h
 from floof.lib.base import BaseController, render
-from floof.lib.search import do_search
+from floof.lib.tags import parse
 
 log = logging.getLogger(__name__)
 
-from floof.model.art import Art, Tag, TagText
-from floof.model.search import SavedSearch, GalleryWidget
+from floof.model import Art, Tag, TagText
+from floof.model import SavedSearch, GalleryWidget
 import elixir
 
 class SearchController(BaseController):
@@ -20,7 +21,7 @@ class SearchController(BaseController):
             return self.save()
 
         c.query = request.params.get('query', '')
-        c.artwork = do_search(c.query)
+        c.artwork = parse(c.query).all()
         return render('/index.mako')
 
     # TODO: login required