Merge branch 'dev' of https://github.com/terminusdb/terminus-client into dev

Author: Cheukting

lib/woql.js

@@ -918,12 +918,15 @@ function TripleBuilder(type, cursor, s, query){
 	this.type = type;
 	this.cursor = cursor;
 	this.subject = query.cleanSubject(s);
-	this.graph = false;
+	this.g = false;
 	this.query = query;//the containing query
 }
 
 TripleBuilder.prototype.graph = function(g){
-	this.graph = g;
+	this.g = this.query.cleanGraph(g);
+	if(this.type == "triple") this.type = "quad";
+	if(this.type == "add_triple") this.type = "add_quad";
+	if(this.type == "delete_triple") this.type = "delete_quad";
 	return this;
 }
 
@@ -942,8 +945,8 @@ TripleBuilder.prototype.addPO = function(p, o, g){
 	else {
 		evstr += o;
 	}
-	if(ttype.substring(ttype.length-4) == "quad"){
-		var g = (g ? g : (this.graph ? this.graph : "db:schema"));
+	if(ttype.substring(ttype.length-4) == "quad" || this.g){
+		var g = (g ? g : (this.g ? this.g : "db:schema"));
 		evstr += ", '" + g + "'"; 
 	}
 	evstr += ")";
@@ -989,7 +992,6 @@ TripleBuilder.prototype.sub = function(s){
 	return this.addEntry(unit);
 }
 
-
 TripleBuilder.prototype.label = function(l, lang){
 	lang = (lang ? lang : "en");
 	var x = this.addPO('rdfs:label', {"@value": l, "@language": lang});
@@ -1001,6 +1003,11 @@ TripleBuilder.prototype.comment = function(c, lang){
 	return this.addPO('rdfs:comment', {"@value": c, "@language": lang});
 }
 
+TripleBuilder.prototype.property = function(p,val){
+	p = this.cleanPredicate(p);
+	return this.addPO(p, val);
+}
+
 TripleBuilder.prototype.parent = function(...p){
 	for(var i = 0 ; i<p.length; i++){
 		pn = this.query.cleanClass(p[i]);