Changeset 27162

Timestamp:

2013-04-09T18:58:07+12:00 (11 years ago)

Author:

ak19

Message:

Fixed bug in remove_index_metadata: it was specifically including the metavalue to be deleted in the metadata that was to be retained (the erroneous line was pushing metavalue instead of metaval onto filtered_metadata).

File:

• main/trunk/greenstone2/perllib/cgiactions/metadataaction.pm (modified) (3 diffs)

main/trunk/greenstone2/perllib/cgiactions/metadataaction.pm

@@ -2208 +2208 @@
     my $metaname  = $self->{'metaname'};
     my $metapos   = $self->{'metapos'};
-    my $metavalue = $self->{'metavalue'};
+    my $metavalue = $self->{'metavalue'} || undef; # necessary to force fallback to undef here
 
     # To people who know $collect_tail please add some comments
@@ -2244 +2244 @@
 
     # Obtain the specified metadata pos
-    $metapos = 0 if (!defined $metapos);
+    if(!defined $metapos && !defined $metavalue) { #$metapos = 0 if (!defined $metapos);
+        $metapos = 0;
+    }
 
     # consider check key is defined before deleting?
@@ -2254 +2256 @@
 
     if (!defined $metavalue && $i != $metapos) {
-        push(@$filtered_metadata,$metaval)
+        push(@$filtered_metadata,$metaval);
     }
     
     if(defined $metavalue && !($metavalue eq $metaval))
     {
-        push(@$filtered_metadata,$metavalue)
+        push(@$filtered_metadata,$metaval);
     }
     }