Changeset 21785

Timestamp:

2010-03-15T12:19:52+13:00 (14 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:

• basebuilder.pm (modified) (3 diffs)
• buildConfigxml.pm (modified) (1 diff)
• colcfg.pm (modified) (1 diff)

main/trunk/greenstone2/perllib/basebuilder.pm

@@ -58 +58 @@
     $maxdocs, $debug, $keepold, $incremental, $incremental_mode,
     $remove_empty_classifications, 
-    $outhandle, $no_text, $failhandle, $gli, $disable_OAI) = @_;
+    $outhandle, $no_text, $failhandle, $gli) = @_;
 
     $outhandle = *STDERR unless defined $outhandle;
@@ -79 +79 @@
               'failhandle'=>$failhandle,
               'notbuilt'=>{},    # indexes not built
-              'gli'=>$gli,
-              'disable_OAI'=>$disable_OAI
+              'gli'=>$gli
               }, $class;
 
     $self->{'gli'} = 0 unless defined $self->{'gli'};
     
-    # 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
-    $self->{'disable_OAI'} = 0 unless defined $self->{'disable_OAI'};
-
     # Read in the collection configuration file.
     my ($colcfgname);
@@ -566 +562 @@
     if ($gs_mode eq "gs3") {
 
-      &colcfg::write_build_cfg_xml(&util::filename_cat($self->{'build_dir'}, "buildConfig.xml"), $build_cfg, $self->{'collect_cfg_preserve'}, $self->{'disable_OAI'});
+      &colcfg::write_build_cfg_xml(&util::filename_cat($self->{'build_dir'}, "buildConfig.xml"), $build_cfg, $self->{'collect_cfg_preserve'});
     }    
 

main/trunk/greenstone2/perllib/buildConfigxml.pm

@@ -230 +230 @@
     # this sub is called in make_auxiliary_files() in basebuilder.pm
     # the received args: $buildoutfile - destination file: buildConfig.xml
-    #                    $buildcfg - all build options, eg, disable_OAI
+    #                    $buildcfg - all build options, 
     #                    $collectcfg - contents of collectionConfig.xml read in by read_cfg_file sub in buildConfigxml.pm.
-    my ($buildoutfile, $buildcfg, $collectcfg, $disable_OAI) = @_;
+    my ($buildoutfile, $buildcfg, $collectcfg) = @_;
     my $line = [];
 

main/trunk/greenstone2/perllib/colcfg.pm

@@ -250 +250 @@
 # gs3 write buildConfig.xml
 sub write_build_cfg_xml {
-    my ($buildoutfile, $buildcfg, $collectcfg, $disable_OAI) = @_;
+    my ($buildoutfile, $buildcfg, $collectcfg) = @_;
 
     require buildConfigxml;
-    return &buildConfigxml::write_cfg_file ($buildoutfile, $buildcfg, $collectcfg, $disable_OAI);
+    return &buildConfigxml::write_cfg_file ($buildoutfile, $buildcfg, $collectcfg);
 }