From bbb1aa2397d9d1af4b1b1336652797ffdf4dc773 Mon Sep 17 00:00:00 2001 From: natdeanlewissoftwire Date: Mon, 5 Jun 2023 10:52:15 +0100 Subject: [PATCH] feat: add extra subs to row_parsers --- 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, 8 insertions(+) diff --git a/app/services/bulk_upload/lettings/year2022/csv_parser.rb b/app/services/bulk_upload/lettings/year2022/csv_parser.rb index 663964195..2ff3fa0db 100644 --- a/app/services/bulk_upload/lettings/year2022/csv_parser.rb +++ b/app/services/bulk_upload/lettings/year2022/csv_parser.rb @@ -92,6 +92,8 @@ private @normalised_string = File.read(path, encoding: "bom|utf-8") @normalised_string.gsub!("\r\n", "\n") + @normalised_string.gsub!("\r\r", "\n") + @normalised_string.tr!("\r", "\n") @normalised_string.scrub!("") @normalised_string diff --git a/app/services/bulk_upload/lettings/year2023/csv_parser.rb b/app/services/bulk_upload/lettings/year2023/csv_parser.rb index 632e18329..0538c994f 100644 --- a/app/services/bulk_upload/lettings/year2023/csv_parser.rb +++ b/app/services/bulk_upload/lettings/year2023/csv_parser.rb @@ -97,6 +97,8 @@ private @normalised_string = File.read(path, encoding: "bom|utf-8") @normalised_string.gsub!("\r\n", "\n") + @normalised_string.gsub!("\r\r", "\n") + @normalised_string.tr!("\r", "\n") @normalised_string.scrub!("") @normalised_string diff --git a/app/services/bulk_upload/sales/year2022/csv_parser.rb b/app/services/bulk_upload/sales/year2022/csv_parser.rb index 76604d5fe..d0b79b29b 100644 --- a/app/services/bulk_upload/sales/year2022/csv_parser.rb +++ b/app/services/bulk_upload/sales/year2022/csv_parser.rb @@ -66,6 +66,8 @@ private @normalised_string = File.read(path, encoding: "bom|utf-8") @normalised_string.gsub!("\r\n", "\n") + @normalised_string.gsub!("\r\r", "\n") + @normalised_string.tr!("\r", "\n") @normalised_string.scrub!("") @normalised_string diff --git a/app/services/bulk_upload/sales/year2023/csv_parser.rb b/app/services/bulk_upload/sales/year2023/csv_parser.rb index 6a1929b5c..23549e561 100644 --- a/app/services/bulk_upload/sales/year2023/csv_parser.rb +++ b/app/services/bulk_upload/sales/year2023/csv_parser.rb @@ -92,6 +92,8 @@ private @normalised_string = File.read(path, encoding: "bom|utf-8") @normalised_string.gsub!("\r\n", "\n") + @normalised_string.gsub!("\r\r", "\n") + @normalised_string.tr!("\r", "\n") @normalised_string.scrub!("") @normalised_string