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

Timestamp:

2018-10-25T20:12:42+13:00 (6 years ago)

Author:

ak19

Message:

Using proper parameters to GreenstoneSQLPlugin/Plugout instead of hardcoded values for params.

File:

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

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

@@ -41 +41 @@
 # TODO: SIGTERM rollback and disconnect?
 # TODO Q: what about verbosity for debugging
+# TODO Q: introduced site_name param to plugins and plugouts. Did I do it right? And should they have hiddengli = "yes"
 
 # this plugout does not output xml to a file, but outputs rows into a mysql table
@@ -64 +65 @@
         'desc' => "{GreenstoneSQLPlug.process_mode.all}" } ];
 
+# The following are the saveas.options:
 my $arguments = [ 
-       { 'name' => "process_mode", 
-     'desc' => "{GreenstoneSQLPlug.process_mode}",
-     'type' => "enum",
-     'list' => $process_mode_list,
-     'deft' => "all",
-     'reqd' => "no",
-     'hiddengli' => "no"} ];
+    { 'name' => "process_mode", 
+      'desc' => "{GreenstoneSQLPlug.process_mode}",
+      'type' => "enum",
+      'list' => $process_mode_list,
+      'deft' => "all",
+      'reqd' => "no",
+      'hiddengli' => "no"},
+    { 'name' => "db_driver", 
+      'desc' => "{GreenstoneSQLPlug.db_driver}",
+      'type' => "string",   
+      'deft' => "mysql",
+      'reqd' => "yes"},
+    { 'name' => "db_client_user", 
+      'desc' => "{GreenstoneSQLPlug.db_client_user}",
+      'type' => "string",   
+      'deft' => "root",
+      'reqd' => "yes"},
+    { 'name' => "db_client_pwd", 
+      'desc' => "{GreenstoneSQLPlug.db_client_pwd}",
+      'type' => "string",
+      'deft' => "",
+      'reqd' => "yes"}, # pwd required?
+    { 'name' => "db_host", 
+      'desc' => "{GreenstoneSQLPlug.db_host}",
+      'type' => "string",
+      'deft' => "127.0.0.1",
+      'reqd' => "yes"},
+    { 'name' => "db_encoding", 
+      'desc' => "{GreenstoneSQLPlug.db_encoding}",
+    'type' => "string",
+      'deft' => "utf8",
+      'reqd' => "yes"}
+    ];
 
 my $options = { 'name'     => "GreenstoneSQLPlugout",
@@ -103 +131 @@
     my $self= shift (@_);
 
+    # The saveas.options
+    #print STDERR "@@@@ PLUGOUT db_pwd: " . $self->{'db_client_pwd'} . "\n";
+    #print STDERR "@@@@ user: " . $self->{'db_client_user'} . "\n";
+    #print STDERR "@@@@ db_host: " . $self->{'db_host'} . "\n";
+    #print STDERR "@@@@ db_enc: " . $self->{'db_encoding'} . "\n";
+    #print STDERR "@@@@ db_driver: " . $self->{'db_driver'} . "\n";
+    #print STDERR "@@@@ proc_mode: " . $self->{'process_mode'} . "\n";
+    
     ########### TODO: these should be set from cmdline/GLI options to plugout #########
-    $self->{'db_driver'} = "mysql";
-    $self->{'site_name'} = "localsite";    
-    $self->{'db_client_user'} = "root";
-    $self->{'db_client_pwd'} = "6reenstone3";
+
     $self->{'build_mode'} = "removeold";
-    #$self->{'db_host'} = "127.0.0.1";
-    #$self->{'db_encoding'} = "utf8";
-    #TODO: proc_mode is also a saveas option    
-    
+
     ############ LOAD NECESSARY OPTIONS ###########
-    print STDERR "########## COLLECTION: ". $ENV{'GSDLCOLLECTION'}."\n";
-    #$self->{'collection_name'} = $ENV{'GSDLCOLLECTION'};
+    #print "@@@ plugout SITE NAME: ". $self->{'site_name'} . "\n" if defined $self->{'site_name'};
+    #print STDERR "########## COLLECTION: ". $ENV{'GSDLCOLLECTION'}."\n";
+
     print STDERR "***** GreenstoneSQLPlugout process mode = \"", $self->{'process_mode'}, "\"\n";
 
@@ -121 +152 @@
     'collection_name' => $ENV{'GSDLCOLLECTION'},    
     'db_encoding' => $self->{'db_encoding'}
-    #'db_name' => $self->{'site_name'},
-    #'build_mode' => $self->{'build_mode'},
     };
 
@@ -142 +171 @@
     }
     
-    my $db_name = $self->{'site_name'} || "localsite"; # one database per GS3 site
+    my $db_name = $self->{'site_name'} || "greenstone2"; # one database per GS3 site, for GS2 the db is called greenstone2
     my $build_mode = $self->{'build_mode'} || "removeold";
     if(!$gs_sql->load_db_and_tables($db_name, $build_mode)) {
@@ -149 +178 @@
     # PrintError would already have displayed the warning message on load fail
     $gs_sql->disconnect_from_db()
-        || warn("Unable to disconnect from database " . $self->{'site_name'} . "\n");
+        || warn("Unable to disconnect from database.\n");
     die("Could not use db $db_name and/or prepare its tables. Can't proceed.\n");
     }