Changeset 34954

Timestamp:

2021-03-02T15:17:20+13:00 (3 years ago)

Author:

anupama

Message:

The newer EXIF that was committed introduced some additional timestamped fields that need to be ignored by diffcol.

Location:

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

Files:

• diffcol.pl (modified) (1 diff)
• gdbdiff.pm (modified) (1 diff)

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

@@ -641 +641 @@
     {
         # allow for a namespace prefix to <Metadata> as happens in GreenstoneMETS docmets.xml files, e.g. <gsdl3:Metadata></gsdl3:Metadata>
-        my $ignore_line_re = "<(.*?:)?Metadata name=\"(lastmodified|lastmodifieddate|oailastmodified|oailastmodifieddate|ex.File.FileModifyDate|ex.File.FilePermissions|ImageSize|FileSize|ex.Composite.LightValue)\">.*</(.*?:)?Metadata>\\s*\\n*";
+        my $ignore_line_re = "<(.*?:)?Metadata name=\"(lastmodified|lastmodifieddate|oailastmodified|oailastmodifieddate|ex.File.FileModifyDate|ex.File.FilePermissions|ex.File.FileAccessDate|ex.File.FileInodeChangeDate|ImageSize|FileSize|ex.Composite.LightValue)\">.*</(.*?:)?Metadata>\\s*\\n*";
         
         my $strResult;

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

@@ -90 +90 @@
     # 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|ex.Composite.LightValue)>([^\n])*";
+    my $ignore_line_re = "\n<(FileSize|lastmodified|lastmodifieddate|oailastmodified|oailastmodifieddate|ex.File.FileModifyDate|ex.File.FilePermissions|ex.File.FileAccessDate|ex.File.FileInodeChangeDate|total_numbytes|ex.Composite.LightValue)>([^\n])*";
     $model_text =~ s/$ignore_line_re//g;
     $test_text =~ s/$ignore_line_re//g;