Changeset 9229

Timestamp:

2005-03-01T15:22:06+13:00 (19 years ago)

Author:

davidb

Message:

Added default_process_exp to ZIPPlug, so GLI can "see" that it likes
.tar files, (.tgz, ...)

File:

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

trunk/gsdl/perllib/plugins/ZIPPlug.pm

@@ -57 +57 @@
 }
 
+my $arguments =
+    [ { 'name' => "process_exp",
+    'desc' => "{BasPlug.process_exp}",
+    'type' => "string",
+    'deft' => &get_default_process_exp(),
+    'reqd' => "no" } ];
+
 my $options = { 'name'     => "ZIPPlug",
         'desc'     => "{ZIPPlug.desc}",
         'abstract' => "no",
-        'inherits' => "yes" };
+        'inherits' => "yes",
+        'args'     => $arguments };
 
 sub new {
     my ($class) = @_;
     my $self = new BasPlug ("ZIPPlug", @_);
+    $self->{'plugin_type'} = "ZIPPlug";
 
     # 14-05-02 To allow for proper inheritance of arguments - John Thompson
@@ -70 +79 @@
     push( @{$option_list}, $options );
 
+    if (!parsargv::parse(\@_, 
+             q^process_exp/.*/^, \$self->{'process_exp'},
+             "allow_extra_options")) {
+    print STDERR "\nIncorrect options passed to ZIPPlug, check your collect.cfg configuration file\n";
+    $self->print_txt_usage("");  # Use default resource bundle
+        die "\n";
+    }
+
+    # BasPlug is explicitly set not to set process_exp if recursive plugin
+    # Not sure of this reasoning.  Want it to be set in ZIPPlug, so explicitly
+    # pass it in as default value
+    if (!$self->{'process_exp'}) {
+    $self->{'process_exp'} = get_default_process_exp();
+    }
+
     return bless $self, $class;
 }
@@ -78 +102 @@
 
     return 1;
+}
+
+sub get_default_process_exp {
+    return q^(?i)\.(gz|tgz|z|taz|bz|bz2|zip|jar|tar)$^;
 }
 
@@ -88 +116 @@
     my $outhandle = $self->{'outhandle'};
 
-    if ($file =~ /\.(gz|tgz|z|taz|bz|bz2|zip|jar|tar)$/i) {
+    if ($file =~ /$self->{'process_exp'}/) {
 
     my $filename = $file;