Changeset 545 for trunk/gsdl/perllib/classify/SectionList.pm

Timestamp:

1999-09-08T12:27:29+12:00 (25 years ago)

Author:

sjboddie

Message:

changed sorting slightly

File:

• trunk/gsdl/perllib/classify/SectionList.pm (modified) (4 diffs)

trunk/gsdl/perllib/classify/SectionList.pm

@@ -86 +86 @@
     my $self = shift (@_);
 
-    if (defined $self->{'metaname'}) {
+    if (defined $self->{'sortname'}) {
     $self->{'list'} = {};
     } else {
@@ -128 +128 @@
     $sortmeta = "" unless defined $sortmeta;
 
-    if (defined $self->{'metaname'}) {
+    if (defined $self->{'sortname'}) {
+    if (defined $self->{'metaname'}) {
 
-    my $metavalue = $doc_obj->get_metadata_element ($section, $self->{'metaname'});
-    if (defined $metavalue) {
+        my $metavalue = $doc_obj->get_metadata_element ($section, $self->{'metaname'});
+        if (defined $metavalue) {
+        if (defined $self->{'list'}->{"$doc_OID.$section"}) {
+            print STDERR "WARNING: SectionList::classify called multiple times for $doc_OID.$section\n";
+        } 
+        $self->{'list'}->{"$doc_OID.$section"} = $sortmeta;
+        }
+    } else {
         if (defined $self->{'list'}->{"$doc_OID.$section"}) {
         print STDERR "WARNING: SectionList::classify called multiple times for $doc_OID.$section\n";
@@ -137 +144 @@
         $self->{'list'}->{"$doc_OID.$section"} = $sortmeta;
     }
+
     } else {
-    push (@{$self->{'list'}}, "$doc_OID.$section");
+    if (defined $self->{'metaname'}) {
+
+        my $metavalue = $doc_obj->get_metadata_element ($section, $self->{'metaname'});
+        if (defined $metavalue) {
+        push (@{$self->{'list'}}, "$doc_OID.$section");
+        }
+    } else {
+        push (@{$self->{'list'}}, "$doc_OID.$section");
+    }
     }
 }
@@ -145 +161 @@
     my $self = shift (@_);
 
-    my $contains = "";
     my @list = ();
-    if (defined $self->{'metaname'}) {
+    if (defined $self->{'sortname'}) {
     if (keys %{$self->{'list'}}) {
         @list = sort {$self->{'list'}->{$a}