Changeset 30058 for main

Timestamp:

2015-07-26T18:19:32+12:00 (9 years ago)

Author:

davidb

Message:

More careful checking/testing of parameters so an override is performed (in a particular case), rather than automatically switching to accumulate

File:

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

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

@@ -1706 +1706 @@
     if ((!defined $opt_doc_secnum) || ($opt_doc_secnum eq $curr_secnum)) 
     {
-        my $name_attr = $attrHash->{'name'};
+        my $name_attr = $attrHash->{'name'};
+        # print STDOUT "*** testing: $name_attr eq $metaname ?   and  $metamode eq override ?\n";
         if (($name_attr eq $metaname) && ($metamode eq "override")) 
         {
@@ -1718 +1719 @@
             } 
             
-            if(defined $parser->{'parameters'}->{'metapos'} && $parser->{'parameters'}->{'poscount'} == $parser->{'parameters'}->{'metapos'})
+            if ((defined $parser->{'parameters'}->{'metapos'} && $parser->{'parameters'}->{'poscount'} == $parser->{'parameters'}->{'metapos'})
+                || (!defined $parser->{'parameters'}->{'metapos'} && $parser->{'parameters'}->{'poscount'} == 0))
+                
             {
                 ##print STDERR "#### got match!!\n";
@@ -1728 +1731 @@
                 $parser->{'parameters'}->{'metamode'} = "done";
             }
-            elsif(defined $parser->{'parameters'}->{'prevmetavalue'} && $parser->{'parameters'}->{'prevmetavalue'} eq $attrHash->{'_content'})
+            elsif (defined $parser->{'parameters'}->{'prevmetavalue'} && $parser->{'parameters'}->{'prevmetavalue'} eq $attrHash->{'_content'})
             {
                 my $metavalue = $parser->{'parameters'}->{'metavalue'};
@@ -1804 +1807 @@
         && ($metamode eq "accumulate" || $metamode eq "override")) {
         if ($metamode eq "override") {
-        print "No metadata value to override.  Switching 'metamode' to accumulate\n";
+        print "Got to end of <Description> block. No metadata value to override.  Switching 'metamode' to accumulate\n";
         }