Changeset 10425

Timestamp:

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

Author:

chi

Message:

Modification of the way passing argument and option lists for the secondary plugin.

Location:

trunk/gsdl/perllib/plugins

Files:

• PSPlug.pm (modified) (4 diffs)
• RTFPlug.pm (modified) (1 diff)

trunk/gsdl/perllib/plugins/PSPlug.pm

@@ -73 +73 @@
     push(@$inputargs,"-title_sub");
     push(@$inputargs,'^(Page\s+\d+)?(\s*1\s+)?');
-
+    
     if(defined $arguments){ push(@{$hashArgOptLists->{"ArgList"}},@{$arguments});}
     if(defined $options) { push(@{$hashArgOptLists->{"OptList"}},$options)};
-
+    
     my $self = (defined $hashArgOptLists)? new ConvertToPlug($pluginlist,$inputargs,$hashArgOptLists): new ConvertToPlug($pluginlist,$inputargs);
-
 
     my $secondary_plugin_options = $self->{'secondary_plugin_options'};
@@ -92 +91 @@
     #$self->{'input_encoding'} = "utf8";
     #$self->{'extract_language'} = 1;
-    #push(@$text_options, "-input_encoding", "utf8");
-    #push(@$text_options,"-extract_language");
+    push(@$text_options, "-input_encoding", "utf8");
+    push(@$text_options,"-extract_language");
     push(@$text_options , "-title_sub", '^(Page\s+\d+)?(\s*1\s+)?');
 
     $self = bless $self, $class;
 
-    $self->load_secondary_plugins($class,$secondary_plugin_options);
+    $self->load_secondary_plugins($class,$secondary_plugin_options, $hashArgOptLists);
 
     return $self;
@@ -124 +123 @@
     
     my ($language, $encoding) = $self->textcat_get_language_encoding ($conv_filename);
-    
-#    print STDERR "*** Plug encoding = $encoding\n";
     
     # read in file ($text will be in utf8)
@@ -134 +131 @@
     unicode::ensure_utf8(\$text);
     
-    #print STDERR "*** Text =$text\n";
     # Write it out again!
     $self->utf8_write_file (\$text, $conv_filename);

trunk/gsdl/perllib/plugins/RTFPlug.pm

@@ -57 +57 @@
     if(defined $arguments){ push(@{$hashArgOptLists->{"ArgList"}},@{$arguments});}
     if(defined $options) { push(@{$hashArgOptLists->{"OptList"}},$options)};
+ 
+    my $self = (defined $hashArgOptLists)? new ConvertToPlug($pluginlist,$inputargs,$hashArgOptLists): new ConvertToPlug($pluginlist,$inputargs);
 
-    my $self = (defined $hashArgOptLists)? new ConvertToPlug($pluginlist,$inputargs,$hashArgOptLists): new ConvertToPlug($pluginlist,$inputargs);
+    my $secondary_plugin_options = $self->{'secondary_plugin_options'};
+    if (!defined $secondary_plugin_options->{'TEXTPlug'}) {
+    $secondary_plugin_options->{'TEXTPlug'} = [];
+    }
+    if (!defined $secondary_plugin_options->{'HTMLPlug'}) {
+    $secondary_plugin_options->{'HTMLPlug'} = [];
+    }
+    my $text_options = $secondary_plugin_options->{'TEXTPlug'};
+    my $html_options = $secondary_plugin_options->{'HTMLPlug'};
+    
+    #$self->{'input_encoding'} = "utf8";
+    #$self->{'extract_language'} = 1;
+    push(@$text_options, "-input_encoding", "utf8");
+    push(@$text_options,"-extract_language");
+    
 
     $self = bless $self, $class;
 
-    my $secondary_plugin_options = $self->{'secondary_plugin_options'};
-    $self->load_secondary_plugins($class,$secondary_plugin_options);
+    $self->load_secondary_plugins($class,$secondary_plugin_options, $hashArgOptLists);
 
     return $self;