diff --git a/checkin_notes b/checkin_notes index 42c504615f..c4030806fa 100644 --- a/checkin_notes +++ b/checkin_notes @@ -6018,3 +6018,9 @@ David 28 July 2008 sched/ Makefile.am pymw_assimilator.C + +David 28 July 2008 + - web: allow profiles to have blank text fields + + html/user/ + create_profile.php diff --git a/html/inc/bossa_example2.inc b/html/inc/bossa_example2.inc index bcb5b7430c..97bf16ee32 100644 --- a/html/inc/bossa_example2.inc +++ b/html/inc/bossa_example2.inc @@ -29,12 +29,16 @@ function job_show($job, $inst, $user) { function job_issued($job, $inst, $user) { $insts = $job->get_instances(); - if (count($insts) > 1) { + if (count($insts) == 1) { + $job->set_priority(2); + } else { $job->set_priority(0); } } function job_finished($job, $inst) { + // record the user's response + // $response = null; if (get_str('submit', true)) { $response->have_ellipse = 0; @@ -45,7 +49,7 @@ function job_finished($job, $inst) { } $inst->update_info($response); - // see if job is done + // see whether we have a consensus // $insts = $job->get_finished_instances(); $n = count($insts); @@ -64,10 +68,17 @@ function job_finished($job, $inst) { } } } + + // no consensus - see whether we've reached replication limit + // if ($n >= 10) { $job->update_state(BOSSA_JOB_INCONCLUSIVE); return; } + + // still looking for consensus - allow another instance to be issued + // + $job->set_priority(2); } // two results are compatible if neither found an ellipse, @@ -87,7 +98,7 @@ function compatible($r1, $r2) { } function job_timed_out($job, $inst, $user) { - $job->set_priority(1); + $job->set_priority(2); } function show_job_summary($job) { diff --git a/html/user/create_profile.php b/html/user/create_profile.php index cb3448a03a..5f2673c365 100644 --- a/html/user/create_profile.php +++ b/html/user/create_profile.php @@ -186,8 +186,8 @@ function show_textarea($name, $text) { // Don't assign to $profile->x if this is the case. // function process_create_profile($user, $profile) { - $response1 = post_str('response1'); - $response2 = post_str('response2'); + $response1 = post_str('response1', true); + $response2 = post_str('response2', true); $language = post_str('language'); akismet_check($user, $response1);