Changeset 29086

Timestamp:

2014-05-29T14:31:45+12:00 (10 years ago)

Author:

kjdon

Message:

need to decode prevmetavalue in same way as metavalue. clear all metadata only if metapos AND metavalue are empty

File:

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

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

@@ -168 +168 @@
     $url_decoded_metavalue = join("",map(chr($_),@$unicode_array));
     $gsdl_cgi->param("metavalue",$url_decoded_metavalue);
+
+    # need to do the same with prevmetavalue
+    my $url_encoded_prevmetavalue = $gsdl_cgi->param("prevmetavalue");
+    my $url_decoded_prevmetavalue = &unicode::url_decode($url_encoded_prevmetavalue,1);
+    my $prevunicode_array = &unicode::utf82unicode($url_decoded_prevmetavalue);
+
+    $url_decoded_prevmetavalue = join("",map(chr($_),@$prevunicode_array));
+    $gsdl_cgi->param("prevmetavalue",$url_decoded_prevmetavalue);
 
     my $self = new baseaction($action_table,$gsdl_cgi,$iis6_mode);
@@ -2221 +2229 @@
     if ($status == 0) 
     {
-        my $mess = "remove-archives-metadata successful: Key[$docid]\n";
+        my $mess = "\nremove-archives-metadata successful: \nKey[$docid]\n";
         $mess .= "  $metaname";
         $mess .= "->[$metapos]" if (defined $metapos);
-
+        $mess .= " ($metavalue)" if (defined $metavalue);
         $gsdl_cgi->generate_ok_message($mess);  
     }
@@ -2346 +2354 @@
         
         # if overriding (for set-meta) but no metapos, then clear all the meta for this metaname
-        if ((defined $parser->{'parameters'}->{'metamode'}) && ($parser->{'parameters'}->{'metamode'} eq "override") && (!defined $parser->{'parameters'}->{'metapos'})) {          
+        if ((defined $parser->{'parameters'}->{'metamode'}) && ($parser->{'parameters'}->{'metamode'} eq "override") && (!defined $parser->{'parameters'}->{'metapos'}) &&(!defined $parser->{'parameters'}->{'metavalue'})) {          
             return [];
         }