X-Git-Url: http://git.indexdata.com/?p=cql-js-moved-to-github.git;a=blobdiff_plain;f=cql.js;h=ed51f7704484531fa2d3beb49244e08eb5c93d40;hp=ebd878e71de519ce95f0fe9e0ff312cd950754a4;hb=1ef699c132ea658c29450a223fa78661e10969aa;hpb=549d7685dd4fe9ac422f0cbfdee3d0c604ad7173;ds=sidebyside
diff --git a/cql.js b/cql.js
index ebd878e..ed51f77 100644
--- a/cql.js
+++ b/cql.js
@@ -1,7 +1,12 @@
-function indent(n) {
+var EXPORTED_SYMBOLS = ["CQLParser"];
+
+var DEFAULT_SERVER_CHOICE_FIELD = 'cql.serverChoice';
+var DEFAULT_SERVER_CHOICE_RELATION = 'scr';
+
+function indent(n, c) {
var s = "";
for (var i = 0; i < n; i++)
- s = s + " ";
+ s = s + c;
return s;
}
// CQLModifier
@@ -12,16 +17,20 @@ var CQLModifier = function () {
}
CQLModifier.prototype = {
- toXCQL: function (n) {
- var s = indent(n+1) + "\n";
- s = s + indent(n+2) + "" + this.name + "\n";
+ toString: function () {
+ return this.name + this.relation + this.value;
+ },
+
+ toXCQL: function (n, c) {
+ var s = indent(n+1, c) + "\n";
+ s = s + indent(n+2, c) + "" + this.name + "\n";
if (this.relation != null)
- s = s + indent(n+2)
+ s = s + indent(n+2, c)
+ "" + this.relation + "\n";
if (this.value != null)
- s = s + indent(n+2)
+ s = s + indent(n+2, c)
+ "" + this.value +"\n";
- s = s + indent(n+1) + "\n";
+ s = s + indent(n+1, c) + "\n";
return s;
},
@@ -36,51 +45,68 @@ CQLModifier.prototype = {
// CQLSearchClause
var CQLSearchClause = function (field, fielduri, relation, relationuri,
- modifiers, term) {
+ modifiers, term, scf, scr) {
this.field = field;
this.fielduri = fielduri;
this.relation = relation;
this.relationuri = relationuri;
this.modifiers = modifiers;
this.term = term;
+ this.scf = scf || DEFAULT_SERVER_CHOICE_FIELD;
+ this.scr = scr || DEFAULT_SERVER_CHOICE_RELATION;
}
CQLSearchClause.prototype = {
- toXCQL: function (n) {
- var s = indent(n) + "\n";
+ toString: function () {
+ var field = this.field;
+ var relation = this.relation;
+ if (field == this.scf && relation == this.scr) {
+ //avoid redundant field/relation
+ field = null;
+ relation = null;
+ }
+ return (field ? field + ' ' : '') +
+ (relation ? relation : '') +
+ (this.modifiers.length > 0 ? '/' + this.modifiers.join('/') : '') +
+ (relation || this.modifiers.length ? ' ' : '') +
+ '"' + this.term + '"';
+ },
+
+ toXCQL: function (n, c) {
+ var s = indent(n, c) + "\n";
if (this.fielduri.length > 0)
{
- s = s + indent(n+1) + "\n" +
- indent(n+2) + "\n" +
- indent(n+3) + "" + this.fielduri +
+ s = s + indent(n+1, c) + "\n" +
+ indent(n+2, c) + "\n" +
+ indent(n+3, c) + "" + this.fielduri +
"\n" +
- indent(n+2) + "\n" +
- indent(n+1) + "\n";
+ indent(n+2, c) + "\n" +
+ indent(n+1, c) + "\n";
}
- s = s + indent(n+1) + "" + this.field + "\n";
- s = s + indent(n+1) + "\n";
+ s = s + indent(n+1, c) + "" + this.field + "\n";
+ s = s + indent(n+1, c) + "\n";
if (this.relationuri.length > 0) {
- s = s + indent(n+2) +
+ s = s + indent(n+2, c) +
"" + this.relationuri + "\n";
}
- s = s + indent(n+2) + "" + this.relation + "\n";
+ s = s + indent(n+2, c) + "" + this.relation + "\n";
if (this.modifiers.length > 0) {
- s = s + indent(n+2) + "\n";
+ s = s + indent(n+2, c) + "\n";
for (var i = 0; i < this.modifiers.length; i++)
- s = s + this.modifiers[i].toXCQL(n+2);
- s = s + indent(n+2) + "\n";
+ s = s + this.modifiers[i].toXCQL(n+2, c);
+ s = s + indent(n+2, c) + "\n";
}
- s = s + indent(n+1) + "\n";
- s = s + indent(n+1) + "" + this.term + "\n";
- s = s + indent(n) + "\n";
+ s = s + indent(n+1, c) + "\n";
+ s = s + indent(n+1, c) + "" + this.term + "\n";
+ s = s + indent(n, c) + "\n";
return s;
},
toFQ: function () {
- var s = '{ "term": "'+this.term+'"';
- if (this.field.length > 0 && this.field != 'cql.serverChoice')
+ var s = '{"term": "'+this.term+'"';
+ if (this.field.length > 0 && this.field != this.scf)
s+= ', "field": "'+this.field+'"';
- if (this.relation.length > 0 && this.relation != 'scr')
+ if (this.relation.length > 0 && this.relation != this.scr)
s+= ', "relation": "'+this._mapRelation(this.relation)+'"';
for (var i = 0; i < this.modifiers.length; i++) {
//since modifiers are mapped to keys, ignore the reserved ones
@@ -90,7 +116,7 @@ CQLSearchClause.prototype = {
continue;
s += ', ' + this.modifiers[i].toFQ();
}
- s += ' }';
+ s += '}';
return s;
},
@@ -104,6 +130,18 @@ CQLSearchClause.prototype = {
case "<=" : return "le";
default: return rel;
}
+ },
+
+ _remapRelation: function (rel) {
+ switch(rel) {
+ case "lt" : return "<";
+ case "gt" : return ">";
+ case "eq" : return "=";
+ case "ne" : return "<>";
+ case "ge" : return ">=";
+ case "le" : return "<=";
+ default: return rel;
+ }
}
}
@@ -116,34 +154,41 @@ var CQLBoolean = function() {
}
CQLBoolean.prototype = {
- toXCQL: function (n) {
- var s = indent(n) + "\n";
- s = s + indent(n+1) + "\n" +
- indent(n+2) + "" + this.op + "\n";
+ toString: function () {
+ return (this.left.op ? '(' + this.left + ')' : this.left) + ' ' +
+ this.op.toUpperCase() +
+ (this.modifiers.length > 0 ? '/' + this.modifiers.join('/') : '') +
+ ' ' + (this.right.op ? '(' + this.right + ')' : this.right);;
+ },
+ toXCQL: function (n, c) {
+ var s = indent(n, c) + "\n";
+ s = s + indent(n+1, c) + "\n" +
+ indent(n+2, c) + "" + this.op + "\n";
if (this.modifiers.length > 0) {
- s = s + indent(n+2) + "\n";
+ s = s + indent(n+2, c) + "\n";
for (var i = 0; i < this.modifiers.length; i++)
- s = s + this.modifiers[i].toXCQL(n+2);
- s = s + indent(n+2) + "\n";
+ s = s + this.modifiers[i].toXCQL(n+2, c);
+ s = s + indent(n+2, c) + "\n";
}
- s = s + indent(n+1) + "\n";
- s = s + indent(n+1) + "\n" +
- this.left.toXCQL(n+2) + indent(n+1) + "\n";
+ s = s + indent(n+1, c) + "\n";
+ s = s + indent(n+1, c) + "\n" +
+ this.left.toXCQL(n+2, c) + indent(n+1, c) + "\n";
- s = s + indent(n+1) + "\n" +
- this.right.toXCQL(n+2) + indent(n+1) + "\n";
- s = s + indent(n) + "\n";
+ s = s + indent(n+1, c) + "\n" +
+ this.right.toXCQL(n+2, c) + indent(n+1, c) + "\n";
+ s = s + indent(n, c) + "\n";
return s;
},
- toFQ: function () {
- var s = ' { "op": "'+this.op+'"';
+ toFQ: function (n, c, nl) {
+ var s = '{"op": "'+this.op+'"';
//proximity modifiers
for (var i = 0; i < this.modifiers.length; i++)
s += ', ' + this.modifiers[i].toFQ();
- s += ', "s1": '+this.left.toFQ();
- s += ', "s2": '+this.right.toFQ();
- s += ' }'
+ s += ','+nl+indent(n, c)+' "s1": '+this.left.toFQ(n+1, c, nl);
+ s += ','+nl+indent(n, c)+' "s2": '+this.right.toFQ(n+1, c, nl);
+ var fill = n && c ? ' ' : '';
+ s += nl+indent(n-1, c)+fill+'}';
return s;
}
@@ -158,26 +203,97 @@ var CQLParser = function () {
this.val = null;
this.prefixes = new Object();
this.tree = null;
+ this.scf = null;
+ this.scr = null;
}
CQLParser.prototype = {
- parse: function (query) {
+ parse: function (query, scf, scr) {
if (!query)
throw new Error("The query to be parsed cannot be empty");
-
+ this.scf = typeof scf != 'string'
+ ? DEFAULT_SERVER_CHOICE_FIELD : scf;
+ this.scr = typeof scr != 'string'
+ ? DEFAULT_SERVER_CHOICE_RELATION : scr;
this.qs = query;
this.ql = this.qs.length;
this.qi = 0;
this._move();
- this.tree = this._parseQuery("cql.serverChoice", "scr", new Array());
+ this.tree = this._parseQuery(this.scf, this.scr, new Array());
if (this.look != "")
throw new Error("EOF expected");
},
- toXCQL: function () {
- return this.tree.toXCQL();
+ parseFromFQ: function (query, scf, scr) {
+ if (!query)
+ throw new Error("The query to be parsed cannot be empty");
+ if (typeof query == 'string')
+ query = JSON.parse(query);
+ this.scf = typeof scf != 'string'
+ ? DEFAULT_SERVER_CHOICE_FIELD : scf;
+ this.scr = typeof scr != 'string'
+ ? DEFAULT_SERVER_CHOICE_RELATION : scr;
+ this.tree = this._parseFromFQ(query);
},
- toFQ: function () {
- return this.tree.toFQ();
+ _parseFromFQ: function (fq) {
+ //op-node
+ if (fq.hasOwnProperty('op')
+ && fq.hasOwnProperty('s1')
+ && fq.hasOwnProperty('s2')) {
+ var node = new CQLBoolean();
+ node.op = fq.op;
+ node.left = this._parseFromFQ(fq.s1);
+ node.right = this._parseFromFQ(fq.s2);
+ //include all other members as modifiers
+ node.modifiers = [];
+ for (var key in fq) {
+ if (key == 'op' || key == 's1' || key == 's2')
+ continue;
+ var mod = new CQLModifier();
+ mod.name = key;
+ mod.relation = '=';
+ mod.value = fq[key];
+ node.modifiers.push(mod);
+ }
+ return node;
+ }
+ //search-clause node
+ if (fq.hasOwnProperty('term')) {
+ var node = new CQLSearchClause();
+ node.term = fq.term;
+ node.scf = this.scf;
+ node.scr = this.scr;
+ node.field = fq.hasOwnProperty('field')
+ ? fq.field : this.scf;
+ node.relation = fq.hasOwnProperty('relation')
+ ? node._remapRelation(fq.relation) : this.scr;
+ //include all other members as modifiers
+ node.relationuri = '';
+ node.fielduri = '';
+ node.modifiers = [];
+ for (var key in fq) {
+ if (key == 'term' || key == 'field' || key == 'relation')
+ continue;
+ var mod = new CQLModifier();
+ mod.name = key;
+ mod.relation = '=';
+ mod.value = fq[key];
+ node.modifiers.push(mod);
+ }
+ return node;
+ }
+ throw new Error('Unknow node type; '+JSON.stringify(fq));
+ },
+ toXCQL: function (c) {
+ c = typeof c == "undefined" ? ' ' : c;
+ return this.tree.toXCQL(0, c);
+ },
+ toFQ: function (c, nl) {
+ c = typeof c == "undefined" ? ' ' : c;
+ nl = typeof nl == "undefined" ? '\n' : c;
+ return this.tree.toFQ(0, c, nl);
+ },
+ toString: function () {
+ return this.tree.toString();
},
_parseQuery: function(field, relation, modifiers) {
var left = this._parseSearchClause(field, relation, modifiers);
@@ -283,7 +399,9 @@ CQLParser.prototype = {
relation,
reluri,
modifiers,
- first);
+ first,
+ this.scf,
+ this.scr);
return sc;
}
// prefixes