Changeset 21570

Show
Ignore:
Timestamp:
21.01.2010 17:12:06 (9 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.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/perllib/colcfg.pm

    r20416 r21570  
    3030 
    3131use cfgread; 
    32 use collConfigxml; 
    33 use buildConfigxml; 
    3432use gsprintf 'gsprintf'; 
    3533use strict; 
     
    209207    my ($filename) = @_; 
    210208 
     209    require collConfigxml; 
    211210    return &collConfigxml::read_cfg_file ($filename); 
    212211} 
     
    244243 
    245244    my ($filename) = @_; 
    246      
     245 
     246    require buildConfigxml; 
    247247    return &buildConfigxml::read_cfg_file($filename); 
    248248} 
     
    252252    my ($buildoutfile, $buildcfg, $collectcfg, $disable_OAI) = @_; 
    253253 
     254    require buildConfigxml; 
    254255    return &buildConfigxml::write_cfg_file ($buildoutfile, $buildcfg, $collectcfg, $disable_OAI); 
    255256}