Changeset 32782 for main/trunk/greenstone2

Timestamp:

2019-02-18T20:27:42+13:00 (5 years ago)

Author:

ak19

Message:

Fix for Zeddy: empty lines and annoying spaces are now removed when metadata gets removed from doc xml files. Haven't tested the metadata xml variants, but changed them in symmetry.

File:

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

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

@@ -330 +330 @@
 }
 
-# the version of set_index_meta that doesn't do authentication
+# the version of set_archives_meta that doesn't do authentication
 sub _set_archives_metadata
 {
@@ -970 +970 @@
         
         if (ref($description_content)) {
-        # got some existing interesting nested content
-        push(@$description_content, "    ", $append_metadata ,"\n        ");
+        # got some existing interesting nested content      
+        push(@$description_content, "  ", $append_metadata, "\n  ");
         }
         else {
         #description_content is most likely a string such as "\n"
-        $attrHash->{'_content'} = [$description_content, "    ", $append_metadata ,"\n" ];
+        $attrHash->{'_content'} = [$description_content, "  ", $append_metadata ,"\n" ];
         }
         
@@ -1007 +1007 @@
     my $line;
     while (defined ($line=<MIN>)) {
-        $xml_in .= $line;
+        $xml_in .= $line if($line !~ m/^\s*$/); # preserve all but empty lines
     }
     close(MIN);
@@ -1413 +1413 @@
         my $line;
         while (defined ($line=<MIN>)) {
-            $xml_in .= $line;
+            $xml_in .= $line if($line !~ m/^\s*$/); # preserve all but empty lines
         }
         close(MIN); 
@@ -1603 +1603 @@
     }
 
-    push(@$description_content,"    ", $append_metadata ,"\n        ");
+    push(@$description_content, "  ", $append_metadata, "\n  ");
     $parser->{'parameters'}->{'metamode'} = "done";
     }
@@ -1745 +1745 @@
         my $line;
         while (defined ($line=<MIN>)) {
-            $xml_in .= $line;
+            $xml_in .= $line if($line !~ m/^\s*$/); # preserve all but empty lines
         }
         close(MIN); 
@@ -2154 +2154 @@
         my $line;
         while (defined ($line=<MIN>)) {
-            $xml_in .= $line;
+            $xml_in .= $line if($line !~ m/^\s*$/); # preserve all but empty lines
         }
         close(MIN);