Changeset 32076 for main/trunk/greenstone2/perllib/cgiactions/modmetadataaction.pm

Timestamp:

2017-11-21T14:42:25+13:00 (6 years ago)

Author:

kjdon

Message:

Bugfix (with debugging left in). The set-archive-metadata would overwrite the very first metadata value for the specified tag if metapos not provided even if prevmetavalue was provided. Changed the logic for handling metapos, prevmetavalue when setting archive metadata to fix this.

File:

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

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

@@ -840 +840 @@
 
     my $curr_secnum = $parser->{'parameters'}->{'curr_section_num'};
-##    print STDERR "**** checking $opt_doc_secnum <=> $curr_secnum\n";
-##    print STDERR "**** metamode = $metamode\n";
+    print STDERR "**** checking $opt_doc_secnum <=> $curr_secnum\n" if (defined $opt_doc_secnum);
+   print STDERR "**** metamode = $metamode\n";
     
     if ((!defined $opt_doc_secnum) || ($opt_doc_secnum eq $curr_secnum)) 
     {
         my $name_attr = $attrHash->{'name'};
-        # print STDOUT "*** testing: $name_attr eq $metaname ?   and  $metamode eq override ?\n";
+         print STDOUT "*** testing: $name_attr eq $metaname ?   and  $metamode eq override ?\n";
         if (($name_attr eq $metaname) && ($metamode eq "override")) 
         {
@@ -858 +858 @@
             } 
             
-            if ((defined $parser->{'parameters'}->{'metapos'} && $parser->{'parameters'}->{'poscount'} == $parser->{'parameters'}->{'metapos'})
-                || (!defined $parser->{'parameters'}->{'metapos'} && $parser->{'parameters'}->{'poscount'} == 0))
-                
-            {
-                ##print STDERR "#### got match!!\n";
+            if (defined $parser->{'parameters'}->{'metapos'}) {
+
+                if ($parser->{'parameters'}->{'poscount'} == $parser->{'parameters'}->{'metapos'}) {
+                print STDERR "#### got pos match!!\n";
                 # Get the value and override the current value
                 my $metavalue = $parser->{'parameters'}->{'metavalue'};
@@ -868 +867 @@
                 
                 # Don't want it to wipe out any other pieces of metadata
-                $parser->{'parameters'}->{'metamode'} = "done";
+                $parser->{'parameters'}->{'metamode'} = "done";
+                }
             }
-            elsif (defined $parser->{'parameters'}->{'prevmetavalue'} && $parser->{'parameters'}->{'prevmetavalue'} eq $attrHash->{'_content'})
-            {
+            elsif (defined $parser->{'parameters'}->{'prevmetavalue'}) {
+                if ($parser->{'parameters'}->{'prevmetavalue'} eq $attrHash->{'_content'}) {
+                print STDERR "### prev meta value matches\n";
                 my $metavalue = $parser->{'parameters'}->{'metavalue'};
                 $attrHash->{'_content'} = $metavalue;
                 $parser->{'parameters'}->{'metamode'} = "done";
+
+                }
             }
+            elsif ($parser->{'parameters'}->{'poscount'} == 0) { # explicit catch all
+                print STDERR "#### got pos match!!\n";
+                # Get the value and override the current value
+                my $metavalue = $parser->{'parameters'}->{'metavalue'};
+                $attrHash->{'_content'} = $metavalue;
+                
+                # Don't want it to wipe out any other pieces of metadata
+                $parser->{'parameters'}->{'metamode'} = "done";
+
+                
+            }
+
+            
+            
         }
-    }
+    }
 
     # RAW is [$tagname => $attrHash] not $tagname => $attrHash!!