Changeset 3639

Timestamp:

2003-01-03T10:03:31+13:00 (21 years ago)

Author:

kjdon

Message:

modified the default sorting element, and fixed a bug.

File:

• trunk/gsdl/perllib/classify/Hierarchy.pm (modified) (8 diffs)

trunk/gsdl/perllib/classify/Hierarchy.pm

@@ -93 +93 @@
 
    -metadata X    Metadata field used for classification,
-                  list will be sorted by this element.
+                  list will be sorted by this element, 
+                  unless -sort is used.
 
    -hfile X       The classification structure file
 
-   -sort X        Metadata field to sort by (defaults to none)
+   -sort X        Metadata field to sort by (defaults to -metadata)
+                  use '-sort nosort' for no sorting.
 
    -hlist_at_top  Display the first level of the classification
@@ -109 +111 @@
     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 );
+    # 14-05-02 To allow for proper inheritance of arguments - John Thompson
+    my $option_list = $self->{'option_list'};
+    push( @{$option_list}, $options );
    
-    my $sortname = "Title";
-    my ($hfile, $metadata, $title, $hlist_at_top);
-
+    my ($hfile, $metadata, $sortname, $title, $hlist_at_top);
+    
     if (!parsargv::parse(\@_, 
              q^buttonname/.*/^, \$title,
-             q^sort/.*/nosort^, \$sortname,
+             q^sort/.*/^, \$sortname,
              q^hfile/.*/^, \$hfile,
              q^metadata/.*/^, \$metadata,
@@ -124 +125 @@
              "allow_extra_options")) {
     
-          $self->{'construction_error'} = "Incorrect options passed to $class, check your collect.cfg file.";
+    $self->{'construction_error'} = "Incorrect options passed to $class, check your collect.cfg file.";
     }
 
     if (!$metadata) {
-          $self->{'construction_error'} = "Hierarchy error: no metadata supplied.";
-    }
-
+    $self->{'construction_error'} = "Hierarchy error: no metadata supplied.";
+    }
+    
     $title = $metadata unless ($title);
-
+    # if no sortname specified, it defaults to metadata
+    $sortname = $metadata unless ($sortname); 
     $sortname = undef if $sortname =~ /^nosort$/;
-
-     my $subjectfile;
+    my $subjectfile;
 
     if (!$hfile) {
-          $self->{'construction_error'} = "Hierarchy error: No -hfile supplied.";
+    $self->{'construction_error'} = "Hierarchy error: No -hfile supplied.";
     }
     else 
-     {
-          $subjectfile = &util::filename_cat($ENV{'GSDLCOLLECTDIR'},"etc", $hfile);
-          if (!-e $subjectfile) {
-                my $collfile = $subjectfile;
-                $subjectfile = &util::filename_cat($ENV{'GSDLHOME'},"etc", $hfile);
-                if (!-e $subjectfile) {
-                     my $outhandle = $self->{'outhandle'};
-                     &print_usage;
-                     print STDERR "\nHierarchy Error: Can't locate subject file $hfile\n";
-                     print STDERR "This file should be in $collfile or $subjectfile\n";
-                     die "\n";
-                }
-          }
-     }
-
+    {
+    $subjectfile = &util::filename_cat($ENV{'GSDLCOLLECTDIR'},"etc", $hfile);
+    if (!-e $subjectfile) {
+        my $collfile = $subjectfile;
+        $subjectfile = &util::filename_cat($ENV{'GSDLHOME'},"etc", $hfile);
+        if (!-e $subjectfile) {
+        my $outhandle = $self->{'outhandle'};
+        &print_usage;
+        print STDERR "\nHierarchy Error: Can't locate subject file $hfile\n";
+        print STDERR "This file should be in $collfile or $subjectfile\n";
+        die "\n";
+        }
+    }
+    }
+    
     $self->{'descriptorlist'} = {}; # first field in subject file
     $self->{'locatorlist'} = {}; # second field in subject file
@@ -169 +170 @@
 sub init {
     my $self = shift (@_);
-
-     if(defined $self->{'construction_error'} || !defined $self->{'metaname'} || !defined $self->{'subjectfile'}) {
-          print STDERR "Error: " , $self->{'construction_error'} , "\n";
-          &print_usage;
-          die "\n";
-     }
-
+    
+    if(defined $self->{'construction_error'} || !defined $self->{'metaname'} || !defined $self->{'subjectfile'}) {
+    print STDERR "Error: " , $self->{'construction_error'} , "\n";
+    &print_usage;
+    die "\n";
+    }
+    
     # read in the subject file
     my $list = &cfgread::read_cfg_file ($self->{'subjectfile'}, undef, '^[^#]?\w');
@@ -194 +195 @@
     my $self = shift (@_);
     my ($doc_obj) = @_;
-
+    
     my $doc_OID = $doc_obj->get_OID();
-
+    
     my $metadata = $doc_obj->get_metadata ($doc_obj->get_top_section(),
                        $self->{'metaname'});
-
+    
     my $sortmeta = "";
     if (defined $self->{'sortname'}) {
@@ -217 +218 @@
     $sortmeta = "" unless defined $sortmeta;
     }
-
+    
     foreach $metaelement (@$metadata) {
     if ((defined $self->{'descriptorlist'}->{$metaelement}) &&
@@ -231 +232 @@
     
     my $list = $self->{'locatorlist'};
-
+    
     my ($classifyinfo);
     if ($self->{'hlist_at_top'}) {
@@ -238 +239 @@
     $classifyinfo = $self->get_entry ($self->{'title'}, "VList", "Invisible");
     }
-
-    foreach $OID (keys (%$list)) {
-
+    # sorted the keys - otherwise funny things happen - kjdon 03/01/03
+    foreach $OID (sort keys (%$list)) {
     my $tempinfo = $self->get_OID_entry ($OID, $classifyinfo, $list->{$OID}->{'title'}, "VList");
-
+    
     if (defined $self->{'sortname'}) {
         foreach $subOID (sort {$a->[1] cmp $b->[1];} @{$list->{$OID}->{'contents'}}) {