Changeset 10218 for trunk/gsdl/perllib/plugins/HTMLPlug.pm

Timestamp:

2005-07-06T15:27:45+12:00 (19 years ago)

Author:

kjdon

Message:

Jeffrey's new parsing modifications, committed approx 6 July, 15.16

File:

• trunk/gsdl/perllib/plugins/HTMLPlug.pm (modified) (3 diffs)

trunk/gsdl/perllib/plugins/HTMLPlug.pm

@@ -92 +92 @@
     'desc' => "{HTMLPlug.description_tags}",
     'type' => "flag" },
+      # retain this for backward compatibility (w3mir option was replaced by
+      # file_is_url)
+      { 'name' => "w3mir",
+#   'desc' => "{HTMLPlug.w3mir}",
+    'type' => "flag",
+    'hiddengli' => "yes"},
       { 'name' => "no_strip_metadata_html",
     'desc' => "{HTMLPlug.no_strip_metadata_html}",
@@ -109 +115 @@
 
 sub new {
-    my $class = shift (@_);
-    my $self = new BasPlug ($class, @_);
-    $self->{'plugin_type'} = "HTMLPlug";
-    # 14-05-02 To allow for proper inheritance of arguments - John Thompson
-    my $option_list = $self->{'option_list'};
-    push( @{$option_list}, $options );
-    
-    if (!parsargv::parse(\@_, 
-             q^nolinks^, \$self->{'nolinks'},
-             q^keep_head^, \$self->{'keep_head'},
-             q^no_metadata^, \$self->{'no_metadata'},
-             q^metadata_fields/.*/Title^, \$self->{'metadata_fields'},
-             q^hunt_creator_metadata^, \$self->{'hunt_creator_metadata'},
-             q^w3mir^, \$self->{'w3mir'},
-             q^file_is_url^, \$self->{'file_is_url'},
-             q^assoc_files/.*/(?i)\.(jpe?g|jpe|gif|png|css)$^, \$self->{'assoc_files'},
-             q^rename_assoc_files^, \$self->{'rename_assoc_files'},
-             q^title_sub/.*/^, \$self->{'title_sub'},
-             q^description_tags^, \$self->{'description_tags'},
-             q^no_strip_metadata_html/.*/^, \$self->{'no_strip_metadata_html'},
-             q^sectionalise_using_h_tags^, \$self->{'sectionalise_using_h_tags'},
-             "allow_extra_options")) {
-
-    print STDERR "\nIncorrect options passed to HTMLPlug, check your collect.cfg configuration file\n";
-    $self->print_txt_usage("");  # Use default resource bundle
-    die "\n";
-    }
-
-    # retain this for backward compatibility (w3mir option was replaced by
-    # file_is_url)
+    my ($class) = shift (@_);
+    my ($pluginlist,$inputargs,$hashArgOptLists) = @_;
+    push(@$pluginlist, $class);
+
+    if(defined $arguments){ push(@{$hashArgOptLists->{"ArgList"}},@{$arguments});}
+    if(defined $options) { push(@{$hashArgOptLists->{"OptList"}},$options)};
+
+    my $self = (defined $hashArgOptLists)? new BasPlug($pluginlist,$inputargs,$hashArgOptLists): new BasPlug($pluginlist,$inputargs);
+
     if ($self->{'w3mir'}) {
     $self->{'file_is_url'} = 1;
@@ -146 +131 @@
     $self->{'dir_num'} = 0;
     $self->{'file_num'} = 0;
-
+    
     return bless $self, $class;
 }