woql update to group_by

Author: kevinchekovfeeney

lib/woql.js

@@ -185,10 +185,20 @@ WOQLQuery.prototype.group_by = function(gvarlist, groupedvar, groupquery, output
 	else {
 		args.push({'list': gvarlist});
 	}
-	if(groupedvar.substring(0, 2) != "v:") groupedvar = "v:" + groupedvar;
+	if(typeof groupedvar == "object" && groupedvar.length){
+		ng = [];
+		for(var i = 0; i<groupedvar.length; i++){
+			ng.push(groupedvar[i].substring(0, 2) != "v:" ? "v:" + groupedvar[i] : groupedvar);			
+		}
+		groupedvar = ng;
+	}
+	else if(typeof groupedvar == "string"){
+		if(groupedvar.substring(0, 2) != "v:") groupedvar = "v:" + groupedvar;
+	}
 	args.push(groupedvar);
 	if(output){
-		args.push(groupquery.json());
+		groupquery = groupquery.json ? groupquery.json() : groupquery; 
+		args.push(groupquery);
 	}
 	else {
 		output = groupquery;