Changeset 22842

Timestamp:

2010-09-02T14:20:43+12:00 (14 years ago)

Author:

davidb

Message:

Minor tidy up of code

File:

• main/trunk/greenstone2/perllib/plugins/HTMLPlugin.pm (modified) (4 diffs)

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

@@ -35 +35 @@
 
 package HTMLPlugin;
+
+use Encode;
 
 use ReadTextFile;
@@ -1230 +1232 @@
     # Convert entities to their UTF8 equivalents
     $$textref =~ s/&(lt|gt|amp|quot|nbsp);/&z$1;/go;
-    $$textref =~ s/&([^;]+);/&ghtml::getcharequiv($1,1)/gseo;
+    $$textref =~ s/&([^;]+);/&Encode::decode("utf8",ghtml::getcharequiv($1,1))/gseo;
     $$textref =~ s/&z(lt|gt|amp|quot|nbsp);/&$1;/go;
+
 }
 
@@ -1586 +1589 @@
     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
 
@@ -1597 +1596 @@
     my $tidy_cmd = "tidy";
     $tidy_cmd .= " -q" if ($self->{'verbosity'} <= 2);
-##    $tidy_cmd .= " -utf8 -wrap 0 -asxml \"$tmp_filename\"";
     $tidy_cmd .= " -raw -wrap 0 -asxml \"$tmp_filename\"";
     if ($self->{'verbosity'} <= 2) {