Changeset 13318

Timestamp:

2006-11-24T09:47:44+13:00 (17 years ago)

Author:

mdewsnip

Message:

Now removes all whitespace from the empty line between the chunks.

File:

• trunk/gsdl/bin/script/gti-process-spreadsheet.pl (modified) (2 diffs)

trunk/gsdl/bin/script/gti-process-spreadsheet.pl

@@ -60 +60 @@
     $excel_txt_file_data =~ s/\r//g;
 
-    # Make sure the first line is where we want it, and remove all stray tabs
+    # Make sure the first line is where we want it, and remove all stray whitespace
     $excel_txt_file_data =~ s/^(\n)*/\n\n/;
-    $excel_txt_file_data =~ s/\n\t\n/\n\n/g;
+    $excel_txt_file_data =~ s/\n(\s*)\n/\n\n/g;
 
     # Split into chunks
@@ -72 +72 @@
     my $total_number_of_chunks = ($excel_txt_file_data =~ s/source::/source::/g);
     if (scalar(@chunks) != $total_number_of_chunks) {
-    die "Error: Expected $total_number_of_chunks chunks but only have " . scalar(@chunks) . " from splitting.";
+    die "Error: Expected $total_number_of_chunks chunks but only have " . scalar(@chunks) . " from splitting";
     }