Changeset 14244 for gsdl/trunk

Timestamp:

2007-07-12T10:42:42+12:00 (17 years ago)

Author:

xiao

Message:

modification to receive the disable_OAI flag directly instead of using the build_cfg structure which might cause perl regular expression compilation warnings.

File:

• gsdl/trunk/perllib/cfgread4gs3.pm (modified) (3 diffs)

gsdl/trunk/perllib/cfgread4gs3.pm

@@ -337 +337 @@
     }
 
-    print "*** collectionConfig.xml internal ***\n";
-    &Display; 
+    #print "*** collectionConfig.xml internal ***\n";
+    #&Display; 
     return $data;
 }
@@ -350 +350 @@
 # Create the buildConfig.xml file for a specific collection
 sub write_cfg_file {
-    # this sub is called make_auxiliary_files() in basebuilder.pm
+    # 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
     #                    $collectcfg - contents of collectionConfig.xml read in by read_cfg_file sub in cfgread4gs3.pm.
-    my ($buildoutfile, $buildcfg, $collectcfg) = @_;
+    my ($buildoutfile, $buildcfg, $collectcfg, $disable_OAI) = @_;
     my $line = [];
 
     if (!open (COLCFG, ">$buildoutfile")) {
-    print STDERR "cfgread::write_cfg_file couldn't write the cfg file $buildoutfile\n";
+    print STDERR "cfgread4gs3::write_cfg_file couldn't write the build config file $buildoutfile\n";
     die;
     }
@@ -391 +391 @@
 
     # This serviceRack enables the collection to provide the oai metadata retrieve service, which is served by the OAIPMH.java class
-    # For each collection, we write the following serviceRack in the collection's buildConfig.xml file as follows if the 'disable_OAI' argument is not ticked in GLI (or equivalently, a 'disable_OAI' flag is not specified on the command line). There are also other configurations in the OAIConfig.xml.
-    if ($buildcfg->{'disable_OAI'} == 0) {
+    # For each collection, we write the following serviceRack in the collection's buildConfig.xml file if the 'disable_OAI' argument is not checked in the GLI (or equivalently, a 'disable_OAI' flag is not specified on the command line). There are also other configurations in the OAIConfig.xml.
+    if ($disable_OAI == 0) {
       &write_line('COLCFG', ["<serviceRack name=\"OAIPMH\">"]);
       if (defined $buildcfg->{'indexstem'}) {