From f43b786f3116fda8e8c731c00facd2ffe6d3bf4a Mon Sep 17 00:00:00 2001 From: HF Date: Tue, 2 Aug 2022 22:38:14 +0200 Subject: [PATCH] fix parsing of pixellog --- src/core/parsePixelLog.js | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/src/core/parsePixelLog.js b/src/core/parsePixelLog.js index e0d118c..0e35da6 100644 --- a/src/core/parsePixelLog.js +++ b/src/core/parsePixelLog.js @@ -131,21 +131,22 @@ export async function getSummaryFromArea( const ipInfo = ip2Info.get(ip); if (!ipInfo) { row.push('N/A', 'xx', 'N/A', 'N/A', 'N/A'); - } - let { pcheck } = ipInfo; - if (pcheck) { - const seperator = pcheck.indexOf(','); - if (seperator !== -1) { - pcheck = pcheck.slice(0, seperator); + } else { + let { pcheck } = ipInfo; + if (pcheck) { + const seperator = pcheck.indexOf(','); + if (seperator !== -1) { + pcheck = pcheck.slice(0, seperator); + } } + row.push( + ipInfo.uuid || 'N/A', + ipInfo.country || 'xx', + ipInfo.cidr || 'N/A', + ipInfo.org || 'N/A', + pcheck || 'N/A', + ); } - row.push( - ipInfo.uuid || 'N/A', - ipInfo.country || 'xx', - ipInfo.cidr || 'N/A', - ipInfo.org || 'N/A', - pcheck || 'N/A', - ); } if (printUsers) { const userMd = (uid && uid2Name.has(uid))