Changeset 3731

Timestamp:

2003-02-13T17:42:57+13:00 (21 years ago)

Author:

jrm21

Message:

If textcat returns too many possibilities, use the default language but
choose textcat's most popular encoding instead of using the default.
Otherwise we might generate bad archive files that aren't utf-8.

File:

• trunk/gsdl/perllib/plugins/BasPlug.pm (modified) (2 diffs)

trunk/gsdl/perllib/plugins/BasPlug.pm

@@ -595 +595 @@
     # first one in the list - otherwise use the defaults
     if (scalar @$results > 3) {
-    
+    # changed 12 Feb 2003 by jrm21
+    # use the most popular encoding at least... otherwise we might
+    # generate invalid archive files!
+    my %guessed_encodings = ();
+    foreach my $result (@$results) {
+        $result =~ /([^\-]+)$/;
+        my $enc=$1;
+        if (!defined($guessed_encodings{$enc})) {
+        $guessed_encodings{$enc}=0;
+        }
+        $guessed_encodings{$enc}++;
+    }
+    my $best_encoding="";
+    $guessed_encodings{""}=-1;
+    foreach my $enc (keys %guessed_encodings) {
+        if ($guessed_encodings{$enc} > $guessed_encodings{$best_encoding}){
+        $best_encoding=$enc;
+        }
+    }
+
     if ($self->{'input_encoding'} ne 'auto') {
         if ($self->{'extract_language'} && $self->{'verbosity'}) {
@@ -605 +624 @@
     } else {
         if ($self->{'verbosity'}) {
-        print $outhandle "BASPlug: WARNING: language/encoding could not be extracted from $filename - ";
-        print $outhandle "defaulting to $self->{'default_language'}/$self->{'default_encoding'}\n";
+        print $outhandle "BASPlug: WARNING: language could not be extracted from $filename - ";
+        print $outhandle "defaulting to $self->{'default_language'}.\n";
         }
-        return ($self->{'default_language'}, $self->{'default_encoding'});
+        return ($self->{'default_language'}, $best_encoding);
     }
     }