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

Timestamp:

2018-10-31T18:58:56+13:00 (5 years ago)

Author:

ak19

Message:

Breadcrumbs on connection and some further helpful messages.

File:

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

main/trunk/greenstone2/perllib/gssql.pm

@@ -125 +125 @@
     # on the local machine via TCP, you must specify the loopback IP address (127.0.0.1) as the host."
     #my $connect_str = "dbi:$db_driver:database=$db_name;host=$db_host";
-    my $connect_str = "dbi:$db_driver:host=$db_host"; # don't provide db - allows checking the db exists
+    my $connect_str = "dbi:$db_driver:host=$db_host"; # don't provide db - allows checking the db exists later when loading the db
+
+    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 "Assuming the mysql server has been started with --character_set_server=utf8mb4" if $db_driver eq "mysql";
+    
     my $dbh = DBI->connect("$connect_str", $db_user, $db_pwd,
                {
@@ -184 +190 @@
     my $dbh = $self->{'db_handle'};
     
+    print STDERR "Attempting to use database $db_name\n";
+    
     # perl DBI switch database: https://www.perlmonks.org/?node_id=995434
     # do() returns undef on error.
@@ -190 +198 @@
     
     if(!$success && $dbh->err == 1049) { # "Unknown database" error has code 1049 (mysql only?) meaning db doesn't exist yet
+
+    print STDERR "Database $db_name didn't exist, creating it and tables for the current collection...\n";
+    
     # attempt to create the db and its tables
     $self->create_db($db_name) || return 0;
 
-    print STDERR "@@@ CREATED DATABASE $db_name\n";
+    print STDERR "   Created database $db_name\n";
     
     # once more attempt to use db, now that it exists
@@ -214 +225 @@
     # 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";
         $self->delete_collection_tables();
     }
@@ -245 +257 @@
     my ($db_name) = @_;
     my $dbh = $self->{'db_handle'};
+
+    print STDERR "Loading database $db_name\n";
     
     # perl DBI switch database: https://www.perlmonks.org/?node_id=995434
@@ -266 +280 @@
     #$meta_sth->finish() if($meta_sth);
     #$txt_sth->finish() if($txt_sth);
+
+    print STDERR "Disconnecting from database\n";
     
     my $rc = $dbh->disconnect or warn $dbh->errstr; # The handle is of little use after disconnecting. Possibly PrintError already prints a warning and this duplicates it?
@@ -286 +302 @@
     
     my $table_name = $self->get_metadata_table_name();
-
+    print STDERR "   Creating table $table_name\n";
+    
     # If using an auto incremented primary key:
     my $stmt = "CREATE TABLE $table_name (id INT NOT NULL AUTO_INCREMENT, did VARCHAR(63) NOT NULL, sid VARCHAR(63) NOT NULL, metaname VARCHAR(127) NOT NULL, metavalue VARCHAR(1023) NOT NULL, PRIMARY KEY(id));";
@@ -301 +318 @@
     
     my $table_name = $self->get_fulltext_table_name();
-
+    print STDERR "   Creating table $table_name\n";
+    
     # If using an auto incremented primary key:
     my $stmt = "CREATE TABLE $table_name (id INT NOT NULL AUTO_INCREMENT, did VARCHAR(63) NOT NULL, sid VARCHAR(63) NOT NULL, fulltxt LONGTEXT, PRIMARY KEY(id));";
@@ -314 +332 @@
     my $self= shift (@_);
     my $dbh = $self->{'db_handle'};
-    
-    print STDERR "### Build mode is removeold, so deleting tables for current collection\n";
     
     # drop table <tablename>
@@ -334 +350 @@
     my ($db_name) = @_;
     my $dbh = $self->{'db_handle'};
+
+    print STDERR "!!! Deleting database $db_name\n";
     
     # "drop database dbname"