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

Timestamp:

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

Author:

sjboddie

Message:

* empty log message *

File:

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

trunk/gsdl/perllib/plugins/BasPlug.pm

@@ -272 +272 @@
     return undef;
     }
-    my $plugin_name = ref ($self);
     $file =~ s/^[\/\\]+//; # $file often begins with / so we'll tidy it up
 
-    my ($language, $encoding);
-    if ($self->{'input_encoding'} eq "auto") {
-    # use textcat to automatically work out the input encoding and language
-    ($language, $encoding) = $self->get_language_encoding ($filename);
-
-    } elsif ($self->{'extract_language'}) {
-    # use textcat to get language metadata
-    ($language, $extracted_encoding) = $self->get_language_encoding ($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'};
-    }
+    # Do encoding stuff
+    my ($language, $encoding) = $self->textcat_get_language_encoding ($filename);
 
     # create a new document
@@ -308 +290 @@
 
     if (!length ($text)) {
+    my $plugin_name = ref ($self);
     print $outhandle "$plugin_name: ERROR: $file contains no text\n" if $self->{'verbosity'};
 
@@ -384 +367 @@
 
     close FILE;
+}
+
+sub textcat_get_language_encoding {
+    my $self = shift (@_);
+    my ($filename) = @_;
+
+    my ($language, $encoding, $extracted_encoding);
+    if ($self->{'input_encoding'} eq "auto") {
+        # use textcat to automatically work out the input encoding and language
+        ($language, $encoding) = $self->get_language_encoding ($filename);
+    } elsif ($self->{'extract_language'}) {
+        # use textcat to get language metadata
+        ($language, $extracted_encoding) = $self->get_language_encoding ($filename);
+        $encoding = $self->{'input_encoding'};
+        if ($extracted_encoding ne $encoding && $self->{'verbosity'}) {
+        my $plugin_name = ref ($self);
+        my $outhandle = $self->{'outhandle'};
+            print $outhandle "$plugin_name: WARNING: $filename 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'};
+    }
+    return ($language, $encoding);
 }