Changeset 28603 for main/trunk/greenstone2/perllib/plugins/ISISPlugin.pm

Timestamp:

2013-11-05T17:40:23+13:00 (10 years ago)

Author:

ak19

Message:

Found some issues when wanting to add in the CDS-ISIS tutorial collection into the model-collections now that 64 bit linux can handled ISIS collections. Windows carriage return linefeed needs to be processed the same way as linux linefeed, else on Windows the ISIS file will not get parsed the same way and also result in extra newline characters, which shows up when doing diffcol.

File:

• main/trunk/greenstone2/perllib/plugins/ISISPlugin.pm (modified) (1 diff)

main/trunk/greenstone2/perllib/plugins/ISISPlugin.pm

@@ -217 +217 @@
 
     # Remove the line at the start, and any blank lines, so the data is split and processed properly
-    $$textref =~ s/^----------\n//;
-    $$textref =~ s/\n\n/\n/g;
+    $$textref =~ s/^----------\r?\n//;
+    $$textref =~ s/(\r|\n)\n/\n/g;
 }