summaryrefslogtreecommitdiff
path: root/ebus
diff options
context:
space:
mode:
authoryvesf <yvesf@d0e8fea9-7529-0410-93fb-d39fd5b9c1dd>2010-06-09 19:41:46 +0000
committeryvesf <yvesf@d0e8fea9-7529-0410-93fb-d39fd5b9c1dd>2010-06-09 19:41:46 +0000
commit6c580608f942d2f4b931faa6fe81171fd9e8a878 (patch)
tree4176230fe3b61f61bbe2aca8ce4068fda8810dd4 /ebus
parent3fc788b05bba8813b5b5b274ac1676050104d2f0 (diff)
downloadebus-alt-6c580608f942d2f4b931faa6fe81171fd9e8a878.tar.gz
ebus-alt-6c580608f942d2f4b931faa6fe81171fd9e8a878.zip
bla
git-svn-id: http://10.2.2.13/svn/common/ebus@1679 d0e8fea9-7529-0410-93fb-d39fd5b9c1dd
Diffstat (limited to 'ebus')
-rw-r--r--ebus/web/controller.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/ebus/web/controller.py b/ebus/web/controller.py
index 406db01..f581e13 100644
--- a/ebus/web/controller.py
+++ b/ebus/web/controller.py
@@ -48,11 +48,10 @@ def index(req):
@CacheDecorator(key=lambda args,kwargs: tuple(kwargs.keys()) + tuple(kwargs.values()),
timeout=20)
def json(req,sensor=None,from_date=None,till_date=None):
- print "name=%s from_date=%s" % (name,from_date)
+ print "sensor=%s from_date=%s till_date=%s" % (sensor,from_date,till_date)
return itty.Response(dump_json(data(sensor)),
content_type="application/json")
-
@itty.get("/static/(?P<filename>.+)")
def static(request,filename):
file = itty.static_file(filename, root=os.path.join(os.path.dirname(__file__), 'static'))