Changeset 20100

Timestamp:

2009-07-29T13:24:17+12:00 (14 years ago)

Author:

kjdon

Message:

small changes to do with calls to colcfg methods

File:

• gsdl/trunk/perllib/basebuilder.pm (modified) (3 diffs)

gsdl/trunk/perllib/basebuilder.pm

@@ -90 +90 @@
     my ($colcfgname);
     ($colcfgname, $gs_mode) = &colcfg::get_collect_cfg_name($outhandle);
-    if ($gs_mode eq "gs2") {
-        $self->{'collect_cfg'} = &colcfg::read_collect_cfg ($colcfgname);
-    } elsif ($gs_mode eq "gs3") {
-    $self->{'collect_cfg'} = &colcfg::read_collection_cfg_xml ($colcfgname);
-
-    #this $self->{'collect_cfg_preserve'} is used for gs3 only and to be passed to &colcfg::write_build_cfg_xml in sub make_auxilary_files later in this basebuilder.pm, we use this preserve object because $self->{'collect_cfg'}->{'classify'} somewhat gets modified during the calling of &classify::load_classifiers.
-    $self->{'collect_cfg_preserve'} = &colcfg::read_collection_cfg_xml ($colcfgname);
-    }
-
+    $self->{'collect_cfg'} = &colcfg::read_collection_cfg ($colcfgname, $gs_mode);
+
+    if ($gs_mode eq "gs3") {
+    # read it in again to save the original form for later writing out
+    # of buildConfig.xml
+    # we use this preserve object because $self->{'collect_cfg'}->{'classify'} somewhat gets modified during the calling of &classify::load_classifiers.
+    $self->{'collect_cfg_preserve'} = &colcfg::read_collection_cfg ($colcfgname, $gs_mode); 
+    }
+    
     # get the database type for this collection from the collect.cfg file (may be undefined)
     $self->{'infodbtype'} = $self->{'collect_cfg'}->{'infodbtype'} || &dbutil::get_default_infodb_type();
@@ -509 +509 @@
 
     if ($gs_mode eq "gs2") {
-      &colcfg::write_build_cfg("$self->{'build_dir'}/build.cfg", $build_cfg);
+      &colcfg::write_build_cfg(&util::filename_cat($self->{'build_dir'},"build.cfg"), $build_cfg);
     }
     if ($gs_mode eq "gs3") {
 
-      &colcfg::write_build_cfg_xml("$self->{'build_dir'}/buildConfig.xml", $build_cfg, $self->{'collect_cfg_preserve'}, $self->{'disable_OAI'});
+      &colcfg::write_build_cfg_xml(&util::filename_cat($self->{'build_dir'}, "buildConfig.xml"), $build_cfg, $self->{'collect_cfg_preserve'}, $self->{'disable_OAI'});
     }    
 
@@ -660 +660 @@
     }
     } 
-    if ($gs_mode eq "gs2") {
-    return &colcfg::read_build_cfg( $buildconfigfile);
-    } 
-    print STDERR "read build cfg basebuilder***\n";
-    return &buildConfigxml::read_cfg_file($buildconfigfile);
-    
+    return &colcfg::read_building_cfg( $buildconfigfile, $gs_mode);
     
 }