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

Timestamp:

2018-11-07T18:39:13+13:00 (5 years ago)

Author:

ak19

Message:

1. support for port param when connecting to SQL DB. 2. GS SQL Plugout now also uses the verbosity member variable when instantiating the gssql object. 3. Since the DBI object has PrintError set to 1 on connection (and ShowErrorStatement set to 1 to for more verbosity), which means an informative message is always printed on error or warning, there's no need for me to right warning statements everywhere when a db statement/call fails. Removed these redundant warnings. 4. Don't want GS XML Plugout's debug outhandle passed to the two gssql::insert methods, as we don't want them to write debug information to the debug handle. That should only be for the XML stuff (whether groups on or not), and the debug outhandle can moreover be set to the XSLT writer, concerning which makes it makes even less sense for gssql to output info and error debug statements into there. gssql now sticks to STDERR for debug information.

File:

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

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

@@ -42 +42 @@
 # 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?
+#   Any more optimisation I can do around this?
 
 # this plugout does not output the metadata and/or fulltxt xml to a file,
@@ -49 +51 @@
 }
 
-# NOTTODO: die() statements need to be replaced with premature_termination
+# + NOTTODO: die() statements need to be replaced with premature_termination
 # which should ensure the GreenstoneXMLPlugin (group)'s stuff is closed and cleaned up SOMEHOW
 # It's fine: the die() stmts all take place before setting up the super class' begin
 
-# TODO Q: about build_mode: how to detect removeold. Now handled by 
+# + TODO Q: about build_mode: how to detect removeold. Now handled by 
 #   GreenstoneSQLPlugout::remove_all(), which is inherited from a base plugin.
-# TODO: deal with -removeold and everything? Or type out instructions for user
-
-# TODO Q: what is "group" in GreenstoneXMLPlugout?
+# + TODO: deal with -removeold and everything? Or type out instructions for user
+
+# + TODO Q: what is "group" in GreenstoneXMLPlugout?
 
 my $process_mode_list =
@@ -127 +129 @@
 
     my $self= shift (@_);
-
+    
     # The saveas.options
     #print STDERR "@@@@ PLUGOUT db_pwd: " . $self->{'db_client_pwd'} . "\n";
@@ -143 +145 @@
     my $db_params = {
     'collection_name' => $ENV{'GSDLCOLLECTION'},
-    'verbosity' => 1
+    'verbosity' => $self->{'verbosity'} || 0
     };
 
@@ -226 +228 @@
 }
  
-# TODO: check arc-inf.db for whether each entry is to be deleted/indexed/reindexed/been indexed?
+# + X TODO: check arc-inf.db for whether each entry is to be deleted/indexed/reindexed/been indexed?
 # That's only for indexing, not for this step which only generates the content in archives dir
 sub saveas {
@@ -315 +317 @@
         # from db (unlike for reading back in from doc.xml)
         my $escaped_meta_value = &docprint::escape_text($data->[1]);
-
+        
         # Write out the current section's meta to collection db's METADATA table        
         
@@ -322 +324 @@
         # filling in the values
         # OR if debugging, then it will print the SQL insert statement but not execute it
-
-        $gs_sql->insert_row_into_metadata_table($doc_oid, $section_name, $meta_name, $escaped_meta_value, $self->{'debug'}, $debug_out);        
-
-        }
+        
+        $gs_sql->insert_row_into_metadata_table($doc_oid, $section_name, $meta_name, $escaped_meta_value, $self->{'debug'});
+    }
     }
     
@@ -337 +338 @@
     # The following will do the SQL insertion
     # or if debug, the following will print the SQL insert stmt without executing it
-    $gs_sql->insert_row_into_fulltxt_table($doc_oid, $section_name, $section_textref, $self->{'debug'}, $debug_out);
+    $gs_sql->insert_row_into_fulltxt_table($doc_oid, $section_name, $section_textref, $self->{'debug'});
     
     }