Changeset 134 for trunk/gsdl/perllib

Timestamp:

1999-02-02T22:59:06+13:00 (25 years ago)

Author:

rjmcnab

Message:

Used GSDLCOLLECTDIR which is now defined in util.pm.

Location:

trunk/gsdl/perllib

Files:

• docsave.pm (modified) (3 diffs)
• mgbuilder.pm (modified) (4 diffs)
• plugin.pm (modified) (3 diffs)

trunk/gsdl/perllib/docsave.pm

@@ -21 +21 @@
     $self->{'archive_info'} = $archive_info;
 
+    # set a default for the archive directory
+    $self->{'archive_dir'} = "$ENV{'GSDLHOME'}/collect/$self->{'collection'}/archives";
+
     return bless $self, $class;
+}
+
+sub setarchivedir {
+    my $self = shift (@_);
+    my ($archive_dir) = @_;
+
+    $self->{'archive_dir'} = $archive_dir;
 }
 
@@ -28 +38 @@
     my ($doc_obj) = @_;
 
-    my $archive_dir = "$ENV{'GSDLHOME'}/collect/$self->{'collection'}/archives";
+    my $archive_dir = $self->{'archive_dir'};
     my $OID = $doc_obj->get_OID();
     $OID = "NULL" unless defined $OID;
@@ -39 +49 @@
     # same one.
     $doc_dir = $doc_info->[0];
+    $doc_dir =~ s/\/?doc\.gml$//;
 
     } else {

trunk/gsdl/perllib/mgbuilder.pm

@@ -34 +34 @@
 
     # read in the collection configuration file
-    if (!-e "$ENV{'GSDLHOME'}/collect/$collection/etc/collect.cfg") {
+    if (!-e "$ENV{'GSDLCOLLECTDIR'}/etc/collect.cfg") {
     die "mgbuilder::new - couldn't find collect.cfg for collection $collection\n";
     }
@@ -71 +71 @@
     # otherwise, use the mg buildproc
     my ($buildprocdir, $buildproctype);
-    if (-e "$ENV{'GSDLHOME'}/collect/$collection/perllib/${collection}buildproc.pm") {
-    $buildprocdir = "$ENV{'GSDLHOME'}/collect/$collection/perllib";
+    if (-e "$ENV{'GSDLCOLLECTDIR'}/perllib/${collection}buildproc.pm") {
+    $buildprocdir = "$ENV{'GSDLCOLLECTDIR'}/perllib";
     $buildproctype = "${collection}buildproc";
     } else {
@@ -102 +102 @@
 sub compress_text {
     my $self = shift (@_);
+    my ($textindex) = @_;
     my $exedir = "$ENV{'GSDLHOME'}/bin/$ENV{'GSDLOS'}";
     my $exe = &util::get_os_exe ();
@@ -121 +122 @@
     $self->{'buildproc'}->set_output_handle ('mgbuilder::PIPEOUT');
     $self->{'buildproc'}->set_mode ('text');
-    $self->{'buildproc'}->set_index ('section:text');
+    $self->{'buildproc'}->set_index ($textindex);
     
     # collect the statistics for the text

trunk/gsdl/perllib/plugin.pm

@@ -3 +3 @@
 package plugin;
 
+require util;
 
 sub load_plugins {
@@ -10 +11 @@
     foreach $plugin (@$plugin_list) {
     # find the plugin
-    if (-e "$ENV{'GSDLHOME'}/collect/$collection/perllib/plugins/${plugin}.pm") {
-        require "$ENV{'GSDLHOME'}/collect/$collection/perllib/plugins/${plugin}.pm";
-
-    } elsif (-e "$ENV{'GSDLHOME'}/perllib/plugins/${plugin}.pm") {
-        require "$ENV{'GSDLHOME'}/perllib/plugins/${plugin}.pm";
-
-    } else {
-        die "ERROR - couldn't find plugin $plugin\n";
-    }
+    my $colplugname = &util::filename_cat($ENV{'GSDLCOLLECTDIR'},"perllib/plugins", 
+                          "${plugin}.pm");
+    my $mainplugname = &util::filename_cat($ENV{'GSDLHOME'},"perllib/plugins", 
+                           "${plugin}.pm");
+    if (-e $colplugname) { require $colplugname; }
+    elsif (-e $mainplugname) { require $mainplugname; }
+    else { die "ERROR - couldn't find plugin $plugin\n"; }
 
     # create a plugin object
@@ -44 +43 @@
     }
 
-    print STDERR "WARNING - no plugin could process $base_dir$file\n";
+    print STDERR "WARNING - no plugin could process " . 
+    &util::filename_cat($base_dir,$file) . "\n";
 }