From ec6e396dfbcb68e53e315ec4a4c282eae514d5de Mon Sep 17 00:00:00 2001 From: natdeanlewissoftwire Date: Mon, 5 Jun 2023 16:38:21 +0100 Subject: [PATCH] feat: scrub before tr to fix invalid byte error --- app/services/bulk_upload/lettings/year2022/csv_parser.rb | 2 +- app/services/bulk_upload/lettings/year2023/csv_parser.rb | 2 +- app/services/bulk_upload/sales/year2022/csv_parser.rb | 2 +- app/services/bulk_upload/sales/year2023/csv_parser.rb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/services/bulk_upload/lettings/year2022/csv_parser.rb b/app/services/bulk_upload/lettings/year2022/csv_parser.rb index 34523b35d..f5bba15bf 100644 --- a/app/services/bulk_upload/lettings/year2022/csv_parser.rb +++ b/app/services/bulk_upload/lettings/year2022/csv_parser.rb @@ -92,8 +92,8 @@ private @normalised_string = File.read(path, encoding: "bom|utf-8") @normalised_string.gsub!("\r\n", "\n") - @normalised_string.gsub!("\r", "\n") @normalised_string.scrub!("") + @normalised_string.tr!("\r", "\n") @normalised_string end diff --git a/app/services/bulk_upload/lettings/year2023/csv_parser.rb b/app/services/bulk_upload/lettings/year2023/csv_parser.rb index 292505431..a51f215fb 100644 --- a/app/services/bulk_upload/lettings/year2023/csv_parser.rb +++ b/app/services/bulk_upload/lettings/year2023/csv_parser.rb @@ -97,8 +97,8 @@ private @normalised_string = File.read(path, encoding: "bom|utf-8") @normalised_string.gsub!("\r\n", "\n") - @normalised_string.gsub!("\r", "\n") @normalised_string.scrub!("") + @normalised_string.tr!("\r", "\n") @normalised_string end diff --git a/app/services/bulk_upload/sales/year2022/csv_parser.rb b/app/services/bulk_upload/sales/year2022/csv_parser.rb index df7a3f80b..4bae79d33 100644 --- a/app/services/bulk_upload/sales/year2022/csv_parser.rb +++ b/app/services/bulk_upload/sales/year2022/csv_parser.rb @@ -66,8 +66,8 @@ private @normalised_string = File.read(path, encoding: "bom|utf-8") @normalised_string.gsub!("\r\n", "\n") - @normalised_string.gsub!("\r", "\n") @normalised_string.scrub!("") + @normalised_string.tr!("\r", "\n") @normalised_string end diff --git a/app/services/bulk_upload/sales/year2023/csv_parser.rb b/app/services/bulk_upload/sales/year2023/csv_parser.rb index 02822daa7..80c8296ba 100644 --- a/app/services/bulk_upload/sales/year2023/csv_parser.rb +++ b/app/services/bulk_upload/sales/year2023/csv_parser.rb @@ -92,8 +92,8 @@ private @normalised_string = File.read(path, encoding: "bom|utf-8") @normalised_string.gsub!("\r\n", "\n") - @normalised_string.gsub!("\r", "\n") @normalised_string.scrub!("") + @normalised_string.tr("\r", "\n") @normalised_string end