Typos in list conversion

Author: GavinMendelGleason

lib/query/woqlCore.js

@@ -190,13 +190,12 @@ WOQLQuery.prototype.arop = function(arg) {
  * takes input that can be either a string (variable name)
  * or an array - each element of the array is a member of the list
  */
-WOQLQuery.prototype.wlist = function(wvar, string_only) {
+WOQLQuery.prototype.dataList = function(wvar, string_only) {
     if (typeof wvar == 'string') return this.expandDataVariable(wvar, true)
     if (Array.isArray(wvar)) {
         let ret = []
         for (var i = 0; i < wvar.length; i++) {
             let co = this.cleanDataValue(wvar[i])
-            if (typeof co == 'string') co = {node: co}
             ret.push(co)
         }
         return ret

lib/query/woqlQuery.js

@@ -141,7 +141,7 @@ WOQLQuery.prototype.from = function(graph_filter, query) {
             'The first parameter to from must be a Graph Filter Expression (string)',
         )
     }
-    this.cursor['graph_filter'] = this.jlt(graph_filter)
+    this.cursor['graph_filter'] = graph_filter
     return this.addSubQuery(query)
 }
 
@@ -185,7 +185,7 @@ WOQLQuery.prototype.removed_triple = function(a, b, c) {
     //if (a && a == 'args') 
     //return ['subject', 'predicate', 'object']
     if (this.cursor['@type']) this.wrapCursorWithAnd()
-    this.cursor['@type'] = 'RemovedTriple'
+    this.cursor['@type'] = 'DeletedTriple'
     this.cursor['subject'] = this.cleanSubject(a)
     this.cursor['predicate'] = this.cleanPredicate(b)
     this.cursor['object'] = this.cleanObject(c)
@@ -271,11 +271,11 @@ WOQLQuery.prototype.substr = function(String, Before, Length, After, SubString)
         )
     if (this.cursor['@type']) this.wrapCursorWithAnd()
     this.cursor['@type'] = 'Substring'
-    this.cursor['string'] = this.cleanObject(String)
-    this.cursor['before'] = this.cleanObject(Before, 'xsd:nonNegativeInteger')
-    this.cursor['length'] = this.cleanObject(Length, 'xsd:nonNegativeInteger')
-    this.cursor['after'] = this.cleanObject(After, 'xsd:nonNegativeInteger')
-    this.cursor['substring'] = this.cleanObject(SubString)
+    this.cursor['string'] = this.cleanDataValue(String, 'xsd:string')
+    this.cursor['before'] = this.cleanDataValue(Before, 'xsd:nonNegativeInteger')
+    this.cursor['length'] = this.cleanDataValue(Length, 'xsd:nonNegativeInteger')
+    this.cursor['after'] = this.cleanDataValue(After, 'xsd:nonNegativeInteger')
+    this.cursor['substring'] = this.cleanDataValue(SubString, 'xsd:string')
     return this
 }
 
@@ -714,7 +714,7 @@ WOQLQuery.prototype.split = function(input, glue, output) {
     this.cursor['@type'] = 'Split'
     this.cursor['string'] = this.cleanDataValue(input)
     this.cursor['pattern'] = this.cleanDataValue(glue)
-    this.cursor['list'] = this.wlist(output)
+    this.cursor['list'] = this.dataList(output)
     return this
 }
 
@@ -749,7 +749,7 @@ WOQLQuery.prototype.concat = function(list, v) {
     if (Array.isArray(list)) {
         if (this.cursor['@type']) this.wrapCursorWithAnd()
         this.cursor['@type'] = 'Concatenate'
-        this.cursor['list'] = this.wlist(list, true)
+        this.cursor['list'] = this.dataList(list, true)
         this.cursor['result'] = this.cleanDataValue(v)
     }
     return this
@@ -762,7 +762,7 @@ WOQLQuery.prototype.join = function(input, glue, output) {
     //return ['join_list', 'join_separator', 'join']
     if (this.cursor['@type']) this.wrapCursorWithAnd()
     this.cursor['@type'] = 'Join'
-    this.cursor['list'] = this.wlist(input)
+    this.cursor['list'] = this.dataList(input)
     this.cursor['separator'] = this.cleanDataValue(glue)
     this.cursor['result'] = this.cleanDataValue(output)
     return this
@@ -772,7 +772,7 @@ WOQLQuery.prototype.sum = function(input, output) {
     //if (input && input == 'args') return ['sum_list', 'sum']
     if (this.cursor['@type']) this.wrapCursorWithAnd()
     this.cursor['@type'] = 'Sum'
-    this.cursor['list'] = this.wlist(input)
+    this.cursor['list'] = this.dataList(input)
     this.cursor['result'] = this.cleanObject(output)
     return this
 }
@@ -800,7 +800,7 @@ WOQLQuery.prototype.re = function(p, s, m) {
     this.cursor['@type'] = 'Regexp'
     this.cursor['pattern'] = this.cleanDataValue(p)
     this.cursor['string'] = this.cleanDataValue(s)
-    this.cursor['result'] = this.wlist(m)
+    this.cursor['result'] = this.dataList(m)
     return this
 }
 
@@ -893,26 +893,17 @@ WOQLQuery.prototype.order_by = function(...orderedVarlist) {
             ? orderedVarlist.pop()
             : false
 
-    let vars = []
-
     for (var i = 0; i < orderedVarlist.length; i++) {
-        if (orderedVarlist[i] == 'asc') {
-            vars[vars.length - 1]['order'] = 'asc'
-        } else if (orderedVarlist[i] == 'desc') {
-            vars[vars.length - 1]['order'] = 'desc'
-        } else if (typeof orderedVarlist[i] == 'string') {
-            vars.push({varname: orderedVarlist[i], order: 'asc'})
-        } else {
-            vars.push(orderedVarlist[i])
-        }
-    }
-    for (var i = 0; i < vars.length; i++) {
-        let obj = {
-            '@type': 'OrderTemplate',
-            'variable': this.rawVar(vars[i].varname),
-            'order': vars[i].order
+        if (typeof orderedVarlist[i] == 'string'){
+            let obj = {
+                '@type': 'OrderTemplate',
+                'variable': this.rawVar(orderedVarlist[i]),
+                'order': "asc"
+            }
+            this.cursor['ordering'].push(obj)
+        }else{
+            this.cursor['ordering'].push(orderedVarlist[i])
         }
-        this.cursor['ordering'].push(obj)
     }
     return this.addSubQuery(embedquery)
 }
@@ -926,11 +917,8 @@ WOQLQuery.prototype.group_by = function(gvarlist, groupedvar, output, groupquery
 
     if (typeof gvarlist == 'string') gvarlist = [gvarlist]
         this.cursor['group_by'] = this.rawVarList(gvarlist)
-    if (typeof groupedvar == 'string') {
-        this.cursor['template'] = this.varj(groupedvar)
-    } else {
+    if (typeof groupedvar == 'string') groupedvar = [groupedvar]
         this.cursor['template'] = this.rawVarList(groupedvar)
-    }
     this.cursor['grouped'] = this.varj(output)
     return this.addSubQuery(groupquery)
 }