Changeset 12893

Timestamp:

2006-09-28T11:29:39+12:00 (18 years ago)

Author:

mdewsnip

Message:

More variable name improvements.

File:

• trunk/gsdl/perllib/classify/GenericList.pm (modified) (11 diffs)

trunk/gsdl/perllib/classify/GenericList.pm

@@ -256 +256 @@
     # The root node of the classification hierarchy
     my $childtype = $self->{$first_metadata_group . ".list_type"};
-    my %classifyinfo = ( 'thistype' => "Invisible",
-             'childtype' => $childtype,
-             'Title' => $self->{'title'},
-             'contains' => [] );
+    my %classifier_node = ( 'thistype' => "Invisible",
+                'childtype' => $childtype,
+                'Title' => $self->{'title'},
+                'contains' => [] );
 
     # Recursively create the classification hierarchy, one level for each metadata element
-    &add_az_list($self, \@metadata_groups, \@OIDs, \%classifyinfo);
-    return \%classifyinfo;
+    &add_az_list($self, \@metadata_groups, \@OIDs, \%classifier_node);
+    return \%classifier_node;
 }
 
@@ -272 +272 @@
     my @metadata_groups = @{shift(@_)};
     my @OIDs = @{shift(@_)};
-    my $classifyinfo = shift(@_);
-    # print STDERR "\nAdding AZ list for " . $classifyinfo->{'Title'} . "\n";
+    my $classifier_node = shift(@_);
+    # print STDERR "\nAdding AZ list for " . $classifier_node->{'Title'} . "\n";
 
     my $metadata_group = $metadata_groups[0];
@@ -306 +306 @@
         # Is this the start of a new partition?
         if ($metavaluepartition ne $lastpartition) {
-        &add_hlist_partition($self, \@metadata_groups, $classifyinfo, $lastpartition, \%metavaluetoOIDsubhash);
+        &add_hlist_partition($self, \@metadata_groups, $classifier_node, $lastpartition, \%metavaluetoOIDsubhash);
         %metavaluetoOIDsubhash = ();
         $lastpartition = $metavaluepartition;
@@ -315 +315 @@
 
     # Don't forget to add the last partition
-    &add_hlist_partition($self, \@metadata_groups, $classifyinfo, $lastpartition, \%metavaluetoOIDsubhash);
+    &add_hlist_partition($self, \@metadata_groups, $classifier_node, $lastpartition, \%metavaluetoOIDsubhash);
 
     # The partitions are stored in an HList
-    $classifyinfo->{'childtype'} = "HList";
+    $classifier_node->{'childtype'} = "HList";
     }
 
@@ -348 +348 @@
             }
 
-            &add_hlist_partition($self, \@metadata_groups, $classifyinfo, $partitionname, \%metavaluetoOIDsubhash);
+            &add_hlist_partition($self, \@metadata_groups, $classifier_node, $partitionname, \%metavaluetoOIDsubhash);
             %metavaluetoOIDsubhash = ();
             $lastpartitionend = $partitionend;
@@ -355 +355 @@
 
         # The partitions are stored in an HList
-        $classifyinfo->{'childtype'} = "HList";
+        $classifier_node->{'childtype'} = "HList";
     }
 
     # Otherwise just add all the values to a VList
     else {
-        &add_vlist($self, \@metadata_groups, $classifyinfo, \%metavaluetoOIDhash);
+        &add_vlist($self, \@metadata_groups, $classifier_node, \%metavaluetoOIDhash);
     }
     }
@@ -418 +418 @@
     my $self = shift(@_);
     my @metadata_groups = @{shift(@_)};
-    my $classifyinfo = shift(@_);
+    my $classifier_node = shift(@_);
     my $partitionname = shift(@_);
     my %metavaluetoOIDhash = %{shift(@_)};
 
     # Create an hlist partition
-    my %subclassifyinfo = ( 'Title' => $partitionname,
-                'childtype' => "VList",
-                'contains' => [] );
+    my %child_classifier_node = ( 'Title' => $partitionname,
+                  'childtype' => "VList",
+                  'contains' => [] );
 
     # Add the children to the hlist partition
-    &add_vlist($self, \@metadata_groups, \%subclassifyinfo, \%metavaluetoOIDhash);
-    push(@{$classifyinfo->{'contains'}}, \%subclassifyinfo);
+    &add_vlist($self, \@metadata_groups, \%child_classifier_node, \%metavaluetoOIDhash);
+    push(@{$classifier_node->{'contains'}}, \%child_classifier_node);
 }
 
@@ -437 +437 @@
     my $self = shift(@_);
     my @metadata_groups = @{shift(@_)};
-    my $classifyinfo = shift(@_);
+    my $classifier_node = shift(@_);
     my %metavaluetoOIDhash = %{shift(@_)};
 
@@ -448 +448 @@
     # If there is only one item and 'always_bookshelf' is false, add the item to the list
     if (@OIDs == 1 && $self->{$metadata_group . ".always_bookshelf"} eq "f") {
-        push(@{$classifyinfo->{'contains'}}, { 'OID' => $OIDs[0] });
+        push(@{$classifier_node->{'contains'}}, { 'OID' => $OIDs[0] });
     }
 
     # Otherwise create a sublist (bookshelf) for the metadata value
     else {
-        my %subclassifyinfo = ( 'Title' => $metavalue,
-                    'childtype' => "VList",
-                    'contains' => [] );
+        my %child_classifier_node = ( 'Title' => $metavalue,
+                      'childtype' => "VList",
+                      'contains' => [] );
 
         # If there are metadata elements remaining, recursively apply the process
@@ -461 +461 @@
         my $next_metadata_group = $metadata_groups[0];
         my $childtype = $self->{$next_metadata_group . ".list_type"};
-        $subclassifyinfo{'childtype'} = $childtype;
-        &add_az_list($self, \@metadata_groups, \@OIDs, \%subclassifyinfo);
+        $child_classifier_node{'childtype'} = $childtype;
+        &add_az_list($self, \@metadata_groups, \@OIDs, \%child_classifier_node);
         }
         # Otherwise just add the documents as children of this list
@@ -476 +476 @@
 
         foreach my $OID (@OIDs) {
-            push(@{$subclassifyinfo{'contains'}}, { 'OID' => $OID });
+            push(@{$child_classifier_node{'contains'}}, { 'OID' => $OID });
         }
         }
 
         # Add the sublist to the list
-        push(@{$classifyinfo->{'contains'}}, \%subclassifyinfo);
+        push(@{$classifier_node->{'contains'}}, \%child_classifier_node);
     }
     }