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 16:43:46 +07:00
parent cff6e5aab9
commit 4927cdf6ce
1 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
server/core/DbSearcher.js
View File

@@ -539,7 +539,6 @@ class DbSearcher {
} }
async bookSearchIds(query) { async bookSearchIds(query) {
const ids = await this.selectBookIds(query);
const queryKey = this.queryKey(query); const queryKey = this.queryKey(query);
const bookKey = `book-search-ids-${queryKey}`; const bookKey = `book-search-ids-${queryKey}`;
let bookIds = await this.getCached(bookKey); let bookIds = await this.getCached(bookKey);
@@ -550,17 +549,19 @@ class DbSearcher {
searchValue = searchValue.toLowerCase(); searchValue = searchValue.toLowerCase();
//особая обработка префиксов //особая обработка префиксов
if (searchValue[0] == '=') { if (searchValue[0] == '=') {
searchValue = searchValue.substring(1); searchValue = searchValue.substring(1);
return `(row.${bookField}.toLowerCase().localeCompare(${db.esc(searchValue)}) === 0)`; return `(row.${bookField}.toLowerCase().localeCompare(${db.esc(searchValue)}) === 0)`;
} else if (searchValue[0] == '*') { } else if (searchValue[0] == '*') {
searchValue = searchValue.substring(1); searchValue = searchValue.substring(1);
return `(row.${bookField} && row.${bookField}.toLowerCase().indexOf(${db.esc(searchValue)}) >= 0)`; return `(row.${bookField} && row.${bookField}.toLowerCase().indexOf(${db.esc(searchValue)}) >= 0)`;
} else if (searchValue[0] == '#') { } else if (searchValue[0] == '#') {
//searchValue = searchValue.substring(1); searchValue = searchValue.substring(1);
//return !bookValue || (bookValue !== emptyFieldValue && !enru.has(bookValue[0]) && bookValue.indexOf(searchValue) >= 0); return `(row.${bookField} === '' || (!enru.has(row.${bookField}.toLowerCase()[0]) && row.${bookField}.toLowerCase().indexOf(${db.esc(searchValue)}) >= 0))`;
return 'true';
} else { } else {
return `(row.${bookField}.toLowerCase().localeCompare(${db.esc(searchValue)}) >= 0 ` + return `(row.${bookField}.toLowerCase().localeCompare(${db.esc(searchValue)}) >= 0 ` +
`&& row.${bookField}.toLowerCase().localeCompare(${db.esc(searchValue)} + ${db.esc(maxUtf8Char)}) <= 0)`; `&& row.${bookField}.toLowerCase().localeCompare(${db.esc(searchValue)} + ${db.esc(maxUtf8Char)}) <= 0)`;
} }
@@ -573,10 +574,22 @@ class DbSearcher {
if (f.type === 'S') { if (f.type === 'S') {
checks.push(filterBySearch(f.field, searchValue)); checks.push(filterBySearch(f.field, searchValue));
} if (f.type === 'N') { } if (f.type === 'N') {
searchValue = parseInt(searchValue, 10); const v = searchValue.split('..');
if (isNaN(searchValue))
throw new Error(`Wrong query param, ${f.field}=${searchValue}`); if (v.length == 1) {
checks.push(`row.${f.field} === ${searchValue}`); searchValue = parseInt(searchValue, 10);
if (isNaN(searchValue))
throw new Error(`Wrong query param, ${f.field}=${searchValue}`);
checks.push(`row.${f.field} === ${searchValue}`);
} else {
const from = parseInt(v[0] || '0', 10);
const to = parseInt(v[1] || '0', 10);
if (isNaN(from) || isNaN(to))
throw new Error(`Wrong query param, ${f.field}=${searchValue}`);
checks.push(`row.${f.field} >= ${from} && row.${f.field} <= ${to}`);
}
} }
} }
} }
@@ -585,17 +598,17 @@ class DbSearcher {
table: 'book', table: 'book',
rawResult: true, rawResult: true,
where: ` where: `
const ids = ${(ids ? db.esc(Array.from(ids)) : '@all()')}; const enru = new Set(${db.esc(enruArr)});
const checkBook = (row) => { const checkBook = (row) => {
return ${checks.join(' && ')}; return ${checks.join(' && ')};
}; };
const result = new Set(); const result = [];
for (const id of ids) { for (const id of @all()) {
const row = @unsafeRow(id); const row = @unsafeRow(id);
if (checkBook(row)) if (checkBook(row))
result.add(row.id); result.push(row.id);
} }
return new Uint32Array(result); return new Uint32Array(result);