Changeset 33311 for main

Timestamp:

2019-07-08T17:24:19+12:00 (5 years ago)

Author:

ak19

Message:

Bugfix to metadataaction, which hadn't been calculating subsections correctly past 1.x. If any section has subsections, then the next section wasn't being incremented at the correct time with the increment lagging. For example, 3, 3.1, 3.2 ... 3.6, then 3 again instead of being immediately changed to 4 when necessary.

File:

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

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

@@ -1088 +1088 @@
     my $old_depth  = $parser->{'parameters'}->{'curr_section_depth'};
     my $old_secnum = $parser->{'parameters'}->{'curr_section_num'};
-
+    
     my $new_secnum;
 
@@ -1096 +1096 @@
     }
     elsif ($new_depth == $old_depth) {
-    # sibling section => increase it's value by 1
+    # sibling section => increase its value by 1
     my ($tail_num) = ($old_secnum =~ m/\.(\d+)$/);
     $tail_num++;
@@ -1106 +1106 @@
     $new_secnum = $old_secnum;
     $new_secnum =~ s/\.\d+$//;
+    # remember to increment from parent section
+    my ($tail_num) = ($new_secnum =~ m/\.(\d+)$/);
+    $tail_num++;
+    $new_secnum =~ s/\.(\d+)$/\.$tail_num/;
     }
 
     $parser->{'parameters'}->{'curr_section_depth'} = $new_depth;
     $parser->{'parameters'}->{'curr_section_num'}   = $new_secnum;
-    
+
+    #print STDERR "**** START SECTION - $new_secnum\n************************\n\n";
     1;
 }