Changeset 42447 for trunk/tools/eam/rawfix.20230221/src/check_md5s_dateobs.pl

Timestamp:

Apr 11, 2023, 11:00:58 AM (3 years ago)

Author:

eugene

Message:

fix little issues

File:

• trunk/tools/eam/rawfix.20230221/src/check_md5s_dateobs.pl (modified) (3 diffs)

trunk/tools/eam/rawfix.20230221/src/check_md5s_dateobs.pl

@@ -59 +59 @@
 
     # if these do not match, complain and move on
+    # we are allowed to have more MD5s than instances: some instances
+    # may have been culled during this process (but the MD5s stay behind)
     my $N1 = @md5data;
     my $N2 = @instdata;
-    if ($N1 != $N2) {
-        print STDOUT "inconsistent number of lines in $md5match : $N1 vs $N2\n";
+    if ($N1 < $N2) {
+        print STDOUT "not enough MD5s $md5match : $N1 vs $N2\n";
         $Nfail ++;
         next;
     }
 
+    # set up an empty hash for the instance names:
+    my %instfound = ();
+    foreach my $line (@instdata) {
+        chomp $line;
+        my @words = split (/\s+/,$line);
+        my $inst   = $words[0];
+        $instfound{$inst} = 0;
+    }
+
     # check for mismatched MD5sums
+    # we are not checking that all instances in the inst file are in the MD5 file
     foreach my $line (@md5data) {
 
@@ -80 +92 @@
         my $md5tru = $words[2];
         my $md5obs = $words[3];
+
+        unless (defined $instfound{$inst}) { print "skip md5 for removed instance $inst\n"; next; }
+        $instfound{$inst} = 1;
 
         if ($md5tru ne $md5obs) {
@@ -88 +103 @@
             if ($DEBUG > 2) { print STDOUT "$inst $state $md5tru = $md5obs\n"; }
         }
+    }
+
+    my @instfoundKEYS = keys %instfound;
+    foreach my $inst (@instfoundKEYS) {
+        unless ($instfound{$inst}) { die "missing MD5 for instance $inst\n"; }
     }
 }