Changeset 409 for trunk/gsdl/perllib

Timestamp:

1999-07-21T16:58:03+12:00 (25 years ago)

Author:

sjboddie

Message:

Tidied things up a bit

Location:

trunk/gsdl/perllib/classify

Files:

• AZList.pm (modified) (4 diffs)
• AZSectionList.pm (modified) (6 diffs)

trunk/gsdl/perllib/classify/AZList.pm

@@ -51 +51 @@
 
     my @classlist = sort {$self->{'list'}->{$a} cmp $self->{'list'}->{$b};} keys %{$self->{'list'}};
-    my $subclasses = $self->splitlist (\@classlist);
 
-    my ($classifyinfo);
-
-    if (scalar @$subclasses) {
-    $classifyinfo = $self->get_entry ($self->{'metaname'}, "AZList");
-    foreach $subclass (@$subclasses) {
-        my $tempclassify = $self->get_entry($subclass->[0], "AZList");
-        foreach $subsubOID (@{$subclass->[2]}) {
-        push (@{$tempclassify->{'contains'}}, {'OID'=>$subsubOID});
-        }
-        push (@{$classifyinfo->{'contains'}}, $tempclassify);
-    }
- 
-    } else {
-    $classifyinfo = $self->get_entry($self->{'metaname'}, "AZList");
-    foreach $subOID (@classlist) {
-        push (@{$classifyinfo->{'contains'}}, {'OID'=>$subOID});
-    }
-    }
-
-    return $classifyinfo;
+    return $self->splitlist (\@classlist);
 }
 
@@ -88 +68 @@
 
 # splitlist takes an ordered list of classifications (@$classlistref) and splits it
-# up into alphabetical sub-sections. returns a list reference each entry of which is 
-# in the form ["sub-section title", "sub-section number", [contents list]]
-# note that the title of each classification in @$classlistref is obtained from
-# $self->{'list'}->{$classlistref->[n]}
+# up into alphabetical sub-sections.
 sub splitlist {
     my $self = shift (@_);
     my ($classlistref) = @_;
     my $classhash = {};
-    my $rarr = [];
+
+    # top level
+    my $classifyinfo = $self->get_entry ($self->{'metaname'}, "AZList");
 
     # don't need to do any splitting if there are less than 20 classifications
-    return [] if ((scalar @$classlistref) <= 20);
-
+    if ((scalar @$classlistref) <= 20) {
+    foreach $subOID (@$classlistref) {
+        push (@{$classifyinfo->{'contains'}}, {'OID'=>$subOID});
+    }
+    return $classifyinfo;
+    }
+    
     # first split up the list into separate A-Z and 0-9 classifications
     foreach $classification (@$classlistref) {
@@ -113 +97 @@
     push (@{$classhash->{$title}}, $classification);
     }
-
     $classhash = $self->compactlist ($classhash);
 
@@ -128 +111 @@
     }
 
-    my $count = 1;
-    foreach $subsection (@tmparr) {
-    push (@$rarr, [$subsection, $count, $classhash->{$subsection}]);
-    $count ++;
+    foreach $subclass (@tmparr) {
+    my $tempclassify = $self->get_entry($subclass, "AZList");
+    foreach $subsubOID (@{$classhash->{$subclass}}) {
+        push (@{$tempclassify->{'contains'}}, {'OID'=>$subsubOID});
+    }
+    push (@{$classifyinfo->{'contains'}}, $tempclassify);
     }
 
-    return $rarr;
+    return $classifyinfo;
 }
 

trunk/gsdl/perllib/classify/AZSectionList.pm

@@ -17 +17 @@
 
     if (!defined @options || !scalar @options) {
-    die "AZList used with no metadata name to classify by\n";
+    die "AZSectionList used with no metadata name to classify by\n";
     }
 
@@ -52 +52 @@
         }
         if (defined $self->{'list'}->{"$doc_OID.$thissection"}) {
-        print STDERR "WARNING: AZList::classify called multiple times for $doc_OID\n";
+        print STDERR "WARNING: AZSectionList::classify called multiple times for $doc_OID\n";
         } 
         $self->{'list'}->{"$doc_OID.$thissection"} = $metavalue;
@@ -60 +60 @@
 }
 
+
 sub get_classify_info {
     my $self = shift (@_);
 
     my @classlist = sort {$self->{'list'}->{$a} cmp $self->{'list'}->{$b};} keys %{$self->{'list'}};
-    my $subclasses = $self->splitlist (\@classlist);
-
-    my ($classifyinfo);
-
-    if (scalar @$subclasses) {
-    $classifyinfo = $self->get_entry ($self->{'metaname'}, "AZList");
-    foreach $subclass (@$subclasses) {
-        my $tempclassify = $self->get_entry($subclass->[0], "AZList");
-        foreach $subsubOID (@{$subclass->[2]}) {
-        push (@{$tempclassify->{'contains'}}, {'OID'=>$subsubOID});
-        }
-        push (@{$classifyinfo->{'contains'}}, $tempclassify);
-    }
- 
-    } else {
-    $classifyinfo = $self->get_entry($self->{'metaname'}, "AZList");
-    foreach $subOID (@classlist) {
-        push (@{$classifyinfo->{'contains'}}, {'OID'=>$subOID});
-    }
-    }
-
-    return $classifyinfo;
+
+    return $self->splitlist (\@classlist);
 }
 
@@ -101 +82 @@
 
 # splitlist takes an ordered list of classifications (@$classlistref) and splits it
-# up into alphabetical sub-sections. returns a list reference each entry of which is 
-# in the form ["sub-section title", "sub-section number", [contents list]]
-# note that the title of each classification in @$classlistref is obtained from
-# $self->{'list'}->{$classlistref->[n]}
+# up into alphabetical sub-sections.
 sub splitlist {
     my $self = shift (@_);
     my ($classlistref) = @_;
     my $classhash = {};
-    my $rarr = [];
+
+    # top level
+    my $classifyinfo = $self->get_entry ($self->{'metaname'}, "AZList");
 
     # don't need to do any splitting if there are less than 20 classifications
-    return [] if ((scalar @$classlistref) <= 20);
-
+    if ((scalar @$classlistref) <= 20) {
+    foreach $subOID (@$classlistref) {
+        push (@{$classifyinfo->{'contains'}}, {'OID'=>$subOID});
+    }
+    return $classifyinfo;
+    }
+    
     # first split up the list into separate A-Z and 0-9 classifications
     foreach $classification (@$classlistref) {
@@ -121 +106 @@
     if ($title =~ /^[0-9]$/) {$title = '0-9';}
     elsif ($title !~ /^[A-Z]$/) {
-        print STDERR "AZList: WARNING $classification has badly formatted title ($title)\n";
+        print STDERR "AZSectionList: WARNING $classification has badly formatted title ($title)\n";
     }
     $classhash->{$title} = [] unless defined $classhash->{$title};
     push (@{$classhash->{$title}}, $classification);
     }
-
     $classhash = $self->compactlist ($classhash);
 
@@ -141 +125 @@
     }
 
-    my $count = 1;
-    foreach $subsection (@tmparr) {
-    push (@$rarr, [$subsection, $count, $classhash->{$subsection}]);
-    $count ++;
-    }
-
-    return $rarr;
+    foreach $subclass (@tmparr) {
+    my $tempclassify = $self->get_entry($subclass, "AZList");
+    foreach $subsubOID (@{$classhash->{$subclass}}) {
+        push (@{$tempclassify->{'contains'}}, {'OID'=>$subsubOID});
+    }
+    push (@{$classifyinfo->{'contains'}}, $tempclassify);
+    }
+
+    return $classifyinfo;
 }