Changeset 20098

Timestamp:

2009-07-29T13:22:28+12:00 (15 years ago)

Author:

kjdon

Message:

use colcfg read_collection/building_cfg methods instead of switching on gs_mode.

Location:

gsdl/trunk/bin/script

Files:

• buildcol.pl (modified) (1 diff)
• explode_metadata_database.pl (modified) (1 diff)
• export.pl (modified) (2 diffs)
• import.pl (modified) (1 diff)
• incremental-buildcol.pl (modified) (1 diff)

gsdl/trunk/bin/script/buildcol.pl

@@ -360 +360 @@
     my ($collectcfg, $buildtype); 
     ($configfilename, $gs_mode) = &colcfg::get_collect_cfg_name($out);
-    if ($gs_mode eq "gs2") {
-        $collectcfg = &colcfg::read_collect_cfg ($configfilename);
-    } elsif ($gs_mode eq "gs3") {
-    $collectcfg = &colcfg::read_collection_cfg_xml ($configfilename);
-    }
+    $collectcfg = &colcfg::read_collection_cfg ($configfilename, $gs_mode);
 
     if ($verbosity !~ /\d+/) {

gsdl/trunk/bin/script/explode_metadata_database.pl

@@ -213 +213 @@
     # Read in the collection configuration file.
     my ($configfilename, $gs_mode) = &colcfg::get_collect_cfg_name(STDERR);
-    my $collectcfg;
-    if ($gs_mode eq "gs2") {
-        $collectcfg = &colcfg::read_collect_cfg ($configfilename);
-    } elsif ($gs_mode eq "gs3") {
-        $collectcfg = &colcfg::read_collection_cfg_xml ($configfilename);
-    }
+    my $collectcfg = &colcfg::read_collect_cfg ($configfilename, $gs_mode);
     $plugin_options_string = &get_plugin_options($collectcfg, $plugin);
     }

gsdl/trunk/bin/script/export.pl

@@ -382 +382 @@
     # Read in the collection configuration file.
     ($configfilename, $gs_mode) = &colcfg::get_collect_cfg_name($out);
-        
-    
-    # Read in the collection configuration file.
-    ($configfilename, $gs_mode) = &colcfg::get_collect_cfg_name($out);
-    
-    if ($gs_mode eq "gs2") {
-    $collectcfg = &colcfg::read_collect_cfg ($configfilename);
-    } elsif ($gs_mode eq "gs3") {
-    $collectcfg = &colcfg::read_collection_cfg_xml ($configfilename);
-    }
-
+    $collectcfg = &colcfg::read_collection_cfg ($configfilename, $gs_mode);
+    
     if (defined $collectcfg->{'importdir'} && $importdir eq "") {
     $importdir = $collectcfg->{'importdir'};
@@ -648 +639 @@
     $doc_obj->add_utf8_metadata($section,$md_label, $val);
     
-    # see cfgread4gs3.pm: GS2's "collectionextra" is called "description" in GS3,
+    # see collConfigxml.pm: GS2's "collectionextra" is called "description" in GS3,
     # while "collectionname" in GS2 is called "name" in GS3.
-    # Variable $nameMap variable in cfgread4gs3.pm maps between GS2 and GS3
+    # Variable $nameMap variable in collConfigxml.pm maps between GS2 and GS3
     if (($md_label eq "ex.collectionname^en") || ($md_label eq "ex.collectionname"))
     {

gsdl/trunk/bin/script/import.pl

@@ -371 +371 @@
     # Read in the collection configuration file.
     ($configfilename, $gs_mode) = &colcfg::get_collect_cfg_name($out);
-
-    if ($gs_mode eq "gs2") {
-        $collectcfg = &colcfg::read_collect_cfg ($configfilename);
-    } elsif ($gs_mode eq "gs3") {
-    $collectcfg = &colcfg::read_collection_cfg_xml ($configfilename);
-    }
+    $collectcfg = &colcfg::read_collection_cfg ($configfilename, $gs_mode);
 
     if (defined $collectcfg->{'importdir'} && $importdir eq "") {

gsdl/trunk/bin/script/incremental-buildcol.pl

@@ -140 +140 @@
     # (e.g. collect.cfg now says lucene, but build.cfg says mgpp)
 
-    my $buildcfg;
-    if ($gs_mode eq "gs2") {
-        $buildcfg = &colcfg::read_build_cfg ($build_cfg_filename);
-    } else {
-        $buildcfg = &colcfg::read_collection_cfg_xml($build_cfg_filename);
-    }
+    my $buildcfg = &colcfg::read_building_cfg ($build_cfg_filename, $gs_mode);
     if ($buildcfg->{'buildtype'} ne $collectcfg->{'buildtype'}) {
         print STDERR "*****\n";