Changeset 21314 for main/trunk/greenstone2

Timestamp:

2009-12-09T15:32:17+13:00 (14 years ago)

Author:

kjdon

Message:

check return values for remove_one, and stop the pipeline once found something positive

File:

• main/trunk/greenstone2/perllib/plugin.pm (modified) (1 diff)

main/trunk/greenstone2/perllib/plugin.pm

@@ -233 +233 @@
     my $src_rec = GDBMUtils::gdbmRecordToHash($arcinfo_src_filename,$file);
     my $oids = $src_rec->{'oid'};
-    map {$_->remove_one($file, $oids); } @$pluginfo;
+    my $rv;
+    foreach my $plugobj (@$pluginfo) {
+
+        $rv = $plugobj->remove_one($file, $oids, $archivedir);
+        if (defined $rv && $rv != -1) {
+        return $rv;
+        } # else undefined (was not recognised by the plugin) or there was an error, try the next one
+    }
+    return 0;
     }