Changeset 29084 for main/trunk/greenstone2/perllib

Timestamp:

2014-05-29T11:37:53+12:00 (10 years ago)

Author:

kjdon

Message:

when editing metadata from the on line library (log in, and edit content), we are not passing in a metapos when changing a value. we are passing in the previous value. So need to test that metapos and prevvalue are both empty before deleting all values of a particular meta elem. Otherwise if we are editing a piece of metadata on line, then all the other values are deleted.

File:

• main/trunk/greenstone2/perllib/cgiactions/metadataaction.pm (modified) (1 diff)

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

@@ -2009 +2009 @@
     my $doc_xml_filename = &util::filename_cat($archives_dir,$doc_xml_file);
 
-    # If we're overriding everything, then $metamode=override combined with $metapos=undefined
+    # If we're overriding everything, then $metamode=override combined with $metapos=undefined and $prevmetavalue=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);
-    }
-
+    if (!defined $prevmetavalue && !defined $metapos && $metamode eq "override") {
+    # remove all values of $metaname metadata 
+    $self->remove_from_doc_xml($gsdl_cgi, &util::filename_cat($archive_dir, $doc_xml_file), $metaname, undef, undef, $docid_secnum, $metamode);
+    }
     # Edit the doc.xml file with the specified metadata name, value and position.
     # TODO: there is a potential problem here as this edit_doc_xml function