Index: openacs-4/packages/acs-admin/www/auth/authority.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/auth/authority.tcl,v diff -u -r1.13 -r1.14 --- openacs-4/packages/acs-admin/www/auth/authority.tcl 20 Oct 2003 15:05:26 -0000 1.13 +++ openacs-4/packages/acs-admin/www/auth/authority.tcl 28 Oct 2003 14:32:12 -0000 1.14 @@ -213,12 +213,9 @@ end_time_pretty { label "End time" } - run_time_seconds { + run_time { label "Run time" html { align right } - display_template { - @batch_jobs.run_time_seconds@ secs - } } num_actions { label "Actions" @@ -251,6 +248,7 @@ interactive_pretty short_message actions_per_minute + run_time } batch_jobs select_batch_jobs {} { set job_url [export_vars -base batch-job { job_id }] @@ -265,6 +263,16 @@ if { $run_time_seconds > 0 && $num_actions > 0 } { set actions_per_minute [expr round(60.0 * $num_actions / $run_time_seconds)] } + + set run_time {} + if { $run_time_seconds > 0 } { + set hrs [expr $run_time_seconds / (60*60)] + set mins [expr ($run_time_seconds / 60) % 60] + set secs [expr $run_time_seconds % 60] + if { $hrs > 0 } { append run_time "${hrs}h " } + if { $hrs > 0 || $mins > 0 } { append run_time "${mins}m " } + append run_time "${secs}s" + } } if { [exists_and_not_null get_doc_impl_id] && [exists_and_not_null process_doc_impl_id] } { set batch_sync_run_url [export_vars -base batch-job-run { authority_id }] Index: openacs-4/packages/acs-admin/www/auth/batch-job.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/auth/batch-job.xql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-admin/www/auth/batch-job.xql 28 Oct 2003 14:32:12 -0000 1.1 @@ -0,0 +1,16 @@ + + + + + + + select entry_id + from auth_batch_job_entries + where job_id = :job_id + [template::list::filter_where_clauses -and -name batch_actions] + order by entry_id + + + + +