Show
Ignore:
Timestamp:
21.08.2010 23:30:28 (9 years ago)
Author:
davidb
Message:

User of AutoloadConverterScripting? expanded to encompass PowerPoint? and Excel. No longer need OOConvertBinaryFile and PBConvertBinaryFile

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/perllib/plugins/BasePlugin.pm

    r22663 r22705  
    655655    my ($filemeta) = @_; 
    656656 
    657     # analyse filenames without extensions and digits (and trimmed of surrounding  
    658     # whitespace), so that irrelevant chars don't confuse textcat 
     657    # analyse filenames without extensions and digits (and trimmed of 
     658    # surrounding whitespace), so that irrelevant chars don't confuse 
     659    # textcat 
    659660    my $strictfilemeta = $filemeta; 
    660661    $strictfilemeta =~ s/\.[^\.]+$//g; 
     
    10311032    my $file_derived_title = $file; 
    10321033    $file_derived_title =~ s/_/ /g; 
    1033     $file_derived_title =~ s/\..*?$//; 
     1034    $file_derived_title =~ s/\.[^.]$//; 
    10341035 
    10351036    return $file_derived_title; 
     
    10421043    my ($doc_obj,$section,$file) = @_; 
    10431044 
    1044     if (!defined $doc_obj->get_metadata_element ($section, "Title") or $doc_obj->get_metadata_element($section, "Title") eq "") { 
     1045    if (!defined $doc_obj->get_metadata_element ($section, "Title")  
     1046    or $doc_obj->get_metadata_element($section, "Title") eq "") { 
    10451047 
    10461048    my $file_derived_title = $self->filename_to_utf8_metadata($self->filename_based_title($file));