Changeset 10579

Timestamp:

2005-08-29T10:38:07+12:00 (19 years ago)

Author:

kjdon

Message:

copied classify.pm and BasClas.pm, added -gsdlinfo flag - if this is present (it gets set by pluginfo.pl) then don't bother parsing the args - just set up the arg data structures

Location:

trunk/gsdl/perllib

Files:

• plugin.pm (modified) (2 diffs)
• plugins/BasPlug.pm (modified) (3 diffs)

trunk/gsdl/perllib/plugin.pm

@@ -28 +28 @@
 use strict; # to pick up typos and undeclared variables...
 no strict 'refs'; # ...but allow filehandles to be variables and vice versa
+no strict 'subs';
 
 require util;
@@ -42 +43 @@
 #globaloptions contains any options that should be passed to all plugins
 my ($verbosity, $outhandle, $failhandle, $globaloptions);
+
+sub load_plugin_for_info {
+    my ($pluginname) = shift @_;
+
+    # find the plugin
+    my $colplugname = &util::filename_cat($ENV{'GSDLCOLLECTDIR'},"perllib/plugins", 
+                      "${pluginname}.pm");
+    my $mainplugname = &util::filename_cat($ENV{'GSDLHOME'},"perllib/plugins", 
+                       "${pluginname}.pm");
+    if (-e $colplugname) { require $colplugname; }
+    elsif (-e $mainplugname) { require $mainplugname; }
+    else {
+    &gsprintf(STDERR, "{plugin.could_not_find_plugin}\n",
+         $pluginname);
+    die "\n";
+    }
+
+    # create a plugin object
+    my ($plugobj);
+    my $options = "-gsdlinfo";
+    
+    eval ("\$plugobj = new \$pluginname([],[$options])");
+    die "$@" if $@;
+
+    return $plugobj;
+}
 
 sub load_plugins {

trunk/gsdl/perllib/plugins/BasPlug.pm

@@ -381 +381 @@
     
     my $self = {};
+    $self->{'outhandle'} = STDERR;
+    $self->{'option_list'} = $hashArgOptLists->{"OptList"};
+    $self->{"info_only"} = 0;
+
+    # Check if gsdlinfo is in the argument list or not - if it is, don't parse 
+    # the args, just return the object.  
+    foreach my $strArg (@{$args})
+    {
+    if($strArg eq "-gsdlinfo")
+    {
+        $self->{"info_only"} = 1;
+        return bless $self, $class;
+    }
+    }
+
     if(!parse2::parse($args,$hashArgOptLists->{"ArgList"},$self))
     {
@@ -390 +405 @@
 
 
+    delete $self->{"info_only"};
     # else parsing was successful.
 
     $self->{'plugin_type'} = $plugin_name;
-    $self->{'outhandle'} = STDERR;
+    #$self->{'outhandle'} = STDERR;
     $self->{'textcat'} = new textcat();
     $self->{'num_processed'} = 0;
@@ -402 +418 @@
     $self->{'cover_image'} = 0 if ($self->{'no_cover_image'});
     $self->{'file_blocks'} = {};
-    $self->{'option_list'} = $hashArgOptLists->{"OptList"};
+    #$self->{'option_list'} = $hashArgOptLists->{"OptList"};
     
     my $associate_ext = $self->{'associate_ext'};