Changeset 28008

Show
Ignore:
Timestamp:
08.08.2013 19:57:58 (6 years ago)
Author:
ak19
Message:

Updates to diffcol's doc.xml processing necessary for diffcol to behave correctly on the Paged image collections, in particular the Scanned-Img-Advanced collection, where the doc.xml produced in the linux-generated model coll had a backslash, whereas the windows version gets all backslashes without exception replaced with forward slashes when doing diffcol

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • other-projects/nightly-tasks/diffcol/trunk/diffcol/diffcol.pl

    r27990 r28008  
    670670                # containing solitary carriage returns instead of linefeed 
    671671                $$lin_contents =~ s@[\r]@@g; #$$lin_contents =~ s@[\r][^\n]@@g; 
     672                 
     673                 
     674                # make all single back slash in the linux file into / slash, if when \ was used as a linux escape char in a path 
     675                # since we've converted *all* single backslashes in the windows doc.xml to / (whether it was meant as a windows path slash or not). 
     676                # Doing so is okay, since we're not modifying the doc.xml in the model or test collections, just normalising them in-memory for comparison 
     677                $$lin_contents =~ s@([^\\])\\([^\\])@$1\/$2@g; 
    672678            } 
    673679