Changeset 14197

Timestamp:

2007-06-29T11:39:37+12:00 (17 years ago)

Author:

xiao

Message:

add an argument called disable_OAI (default is 0, i.e., enable the collection for oai metadata harvesting). Pass this argument to basebuilder.pm via the new sub.

File:

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

gsdl/trunk/bin/script/buildcol.pl

@@ -73 +73 @@
 
 my $arguments =
-    [ { 'name' => "remove_empty_classifications",
+    [ { 'name' => "disable_OAI",
+    'desc' => "{buildcol.disable_OAI}",
+    'type' => "flag",
+    'reqd' => "no",
+    'modegli' => "2" },
+      { 'name' => "remove_empty_classifications",
     'desc' => "{buildcol.remove_empty_classifications}",
     'type' => "flag",
@@ -268 +273 @@
     $create_images, $collectdir, $build, $type, $textindex,
     $no_strip_html, $no_text, $faillog, $gli, $index, $language,
-    $sections_index_document_metadata, $maxnumeric, $incremental_dlc);
+    $sections_index_document_metadata, $maxnumeric, $incremental_dlc,
+    $disable_OAI);
 
     my $xml = 0;
@@ -347 +353 @@
     unshift (@INC, "$ENV{'GSDLCOLLECTDIR'}/perllib/plugins");
 
-    # Read in the collection configuration file.
+    # read the configuration file (for gs2)
+    $configfilename = &util::filename_cat ($ENV{'GSDLCOLLECTDIR'}, "etc", "collect.cfg");
     my ($collectcfg, $buildtype); 
-    ($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") {
+
+    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 {
     $collectcfg = &colcfg::read_collection_cfg_xml ($configfilename);
-    }
-
+    $gs_mode = "gs3";
+      } 
+    }
+    
     if ($verbosity !~ /\d+/) {
     if (defined $collectcfg->{'verbosity'} && $collectcfg->{'verbosity'} =~ /\d+/) {
@@ -422 +441 @@
         $remove_empty_classifications = 1;
     }
-    }
-    
+    }    
     
     if (defined $collectcfg->{'create_images'} && $collectcfg->{'create_images'} =~ /^true$/i) {
@@ -446 +464 @@
  
     $gli = 0 unless defined $gli;
+
+    $disable_OAI = 0 unless defined $disable_OAI;
 
     # New argument to track whether build is incremental
@@ -517 +537 @@
     # if a builder class has been created for this collection, use it
     # otherwise, use the mg or mgpp builder
-    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") {
+    if (-e "$ENV{'GSDLCOLLECTDIR'}/perllib/${collection}builder.pm") {
     $builderdir = "$ENV{'GSDLCOLLECTDIR'}/perllib";
     $buildertype = "${collection}builder";
@@ -545 +559 @@
      "\$maxdocs, \$debug, \$keepold, \$incremental, \$incremental_dlc, " .
      "\$remove_empty_classifications, " .
-     "\$out, \$no_text, \$faillog, \$gli)");
+     "\$out, \$no_text, \$faillog, \$gli, \$disable_OAI)");
     die "$@" if $@;