Changeset 14953

Timestamp:

2008-02-04T13:54:55+13:00 (16 years ago)

Author:

mdewsnip

Message:

Changed convert() function to take a target file type instead of a target file path, in preparation for caching images.

File:

• gsdl/trunk/perllib/plugins/ImagePlug.pm (modified) (5 diffs)

gsdl/trunk/perllib/plugins/ImagePlug.pm

@@ -162 +162 @@
     if ($converttotype ne "" && $filename !~ m/$converttotype$/) {
     $originalfilename = $filename;
-    $filename = &util::get_tmp_filename() . ".$converttotype";
-
-    my $result = $self->convert($originalfilename, $filename, "", "");
+
+    my $result = $self->convert($originalfilename, $converttotype, "", "");
+    ($filename) = ($result =~ /=>(.*\.$converttotype)/);
 
     $type = $converttotype;
@@ -214 +214 @@
     my $thumbnailtype = $self->{'thumbnailtype'} || 'gif';
     
-    my $thumbnailfile = &util::get_tmp_filename() . ".$thumbnailtype";
-
     # Generate the thumbnail with convert
-    my $result = $self->convert($filename, $thumbnailfile, "-geometry $thumbnailsize" . "x$thumbnailsize", "THUMB");
+    my $result = $self->convert($filename, $thumbnailtype, "-geometry $thumbnailsize" . "x$thumbnailsize", "THUMB");
+    my ($thumbnailfile) = ($result =~ /=>(.*\.$thumbnailtype)/);
 
     # Add the thumbnail as an associated file ...
@@ -243 +242 @@
     my $screenviewsize = $self->{'screenviewsize'};
     my $screenviewtype = $self->{'screenviewtype'} || 'jpeg';
-    my $screenviewfilename = &util::get_tmp_filename() . ".$screenviewtype";
 
     # make the screenview image
-    my $result = $self->convert($filename, $screenviewfilename, "-geometry $screenviewsize" . "x$screenviewsize", "SCREEN");
+    my $result = $self->convert($filename, $screenviewtype, "-geometry $screenviewsize" . "x$screenviewsize", "SCREEN");
+    my ($screenviewfilename) = ($result =~ /=>(.*\.$screenviewtype)/);
 
     # get screenview dimensions, size and type
@@ -329 +328 @@
     my $self = shift(@_);
     my $source_file_path = shift(@_);
-    my $target_file_path = shift(@_);
+    my $target_file_type = shift(@_);
     my $convert_options = shift(@_) || "";
     my $convert_type = shift(@_) || "";
@@ -336 +335 @@
     my $verbosity = $self->{'verbosity'};
 
+    # Determine the full name and path of the output file
+    my $target_file_path = &util::get_tmp_filename() . "." . $target_file_type;
+    push(@{$self->{'tmp_file_paths'}}, $target_file_path);
+
+    # Generate and run the convert command
     my $convert_command = "convert -interlace plane -verbose $convert_options \"$source_file_path\" \"$target_file_path\"";
     print $outhandle "$convert_type $convert_command\n" if ($verbosity > 2);
     my $result = `$convert_command 2>&1`;
     print $outhandle "$convert_type RESULT = $result\n" if ($verbosity > 2);
-
-    push(@{$self->{'tmp_file_paths'}}, $target_file_path);
 
     return $result;