Changeset 14022

Timestamp:

2007-04-24T17:13:57+12:00 (17 years ago)

Author:

xiao

Message:

1. Changes made to look for collectionConfig.xml in gs3 mode and collect.cfg in gs2 mode, rather than presumably only for the file collect.cfg. 2. Changes made to use cfgread4gs3.pm in gs3 mode and cfgread.pm in gs2 mode.

File:

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

trunk/gsdl/perllib/basebuilder.pm

@@ -47 +47 @@
 our $maxdocsize = 12000;
 
+# used to signify "gs2"(default) or "gs3"
+my $gs_mode = "gs2";
+
 sub new {
     my ($class, $collection, $source_dir, $build_dir, $verbosity, 
@@ -79 +82 @@
     # read in the collection configuration file
     my $colcfgname = "$ENV{'GSDLCOLLECTDIR'}/etc/collect.cfg";
-    if (!-e $colcfgname) {
+    if (-e $colcfgname) {
+      $self->{'collect_cfg'} = &colcfg::read_collect_cfg ($colcfgname);
+      $gs_mode = "gs2";
+    }
+    else {
+      my $colcfgname = "$ENV{'GSDLCOLLECTDIR'}/etc/collectionConfig.xml";
+      if (!-e $colcfgname) {
     die "mgbuilder::new - couldn't find collect.cfg for collection $collection\n";
-    }
-    $self->{'collect_cfg'} = &colcfg::read_collect_cfg ($colcfgname);
+      }
+      else {
+    $self->{'collect_cfg'} = &colcfg::read_collection_cfg_xml ($colcfgname);
+    $gs_mode = "gs3";
+      }
+    }
     
     # get the list of plugins for this collection
@@ -447 +460 @@
 
     $self->build_cfg_extra($build_cfg);
-    
-    &colcfg::write_build_cfg("$self->{'build_dir'}/build.cfg", $build_cfg);
+
+    if ($gs_mode eq "gs2") {
+      &colcfg::write_build_cfg("$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'});
+    }    
 
     print STDERR "</Stage>\n" if $self->{'gli'};