Changeset 32589 for main/trunk

Timestamp:

2018-11-08T21:25:36+13:00 (5 years ago)

Author:

ak19

Message:

1. SQL db password is not compulsory. 2. Forgot to add the non-compulsory db_port option to the GS SQL Plugs

Location:

main/trunk/greenstone2/perllib

Files:

• plugins/GreenstoneSQLPlugin.pm (modified) (3 diffs)
• plugouts/GreenstoneSQLPlugout.pm (modified) (2 diffs)
• strings.properties (modified) (1 diff)

main/trunk/greenstone2/perllib/plugins/GreenstoneSQLPlugin.pm

@@ -178 +178 @@
     'type' => "string",
     'deft' => "",
-    'reqd' => "yes"}, # pwd required?
+    'reqd' => "no"}, # pwd required? NO.
       { 'name' => "db_host", 
     'desc' => "{GreenstoneSQLPlug.db_host}",
@@ -184 +184 @@
     'deft' => "127.0.0.1",
     'reqd' => "yes"},
+      { 'name' => "db_port", 
+    'desc' => "{GreenstoneSQLPlug.db_port}",
+    'type' => "string", # NOTE: make this int? No default for port, since it's not a required connection param
+    'reqd' => "no"}
     ];
 
@@ -261 +265 @@
     'db_client_pwd' => $self->{'db_client_pwd'},
     'db_host' => $self->{'db_host'},
+    'db_port' => $self->{'db_port'}, # undef by default, can leave as is
     'autocommit' => $autocommit
                    })

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

@@ -105 +105 @@
       'type' => "string",
       'deft' => "",
-      'reqd' => "yes"}, # pwd required?
+      'reqd' => "no"}, # pwd required? NO.
     { 'name' => "db_host", 
       'desc' => "{GreenstoneSQLPlug.db_host}",
       'type' => "string",
       'deft' => "127.0.0.1",
-      'reqd' => "yes"}
+      'reqd' => "yes"},
+    { 'name' => "db_port", 
+      'desc' => "{GreenstoneSQLPlug.db_port}",
+      'type' => "string", # NOTE: make this int? No default for port, since it's not a required connection param
+      'reqd' => "no"}
     ];
 
@@ -178 +182 @@
     'db_client_pwd' => $self->{'db_client_pwd'},
     'db_host' => $self->{'db_host'},
+    'db_port' => $self->{'db_port'}, # undef by default, can leave as is
     'autocommit' => $autocommit
                    })

main/trunk/greenstone2/perllib/strings.properties

@@ -1459 +1459 @@
 GreenstoneSQLPlug.db_client_pwd:The password with which you connect to the (My)SQL database.
 GreenstoneSQLPlug.db_host:The hostname on which the (My)SQL database server is running, 127.0.0.1 by default. Other values to try include localhost.
+GreenstoneSQLPlug.db_port:If your (My)SQL database server is NOT using the default port, then specift the port number here. Otherwise leave this field empty.
 
 GreenstoneSQLPlug.rollback_on_cancel:Support for undo on cancel. Set to true to support rollbacks on cancel. Transactions are then only committed to the database at the end of import and buildcol. Set to false if you do not want undo support, in which case SQL statements are autocommitted to the database.