deadcxap/inpx-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Работа над расширенным поиском

Browse Source
This commit is contained in:
Book Pauk
2022-12-07 15:36:54 +07:00
parent 5b6ef8202f
commit 85007f3e91
4 changed files with 122 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
server/core/DbSearcher.js
View File

@@ -213,12 +213,13 @@ class DbSearcher {
}
//удаленные
if (query.del !== undefined) {
const key = `book-ids-del-${query.del}`;
if (query.del) {
const del = parseInt(query.del, 10) || 0;
const key = `book-ids-del-${del}`;
let ids = await this.getCached(key);
if (ids === null) {
ids = await tableBookIds('del', `@indexLR('value', ${db.esc(query.del)}, ${db.esc(query.del)})`);
ids = await tableBookIds('del', `@indexLR('value', ${db.esc(del)}, ${db.esc(del)})`);
await this.putCached(key, ids);
}
@@ -559,7 +560,7 @@ class DbSearcher {
//return !bookValue || (bookValue !== emptyFieldValue && !enru.has(bookValue[0]) && bookValue.indexOf(searchValue) >= 0);
return 'true';
} else {
return `(row.${bookField}.localeCompare(${db.esc(searchValue)}) >= 0 && row.${bookField}.localeCompare(${db.esc(searchValue)} + maxUtf8Char) <= 0)`;
return `(row.${bookField}.localeCompare(${db.esc(searchValue)}) >= 0 && row.${bookField}.localeCompare(${db.esc(searchValue)} + ${db.esc(maxUtf8Char)}) <= 0)`;
}
};