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

trunk/gsdl/perllib/classify/SectionList.pm

@@ -45 +45 @@
 
 
-sub new {
-    my $class = shift (@_);
-    my $self = new List($class, @_);
+sub new { 
+    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 List($classifierslist,$inputargs,$hashArgOptLists): new List($classifierslist,$inputargs);
+
     return bless $self, $class;
 }
@@ -67 +65 @@
     # 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;
     }
@@ -83 +81 @@
 
     my $sortmeta = "";
-    if (!$nosort && defined $self->{'sortname'}) {
-    if ($self->{'sortname'} =~ /^filename$/i) {
+    if (!$nosort && defined $self->{'sort'}) {
+    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);
         }
     }
@@ -140 +138 @@
     } 
 
-    if (defined $self->{'sortname'}) {
+    if (defined $self->{'sort'}) {
     # sorting on alternative metadata
     $self->{'list'}->{"$doc_OID.$section"} = $sortmeta;
     } else {
-    # sortingon the classification metadata
+    # sorting on the classification metadata
     # do the same formatting on the meta value as for sort meta
     $metavalue = &sorttools::format_metadata_for_sorting($metaname, $metavalue, $doc_obj);