Changeset 28603

Show
Ignore:
Timestamp:
05.11.2013 17:40:23 (6 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.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/perllib/plugins/ISISPlugin.pm

    r28563 r28603  
    217217 
    218218    # Remove the line at the start, and any blank lines, so the data is split and processed properly 
    219     $$textref =~ s/^----------\n//; 
    220     $$textref =~ s/\n\n/\n/g; 
     219    $$textref =~ s/^----------\r?\n//; 
     220    $$textref =~ s/(\r|\n)\n/\n/g; 
    221221} 
    222222