X-Git-Url: http://git.veekun.com/zzz-floof.git/blobdiff_plain/c50e600e708d2083290134440223ab65076376ee..6fb3ad2a578aa2e0eced735187a02a79a8907668:/floof/controllers/search.py?ds=sidebyside diff --git a/floof/controllers/search.py b/floof/controllers/search.py index 88dfbe3..3b6faef 100644 --- a/floof/controllers/search.py +++ b/floof/controllers/search.py @@ -1,6 +1,6 @@ import logging -from pylons import request, response, session, tmpl_context as c +from pylons import request, response, session, tmpl_context as c, h from pylons.controllers.util import abort, redirect_to from floof.lib.base import BaseController, render @@ -8,21 +8,48 @@ from floof.lib.base import BaseController, render log = logging.getLogger(__name__) from floof.model.art import Art, Tag, TagText +from floof.model.search import SavedSearch 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() + + c.query = request.params.get('query', '') + tags = c.query.split() + 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.id.in_(tagtext_ids)) \ + .filter(Tag.tagtext_id.in_(tagtext_ids)) \ .all() 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_to(action="list") + # 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) + # TODO: create a gallery widget + + redirect_to(controller="users", action="view", name=c.user.name) + + + \ No newline at end of file