Changeset 29098 for main/trunk/greenstone2

Timestamp:

2014-06-16T19:44:41+12:00 (10 years ago)

Author:

ak19

Message:

Removing import metadata needs to take into account prevmetavalue and and not delete all metavalues in override mode if metapos is undefined. In the case of prevmetavalue being defined, it should only handle prevmetavalue. Kathy had already fixed the archives_metadata case, and the index_metadata case does not deal with xml files but the database.

File:

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

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

@@ -2357 +2357 @@
             return [];
         }
-    }
-
-    if ((defined $parser->{'parameters'}->{'metapos'}) && ($parser->{'parameters'}->{'metaname'} eq $attrHash->{'name'}) && ($parser->{'parameters'}->{'poscount'} == $parser->{'parameters'}->{'metapos'}))
-    {   
-        return [];
-    }
-
-    if ((defined $parser->{'parameters'}->{'metavalue'}) && ($parser->{'parameters'}->{'metaname'} eq $attrHash->{'name'}) && ($parser->{'parameters'}->{'metavalue'} eq $attrHash->{'_content'}))
-    {   
-        return [];
+
+        if ((defined $parser->{'parameters'}->{'metapos'}) && ($parser->{'parameters'}->{'poscount'} == $parser->{'parameters'}->{'metapos'}))
+        {   
+            return [];
+        }
+        
+        if ((defined $parser->{'parameters'}->{'metavalue'}) && ($parser->{'parameters'}->{'metavalue'} eq $attrHash->{'_content'}))
+        {   
+            return [];
+        }
     }
     
@@ -2898 +2898 @@
     my $metadata_xml_filename = &util::filename_cat($import_dirname,"metadata.xml");
     
-    # 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
+    # If we're overriding everything, then $prevmetavalue=undefined and
+    # $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 able to set the overriding metavalue for this metaname
-    if(!defined $metapos && $metamode eq "override") {
+    if(!defined $prevmetavalue && !defined $metapos && $metamode eq "override") {
 ##  print STDERR "@@@ REMOVING all import metadata for $metaname\n";
     $self->remove_from_metadata_xml($gsdl_cgi, $metadata_xml_filename, $metaname, $metapos, undef, $import_tailname, $metamode); # we're removing all values, so metavalue=undef
@@ -3095 +3096 @@
 
         # 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'})) {
+        if ((defined $parser->{'parameters'}->{'metamode'}) && ($parser->{'parameters'}->{'metamode'} eq "override") && (!defined $parser->{'parameters'}->{'metapos'}) && (!defined $parser->{'parameters'}->{'metavalue'})) {
             return [];
         }
@@ -3103 +3104 @@
             return [];
         }
-
         if ((defined $parser->{'parameters'}->{'metavalue'}) && ($attrHash->{'_content'} eq $parser->{'parameters'}->{'metavalue'}))
         {
@@ -3306 +3306 @@
     $mess .= "  $metaname";
     $mess .= "->[$metapos]" if (defined $metapos);
+    $mess .= " ($metavalue)" if (defined $metavalue);
 
     $gsdl_cgi->generate_ok_message($mess);