fixed vocab, paged and getDocumentConnections

kevinchekovfeeney · kevinchekovfeeney · commit cfc9ae46f47b · 2019-12-06T14:38:55.000Z
diff --git a/lib/woql.js b/lib/woql.js
@@ -633,7 +633,7 @@ WOQLQuery.prototype.documentProperties = function(id){
 
 WOQLQuery.prototype.getDocumentConnections = function(id){
 	return this.and(
-		this.or(
+		WOQL.or(
 			WOQL.triple(id, "v:Outgoing", "v:Entid"),
 			WOQL.triple("v:Entid", "v:Incoming", id)
 		), 
@@ -718,9 +718,10 @@ WOQLQuery.prototype.isPaged = function(q){
 	for (const prop of Object.keys(q)) {
 		if(prop == "limit") return true;
 		else if(this.paging_transitive_properties.indexOf(prop) !== -1){
-			return this.isPaged(q[prop][q[prop].length-1])
+			return this.isPaged(q[prop][q[prop].length-1]);
 		}
 	}
+	return false;
 }
 
 WOQLQuery.prototype.getPage = function(){

Original file line number	Diff line number	Diff line change
`@@ -633,7 +633,7 @@ WOQLQuery.prototype.documentProperties = function(id){`
`633`	`633`
`634`	`634`	`WOQLQuery.prototype.getDocumentConnections = function(id){`
`635`	`635`	`return this.and(`
`636`		`- this.or(`
	`636`	`+ WOQL.or(`
`637`	`637`	`WOQL.triple(id, "v:Outgoing", "v:Entid"),`
`638`	`638`	`WOQL.triple("v:Entid", "v:Incoming", id)`
`639`	`639`	`),`
`@@ -718,9 +718,10 @@ WOQLQuery.prototype.isPaged = function(q){`
`718`	`718`	`for (const prop of Object.keys(q)) {`
`719`	`719`	`if(prop == "limit") return true;`
`720`	`720`	`else if(this.paging_transitive_properties.indexOf(prop) !== -1){`
`721`		`- return this.isPaged(q[prop][q[prop].length-1])`
	`721`	`+ return this.isPaged(q[prop][q[prop].length-1]);`
`722`	`722`	`}`
`723`	`723`	`}`
	`724`	`+ return false;`
`724`	`725`	`}`
`725`	`726`
`726`	`727`	`WOQLQuery.prototype.getPage = function(){`