Changeset 16827 for gsdl/trunk/perllib/plugins/PagedImagePlugin.pm

Timestamp:

2008-08-15T15:35:32+12:00 (16 years ago)

Author:

davidb

Message:

Edited needed to make pageImagePlugin work again after plugin restructuring

File:

• gsdl/trunk/perllib/plugins/PagedImagePlugin.pm (modified) (8 diffs)

gsdl/trunk/perllib/plugins/PagedImagePlugin.pm

@@ -192 +192 @@
     push(@{$hashArgOptLists->{"OptList"}},$options);
     
-    new ImageConverter($pluginlist, $inputargs, $hashArgOptLists);
-    new ReadTextFile($pluginlist, $inputargs, $hashArgOptLists, 1);
-    my $self = new ReadXMLFile($pluginlist, $inputargs, $hashArgOptLists);
-    
+    my $imc_self = new ImageConverter($pluginlist, $inputargs, $hashArgOptLists);
+    my $rtf_self = new ReadTextFile($pluginlist, $inputargs, $hashArgOptLists, 1);
+    my $rxf_self = new ReadXMLFile($pluginlist, $inputargs, $hashArgOptLists);
+
+    my $self = BasePlugin::merge_inheritance($imc_self,$rtf_self,$rxf_self);
+
+    # Update $self used by XML::Parser so it finds callback functions 
+    # such as start_document here and not in ReadXMLFile (which is what
+    # $self was when new XML::Parser was done)
+    #
+    # If the $self returned by this constructor is the same as the one
+    # used in ReadXMLFile (e.g. in the GAPlugin) then this step isn't necessary
+    #
+    # Consider embedding this type of assignment into merge_inheritance
+    # to help catch all cases?
+
+    $rxf_self->{'parser'}->{'PluginObj'} = $self;
+
     return bless $self, $class;
 }
@@ -227 +241 @@
     
     return q^(?i)(\.jpe?g|\.gif|\.png|\.tif?f|\.te?xt|\.html?|~)$^
+###    return q^(?i)(\.jpe?g|\.gif|\.png|\.tif?f|\.te?xt|\.html?|\.css|\.opd|\.pdf|~)$^
 }
 
@@ -233 +248 @@
 {
     my $self = shift (@_);
+
     $self->BasePlugin::read(@_);
 }
@@ -241 +257 @@
     my ($pluginfo, $base_dir, $file, $block_hash, $metadata, $processor, $maxdocs, $total_count, $gli) = @_;
     my $outhandle = $self->{'outhandle'};
+    my $verbosity = $self->{'verbosity'};
     
     my ($filename_full_path, $filename_no_path) = &util::get_full_filenames($base_dir, $file);
 
     print $outhandle "PagedImagePlugin processing \"$filename_full_path\"\n"
-    if $self->{'verbosity'} > 1;
+    if $verbosity > 1;
     print STDERR "<Processing n='$file' p='PagedImagePlugin'>\n" if ($gli);
     
@@ -354 +371 @@
     my ($filename_full_path, $filename_no_path, $doc_obj, $section, $rotate) = @_;
     # do rotation
-    if ($rotate eq "r") {
+    if  ((defined $rotate) && ($rotate eq "r")) {
     # check the filenames
     return 0 if ($filename_no_path eq "" || !-f $filename_full_path);
@@ -393 +410 @@
     my ($imgfile) = $_{'imgfile'};
     if (defined $imgfile) {
-        $self->process_image($self->{'base_dir'}.$imgfile, $imgfile, $doc_obj, $self->{'current_section'});
+        # *****
+        # What about support for rotate image (e.g. old ':r' notation)? 
+        $self->process_image($self->{'xml_file_dir'}.$imgfile, $imgfile, $doc_obj, $self->{'current_section'});
     }
     my ($txtfile) = $_{'txtfile'};
     if (defined($txtfile)&& $txtfile ne "") {
-        $self->process_text ($self->{'base_dir'}.$txtfile, $txtfile, $doc_obj, $self->{'current_section'});
+        $self->process_text ($self->{'xml_file_dir'}.$txtfile, $txtfile, $doc_obj, $self->{'current_section'});
     } else {
         $self->add_dummy_text($doc_obj, $self->{'current_section'});
@@ -450 +469 @@
 
     my ($dir, $file) = $self->{'filename'} =~ /^(.*?)([^\/\\]*)$/;
-    $self->{'base_dir'} = $dir;
+    $self->{'xml_file_dir'} = $dir;
     $self->{'num_pages'} = 0;
 
@@ -578 +597 @@
 
 
-    if ($text =~ m/<html.*?>\s*<head.*?>.*<\/head>\s*<body.*?>(.*)<\/body>\s*<\/html>\s*$/s) {
+    if ($text =~ m/<html.*?>\s*<head.*?>.*<\/head>\s*<body.*?>(.*)<\/body>\s*<\/html>\s*$/is) {
     # looks like HTML input
     # no need to escape < and > or put in <pre> tags