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

Timestamp:

2018-11-09T19:13:32+13:00 (5 years ago)

Author:

ak19

Message:

Renamed gssql.pm to gsmysql.pm. Not subclassing the old gssql into gsmysql yet, as there's the complex issue of sighandlers, the static singleton method _get_connection_instance(), the singleton variable _db_instance and its use in the sighandlers and DESTROY, and how all of this can be impacted when making them part of an inheritance chain. Not sure of the best way to structure inheritance around these things. Even if rollback_on_cancel ends up unnecessary, the singleton method _get_connection_instance and singleton object _db_instance still impact decisions around inheritance.

File:

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

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

@@ -34 +34 @@
 use GreenstoneXMLPlugout;
 use docprint;
-use gssql;
+use gsmysql;
 
 use DBI; # the central package for this plugout
@@ -170 +170 @@
     };
 
-    my $gs_sql = new gssql($db_params);
+    my $gs_sql = new gsmysql($db_params);
 
     # if autocommit is set, there's no rollback support
@@ -192 +192 @@
     }
 
-    #die("@@@@ TEST. Connected successfully. Testing gssql::destructor.\n"); # WORKS
+    #die("@@@@ TEST. Connected successfully. Testing gsmysql::destructor.\n"); # WORKS
     
     my $db_name = $self->{'site'} || "greenstone2"; # one database per GS3 site, for GS2 the db is called greenstone2
@@ -212 +212 @@
     # This is fatal for the plugout, let's terminate here after disconnecting again
     # PrintError would already have displayed the warning message on load fail
-    # And on die() perl will call gssql destroy which will ensure a disconnect() from db
+    # And on die() perl will call gsmysql destroy which will ensure a disconnect() from db
     #$gs_sql->force_disconnect_from_db(); # disconnect_from_db() will issue a warning on error
     die("Could not use db $db_name and/or prepare its tables. Can't proceed.\n");
@@ -237 +237 @@
 
     # Important to call finished():
-    # it will disconnect from db if this is the last gssql instance,
+    # it will disconnect from db if this is the last gsmysql instance,
     # and it will commit to db before disconnecting if rollbback_on_cancel turned on
     $self->{'gs_sql'}->finished();