Changeset 21969

Timestamp:

2010-04-27T16:00:59+12:00 (14 years ago)

Author:

kjdon

Message:

store the offsets in add_vlist for all the cases, not just for when there is only one item for a particular metadata value

File:

• main/trunk/greenstone2/perllib/classify/List.pm (modified) (5 diffs)

main/trunk/greenstone2/perllib/classify/List.pm

@@ -793 +793 @@
     if (@OIDs == 1 && $self->{$metadata_group . ".bookshelf_type"} ne "always") {
         my $OID = $OIDs[0];
-
-        # Find the offset of this metadata value
-        my $offset = 0;
-        my $OID_to_metadata_values_hash_ref = $self->{$metadata_group . ".list"};
-        my @metadata_values = @{$OID_to_metadata_values_hash_ref->{$OID}};
-        for (my $i = 0; $i < scalar(@metadata_values); $i++) {
-        if ($metadata_value eq $metadata_values[$i]) {
-            $offset = $i;
-            last;
-        }
-        }
+        my $offset = $self->metadata_offset($metadata_group, $OID, $metadata_value);
         push(@{$classifier_node->{'contains'}}, { 'OID' => $OID, 'offset' => $offset });
-    } 
+    }
     # If 'bookshelf_type' is 'never', list all the items even if there are duplicated values
     elsif ($self->{$metadata_group . ".bookshelf_type"} eq "never") {
-       $self->add_sorted_leaf_items(\@OIDs, $classifier_node); 
+        @OIDs = $self->sort_leaf_items(\@OIDs);
+        foreach my $OID (@OIDs) {
+        my $offset = $self->metadata_offset($metadata_group, $OID, $metadata_value);
+        push(@{$classifier_node->{'contains'}}, { 'OID' => $OID , 'offset' => $offset });
+        }
+    
     }
     # Otherwise create a sublist (bookshelf) for the metadata value
@@ -814 +809 @@
         my %child_classifier_node = ( 'Title' => $self->convert_unicode_string_to_utf8_string($metadata_value),
                       'childtype' => "VList",
+                      'mdtype' => $metadata_group,
                       'contains' => [] );
 
@@ -824 +820 @@
         # Otherwise just add the documents as children of this list
         else {
-        $self->add_sorted_leaf_items(\@OIDs, \%child_classifier_node); 
+        @OIDs = $self->sort_leaf_items(\@OIDs);
+        foreach my $OID (@OIDs) {
+            my $offset = $self->metadata_offset($metadata_group, $OID, $metadata_value);
+            push(@{$child_classifier_node{'contains'}}, { 'OID' => $OID , 'offset' => $offset });
+        }
+
         }
 
@@ -833 +834 @@
 }
 
-sub add_sorted_leaf_items
+sub metadata_offset
+{
+    my $self = shift(@_);
+    my $metadata_group = shift(@_);
+    my $OID = shift(@_);
+    my $metadata_value = shift(@_);
+    
+    my $OID_to_metadata_values_hash_ref = $self->{$metadata_group . ".list"};
+    my @metadata_values = @{$OID_to_metadata_values_hash_ref->{$OID}};
+    for (my $i = 0; $i < scalar(@metadata_values); $i++) {
+    if ($metadata_value eq $metadata_values[$i]) {
+        return $i;
+    }
+    }
+    
+    return 0;
+}
+
+sub sort_leaf_items
 {
     my $self = shift(@_);
     my @OIDs = @{shift(@_)};
-    my $classifier_node = shift(@_);    
+#    my $classifier_node = shift(@_);
     
     # Sort leaf nodes and add to list
@@ -847 +866 @@
     @OIDs = @OIDs[ sort { $OID_to_metadata_values_hash_ref->{$OIDs[$a]}[0] cmp $OID_to_metadata_values_hash_ref->{$OIDs[$b]}[0] || $a <=> $b; } 0..$#OIDs ];
     }
-
-    foreach my $OID (@OIDs) {
-    push(@{$classifier_node->{'contains'}}, { 'OID' => $OID });
-    }
-}
+    return @OIDs;
+}
+