Changeset 28005 for other-projects/nightly-tasks/diffcol/trunk/diffcol

Timestamp:

2013-08-08T16:20:31+12:00 (11 years ago)

Author:

ak19

Message:

1. task.pl summarise cmd now prints out whether the diffcol result is success or failure (previously it would only do this on the upload cmd) 2. Another gdb field had double windows backslashes that got turned into double forward slashes for the MARC-Exploded collection, which need to be single forward slashes when normalising for comparing with the linux version of the gdb file contents.

File:

• other-projects/nightly-tasks/diffcol/trunk/diffcol/gdbdiff.pm (modified) (2 diffs)

other-projects/nightly-tasks/diffcol/trunk/diffcol/gdbdiff.pm

@@ -60 +60 @@
 
 #   my $savepath = &getcwd."/../"; # TASK_HOME env var does not exist at this stage, but it's one level up from current directory
-#   print_string_to_file($test_text, $savepath.$dbname."_test.out");    
-#   print_string_to_file($model_text, $savepath.$dbname."_model.out");
+#   print_string_to_file($test_text, $savepath.$dbname."_test.out1");   
+#   print_string_to_file($model_text, $savepath.$dbname."_model.out1");
 
     # filter out the fields that can be ignored in the two database files
@@ -136 +136 @@
             my $tmp = ""; # rebuild windows file's set of lines after processing them one by one
             for my $line (split /^/, $$win_text) { # split the string into newlines
-                
-                if($line =~ m@^<ex.File.Directory>(.*)@s) { # word-pdf collection contains double windows backslashes
-                    (my $escaped_path = $1) =~ s@\\\\@\\@g;             
-                    $line = "<ex.File.Directory>$escaped_path";
+            
+                # In the following regex, add any .gdb fieldnames that represent a path and so would contain double backslashes 
+                # on Windows (to escape the single backlash of win filepaths). They will be turned into single-backslashes here, 
+                # and converted into single forward slashes futher below when the txt version of the win gdb file is normalised 
+                # to compare it with the linux version. 
+                # E.g. On windows, the Word-PDF collection(s) contains double backslashes in the ex.File.Directory field
+                # the MARC-Exploded collection contains double backslashes in the null_file entry field of the .gdb file                
+                if($line =~ m@^<(ex.File.Directory|null_file)>(.*)@s) {
+                    my ($fieldname, $escaped_path) = ($1, $2);
+                    $escaped_path =~ s@\\\\@\\@g; #(my $escaped_path = $2) =~ s@\\\\@\\@g;
+                    $line = "<$fieldname>$escaped_path";
                 } 
                 elsif($line =~ m@^<Title>(.*)@s) {