Changeset 36293

Timestamp:

2022-07-21T16:43:01+12:00 (22 months ago)

Author:

anupama

Message:

Forgot to commit minor change for GS3 to LOMPlugin previously. If GS3, no line feed character (backslash-n) added into value of the MetadataTable metadata.

File:

• main/trunk/greenstone2/perllib/plugins/LOMPlugin.pm (modified) (6 diffs)

main/trunk/greenstone2/perllib/plugins/LOMPlugin.pm

@@ -104 +104 @@
     $self->{'extra_blocks'} = {};
 
+    $self->{'endline'} = ($ENV{'GSDL3SRCHOME'}) ? "" : "\n";    
+    
     return bless $self, $class;
 }
@@ -319 +321 @@
     $self->{'lom_datatype'} = "";
     $self->{'lom_language'} = undef;
-    $self->{'metadatatext'} = "<table class=\"metadata\" width=\"_pagewidth_\" >\n";
+    $self->{'metadatatext'} = "<table class=\"metadata\" width=\"_pagewidth_\" >".$self->{'endline'};
     }
     else {
     my $xml_depth = scalar(@{$self->{'metaname_stack'}});
-    $self->{'raw_text'} .= "\n"; 
+    $self->{'raw_text'} .= $self->{'endline'}; 
     $self->{'raw_text'} .= "&nbsp;&nbsp;" x $xml_depth; 
     $self->{'raw_text'} .= $raw_tag;
@@ -333 +335 @@
         my $style = "class=\"metadata\"";
         my $open_close
-        = "<a id=\"${element}opencloselink\" href=\"javascript:hideTBodyArea('$element')\">\n";
+        = "<a id=\"${element}opencloselink\" href=\"javascript:hideTBodyArea('$element')\">".$self->{'endline'};
         $open_close
-        .= "<img id=\"${element}openclose\" border=\"0\" src=\"_httpopenmdicon_\"></a>\n";
-
-        my $header_line = "  <tr $style ><th $style colspan=\"3\">$open_close \u$element</th></tr>\n";
-        my $md_tbody = "<tbody id=\"$element\">\n";
+        .= "<img id=\"${element}openclose\" border=\"0\" src=\"_httpopenmdicon_\"></a>".$self->{'endline'};
+
+        my $header_line = "  <tr $style ><th $style colspan=\"3\">$open_close \u$element</th></tr>".$self->{'endline'};
+        my $md_tbody = "<tbody id=\"$element\">".$self->{'endline'};
 
         $self->{'mdheader'}     = $header_line;
@@ -379 +381 @@
         my $tbody_text  = $self->{'mdtbody_text'};
         if ($tbody_text !~ m/^\s*$/s) {
-        my $tbody_end = "</tbody>\n";
+        my $tbody_end = "</tbody>".$self->{'endline'};
         my $table_chunk 
             = $header_line.$tbody_start.$tbody_text.$tbody_end;
@@ -393 +395 @@
 
     my $xml_depth = scalar(@{$self->{'metaname_stack'}});
-    $self->{'raw_text'} .= "\n"; 
+    $self->{'raw_text'} .= $self->{'endline'}; 
     $self->{'raw_text'} .= "&nbsp;&nbsp;" x $xml_depth; 
     $self->{'raw_text'} .= $raw_tag;
@@ -525 +527 @@
     my $tr_attr = "$style id=\"$outermost_element\"";
 
-    my $mdtext_line = "  <tr $tr_attr><td $style><nobr>$pretty_print_fmn</nobr></td>$pretty_print_text</tr>\n";
+    my $mdtext_line = "  <tr $tr_attr><td $style><nobr>$pretty_print_fmn</nobr></td>$pretty_print_text</tr>".$self->{'endline'};
     $self->{'mdtbody_text'} .= $mdtext_line;
 }