Changeset 32500 for main/trunk/greenstone2/perllib/plugins/ReadTextFile.pm

Timestamp:

2018-10-05T16:48:04+13:00 (6 years ago)

Author:

ak19

Message:

For a test case, best_encoding come out with prefix/suffix to utf_8, so allowing for that

File:

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

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

@@ -422 +422 @@
         $best_encoding =~ s/-+/_/g;
         $best_encoding = lc($best_encoding); # lowercase
-        if ($best_encoding eq "utf_8") { $best_encoding = "utf8" }
+        if ($best_encoding eq "utf_8" ||  $best_encoding =~ /utf_8/) { $best_encoding = "utf8" }
         $found_html_encoding = 1;
         # We shouldn't be modifying this here!!