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

Timestamp:

2005-07-06T15:27:45+12:00 (19 years ago)

Author:

kjdon

Message:

Jeffrey's new parsing modifications, committed approx 6 July, 15.16

File:

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

trunk/gsdl/perllib/plugins/ConvertToPlug.pm

@@ -65 +65 @@
     'desc' => "{ConvertToPlug.use_strings}",
     'type' => "flag",
-    'reqd' => "no" } ];
+    'reqd' => "no" },
+      { 'name' => "extract_keyphrases",
+    'desc' => "{BasPlug.extract_keyphrases}",
+    'type' => "flag",
+    'reqd' => "no",
+    'hiddengli' => "yes" },
+      { 'name' => "extract_keyphrase_options",
+    'desc' => "{BasPlug.extract_keyphrase_options}",
+    'type' => "string",
+    'reqd' => "no",
+    'hiddengli' => "yes" } ];
 
 my $options = { 'name'     => "ConvertToPlug",
@@ -73 +83 @@
         'args'     => $arguments };
 
-sub parse_args
+
+sub findType
 {
-    my $class = shift (@_);
-    my ($args) = @_;
-
-    my $plugin_name = $class;
-    $plugin_name =~ s/\.pm$//;
-
-    my $newargs = {};
-
-    if (!parsargv::parse($args,  
-             q^extract_keyphrases^, \$newargs->{'kea'}, #with extra options (undocumented) 
-             q^extract_keyphrase_options/.*/^, \$newargs->{'kea_options'}, #no extra options (undocumented)
-             q^convert_to/(html|text)/html^, \$newargs->{'generate_format'},
-             q^use_strings^, \$newargs->{'use_strings'},
-             "allow_extra_options")) {
-
-    print STDERR "\nIncorrect options passed to $plugin_name, ";
-    print STDERR "check your collect.cfg configuration file\n";
-    $self->print_txt_usage("");  # Use default resource bundle
-    die "\n";
-    }
-   
-    return ($plugin_name, $newargs);
+    my ($inputargs) = @_;
+    
+    for(my $intCounter = 0; $intCounter < scalar(@{$inputargs}) ; $intCounter++)
+    {
+    if($inputargs->[$intCounter] eq "-convert_to")
+    {
+        if($inputargs->[$intCounter+1] eq "text" || $inputargs->[$intCounter+1] eq "html")
+        {
+        return $inputargs->[$intCounter+1];
+        }
+        else {return "html";}
+    }
+    }
+    return "html";
 }
 
 sub new {
-    my $class = shift (@_);
-    if ($class eq "ConvertToPlug" && defined $_[0]) {$class = shift (@_);}
-    my $self;
-    # parsargv::parse might modify the list, so we do this by creating a copy
-    # of the argument list.
-    my @arglist = @_;
-    my ($plugin_name, $args) = $class->parse_args(\@_);
-
-    if ($class eq "PDFPlug" && $args->{'generate_format'} eq "text" && 
+    my ($class) = shift (@_);
+    my ($pluginlist,$inputargs,$hashArgOptLists) = @_;
+    push(@$pluginlist, $class);
+    my $classPluginName = (defined $pluginlist->[0]) ? $pluginlist->[0] : $class;
+    my $strConvertTo = findType($inputargs);
+
+    if(defined $arguments){ push(@{$hashArgOptLists->{"ArgList"}},@{$arguments});}
+    if(defined $options) { push(@{$hashArgOptLists->{"OptList"}},$options)};
+
+    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";
-    $args->{'generate_format'} = "html";
-    }
-
-    if ($args->{'generate_format'} eq "text")
+    $strConvertTo = "html";
+    }
+
+    my $self = {};
+    if ($strConvertTo eq "text")
     {
-    $self = new TEXTPlug ($class, @arglist);
+    $self = (defined $hashArgOptLists)? new TEXTPlug($pluginlist,$inputargs,$hashArgOptLists): new TEXTPlug($pluginlist,$inputargs);
     $self->{'convert_to'} = "TEXT";
     $self->{'convert_to_ext'} = "txt";
@@ -122 +127 @@
     else
     {
-    $self = new HTMLPlug ($class, @arglist);
+    $self = (defined $hashArgOptLists)? new HTMLPlug($pluginlist,$inputargs,$hashArgOptLists): new HTMLPlug($pluginlist,$inputargs);
     $self->{'convert_to'} = "HTML";
     $self->{'convert_to_ext'} = "html";
@@ -130 +135 @@
     }
 
-    # 14-05-02 To allow for proper inheritance of arguments - John Thompson
-    my $option_list = $self->{'option_list'};
-    push( @{$option_list}, $options );
-
-    foreach my $key (keys %$args) {
-      $self->{$key} = $args->{$key};
-    }
- 
     return bless $self, $class;
 }
@@ -273 +270 @@
 
     my $outhandle = $self->{'outhandle'};
-
+    
     my $filename = $file;
     $filename = &util::filename_cat ($base_dir, $file) if $base_dir =~ /\w/;
@@ -296 +293 @@
 
     my $output_ext = $self->{'convert_to_ext'};
+    
     my $conv_filename = $self->tmp_area_convert_file($output_ext, $filename);