Skip to content

Commit cc3543a

Browse files
kevinchekovfeeneykevinchekovfeeney
committed
fixing small bugs with woql
1 parent a23cd1c commit cc3543a

File tree

8 files changed

+99
-58
lines changed

8 files changed

+99
-58
lines changed

‎lib/terminusRule.js‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,8 +183,13 @@ TerminusPattern.prototype.numberMatch = function (vala, valb) {
183183
};
184184

185185
TerminusPattern.prototype.stringMatch = function (vala, valb) {
186-
const pat = new RegExp(vala);
187-
return pat.test(valb);
186+
if(vala.substring(0,1) == "/"){
187+
const pat = new RegExp(vala.substring(1));
188+
return pat.test(valb);
189+
}
190+
else {
191+
return vala === valb;
192+
}
188193
};
189194

190195

‎lib/viewer/woqlGraph.js‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,12 @@ WOQLGraph.prototype.extractFromBinding = function(row, rownum){
6767
WOQLGraph.prototype.addAdornedEdge = function(source, target, ks, kt, row){
6868
var edge = { type: "link", target: target, source: source, text: kt};
6969
const matched_rules = new WOQLRule().matchEdge(this.config.rules, row, ks, kt);
70+
var hid = false;
7071
for(var i = 0; i<matched_rules.length; i++){
7172
var rule = matched_rules[i].rule;
73+
if(typeof rule.hidden != "undefined"){
74+
hid = rule.hidden;
75+
}
7276
if(rule.size){
7377
edge.radius = UTILS.getConfigValue(rule.size, row);
7478
}
@@ -91,7 +95,7 @@ WOQLGraph.prototype.addAdornedEdge = function(source, target, ks, kt, row){
9195
edge.weight = UTILS.getConfigValue(rule.weight, row);
9296
}
9397
}
94-
this.edges.push(edge);
98+
if(!hid) this.edges.push(edge);
9599
}
96100

97101
WOQLGraph.prototype.addAdornedNode = function(nid, k, row){
@@ -173,6 +177,7 @@ WOQLGraph.prototype.combineNodes = function(nodes){
173177
var nnodes = {};
174178
for(var i = 0; i<nodes.length; i++){
175179
var n = nodes[i];
180+
if(this.nodes_referenced_by_edges.indexOf(n.id) == -1) continue;
176181
if(typeof nnodes[n.id] == "undefined"){
177182
nnodes[n.id] = n;
178183
}
@@ -189,6 +194,7 @@ WOQLGraph.prototype.combineNodes = function(nodes){
189194

190195

191196
WOQLGraph.prototype.combineEdges = function(edges){
197+
this.nodes_referenced_by_edges = [];
192198
var nedges = {};
193199
for(var i = 0; i<edges.length; i++){
194200
var e = edges[i];
@@ -203,6 +209,8 @@ WOQLGraph.prototype.combineEdges = function(edges){
203209
if(typeof nedges[e.source][e.target][k] == "undefined") nedges[e.source][e.target][k] = e[k];
204210
}
205211
}
212+
if(this.nodes_referenced_by_edges.indexOf(e.source) == -1) this.nodes_referenced_by_edges.push(e.source);
213+
if(this.nodes_referenced_by_edges.indexOf(e.target) == -1) this.nodes_referenced_by_edges.push(e.target);
206214
}
207215
var fedges = [];
208216
for(var k in nedges){

‎lib/woql.js‎

Lines changed: 46 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,6 @@ WOQLQuery.prototype.unique = function(prefix, vari, type){
309309
WOQLQuery.prototype.concat = function(list, v){
310310
if(typeof list == "string"){
311311
var nlist = list.split(/(v:[\w_]+)\b/);
312-
var nxlist = [];
313312
for(var i = 1; i<nlist.length; i++){
314313
if(nlist[i-1].substring(nlist[i-1].length-1) == "v" && nlist[i].substring(0, 1) == ":"){
315314
nlist[i-1] = nlist[i-1].substring(0, nlist[i-1].length-1);
@@ -471,7 +470,13 @@ WOQLQuery.prototype.and = function (...queries) {
471470
this.cursor.and = [];
472471
for (let i = 0; i < queries.length; i++) {
473472
if (queries[i].contains_update) this.contains_update = true;
474-
this.cursor.and.push(queries[i].json());
473+
var nquery = (queries[i].json ? queries[i].json() : queries[i]);
474+
if(nquery['and']){
475+
this.cursor.and = this.cursor.and.concat(nquery['and']);
476+
}
477+
else {
478+
this.cursor.and.push(nquery);
479+
}
475480
}
476481
return this;
477482
};
@@ -480,7 +485,8 @@ WOQLQuery.prototype.or = function (...queries) {
480485
this.cursor.or = [];
481486
for (let i = 0; i < queries.length; i++) {
482487
if (queries[i].contains_update) this.contains_update = true;
483-
this.cursor.or.push(queries[i].json());
488+
var nquery = (queries[i].json ? queries[i].json() : queries[i]);
489+
this.cursor.or.push(nquery);
484490
}
485491
return this;
486492
};
@@ -934,8 +940,8 @@ WOQLQuery.prototype.getDocumentConnections = function(id){
934940
WOQL.triple("v:Entid", "type", "v:Enttype"),
935941
WOQL.sub("v:Enttype", "tcs:Document"),
936942
WOQL.or(
937-
WOQL.triple("v:Docid", "v:Outgoing", "v:Entid"),
938-
WOQL.triple("v:Entid", "v:Incoming", "v:Docid")
943+
WOQL.triple(id, "v:Outgoing", "v:Entid"),
944+
WOQL.triple("v:Entid", "v:Incoming", id)
939945
),
940946
WOQL.opt().triple("v:Entid", "rdfs:label", "v:Label"),
941947
WOQL.opt().quad("v:Enttype", "rdfs:label", "v:Class_Label", "db:schema")
@@ -1332,7 +1338,9 @@ WOQLQuery.prototype.prettyPrint = function(indent, show_context, q, fluent){
13321338
}
13331339
else {
13341340
//non chainable operators all live inside the function call parameters
1335-
str += this.uncleanArguments(operator, val, indent, show_context);
1341+
if(!this.hasShortcut(operator, val, indent)){
1342+
str += this.uncleanArguments(operator, val, indent, show_context);
1343+
}
13361344
}
13371345
}
13381346
//remove any trailing dots in the chain (only exist in incompletely specified queries)
@@ -1370,43 +1378,41 @@ WOQLQuery.prototype.isChainable = function(operator, lastArg){
13701378
* Transforms arguments to WOQL functions from the internal (clean) version, to the WOQL.js human-friendly version
13711379
*/
13721380
WOQLQuery.prototype.uncleanArguments = function(operator, args, indent, show_context){
1373-
str = '(';
1374-
const args_take_newlines = ["and", "or"];
13751381
if(this.hasShortcut(operator, args)){
1376-
return this.getShortcut(args, indent);
1382+
return this.getShortcut(operator, args, indent);
13771383
}
1378-
else {
1379-
for(var i = 0; i<args.length; i++){
1380-
if(this.argIsSubQuery(operator, args[i], i)){
1381-
str += this.prettyPrint(indent + this.indent, show_context, args[i], false);
1382-
}
1383-
else if(operator == "get" && i == 0){ // weird one, needs special casing
1384-
str += "\n" + nspaces(indent-this.indent) + "WOQL";
1385-
for(var j = 0; j < args[0].length; j++){
1386-
var myas = (args[0][j].as ? args[0][j].as : args[0][j]);
1387-
var lhs = myas[0];
1388-
var rhs = myas[1];
1389-
if(typeof lhs == "object" && lhs['@value']){
1390-
lhs = lhs['@value'];
1391-
}
1392-
if(typeof lhs == "object") {
1393-
lhs = JSON.stringify(lhs);
1394-
}
1395-
else {
1396-
lhs = '"' + lhs + '"'
1397-
}
1398-
str += '.as(' + lhs;
1399-
if(rhs) str += ', "' + rhs + '"';
1400-
str += ")";
1401-
str += "\n" + nspaces(indent);
1384+
let str = '(';
1385+
for(var i = 0; i<args.length; i++){
1386+
if(this.argIsSubQuery(operator, args[i], i)){
1387+
str += this.prettyPrint(indent + this.indent, show_context, args[i], false);
1388+
}
1389+
else if(operator == "get" && i == 0){ // weird one, needs special casing
1390+
str += "\n" + nspaces(indent-this.indent) + "WOQL";
1391+
for(var j = 0; j < args[0].length; j++){
1392+
var myas = (args[0][j].as ? args[0][j].as : args[0][j]);
1393+
var lhs = myas[0];
1394+
var rhs = myas[1];
1395+
if(typeof lhs == "object" && lhs['@value']){
1396+
lhs = lhs['@value'];
14021397
}
1398+
if(typeof lhs == "object") {
1399+
lhs = JSON.stringify(lhs);
1400+
}
1401+
else {
1402+
lhs = '"' + lhs + '"'
1403+
}
1404+
str += '.as(' + lhs;
1405+
if(rhs) str += ', "' + rhs + '"';
1406+
str += ")";
1407+
str += "\n" + nspaces(indent);
14031408
}
1404-
else {
1405-
str += this.uncleanArgument(operator, args[i], i, args);
1406-
}
1407-
if(i < args.length -1) str += ',';
14081409
}
1410+
else {
1411+
str += this.uncleanArgument(operator, args[i], i, args);
1412+
}
1413+
if(i < args.length -1) str += ',';
14091414
}
1415+
const args_take_newlines = ["and", "or"];
14101416
if(args_take_newlines.indexOf(operator) != -1){
14111417
str += "\n" + nspaces(indent-this.indent);
14121418
}
@@ -1519,11 +1525,12 @@ WOQLQuery.prototype.unclean = function(s, part){
15191525
return s;
15201526
}
15211527

1522-
WOQLQuery.prototype.hasShortcut = function(operator, args, indent, show_context){
1528+
WOQLQuery.prototype.hasShortcut = function(operator, args, indent){
15231529
if(operator == "true") return true;
1530+
return false;
15241531
}
15251532

1526-
WOQLQuery.prototype.getShortcut = function(operator, args, indent, show_context){
1533+
WOQLQuery.prototype.getShortcut = function(operator, args, indent){
15271534
if(operator == "true") return true;
15281535
}
15291536

‎lib/woqlResult.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,9 @@ WOQLResult.prototype.last = function(){
8989
}
9090

9191
WOQLResult.prototype.next = function () {
92-
this.cursor++;
92+
if(this.cursor >= this.bindings.length) return false;
9393
const res = this.bindings[this.cursor];
94+
this.cursor++;
9495
return res;
9596
};
9697

‎test/objectFrame.spec.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,5 @@ describe('Object Frame Rules', function () {
2020
const jsonObj= {"@id": "doc:utop", "@type": "mycls", mprop: [{ "@type": "xsd:string", "@value": "helloworld"}]};
2121
expect(extract).to.eql(jsonObj);
2222
})
23-
2423
})
2524

‎test/woql.spec.js‎

Lines changed: 28 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,17 @@ describe('woql queries', function () {
321321

322322
})
323323

324+
it('check the concat method',function(){
325+
326+
const woqlObject=WOQL.concat("v:Duration yo v:Duration_Cast", "x");
327+
328+
const jsonObj={ "concat": [ { list: ["v:Duration", {"@value": " yo ", "@type": "xsd:string"}, "v:Duration_Cast" ]}, "v:x"] }
329+
330+
expect(woqlObject.json()).to.eql(jsonObj);
331+
332+
})
333+
334+
324335

325336
it('check the list method',function(){
326337

@@ -348,9 +359,16 @@ describe('woql queries', function () {
348359
const jsonObj2={ order_by: [ {desc: ['v:C', "v:A"]}, {} ] };
349360
expect(woqlObject2.json()).to.eql(jsonObj2);
350361

362+
const ascd = WOQL.asc(["v:C", "v:A"]);
363+
const woqlObject3=WOQL.order_by(ascd);
364+
const jsonObj3={ order_by: [ {asc: ['v:C', "v:A"]}, {} ] };
365+
expect(woqlObject3.json()).to.eql(jsonObj3);
366+
367+
351368
})
352369

353370

371+
354372
})
355373

356374
describe('triple builder', function () {
@@ -724,9 +742,9 @@ describe('triple builder chaining methods', function () {
724742
expect(woqlObject.json()).to.eql(jsonObj);
725743
})
726744
it('check the chained doctype method',function(){
727-
const woqlObject = WOQL.doctype("MyDoc")
728-
.property("prop", "dateTime")
729-
.property("prop2", "integer")
745+
const woqlObject = WOQL.doctype("MyDoc").label("abc").description("abcd")
746+
.property("prop", "dateTime").label("aaa")
747+
.property("prop2", "integer").label("abe")
730748

731749
const jsonObj={ and: [
732750
{ add_quad: ["scm:prop2", "rdf:type", "owl:DatatypeProperty", "db:schema"] },
@@ -736,12 +754,15 @@ describe('triple builder chaining methods', function () {
736754
{ add_quad: ["scm:prop", "rdf:type", "owl:DatatypeProperty", "db:schema"] },
737755
{ add_quad: ["scm:prop", "rdfs:range", "xsd:dateTime", "db:schema"] },
738756
{ add_quad: ["scm:prop", "rdfs:domain", "scm:MyDoc", "db:schema"] },
739-
740757
{ and: [
741758
{ add_quad: ["scm:MyDoc", "rdf:type", "owl:Class", "db:schema"] },
742-
{ add_quad: ["scm:MyDoc", "rdfs:subClassOf", "tcs:Document", "db:schema"] }
743-
]}
744-
]},
759+
{ add_quad: ["scm:MyDoc", "rdfs:subClassOf", "tcs:Document", "db:schema"] },
760+
{ add_quad: ["scm:MyDoc", "rdfs:label", {"@value": "abc", "@language": "en"}, "db:schema"] },
761+
{ add_quad: ["scm:MyDoc", "rdfs:comment", {"@value": "abcd", "@language": "en"}, "db:schema"] },
762+
]},
763+
{ add_quad: ["scm:prop", "rdfs:label", {"@value": "aaa", "@language": "en"}, "db:schema"] }
764+
]},
765+
{ add_quad: ["scm:prop2", "rdfs:label", {"@value": "abe", "@language": "en"}, "db:schema"] }
745766
]};
746767
expect(woqlObject.json()).to.eql(jsonObj);
747768
})

‎test/woqlQuery.spec.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -306,6 +306,9 @@ describe('pre-roll queries', function () {
306306
const woqlObject=WOQL.limit(2).start(0);
307307
//console.log(JSON.stringify(woqlObject.getDocumentConnections("docid").json()));
308308
const jsonObj={ limit: [ 2, { start: [ 0, { "and": [
309+
{ "eq" : ["v:Docid", "doc:docid"]},
310+
{ "triple": [ "v:Entid", "rdf:type", "v:Enttype"] },
311+
{ "sub": [ "v:Enttype", "tcs:Document"] },
309312
{ "or": [
310313
{ "triple": [
311314
"doc:docid",
@@ -314,11 +317,9 @@ describe('pre-roll queries', function () {
314317
] },
315318
{ "triple": [ "v:Entid",
316319
"v:Incoming",
317-
{ "@language": "en", "@value": "docid" },
320+
"doc:docid",
318321
] },
319322
] },
320-
{ "isa": [ "v:Entid", "v:Enttype"] },
321-
{ "sub": [ "v:Enttype", "tcs:Document"] },
322323
{ "opt": [ { "triple": [
323324
"v:Entid",
324325
"rdfs:label",
@@ -332,8 +333,7 @@ describe('pre-roll queries', function () {
332333
] } ] }
333334
],
334335
} ] } ] };
335-
336-
expect(woqlObject.getDocumentConnections("docid").json()).to.eql(jsonObj);
336+
expect(woqlObject.getDocumentConnections("doc:docid").json()).to.eql(jsonObj);
337337

338338
})
339339

‎test/woqlResult.spec.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@ describe('woql results 01', function () {
6464
'v:Element': 'http://195.201.12.87:6365/pybike/schema#Journey',
6565
'v:Label': { '@language': 'en', '@value': 'Journey' } }
6666

67+
results.next();
6768
expect(results.next()).to.eql(secondItem);
68-
69-
expect(results.prev()).to.eql(fistItem);
69+
//expect(results.prev()).to.eql(fistItem);
7070

7171
const lastItem={ 'v:Abstract': 'unknown',
7272
'v:Comment':

0 commit comments

Comments
 (0)