From 5a6577486400e9fe70b604028703adf330f84bdf Mon Sep 17 00:00:00 2001
From: worksofliam <mrliamallan@live.co.uk>
Date: Fri, 19 Apr 2024 09:57:25 -0400
Subject: [PATCH] Additional changes to get correct amount of spaces

Signed-off-by: worksofliam <mrliamallan@live.co.uk>
---
 src/api/Tools.ts     | 11 ++++++++---
 src/testing/tools.ts | 35 ++++++++++++++++++++++++++++++++++-
 2 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/src/api/Tools.ts b/src/api/Tools.ts
index c1ea6a4dd..456cb78cf 100644
--- a/src/api/Tools.ts
+++ b/src/api/Tools.ts
@@ -105,11 +105,16 @@ export namespace Tools {
 
         headers.forEach(header => {
           const fromPos = header.from - slideBytesBy;
-          const strValue = line.substring(fromPos, fromPos + header.length).trimEnd();
+          let strValue = line.substring(fromPos, fromPos + header.length);
 
-          let realValue: string | number | null = strValue;
+          const extendedBytes = strValue.split(``).map(c => Buffer.byteLength(c) === 1 ? 0 : 1).reduce((a: number, b: number) => a + b, 0);
 
-          slideBytesBy += strValue.split(``).map(c => Buffer.byteLength(c) === 1 ? 0 : 1).reduce((a: number, b: number) => a + b, 0);
+          slideBytesBy += extendedBytes;
+          if (extendedBytes > 0) {
+            strValue = strValue.substring(0, strValue.length - extendedBytes);
+          }
+
+          let realValue: string | number | null = strValue.trimEnd();
 
           // is value a number?
           if (strValue.startsWith(` `)) {
diff --git a/src/testing/tools.ts b/src/testing/tools.ts
index 5cc2f3891..1d8155bf4 100644
--- a/src/testing/tools.ts
+++ b/src/testing/tools.ts
@@ -85,7 +85,7 @@ export const ToolsSuite: TestSuite = {
       }
     },
     {
-      name: `JP result set test`, test: async () => {
+      name: `JP result set test (A)`, test: async () => {
         const lines = [
           `DB2>`,
           `  ?>`,
@@ -117,6 +117,39 @@ export const ToolsSuite: TestSuite = {
         assert.strictEqual(rows[0].CREATED, 1712670631000);
         assert.strictEqual(rows[0].CHANGED, 1712683676000);
       }
+    },
+    {
+      name: `JP result set test (B)`, test: async () => {
+        const lines = [
+          `DB2>`,
+          `  ?>`,
+          `  ?>`,
+          `  ?>`,
+          `  ?>`,
+          ``,
+          ``,
+          `LIBRARY   RECORD_LENGTH        ASP    SOURCE_FILE  NAME       TYPE       TEXT                                                                                                                           LINES                CREATED              CHANGED`,
+          `--------- -------------------- ------ ------------ ---------- ---------- ------------------------------------------------------------------------------------------------------------------------------ -------------------- -------------------- --------------------`,
+          `SNDLIB                     112      0 QRPGLESRC    TESTEDTW   RPGLE      日付と時刻を先行０付きで表示-> 8桁では無理？                                                                                                  9        1713451802000        1713453741000`,
+          ``,
+          `  1 RECORD(S) SELECTED.`,
+        ];
+
+        const rows = Tools.db2Parse(lines.join(`\n`));
+
+        assert.strictEqual(rows.length, 1);
+
+        assert.strictEqual(rows[0].LIBRARY, `SNDLIB`);
+        assert.strictEqual(rows[0].RECORD_LENGTH, 112);
+        assert.strictEqual(rows[0].ASP, 0);
+        assert.strictEqual(rows[0].SOURCE_FILE, `QRPGLESRC`);
+        assert.strictEqual(rows[0].NAME, `TESTEDTW`);
+        assert.strictEqual(rows[0].TYPE, `RPGLE`);
+        assert.strictEqual(rows[0].TEXT, `日付と時刻を先行０付きで表示-> 8桁では無理？`);
+        assert.strictEqual(rows[0].LINES, 9);
+        assert.strictEqual(rows[0].CREATED, 1713451802000);
+        assert.strictEqual(rows[0].CHANGED, 1713453741000);
+      }
     }
   ]
 };