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

trunk/gsdl/perllib/classify/List.pm

@@ -44 +44 @@
     'desc' => "{BasClas.buttonname}",
     'type' => "string",
-    'deft' => "{BasClas.metadata.deft}",
+#   'deft' => "{BasClas.metadata.deft}",
     'reqd' => "no" },
       { 'name' => "sort",
     'desc' => "{List.sort}",
     'type' => "string",
-    'deft' => "{BasClas.metadata.deft}",
+#   'deft' => "{BasClas.metadata.deft}",
     'reqd' => "no" } ];
 
@@ -60 +60 @@
 
 sub new {
-    my $class = shift (@_);
-    my $self = new BasClas($class, @_);
-
-    # 14-05-02 To allow for proper inheritance of arguments - John Thompson
-    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, $sortname, $list);
-
-    if (!parsargv::parse(\@_, 
-             q^metadata/.*/^, \$metadata,
-             q^buttonname/.*/^, \$title,
-             q^sort/.*/^, \$sortname,
-             "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";
-    }
-    my @meta_list;
-    my $meta1;
-    
-    if ($metadata) {
-    @meta_list = split(/,/, $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);
+
+    # Transfer value from Auto Parsing to the variable name that used in previous GreenStone.
+    my (@meta_list,$meta1);
+    print STDERR "new List\n";
+    if ($self->{"metadata"}) {
+    print STDERR "List: splitting metadata, ".$self->{"metadata"}."\n";
+    @meta_list = split(/,/, $self->{"metadata"});
     $meta1 = $meta_list[0];
-    } else {
-    $metadata = undef;
+    $self->{'meta_list'} = \@meta_list;
+    } else {
     $meta1=undef;
     @meta_list = undef;
     }
 
-    if (!$title) {
-    if (defined ($meta1)) {
-        $title = $meta1;
-    } else {
-        $title = 'List';
-    }
-    }
-
-    # sortname is handled a bit differently - kjdon
+    if (!$self->{"buttonname"}) {
+    if (defined ($self->{'metadata'})) {
+        $self->{"buttonname"} = $self->generate_title_from_metadata($self->{'metadata'});
+    } else {
+        $self->{"buttonname"} = 'List';
+    }
+    }
+
+    # Further setup
+    # $self->{"sort"} is handled a bit differently - kjdon
     # undef means to sort, but use the metadata value from -metadata
     # because there is no one metadata value to get for sorting when 
     # we have a list of possible metadata
-    # to get no sorting, set sortname = 'nosort'
-    if (!$sortname) {
-    if (defined ($metadata)) {
-        $sortname = undef;
-    } else {
-        $sortname = "nosort";
-    }
-    }
+    # to get no sorting, set $self->{"sort"} = 'nosort'
+    if (!$self->{"sort"}) {
+    print STDERR "no sorting\n";
+    if (defined ($self->{"metadata"})) {
+        $self->{"sort"} = undef;
+        print STDERR "setting no meta\n";
+    } else {
+        $self->{"sort"} = "nosort";
+    }
+    }    
+    if (defined  $self->{"sort"} &&  $self->{"sort"} eq "nosort") {
+    $self->{'list'} = [];
+    } else {
+    $self->{'list'} = {};
+    }
+        
+    # Clean out the unused keys
+    delete $self->{"metadata"}; # Delete this key
     
-    if (defined $sortname && $sortname eq "nosort") {
-    $list = [];
-    } else {
-    $list = {};
-    }
-    
-    $self->{'list'} = $list;
-    if (defined $metadata) {
-    $self->{'meta_list'} = \@meta_list;
-    }
-    $self->{'title'} = $title;
-    $self->{'sortname'} = $sortname;
-
     return bless $self, $class;
 }
@@ -146 +131 @@
     # are we sorting the list??
     my $nosort = 0;
-    if (defined $self->{'sortname'} && $self->{'sortname'} eq "nosort") {
+    if (defined $self->{'sort'} && $self->{'sort'} eq "nosort") {
     $nosort = 1;
     }
@@ -195 +180 @@
 
     #check for a sort element other than our metadata
-    if (defined $self->{'sortname'}) {
+    if (defined $self->{'sort'}) {
     my $sortmeta;
-    if ($self->{'sortname'} =~ /^filename$/i) {
+    if ($self->{'sort'} =~ /^filename$/i) {
         $sortmeta = $doc_obj->get_source_filename();
     } else {
-        $sortmeta = $doc_obj->get_metadata_element($doc_obj->get_top_section(), $self->{'sortname'});
+        $sortmeta = $doc_obj->get_metadata_element($doc_obj->get_top_section(), $self->{'sort'});
         if (defined $sortmeta) {
-        $sortmeta = &sorttools::format_metadata_for_sorting($self->{'sortname'}, $sortmeta, $doc_obj);
+        $sortmeta = &sorttools::format_metadata_for_sorting($self->{'sort'}, $sortmeta, $doc_obj);
         }
     }
@@ -225 +210 @@
 
     my @list = ();
-    if (defined $self->{'sortname'} && $self->{'sortname'} eq "nosort") {
+    if (defined $self->{'sort'} && $self->{'sort'} eq "nosort") {
     @list = @{$self->{'list'}};
     } else {
@@ -233 +218 @@
     }   
     }
-
     # organise into classification structure
     my %classifyinfo = ('childtype'=>'VList',
-            'Title'=>$self->{'title'},
+            'Title'=>$self->{'buttonname'},
             'contains'=>[]);
     $classifyinfo{'thistype'} = 'Invisible' unless $no_thistype;