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

trunk/gsdl/perllib/classify/HFileHierarchy.pm

@@ -51 +51 @@
     'type' => "flag",
     'reqd' => "no" },
-      { 'name' => "sort",
-    'desc' => "{Hierarchy.sort}",
-    'type' => "string",
-    'deft' => "{BasClas.metadata.deft}",
-    'reqd' => "no" },
       { 'name' => "hfile",
     'desc' => "{Hierarchy.hfile}",
@@ -69 +64 @@
     'desc' => "{Hierarchy.sort}",
     'type' => "string",
-    'deft' => "{BasClas.metadata.deft}", 
+#   'deft' => "{BasClas.metadata.deft}", 
     'reqd' => "no" },
       { 'name' => "reverse_sort",
@@ -82 +77 @@
 my $options = 
 {   'name'     => "HFileHierarchy",
-    'desc'     => "{Hierarchy.desc}",
+    'desc'     => "{HFileHierarchy.desc}",
     'abstract' => "yes",
     'inherits' => "yes", 
@@ -89 +84 @@
 
 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 ($hfile, $metadata, $buttonname, $sortname, $reverse_sort, $title, 
-    $hlist_at_top);
-    my $firstvalueonly = 0;
-    my $allvalues = 0;
-    
-    if (!parsargv::parse(\@_, 
-             q^metadata/.*/^, \$metadata,
-             q^buttonname/.*/^, \$buttonname,
-             q^firstvalueonly^, \$firstvalueonly,
-             q^allvalues^, \$allvalues,
-             q^sort/.*/^, \$sortname,
-             q^reverse_sort^, \$reverse_sort,
-             q^hfile/.*/^, \$hfile,
-             q^hlist_at_top^, \$hlist_at_top,
-             "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 ($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); 
+
+    my $metadata = $self->{'metadata'};
     if (!$metadata) {
     print STDERR "$class Error: required option -metadata not supplied\n";
@@ -129 +101 @@
     }
     
-    $buttonname = $self->generate_title_from_metadata($metadata) unless ($buttonname);
-    $title = $buttonname;
-    $self->{'title'} = $title;
-
-    $self->{'metaname'} = $metadata;
+    $self->{'buttonname'} = $self->generate_title_from_metadata($metadata) unless ($self->{'buttonname'});
+
+    #$self->{'metaname'} = $metadata;
     my @meta_list = split(/,/, $metadata);
     $self->{'meta_list'} = \@meta_list;
+
+    print STDERR "sort = $self->{'sort'}\n";
+    # sort = undef in this case is the same as sort=nosort
+    if ($self->{'sort'} eq "nosort") {
+    $self->{'sort'} = undef;
+    }
 
     # sortname is handled a bit differently - kjdon
@@ -142 +118 @@
     # we have a list of possible metadata.
     # To get no sorting, set sortname = 'nosort'
-    if (!$sortname) {
-    if (defined ($metadata)) {
-        $sortname = undef;
-    } else {
-        $sortname = "nosort";
-    }
-    }
-    $self->{'sortname'} = $sortname;
-
-    if (defined $sortname && $reverse_sort) {
-    $self->{'reverse_sort'} = 1;
-    }
+    # we don't need to set it to undef if its not defined do we???
+
+#    if (!$self->{'sort'}) {
+#   if (defined ($metadata)) {
+#       $sortname = undef;
+#   } else {
+#       $sortname = "nosort";
+#   }
+#    }
+ #   $self->{'sortname'} = $sortname;
+
+    #if (defined $self->{'sort'} && $reverse_sort) {
+#   $self->{'reverse_sort'} = 1;
+ #   }
     
-    if ($hfile) {
+    if ($self->{'hfile'}) {
+    my $hfile = $self->{'hfile'};
     my $subjectfile;
     $subjectfile = &util::filename_cat($ENV{'GSDLCOLLECTDIR'},"etc", $hfile);
@@ -177 +156 @@
     
 
-    $self->{'firstvalueonly'} = $firstvalueonly;
-    $self->{'allvalues'} = $allvalues;
-
-    $self->{'hlist_at_top'} = $hlist_at_top;
-
+   # $self->{'firstvalueonly'} = $firstvalueonly;
+   # $self->{'allvalues'} = $allvalues;
+
+    #$self->{'hlist_at_top'} = $hlist_at_top;
+
+    # Clean out the unused keys
+    delete $self->{'metadata'};
+    delete $self->{'hfile'};
     
     return bless $self, $class;
@@ -240 +222 @@
     my $tempinfo = $self->get_OID_entry ($OID, $classifyinfo, $list->{$OID}->{'title'}, "VList");
     
-    if (defined $self->{'sortname'}) {
+    if (defined $self->{'sort'}) {
         if ($self->{'reverse_sort'}) {
         foreach $subOID (sort {$b->[1] cmp $a->[1];} @{$list->{$OID}->{'contents'}}) {