Changeset 11680 for trunk/gsdl/perllib/plugins/ConvertToPlug.pm

Timestamp:

2006-04-21T15:19:32+12:00 (18 years ago)

Author:

kjdon

Message:

changed how it loads secondary plugins - now uses eval. did this cos otherwise you get a syntax error when running pluginfo.pl -describeall

File:

• trunk/gsdl/perllib/plugins/ConvertToPlug.pm (modified) (4 diffs)

trunk/gsdl/perllib/plugins/ConvertToPlug.pm

@@ -41 +41 @@
 use strict;
 no strict 'refs'; # allow filehandles to be variables and viceversa
-
+no strict 'subs';
 sub BEGIN {
     @ConvertToPlug::ISA = ('BasPlug');
@@ -100 +100 @@
     my @convert_to_list = split(",",$self->{'convert_to'});
     my $secondary_plugins = {};
+    # find the plugin
 
     foreach my $convert_to (@convert_to_list) {
@@ -106 +107 @@
     my $plugin_package = $plugin_class.".pm";
 
-    require $plugin_package;
+    my $colplugname = &util::filename_cat($ENV{'GSDLCOLLECTDIR'},
+                          "perllib/plugins", 
+                          $plugin_package);
+    my $mainplugname = &util::filename_cat($ENV{'GSDLHOME'},
+                           "perllib/plugins", 
+                           $plugin_package);
+
+    if (-e $colplugname) {require $colplugname;}
+    elsif (-e $mainplugname) { require $mainplugname; }
+    else {
+        &gsprintf(STDERR, "{plugin.could_not_find_plugin}\n",
+              $plugin_class);
+        die "\n";
+    }
 
     # call its constructor with extra options that we've worked out!
     my $arglist = $input_args->{$plugin_class};
-#   my $secondary_plugin = new $plugin_class([],$arglist, $hashArgOptLists);
-    # secondary plugins don';t need to know their calling plugin's options
-    my $secondary_plugin = new $plugin_class([],$arglist);
+
+    my ($secondary_plugin);
+    eval("\$secondary_plugin = new $plugin_class([],\$arglist)");
+    die "$@" if $@;
     $secondary_plugins->{$plugin_class} = $secondary_plugin;
     }
@@ -128 +143 @@
     my $self = (defined $hashArgOptLists)? new BasPlug($pluginlist,$inputargs,$hashArgOptLists): new BasPlug($pluginlist,$inputargs);
     
+    if ($self->{'info_only'}) {
+    # don't worry about any options etc
+    return bless $self, $class;
+    }
+
     my $convert_to_type = $self->{'convert_to'};
     if (!defined $convert_to_type || $convert_to_type eq "") {