Changeset 32565

Timestamp:

2018-11-02T20:51:09+13:00 (5 years ago)

Author:

ak19

Message:

I think this is a bugfix to plugin.pm::remove_some(): when processing files to delete on deletion/reindexing, it would return after the first successful remove_one(). This wasn't a noticeable problem in the past since no plugin had a real need for implementing remove_one(). But now GS SQLPlugin does remove_one() in earnest, we need all the docs marked for deletion to be processed.

Location:

main/trunk/greenstone2/perllib

Files:

• plugin.pm (modified) (2 diffs)
• plugins/GreenstoneSQLPlugin.pm (modified) (1 diff)

main/trunk/greenstone2/perllib/plugin.pm

@@ -255 +255 @@
     # use 'archiveinf-src' info database to look up all the OIDs
     # that this file is used in (note in most cases, it's just one OID)
+
+    my $processed_file = 0; # set to 1 if a plugin could process the file and did so successfully
     
     my $file_with_placeholders = &util::abspath_to_placeholders($file);
@@ -264 +266 @@
         $rv = $plugobj->remove_one($file, $oids, $archivedir);
         if (defined $rv && $rv != -1) {
-        return $rv;
+        #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;
-    }
-
-}
+    #return 0;
+    
+    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;
+    } # 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
+}
+
 sub file_block_read {
     my ($pluginfo, $base_dir, $file, $block_hash, $metadata, $gli) = @_;

main/trunk/greenstone2/perllib/plugins/GreenstoneSQLPlugin.pm

@@ -228 +228 @@
     my $gs_sql = $self->{'gs_sql'} || return 0; # couldn't make the connection or no db etc
     if(scalar @$oids > 1) {
-    print STDERR "TODO: We now have reason to optimise GreenstoneSQLPlugin::remove_one() by using prepare and execute.\n";
+    print STDERR "TODO: We now have reason to optimise GreenstoneSQLPlugin::remove_one() by using dbi::prepare() + dbi::execute() instead of dbi::do().\n";
     }