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 f87ddae..8617966 100644 (file)
--- a/floof/controllers/search.py
+++ b/floof/controllers/search.py
@@ -1,11 +1,12 @@
 import logging
 
 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 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.base import BaseController, render

-from floof.lib.search import do_search
+from floof.lib.tags import parse

 
 log = logging.getLogger(__name__)
 
 
 log = logging.getLogger(__name__)
 


@@ -20,7 +21,7 @@ class SearchController(BaseController):
             return self.save()
 
         c.query = request.params.get('query', '')
             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
         return render('/index.mako')
 
     # TODO: login required