Changeset 2811 for trunk/gsdl/perllib/plugins/ConvertToPlug.pm

Timestamp:

2001-10-31T19:41:49+13:00 (22 years ago)

Author:

sjboddie

Message:

* empty log message *

File:

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

trunk/gsdl/perllib/plugins/ConvertToPlug.pm

@@ -243 +243 @@
         return undef;
     }
-    my $plugin_name = ref ($self);
     $file =~ s/^[\/\\]+//; # $file often begins with / so we'll tidy it up
 
@@ -257 +256 @@
 
     # Do encoding stuff
-    my ($language, $encoding);
-
-    # WordPlug's wvWare will always produce html files encoded as utf-8
-    if ($plugin_name eq "WordPlug") {
-    $self->{'input_encoding'} = "utf8";
-    $self->{'extract_language'} = 1;
-    }
-
-    if ($self->{'input_encoding'} eq "auto") {
-        # use textcat to automatically work out the input encoding and language
-        ($language, $encoding) = $self->get_language_encoding ($conv_filename);
-    } elsif ($self->{'extract_language'}) {
-        # use textcat to get language metadata
-
-    my ($extracted_encoding);
-        ($language, $extracted_encoding) = $self->get_language_encoding ($conv_filename);
-        $encoding = $self->{'input_encoding'};
-        if ($extracted_encoding ne $encoding && $self->{'verbosity'}) {
-            print $outhandle "$plugin_name: WARNING: $file was read using $encoding encoding but ";
-            print $outhandle "appears to be encoded as $extracted_encoding.\n";
-        }
-    } else {
-        $language = $self->{'default_language'};
-        $encoding = $self->{'input_encoding'};
-    }
+    my ($language, $encoding) = $self->textcat_get_language_encoding ($conv_filename);
 
     &BasPlug::read_file($self, $conv_filename, $encoding, $language, \$text);
     if (!length ($text)) {
+    my $plugin_name = ref ($self);
         print $outhandle "$plugin_name: ERROR: $file contains no text\n" if $self->{'verbosity'};
         return 0;