diff --git a/checkin_notes b/checkin_notes
index e19579c267..57f6a6d6ff 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -1294,3 +1294,11 @@ Rom Feb 9 2008
client/
http_curl.C
+
+David Feb 9 2008
+ - scheduler: fix bone-head mistake in HR code
+
+ client/
+ app_control.C
+ sched/
+ sched_hr.C
diff --git a/client/app_control.C b/client/app_control.C
index dacb7aa591..b4c64155fb 100644
--- a/client/app_control.C
+++ b/client/app_control.C
@@ -217,7 +217,7 @@ void ACTIVE_TASK::handle_premature_exit(bool& will_restart) {
if (premature_exit_count > 100) {
set_task_state(PROCESS_ABORTED, "handle_premature_exit");
result->exit_status = ERR_TOO_MANY_EXITS;
- gstate.report_result_error(*result, "too many normally harmless exit(s)");
+ gstate.report_result_error(*result, "too many exit(0)s");
result->set_state(RESULT_ABORTED, "handle_premature_exit");
} else {
will_restart = true;
diff --git a/doc/logo.php b/doc/logo.php
index 58b87200e2..9847e9ca67 100644
--- a/doc/logo.php
+++ b/doc/logo.php
@@ -43,6 +43,7 @@ The colors are based on U.C. Berkeley's blue-and-gold colors.
Adobe Illustrator (.ai)
Vector graphics (.cdr)
Adobe PDF (.cdr)
+ Scalable Vector Graphics (.svg)
1280x535, transparent background (.png)
Windows meta-file (.wmf)
Favicon (GIFF)
diff --git a/html/user/bolt_course.php b/html/user/bolt_course.php
index af2aa36a73..87725f06d2 100644
--- a/html/user/bolt_course.php
+++ b/html/user/bolt_course.php
@@ -50,6 +50,7 @@ function show_view($view) {
Answer page";
}
echo "
+ $view->id |
".time_str($view->start_time)." |
$dur |
$view->item_name |
@@ -69,7 +70,7 @@ function show_views() {
$views = BoltView::enum("user_id=$user->id and course_id=$course->id order by id desc");
start_table();
- table_header("Time", "Duration", "Item", "Mode",
+ table_header("ID", "Time", "Duration", "Item", "Mode",
// "Phase",
"Action");
foreach ($views as $view) {
diff --git a/html/user/bolt_sched.php b/html/user/bolt_sched.php
index dca7de5a28..3b054075ca 100644
--- a/html/user/bolt_sched.php
+++ b/html/user/bolt_sched.php
@@ -338,7 +338,12 @@ case 'prev':
$iter = new BoltIter($course_doc);
$iter->decode_state($view->state);
$iter->at();
- $mode = default_mode($iter->item);
+ $mode = $view->mode;
+ if ($mode == BOLT_MODE_ANSWER) {
+ $v2 = BoltView::lookup_id($view->prev_view_id);
+ $result = BoltResult::lookup_id($v2->result_id);
+ $bolt_ex_query_string = $result->response;
+ }
$view_id = create_view($iter, $mode, $view->prev_view_id);
show_item($iter, $view_id, $view->prev_view_id, $mode);
} else {
diff --git a/sched/sched_hr.C b/sched/sched_hr.C
index 54a16a88dd..c16acf28f7 100644
--- a/sched/sched_hr.C
+++ b/sched/sched_hr.C
@@ -76,7 +76,7 @@ bool already_sent_to_different_platform_careful(
) {
DB_WORKUNIT db_wu;
int retval, wu_hr_class;
- char buf[256];
+ char buf[256], buf2[256];
// reread hr_class field from DB in case it's changed
//
@@ -99,8 +99,9 @@ bool already_sent_to_different_platform_careful(
// do a "careful update" to make sure the WU's hr_class hasn't
// changed since we read it earlier
//
- sprintf(buf, "hr_class=%d", "hr_class=%d", host_hr_class, wu_hr_class);
- retval = db_wu.update_field(buf);
+ sprintf(buf, "hr_class=%d", host_hr_class);
+ sprintf(buf2, "hr_class=%d", wu_hr_class);
+ retval = db_wu.update_field(buf, buf2);
if (retval) return true;
}
return wreq.hr_reject_temp;