barak/cayley
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Query api requests now have the special handling for appengine, can't test properly owing to instability of appengine SDK

Browse source
This commit is contained in:
panamafrancis 2014-12-20 12:45:34 +00:00
parent 1ddc94c2e5
commit 299cca54cf
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
http/query.go
View file

@ -66,12 +66,13 @@ func GetQueryShape(q string, ses query.HTTP) ([]byte, error) {
// TODO(barakmich): Turn this into proper middleware. // TODO(barakmich): Turn this into proper middleware.
func (api *API) ServeV1Query(w http.ResponseWriter, r *http.Request, params httprouter.Params) int { func (api *API) ServeV1Query(w http.ResponseWriter, r *http.Request, params httprouter.Params) int {
h, err := api.GetHandleForRequest(r)
var ses query.HTTP var ses query.HTTP
switch params.ByName("query_lang") { switch params.ByName("query_lang") {
case "gremlin": case "gremlin":
ses = gremlin.NewSession(api.handle.QuadStore, api.config.Timeout, false) ses = gremlin.NewSession(h.QuadStore, api.config.Timeout, false)
case "mql": case "mql":
ses = mql.NewSession(api.handle.QuadStore) ses = mql.NewSession(h.QuadStore)
default: default:
return jsonResponse(w, 400, "Need a query language.") 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 { func (api *API) ServeV1Shape(w http.ResponseWriter, r *http.Request, params httprouter.Params) int {
h, err := api.GetHandleForRequest(r)
var ses query.HTTP var ses query.HTTP
switch params.ByName("query_lang") { switch params.ByName("query_lang") {
case "gremlin": case "gremlin":
ses = gremlin.NewSession(api.handle.QuadStore, api.config.Timeout, false) ses = gremlin.NewSession(h.QuadStore, api.config.Timeout, false)
case "mql": case "mql":
ses = mql.NewSession(api.handle.QuadStore) ses = mql.NewSession(h.QuadStore)
default: default:
return jsonResponse(w, 400, "Need a query language.") return jsonResponse(w, 400, "Need a query language.")
} }