0x2620/cablegates
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

support deeper nesting of brackets in url find query

Browse source
This commit is contained in:
rlx 2011-08-25 02:51:58 +00:00
commit e4834bf8a4
7 changed files with 56 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

19
static/js/pandora/Query.js
View file

@ -97,13 +97,24 @@ pandora.Query = (function() {
list: '',
query: {conditions: [], operator: ''}
},
subconditions = str.match(/\[.*?\]/g) || [];
subconditions = [];
if (str.length) {
// replace subconditions with placeholder,
// so we can later split by main operator
var counter = 0;
Ox.forEach(str, function(c, i) {
if (c == ']') {
counter--;
}
if (counter >= 1) {
subconditions[subconditions.length - 1] += c;
}
if (c == '[') {
(++counter == 1) && subconditions.push('');
}
});
subconditions.forEach(function(subcondition, i) {
subconditions[i] = subcondition.substr(1, subcondition.length - 2);
str = str.replace(subconditions[i], i);
str = str.replace(subcondition, i);
});
if (str.indexOf(',') > -1) {
ret.query.operator = '&';
@ -116,7 +127,7 @@ pandora.Query = (function() {
var kv, ret;
if (condition[0] == '[') {
// re-insert subcondition
ret = parseFind(subconditions[parseInt(condition.substr(1, condition.length - 2))]).query;
ret = parseFind(subconditions[parseInt(Ox.sub(condition, 1, -1))]).query;
} else {
kv = ((condition.indexOf(':') > -1 ? '' : ':') + condition).split(':');
ret = Ox.extend({key: kv[0]}, parseValue(kv[1]));