Changeset 15872 for gsdl/trunk/perllib/plugins/ExcelPlugin.pm

Timestamp:

2008-06-05T09:29:32+12:00 (16 years ago)

Author:

kjdon

Message:

plugin overhaul: plugins renamed to xxPlugin, and in some cases the names are made more sensible. They now use the new base plugins. Hopefully we have better code reuse. Some of the plugins still need work done as I didn't want to spend another month doing this before committing it. Alos, I haven't really tested anything yet...

File:

• gsdl/trunk/perllib/plugins/ExcelPlugin.pm (modified) (7 diffs)

gsdl/trunk/perllib/plugins/ExcelPlugin.pm

@@ -1 +1 @@
 ###########################################################################
 #
-# ExcelPlug.pm -- plugin for importing Microsoft Excel files.
+# ExcelPlugin.pm -- plugin for importing Microsoft Excel files.
 #  (currently only versions 95 and 97)
 #
@@ -26 +26 @@
 ###########################################################################
 
-package ExcelPlug;
+package ExcelPlugin;
 
-use ConvertToPlug;
+use ConvertBinaryFile;
 use strict;
 no strict 'refs'; # allow filehandles to be variables and viceversa
 
 sub BEGIN {
-    @ExcelPlug::ISA = ('ConvertToPlug');
+    @ExcelPlugin::ISA = ('ConvertBinaryFile');
 }
 
 my $arguments = 
     [ { 'name' => "process_exp",
-    'desc' => "{BasPlug.process_exp}",
+    'desc' => "{BasePlugin.process_exp}",
     'type' => "regexp",
     'reqd' => "no",
@@ -44 +44 @@
       ];
 
-my $options = { 'name'     => "ExcelPlug",
-        'desc'     => "{ExcelPlug.desc}",
+my $options = { 'name'     => "ExcelPlugin",
+        'desc'     => "{ExcelPlugin.desc}",
         'abstract' => "no",
         'inherits' => "yes",
@@ -59 +59 @@
     if(defined $options) { push(@{$hashArgOptLists->{"OptList"}},$options)};
     
-    my $self = new ConvertToPlug($pluginlist, $inputargs, $hashArgOptLists);
+    my $self = new ConvertBinaryFile($pluginlist, $inputargs, $hashArgOptLists);
 
     if ($self->{'info_only'}) {
@@ -66 +66 @@
     }
 
+    $self->{'filename_extension'} = "xls";
+    $self->{'file_type'} = "Excel";
+
     my $secondary_plugin_options = $self->{'secondary_plugin_options'};
-    if (!defined $secondary_plugin_options->{'HTMLPlug'}) {
-    $secondary_plugin_options->{'HTMLPlug'} = [];
+    if (!defined $secondary_plugin_options->{'HTMLPlugin'}) {
+    $secondary_plugin_options->{'HTMLPlugin'} = [];
     }
-    my $html_options = $secondary_plugin_options->{'HTMLPlug'};
+    my $html_options = $secondary_plugin_options->{'HTMLPlugin'};
     
-    #$self->{'input_encoding'} = "utf8";
-    #$self->{'extract_language'} = 1;
     push(@$html_options, "-input_encoding", "utf8");
     push(@$html_options,"-extract_language") if $self->{'extract_language'};
@@ -82 +83 @@
 }
 
-sub convert_post_process
+sub convert_post_process_old
 {
     my $self = shift (@_);
@@ -107 +108 @@
 }
     
-sub process {
-    my $self = shift (@_);
-    my ($textref, $pluginfo, $base_dir, $file, $metadata, $doc_obj, $gli) = @_;
-
-    return $self->process_type("xls",$base_dir,$file,$doc_obj);
-}
 
 1;