Changeset 14657 for gsdl/trunk/perllib/plugout.pm

Timestamp:

2007-10-11T10:45:56+13:00 (17 years ago)

Author:

anna

Message:

Updated Perl Module in Marathi. Many thanks to Shubhada Nagarkar.

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