Changeset 14112 for trunk/gsdl/perllib/basebuilder.pm

Timestamp:

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

Author:

sjboddie

Message:

More modifications to support additional collection-level customisations
to be put in gsdl/collect/COLLECTION/custom/COLLECTION. basebuilder.pm,
classify.pm, colcfg.pm, and plugin.pm were modified to allow
collection-specific plugins, classifiers, builders, and buildprocs to
be located in the new locations. These changes should not have any effect
on existing collections.

File:

• trunk/gsdl/perllib/basebuilder.pm (modified) (6 diffs)

trunk/gsdl/perllib/basebuilder.pm

@@ -26 +26 @@
 package basebuilder;
 
+use strict;
+no strict 'refs'; # allow filehandles to be variables and viceversa
+
 use classify;
 use cfgread;
@@ -56 +59 @@
     $outhandle, $no_text, $failhandle, $gli) = @_;
 
-    $outhandle = STDERR unless defined $outhandle;
+    $outhandle = *STDERR unless defined $outhandle;
     $no_text = 0 unless defined $no_text;
-    $failhandle = STDERR unless defined $failhandle;
+    $failhandle = *STDERR unless defined $failhandle;
 
     # create a builder object
@@ -80 +83 @@
     $self->{'gli'} = 0 unless defined $self->{'gli'};
 
-    # read in the collection configuration file
-    my $colcfgname = "$ENV{'GSDLCOLLECTDIR'}/etc/collect.cfg";
-    if (-e $colcfgname) {
-      $self->{'collect_cfg'} = &colcfg::read_collect_cfg ($colcfgname);
-      $gs_mode = "gs2";
-    }
-    else {
-      my $colcfgname = "$ENV{'GSDLCOLLECTDIR'}/etc/collectionConfig.xml";
-      if (!-e $colcfgname) {
-    die "mgbuilder::new - couldn't find collect.cfg for collection $collection\n";
-      }
-      else {
+    # Read in the collection configuration file.
+    my ($colcfgname);
+    ($colcfgname, $gs_mode) = &colcfg::get_collect_cfg_name($outhandle);
+    if ($gs_mode eq "gs2") {
+        $self->{'collect_cfg'} = &colcfg::read_collect_cfg ($colcfgname);
+    } elsif ($gs_mode eq "gs3") {
     $self->{'collect_cfg'} = &colcfg::read_collection_cfg_xml ($colcfgname);
-    $gs_mode = "gs3";
-      }
     }
     
@@ -192 +187 @@
     my ($buildprocdir, $buildproctype);
     my $collection = $self->{'collection'};
-    if (-e "$ENV{'GSDLCOLLECTDIR'}/perllib/${collection}buildproc.pm") {
+    if (-e "$ENV{'GSDLCOLLECTDIR'}/custom/${collection}/perllib/custombuildproc.pm") {
+    $buildprocdir = "$ENV{'GSDLCOLLECTDIR'}/custom/${collection}/perllib";
+    $buildproctype = "custombuildproc";
+    } elsif (-e "$ENV{'GSDLCOLLECTDIR'}/perllib/custombuildproc.pm") {
+    $buildprocdir = "$ENV{'GSDLCOLLECTDIR'}/perllib";
+    $buildproctype = "custombuildproc";
+    } elsif (-e "$ENV{'GSDLCOLLECTDIR'}/perllib/${collection}buildproc.pm") {
     $buildprocdir = "$ENV{'GSDLCOLLECTDIR'}/perllib";
     $buildproctype = "${collection}buildproc";
@@ -338 +339 @@
     my ($handle);
     if ($self->{'debug'}) {
-    $handle = STDOUT;
+    $handle = *STDOUT;
     } else {
     if (!-e "$txt2db_exe" || !open (PIPEOUT, "| txt2db$exe \"$fulldbname\"")) {
@@ -344 +345 @@
         die "builder::make_infodatabase - couldn't run $txt2db_exe\n";
     }
-    $handle = basebuilder::PIPEOUT;
+    $handle = *PIPEOUT;
     }