Changeset 27167

Timestamp:

2013-04-10T17:37:04+12:00 (11 years ago)

Author:

ak19

Message:

Another bugfix: when doing a set_archives_meta with metamode=override, it was overwriting only the first metavalue of a metaname but preserving the rest. That behaviour is only supposed to happen if metamode=override combined with metapos=0. But when metamode=override and no metapos is defined, need to remove all metavalues for the given metaname, and then set the archives metadata for that metaname to the newly provided metavalue.

File:

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

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

@@ -717 +717 @@
     my $prevmetavalue = $self->{'prevmetavalue'};
     
-    my $metapos    = $self->{'metapos'};
-    $metapos = 0 if (!defined $metapos);
+    my $metapos    = $self->{'metapos'}; # Don't append "|| undef", since if metapos=0 it will then be set to undef
+
+    # Don't set metapos=0 if it's undefined, as doing so will interfere when overriding all values for a metaname
+    # (all values for a metaname should get overridden if metamode=override combined with no user-defined metapos)
 
     my $metamode   = $self->{'metamode'};
@@ -725 +727 @@
     # delete any existing values)
     $metamode = "accumulate";
-    } 
+    }
     
     my $status = $self->set_archives_metadata_entry($gsdl_cgi,$archive_dir, $collect_dir,$collect, $infodbtype,$docid,
@@ -1312 +1314 @@
     my $archives_dir = &util::filename_cat($collect_dir,$collect,"archives");    
     my $doc_xml_filename = &util::filename_cat($archives_dir,$doc_xml_file);
+
+    # If we're overriding everything, then $metamode=override combined with $metapos=undefined
+    # in which case, we need to remove all metavalues for the metaname at the given (sub)section
+    # Thereafter, we will finally be setting the overriding metavalue for this metaname
+    if(!defined $metapos && $metamode eq "override") {
+    $self->remove_from_doc_xml($gsdl_cgi, &util::filename_cat($archive_dir, $doc_xml_file), $metaname, $metapos, undef, $docid_secnum, $metamode);
+    }
     
     # Edit the doc.xml file with the specified metadata name, value and position.
@@ -1466 +1475 @@
         $metapos = 0;
     }
+
+    my $metamode = $self->{'metamode'} || undef;    
     
     my $arcinfo_doc_filename = &dbutil::get_infodb_file_path($infodbtype, "archiveinf-doc", $archive_dir);
@@ -1473 +1484 @@
     my $doc_filename = $doc_rec->{'doc-file'}->[0]; 
 
-    my $status = $self->remove_from_doc_xml($gsdl_cgi, &util::filename_cat($archive_dir, $doc_filename), $metaname, $metapos, $metavalue, $docid_secnum);
+    my $status = $self->remove_from_doc_xml($gsdl_cgi, &util::filename_cat($archive_dir, $doc_filename), $metaname, $metapos, $metavalue, $docid_secnum, $metamode);
 #   my $status = $self->remove_from_doc_xml($gsdl_cgi, &util::filename_cat($archive_dir, $doc_filename), $metaname, $metapos, undef, $docid_secnum);
     
@@ -1523 +1534 @@
 {
     my $self = shift @_;
-    my ($gsdl_cgi, $doc_xml_filename, $metaname, $metapos, $metavalue, $secid) = @_;
+    my ($gsdl_cgi, $doc_xml_filename, $metaname, $metapos, $metavalue, $secid, $metamode) = @_;
     
     my @start_rules = ('Section' => \&dxml_start_section);
@@ -1568 +1579 @@
         else {
             binmode($MOUT,":utf8");
-            $parser->filter($xml_in, $MOUT, {metaname => $metaname, metapos => $metapos, metavalue => $metavalue, secid => $secid});
+            $parser->filter($xml_in, $MOUT, {metaname => $metaname, metapos => $metapos, metavalue => $metavalue, secid => $secid, metamode => $metamode});
             close($MOUT);       
         }
@@ -1594 +1605 @@
         {
             $parser->{'parameters'}->{'poscount'}++;
+        }
+
+        # if overriding 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'})) {          
+            return [];
         }
     }