Changeset 32077 for main

Timestamp:

2017-11-21T16:02:00+13:00 (6 years ago)

Author:

kjdon

Message:

Removed debugging, and added some comments.

File:

• main/trunk/greenstone2/perllib/cgiactions/modmetadataaction.pm (modified) (4 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" if (defined $opt_doc_secnum);
-   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'}) {
+            if (defined $parser->{'parameters'}->{'metapos'}) { # if pos defined, ignore any prevmeta if also defined, and just wait for pos match
 
                 if ($parser->{'parameters'}->{'poscount'} == $parser->{'parameters'}->{'metapos'}) {
@@ -870 +870 @@
                 }
             }
-            elsif (defined $parser->{'parameters'}->{'prevmetavalue'}) {
+            elsif (defined $parser->{'parameters'}->{'prevmetavalue'}) { # if no pos defined but prevmeta defined, then wait for prevmeta match
                 if ($parser->{'parameters'}->{'prevmetavalue'} eq $attrHash->{'_content'}) {
                 print STDERR "### prev meta value matches\n";
@@ -879 +879 @@
                 }
             }
-            elsif ($parser->{'parameters'}->{'poscount'} == 0) { # explicit catch all
+            elsif ($parser->{'parameters'}->{'poscount'} == 0) { # explicit catch all - ignored!!!! 
+                # If no pos or prevmeta defined, then metavalue set for metaname becomes the ONLY instance of that metaname!!!
                 print STDERR "#### got pos match!!\n";
                 # Get the value and override the current value