Changeset 15903

Timestamp:

2008-06-09T12:25:11+12:00 (16 years ago)

Author:

kjdon

Message:

input_encoding option no longer used

File:

• gsdl/trunk/perllib/plugins/PPTPlugin.pm (modified) (1 diff)

gsdl/trunk/perllib/plugins/PPTPlugin.pm

@@ -117 +117 @@
     if ($self->{'input_encoding'} eq "auto") {
     $self->{'input_encoding'} = "utf8";
-    if (defined $secondary_plugin_options->{'HTMLPlugin'}){
-        push(@$html_options,"-input_encoding", "utf8");
-        push(@$html_options,"-extract_language") if $self->{'extract_language'};
-
-        # Instruct HTMLPlugin (when eventually accessed through read_into_doc_obj) 
-        # to extract these metadata fields from the HEAD META fields
-        push(@$html_options,"-metadata_fields","Title,GENERATOR,date,author<Creator>");
-    } 
-    if (defined $secondary_plugin_options->{'PagedImagePlugin'}){
-        push(@$pageimg_options,"-input_encoding", "utf8");
-        push(@$pageimg_options,"-extract_language") if $self->{'extract_language'};
-    }
+    }
+    if (defined $secondary_plugin_options->{'HTMLPlugin'}){
+    push(@$html_options,"-input_encoding", "utf8");
+    push(@$html_options,"-extract_language") if $self->{'extract_language'};
+    
+    # Instruct HTMLPlugin (when eventually accessed through read_into_doc_obj) 
+    # to extract these metadata fields from the HEAD META fields
+    push(@$html_options,"-metadata_fields","Title,GENERATOR,date,author<Creator>");
+    } 
+    if (defined $secondary_plugin_options->{'PagedImagePlugin'}){
+    push(@$pageimg_options,"-input_encoding", "utf8");
+    push(@$pageimg_options,"-extract_language") if $self->{'extract_language'};
     }