Adding Marshalling lists correctly.

Author: GavinMendelGleason

lib/query/woqlCore.js

@@ -338,6 +338,12 @@ WOQLQuery.prototype.cleanDataValue = function(o, t) {
     } else if (typeof o == 'boolean') {
         t = t || 'xsd:boolean'
         obj['data'] = this.jlt(o, t)
+    } else if (Array.isArray(o)) {
+        let res = []
+        for( var i = 0; i < o.length; i++ ){
+            res.push(this.cleanDataValue(o[i]))
+        }
+        obj['list'] = res
     } else if (typeof o == 'object' && o) {
         if (o['@value']) obj['data'] = o
         else return o

lib/query/woqlQuery.js

@@ -647,7 +647,7 @@ WOQLQuery.prototype.unique = function(prefix, vari, type) {
     if (this.cursor['@type']) this.wrapCursorWithAnd()
     this.cursor['@type'] = 'HashKey'
     this.cursor['base'] = this.cleanDataValue(prefix,'xsd:string')
-    this.cursor['key_list'] = this.dataList(vari)
+    this.cursor['key_list'] = this.cleanDataValue(vari)
     this.cursor['uri'] = this.cleanNodeValue(type)
     return this
 }
@@ -713,7 +713,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.dataList(output)
+    this.cursor['list'] = this.cleanDataValue(output)
     return this
 }
 
@@ -748,7 +748,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.dataList(list, true)
+        this.cursor['list'] = this.cleanDataValue(list, true)
         this.cursor['result'] = this.cleanDataValue(v)
     }
     return this
@@ -761,7 +761,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.dataList(input)
+    this.cursor['list'] = this.cleanDataValue(input)
     this.cursor['separator'] = this.cleanDataValue(glue)
     this.cursor['result'] = this.cleanDataValue(output)
     return this
@@ -771,7 +771,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.dataList(input)
+    this.cursor['list'] = this.cleanDataValue(input)
     this.cursor['result'] = this.cleanObject(output)
     return this
 }
@@ -799,7 +799,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.dataList(m)
+    this.cursor['result'] = this.cleanDataValue(m)
     return this
 }
 
@@ -810,7 +810,7 @@ WOQLQuery.prototype.length = function(va, vb) {
     //return ['length_list', 'length']
     if (this.cursor['@type']) this.wrapCursorWithAnd()
     this.cursor['@type'] = 'Length'
-    this.cursor['list'] = this.cleanObject(va)
+    this.cursor['list'] = this.cleanDataValue(va)
     if (typeof vb == 'number') {
         this.cursor['length'] = this.cleanObject(vb, 'xsd:nonNegativeInteger')
     } else if (typeof vb == 'string') {

test/woqlJson/woqlConcatJson.js

@@ -1,22 +1,23 @@
 module.exports={
     "@type": "Concatenate",
-    "list": [
-            {
-                "@type": "DataValue",
-                "variable": "Duration"
-            },
-            {
-                "@type": "DataValue",
-                "data": {
-                    "@type": "xsd:string",
-                    "@value": " yo "
-                }
-            },
-            {
-                "@type": "DataValue",
-                "variable": "Duration_Cast"
-            }
-    ],
+    "list": { "@type" : "DataValue",
+              "list" : [
+                  {
+                      "@type": "DataValue",
+                      "variable": "Duration"
+                  },
+                  {
+                      "@type": "DataValue",
+                      "data": {
+                          "@type": "xsd:string",
+                          "@value": " yo "
+                      }
+                  },
+                  {
+                      "@type": "DataValue",
+                      "variable": "Duration_Cast"
+                  }
+              ]},
     "result": {
         "@type": "DataValue",
         "data": {

test/woqlJson/woqlJoinSplitJson.js

@@ -1,15 +1,16 @@
 module.exports={joinJson:{
             "@type": "Join",
-            "list": [
-                      {
-                          "@type": "DataValue",
-                          "variable": "A_obj"
-                      },
-                      {
-                          "@type": "DataValue",
-                          "variable": "B_obj"
-                      }
-            ],
+            "list": { "@type" : "DataValue",
+                      "list" : [
+                          {
+                              "@type": "DataValue",
+                              "variable": "A_obj"
+                          },
+                          {
+                              "@type": "DataValue",
+                              "variable": "B_obj"
+                          }
+                      ]},
             "separator": {
                 "@type": "DataValue",
                 "data": {