Changeset 10218 for trunk/gsdl/perllib/classify/HTML.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/classify/HTML.pm (modified) (3 diffs)

trunk/gsdl/perllib/classify/HTML.pm

@@ -54 +54 @@
 
 sub new {
-    my $class = shift (@_);
-    my $self = new BasClas($class, @_);
+    my ($class) = shift (@_);
+    my ($classifierslist,$inputargs,$hashArgOptLists) = @_;
+    push(@$classifierslist, $class);
 
-    # 14-05-02 To allow for proper inheritance of arguments - John Thompson
-    my $option_list = $self->{'option_list'};
-    push( @{$option_list}, $options );
+    if(defined $arguments){ push(@{$hashArgOptLists->{"ArgList"}},@{$arguments});}
+    if(defined $options) { push(@{$hashArgOptLists->{"OptList"}},$options)};
 
-    if ($self->{'info_only'}) {
-    # created from classinfo.pl - don't need to parse the arguments
-    return bless $self, $class;
-    }
+    my $self = (defined $hashArgOptLists)? new BasClas($classifierslist,$inputargs,$hashArgOptLists): new BasClas($classifierslist,$inputargs);
 
-    my ($title, $url);
-    
-    if (!parsargv::parse(\@_, 
-             q^url/.*/^, \$url,
-             q^buttonname/.*/Browse^, \$title,
-             "allow_extra_options")) {
-    
-    print STDERR "\nIncorrect options passed to $class, check your collect.cfg file\n";
-    $self->print_txt_usage("");  # Use default resource bundle
-    die "\n";
-    }
-
-    if (!$url) {
+    if (!$self->{'url'}) {
     my $outhandle = $self->{'outhandle'};
     print $outhandle "HTML Error: required option -url not supplied\n";
@@ -84 +69 @@
     die "HTML Error: required option -url not supplied\n";
     }
-
-    $self->{'url'} = $url;
-    $self->{'title'} = $title;
-
     return bless $self, $class;
 }
@@ -107 +88 @@
     my %classifyinfo = ('thistype'=>'Invisible',
             'childtype'=>'HTML',
-            'Title'=>$self->{'title'},
+            'Title'=>$self->{'buttonname'},
             'contains'=>[]);