Changeset 14557 for gsdl/trunk

Timestamp:

2007-09-22T16:15:53+12:00 (17 years ago)

Author:

shaoqun

Message:

make it take a array as param

File:

• gsdl/trunk/perllib/plugout.pm (modified) (2 diffs)

gsdl/trunk/perllib/plugout.pm

@@ -41 +41 @@
          };
 
-#globaloptions contains any options that should be passed to all plugins
+#globaloptions contains any options that should be passed to all plugouts
 my ($verbosity, $outhandle, $failhandle, $globaloptions);
 
 sub load_plugout{
-    my ($plugoutname,$plugout_options) = @_;
+    my ($plugout) = shift @_;
 
     my $colplugdir = &util::filename_cat($ENV{'GSDLCOLLECTDIR'},"perllib/plugouts");
-     unshift (@INC, $colplugdir);
-
+    unshift (@INC, $colplugdir); 
+    
+    my $plugoutname = shift @$plugout;
+        
     # find the plugout
-    my $colplugname = &util::filename_cat($ENV{'GSDLCOLLECTDIR'},"perllib/plugouts", 
+    my $customplugname = &util::filename_cat($ENV{'GSDLCOLLECTDIR'}, "custom", $ENV{'GSDLCOLLECTION'}, 
+                         'perllib', 'plugouts', "${plugoutname}.pm");
+    my $colplugname = &util::filename_cat($ENV{'GSDLCOLLECTDIR'}, 'perllib', 'plugouts', 
                       "${plugoutname}.pm");
-    my $mainplugname = &util::filename_cat($ENV{'GSDLHOME'},"perllib/plugouts", 
-                       "${plugoutname}.pm");
-    if (-e $colplugname) { require $colplugname; }
+    my $mainplugname = &util::filename_cat($ENV{'GSDLHOME'}, 'perllib', 'plugouts',
+                      "${plugoutname}.pm");
+    if (-e $customplugname) { require $customplugname; }
+    elsif (-e $colplugname) { require $colplugname; }
     elsif (-e $mainplugname) { require $mainplugname; }
     else {
-    &gsprintf(STDERR, "{plugout.could_not_find_plugout}\n",
+    gsprintf($outhandle, "{plugout.could_not_find_plugout}\n",
          $plugoutname);
-    die "\n";
+        die "\n";
     }
 
@@ -66 +71 @@
     my ($plugobj);
 
-    eval ("\$plugobj = new \$plugoutname([],\$plugout_options)");
+    eval ("\$plugobj = new \$plugoutname([],\$plugout)");
     die "$@" if $@;