Changeset 20539

Timestamp:

2009-09-07T11:42:58+12:00 (15 years ago)

Author:

davidb

Message:

Couple of tweaks to do with when caching is run for the very first time

File:

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

gsdl/trunk/perllib/convertutil.pm

@@ -268 +268 @@
     my $args_filename = "$ofilename.args";
 
-    if (!-e $ofilename) {
+    if ((!-e $ofilename) || (!-e $args_filename)) {
     ($regenerated,$result,$had_error) 
         = regenerate_general_cmd($command,$ofilename,$options);
@@ -302 +302 @@
             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";
-                    }
+           
+            if ((defined $options->{'cache_mode'}) 
+            && $options->{'cache_mode'} eq "without_result") {
+            $result = "";           
+            }
+            else {
+            # 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";
+            }
+            }
         }