Changeset 22431 for main/trunk/greenstone2/perllib/convertutil.pm
- Timestamp:
- 2010-07-19T13:59:55+12:00 (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/perllib/convertutil.pm
r22350 r22431 119 119 $monitor_deinit = "monitor_deinit"; 120 120 } 121 122 my ($cpackage,$cfilename,$cline,$csubr,$chas_args,$cwantarray) = caller(4); 123 print STDERR "Calling method; $cfilename:$cline $cpackage->$csubr:$cline\n"; 121 124 122 125 print $outhandle "$message_prefix: $command\n" if ($verbosity > 3); … … 213 216 sub regenerate_general_cmd 214 217 { 215 my ($command,$ ofilename,$options) = @_;218 my ($command,$ifilename,$ofilename,$options) = @_; 216 219 217 220 my $regenerated = 1; … … 256 259 sub run_cached_general_cmd 257 260 { 258 my ($command,$ ofilename,$options) = @_;261 my ($command,$ifilename,$ofilename,$options) = @_; 259 262 260 263 my $outhandle = $options->{'outhandle'}; … … 270 273 if ((!-e $ofilename) || (!-e $args_filename)) { 271 274 ($regenerated,$result,$had_error) 272 = regenerate_general_cmd($command,$ ofilename,$options);273 } 274 elsif (-M $ ofilename < -M $args_filename) {275 = regenerate_general_cmd($command,$ifilename,$ofilename,$options); 276 } 277 elsif (-M $ifilename < -M $args_filename) { 275 278 # Source files has been updated/changed in some way 276 279 # => regenerate 277 print $outhandle "$ ofilename modified more recently than cached version\n";280 print $outhandle "$ifilename modified more recently than cached version\n"; 278 281 279 282 ($regenerated,$result,$had_error) 280 = regenerate_general_cmd($command,$ ofilename,$options);283 = regenerate_general_cmd($command,$ifilename,$ofilename,$options); 281 284 } 282 285 else { … … 294 297 # need to rerun command 295 298 ($regenerated,$result,$had_error) 296 = regenerate_general_cmd($command,$ ofilename,$options);299 = regenerate_general_cmd($command,$ifilename,$ofilename,$options); 297 300 } 298 301 else { … … 328 331 print $outhandle " $message_prefix: No cached previous args found. Regenerating $ofilename\n"; 329 332 330 ($regenerated,$result,$had_error) = regenerate_general_cmd($command,$ofilename,$options); 333 ($regenerated,$result,$had_error) 334 = regenerate_general_cmd($command,$ifilename,$ofilename,$options); 331 335 } 332 336 }
Note:
See TracChangeset
for help on using the changeset viewer.