--- loncom/homework/bridgetask.pm 2005/05/20 21:23:42 1.29 +++ loncom/homework/bridgetask.pm 2005/05/24 19:33:28 1.30 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: bridgetask.pm,v 1.29 2005/05/20 21:23:42 albertel Exp $ +# $Id: bridgetask.pm,v 1.30 2005/05/24 19:33:28 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -154,6 +154,18 @@ sub add_request_another_attempt_button { return $result; } +sub preserve_grade_info { + my $result; + # if we are viewing someone else preserve that info + if (defined $env{'form.grade_symb'}) { + foreach my $field ('symb','courseid','domain','username') { + $result .= ''."\n"; + } + } + return $result; +} + sub start_Task { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; @@ -240,13 +252,7 @@ sub start_Task { $result.="$head_tag_start$name $body_tag_start \n $form_tag_start". ''; - # if we are viewing someone else preserve that info - if (defined $env{'form.grade_symb'}) { - foreach my $field ('symb','courseid','domain','username') { - $result .= ''."\n"; - } - } + $result.=&preserve_grade_info(); my ($version,$previous)=&get_version(); if ($Apache::lonhomework::history{"resource.$version.status"} eq 'fail') { $result.='

'.&mt('Did not pass').'

'; @@ -263,9 +269,13 @@ sub start_Task { if ($target eq 'webgrade') { $result.=$head_tag_start.$body_tag_start.$form_tag_start; $result.=''; - $result.=&show_queue(); + $result.='
Before'.&show_queue('gradingqueue'); + } + my $todo; + # don't get something new from the queue if they hit the stop button + if (!($env{'form.stop'} && $target eq 'webgrade')) { + $todo=&get_from_queue('gradingqueue'); } - my $todo=&get_from_queue(); if ($todo) { &setup_env_for_other_user($todo,$safeeval); my ($symb,$uname,$udom)=&decode_queue_key($todo); @@ -276,11 +286,19 @@ sub start_Task { $Apache::bridgetask::queue_key=$todo; &Apache::structuretags::initialize_storage(); &Apache::lonhomework::showhash(%Apache::lonhomework::history); - $result.="\n".''; + if ($target eq 'webgrade') { + $result.='
After'.&show_queue('gradingqueue'); + $result.="\n".'
'; + } } else { if ($target eq 'webgrade') { - $result.="\n". - '
No user to be graded.
'; + $result.="\n".'
'; + if ($env{'form.stop'}) { + $result.=&mt("Stopped grading."); + } else { + $result.=&mt("No user to be graded."); + } + $result.='
'; } my $bodytext=&Apache::lonxml::get_all_text("/task",$parser); } @@ -333,7 +351,7 @@ sub end_Task { &Apache::lonhomework::showhash(%Apache::lonhomework::results); &Apache::structuretags::finalize_storage(); if ($award eq 'SUBMITTED') { - &add_to_queue(); + &add_to_queue('gradingqueue'); } } if ($target eq 'grade' && $env{'form.webgrade'}) { @@ -371,13 +389,13 @@ sub end_Task { &move_to_review_queue(); } elsif ($ungraded) { $Apache::lonhomework::results{"resource.$version.status"}='ungraded'; - &check_queue_unlock(); + &check_queue_unlock('gradingqueue'); } elsif ($mandatory_failed) { $Apache::lonhomework::results{"resource.$version.status"}='fail'; $Apache::lonhomework::results{"resource.$version.0.solved"}='incorrect_by_override'; $Apache::lonhomework::results{"resource.$version.0.award"}='INCORRECT'; $Apache::lonhomework::results{"resource.$version.0.awarded"}='0'; - &remove_from_queue(); + &remove_from_queue('gradingqueue'); } else { $Apache::lonhomework::results{"resource.$version.status"}='pass'; $Apache::lonhomework::results{"resource.$version.0.solved"}='correct_by_override'; @@ -418,25 +436,37 @@ sub end_Task { } sub move_to_review_queue { + &Apache::lonxml::debug("Want to move"); } sub check_queue_unlock { - &Apache::lonxml::debug("Want to unlock?"); + my ($queue)=@_; + my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser(); + my $cnum=$env{'course.'.$cid.'.num'}; + my $cdom=$env{'course.'.$cid.'.domain'}; + my $key="$symb\0queue\0$uname\@$udom"; + my $me=$env{'user.name'}.'@'.$env{'user.domain'}; + my $who=&queue_key_locked($queue,$key,$cdom,$cnum); + if ($who eq $me) { + &Apache::lonnet::del($queue,["$key\0locked"],$cdom,$cnum); + } } sub remove_from_queue { + my ($queue)=@_; my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser(); my $cnum=$env{'course.'.$cid.'.num'}; my $cdom=$env{'course.'.$cid.'.domain'}; my $key="$symb\0queue\0$uname\@$udom"; my @keys=($key,"$key\0locked"); - &Apache::lonnet::del('gradingqueue',\@keys,$cdom,$cnum); + &Apache::lonnet::del($queue,\@keys,$cdom,$cnum); } sub setup_env_for_other_user { my ($queue_key,$safeeval)=@_; my ($symb,$uname,$udom)=&decode_queue_key($queue_key); + &Apache::lonxml::debug("setup_env for $queue_key"); $env{'form.grade_symb'}=$symb; $env{'form.grade_domain'}=$udom; $env{'form.grade_username'}=$uname; @@ -445,21 +475,23 @@ sub setup_env_for_other_user { } sub add_to_queue { + my ($queue)=@_; my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser(); my $cnum=$env{'course.'.$cid.'.num'}; my $cdom=$env{'course.'.$cid.'.domain'}; my %data; $data{"$symb\0queue\0$uname\@$udom"}=[$Apache::inputtags::slot_name]; - &Apache::lonnet::put('gradingqueue',\%data,$cdom,$cnum); + &Apache::lonnet::put($queue,\%data,$cdom,$cnum); } sub show_queue { + my ($queue)=@_; my $result; my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser(); my $cnum=$env{'course.'.$cid.'.num'}; my $cdom=$env{'course.'.$cid.'.domain'}; my $regexp="^$symb\0"; - my %queue=&Apache::lonnet::dump('gradingqueue',$cdom,$cnum,$regexp); + my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp); $result.="\n

Current Queue

". ""; foreach my $key (sort(keys(%queue))) { @@ -497,9 +529,9 @@ sub decode_queue_key { } sub queue_key_locked { - my ($key,$cdom,$cnum)=@_; + my ($queue,$key,$cdom,$cnum)=@_; my ($key_locked,$value)= - &Apache::lonnet::get('gradingqueue',["$key\0locked"],$cdom,$cnum); + &Apache::lonnet::get($queue,["$key\0locked"],$cdom,$cnum); if ($key_locked eq "$key\0locked") { return $value; } @@ -507,8 +539,8 @@ sub queue_key_locked { } sub pick_from_queue_data { - my ($check_section,$queue,$cdom,$cnum)=@_; - foreach my $key (keys(%$queue)) { + my ($queue,$check_section,$queuedata,$cdom,$cnum)=@_; + foreach my $key (keys(%$queuedata)) { my ($symb,$uname,$udom)=&decode_queue_key($key); if ($check_section) { my $section=&Apache::lonnet::getsection($uname,$udom); @@ -517,13 +549,13 @@ sub pick_from_queue_data { next; } } - my $slot=$queue->{$key}[0]; + my $slot=$queuedata->{$key}[0]; my %slot_data=&Apache::lonnet::get_slot($slot); if ($slot_data{'endtime'} > time) { &Apache::lonnet::logthis("not time"); next; } - if (&queue_key_locked($key,$cdom,$cnum)) { + if (&queue_key_locked($queue,$key,$cdom,$cnum)) { &Apache::lonnet::logthis("someone already has um."); next; } @@ -533,15 +565,15 @@ sub pick_from_queue_data { } sub find_mid_grade { - my ($symb,$cdom,$cnum)=@_; + my ($queue,$symb,$cdom,$cnum)=@_; my $todo=&Apache::lonnet::unescape($env{'form.gradingkey'}); my $me=$env{'user.name'}.'@'.$env{'user.domain'}; if ($todo) { - my $who=&queue_key_locked($todo,$cdom,$cnum); + my $who=&queue_key_locked($queue,$todo,$cdom,$cnum); if ($who eq $me) { return $todo; } } my $regexp="^$symb\0.*\0locked\$"; - my %locks=&Apache::lonnet::dump('gradingqueue',$cdom,$cnum,$regexp); + my %locks=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp); foreach my $key (keys(%locks)) { my $who=$locks{$key}; if ($who eq $me) { @@ -554,27 +586,28 @@ sub find_mid_grade { } sub get_from_queue { + my ($queue)=@_; my $result; my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser(); my $cnum=$env{'course.'.$cid.'.num'}; my $cdom=$env{'course.'.$cid.'.domain'}; my $todo; # FIXME need to find if I am 'mid grading' - $todo=&find_mid_grade($symb,$cdom,$cnum); + $todo=&find_mid_grade($queue,$symb,$cdom,$cnum); &Apache::lonnet::logthis("found ".join(':',&decode_queue_key($todo))); if ($todo) { return $todo; } while (1) { my $starttime=time; - &Apache::lonnet::put('gradingqueue',{"$symb\0timestamp"=>$starttime}, + &Apache::lonnet::put($queue,{"$symb\0timestamp"=>$starttime}, $cdom,$cnum); &Apache::lonnet::logthis("$starttime"); my $regexp="^$symb\0queue\0"; - my %queue=&Apache::lonnet::dump('gradingqueue',$cdom,$cnum,$regexp); + my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp); #make a pass looking for a user in my section if ($env{'request.course.sec'}) { &Apache::lonnet::logthis("sce"); - $todo=&pick_from_queue_data($env{'request.course.sec'},\%queue, - $cdom,$cnum); + $todo=&pick_from_queue_data($queue,$env{'request.course.sec'}, + \%queue,$cdom,$cnum); &Apache::lonnet::logthis("sce $todo"); } # no one in our section so look for any user that is ready for grading @@ -588,7 +621,7 @@ sub get_from_queue { if (!$todo) { last; } &Apache::lonnet::logthis("got $todo"); # otherwise found someone so lets try to lock them - my $success=&Apache::lonnet::newput('gradingqueue', + my $success=&Apache::lonnet::newput($queue, {"$todo\0locked"=> $env{'user.name'}.'@'.$env{'user.domain'}}, $cdom,$cnum); @@ -596,7 +629,7 @@ sub get_from_queue { &Apache::lonnet::logthis("success $todo"); if ($success ne 'ok') { next; } my (undef,$endtime)= - &Apache::lonnet::get('gradingqueue',["$symb\0timestamp"], + &Apache::lonnet::get($queue,["$symb\0timestamp"], $cdom,$cnum); &Apache::lonnet::logthis("emd $endtime"); # someone else already modified the queue, @@ -605,12 +638,12 @@ sub get_from_queue { # double check. if ($endtime != $starttime) { my ($key,$value)= - &Apache::lonnet::get('gradingqueue',["$todo"], + &Apache::lonnet::get($queue,["$todo"], $cdom,$cnum); &Apache::lonnet::logthis("check $key .. $value"); if ($key eq $todo && ref($value)) { } else { - &Apache::lonnet::del('gradingqueue',["$todo\0locked"], + &Apache::lonnet::del($queue,["$todo\0locked"], $cdom,$cnum); &Apache::lonnet::logthis("del"); next; @@ -719,16 +752,18 @@ sub get_instance { ''. ''. ''. ''; $result.='
resourceusertypedata
'. - '
'. - '
'. - '
'. - '
'. + '
'. + '
'. + '
'. + '
'. '		'. 'Prev
'. 'Next


'. ' '. + ' '. '
'; my (undef,undef,$udom,$uname) = &Apache::lonxml::whichuser();