Changeset 18474 for gsdl/trunk

Timestamp:

2009-02-09T14:34:27+13:00 (15 years ago)

Author:

mdewsnip

Message:

Fix to problem when using cached generated images where the image width and height metadata values were left undefined. Now saves the conversion result to a file (similar to what is done with the conversion arguments), and this is read when a cached image is used. By Jeffrey Ke at DL Consulting Ltd.

File:

• gsdl/trunk/perllib/convertutil.pm (modified) (2 diffs)

gsdl/trunk/perllib/convertutil.pm

@@ -233 +233 @@
     print $outhandle "         This means $ofilename will be regenerated on next build whether\n";
     print $outhandle "         processing args have changed or not.\n";
+    }
+
+    # Store the result, since ImageConverter.pm extracts the image height and width from the processed result
+    my $result_filename = "$ofilename.result";
+    if (open(RESOUT, ">$result_filename"))
+    {
+    print RESOUT $result;
+    close(RESOUT);
+    }
+    else
+    {
+    my $outhandle = $options->{'outhandle'};
+    print $outhandle "Warning: Unable to write out cached process result to file $result_filename.\n";
     }
 
@@ -279 +292 @@
             print $outhandle "  $message_prefix: Cached file $ofile_no_dir already exists.\n";
             print $outhandle "  $message_prefix: No need to regenerate $ofile\n" if ($verbosity > 2);
+                    
+                    # Read in the cached result lines and join them into a single string
+                    my $result_filename = "$ofilename.result";
+                    if (open(RESIN, "<$result_filename"))
+            {
+                      my @result_lines = <RESIN>;
+                      $result = join("\n", @result_lines);
+                      close(RESIN);
+                    }
+                    else
+            {
+                      print $outhandle "  $message_prefix: Error, failed to obtain cached result from $result_filename.\n";
+                    }
         }