Changeset 134 for trunk/gsdl/perllib/plugin.pm

Timestamp:

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

Author:

rjmcnab

Message:

Used GSDLCOLLECTDIR which is now defined in util.pm.

File:

• trunk/gsdl/perllib/plugin.pm (modified) (3 diffs)

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";
 }