diff --git a/html/inc/bossa_example.inc b/html/inc/bossa_example.inc index 5740a7dc25..76e043fc7d 100644 --- a/html/inc/bossa_example.inc +++ b/html/inc/bossa_example.inc @@ -64,8 +64,7 @@ function job_summary($job) { return "path>View image"; } -function instance_summary($inst) { - $info = $inst->get_opaque_data(); +function instance_summary($info) { if ($info->have_ellipse) { return "($info->cx, $info->cy)"; } else { diff --git a/html/inc/bossa_example2.inc b/html/inc/bossa_example2.inc index 838ac6d5dd..093ddb2770 100644 --- a/html/inc/bossa_example2.inc +++ b/html/inc/bossa_example2.inc @@ -122,8 +122,7 @@ function show_job_summary($job) { return "path>View image"; } -function show_instance_summary($inst) { - $info = $inst->get_opaque_data(); +function instance_summary($info) { if ($info->have_ellipse) { return "ellipse ($info->cx, $info->cy)"; } else { diff --git a/html/ops/bossa_admin.php b/html/ops/bossa_admin.php index 8a00408d94..367557094a 100644 --- a/html/ops/bossa_admin.php +++ b/html/ops/bossa_admin.php @@ -223,7 +223,7 @@ function job_show_insts($job_id) { function calibration_job_string($inst, $job) { if ($inst->calibration) { - $i = $job->get_info(); + $i = $job->get_opaque_data(); return "yes: ".instance_summary($i->answer); } else { return "no"; @@ -250,7 +250,7 @@ function show_bossa_user() { calibration_job_string($inst, $job), time_str($inst->create_time), job_duration($inst), - instance_summary($inst->get_info()) + instance_summary($inst->get_opaque_data()) ); } end_table(); @@ -273,6 +273,10 @@ function clear_batch($batch_id) { admin_page_head("Deleting instances"); if (BossaJobInst::delete_aux("batch_id=$batch_id")) { echo "Job instances deleted."; + $jobs = BossaJob::enum("batch_id=$batch_id"); + foreach ($jobs as $job) { + $job->update("priority_0=1"); + } } else { echo "Database error."; }