Changeset 14111

Timestamp:

2007-05-30T17:53:17+12:00 (17 years ago)

Author:

sjboddie

Message:

Added support for additional collection customisation code to be put in
collect/COLLECTION/custom/COLLECTION. buildcol.pl and import.pl were
modified to look in the new location first for a collect.cfg file.

Location:

trunk/gsdl/bin/script

Files:

• buildcol.pl (modified) (2 diffs)
• import.pl (modified) (2 diffs)

trunk/gsdl/bin/script/buildcol.pl

@@ -347 +347 @@
     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+/) {
@@ -530 +517 @@
     # 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";

trunk/gsdl/bin/script/import.pl

@@ -242 +242 @@
     $removeold, $saveas, $version,
     $gzip, $groupsize, $OIDtype, $OIDmetadata, $debug, 
-    $maxdocs, $collection, $configfilename, $collectcfg, 
+    $maxdocs, $collection, $configfilename, $collectcfg, $gs_mode,
     $pluginfo, $sortmeta, $removeprefix, $removesuffix, 
     $archive_info_filename, $statsfile,
@@ -323 +323 @@
     $faillog->autoflush(1);
     
-    # check that there is a collect.cfg file, i.e. it is gs2.
-    $configfilename = &util::filename_cat ($ENV{'GSDLCOLLECTDIR'}, "etc", "collect.cfg");
-    if (-e $configfilename) {
-      $collectcfg = &colcfg::read_collect_cfg ($configfilename);
-
-    } else {
-      # check that there is a collectionConfig.xml file, i.e. 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 {
+    # Read in the collection configuration file.
+    ($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);
-      }
     }