Changeset 22705 for main/trunk/greenstone2/perllib/plugins/BasePlugin.pm

Timestamp:

2010-08-21T23:30:28+12:00 (14 years ago)

Author:

davidb

Message:

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

File:

• main/trunk/greenstone2/perllib/plugins/BasePlugin.pm (modified) (3 diffs)

main/trunk/greenstone2/perllib/plugins/BasePlugin.pm

@@ -655 +655 @@
     my ($filemeta) = @_;
 
-    # analyse filenames without extensions and digits (and trimmed of surrounding 
-    # whitespace), so that irrelevant chars don't confuse textcat
+    # analyse filenames without extensions and digits (and trimmed of
+    # surrounding whitespace), so that irrelevant chars don't confuse
+    # textcat
     my $strictfilemeta = $filemeta;
     $strictfilemeta =~ s/\.[^\.]+$//g;
@@ -1031 +1032 @@
     my $file_derived_title = $file;
     $file_derived_title =~ s/_/ /g;
-    $file_derived_title =~ s/\..*?$//;
+    $file_derived_title =~ s/\.[^.]$//;
 
     return $file_derived_title;
@@ -1042 +1043 @@
     my ($doc_obj,$section,$file) = @_;
 
-    if (!defined $doc_obj->get_metadata_element ($section, "Title") or $doc_obj->get_metadata_element($section, "Title") eq "") {
+    if (!defined $doc_obj->get_metadata_element ($section, "Title") 
+    or $doc_obj->get_metadata_element($section, "Title") eq "") {
 
     my $file_derived_title = $self->filename_to_utf8_metadata($self->filename_based_title($file));