Changeset 15914

Timestamp:

2008-06-09T13:26:33+12:00 (16 years ago)

Author:

kjdon

Message:

removed some old stuff and moved around some methods

File:

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

gsdl/trunk/perllib/plugins/PagedImagePlugin.pm

@@ -229 +229 @@
 }
 
-sub rotate_image {
-    my $self = shift (@_);
-    my ($filename_full_path) = @_;
-    
-    my ($this_filetype) = $filename_full_path =~ /\.([^\.]*)$/;
-    my $result = $self->convert($filename_full_path, $this_filetype, "-rotate 180", "ROTATE");
-    my ($new_filename) = ($result =~ /=>(.*\.$this_filetype)/);
-    if (-e "$new_filename") {
-    return $new_filename;
-    }
-    # somethings gone wrong
-    return $filename_full_path;
-
-}
-
-sub process_image {
-    my $self = shift(@_);
-    my ($filename_full_path, $filename_no_path, $doc_obj, $section, $rotate) = @_;
-    # do rotation
-    if ($rotate eq "r") {
-    # check the filenames
-    return 0 if ($filename_no_path eq "" || !-f $filename_full_path);
-
-    # we get a new temporary file which is rotated
-    $filename_full_path = $self->rotate_image($filename_full_path);
-    }
-    
-    # do generate images
-    my $result = $self->generate_images($filename_full_path, $filename_no_path, $doc_obj, $section);
-    #overwrite one set in ImageConverter
-    $doc_obj->set_metadata_element ($section, "FileFormat", "PagedImage");
-    return $result;
-}
-
-sub old_read_stuff_for_xml_version {
-    my ($self, $filename, $file, $gli);
-
-    # this bit same as ReadXMLFile read
-#   $file =~ s/^[\/\\]+//; # $file often begins with / so we'll tidy it up
-#   $self->{'file'} = $file;
-#   $self->{'filename'} = $filename_full_path;
-#   $self->{'processor'} = $processor;
-#   $self->{'metadata'} = $metadata;
-#
-    eval {
-        $@ = "";
-        my $xslt = $self->{'xslt'};
-        if (defined $xslt && ($xslt ne "")) {
-        # perform xslt
-        my $transformed_xml = $self->apply_xslt($xslt,$filename);
-        
-        # feed transformed file (now in memory as string) into XML parser
-        $self->{'parser'}->parse($transformed_xml);
-        ###$self->parse_string($transformed_xml);
-        }
-        else {
-        $self->{'parser'}->parsefile($filename);
-        #$self->parse_file($filename);
-        }
-    };
-    
-    
-    
-    if ($@) {
-        
-        # parsefile may either croak somewhere in XML::Parser (e.g. because
-        # the document is not well formed) or die somewhere in XMLPlug or a
-        # derived plugin (e.g. because we're attempting to process a
-        # document whose DOCTYPE is not meant for this plugin). For the
-        # first case we'll print a warning and continue, for the second
-        # we'll just continue quietly
-        
-        print STDERR "**** XML Parse Error is: $@\n";
-        
-        my ($msg) = $@ =~ /Carp::croak\(\'(.*?)\'\)/;
-        if (defined $msg) { 
-        my $outhandle = $self->{'outhandle'};
-        my $plugin_name = ref ($self);
-        print $outhandle "$plugin_name failed to process $file ($msg)\n";
-        }
-
-        # reset ourself for the next document
-        $self->{'section_level'}=0;
-        print STDERR "<ProcessingError n='$file'>\n" if ($gli);
-        return -1; # error during processing
-    }
-
-}
-
-
-# The PagedImagePlugin read() function. This function does all the right things
-# to make general options work for a given plugin. It calls the process()
-# function which does all the work specific to a plugin (like the old
-# read functions used to do). Most plugins should define their own 
-# process() function and let this read() function keep control.
-#
-# PagedImagePlugin overrides read() because there is no need to read the actual 
-# text of the file in, because the contents of the file is not text...
-#
-# Return number of files processed, undef if can't process
-# Note that $base_dir might be "" and that $file might 
-# include directories
+# we want to use BasePlugin's read, not ReadXMLFile's
+sub read
+{
+    my $self = shift (@_);
+    $self->BasePlugin::read(@_);
+}
+
 
 sub read_into_doc_obj {
@@ -429 +334 @@
 
 }
-# de we need this? old read was the same as BasePlug read, not the same as ReadXMLfile read
-sub read
-{
-    my $self = shift (@_);
-    $self->BasePlugin::read(@_);
-}
+
+sub rotate_image {
+    my $self = shift (@_);
+    my ($filename_full_path) = @_;
+    
+    my ($this_filetype) = $filename_full_path =~ /\.([^\.]*)$/;
+    my $result = $self->convert($filename_full_path, $this_filetype, "-rotate 180", "ROTATE");
+    my ($new_filename) = ($result =~ /=>(.*\.$this_filetype)/);
+    if (-e "$new_filename") {
+    return $new_filename;
+    }
+    # somethings gone wrong
+    return $filename_full_path;
+
+}
+
+sub process_image {
+    my $self = shift(@_);
+    my ($filename_full_path, $filename_no_path, $doc_obj, $section, $rotate) = @_;
+    # do rotation
+    if ($rotate eq "r") {
+    # check the filenames
+    return 0 if ($filename_no_path eq "" || !-f $filename_full_path);
+
+    # we get a new temporary file which is rotated
+    $filename_full_path = $self->rotate_image($filename_full_path);
+    }
+    
+    # do generate images
+    my $result = $self->generate_images($filename_full_path, $filename_no_path, $doc_obj, $section);
+    #overwrite one set in ImageConverter
+    $doc_obj->set_metadata_element ($section, "FileFormat", "PagedImage");
+    return $result;
+}
+
 
 sub xml_start_tag {
@@ -661 +595 @@
 }
 
-# do plugin specific processing of doc_obj
-sub process_old {
-    my $self = shift (@_);
-    my ($textref, $pluginfo, $base_dir, $file, $metadata, $doc_obj) = @_;
-    my $outhandle = $self->{'outhandle'};
-    
-    return 1;
-}
 
 sub clean_up_after_doc_obj_processing {