Changeset 32563 for main/trunk/greenstone2/perllib/plugouts

Timestamp:

2018-11-02T19:07:16+13:00 (5 years ago)

Author:

ak19

Message:

1. Overhaul of GreenstoneSQLPlugs to handle removeold and incremental delete correctly. And now code also automatically handles 'non-incremental delete' (see mention in ArchivesInfPlugin). The new version no longer does lazy loading for getting the sql db connection in the GS SQL Plugin, as now the connection needs to be active since the start of the plugin to run SQL delete statements on remove_old. So the db connection code for the GS SQL plugin has moved back into its init() method. Lots of changes to gssql.pm (and some flow on effects to the GS SQL Plugout) as when database tables exist and need to be created have changed. 2. Undoing most of the changes of changeset 32555 since we're doing incremental delete and removeold differently and in the correct way now when using the GreenstoneSQLPlugs.

Location:

main/trunk/greenstone2/perllib/plugouts

Files:

• BasePlugout.pm (modified) (1 diff)
• GreenstoneSQLPlugout.pm (modified) (5 diffs)

main/trunk/greenstone2/perllib/plugouts/BasePlugout.pm

@@ -347 +347 @@
 }
 
-# GreenstoneSQLPlugout needs to know whether we're doing removeold or not
-sub set_incremental_options {
-    my $self= shift (@_);
-    my ($removeold, $keepold, $incremental, $incremental_mode) = @_;
-    
-    $self->{'removeold'}        = $removeold;
-    $self->{'keepold'}          = $keepold;
-    $self->{'incremental'}      = $incremental;
-    $self->{'incremental_mode'} = $incremental_mode;
-}
 
 # OIDtype may be "hash" or "hash_on_full_filename" or "incremental" or "filename" or "dirname" or "full_filename" or "assigned"

main/trunk/greenstone2/perllib/plugouts/GreenstoneSQLPlugout.pm

@@ -53 +53 @@
 # It's fine: the die() stmts all take place before setting up the super class' begin
 
-# TODO Q: about build_mode: how to detect removeold
+# TODO Q: about build_mode: how to detect removeold. Now handled by 
+#   GreenstoneSQLPlugout::remove_all(), which is inherited from a base plugin.
 # TODO: deal with -removeold and everything? Or type out instructions for user
 
@@ -117 +118 @@
         return bless $self, $class;
     }
-    print STDERR "***** GreenstoneSQLPlugout process mode = \"", $self->{'process_mode'}, "\"\n";
+    #print STDERR "***** GreenstoneSQLPlugout process mode = \"", $self->{'process_mode'}, "\"\n";
     
     return bless $self, $class;
@@ -163 +164 @@
     
     my $db_name = $self->{'site_name'} || "greenstone2"; # one database per GS3 site, for GS2 the db is called greenstone2
-    my $build_mode = ($self->{'removeold'}) ? "removeold" : "incremental";
-    print STDERR "@@@@@@@@@@@@ remove_old: $build_mode\n";
-    
-    if(!$gs_sql->load_db_and_tables($db_name, $build_mode)) {
-    
+    my $proc_mode = $self->{'process_mode'};
+    
+
+    my $success = $gs_sql->use_db($db_name);
+    
+    if($success && $proc_mode ne "text_only") {
+    ##print STDERR "@@@@ Ensuring meta table exists\n";
+    $success = $gs_sql->ensure_meta_table_exists();
+    }    
+    if($success && $proc_mode ne "meta_only") {
+    ##print STDERR "@@@@ Ensuring fulltxt table exists\n";
+    $success = $gs_sql->ensure_fulltxt_table_exists();
+    }
+    #if(!$gs_sql->load_db_and_tables($db_name, $proc_mode)) {
+    if(!$success) { 
     # This is fatal for the plugout, let's terminate here after disconnecting again
     # PrintError would already have displayed the warning message on load fail
@@ -177 +188 @@
     # prepare the shared/common HANDLES to SQL insert statements that contain placeholders
     # and which we will reuse repeatedly when actually executing the insert statements
-    my $proc_mode = $self->{'process_mode'};
+    
     if($proc_mode eq "all" || $proc_mode eq "meta_only" ) {
     $self->{'metadata_prepared_insert_statement_handle'} = $gs_sql->prepare_insert_metadata_row_stmthandle();
@@ -188 +199 @@
     $self->{'gs_sql'} = $gs_sql;
     
-    print STDERR "#### Meta stmt: " . $self->{'metadata_prepared_insert_statement_handle'}->{'Statement'} . "\n";
-    print STDERR "#### Full stmt: " . $self->{'fulltxt_prepared_insert_statement_handle'}->{'Statement'} . "\n";
+    ##print STDERR "#### Meta stmt: " . $self->{'metadata_prepared_insert_statement_handle'}->{'Statement'} . "\n";
+    ##print STDERR "#### Full stmt: " . $self->{'fulltxt_prepared_insert_statement_handle'}->{'Statement'} . "\n";
     
     # if setting up to work with sql db failed, we'd have terminated and wouldn't come up to here: