X-Git-Url: http://git.veekun.com/zzz-floof.git/blobdiff_plain/7222589e3a941faf670445af1f93a930f5a6fde0..aef2b7601e02859595ce272a730e13e074d1e713:/floof/controllers/search.py diff --git a/floof/controllers/search.py b/floof/controllers/search.py index 75bbba8..4e92a6d 100644 --- a/floof/controllers/search.py +++ b/floof/controllers/search.py @@ -1,34 +1,47 @@ 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.search import do_search 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): - # Return a rendered template - #return render('/search.mako') - # or, return a response - return 'Hello World' + if request.params.get('button') == 'Save': + return self.save() - def results(self): - """ Search, implemented the stupid way! """ - query = request.params.get('query','') - tags = query.split() + c.query = request.params.get('query', '') + c.artwork = do_search(c.query) + return render('/index.mako') - tagtexts = TagText.query.filter(TagText.text.in_(tags)) - tagtext_ids = [_.id for _ in tagtexts] + # 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)) - # Fetch art that has all the tags - c.artwork = Art.query.join(Tag) \ - .filter(Tag.id.in_(tagtext_ids)) \ - .all() - return render('/index.mako')