Changeset 10890 for trunk/gsdl/perllib/plugins/ConvertToPlug.pm

Timestamp:

2005-11-14T14:26:10+13:00 (18 years ago)

Author:

kjdon

Message:

changed convetr_to default to auto (was html), got rid of findType method - just use the result of parsing to work this out. changed blnWindowsScripting to windows_scripting, and strConvertTo to convert_to_type

File:

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

trunk/gsdl/perllib/plugins/ConvertToPlug.pm

@@ -61 +61 @@
     'reqd' => "yes",
     'list' => $convert_to_list, 
-    'deft' => "html" },
+    'deft' => "auto" },
       { 'name' => "title_sub",
     'desc' => "{HTMLPlug.title_sub}",
@@ -88 +88 @@
         'args'     => $arguments };
 
-sub findType
-{
-    my ($inputargs) = @_;
-    my $convert_to_type = "html";
-    my $windows_scripting = "false";
-    for(my $intCounter = 0; $intCounter < scalar(@{$inputargs}) ; $intCounter++)
-    {
-    if($inputargs->[$intCounter] eq "-convert_to")
-    {
-        if($inputargs->[$intCounter+1] eq "auto" || $inputargs->[$intCounter+1] =~ /pagedimg.*/i || $inputargs->[$intCounter+1] eq "text" || $inputargs->[$intCounter+1] eq "html")
-        {
-        $convert_to_type = $inputargs->[$intCounter+1];
-        }
-    }
-    if ($inputargs->[$intCounter] eq "-windows_scripting")
-    {
-        $windows_scripting = "true";
-    }
-    }
-    return ($convert_to_type,$windows_scripting);
-}
 
 sub load_secondary_plugins
@@ -127 +106 @@
     # call its constructor with extra options that we've worked out!
     my $arglist = $input_args->{$plugin_class};
-    my $secondary_plugin = new $plugin_class([],$arglist, $hashArgOptLists);
+#   my $secondary_plugin = new $plugin_class([],$arglist, $hashArgOptLists);
+    # secondary plugins don';t need to know their calling plugin's options
+    my $secondary_plugin = new $plugin_class([],$arglist);
     $secondary_plugins->{$plugin_class} = $secondary_plugin;
     }
@@ -138 +119 @@
     push(@$pluginlist, $class);
     my $classPluginName = (defined $pluginlist->[0]) ? $pluginlist->[0] : $class;
-    my ($strConvertTo,$blnWindowsScripting) = findType($inputargs);
-
     if(defined $arguments){ push(@{$hashArgOptLists->{"ArgList"}},@{$arguments});}
     if(defined $options) { push(@{$hashArgOptLists->{"OptList"}},$options)};
@@ -145 +124 @@
     my $self = (defined $hashArgOptLists)? new BasPlug($pluginlist,$inputargs,$hashArgOptLists): new BasPlug($pluginlist,$inputargs);
     
-    
+    my $convert_to_type = $self->{'convert_to'};
+    if (!defined $convert_to_type || $convert_to_type eq "") {
+    $convert_to_type = "auto";
+    }
+    my $windows_scripting = $self->{'windows_scripting'};
     if ($classPluginName eq "PDFPlug") {
-    if ($strConvertTo eq "text" && 
+    if ($convert_to_type eq "text" && 
         $ENV{'GSDLOS'} =~ /^windows$/i) {
         print STDERR "Windows does not support pdf to text. PDFs will be converted to HTML instead\n";
-        $strConvertTo = "html";
+        $convert_to_type = "html";
     }
     } elsif ($classPluginName eq "WordPlug") {
-    if ($blnWindowsScripting eq "true" && $ENV{'GSDLOS'} =~ /^windows$/i && $strConvertTo =~ /^(html|auto)$/) {
+    if (defined $self->{'windows_scripting'} && $ENV{'GSDLOS'} =~ /^windows$/i && $convert_to_type =~ /^(html|auto)$/) {
         # we use structured HTML, not normal html
-        $strConvertTo = "structuredhtml";
+        $convert_to_type = "structuredhtml";
     } 
     } elsif ($classPluginName eq "PPTPlug") {
-    if ($blnWindowsScripting eq "true" && $ENV{'GSDLOS'} =~ /^windows$/i && $strConvertTo eq "auto") {
+    if (defined $self->{'windows_scripting'} && $ENV{'GSDLOS'} =~ /^windows$/i && $convert_to_type eq "auto") {
         # we use paged img
-        $strConvertTo = "pagedimg_jpg";
+        $convert_to_type = "pagedimg_jpg";
     } 
     } elsif ($classPluginName eq "PSPlug") {
-    if ($strConvertTo eq "auto") {
+    if ($convert_to_type eq "auto") {
         # we use text
-        $strConvertTo = "text";
+        $convert_to_type = "text";
     }
     }
     
-    if ($strConvertTo eq "auto") {
+    if ($convert_to_type eq "auto") {
     # choose html for now - should choose a format based on doc type
-    $strConvertTo = "html";
-    }
-    
-    if ($strConvertTo eq "html") {
+    $convert_to_type = "html";
+    }
+    
+    if ($convert_to_type eq "html") {
     $self->{'convert_to'} = "HTML";
     $self->{'convert_to_ext'} = "html";
-    } elsif ($strConvertTo eq "text") {
+    } elsif ($convert_to_type eq "text") {
     $self->{'convert_to'} = "TEXT";
     $self->{'convert_to_ext'} = "txt";
-    } elsif ($strConvertTo eq "structuredhtml") {
+    } elsif ($convert_to_type eq "structuredhtml") {
     $self->{'convert_to'} = "StructuredHTML";
     $self->{'convert_to_ext'} = "html";
-    } elsif ($strConvertTo =~ /^pagedimg/) {
+    } elsif ($convert_to_type =~ /^pagedimg/) {
     $self->{'convert_to'} = "PagedImg";
-    my ($convert_to_ext) = $strConvertTo =~ /pagedimg\_(jpg|gif|png)/i;
+    my ($convert_to_ext) = $convert_to_type =~ /pagedimg\_(jpg|gif|png)/i;
     $convert_to_ext = 'jpg' unless defined $convert_to_ext;
     $self->{'convert_to_ext'} = $convert_to_ext;