Changeset 3833

Timestamp:

2003-03-10T15:44:08+13:00 (21 years ago)

Author:

jrm21

Message:

fixed up parsing the use_sections argument.

File:

• trunk/gsdl/perllib/plugins/PDFPlug.pm (modified) (4 diffs)

trunk/gsdl/perllib/plugins/PDFPlug.pm

@@ -60 +60 @@
     my $class = shift (@_);
 
-    my ($noimages, $complex, $zoom);
+    my ($noimages, $complex, $zoom, $use_sections);
     
     if (!parsargv::parse(\@_, 
@@ -66 +66 @@
              q^complex^, \$complex,
              q^zoom/\d+/2^, \$zoom,
+             q^use_sections/1?/^, \$use_sections,
              "allow_extra_options")) {
 
@@ -73 +74 @@
     }
 
+
+    my @args=@_;
+    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 @args=();
-    my $use_sections=0;
-    while ($#_ > -1) {
-    my $arg=shift(@_);
-    if ($arg =~ /^\-use_sections/) {
-        $use_sections=1;
-        # in case someone put "-use_sections 1"
-        $arg=shift(@_);
-        if (defined($arg) && $arg ne "1") {
-        push(@args, $arg);
-        }
-        push(@args, "-description_tags"); # so HTML uses sections...
-        push(@args, @_); # any other args to PDFPlug...
-        @_=();
-        last;
-    } else {
-        push(@args, $arg);
-    }
-    }
     my $self = new ConvertToPlug ($class, @args, "-title_sub", '^(Page\s+\d+)?(\s*1\s+)?');
+
     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'};
@@ -153 +143 @@
 sub process {
     my $self = shift (@_);
-
     if ($self->{'use_sections'}
     && $self->{'converted_to'} eq "HTML") {