Changeset 22874

Timestamp:

2010-09-07T14:44:50+12:00 (13 years ago)

Author:

kjdon

Message:

no longer use filename_extension, as we should be using the original extension . eg when processing an odt doc with word plugin, the associated file used to be doc.doc, instead of doc.odt.

Location:

main/trunk/greenstone2/perllib/plugins

Files:

• ConvertBinaryFile.pm (modified) (1 diff)
• ExcelPlugin.pm (modified) (1 diff)
• PDFPlugin.pm (modified) (1 diff)
• PostScriptPlugin.pm (modified) (1 diff)
• PowerPointPlugin.pm (modified) (1 diff)
• RTFPlugin.pm (modified) (1 diff)
• WordPlugin.pm (modified) (1 diff)

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

@@ -467 +467 @@
     
     # need to check that not empty
-    my $doc_ext = $self->{'filename_extension'};
+    my ($doc_ext) = $file =~ /\.(\w+)$/;
     my $file_type = "unknown";
     $file_type = $self->{'file_type'} if defined $self->{'file_type'};

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

@@ -96 +96 @@
 
     $self = bless $self, $class;
-    $self->{'filename_extension'} = "xls";
     $self->{'file_type'} = "Excel";
 

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

@@ -131 +131 @@
     
     $self = bless $self, $class;
-    $self->{'filename_extension'} = "pdf";
     $self->{'file_type'} = "PDF";
 

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

@@ -101 +101 @@
     }
 
-    $self->{'filename_extension'} = "ps";
     $self->{'file_type'} = "PS";
 

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

@@ -151 +151 @@
 
     $self = bless $self, $class;
-    $self->{'filename_extension'} = "ppt";
     $self->{'file_type'} = "PPT";
 

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

@@ -79 +79 @@
     }
 
-    $self->{'filename_extension'} = "rtf";
     $self->{'file_type'} = "RTF";
 

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

@@ -150 +150 @@
 
     $self = bless $self, $class;
-    $self->{'filename_extension'} = "doc";
     $self->{'file_type'} = "Word";