adding fix for .when()

Author: kevinchekovfeeney

lib/woql.js

@@ -44,6 +44,9 @@ WOQL.as = function(map, vari){	return new WOQLQuery().as(map, vari); }
 WOQL.remote = function(url){	return new WOQLQuery().remote(url); }
 WOQL.unique = function(prefix, vari){	return new WOQLQuery().unique(prefix, vari); }
 WOQL.list = function(...vars){	return new WOQLQuery().list(...vars); }
+WOQL.group_by = function(...vars){	return new WOQLQuery().group_by(...vars); }
+WOQL.update = function(Q){	return new WOQLQuery().update(Q); }
+
 
 //language extensions that can be chained after 'grounded' stuff (clauses with a specific subject) sub, isa, delete_triple, add_triple, delete_quad, add_quad, node
 //WOQL.value = function(vars){	return new WOQLQuery().list(vars); }
@@ -92,15 +95,83 @@ function WOQLQuery(query){
 }
 
 WOQLQuery.prototype.get = function(map, target){
-	this.cursor['get'] = [map, target];
+	if(target){
+		this.cursor['get'] = [map, target];
+	}
+	else {
+		this.cursor['get'] = [map];
+		this.cursor = this.cursor["get"][1];	
+	}
 	return this;
 }
 
+WOQLQuery.prototype.concat = function(list, v){
+	this.cursor['concat'] = [list, v];
+	return this;
+}
+
+WOQLQuery.prototype.lower = function(u, l){
+	this.cursor['lower'] = [u, l];
+	return this;
+}
+
+WOQLQuery.prototype.pad = function(input, pad, len, output){
+	this.cursor['pad'] = [input, pad, len, output];
+	return this;
+}
+
+WOQLQuery.prototype.join = function(...list){
+	this.cursor['join'] = list;
+	return this;
+}
+
+
+//concat() //"concat" : [{"list" : ["doc:", "v:Polity_Lower"]}, "v:Polity_ID"]},
+/**
+ * [{"list" : [{"@value" : "[", "@type" : "xsd:string"},
+                                      "v:GYear",
+                                      {"@value" : ",","@type" : "xsd:string"},
+                                      "v:GYear",
+                                      {"@value" : "]","@type" : "xsd:string"}]
+ */
+//lower(v1, v2) ["v:Polity", "v:Polity_Lower"]
+//pad(var,pad,len,nvar]) ["v:Year",0,4,"v:GYear"]
+//unique(prefix, vars, type)
+//group_by
+//file
+//join(...x)
+//{"join" : ["v:Records",
+//{"@value" : ",", "@type" : "xsd:string"},
+//"v:Coord_String"
+//]},
+
 WOQLQuery.prototype.remote = function(json){
 	this.cursor['remote'] = [json];
 	return this;
 }
 
+WOQLQuery.prototype.group_by = function(...grouped){
+	var ngs = [];
+	for(var i = 0; i<grouped.length; i++){
+		ngs.push(grouped[i].json());
+	}
+	this.cursor['group_by'] = ngs;
+	this.cursor = this.cursor["group_by"][ngs.length];	
+	return this;
+}
+
+
+WOQLQuery.prototype.unique = function(prefix, vari, type){	
+	this.cursor['unique'] = [prefix, vari, type]; 
+	return this;
+}
+
+WOQLQuery.prototype.list  = function(...vars){	
+	this.cursor['list'] = vars;
+	return this;
+}
+
+
 /*
  * json version of query for passing to api
  */
@@ -117,9 +188,14 @@ WOQLQuery.prototype.json = function(json){
  * into the corrent place in the encompassing json 
  */
 WOQLQuery.prototype.when = function(Query, Update){
+	if(typeof Query == "boolean") {
+		var jq = {};
+		jq[Query] = [];
+		Query = jq;
+	}
 	this.advanceCursor("when", Query);	
 	if(Update){
-		this.cursor = Update.json();
+		this.cursor = (Update.json ? Update.json() : Update);
 	}
 	return this;
 }
@@ -381,7 +457,6 @@ WOQLQuery.prototype.as = function(a, b){
 	return this.lastUpdate();		
 }
 
-
 /**
  * WOQL API
  */