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

Timestamp:

2013-09-06T22:03:08+12:00 (11 years ago)

Author:

ak19

Message:

Modifications to handle placeholders for Greenstone standard path prefixes when the suffix of such a path is of the form of a Windows shortfilename. This occurs in archiveinf-doc.gdb on Windows, and possibly archiveinf-src.gdb too. Need to first reconstruct the full path locally (without placeholder), then convert it to a windows long filename, then stick the placeholder back into its place and do the diff between the test and model databases.

Location:

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

Files:

• diffcol.pl (modified) (5 diffs)
• gdbdiff.pm (modified) (4 diffs)

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

@@ -293 +293 @@
     my $strModelGdb =  &FileUtils::filenameConcatenate($strModelCol,"index","text","$strColName.gdb");
     my $strTestGdb =  &FileUtils::filenameConcatenate($strTestCol,"index","text","$strColName.gdb");    
-    my $strGdbError = &GdbDiff($strModelGdb,$strTestGdb,$strOutputFormat,$intLevel,$strColName); # returns 0 if no error
+    my $strGdbError = &GdbDiff($strModelGdb,$strTestGdb,$strOutputFormat,$intLevel,$strColName,$strTestCol,$strModelCol); # returns 0 if no error
     if($strGdbError) {
         push(@Errors,$strGdbError);
@@ -301 +301 @@
     $strModelGdb =  &FileUtils::filenameConcatenate($strModelCol,"archives","archiveinf-doc.gdb");
     $strTestGdb =  &FileUtils::filenameConcatenate($strTestCol,"archives","archiveinf-doc.gdb");    
-    $strGdbError = &GdbDiff($strModelGdb,$strTestGdb,$strOutputFormat,$intLevel,$strColName);
+    $strGdbError = &GdbDiff($strModelGdb,$strTestGdb,$strOutputFormat,$intLevel,$strColName,$strTestCol,$strModelCol);
     if($strGdbError) {
         push(@Errors,$strGdbError);
@@ -308 +308 @@
     $strModelGdb =  &FileUtils::filenameConcatenate($strModelCol,"archives","archiveinf-src.gdb");
         $strTestGdb =  &FileUtils::filenameConcatenate($strTestCol,"archives","archiveinf-src.gdb");
-        $strGdbError = &GdbDiff($strModelGdb,$strTestGdb,$strOutputFormat,$intLevel,$strColName);
+        $strGdbError = &GdbDiff($strModelGdb,$strTestGdb,$strOutputFormat,$intLevel,$strColName,$strTestCol,$strModelCol);
         if($strGdbError) {
             push(@Errors,$strGdbError);
@@ -322 +322 @@
 sub GdbDiff
 {
-    my ($strModelGdb,$strTestGdb,$strOutputFormat,$intLevel,$strColName) = @_;
+    my ($strModelGdb,$strTestGdb,$strOutputFormat,$intLevel,$strColName,$strTestCol,$strModelCol) = @_;
 
     my $strGdbError = 0;
@@ -329 +329 @@
     {
     #my $strGdbError = gdbdiff::test_gdb($strModelGdb, $strTestGdb);
-    $strGdbError = gdbdiff::test_gdb($strModelGdb, $strTestGdb, $strColName,$gv_test_os, $gv_model_os);
+    $strGdbError = gdbdiff::test_gdb($strModelGdb, $strTestGdb, $strColName,$gv_test_os, $gv_model_os,$strTestCol,$strModelCol);
     if($strGdbError ne "")
     {

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

@@ -46 +46 @@
 sub test_gdb
 {
-    my ($full_modeldb, $full_testdb, $strColName, $test_os, $model_os) = @_;
+    my ($full_modeldb, $full_testdb, $strColName, $test_os, $model_os, $strTestCol, $strModelCol) = @_;
 
    # print "Now is testing database\n";
@@ -105 +105 @@
     
         my ($win_text, $lin_text); # references
+        my $collection_path = $strTestCol; # full path to a windows collection
+        
         if($testIsWin) {
+            $collection_path = $strTestCol; # test collection path is windows 
             $win_text = \$test_text;
             $lin_text = \$model_text;
         } else {
+            $collection_path = $strModelCol; # model collection path is windows
             $win_text = \$model_text;
             $lin_text = \$test_text;
@@ -114 +118 @@
         
         if($dbname =~ m/archiveinf-doc/) {
+            
+            (my $collection_path_re = $collection_path) =~ s@\\@\\\\@g;
+            
             my $tmp = ""; # rebuild windows file's set of lines after processing them one by one
     
@@ -122 +129 @@
                 # 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|src-file)>(.*)(\s+)@s) {
+                    my ($field, $value, $suffix) = ($1, $2, $3);
+                    $line = $value; # it may be a short file name   
                     
-                    if($2 !~ m/^\@/) { # if the path doesn't use a "relative" @GSPATH@ placeholder string, but is an absolute path instead
-                        $line = $2; # it may be a short file name
-                        # perhaps test here if it is a shortfilename? should match /CAPS....~number(.ext)/
-                        
-                        $line = "<$1>".&Win32::GetLongPathName($line)."$3"; # make it a long file name and prefix assoc-file/meta-file tagname to it again                  
+                    if($line !~ m/^\@/) { # if the path doesn't use a "relative" @GSPATH@ placeholder string, but is an absolute path instead                       
+                        # perhaps test here if it is a shortfilename? should match /CAPS....~number(.ext)/                      
+                        $line = "<$field>".&Win32::GetLongPathName($line)."$suffix"; # make it a long file name and prefix assoc-file/meta-file tagname to it again                 
+                    } 
+                    else { # if $line contains @THISCOLLECTIONPATH@, still need to deal with DOS filenames suffixes: 
+                        # replace placeholder with absolute path and expand to long filename, then insert placeholder in its original place again                       
+                        $line =~ s/\@THISCOLLECTPATH\@/$collection_path/;
+                        $line = &Win32::GetLongPathName($line);
+                        $line =~ s/^$collection_path_re/\@THISCOLLECTPATH\@/;
+                        $line = "<$field>".$line."$suffix";
                     }
                 }