fixed bug with woql pretty print

Author: kevinchekovfeeney

lib/woql.js

@@ -285,7 +285,7 @@ WOQLQuery.prototype.prettyPrint = function(indent, show_context, q, embed){
 					}
 					else {
 						if(typeof val[i] == "string"){
-							nvals.push('"' + self.unclean(val[i]) + '"');
+							nvals.push(self.unclean(val[i]));
 						}
 						else if(typeof val[i] == "object"){
 							nvals.push(JSON.stringify(val[i]));
@@ -297,8 +297,8 @@ WOQLQuery.prototype.prettyPrint = function(indent, show_context, q, embed){
 				}
 				if(nvals.length){
 					str += unclean(nvals);
-					if(key == "from") str += ")\n    .";
-					else str +=").";
+					if(key == "from") str += "\n    .";
+					else str +=".";
 				}
 				else {
 					str += "().";					

lib/woqlResult.js

@@ -2,7 +2,12 @@ const FrameHelper = require("./frameHelper");
 
 function WOQLResult(results, query, config){
 	this.bindings = results.bindings;
-	this.query = query;
+	if(query.constructor.name == "WOQLQuery"){
+		this.query = query;
+	}
+	else {
+		this.query = query.query;
+	}
 	this.cursor = 0;
 	if(!(config && config.no_compress)){
 		var context = (config && config.context ? config.context : false);