Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-01 19:46:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix callbacks and regex

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

32
src/database/mongo/sorted.js
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;
}
}

21
src/database/redis/sorted.js
View File

@@ -293,23 +293,24 @@ module.exports = function (redisClient, module) {
};
module.getSortedSetRangeByLex = function (key, min, max, start, count, callback) {
sortedSetLex('zrangebylex', false, key, min, max, start, count, callback)
sortedSetLex('zrangebylex', false, key, min, max, start, count, callback);
};
module.getSortedSetRevRangeByLex = function (key, max, min, start, count, callback) {
sortedSetLex('zrevrangebylex', true, key, max, min, start, count, callback)
sortedSetLex('zrevrangebylex', true, key, max, min, start, count, callback);
};
module.sortedSetRemoveRangeByLex = function (key, min, max) {
sortedSetLex('zremrangebylex', false, key, min, max, callback)
module.sortedSetRemoveRangeByLex = function (key, min, max, callback) {
callback = callback || helpers.noop;
sortedSetLex('zremrangebylex', false, key, min, max, callback);
};
module.sortedSetLexCount = function (key, min, max) {
sortedSetLex('zlexcount', false, key, min, max, callback)
module.sortedSetLexCount = function (key, min, max, callback) {
sortedSetLex('zlexcount', false, key, min, max, callback);
};
function sortedSetLex(method, reverse, key, min, max, start, count, callback) {
if (!callback) callback === start;
callback = callback || start;
var minmin, maxmax;
if (reverse) {
@@ -321,12 +322,10 @@ module.exports = function (redisClient, module) {
}
if (min !== minmin) {
min = '' + min;
if (!min.match(/[\[\(]/)) min = '[' + min;
if (!min.match(/^[\[\(]/)) min = '[' + min;
}
if (max !== maxmax) {
max = '' + max;
if (!max.match(/[\[\(]/)) max = '[' + max;
if (!max.match(/^[\[\(]/)) max = '[' + max;
}
if (count) {