Changeset 21785


Ignore:
Timestamp:
2010-03-15T12:19:52+13:00 (12 years ago)
Author:
kjdon
Message:

removing disable_OAI option. As far as I know, its only used for gs3, to determine whether to output the serviceRack or not, but this is now done in collectionConfig.xml

Location:
main/trunk/greenstone2/perllib
Files:
3 edited

Legend:

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

    r21607 r21785  
    5858    $maxdocs, $debug, $keepold, $incremental, $incremental_mode,
    5959    $remove_empty_classifications,
    60     $outhandle, $no_text, $failhandle, $gli, $disable_OAI) = @_;
     60    $outhandle, $no_text, $failhandle, $gli) = @_;
    6161
    6262    $outhandle = *STDERR unless defined $outhandle;
     
    7979              'failhandle'=>$failhandle,
    8080              'notbuilt'=>{},    # indexes not built
    81               'gli'=>$gli,
    82               'disable_OAI'=>$disable_OAI
     81              'gli'=>$gli
    8382              }, $class;
    8483
    8584    $self->{'gli'} = 0 unless defined $self->{'gli'};
    8685   
    87     # 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
    88     $self->{'disable_OAI'} = 0 unless defined $self->{'disable_OAI'};
    89 
    9086    # Read in the collection configuration file.
    9187    my ($colcfgname);
     
    566562    if ($gs_mode eq "gs3") {
    567563
    568       &colcfg::write_build_cfg_xml(&util::filename_cat($self->{'build_dir'}, "buildConfig.xml"), $build_cfg, $self->{'collect_cfg_preserve'}, $self->{'disable_OAI'});
     564      &colcfg::write_build_cfg_xml(&util::filename_cat($self->{'build_dir'}, "buildConfig.xml"), $build_cfg, $self->{'collect_cfg_preserve'});
    569565    }   
    570566
  • main/trunk/greenstone2/perllib/buildConfigxml.pm

    r21783 r21785  
    230230    # this sub is called in make_auxiliary_files() in basebuilder.pm
    231231    # the received args: $buildoutfile - destination file: buildConfig.xml
    232     #                    $buildcfg - all build options, eg, disable_OAI
     232    #                    $buildcfg - all build options,
    233233    #                    $collectcfg - contents of collectionConfig.xml read in by read_cfg_file sub in buildConfigxml.pm.
    234     my ($buildoutfile, $buildcfg, $collectcfg, $disable_OAI) = @_;
     234    my ($buildoutfile, $buildcfg, $collectcfg) = @_;
    235235    my $line = [];
    236236
  • main/trunk/greenstone2/perllib/colcfg.pm

    r21570 r21785  
    250250# gs3 write buildConfig.xml
    251251sub write_build_cfg_xml {
    252     my ($buildoutfile, $buildcfg, $collectcfg, $disable_OAI) = @_;
     252    my ($buildoutfile, $buildcfg, $collectcfg) = @_;
    253253
    254254    require buildConfigxml;
    255     return &buildConfigxml::write_cfg_file ($buildoutfile, $buildcfg, $collectcfg, $disable_OAI);
     255    return &buildConfigxml::write_cfg_file ($buildoutfile, $buildcfg, $collectcfg);
    256256}
    257257
Note: See TracChangeset for help on using the changeset viewer.