Changeset 10453

Timestamp:

2005-08-10T12:57:34+12:00 (19 years ago)

Author:

kjdon

Message:

fixed up some mistakes from previous merging of davids new code and jeffreys new code

File:

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

trunk/gsdl/perllib/plugins/ConvertToPlug.pm

@@ -39 +39 @@
 use PagedImgPlug;
 
-#use strict;
-#no strict 'refs'; # allow filehandles to be variables and viceversa
+use strict;
+no strict 'refs'; # allow filehandles to be variables and viceversa
 
 sub BEGIN {
@@ -52 +52 @@
     'desc' => "{ConvertToPlug.convert_to.html}" },
       { 'name' => "text",
-    'desc' => "{ConvertToPlug.convert_to.text}" },
-      { 'name' => "pagedimg_jpg",
-    'desc' => "{ConvertToPlug.convert_to.pagedimg_jpg}"},
-      { 'name' => "pagedimg_gif",
-    'desc' => "{ConvertToPlug.convert_to.pagedimg_gif}"},
-      { 'name' => "pagedimg_png",
-    'desc' => "{ConvertToPlug.convert_to.pagedimg_png}"}, 
+    'desc' => "{ConvertToPlug.convert_to.text}" }
       ];
 
@@ -97 +91 @@
 {
     my ($inputargs) = @_;
-    my ($convert_to_type,$windows_scripting);
-    $conver_to_type = "html";
-    $windows_scripting = "false";
+    my $convert_to_type = "html";
+    my $windows_scripting = "false";
     for(my $intCounter = 0; $intCounter < scalar(@{$inputargs}) ; $intCounter++)
     {
@@ -105 +98 @@
     {
         if($inputargs->[$intCounter+1] eq "auto" || $inputargs->[$intCounter+1] =~ /pagedimg.*/i || $inputargs->[$intCounter+1] eq "text" || $inputargs->[$intCounter+1] eq "html")
-        # if the setting is "auto" then refer to html for now
-        #if($inputargs->[$intCounter+1] =~ /pagedimg.*/i || $inputargs->[$intCounter+1] eq "text" || $inputargs->[$intCounter+1] eq "html")
         {
-        $conver_to_type = $inputargs->[$intCounter+1];
+        $convert_to_type = $inputargs->[$intCounter+1];
         }
     }
@@ -116 +107 @@
     }
     }
-    return ($conver_to_type,$windows_scripting);
+    return ($convert_to_type,$windows_scripting);
 }
 
@@ -125 +116 @@
 
     my @convert_to_list = split(",",$self->{'convert_to'});
-    $secondary_plugins = {};
+    my $secondary_plugins = {};
 
     foreach my $convert_to (@convert_to_list) {
@@ -152 +143 @@
     if(defined $options) { push(@{$hashArgOptLists->{"OptList"}},$options)};
 
+    my $self = (defined $hashArgOptLists)? new BasPlug($pluginlist,$inputargs,$hashArgOptLists): new BasPlug($pluginlist,$inputargs);
+    
+    
     if ($classPluginName eq "PDFPlug" && $strConvertTo 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";
-    }
-    my $self = {};
-    my $plugin_class ="";
-    if ($classPluginName eq "WordPlug" && $blnWindowsScripting eq "true" &&
-    $ENV{'GSDLOS'} =~ /^windows$/i) {
-    $plugin_class = "StructuredHTML"."Plug";
-    } elsif ($strConvertTo =~ /pagedimg.*/i){
-    $plugin_class = "PagedImg"."Plug";
-    } else {
-    $plugin_class = uc($strConvertTo)."Plug";
-    }
-    
-    my $plugin_package = $plugin_class.".pm";
-    require $plugin_package;
-
-    #call its constructor with extra options that we've worked out!
-    my $arglist = $plugin_options->{$plugin_class};
-    $self = (defined $hashArgOptLists)? new $plugin_class($pluginlist,$inputargs,$hashArgOptLists): new $plugin_class($pluginlist,$inputargs);
-
-    if ($plugin_class eq "StructuredHTMLPlug") {
+    } elsif ($classPluginName eq "WordPlug" && $blnWindowsScripting eq "true" && $ENV{'GSDLOS'} =~ /^windows$/i) {
+    # we use structured HTML
+    $strConvertTo = "structuredhtml";
+    } elsif ($strConvertTo eq "auto") {
+    # choose html for now - should choose a format based on doc type
+    $strConvertTo = "html";
+    }
+    
+    if ($strConvertTo eq "html") {
+    $self->{'convert_to'} = "HTML";
+    $self->{'convert_to_ext'} = "html";
+    } elsif ($strConvertTo eq "text") {
+    $self->{'convert_to'} = "TEXT";
+    $self->{'convert_to_ext'} = "txt";
+    } elsif ($strConvertTo eq "structuredhtml") {
     $self->{'convert_to'} = "StructuredHTML";
     $self->{'convert_to_ext'} = "html";
-#   my $structhtml_options = [];
-#   push(@$structhtml_options,"-metadata_fields","Title,GENERATOR");
-#   $secondary_plugin_options->{'StructuredHTMLPlug'} = $structhtml_options;
-    }
-    elsif ($strConvertTo eq "text")
-    {
-    $self->{'convert_to'} = "TEXT";
-    $self->{'convert_to_ext'} = "txt";
-#   my $text_options = [];
-#   push(@$text_options,"-metadata_fields","Title,GENERATOR");
-#   $secondary_plugin_options->{'TextPlug'} = $text_options;
-    }
-    elsif ($strConvertTo =~ /pagedimg.*/i){
+    } elsif ($strConvertTo =~ /^pagedimg/) {
     $self->{'convert_to'} = "PagedImg";
-    my $convert_to_ext = $strConvertTo;
-    $convert_to_ext =~ s/.*\_(.*)/$1/i;
-    if ($convert_to_ext eq "gif"){
-        $self->{'convert_to_ext'} = "gif";
-    } elsif ($convert_to_ext eq "jpg"){
-        $self->{'convert_to_ext'} = "jpg";
-    } elsif ($convert_to_ext eq "png") {
-        $self->{'convert_to_ext'} = "png";
-    }
-#       my $pagedimg_options = [];
-#   push(@$pagedimg_options,"-metadata_fields","Title,GENERATOR");
-#   $secondary_plugin_options->{'PagedImgPlug'} = $pagedimg_options;
-    } else {
-    # HTML or auto
-    $self = (defined $hashArgOptLists)? new HTMLPlug($pluginlist,$inputargs,$hashArgOptLists): new HTMLPlug($pluginlist,$inputargs);
-    $self->{'convert_to'} = "HTML";
-    $self->{'convert_to_ext'} = "html";
-#   my $html_options = [];
-#   push(@$html_options,"-rename_assoc_files","1");
-#   push(@$html_options,"-metadata_fields","Title,GENERATOR");
-#   $secondary_plugin_options->{'HTMLPlug'} = $html_options;
-    }
+    my ($convert_to_ext) = $strConvertTo =~ /pagedimg\_(jpg|gif|png)/i;
+    $convert_to_ext = 'jpg' unless defined $convert_to_ext;
+    $self->{'convert_to_ext'} = $convert_to_ext;
+    }
+
     return bless $self, $class;
 }