Changeset 32589

Show
Ignore:
Timestamp:
08.11.2018 21:25:36 (11 days 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:
3 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/perllib/plugins/GreenstoneSQLPlugin.pm

    r32586 r32589  
    178178    'type' => "string", 
    179179    'deft' => "", 
    180     'reqd' => "yes"}, # pwd required? 
     180    'reqd' => "no"}, # pwd required? NO. 
    181181      { 'name' => "db_host",  
    182182    'desc' => "{GreenstoneSQLPlug.db_host}", 
     
    184184    'deft' => "127.0.0.1", 
    185185    'reqd' => "yes"}, 
     186      { 'name' => "db_port",  
     187    'desc' => "{GreenstoneSQLPlug.db_port}", 
     188    'type' => "string", # NOTE: make this int? No default for port, since it's not a required connection param 
     189    'reqd' => "no"} 
    186190    ]; 
    187191 
     
    261265    'db_client_pwd' => $self->{'db_client_pwd'}, 
    262266    'db_host' => $self->{'db_host'}, 
     267    'db_port' => $self->{'db_port'}, # undef by default, can leave as is 
    263268    'autocommit' => $autocommit 
    264269                   }) 
  • main/trunk/greenstone2/perllib/plugouts/GreenstoneSQLPlugout.pm

    r32586 r32589  
    105105      'type' => "string", 
    106106      'deft' => "", 
    107       'reqd' => "yes"}, # pwd required? 
     107      'reqd' => "no"}, # pwd required? NO. 
    108108    { 'name' => "db_host",  
    109109      'desc' => "{GreenstoneSQLPlug.db_host}", 
    110110      'type' => "string", 
    111111      'deft' => "127.0.0.1", 
    112       'reqd' => "yes"} 
     112      'reqd' => "yes"}, 
     113    { 'name' => "db_port",  
     114      'desc' => "{GreenstoneSQLPlug.db_port}", 
     115      'type' => "string", # NOTE: make this int? No default for port, since it's not a required connection param 
     116      'reqd' => "no"} 
    113117    ]; 
    114118 
     
    178182    'db_client_pwd' => $self->{'db_client_pwd'}, 
    179183    'db_host' => $self->{'db_host'}, 
     184    'db_port' => $self->{'db_port'}, # undef by default, can leave as is 
    180185    'autocommit' => $autocommit 
    181186                   }) 
  • main/trunk/greenstone2/perllib/strings.properties

    r32586 r32589  
    14591459GreenstoneSQLPlug.db_client_pwd:The password with which you connect to the (My)SQL database. 
    14601460GreenstoneSQLPlug.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. 
     1461GreenstoneSQLPlug.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. 
    14611462 
    14621463GreenstoneSQLPlug.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.