Changeset 21613 for main/trunk/greenstone2

Timestamp:

2010-01-25T16:20:25+13:00 (14 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:

• buildcol.pl (modified) (1 diff)
• export.pl (modified) (1 diff)
• import.pl (modified) (1 diff)

main/trunk/greenstone2/bin/script/buildcol.pl

@@ -374 +374 @@
     ($configfilename, $gs_mode) = &colcfg::get_collect_cfg_name($out);
     $collectcfg = &colcfg::read_collection_cfg ($configfilename, $gs_mode);
+    
+    # If the infodbtype value wasn't defined in the collect.cfg file, use the default
+    if (!defined($collectcfg->{'infodbtype'}))
+    {
+      $collectcfg->{'infodbtype'} = &dbutil::get_default_infodb_type();
+    }
 
     if ($verbosity !~ /\d+/) {

main/trunk/greenstone2/bin/script/export.pl

@@ -395 +395 @@
     $collectcfg = &colcfg::read_collection_cfg ($configfilename, $gs_mode);
     
+    # If the infodbtype value wasn't defined in the collect.cfg file, use the default
+    if (!defined($collectcfg->{'infodbtype'}))
+    {
+      $collectcfg->{'infodbtype'} = &dbutil::get_default_infodb_type();
+    }
+    
     if (defined $collectcfg->{'importdir'} && $importdir eq "") {
     $importdir = $collectcfg->{'importdir'};

main/trunk/greenstone2/bin/script/import.pl

@@ -377 +377 @@
     ($configfilename, $gs_mode) = &colcfg::get_collect_cfg_name($out);
     $collectcfg = &colcfg::read_collection_cfg ($configfilename, $gs_mode);
+    
+    # If the infodbtype value wasn't defined in the collect.cfg file, use the default
+    if (!defined($collectcfg->{'infodbtype'}))
+    {
+      $collectcfg->{'infodbtype'} = &dbutil::get_default_infodb_type();
+    }
 
     if (defined $collectcfg->{'importdir'} && $importdir eq "") {