updates to woql language

Author: kevinchekovfeeney

lib/woql.js

@@ -48,6 +48,9 @@ WOQL.lower = function(u, l){	return new WOQLQuery().lower(u, l); }
 WOQL.pad = function(input, pad, len, output){	return new WOQLQuery().pad(input, pad, len, output); }
 WOQL.join = function(...list){	return new WOQLQuery().join(...list); }
 WOQL.unique = function(prefix, vari, type){	return new WOQLQuery().unique(prefix, vari, type); }
+WOQL.idgen = function(prefix, vari, type, output){	return new WOQLQuery().idgen(prefix, vari, type, output); }
+WOQL.typecast = function(vara, type, varb){	return new WOQLQuery().typecast(vara, type, varb); }
+
 
 /* Mathematical Processing */
 WOQL.eval = function(arith, v){	return new WOQLQuery().eval(arith, v);}
@@ -147,6 +150,10 @@ WOQLQuery.prototype.buildAsClauses = function(vars, cols){
 	return clauses;
 }
 
+WOQLQuery.prototype.typecast = function(va, type, vb){
+	this.cursor['typecast'] = [va, type, vb];
+	return this;
+}
 
 
 WOQLQuery.prototype.remote = function(json){
@@ -189,6 +196,24 @@ WOQLQuery.prototype.group_by = function(gvarlist, groupedvar, groupquery, output
 	return this;
 }
 
+WOQLQuery.prototype.idgen = function(prefix, vari, type, mode){
+	this.cursor['idgen'] = [prefix];
+	if(vari.json){
+		this.cursor['idgen'].push(vari.json());
+	}
+	else if(vari.list){
+		this.cursor['idgen'].push(vari);
+	}
+	else {
+		this.cursor['idgen'].push({"list": vari})
+	}
+	if(mode){
+		this.cursor['idgen'].push(mode);
+	}
+	this.cursor['idgen'].push(type);
+	return this;
+}
+
 
 WOQLQuery.prototype.unique = function(prefix, vari, type){
 	this.cursor['unique'] = [prefix];
@@ -209,6 +234,13 @@ WOQLQuery.prototype.unique = function(prefix, vari, type){
 WOQLQuery.prototype.concat = function(list, v){
 	if(typeof list == "string"){
 		var nlist = list.split(/(v:[\w_]+)\b/);
+		var nxlist = [];
+		for(var i = 1; i<nlist.length; i++){
+			if(nlist[i-1].substring(nlist[i-1].length-1) == "v" && nlist[i].substring(0, 1) == ":"){
+				nlist[i-1] = nlist[i-1].substring(0, nlist[i-1].length-1);
+				nlist[i] = nlist[i].substring(1);
+			}
+		}
 	}
 	else if(list.list){
 		var nlist = list.list;