Changeset 10218 for trunk/gsdl/perllib/plugins/PDFPlug.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/PDFPlug.pm (modified) (1 diff)

trunk/gsdl/perllib/plugins/PDFPlug.pm

@@ -70 +70 @@
 
 sub new {
-    my $class = shift (@_);
-
-    my ($noimages, $complex, $zoom, $use_sections, $nohidden);
-
-    my @args=@_;
-
-    if (!parsargv::parse(\@_, 
-             q^noimages^, \$noimages,
-             q^complex^, \$complex,
-             q^zoom/\d+/2^, \$zoom,
-             q^nohidden^, \$nohidden,
-             q^use_sections^, \$use_sections,
-             "allow_extra_options")) {
-
-    my $self = new ConvertToPlug($class, @_);
-    my $outhandle=$self->{'outhandle'};
-    print $outhandle "\nIncorrect options passed to PDFPlug, check your collect.cfg configuration file\n";
-    $self->print_txt_usage("");  # Use default resource bundle
-    exit 1;
-    }
-
-
-    if ($use_sections) {
-    push (@args, "-description_tags");
-    }
-
-    # following title_sub removes "Page 1" added by pdftohtml, and a leading
-    # "1", which is often the page number at the top of the page. Bad Luck
-    # if your document title actually starts with "1 " - is there a better way?
-
-    my $self = new ConvertToPlug ($class, @args, "-title_sub", '^(Page\s+\d+)?(\s*1\s+)?');
-    $self->{'plugin_type'} = "PDFPlug";
-    if ($use_sections) {
-    $self->{'use_sections'}=1;
-    }
-
-    # 14-05-02 To allow for proper inheritance of arguments - John Thompson
-    my $option_list = $self->{'option_list'};
-    push( @{$option_list}, $options );
+    my ($class) = shift (@_);
+    my ($pluginlist,$inputargs,$hashArgOptLists) = @_;
+    push(@$pluginlist, $class);
+
+    if(defined $arguments){ push(@{$hashArgOptLists->{"ArgList"}},@{$arguments});}
+    if(defined $options) { push(@{$hashArgOptLists->{"OptList"}},$options)};
+
+    push(@$inputargs,"-title_sub");
+    push(@$inputargs,'^(Page\s+\d+)?(\s*1\s+)?');
+
+    my $self = (defined $hashArgOptLists)? new ConvertToPlug($pluginlist,$inputargs,$hashArgOptLists): new ConvertToPlug($pluginlist,$inputargs);
+
+
+    if ($self->{"use_sections"}) {
+    $self->{"description_tags"} = 1;
+    }
 
     # these are passed through to gsConvert.pl by ConvertToPlug.pm
+    my $zoom = $self->{"zoom"};
     $self->{'convert_options'} = "-pdf_zoom $zoom";
-    $self->{'convert_options'} .= " -pdf_complex" if $complex;
-    $self->{'convert_options'} .= " -pdf_nohidden" if $nohidden;
-    $self->{'convert_options'} .= " -pdf_ignore_images" if $noimages;
+    $self->{'convert_options'} .= " -pdf_complex" if $self->{"complex"};
+    $self->{'convert_options'} .= " -pdf_nohidden" if $self->{"nohidden"};
+    $self->{'convert_options'} .= " -pdf_ignore_images" if $self->{"noimages"};
 
     # pdftohtml will always produce html files encoded as utf-8