From b97e6782ff75c0cd3fbcd8625adedb03cc3886c1 Mon Sep 17 00:00:00 2001 From: Matei Chiperi Date: Thu, 28 Aug 2014 17:52:58 -0700 Subject: [PATCH] Changed identifier "not" to "except" for iterator builder. --- query/gremlin/build_iterator.go | 2 +- query/gremlin/traversals.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/query/gremlin/build_iterator.go b/query/gremlin/build_iterator.go index a855637..8f718c6 100644 --- a/query/gremlin/build_iterator.go +++ b/query/gremlin/build_iterator.go @@ -298,7 +298,7 @@ func buildIteratorTreeHelper(obj *otto.Object, ts graph.TripleStore, base graph. it = buildIteratorTreeHelper(arg.Object(), ts, subIt) case "in": it = buildInOutIterator(obj, ts, subIt, true) - case "not": + case "except": arg, _ := obj.Get("_gremlin_values") firstArg, _ := arg.Object().Get("0") if !isVertexChain(firstArg.Object()) { diff --git a/query/gremlin/traversals.go b/query/gremlin/traversals.go index e22a5c6..8177d80 100644 --- a/query/gremlin/traversals.go +++ b/query/gremlin/traversals.go @@ -39,8 +39,8 @@ func (wk *worker) embedTraversals(env *otto.Otto, obj *otto.Object) { obj.Set("Save", wk.gremlinFunc("save", obj, env)) obj.Set("SaveR", wk.gremlinFunc("saver", obj, env)) obj.Set("Loop", wk.gremlinFunc("loop", obj, env)) - obj.Set("Except", wk.gremlinFunc("not", obj, env)) - obj.Set("Difference", wk.gremlinFunc("not", obj, env)) + obj.Set("Except", wk.gremlinFunc("except", obj, env)) + obj.Set("Difference", wk.gremlinFunc("except", obj, env)) } func (wk *worker) gremlinFunc(kind string, prev *otto.Object, env *otto.Otto) func(otto.FunctionCall) otto.Value {