Работа над новым поиском

client/components/Search/SeriesList/SeriesList.vue

@@ -181,7 +181,7 @@ class SeriesList extends BaseList {
         let result = [];
 
         const expandedSet = new Set(this.expandedSeries);
-        const series = this.searchResult.series;
+        const series = this.searchResult.found;
         if (!series)
             return;
 
@@ -256,13 +256,13 @@ class SeriesList extends BaseList {
                 this.queryExecute = null;
 
                 try {
-                    const result = await this.api.seriesSearch(query);
+                    const response = await this.api.search('series', query);
 
-                    this.list.queryFound = result.series.length;
+                    this.list.queryFound = response.found.length;
-                    this.list.totalFound = result.totalFound;
+                    this.list.totalFound = response.totalFound;
-                    this.list.inpxHash = result.inpxHash;
+                    this.list.inpxHash = response.inpxHash;
 
-                    this.searchResult = result;
+                    this.searchResult = response;
 
                     await utils.sleep(1);
                     if (!this.queryExecute) {

client/components/Search/TitleList/TitleList.vue

@@ -49,7 +49,7 @@ class TitleList extends BaseList {
     async updateTableData() {
         let result = [];
 
-        const title = this.searchResult.title;
+        const title = this.searchResult.found;
         if (!title)
             return;
 
@@ -116,13 +116,13 @@ class TitleList extends BaseList {
                 this.queryExecute = null;
 
                 try {
-                    const result = await this.api.titleSearch(query);
+                    const response = await this.api.search('title', query);
 
-                    this.list.queryFound = result.title.length;
+                    this.list.queryFound = response.found.length;
-                    this.list.totalFound = result.totalFound;
+                    this.list.totalFound = response.totalFound;
-                    this.list.inpxHash = result.inpxHash;
+                    this.list.inpxHash = response.inpxHash;
 
-                    this.searchResult = result;
+                    this.searchResult = response;
 
                     await utils.sleep(1);
                     if (!this.queryExecute) {

server/core/DbSearcher.js

@@ -318,8 +318,8 @@ class DbSearcher {
     async filterTableIds(tableIds, from, query) {
         let result = tableIds;
 
-        //т.к. авторы идут списком, то дополнительно фильтруем
+        //т.к. авторы у книги идут списком, то дополнительно фильтруем
-        if (query.author && query.author !== '*') {
+        if (from == 'author' && query.author && query.author !== '*') {
             const key = `filter-ids-author-${query.author}`;
             let authorIds = await this.getCached(key);
 
@@ -591,18 +591,24 @@ class DbSearcher {
             }
         }
 
-        //кладем в таблицу
+        //кладем в таблицу асинхронно
-        await db.insert({
+        (async() => {
-            table: 'query_cache',
+            try {
-            replace: true,
+                await db.insert({
-            rows: [{id: key, value}],
+                    table: 'query_cache',
-        });
+                    replace: true,
+                    rows: [{id: key, value}],
+                });
 
-        await db.insert({
+                await db.insert({
-            table: 'query_time',
+                    table: 'query_time',
-            replace: true,
+                    replace: true,
-            rows: [{id: key, time: Date.now()}],
+                    rows: [{id: key, time: Date.now()}],
-        });
+                });
+            } catch(e) {
+                console.error(`putCached: ${e.message}`);
+            }
+        })();
     }
 
     async periodicCleanCache() {