Changeset 21613

Show
Ignore:
Timestamp:
25.01.2010 16:20:25 (9 years ago)
Author:
mdewsnip
Message:

Changed calls to read_collection_cfg() so the infodbtype value is set to be the default infodbtype (from dbutil), if not defined in the collect.cfg file. Part of making the code less GDBM-specific.

Location:
main/trunk/greenstone2/bin/script
Files:
3 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/bin/script/buildcol.pl

    r21292 r21613  
    374374    ($configfilename, $gs_mode) = &colcfg::get_collect_cfg_name($out); 
    375375    $collectcfg = &colcfg::read_collection_cfg ($configfilename, $gs_mode); 
     376     
     377    # If the infodbtype value wasn't defined in the collect.cfg file, use the default 
     378    if (!defined($collectcfg->{'infodbtype'})) 
     379    { 
     380      $collectcfg->{'infodbtype'} = &dbutil::get_default_infodb_type(); 
     381    } 
    376382 
    377383    if ($verbosity !~ /\d+/) { 
  • main/trunk/greenstone2/bin/script/export.pl

    r21581 r21613  
    395395    $collectcfg = &colcfg::read_collection_cfg ($configfilename, $gs_mode); 
    396396     
     397    # If the infodbtype value wasn't defined in the collect.cfg file, use the default 
     398    if (!defined($collectcfg->{'infodbtype'})) 
     399    { 
     400      $collectcfg->{'infodbtype'} = &dbutil::get_default_infodb_type(); 
     401    } 
     402     
    397403    if (defined $collectcfg->{'importdir'} && $importdir eq "") { 
    398404    $importdir = $collectcfg->{'importdir'}; 
  • main/trunk/greenstone2/bin/script/import.pl

    r21581 r21613  
    377377    ($configfilename, $gs_mode) = &colcfg::get_collect_cfg_name($out); 
    378378    $collectcfg = &colcfg::read_collection_cfg ($configfilename, $gs_mode); 
     379     
     380    # If the infodbtype value wasn't defined in the collect.cfg file, use the default 
     381    if (!defined($collectcfg->{'infodbtype'})) 
     382    { 
     383      $collectcfg->{'infodbtype'} = &dbutil::get_default_infodb_type(); 
     384    } 
    379385 
    380386    if (defined $collectcfg->{'importdir'} && $importdir eq "") {