Changeset 21785 for main/trunk/greenstone2
- Timestamp:
- 2010-03-15T12:19:52+13:00 (14 years ago)
- Location:
- main/trunk/greenstone2/perllib
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/perllib/basebuilder.pm
r21607 r21785 58 58 $maxdocs, $debug, $keepold, $incremental, $incremental_mode, 59 59 $remove_empty_classifications, 60 $outhandle, $no_text, $failhandle, $gli , $disable_OAI) = @_;60 $outhandle, $no_text, $failhandle, $gli) = @_; 61 61 62 62 $outhandle = *STDERR unless defined $outhandle; … … 79 79 'failhandle'=>$failhandle, 80 80 'notbuilt'=>{}, # indexes not built 81 'gli'=>$gli, 82 'disable_OAI'=>$disable_OAI 81 'gli'=>$gli 83 82 }, $class; 84 83 85 84 $self->{'gli'} = 0 unless defined $self->{'gli'}; 86 85 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.xml88 $self->{'disable_OAI'} = 0 unless defined $self->{'disable_OAI'};89 90 86 # Read in the collection configuration file. 91 87 my ($colcfgname); … … 566 562 if ($gs_mode eq "gs3") { 567 563 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'}); 569 565 } 570 566 -
main/trunk/greenstone2/perllib/buildConfigxml.pm
r21783 r21785 230 230 # this sub is called in make_auxiliary_files() in basebuilder.pm 231 231 # the received args: $buildoutfile - destination file: buildConfig.xml 232 # $buildcfg - all build options, eg, disable_OAI232 # $buildcfg - all build options, 233 233 # $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) = @_; 235 235 my $line = []; 236 236 -
main/trunk/greenstone2/perllib/colcfg.pm
r21570 r21785 250 250 # gs3 write buildConfig.xml 251 251 sub write_build_cfg_xml { 252 my ($buildoutfile, $buildcfg, $collectcfg , $disable_OAI) = @_;252 my ($buildoutfile, $buildcfg, $collectcfg) = @_; 253 253 254 254 require buildConfigxml; 255 return &buildConfigxml::write_cfg_file ($buildoutfile, $buildcfg, $collectcfg , $disable_OAI);255 return &buildConfigxml::write_cfg_file ($buildoutfile, $buildcfg, $collectcfg); 256 256 } 257 257
Note:
See TracChangeset
for help on using the changeset viewer.