@@ -22,9 +22,9 @@ import wsgiref.handlers from google.appengine.ext import webapp from yos.crawl.rest import download -from yos.util import console +from yos.util import text, console from yos.boss import ysearch -from yos.yql import db +from yos.yql import udfs, db from django.utils import simplejson @@ -46,13 +46,25 @@ class NewsSearchHandler(webapp.RequestHandler): serialized = simplejson.dumps(images.rows) self.response.out.write(serialized) + +def overlap_predicate(r1,r2): + return text.overlap(r1['title'],r2['title']) > 1 + class WebSearchHandler(webapp.RequestHandler): + + def get(self): query = console.strfix(self.request.get("query")) offset = int(console.strfix(self.request.get("offset"))) - data = ysearch.search(query,count=20,start=offset); - images = db.create(data=data) - serialized = simplejson.dumps(images.rows) + includeDelicious = console.strfix(self.request.get("includeDelicious")) + + search_results = ysearch.search(query,count=20,start=offset); + web = db.create(data=search_results) + if len(includeDelicious) == 4: + dl = db.select(udfs.unnest_value, name="dl", url=u"http://feeds.delicious.com/rss/popular/%s" % query) + web = db.join(overlap_predicate,[web,dl]) + + serialized = simplejson.dumps(web.rows) self.response.out.write(serialized) class RootHandler(webapp.RequestHandler): main.py @@ -6,7 +6,7 @@ __author__ = "Vik Singh (viksi@yahoo-inc.com)" -from util.typechecks import is_dict +from yos.util.typechecks import is_dict def unnest_value(row): """ yos/yql/udfs.py 5798331d8ad9e3917610ca5675e7ca13bff14d30 Will Larson lethain@gmail.com http://github.com/lethain/mahou/commit/bf927144a468e3b2ced44d6f3df4a52466512a96 bf927144a468e3b2ced44d6f3df4a52466512a96 2008-09-12T05:21:31-07:00 2008-09-12T05:21:31-07:00 Can now restrict queries by Delicious popular feed. 9b7f2f764b4b7118d401f336d9055d48b650efe3 Will Larson lethain@gmail.com