Changeset 32563 for main/trunk/greenstone2/perllib/gssql.pm

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.

File:

• main/trunk/greenstone2/perllib/gssql.pm (modified) (6 diffs)

main/trunk/greenstone2/perllib/gssql.pm

@@ -44 +44 @@
 
 # Parameterise (one or more methods may use them):
-# - build_mode (like removeold)
 # - db_name (which is the GS3 sitename)
 
@@ -134 +133 @@
     print STDERR "Away to make connection to $db_driver database with:\n";
     print STDERR " - hostname $db_host; username: $db_user";
-    print STDERR "; and the password provided" if $db_pwd;
+    print STDERR "; and the provided password" if $db_pwd;
     print STDERR "\nAssuming the mysql server has been started with: --character_set_server=utf8mb4\n" if $db_driver eq "mysql";
     }
@@ -188 +187 @@
 }
 
-# will attempt to load the specified db and the <coll>_metadata and <coll>_fulltxt for this
-# collection, or create any of these (db, tables) that don't yet exist. At the end
-# it will have loaded the requested database (in MySQL: "use <db>;")
-sub load_db_and_tables {
-    my $self= shift (@_);
-    my ($db_name, $build_mode) = @_;
+# Load the designated database, i.e. 'use <dbname>;'.
+# If the database doesn't yet exist, creates it and loads it.
+# (Don't create the collection's tables yet, though)
+# At the end it will have loaded the requested database (in MySQL: "use <db>;") on success.
+# As usual, returns success or failure value that can be evaluated in a boolean context.
+sub use_db {
+    my $self= shift (@_);
+    my ($db_name) = @_;
     my $dbh = $self->{'db_handle'};
     $db_name = $self->sanitize_name($db_name);
@@ -215 +216 @@
     # once more attempt to use db, now that it exists
     $dbh->do("use $db_name") || return 0;
-    #$dbh->do("use localsite") or die "Error (code" . $dbh->err ."): " . $dbh->errstr . "\n";
-
-    # attempt to create tables in current db
-    $self->create_metadata_table() || return 0;
-    $self->create_fulltext_table() || return 0; 
+    #$dbh->do("use $db_name") or die "Error (code" . $dbh->err ."): " . $dbh->errstr . "\n";
 
     $success = 1;
@@ -227 +224 @@
 
     print STDERR "@@@ DATABASE $db_name EXISTED\n" if($self->{'verbosity'} > 2);
-    
-
-    # build_mode can be removeold or incremental. We only do something special on removeold:
-    # deleting the existing tables for this collection and recreating empty ones
-    if($build_mode eq "removeold") {
-        print STDERR "   Building with removeold option set, so deleting current collection's tables if they exist\n" if($self->{'verbosity'});
-        $self->delete_collection_tables();
-    }
-
-    # use existing tables if any
-    # attempt to create tables in current db    
-    if($build_mode eq "removeold" || !$self->table_exists($self->get_metadata_table_name())) {
-        $self->create_metadata_table() || return 0;
-    } else {
-        print STDERR "@@@ Meta table exists\n" if($self->{'verbosity'} > 2);
-    }
-    if($build_mode eq "removeold" || !$self->table_exists($self->get_fulltext_table_name())) {
-        $self->create_fulltext_table() || return 0;
-    } else {
-        print STDERR "@@@ Fulltxt table exists\n" if($self->{'verbosity'} > 2);
-    }
-    
     }
     
@@ -254 +229 @@
 }
 
-# GreenstoneSQLPlugin calls this method to load an existing db.
-# This will terminate if the db does not exist. Unlike load_db_and_tables() above, used by
-# GreenstoneSQLPlugout, this method will not attempt to create the requested db (nor its tables)
-# TODO: GS SQLPlugin is called before GS SQLPlugout and attempts to use_db() - called in plugin's
-# init() method. This will fail if the db does not exist. Ideally want the gssqlplugin only called
-# during buildcol.pl
-sub use_db {
-    my $self= shift (@_);
-    my ($db_name) = @_;
-    my $dbh = $self->{'db_handle'};
-    $db_name = $self->sanitize_name($db_name);
-
-    
-    print STDERR "Loading database $db_name\n" if($self->{'verbosity'} > 1);
-    
-    # perl DBI switch database: https://www.perlmonks.org/?node_id=995434
-    # do() returns undef on error.
-    # connection succeeded, try to load our database. If that didn't work, attempt to create db
-    return $dbh->do("use $db_name") || warn();
+# We should already have done "use <database>;" if this gets called.
+# Just load this collection's metatable
+sub ensure_meta_table_exists {
+    my $self = shift (@_);
+    
+    my $tablename = $self->get_metadata_table_name();
+    if(!$self->table_exists($tablename)) {
+    #print STDERR "   Creating metadata table $tablename\n" if($self->{'verbosity'} > 1);
+    $self->create_metadata_table() || return 0;
+    } else {
+    print STDERR "@@@ Meta table exists\n" if($self->{'verbosity'} > 2);
+    }
+    return 1;
+}
+
+# We should already have done "use <database>;" if this gets called.
+# Just load this collection's metatable
+sub ensure_fulltxt_table_exists {
+    my $self = shift (@_);
+    
+    my $tablename = $self->get_fulltext_table_name();    
+    if(!$self->table_exists($tablename)) {
+    #print STDERR "   Creating fulltxt table $tablename\n" if($self->{'verbosity'} > 1);
+    $self->create_fulltext_table() || return 0;
+    } else {
+    print STDERR "@@@ Fulltxt table exists\n" if($self->{'verbosity'} > 2);
+    }
+    return 1;
 }