optimised queries in woql for connections

Author: kevinchekovfeeney

lib/viewer/woqlChooser.js

@@ -37,7 +37,6 @@ WOQLChooser.prototype.setResult = function(result){
 	const variables = result.getVariableList();
 	if(!this.config.values() && variables.length){
 		this.config.values(variables[0]);
-		alert(variables[0]);
 	}
 	//sort it 
 	if(this.config.sort()){

lib/woql.js

@@ -930,28 +930,28 @@ WOQLQuery.prototype.documentProperties = function(id){
 
 WOQLQuery.prototype.getDocumentConnections = function(id){
 	return this.and(
+		WOQL.eq("v:Docid", id),
+		WOQL.triple("v:Entid", "type", "v:Enttype"),
+		WOQL.sub("v:Enttype", "tcs:Document"),
 		WOQL.or(
 			WOQL.triple("v:Docid", "v:Outgoing", "v:Entid"),
 			WOQL.triple("v:Entid", "v:Incoming", "v:Docid")
 		),
-		WOQL.eq("v:Docid", id),
-		WOQL.triple("v:Entid", "type", "v:Enttype"),
-		WOQL.sub("v:Enttype", "tcs:Document"),
 		WOQL.opt().triple("v:Entid", "rdfs:label", "v:Label"),
 		WOQL.opt().quad("v:Enttype", "rdfs:label", "v:Class_Label", "db:schema")
 	);
 }
 
 WOQLQuery.prototype.getAllDocumentConnections = function(){
 	return this.and(
+		WOQL.sub("v:Enttype", "tcs:Document"),
 		WOQL.triple("v:doc1", "type", "v:Enttype"),
+		WOQL.triple("v:doc1", "v:Predicate", "v:doc2"),
 		WOQL.triple("v:doc2", "type", "v:Enttype2"),
-		WOQL.not().eq("v:doc1", "v:doc2"),
-		WOQL.sub("v:Enttype", "tcs:Document"),
 		WOQL.sub("v:Enttype2", "tcs:Document"),
-		WOQL.triple("v:doc1", "v:Predicate", "v:doc2"),
 		WOQL.opt().triple("v:doc1", "rdfs:label", "v:Label1"),
-		WOQL.opt().triple("v:doc2", "rdfs:label", "v:Label2")
+		WOQL.opt().triple("v:doc2", "rdfs:label", "v:Label2"),
+		WOQL.not().eq("v:doc1", "v:doc2")
 	);
 }