Changeset 28086 for other-projects/nightly-tasks/diffcol/trunk/diffcol/gdbdiff.pm

Timestamp:

2013-08-19T20:42:40+12:00 (11 years ago)

Author:

ak19

Message:

Bringing windows diffcol up to date for the latest tutorials. A new field whose value can be slightly different. Need to test for windows gdb differently when the input collection is OAI. Backslashes in docmets need to be normalised.

File:

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

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

@@ -66 +66 @@
     # The total_numbytes field can vary depending on how many backslashes exist in the urls in the main body text, as each
     # of these windows slashes get escaped with another backslash, and the resulting string is used as key into rel link db
-    my $ignore_line_re = "\n<(FileSize|lastmodified|lastmodifieddate|oailastmodified|oailastmodifieddate|ex.File.FileModifyDate|ex.File.FilePermissions|total_numbytes)>([^\n])*";
+    my $ignore_line_re = "\n<(FileSize|lastmodified|lastmodifieddate|oailastmodified|oailastmodifieddate|ex.File.FileModifyDate|ex.File.FilePermissions|total_numbytes|ex.Composite.LightValue)>([^\n])*";
     $model_text =~ s/$ignore_line_re//g;
     $test_text =~ s/$ignore_line_re//g;
@@ -81 +81 @@
     my $modelIsWin = &isDBWindowsSensitive($dbname, $model_text);
     
-    if($testIsWin == $modelIsWin) { # both linux or both windows, do the basic test we did on linux machines:
+    if($testIsWin == $modelIsWin) {     
+    # both linux or both windows, do the basic test we did on linux machines:
             # ignore absolute path prefixes in modelcol and testcol (necessary for archiveinf-doc and -src.gdb files)
 
@@ -120 +121 @@
                 
                 # assoc-file and meta-file contain filepaths, ensure these are long windows file paths now (will later convert to linux slashes)    
-                if($line =~ m@^<(assoc-file|meta-file)>(.*)(\s+)@s) { 
+                if($line =~ m@^<(assoc-file|meta-file)>(.*)(\s+)@s) {
                     $line = $2; # may be a short file name
                     # perhaps test here if it is a shortfilename? should match /CAPS....~number(.ext)/
@@ -135 +136 @@
         if($dbname =~ m/$strColName/) {
             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
-            
+            for my $line (split /^/, $$win_text) { # split the string into newlines         
+
                 # 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, 
@@ -143 +144 @@
                 # 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) {                 
+                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;
@@ -282 +283 @@
             return 1;
         }
+        elsif ($db_contents =~ m@^(<ex.File.Directory>[a-zA-Z]:\\\\)@m) { # <ex.File.Directory>C:\\path\\path for OAI collection
+            return 1;
+        }
         return 0;       
     }