Simplify object cleaning

Author: GavinMendelGleason

lib/query/woqlCore.js

@@ -155,19 +155,6 @@ WOQLQuery.prototype.asv = function(colname_or_index, vname, type) {
     return asvar
 }
 
-/**
- * Adds a variable to a json-ld as variable list
- */
-WOQLQuery.prototype.addASV = function(cursor, asv) {
-    if (asv['@type'] == 'IndexedAsVar') {
-        if (!cursor['indexed_as_var']) cursor['indexed_as_var'] = []
-        cursor['indexed_as_var'].push(asv)
-    } else {
-        if (!cursor['named_as_var']) cursor['named_as_var'] = []
-        cursor['named_as_var'].push(asv)
-    }
-}
-
 /**
  * JSON LD Format Descriptor
  * @param {object} opts
@@ -320,18 +307,17 @@ WOQLQuery.prototype.cleanPathPredicate = function(p) {
 WOQLQuery.prototype.cleanObject = function(o, t) {
     let obj = {'@type': 'Value'}
     if (typeof o === 'string') {
-        if (this.looksLikeClass(o)) {
-            return this.cleanClass(o)
-        } else if (this.vocab && this.vocab[o]) {
-            return this.cleanClass(this.vocab[o])
-        } else if (s.indexOf('v:') !== -1) {
+        if (o.indexOf('v:') !== -1) {
             return this.expandValueVariable(o)
         } else {
-            obj['data'] = this.jlt(o, t)
+            obj['node'] = o
         }
     } else if (typeof o == 'number') {
         t = t || 'xsd:decimal'
         obj['data'] = this.jlt(o, t)
+    } else if (typeof o == 'boolean') {
+        t = t || 'xsd:boolean'
+        obj['data'] = this.jlt(o, t)
     } else if (typeof o == 'object' && o) {
         if (o['@value']) obj['data'] = o
         else return o