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

trunk/gsdl/perllib/classify/AZList.pm

@@ -67 +67 @@
 
 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 ($metadata, $title, $removeprefix, $removesuffix);
-    
-    if (!parsargv::parse(\@_, 
-             q^metadata/.*/^, \$metadata,
-             q^buttonname/.*/^, \$title,
-             q^removeprefix/.*/^, \$removeprefix,
-             q^removesuffix/.*/^, \$removesuffix,
-             "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 (!$metadata) {
+    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);
+
+    if (!$self->{"metadata"}) {
     print STDERR "AZList Error: required option -metadata not supplied \n";
     $self->print_txt_usage("");  # Use default resource bundle
@@ -97 +82 @@
     die "AZList Error: required option -metadata not supplied\n";
     }
-    
-    my @meta_list = split(/,/, $metadata);
-    #my $meta1 = $meta_list[0];
-
-    #$title = $meta1 unless ($title);
-    $title = $self->generate_title_from_metadata($metadata) unless ($title);
+        
+    # Manually set $self parameters.
     $self->{'list'} = {};
+
+    # Transfer value from Auto Parsing to the variavle name that used in previous GreenStone.
+    my @meta_list = split(/,/, $self->{"metadata"});
     $self->{'meta_list'} = \@meta_list;
-    $self->{'title'} = $title;
-    
-    if (defined($removeprefix) && $removeprefix) {
-    $removeprefix =~ s/^\^//; # don't need a leading ^
-    $self->{'removeprefix'} = $removeprefix;
-    }
-    if (defined($removesuffix) && $removesuffix) {
-    $removesuffix =~ s/\$$//; # don't need a trailing $
-    $self->{'removesuffix'} = $removesuffix;
-    }
+
+    $self->{'buttonname'} = $self->generate_title_from_metadata($self->{'metadata'}) unless ($self->{'buttonname'});
+
+    # Further setup 
+    if (defined($self->{"removeprefix"}) && $self->{"removeprefix"}) {
+    $self->{"removeprefix"} =~ s/^\^//; # don't need a leading ^
+    }
+    if (defined($self->{"removesuffix"}) && $self->{"removesuffix"}) {
+    $self->{"removesuffix"} =~ s/\$$//; # don't need a trailing $
+    }
+
+    # Clean out the unused keys
+    delete $self->{"metadata"}; # Delete this key
+
+    if($self->{"removeprefix"} eq "") {delete $self->{"removeprefix"};}
+    if($self->{"removesuffix"} eq "") {delete $self->{"removesuffix"};}
 
     return bless $self, $class;
@@ -233 +223 @@
     my $childtype = "HList";
     if (scalar (@$classlistref) <= 39) {$childtype = "VList";}
-    my $classifyinfo = $self->get_entry ($self->{'title'}, $childtype, "Invisible");
+    my $classifyinfo = $self->get_entry ($self->{'buttonname'}, $childtype, "Invisible");
 
     # don't need to do any splitting if there are less than 39 (max + min -1) classifications