From a4aa4ae2f0cb90ed37aabf9070751af092320213 Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Thu, 3 Nov 2022 21:50:08 +0700
Subject: [PATCH 1/3] =?UTF-8?q?=D0=A0=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=BE?=
 =?UTF-8?q?=D1=80=D0=B8=D0=BD=D0=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/core/InpxParser.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/server/core/InpxParser.js b/server/core/InpxParser.js
index b4c6b21..919e6c3 100644
--- a/server/core/InpxParser.js
+++ b/server/core/InpxParser.js
@@ -70,9 +70,8 @@ class InpxParser {
             this.chunk = [];
             for (const inpFile of inpFiles) {
                 await readFileCallback({fileName: inpFile, current: ++current});
-                const buf = await zipReader.extractToBuf(inpFile);
                 
-                await this.parseInp(buf, structure, inpFile, parsedCallback);
+                await this.parseInp(zipReader, inpFile, structure, parsedCallback);
             }
 
             if (this.chunk.length) {
@@ -84,10 +83,12 @@ class InpxParser {
         }
     }
 
-    async parseInp(inpBuf, structure, inpFile, parsedCallback) {
-        const structLen = structure.length;
+    async parseInp(zipReader, inpFile, structure, parsedCallback) {
+        const inpBuf = await zipReader.extractToBuf(inpFile);
         const rows = inpBuf.toString().split('\n');
+
         const defaultFolder = `${path.basename(inpFile, '.inp')}.zip`;
+        const structLen = structure.length;
 
         for (const row of rows) {
             let line = row;

From 0f7ac5c387f4bd6908b1b8f5f414375347e2ff99 Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Thu, 3 Nov 2022 22:30:50 +0700
Subject: [PATCH 2/3] =?UTF-8?q?=D0=92=D0=B5=D1=80=D1=81=D0=B8=D1=8F=20?=
 =?UTF-8?q?=D0=91=D0=94:=20'6'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/config/base.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/config/base.js b/server/config/base.js
index 30cba44..ced76b7 100644
--- a/server/config/base.js
+++ b/server/config/base.js
@@ -14,9 +14,9 @@ module.exports = {
     bookReadLink: '',
     loggingEnabled: true,
 
-    //поправить в случае, если были критические изменения в DbCreator
+    //поправить в случае, если были критические изменения в DbCreator или InpxParser
     //иначе будет рассинхронизация между сервером и клиентом на уровне БД
-    dbVersion: '5',
+    dbVersion: '6',
     dbCacheSize: 5,
 
     maxPayloadSize: 500,//in MB

From f43a0bde45a311af0b0bf0a263c0661bff586444 Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Thu, 3 Nov 2022 22:31:57 +0700
Subject: [PATCH 3/3] 1.1.4

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4e8f525..52bb9f2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "inpx-web",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "inpx-web",
-      "version": "1.1.3",
+      "version": "1.1.4",
       "hasInstallScript": true,
       "license": "CC0-1.0",
       "dependencies": {
diff --git a/package.json b/package.json
index 57cb452..263460f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "inpx-web",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "author": "Book Pauk <bookpauk@gmail.com>",
   "license": "CC0-1.0",
   "repository": "bookpauk/inpx-web",