From 299cca54cf3bedeae23b842bbf875f3a64b57368 Mon Sep 17 00:00:00 2001 From: panamafrancis Date: Sat, 20 Dec 2014 12:45:34 +0000 Subject: [PATCH] Query api requests now have the special handling for appengine, can't test properly owing to instability of appengine SDK --- http/query.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/http/query.go b/http/query.go index 8944276..44d5fb4 100644 --- a/http/query.go +++ b/http/query.go @@ -66,12 +66,13 @@ func GetQueryShape(q string, ses query.HTTP) ([]byte, error) { // TODO(barakmich): Turn this into proper middleware. func (api *API) ServeV1Query(w http.ResponseWriter, r *http.Request, params httprouter.Params) int { + h, err := api.GetHandleForRequest(r) var ses query.HTTP switch params.ByName("query_lang") { case "gremlin": - ses = gremlin.NewSession(api.handle.QuadStore, api.config.Timeout, false) + ses = gremlin.NewSession(h.QuadStore, api.config.Timeout, false) case "mql": - ses = mql.NewSession(api.handle.QuadStore) + ses = mql.NewSession(h.QuadStore) default: return jsonResponse(w, 400, "Need a query language.") } @@ -111,12 +112,13 @@ func (api *API) ServeV1Query(w http.ResponseWriter, r *http.Request, params http } func (api *API) ServeV1Shape(w http.ResponseWriter, r *http.Request, params httprouter.Params) int { + h, err := api.GetHandleForRequest(r) var ses query.HTTP switch params.ByName("query_lang") { case "gremlin": - ses = gremlin.NewSession(api.handle.QuadStore, api.config.Timeout, false) + ses = gremlin.NewSession(h.QuadStore, api.config.Timeout, false) case "mql": - ses = mql.NewSession(api.handle.QuadStore) + ses = mql.NewSession(h.QuadStore) default: return jsonResponse(w, 400, "Need a query language.") }