Changeset 10218 for trunk/gsdl/perllib/plugins/PagedImgPlug.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/PagedImgPlug.pm (modified) (4 diffs)

trunk/gsdl/perllib/plugins/PagedImgPlug.pm

@@ -137 +137 @@
 
 sub BEGIN {
-    @ISA = ('XMLPlug');
+    @PagedImgPlug::ISA = ('XMLPlug');
 }
 
@@ -220 +220 @@
 
 sub new {
-    my ($class) = @_;
-    my $plugin_name = shift (@_);
-    $self = new XMLPlug ("PagedImgPlug", @_);
-
-    my $option_list = $self->{'option_list'};
-    push( @{$option_list}, $options );
-
-    if (!parsargv::parse(\@_,
-             q^noscaleup^, \$self->{'noscaleup'},
-             q^converttotype/.*/^, \$self->{'converttotype'},
-             q^minimumsize/[0-9]*/100^, \$self->{'minimumsize'},
-
-             q^thumbnailsize/[0-9]*/100^, \$self->{'thumbnailsize'},
-             q^thumbnailtype/.*/gif^, \$self->{'thumbnailtype'},
-             q^screenviewsize/[0-9]*/0^, \$self->{'screenviewsize'},
-             q^screenviewtype/.*/jpg^, \$self->{'screenviewtype'},
-             q^thumbnail^, \$self->{'thumbnail'},
-             q^screenview^, \$self->{'screenview'},
-             q^headerpage^, \$self->{'headerpage'},
-             'documenttype/^(paged|hierarchy)$/paged', \$self->{'doctype'},
-             "allow_extra_options")) {
-    
-    print STDERR "\nPagedImgPlug uses an incorrect option.\n";
-    print STDERR "Check your collect.cfg configuration file.\n";
-    $self->print_txt_usage("");  # Use default resource bundle
-    die "\n";
-    }
+    my ($class) = shift (@_);
+    my ($pluginlist,$inputargs,$hashArgOptLists) = @_;
+    push(@$pluginlist, $class);
+
+    if(defined $arguments){ push(@{$hashArgOptLists->{"ArgList"}},@{$arguments});}
+    if(defined $options) { push(@{$hashArgOptLists->{"OptList"}},$options)};
+
+    my $self = (defined $hashArgOptLists)? new XMLPlug($pluginlist,$inputargs,$hashArgOptLists): new XMLPlug($pluginlist,$inputargs);
 
     return bless $self, $class;
@@ -768 +749 @@
     $self->{'num_pages'} = 0;
     my $topsection = $doc_obj->get_top_section();
-    if ($self->{'doctype'} eq 'paged') {
+    if ($self->{'documenttype'} eq 'paged') {
     # set the gsdlthistype metadata to Paged - this ensures this document will
     # be treated as a Paged doc, even if Titles are not numeric
@@ -806 +787 @@
     my $topsection = $doc_obj->get_top_section();
 
-    if ($self->{'doctype'} eq 'paged') {
+    if ($self->{'documenttype'} eq 'paged') {
     # set the gsdlthistype metadata to Paged - this ensures this document will
     # be treated as a Paged doc, even if Titles are not numeric