Changeset 21570

Timestamp:

2010-01-21T17:12:06+13:00 (14 years ago)

Author:

mdewsnip

Message:

Changed colcfg.pm so it "require"s collConfigxml and buildConfigxml only in Greenstone 3 mode. This is to avoid requiring these modules in the gs2-core.

File:

• main/trunk/greenstone2/perllib/colcfg.pm (modified) (4 diffs)

main/trunk/greenstone2/perllib/colcfg.pm

@@ -30 +30 @@
 
 use cfgread;
-use collConfigxml;
-use buildConfigxml;
 use gsprintf 'gsprintf';
 use strict;
@@ -209 +207 @@
     my ($filename) = @_;
 
+    require collConfigxml;
     return &collConfigxml::read_cfg_file ($filename);
 }
@@ -244 +243 @@
 
     my ($filename) = @_;
-    
+
+    require buildConfigxml;
     return &buildConfigxml::read_cfg_file($filename);
 }
@@ -252 +252 @@
     my ($buildoutfile, $buildcfg, $collectcfg, $disable_OAI) = @_;
 
+    require buildConfigxml;
     return &buildConfigxml::write_cfg_file ($buildoutfile, $buildcfg, $collectcfg, $disable_OAI);
 }