From 109fb0559317d95121bbbd175eb3f262e7ca3755 Mon Sep 17 00:00:00 2001 From: "U-BASIS\\dsmyda" Date: Tue, 13 Aug 2019 12:44:30 -0400 Subject: [PATCH 1/2] Fixed the way CSV are split --- test/script/tskdbdiff.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test/script/tskdbdiff.py b/test/script/tskdbdiff.py index 54a7b624ae..1a9d6b4308 100644 --- a/test/script/tskdbdiff.py +++ b/test/script/tskdbdiff.py @@ -11,6 +11,7 @@ import sys import psycopg2 import psycopg2.extras import socket +import csv class TskDbDiff(object): """Compares two TSK/Autospy SQLite databases. @@ -436,8 +437,8 @@ def normalize_db_entry(line, files_table, vs_parts_table, vs_info_table, fs_info ig_groups_seen_index = line.find('INSERT INTO "image_gallery_groups_seen"') > -1 or line.find('INSERT INTO image_gallery_groups_seen ') > -1 parens = line[line.find('(') + 1 : line.rfind(')')] - fields_list = parens.replace(" ", "").split(',') - + fields_list = list(csv.reader([parens], quotechar="'"))[0] + # remove object ID if files_index: newLine = ('INSERT INTO "tsk_files" VALUES(' + ', '.join(fields_list[1:]) + ');') From 9029b0476a0f2f4b219a477102a4ecbb2f4a6f43 Mon Sep 17 00:00:00 2001 From: "U-BASIS\\dsmyda" Date: Tue, 13 Aug 2019 12:50:47 -0400 Subject: [PATCH 2/2] Added back in the replace statement --- test/script/tskdbdiff.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/script/tskdbdiff.py b/test/script/tskdbdiff.py index 1a9d6b4308..5b7cd62c10 100644 --- a/test/script/tskdbdiff.py +++ b/test/script/tskdbdiff.py @@ -437,7 +437,7 @@ def normalize_db_entry(line, files_table, vs_parts_table, vs_info_table, fs_info ig_groups_seen_index = line.find('INSERT INTO "image_gallery_groups_seen"') > -1 or line.find('INSERT INTO image_gallery_groups_seen ') > -1 parens = line[line.find('(') + 1 : line.rfind(')')] - fields_list = list(csv.reader([parens], quotechar="'"))[0] + fields_list = list(csv.reader([parens.replace(" ", "")], quotechar="'"))[0] # remove object ID if files_index: