@@ -65,6 +65,7 @@ Here's plotting stuff.<br \>
</table>
</form>
+<div id="errormsg"></div>
<div id="graph"></div>
<div id="undergraph"></div>
graph/index.html
@@ -96,14 +96,24 @@ function loadFilters() {
// callback for the json data.
function jsonCallback(data) {
- // TODO: check http status, act thereafter.
-
// TODO: hide spinner.
-
- graph = pivot(data);
- var imgUrl = chartImgUrl(graph);
- $('#graph').html('<img src="' + imgUrl + '" />');
- $('#undergraph').append(' and <a href="' +imgUrl +'">chart</a>.');
+
+ // check length of data.
+ if (data.length == 0) {
+ $('#errormsg').html('empty dataset.');
+ } else {
+ $('#errormsg').html('' + data.length + ' days of data.');
+ graph = pivot(data);
+ var imgUrl = chartImgUrl(graph);
+ $('#graph').html('<img src="' + imgUrl + '" />');
+ $('#undergraph').append(' and <a href="' +imgUrl +'">chart</a>.');
+ }
+}
+
+function jsonErrorCallback(error) {
+ // TODO: hide spinner.
+ $('#errormsg').append('ERROR: ');
+ $('#errormsg').append(error['error_msg']);
}
function loadData(t0, t1, unit, d0, d0v, filters) {
@@ -115,9 +125,11 @@ function loadData(t0, t1, unit, d0, d0v, filters) {
'&d0v=' + encodeURIComponent(d0v) +
'&' + filters +
'&jsoncallback=?' +
- '&jsonp=jsonCallback'
+ '&jsonp=jsonCallback' +
+ '&jsonperror=jsonErrorCallback'
$('#undergraph').html('<a href="' +dataUrl +'">raw data</a>');
+ $('#errormsg').html('');
// TODO: show spinner.
// TODO: set timeout thread.
graph/js/zohmg.js
@@ -112,7 +112,7 @@ def dump_jsonp(data, jsonp_method=None):
if jsonp_method:
# client requested data to be wrapped in a function call.
- return jsonp_method + "(" + jsondata + ")"
+ return jsonp_method+"("+jsondata+")"
else:
return jsondata
src/zohmg/data.py
@@ -25,9 +25,13 @@ from paste.request import parse_formvars
import zohmg.data
from zohmg.config import Config
-def json_of(error_msg='wha?', status_code=400):
+def json_of(error_msg='wha?', status_code=400, callback=None):
structure = {'error_msg': error_msg, 'status_code': status_code}
- return json.dumps(structure)
+ jsondata = json.dumps(structure)
+ if callback:
+ return callback+"("+jsondata+")"
+ else:
+ return jsondata
# data application serving at /data.
class data(object):
@@ -55,6 +59,11 @@ class data(object):
# interpret the environment.
params = parse_formvars(environ)
+ # error callback?
+ # (hm! can not do json error callbacks on error codes other than 200.)
+ try: errorcallback = params['jsonperror']
+ except: errorcallback = None
+
try:
# hbase query.
start = time.time()
@@ -63,23 +72,26 @@ class data(object):
except zohmg.data.DataNotFound, (instance):
print >>sys.stderr, "Data not found: ", instance.error
start_response('200 OK', content_type)
- return json_of("data not found: " + instance.error, 200)
+ return json_of("data not found: " + instance.error, 200, errorcallback)
except zohmg.data.MissingArguments, (instance):
print >>sys.stderr, "400 Bad Request: missing arguments."
- start_response('400 Bad Request', content_type)
- return json_of("Query is missing arguments: " + instance.error)
+ #start_response('400 Bad Request', content_type)
+ start_response('200 OK', content_type)
+ return json_of("Query is missing arguments: " + instance.error, 400, errorcallback)
# TODO: print list of required arguments.
except zohmg.data.NoSuitableProjection, (instance):
print >>sys.stderr, "400 Bad Request: No suitable projection. ", instance.error
- start_response('400 Bad Request', content_type)
- return json_of(" " + instance.error)
+ #start_response('400 Bad Request', content_type)
+ start_response('200 OK', content_type)
+ return json_of(" " + instance.error, 400, errorcallback)
except Exception, e:
print >>sys.stderr, "Error: ", e
- start_response('500 Internal Server Error', content_type)
- return json_of("egads!, I failed in serving you: " + str(e), 500)
+ #start_response('500 Internal Server Error', content_type)
+ start_response('200 OK', content_type)
+ return json_of("egads!, I failed in serving you: " + str(e), 500, errorcallback)
elapsed = (time.time() - start)
sys.stderr.write("hbase query+prep: %s\n\n" % elapsed)
src/zohmg/middleware/data.py
0e7dd565640375295f92798f64f231956ac0d6e5
Fredrik Mollerstrand
fredrik@last.fm
http://github.com/zohmg/zohmg/commit/600a20b88e48c9ea0a418b41b936e48e1e5095be
600a20b88e48c9ea0a418b41b936e48e1e5095be
2009-06-24T06:41:38-07:00
2009-06-24T06:41:38-07:00
graph: prints error if callback set, or size of data set returned.
src/zohmg/middleware/data.py: all status codes are 200 :|
zohmg.js: added error callback.
index.html: added error div.
5294ac233a10b9413f629dea165aafd5b73a0876
Fredrik Mollerstrand
fredrik@last.fm