Changeset 32530 for main/trunk/greenstone2/perllib/plugouts/GreenstoneSQLPlugout.pm

Timestamp:

2018-10-19T20:54:17+13:00 (6 years ago)

Author:

ak19

Message:

Some more tidying up: some params passed by GreenstoneSQLPlugout to gssql should be instance variables, others are connection specific and now restricted to the gssql::connect_to_db() method.

File:

• main/trunk/greenstone2/perllib/plugouts/GreenstoneSQLPlugout.pm (modified) (2 diffs)

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

@@ -119 +119 @@
 
     my $db_params = {
-    'collection_name' => $ENV{'GSDLCOLLECTION'},
-    'db_driver' => $self->{'db_driver'},
-    'db_client_user' => $self->{'db_client_user'},
-    'db_client_pwd' => $self->{'db_client_pwd'},
-    'db_host' => $self->{'db_host'},
+    'collection_name' => $ENV{'GSDLCOLLECTION'},    
     'db_encoding' => $self->{'db_encoding'}
     #'db_name' => $self->{'site_name'},
@@ -131 +127 @@
     my $gs_sql = new gssql($db_params);
     
-    if(!$gs_sql->connect_to_db()) {
+    # try connecting to the mysql db, if that fails it will die
+    # so don't bother preparing GreenstoneXMLPlugout by calling superclass' begin()
+    if(!$gs_sql->connect_to_db({
+    'db_driver' => $self->{'db_driver'},
+    'db_client_user' => $self->{'db_client_user'},
+    'db_client_pwd' => $self->{'db_client_pwd'},
+    'db_host' => $self->{'db_host'}
+                   })
+    )
+    {
     # This is fatal for the plugout, let's terminate here
     # PrintError would already have displayed the warning message on connection fail