Changeset 15903

Show
Ignore:
Timestamp:
09.06.2008 12:25:11 (12 years ago)
Author:
kjdon
Message:

input_encoding option no longer used

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • gsdl/trunk/perllib/plugins/PPTPlugin.pm

    r15872 r15903  
    117117    if ($self->{'input_encoding'} eq "auto") { 
    118118    $self->{'input_encoding'} = "utf8"; 
    119     if (defined $secondary_plugin_options->{'HTMLPlugin'}){ 
    120         push(@$html_options,"-input_encoding", "utf8"); 
    121         push(@$html_options,"-extract_language") if $self->{'extract_language'}; 
    122  
    123         # Instruct HTMLPlugin (when eventually accessed through read_into_doc_obj)  
    124         # to extract these metadata fields from the HEAD META fields 
    125         push(@$html_options,"-metadata_fields","Title,GENERATOR,date,author<Creator>"); 
    126     }  
    127     if (defined $secondary_plugin_options->{'PagedImagePlugin'}){ 
    128         push(@$pageimg_options,"-input_encoding", "utf8"); 
    129         push(@$pageimg_options,"-extract_language") if $self->{'extract_language'}; 
    130     } 
     119    } 
     120    if (defined $secondary_plugin_options->{'HTMLPlugin'}){ 
     121    push(@$html_options,"-input_encoding", "utf8"); 
     122    push(@$html_options,"-extract_language") if $self->{'extract_language'}; 
     123     
     124    # Instruct HTMLPlugin (when eventually accessed through read_into_doc_obj)  
     125    # to extract these metadata fields from the HEAD META fields 
     126    push(@$html_options,"-metadata_fields","Title,GENERATOR,date,author<Creator>"); 
     127    }  
     128    if (defined $secondary_plugin_options->{'PagedImagePlugin'}){ 
     129    push(@$pageimg_options,"-input_encoding", "utf8"); 
     130    push(@$pageimg_options,"-extract_language") if $self->{'extract_language'}; 
    131131    } 
    132132