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

trunk/gsdl/perllib/classify/Collage.pm

@@ -106 +106 @@
 
 sub new {
-    my $class = shift (@_);
-    my $self = new BasClas($class, @_);
-
-    my $option_list = $self->{'option_list'};
-    push( @{$option_list}, $options );
-
-    if ($self->{'info_only'}) {
-    # created from classinfo.pl - don't need to parse the arguments
-    return bless $self, $class;
-    }   
-
-    my ($title, $geometry, $verbosity, $maxDepth, $imageType, $bgcolor, $refreshDelay, $isJava2, $caption, $maxDisplay, $maxDownloads, $list);
-
-    if (!parsargv::parse(\@_, 
-             q^buttonname/.*/Collage^, \$title,
-             q^geometry/.*/600x300^, \$geometry,
-             q^verbosity/.*/3^, \$verbosity,
-             q^maxDepth/.*/500^, \$maxDepth,
-#            q^maxDownloads/.*/^, \$maxDownloads,
-             q^maxDisplay/.*/25^, \$maxDisplay,
-             q^imageType/.*/.jpg%.png^, \$imageType,
-             q^bgcolor/.*/\#96c29a^, \$bgcolor,
-             q^refreshDelay/.*/1200^, \$refreshDelay,
-             q^isJava2/.*/auto^, \$isJava2,
-             q^imageMustNotHave/.*/hl=\%x=\%gt=\%gc=\%.pr^, \$imageMustNotHave,
-             q^caption/.*/ ^, \$caption,
-             "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 (!$title) {
-    $title = 'Collage';
-    }
-
-    $self->{'list'} = $list;
-    $self->{'title'} = $title;
-    $self->{'geometry'} = $geometry;
-    $self->{'verbosity'} = $verbosity;
-    $self->{'maxDepth'} = $maxDepth;
-    $self->{'maxDownloads'} = $maxDownloads;
-    $self->{'maxDisplay'} = $maxDisplay;
-    $self->{'imageType'} = $imageType;
-    $self->{'bgcolor'} = $bgcolor;
-    $self->{'refreshDelay'} = $refreshDelay;
-    $self->{'isJava2'} = $isJava2;
-#    $self->{'imageMustNotHave'} = $imageMustNotHave;
-    $self->{'caption'} = $caption;
+    my ($class) = shift (@_);
+    my ($classifierslist,$inputargs,$hashArgOptLists) = @_;
+    push(@$classifierslist, $class);
+
+    if(defined $arguments){ push(@{$hashArgOptLists->{"ArgList"}},@{$arguments});}
+    if(defined $options) { push(@{$hashArgOptLists->{"OptList"}},$options)};
+
+    my $self = (defined $hashArgOptLists)? new BasClas($classifierslist,$inputargs,$hashArgOptLists): new BasClas($classifierslist,$inputargs);
+
+    # Manually set $self parameters.
+    $self->{'list'} = {};
+    print STDERR "buttonnmae = $buttonname\n";
+    $self->{'buttonname'} = 'Collage' unless ($self->{'buttonname'});
+
     return bless $self, $class;
 }
@@ -206 +170 @@
 
     if ($verbosity>1) {
-    print $outhandle ("$self->{'title'}\n");
-    }
-
-    my $collage_head = $self->get_entry ($self->{'title'}, "Collage", "Invisible");
+    print $outhandle ("$self->{'buttonname'}\n");
+    }
+
+    my $collage_head = $self->get_entry ($self->{'buttonname'}, "Collage", "Invisible");
     my $collage_curr = $self->get_entry("Collage","VList");
     push (@{$collage_head->{'contains'}},$collage_curr);