Changeset 14247

Timestamp:

2007-07-12T11:19:16+12:00 (17 years ago)

Author:

xiao

Message:

modification to make the disable_OAI option hidden in the GLI for Greenstone 2. Plus restore the file back to sjboddie's revision 14111.

File:

• gsdl/trunk/bin/script/buildcol.pl (modified) (6 diffs)

gsdl/trunk/bin/script/buildcol.pl

@@ -73 +73 @@
 
 my $arguments =
-    [ { 'name' => "disable_OAI",
-    'desc' => "{buildcol.disable_OAI}",
-    'type' => "flag",
-    'reqd' => "no",
-    'modegli' => "2" },
-      { 'name' => "remove_empty_classifications",
+    [ { 'name' => "remove_empty_classifications",
     'desc' => "{buildcol.remove_empty_classifications}",
     'type' => "flag",
@@ -205 +200 @@
     'type' => "flag",
     'reqd' => "no",
-    'hiddengli' => "yes" }
+    'hiddengli' => "yes" },
+      { 'name' => "disable_OAI",
+          'desc' => "{buildcol.disable_OAI}",
+          'type' => "flag",
+          'reqd' => "no",
+          'modegli' => "2",
+      'hiddengli' => "yes" }
 
 #      { 'name' => "incremental_dlc",
@@ -353 +354 @@
     unshift (@INC, "$ENV{'GSDLCOLLECTDIR'}/perllib/plugins");
 
-    # read the configuration file (for gs2)
-    $configfilename = &util::filename_cat ($ENV{'GSDLCOLLECTDIR'}, "etc", "collect.cfg");
+    # Read in the collection configuration file.
     my ($collectcfg, $buildtype); 
-
-    if (-e $configfilename) {
-      $collectcfg = &colcfg::read_collect_cfg ($configfilename);
-      $gs_mode = "gs2";  
-    } 
-    else {
-
-      # If it is gs3
-      $configfilename = &util::filename_cat ($ENV{'GSDLCOLLECTDIR'}, "etc", "collectionConfig.xml");
-
-      if (!-e $configfilename) {
-    &gsprintf($out, "{common.cannot_find_cfg_file}\n", $configfilename) && die;
-      }
-      else {
+    ($configfilename, $gs_mode) = &colcfg::get_collect_cfg_name($out);
+    if ($gs_mode eq "gs2") {
+        $collectcfg = &colcfg::read_collect_cfg ($configfilename);
+    } elsif ($gs_mode eq "gs3") {
     $collectcfg = &colcfg::read_collection_cfg_xml ($configfilename);
-    $gs_mode = "gs3";
-      } 
-    }
-    
+    }
+
     if ($verbosity !~ /\d+/) {
     if (defined $collectcfg->{'verbosity'} && $collectcfg->{'verbosity'} =~ /\d+/) {
@@ -441 +429 @@
         $remove_empty_classifications = 1;
     }
-    }    
+    }
+    
     
     if (defined $collectcfg->{'create_images'} && $collectcfg->{'create_images'} =~ /^true$/i) {
@@ -465 +454 @@
     $gli = 0 unless defined $gli;
 
+    # If the disable_OAI flag is not present, the option $disable_OAI with the value of 0 will be passed to basebuilder.pm
     $disable_OAI = 0 unless defined $disable_OAI;
-
+    
     # New argument to track whether build is incremental
     $incremental = 0 unless defined $incremental;
@@ -537 +527 @@
     # if a builder class has been created for this collection, use it
     # otherwise, use the mg or mgpp builder
-    if (-e "$ENV{'GSDLCOLLECTDIR'}/perllib/${collection}builder.pm") {
+    if (-e "$ENV{'GSDLCOLLECTDIR'}/custom/${collection}/perllib/custombuilder.pm") {
+    $builderdir = "$ENV{'GSDLCOLLECTDIR'}/custom/${collection}/perllib";
+    $buildertype = "custombuilder";
+    } elsif (-e "$ENV{'GSDLCOLLECTDIR'}/perllib/custombuilder.pm") {
+    $builderdir = "$ENV{'GSDLCOLLECTDIR'}/perllib";
+    $buildertype = "custombuilder";
+    } elsif (-e "$ENV{'GSDLCOLLECTDIR'}/perllib/${collection}builder.pm") {
     $builderdir = "$ENV{'GSDLCOLLECTDIR'}/perllib";
     $buildertype = "${collection}builder";