@@ -2,3 +2,4 @@ app.yaml index.yaml settings.py +django .gitignore @@ -584,10 +584,16 @@ def search(request): start = max(int(request.GET.get('start', 0)), 0) except: start = 0 - service = request.GET.get('service', None) num = int(request.session.get('num', NUM)) + kwargs = { + "start": start, + "num": num, + } + service = request.GET.get('service', None) + if service: + kwargs["service"] = service search = form.data['search'] - data = f.search(search, num=num, start=start, service=service) + data = f.search(search, **kwargs) if 'errorCode' in data: return error(request, data) entries = [entry for entry in data['entries'] if not entry['hidden']] fftogo/views.py @@ -1,3 +1,4 @@ +import logging import os import sys @@ -5,13 +6,13 @@ import sys for k in [k for k in sys.modules if k.startswith('django')]: del sys.modules[k] +# Import Django from a zipfile. +sys.path.insert(0, os.path.abspath('django.zip')) + # Force sys.path to have our own directory first, in case we want to import # from it. sys.path.insert(0, os.path.abspath(os.path.dirname(__file__))) -# Import Django from a zipfile. -sys.path.insert(0, os.path.abspath('django.zip')) - # Google App Engine imports. from google.appengine.ext.webapp import util @@ -24,6 +25,7 @@ os.environ['DJANGO_SETTINGS_MODULE'] = 'settings' import django.core.handlers.wsgi def main(): + logging.getLogger().setLevel(logging.DEBUG) # Create a Django application for WSGI. application = django.core.handlers.wsgi.WSGIHandler() # Run the WSGI CGI handler with that application. main.py bba1cc73f6eb8674ac989b857f9e5a09c4384526 Benjamin Golub bgolub@benjamingolub.com http://github.com/bgolub/fftogo/commit/a8bfe5da8537f1a80b3860fa73ec44cad18092aa a8bfe5da8537f1a80b3860fa73ec44cad18092aa 2009-02-16T08:56:44-08:00 2009-02-16T08:56:44-08:00 don't urlencode service:None c64dd5bfcdcf60f0dab255272ebe53f7b6c30e61 Benjamin Golub bgolub@benjamingolub.com