Changeset 32061

Timestamp:

2017-11-06T18:54:37+13:00 (6 years ago)

Author:

ak19

Message:

Moving two subroutines from modmetadataaction.pm to metadataaction.pm since they're already referenced in metadataaction.pm; and since metadataaction.pm includes modmetadataaction.pm anyway, so modmeta won't be missing the moved subroutines.

Location:

main/trunk/greenstone2/perllib/cgiactions

Files:

• metadataaction.pm (modified) (2 diffs)
• modmetadataaction.pm (modified) (2 diffs)

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

@@ -841 +841 @@
 }
 
+sub mxml_filename
+{
+    my ($tagname, $attrHash, $contextArray, $parentDataArray, $parser) = @_;
+
+    # Store the filename of the Current Fileset
+    # Note: According to http://greenstone.org/dtd/DirectoryMetadata/1.0/DirectoryMetadata.dtd
+    # FileName tag must come before Description tag
+    $parser->{'parameters'}->{'current_file'} = $attrHash->{'_content'};
+
+    # RAW is [$tagname => $attrHash] not $tagname => $attrHash!!
+    return [$tagname => $attrHash];
+}
+
 sub get_archives_metadata
 {
@@ -949 +962 @@
 }
 
+
+sub dxml_start_section
+{
+    my ($tagname, $attrHash, $contextArray, $parentDataArray, $parser) = @_;
+
+    my $new_depth = scalar(@$contextArray);
+
+#   print STDERR "**** START SECTION \n";
+    
+    if ($new_depth == 1) {
+    $parser->{'parameters'}->{'curr_section_depth'} = 1;
+    $parser->{'parameters'}->{'curr_section_num'}   = "";
+    }
+
+    my $old_depth  = $parser->{'parameters'}->{'curr_section_depth'};
+    my $old_secnum = $parser->{'parameters'}->{'curr_section_num'};
+
+    my $new_secnum;
+
+    if ($new_depth > $old_depth) {
+    # child subsection
+    $new_secnum = "$old_secnum.1";
+    }
+    elsif ($new_depth == $old_depth) {
+    # sibling section => increase it's value by 1
+    my ($tail_num) = ($old_secnum =~ m/\.(\d+)$/);
+    $tail_num++;
+    $new_secnum = $old_secnum;
+    $new_secnum =~ s/\.(\d+)$/\.$tail_num/;
+    }
+    else {
+    # back up to parent section => lopp off tail
+    $new_secnum = $old_secnum;
+    $new_secnum =~ s/\.\d+$//;
+    }
+
+    $parser->{'parameters'}->{'curr_section_depth'} = $new_depth;
+    $parser->{'parameters'}->{'curr_section_num'}   = $new_secnum;
+    
+    1;
+}
+
 1;

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

@@ -987 +987 @@
 }
 
-
-sub dxml_start_section
-{
-    my ($tagname, $attrHash, $contextArray, $parentDataArray, $parser) = @_;
-
-    my $new_depth = scalar(@$contextArray);
-
-#   print STDERR "**** START SECTION \n";
-    
-    if ($new_depth == 1) {
-    $parser->{'parameters'}->{'curr_section_depth'} = 1;
-    $parser->{'parameters'}->{'curr_section_num'}   = "";
-    }
-
-    my $old_depth  = $parser->{'parameters'}->{'curr_section_depth'};
-    my $old_secnum = $parser->{'parameters'}->{'curr_section_num'};
-
-    my $new_secnum;
-
-    if ($new_depth > $old_depth) {
-    # child subsection
-    $new_secnum = "$old_secnum.1";
-    }
-    elsif ($new_depth == $old_depth) {
-    # sibling section => increase it's value by 1
-    my ($tail_num) = ($old_secnum =~ m/\.(\d+)$/);
-    $tail_num++;
-    $new_secnum = $old_secnum;
-    $new_secnum =~ s/\.(\d+)$/\.$tail_num/;
-    }
-    else {
-    # back up to parent section => lopp off tail
-    $new_secnum = $old_secnum;
-    $new_secnum =~ s/\.\d+$//;
-    }
-
-    $parser->{'parameters'}->{'curr_section_depth'} = $new_depth;
-    $parser->{'parameters'}->{'curr_section_num'}   = $new_secnum;
-    
-    1;
-}
-
 sub edit_xml_file
 {
@@ -1651 +1609 @@
 
 
-sub mxml_filename
-{
-    my ($tagname, $attrHash, $contextArray, $parentDataArray, $parser) = @_;
-
-    # Store the filename of the Current Fileset
-    # Note: According to http://greenstone.org/dtd/DirectoryMetadata/1.0/DirectoryMetadata.dtd
-    # FileName tag must come before Description tag
-    $parser->{'parameters'}->{'current_file'} = $attrHash->{'_content'};
-
-    # RAW is [$tagname => $attrHash] not $tagname => $attrHash!!
-    return [$tagname => $attrHash];
-}
-
-
 sub mxml_fileset
 {