Changeset 28008

Timestamp:

2013-08-08T19:57:58+12:00 (11 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

File:

• other-projects/nightly-tasks/diffcol/trunk/diffcol/diffcol.pl (modified) (1 diff)

other-projects/nightly-tasks/diffcol/trunk/diffcol/diffcol.pl

@@ -670 +670 @@
                 # containing solitary carriage returns instead of linefeed
                 $$lin_contents =~ s@[\r]@@g; #$$lin_contents =~ s@[\r][^\n]@@g;
+                
+                
+                # make all single back slash in the linux file into / slash, if when \ was used as a linux escape char in a path
+                # since we've converted *all* single backslashes in the windows doc.xml to / (whether it was meant as a windows path slash or not).
+                # 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
+                $$lin_contents =~ s@([^\\])\\([^\\])@$1\/$2@g;
             }