fix or function

Author: Francesca-Bit

lib/woql.js

@@ -7,6 +7,7 @@ const FramePattern = require('./framePattern');
 const FrameHelper = require('./frameHelper');
 
 const WOQL = {};
+
 WOQL.when = function(Query, Update){ return new WOQLQuery().when(Query, Update);}
 WOQL.opt = function(query){ return new WOQLQuery().opt(query); }
 WOQL.from = function(dburl, query){ return new WOQLQuery().from(dburl, query); }
@@ -34,7 +35,7 @@ WOQL.divide = function(...args){ return new WOQLQuery().divide(...args); }
 WOQL.exp = function(a, b){	return new WOQLQuery().exp(a, b); }
 WOQL.json = function(json){	return new WOQLQuery().json(json); }
 WOQL.rule = function(){	return new FramePattern.FrameRule() }
-WOQL.getAllDocuments= function(){return new WOQLQuery().getAllDocuments()}
+//WOQL.getAllDocuments= function(){return new WOQLQuery().getAllDocuments()}
 
 function WOQLQuery(query, results){
 	this.query = (query ? query : {});
@@ -108,7 +109,7 @@ WOQLQuery.prototype.setPagingProperty = function(pageprop, val, q){
 WOQLQuery.prototype.addStart = function(val, q){
 	q = (q ? q : this.query);	
 	for (const prop of Object.keys(q)) {
-		if(prop == limit) {
+		if(prop == "limit") {
 			var nval = { "start": [0, q[prop][1]]}
 			q[prop][1] = nval;
 		}
@@ -405,7 +406,7 @@ WOQLQuery.prototype.and = function(...queries){
 	return this;
 }
 
-WOQLQuery.prototype.or = function(queries){
+WOQLQuery.prototype.or = function(...queries){
 	this.cursor["or"] = [];
 	for(var i = 0; i<queries.length; i++){
 		if(queries[i].contains_update) this.contains_update = true;
@@ -552,6 +553,9 @@ WOQLQuery.prototype.documentMetadata = function(){
 	);
 }
 
+
+
+
 WOQLQuery.prototype.propertyMetadata = function(){
 	return this.and(
 		WOQL.or(
@@ -602,9 +606,9 @@ WOQLQuery.prototype.getDataOfProperty = function(chosen){
 
 WOQLQuery.prototype.documentProperties = function(id){
 	return this.and(
-		WOQL.triple(id, "v:Property", "v:Property_Value"),
-		WOQL.opt().quad("v:Property", "rdfs:label", "v:Property_Label", "db:schema"),
-		WOQL.opt().quad("v:Property", "rdf:type", "v:Property_Type", "db:schema")
+		'WOQL.triple(id, "v:Property", "v:Property_Value")',
+		'WOQL.opt().quad("v:Property", "rdfs:label", "v:Property_Label", "db:schema")',
+		'WOQL.opt().quad("v:Property", "rdf:type", "v:Property_Type", "db:schema")'
 	);
 }