Changeset 10423

Timestamp:

2005-08-05T15:09:09+12:00 (19 years ago)

Author:

chi

Message:

Modify the structure of pushing argument and option lists to secondary plugin
in load_secondary_plugins().

File:

• trunk/gsdl/perllib/plugins/ConvertToPlug.pm (modified) (8 diffs)

trunk/gsdl/perllib/plugins/ConvertToPlug.pm

@@ -24 +24 @@
 #
 ###########################################################################
+
 # This plugin is inherited by such plugins as WordPlug, PPTPlug, PSPlug, RTFPlug 
 # and PDFPlug. It facilitates the conversion of these document types to either 
@@ -121 +122 @@
 {
     my $self = shift (@_);
-    my ($class,$plugin_options) = @_;
+    my ($class,$input_args,$hashArgOptLists) = @_;
 
     my @convert_to_list = split(",",$self->{'convert_to'});
@@ -134 +135 @@
 
     # call its constructor with extra options that we've worked out!
-    my $arglist = $plugin_options->{$plugin_class};
-    my $secondary_plugin = new $plugin_class([], \@$arglist);
+    my $arglist = $input_args->{$plugin_class};
+    my $secondary_plugin = new $plugin_class([],$arglist, $hashArgOptLists);
     $secondary_plugins->{$plugin_class} = $secondary_plugin;
     }
@@ -158 +159 @@
     my $self = {};
     my $plugin_class ="";
-    # If the WordPlug -windows_scripting is on, we will call StructuredHTMLPlug to format the
-    # HTML documents and then pass to HTMLPlug
     if ($classPluginName eq "WordPlug" && $blnWindowsScripting eq "true" &&
     $ENV{'GSDLOS'} =~ /^windows$/i) {
@@ -185 +184 @@
     elsif ($strConvertTo eq "text")
     {
-    #$self = (defined $hashArgOptLists)? new TEXTPlug($pluginlist,$inputargs,$hashArgOptLists): new TEXTPlug($pluginlist,$inputargs);
     $self->{'convert_to'} = "TEXT";
     $self->{'convert_to_ext'} = "txt";
@@ -193 +191 @@
     }
     elsif ($strConvertTo =~ /pagedimg.*/i){
-#   #$self = (defined $hashArgOptLists)? new PagedImgPlug($pluginlist,$inputargs,$hashArgOptLists): new PagedImgPlug($pluginlist,$inputargs);
     $self->{'convert_to'} = "PagedImg";
     my $convert_to_ext = $strConvertTo;
@@ -237 +234 @@
 sub deinit {
     # called only once, after all plugin passes have been done
+
     my ($self) = @_;
 
@@ -448 +446 @@
     # process the document
     $processor->process($doc_obj);
-    # We don't clear up the tmp directory here, the tmp directory will be deleted if the user setup -removeold option 
-    # in the import.pl
-    #$self->cleanup_tmp_area();
+    ##$self->cleanup_tmp_area();
 
     $self->{'num_processed'} ++;