From 68532e361eacde2a1bcc88f65803432cad6438d0 Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Thu, 1 Dec 2022 16:28:39 +0700
Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=20=D0=BD?=
 =?UTF-8?q?=D0=B0=D0=B4=20=D1=80=D0=B0=D1=81=D1=88=D0=B8=D1=80=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=BD=D1=8B=D0=BC=20=D0=BF=D0=BE=D0=B8=D1=81=D0=BA=D0=BE=D0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/config/base.js     | 2 +-
 server/core/DbCreator.js  | 5 ++++-
 server/core/InpxParser.js | 8 +++-----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/server/config/base.js b/server/config/base.js
index 0cc95ae..56c82e6 100644
--- a/server/config/base.js
+++ b/server/config/base.js
@@ -17,7 +17,7 @@ module.exports = {
 
     //поправить в случае, если были критические изменения в DbCreator или InpxParser
     //иначе будет рассинхронизация между сервером и клиентом на уровне БД
-    dbVersion: '8',
+    dbVersion: '9',
     dbCacheSize: 5,
 
     maxPayloadSize: 500,//in MB
diff --git a/server/core/DbCreator.js b/server/core/DbCreator.js
index d1aba16..d9c673f 100644
--- a/server/core/DbCreator.js
+++ b/server/core/DbCreator.js
@@ -446,8 +446,11 @@ class DbCreator {
             table: 'config'
         });
 
+        const inpxInfo = (inpxFilter && inpxFilter.info ? inpxFilter.info : parser.info);
+        inpxInfo.structure = parser.info.structure;
+        
         await db.insert({table: 'config', rows: [
-            {id: 'inpxInfo', value: (inpxFilter && inpxFilter.info ? inpxFilter.info : parser.info)},
+            {id: 'inpxInfo', value: inpxInfo},
             {id: 'stats', value: stats},
             {id: 'inpxHash', value: await inpxHashCreator.getHash()},
         ]});
diff --git a/server/core/InpxParser.js b/server/core/InpxParser.js
index 6e2d864..29a6761 100644
--- a/server/core/InpxParser.js
+++ b/server/core/InpxParser.js
@@ -61,11 +61,9 @@ class InpxParser {
             info.version = await this.safeExtractToString(zipReader, versionInfo);
 
             //структура
-            let inpxStructure = info.structure;
-            if (!inpxStructure)
-                inpxStructure = defaultStructure;
-            inpxStructure = inpxStructure.toLowerCase();
-            const structure = inpxStructure.split(';');
+            if (!info.structure)
+                info.structure = defaultStructure;
+            const structure = info.structure.toLowerCase().split(';');
 
             //парсим inp-файлы
             this.chunk = [];