X-Git-Url: http://git.veekun.com/zzz-floof.git/blobdiff_plain/74a67e786406779761820b27159df5dd27787c4a..d2cfab09f98980d5c1d433a9e75eb65e0b13b0aa:/floof/controllers/search.py diff --git a/floof/controllers/search.py b/floof/controllers/search.py index 75926e7..63e20ec 100644 --- a/floof/controllers/search.py +++ b/floof/controllers/search.py @@ -1,35 +1,48 @@ import logging from pylons import request, response, session, tmpl_context as c -from pylons.controllers.util import abort, redirect_to +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.tags import parse log = logging.getLogger(__name__) -from floof.model.art import Art, Tag, TagText +from floof.model import Art, Tag, TagText +from floof.model import SavedSearch, GalleryWidget import elixir class SearchController(BaseController): def index(self): - # Return a rendered template - #return render('/search.mako') - # or, return a response - return 'Hello World' - - def results(self): - """ Search, implemented the stupid way! """ - query = request.params.get('query','') - tags = query.split() - - tagtexts = TagText.query.filter(TagText.text.in_(tags)) - tagtext_ids = map(lambda x:x.id, tagtexts) - - # TODO: this is wrong. Please fix it so it returns art that has all the tags. - art_tag_pairs = elixir.session.query(Art,Tag).filter(Art.id == Tag.art_id).\ - filter(Tag.tagtext_id.in_(tagtext_ids)).all() - - # just the art please. - c.artwork = map(lambda x: x[0], art_tag_pairs) - return render('/index.mako') \ No newline at end of file + if request.params.get('button') == 'Save': + return self.save() + + c.query = request.params.get('query', '') + c.artwork = parse(c.query, me=c.user).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(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)) + +