Changeset 34417

Timestamp:

2020-09-28T18:23:19+13:00 (4 years ago)

Author:

ak19

Message:

Updates to diffcol to handle change introduced in commit 34394, which brought in new meta gsdlfullsourcepath. METS model coll was still failing after rebuild until update to diffcol.pl (this commit) that now handles docMETS.xml files to support the new meta field. The new meta field is converted to a relative path, relative to collect, so that modelcollect and test collect can be properly compared, as with doc.xml files. Hopefully this change will work on windows and mac too, but at least diffcol finally succeeded on linux again. Can't make out why the diffcol report is not being uploaded to nzdl, however. Maybe I wasn't logged in as the correct user. But it didn't complain about not being able to upload the report to wwwinternal.

File:

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

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

@@ -708 +708 @@
                 $$lin_contents =~ s@href=http:///@href=http://@g;               
             }   
+        }           
+            
+        # remove all absolute paths upto collect folder from <Metadata /> elements
+        if($strModel =~ m/docmets\.xml$/) {
+            $model_contents =~ s@(<gsdl3:Metadata name=\"gsdlfullsourcepath\">).*($strColName)@$1$2@g;
+            $test_contents  =~ s@(<gsdl3:Metadata name=\"gsdlfullsourcepath\">).*($strColName)@$1$2@g;
         }
         
@@ -719 +725 @@
             # remove all absolute paths upto collect folder from <Metadata /> elements
             $model_contents =~ s@(<Metadata name=\"[^\"]*\">(http:\/\/)?).*(collect[\\\/]$strColName)@$1$3@g;
-            $test_contents =~ s@(<Metadata name=\"[^\"]*\">(http:\/\/)?).*(collect[\\\/]$strColName)@$1$3@g;        
+            $test_contents =~ s@(<Metadata name=\"[^\"]*\">(http:\/\/)?).*(collect[\\\/]$strColName)@$1$3@g;
             
             # The following block of code is necessary to deal with tmp (html) source files generated when using PDFBox