fix callbacks and regex

This commit is contained in:
yariplus
2016-10-16 21:53:02 -04:00
parent 1bb44e2429
commit be3b35dea3
2 changed files with 30 additions and 23 deletions

View File

@@ -596,18 +596,22 @@ module.exports = function (db, module) {
var query = {_key: key, value: {}};
if (min !== '-') {
if (min.match('(')) {
query.value = {$gt: parseInt(min, 10)};
if (min.match(/^\(/)) {
query.value = {$gt: min.slice(1)};
} else if (min.match(/^\[/)) {
query.value = {$gte: min.slice(1)};
} else {
query.value = {$gte: parseInt(min, 10)};
query.value = {$gte: min};
}
}
if (max !== '+') {
query.value = query.value || {};
if (max.match('(')) {
query.value = {$lt: parseInt(max, 10)};
if (max.match(/^\(/)) {
query.value.$lt = max.slice(1);
} else if (max.match(/^\[/)) {
query.value.$lte = max.slice(1);
} else {
query.value = {$lte: parseInt(max, 10)};
query.value.$lte = max;
}
}
@@ -632,18 +636,22 @@ module.exports = function (db, module) {
var query = {_key: key};
if (min !== '-') {
if (min.match('(')) {
query.value = {$gt: parseInt(min, 10)};
if (min.match(/^\(/)) {
query.value = {$gt: min.slice(1)};
} else if (min.match(/^\[/)) {
query.value = {$gte: min.slice(1)};
} else {
query.value = {$gte: parseInt(min, 10)};
query.value = {$gte: min};
}
}
if (max !== '+') {
query.value = query.value || {};
if (max.match('(')) {
query.value = {$lt: parseInt(max, 10)};
if (max.match(/^\(/)) {
query.value.$lt = max.slice(1);
} else if (max.match(/^\[/)) {
query.value.$lte = max.slice(1);
} else {
query.value = {$lte: parseInt(max, 10)};
query.value.$lte = max;
}
}