Changeset 27160

Timestamp:

2013-04-08T19:29:39+12:00 (11 years ago)

Author:

ak19

Message:

Committing bugfix discovered during restructuring of code (the restructured code is still being tested). Previously, the remove_archives_meta subroutine was ignoring any metavalue that was provided (and was instead always deleting the first metavalue for a metaname, unless metapos was explicitly set), whereas the rfdxml_metadata parse function clearly contained code to handle deleting a specified metavalue. Now remove_archives_meta checks for metapos and metavalue, and if both/either is set the specified value(s) are deleted. If neither is set, then metapos defaults to 0 as in the past and the first metavalue for the given metaname is deleted.

File:

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

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

@@ -1455 +1455 @@
     my $metaname = $self->{'metaname'};
     my $metapos = $self->{'metapos'};
-    $metapos = 0 if (!defined $metapos);
+    my $metavalue = $self->{'metavalue'} || undef; # necessary to force fallback to undef here
+
+    # if the user hasn't told us what to delete, not having given a metavalue or metapos,
+    # default to deleting the first metavalue for the given metaname
+    # Beware that if both metapos AND metavalue are defined, both matches (if any) 
+    # seem to get deleted in one single remove_archives_meta action invocation.
+    # Similarly, if 2 identical metavalues for a metaname exist and that metavalue is being
+    # deleted, both get deleted.
+    if(!defined $metapos && !defined $metavalue) {
+        $metapos = 0;
+    }
     
     my $arcinfo_doc_filename = &dbutil::get_infodb_file_path($infodbtype, "archiveinf-doc", $archive_dir);
@@ -1463 +1473 @@
     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, undef, $docid_secnum);
+    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, undef, $docid_secnum);
     
     if ($status == 0)