Changeset 20095

Timestamp:

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

Author:

kjdon

Message:

changes for cfgread4gs3 renaming, and to make this look for buildConfig.xml instead of only build.cfg

File:

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

gsdl/trunk/perllib/basebuilder.pm

@@ -52 +52 @@
 
 # used to signify "gs2"(default) or "gs3"
-my $gs_mode = "gs2";
+our $gs_mode = "gs2";
 
 sub new {
@@ -84 +84 @@
     $self->{'gli'} = 0 unless defined $self->{'gli'};
     
-    # disable_OIA applies to greenstone 3 only and is only passed to &colcfg::write_build_cfg_xml (then cfgread4gs3::write_cfg_file) when writing the buildConfig.xml
+    # disable_OAI applies to greenstone 3 only and is only passed to &colcfg::write_build_cfg_xml (then buildConfigxml::write_build_cfg_file) when writing the buildConfig.xml
     $self->{'disable_OAI'} = 0 unless defined $self->{'disable_OAI'};
 
@@ -642 +642 @@
     my $self = shift(@_);
 
-    my $buildconfigfile = &util::filename_cat($self->{'build_dir'}, "build.cfg");
+    my $buildconfigfilename;
+    
+    if ($gs_mode eq "gs2") {
+    $buildconfigfilename = "build.cfg";
+    } else {
+    $buildconfigfilename = "buildConfig.xml";
+    }
+    
+    my $buildconfigfile = &util::filename_cat($self->{'build_dir'}, $buildconfigfilename);
     
     if (!-e $buildconfigfile) {
     # try the index dir - but do we know where it is?? try here
-    $buildconfigfile  = &util::filename_cat($ENV{'GSDLCOLLECTDIR'}, "index", "build.cfg");
+    $buildconfigfile  = &util::filename_cat($ENV{'GSDLCOLLECTDIR'}, "index", $buildconfigfilename);
     if (!-e $buildconfigfile) {
         #we cant find a config file - just ignore the field list
@@ -652 +660 @@
     }
     } 
-
-    my $buildcfg = &colcfg::read_build_cfg( $buildconfigfile);
-    return $buildcfg;
-
+    if ($gs_mode eq "gs2") {
+    return &colcfg::read_build_cfg( $buildconfigfile);
+    } 
+    print STDERR "read build cfg basebuilder***\n";
+    return &buildConfigxml::read_cfg_file($buildconfigfile);
+    
+    
 }