Changeset 32566

Timestamp:

2018-11-02T21:06:21+13:00 (5 years ago)

Author:

ak19

Message:

In some ways, it may be better if plugin.pm::remove_some() didn't return after the first failure, since the return value is never checked or acted upon, but continues attempting to process the remainder of its list of files to be deleted/reindexed.

File:

• main/trunk/greenstone2/perllib/plugin.pm (modified) (2 diffs)

main/trunk/greenstone2/perllib/plugin.pm

@@ -252 +252 @@
     my $arcinfo_src_filename = &dbutil::get_infodb_file_path($infodbtype, "archiveinf-src", $archivedir);
 
+    my $all_files_processed_successfully = 1;
+    
     foreach my $file (@$deleted_files) {
     # use 'archiveinf-src' info database to look up all the OIDs
@@ -275 +277 @@
     if (!$processed_file) { # no plugin could recognise file. 
         # Should we continue processing other deleted files or not?
-        print STDERR "WARNING: plugin::remove_some() failed to process $file with oid(s) ". join(",", $oids) . "\n";
-        return 0;
+        print STDERR "WARNING: plugin::remove_some() failed to process $file with oid(s) ". join(",", @$oids) . "\n";
+        #return 0;
+        $all_files_processed_successfully = $processed_file && $all_files_processed_successfully;       
     } # else some plugin processed the current deleted file
       # continue to process next deleted file
     
     }
-    return 1; # if we got here, all deleted files got processed successfully
+    return $all_files_processed_successfully; # callers don't seem to do anything with return val
 }