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

Timestamp:

2018-11-08T17:22:04+13:00 (5 years ago)

Author:

ak19

Message:

1. Some tidying up of the code. 2. Removing unnecessary calls to force_disconnect_from_db (now made 'private') after die() since on die() perl calls object destructor which will ensure disconnection anyway.

File:

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

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

@@ -39 +39 @@
 
 
-# This entire class is called only during import.pl
-
-# TODO: SIGTERM rollback and disconnect?
-# TODO Q: what about verbosity for debugging, instead of current situation of printing out upon debug set at the expense of writing to db
+# + TODO: SIGTERM rollback and disconnect?
+# + TODO Q: what about verbosity for debugging, instead of current situation of printing out upon debug set at the expense of writing to db
 # TODO Q: introduced site_name param to plugins and plugouts. Did I do it right? And should they have hiddengli = "yes"
 # Did I do the pass by ref in docprint's escape and unescape textref functions correctly, and how they're called here?
@@ -121 +119 @@
         'args'     => $arguments };
 
+##### This entire class is called only during import.pl #####
+
+##### Overridden methods #####
+
 sub new {
     my ($class) = shift (@_);
@@ -205 +207 @@
     # This is fatal for the plugout, let's terminate here after disconnecting again
     # PrintError would already have displayed the warning message on load fail
-    $gs_sql->force_disconnect_from_db(); # disconnect_from_db() will issue a warning on error
+    # And on die() perl will call gssql 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");
     }
@@ -227 +230 @@
     # do the superclass stuff first, as any sql db failures should not prevent superclass cleanup
     $self->SUPER::end(@_);    
-    
-    $self->{'gs_sql'}->finished(); # will disconnect from db if last instance
+
+    # Important to call finished():
+    # it will disconnect from db if this is the last gssql instance,
+    # and it will commit to db before disconnecting if rollbback_on_cancel turned on
+    $self->{'gs_sql'}->finished();
     delete $self->{'gs_sql'}; # key gs_sql no longer exists, not just the value being undef
 }
@@ -295 +301 @@
 
     
-    # 3. post save out
-    #$self->SUPER::post_saveas(@_);
+    # 3. post save out 
     $self->SUPER::post_saveas($doc_obj, $doc_dir, $docxml_outhandler, $output_file);
     
@@ -304 +309 @@
 }
 
+##### New methods, not inherited  #####
 
 # write meta and/or text PER DOC out to DB