Changeset 22431

Timestamp:

2010-07-19T13:59:55+12:00 (14 years ago)

Author:

davidb

Message:

Correction to caching technique to work with input file rather than output file in terms of working out when the cached file needs to be regenerated

Location:

main/trunk/greenstone2/perllib

Files:

• convertutil.pm (modified) (6 diffs)
• plugins/BaseMediaConverter.pm (modified) (5 diffs)

main/trunk/greenstone2/perllib/convertutil.pm

@@ -119 +119 @@
     $monitor_deinit = "monitor_deinit";
     }
+
+   my ($cpackage,$cfilename,$cline,$csubr,$chas_args,$cwantarray) = caller(4);
+   print STDERR "Calling method; $cfilename:$cline $cpackage->$csubr:$cline\n";
 
     print $outhandle "$message_prefix: $command\n" if ($verbosity > 3);
@@ -213 +216 @@
 sub regenerate_general_cmd
 {
-    my ($command,$ofilename,$options) = @_;
+    my ($command,$ifilename,$ofilename,$options) = @_;
 
     my $regenerated = 1;
@@ -256 +259 @@
 sub run_cached_general_cmd
 {
-    my ($command,$ofilename,$options) = @_;
+    my ($command,$ifilename,$ofilename,$options) = @_;
 
     my $outhandle = $options->{'outhandle'};
@@ -270 +273 @@
     if ((!-e $ofilename) || (!-e $args_filename)) {
     ($regenerated,$result,$had_error) 
-        = regenerate_general_cmd($command,$ofilename,$options);
-    }
-    elsif (-M $ofilename < -M $args_filename) {
+        = regenerate_general_cmd($command,$ifilename,$ofilename,$options);
+    }
+    elsif (-M $ifilename < -M $args_filename) {
     # Source files has been updated/changed in some way
     # => regenerate
-    print $outhandle "$ofilename modified more recently than cached version\n";
+    print $outhandle "$ifilename modified more recently than cached version\n";
 
     ($regenerated,$result,$had_error) 
-        = regenerate_general_cmd($command,$ofilename,$options); 
+        = regenerate_general_cmd($command,$ifilename,$ofilename,$options);
     }
     else {
@@ -294 +297 @@
             # need to rerun command
             ($regenerated,$result,$had_error) 
-            = regenerate_general_cmd($command,$ofilename,$options);
+            = regenerate_general_cmd($command,$ifilename,$ofilename,$options);
         }
         else {
@@ -328 +331 @@
         print $outhandle "  $message_prefix: No cached previous args found.  Regenerating $ofilename\n";
 
-        ($regenerated,$result,$had_error) = regenerate_general_cmd($command,$ofilename,$options);
+        ($regenerated,$result,$had_error) 
+        = regenerate_general_cmd($command,$ifilename,$ofilename,$options);
     }
     }

main/trunk/greenstone2/perllib/plugins/BaseMediaConverter.pm

@@ -153 +153 @@
 {
     my $self = shift @_;
-    my ($command,$ofilename,$print_info) = @_;
+    my ($command,$ifilename,$ofilename,$print_info) = @_;
 
     if (!defined $print_info->{'verbosity'}) {
@@ -172 +172 @@
     my $self = shift @_;
 
-    my ($command,$ofilename,$print_info) = @_;
+    my ($command,$ifilename,$ofilename,$print_info) = @_;
 
     return $self->run_general_cmd($command,$print_info);
@@ -183 +183 @@
     my $self = shift @_;
 
-    my ($command,$ofilename,$print_info) = @_;
+    my ($command,$ifilename,$ofilename,$print_info) = @_;
 
     if (!defined $print_info->{'verbosity'}) {
@@ -202 +202 @@
     my $self = shift @_;
 
-    my ($command,$ofilename,$print_info) = @_;
+    my ($command,$ifilename,$ofilename,$print_info) = @_;
 
     my $result;
@@ -210 +210 @@
     if ($self->{'enable_cache'}) {
     ($regenerated,$result,$had_error)
-        = $self->run_cached_general_cmd($command,$ofilename,$print_info);
+        = $self->run_cached_general_cmd($command,$ifilename,$ofilename,$print_info);
     }
     else {