Changeset 32572

Timestamp:

2018-11-05T19:06:16+13:00 (5 years ago)

Author:

ak19

Message:

Dr Bainbridge simplified my boolean expression when he checked my recent bugfix in plugin::remove_some() for correctness.

File:

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

main/trunk/greenstone2/perllib/plugin.pm

@@ -268 +268 @@
         $rv = $plugobj->remove_one($file, $oids, $archivedir);
         if (defined $rv && $rv != -1) {
-        #return $rv;
         $processed_file = 1;
         last; # break and continue with outer for loop, to process other deleted files
         } # else undefined (was not recognised by the plugin) or there was an error, try the next one
     }
-    #return 0;
     
     if (!$processed_file) { # no plugin could recognise file. 
@@ -279 +277 @@
         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;       
+        $all_files_processed_successfully = 0;
     } # else some plugin processed the current deleted file
       # continue to process next deleted file