Changeset 16667

Timestamp:

2008-08-07T12:56:50+12:00 (16 years ago)

Author:

kjdon

Message:

get_language_encoding was setting ->input_encoding, which means its wrong for all the next files. Changed this.

File:

• gsdl/trunk/perllib/plugins/ReadTextFile.pm (modified) (3 diffs)

gsdl/trunk/perllib/plugins/ReadTextFile.pm

@@ -292 +292 @@
     }
     
-
+    my $found_html_encoding = 0;
     # handle html files specially
     # XXX this doesn't match plugins derived from HTMLPlug (except ConvertTo)
@@ -312 +312 @@
         $best_encoding = lc($best_encoding); # lowercase
         if ($best_encoding eq "utf_8") { $best_encoding = "utf8" }
-        $self->{'input_encoding'} = $best_encoding;
+        $found_html_encoding = 1;
+        # We shouldn't be modifying this here!!
+        #$self->{'input_encoding'} = $best_encoding;
     }
         
@@ -355 +357 @@
         }       
         $best_language = $self->{'default_language'};
-        $best_encoding = $self->{'input_encoding'};
+        if (!$found_html_encoding) {
+        $best_encoding = $self->{'input_encoding'};
+        }
 
     } else {