Changeset 22594

Timestamp:

2010-08-10T11:51:17+12:00 (14 years ago)

Author:

kjdon

Message:

committing for davidb. pipe output of tidy to /dev/null if verbosity is low

File:

• main/trunk/greenstone2/perllib/plugins/HTMLPlugin.pm (modified) (1 diff)

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

@@ -1576 +1576 @@
     close (PROD) || die("Error Closing File: $tmp_filename $!");
 
+
+    my ($language, $encoding) = $self->textcat_get_language_encoding ($input_filename);
+    #print STDERR "*** encoding = $encoding\n";
+
     # run html-tidy on the tmp file to make it a proper XML file
-    my $tidyfile = `tidy -utf8 -wrap 0 -asxml "$tmp_filename"`;
+
+    my $outhandle = $self->{'outhandle'};
+    print $outhandle "Converting HTML to be XML compliant:\n";
+
+    my $tidy_cmd = "tidy";
+    $tidy_cmd .= " -q" if ($self->{'verbosity'} <= 2);
+    $tidy_cmd .= " -utf8 -wrap 0 -asxml \"$tmp_filename\"";
+    if ($self->{'verbosity'} <= 2) {
+    if ($ENV{'GSDLOS'} =~ m/^windows/i) {
+        $tidy_cmd .= " 2>nul";
+    }
+    else {
+        $tidy_cmd .= " 2>/dev/null";
+    }
+    print $outhandle "  => $tidy_cmd\n";
+    }
+
+    my $tidyfile = `$tidy_cmd`;
 
     # write result back to the tmp file