From 3a8fa1289457adc64679d05df90ebd857dde3641 Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Tue, 25 Oct 2022 17:42:50 +0700 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=BF=D0=B8=D0=BB=D0=B8=D0=B2?= =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D0=B5=20DbCreator?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/core/DbCreator.js | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/server/core/DbCreator.js b/server/core/DbCreator.js index 29e43ac..a5823e6 100644 --- a/server/core/DbCreator.js +++ b/server/core/DbCreator.js @@ -238,7 +238,7 @@ class DbCreator { } } - ids.sort();// обязательно, иначе будет тормозить - особенности JembaDb + ids.sort((a, b) => a - b);// обязательно, иначе будет тормозить - особенности JembaDb callback(0.1); const rows = await db.select({table: 'book', where: `@@id(${db.esc(ids)})`}); @@ -600,7 +600,7 @@ class DbCreator { } } - ids.sort();// обязательно, иначе будет тормозить - особенности JembaDb + ids.sort((a, b) => a - b);// обязательно, иначе будет тормозить - особенности JembaDb const rows = await db.select({table: 'book', where: `@@id(${db.esc(ids)})`}); @@ -610,17 +610,26 @@ class DbCreator { for (const s of seriesChunk) { s.books = []; + s.bookCount = 0; + s.bookDelCount = 0; for (const id of s.bookId) { const rec = bookArr.get(id); - s.books.push(rec); + if (rec) {//на всякий случай + s.books.push(rec); + if (!rec.del) + s.bookCount++; + else + s.bookDelCount++; + } } if (s.books.length) { - s.series = s.books[0].value; + s.series = s.books[0].series; } else { s.toDel = 1; } + delete s.authorId; delete s.bookId; }