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

trunk/gsdl/perllib/classify/Hierarchy.pm

@@ -43 +43 @@
 my $arguments = 
     [ { 'name' => "separator",
-    'desc' => "{AutoHierarchy.separator}",
+    'desc' => "{Hierarchy.separator}",
     'type' => "regexp",
     'deft' => "[\\\\\\\/|\\\\\\\|]",
     'reqd' => "no" },
       { 'name' => "suppresslastlevel",
-    'desc' => "{AutoHierarchy.suppresslastlevel}",
+    'desc' => "{Hierarchy.suppresslastlevel}",
     'type' => "flag",
     'reqd' => "no" } ];
 
 my $options = { 'name'     => "Hierarchy",
-        'desc'     => "{AutoHierarchy.desc}",
+        'desc'     => "{Hierarchy.desc}",
         'abstract' => "no",
         'inherits' => "yes",
@@ -60 +60 @@
 
 sub new {
-    my $class = shift (@_);
-    my $self = new HFileHierarchy($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 $separator;
-    my $suppresslastlevel = 0;
-
-    if (!parsargv::parse(\@_, 
-             q^separator/.*/^, \$separator,
-             q^suppresslastlevel^, \$suppresslastlevel,
-             "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 (!$separator) {
-    $separator = "[\\\/|\\\|]";
-    }
-    $self->{'separator'} = $separator;
-    $self->{'suppresslastlevel'} = $suppresslastlevel;
+    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 HFileHierarchy($classifierslist,$inputargs,$hashArgOptLists): new HFileHierarchy($classifierslist,$inputargs); 
     
     # the hash that we use to build up the hierarchy
@@ -127 +104 @@
         push(@{$current_pos->{'docs'}}, $doc_OID);
     } else {
-        if (defined $sortmeta) {
-        # can you ever get the same doc twice in one classification??
-        $current_pos->{'docs'}->{$doc_OID} = $sortmeta;
-        } else {
-        $current_pos->{'docs'}->{$doc_OID} = $metavalue;
-        }
+        $current_pos->{'docs'}->{$doc_OID} = $sortmeta;
+        
+        #if (defined $sortmeta) {
+    #   # can you ever get the same doc twice in one classification??
+    #   $current_pos->{'docs'}->{$doc_OID} = $sortmeta;
+    #    } else {
+    #   $current_pos->{'docs'}->{$doc_OID} = $metavalue;
+    #    }
     }
     } # foreach metadata
@@ -146 +125 @@
     # are we sorting the list??
     my $nosort = 0;
-    if (defined $self->{'sortname'} && $self->{'sortname'} eq "nosort") {
+    if (!defined $self->{'sort'}) {
     $nosort = 1;
     }
-
+    
     my $metavalues = [];
     # find all the metadata values
@@ -155 +134 @@
     my $mvalues = $doc_obj->get_metadata($doc_obj->get_top_section(), $m);
     next unless (@{$mvalues});
-    if ($self->{'onlyfirst'}) {
+    if ($self->{'firstvalueonly'}) {
         # we only want the first metadata value
         push (@$metavalues, $mvalues[0]);
@@ -169 +148 @@
     #check for a sort element other than our metadata
     my $sortmeta = undef;
-    if (!$nosort && defined $self->{'sortname'}) {
-        
-    if ($self->{'sortname'} =~ /^filename$/i) {
+    if (!$nosort) {
+    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);
         }
     }
@@ -252 +230 @@
     my @doc_list;
     # generate a sorted list of doc ids
-    if ($nosort && scalar(@{$top_hash->{$key}->{'docs'}})) {
+    if (not (defined ($self->{'sort'})) && scalar(@{$top_hash->{$key}->{'docs'}})) {
         @doc_list = @{$top_hash->{$key}->{'docs'}};
-    } elsif (!$nosort && (keys %{$top_hash->{$key}->{'docs'}})) {
+    } elsif (defined ($self->{'sort'}) && (keys %{$top_hash->{$key}->{'docs'}})) {
         @doc_list = sort {$top_hash->{$key}->{'docs'}->{$a} 
                   cmp $top_hash->{$key}->{'docs'}->{$b};} keys %{$top_hash->{$key}->{'docs'}};
@@ -289 +267 @@
     if ($self->{'path_hash'}) {
     if ($self->{'hlist_at_top'}) {
-        $classification = $self->get_entry ($self->{'title'}, "HList", "Invisible");
+        $classification = $self->get_entry ($self->{'buttonname'}, "HList", "Invisible");
     }
     else {
-        $classification = $self->get_entry ($self->{'title'}, "VList", "Invisible");
+        $classification = $self->get_entry ($self->{'buttonname'}, "VList", "Invisible");
     }
     }
@@ -319 +297 @@
 
     if ($self->{'hlist_at_top'}) {
-    $classifyinfo = $self->get_entry ($self->{'title'}, "HList", "Invisible");
+    $classifyinfo = $self->get_entry ($self->{'buttonname'}, "HList", "Invisible");
     }
     else {
-    $classifyinfo = $self->get_entry ($self->{'title'}, "VList", "Invisible");
+    $classifyinfo = $self->get_entry ($self->{'buttonname'}, "VList", "Invisible");
     }