--- loncom/homework/bridgetask.pm 2005/05/19 21:28:06 1.26 +++ loncom/homework/bridgetask.pm 2005/05/27 17:08:03 1.32 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: bridgetask.pm,v 1.26 2005/05/19 21:28:06 albertel Exp $ +# $Id: bridgetask.pm,v 1.32 2005/05/27 17:08:03 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -71,11 +71,16 @@ sub proctor_check_auth { if ($authhost ne 'no_host') { my $version= $Apache::lonhomework::results{'resource.version'}= - $Apache::lonhomework::history{'resource.version'}++; + ++$Apache::lonhomework::history{'resource.version'}; $Apache::lonhomework::results{"resource.$version.checkedin"}= $user.'@'.$domain; $Apache::lonhomework::results{"resource.$version.checkedin.slot"}= $slot_name; + foreach my $key (keys(%Apache::lonhomework::history)) { + if ($key=~/^resource\.0\./) { + $Apache::lonhomework::results{$key}=''; + } + } return 1; } } @@ -84,35 +89,67 @@ sub proctor_check_auth { } sub get_version { + my ($version,$previous); if ($env{'form.previousversion'} && defined($Apache::lonhomework::history{'resource.'.$env{'form.previousversion'}.'.status'})) { - return $env{'form.previousversion'}; + $version=$env{'form.previousversion'}; + $previous=1; + } else { + $version=$Apache::lonhomework::history{'resource.version'}; + $previous=0; } - return $Apache::lonhomework::history{'resource.version'}; + if (wantarray) { + return ($version,$previous); + } + return $version; } sub add_previous_version_button { my ($status)=@_; my $result; - if ($Apache::lonhomework::history{'resource.version'} eq '0') { + if ($Apache::lonhomework::history{'resource.version'} eq '') { return ''; } - my $version=&get_version(); - if ($version ne $Apache::lonhomework::history{'resource.version'}) { + if ($Apache::lonhomework::history{'resource.version'} < 2 && + $status ne 'NEEDS_CHECKIN') { return ''; } - - $result.=&mt(' Show a previously done version: [_1]',''); + my $version=&get_version(); + if ($env{'form.previousversion'} ne '' && + $env{'form.previousversion'} eq $version) { + $result.="

".&mt("Showing previous version [_1]",$version). + "

\n"; + } + my @to_show; + foreach my $test_version (1..$Apache::lonhomework::history{'resource.version'}) { + if (defined($Apache::lonhomework::history{'resource.'.$test_version.'.status'})) { + push(@to_show,$test_version); + } + } + my $list='\n\n"; + $result.='
'. + &mt(' Show a previously done version: [_1]','')."
"; return $result; } sub add_grading_button { - my $result; - $result.=' '; $result.=''; + if ( 1) { + #need a permissions for limitng this to 'powerful users' + #check if review queue has items + $result.=' '; + } return $result; } @@ -123,6 +160,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)=@_; @@ -147,7 +196,7 @@ sub start_Task { } if ($target eq 'web' || ($target eq 'grade' && !$env{'form.webgrade'}) || $target eq 'answer' || $target eq 'tex') { - my $version=&get_version(); + my ($version,$previous)=&get_version(); ($status,$accessmsg,my $slot_name,$slot) = &Apache::lonhomework::check_task_access('0'); push(@Apache::inputtags::status,$status); @@ -157,13 +206,14 @@ sub start_Task { &Apache::run::run($expression,$safeeval); &Apache::lonxml::debug("Got $status"); $body_tag_start.=&add_previous_version_button($status); - if (( $status eq 'CLOSED' ) || - ( $status eq 'BANNED') || - ( $status eq 'UNAVAILABLE') || - ( $status eq 'NOT_IN_A_SLOT') || - ( $status eq 'NEEDS_CHECKIN') || - ( $status eq 'WAITING_FOR_GRADE') || - ( $status eq 'INVALID_ACCESS')) { + if (!$previous && ( + ( $status eq 'CLOSED' ) || + ( $status eq 'BANNED') || + ( $status eq 'UNAVAILABLE') || + ( $status eq 'NOT_IN_A_SLOT') || + ( $status eq 'NEEDS_CHECKIN') || + ( $status eq 'WAITING_FOR_GRADE') || + ( $status eq 'INVALID_ACCESS') )) { my $bodytext=&Apache::lonxml::get_all_text("/task",$parser); if ( $target eq "web" ) { $result.= $head_tag_start.''.$body_tag_start; @@ -208,17 +258,13 @@ 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"; - } - } - my $version=&get_version(); + $result.=&preserve_grade_info(); + my ($version,$previous)=&get_version(); if ($Apache::lonhomework::history{"resource.$version.status"} eq 'fail') { $result.='

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

'; - $result.=&add_request_another_attempt_button(); + if (!$previous) { + $result.=&add_request_another_attempt_button(); + } } if ($Apache::lonhomework::history{"resource.$version.status"} eq 'pass') { $result.='

'.&mt('Passed').'

'; @@ -226,29 +272,56 @@ sub start_Task { } } elsif ( ($target eq 'grade' && $env{'form.webgrade'}) || $target eq 'webgrade') { + my $webgrade='yes'; if ($target eq 'webgrade') { - $result.=$head_tag_start.$body_tag_start.$form_tag_start; - $result.=''; - $result.=&show_queue(); - } - my $todo=&get_from_queue(); - if ($todo) { - &setup_env_for_other_user($todo,$safeeval); - my ($symb,$uname,$udom)=&decode_queue_key($todo); - $result.="\n".'
Found '. - &Apache::lonnet::gettitle($symb).' for '.$uname.' at '.$udom.'
'; - $result.=''; - $Apache::bridgetask::queue_key=$todo; - &Apache::structuretags::initialize_storage(); - &Apache::lonhomework::showhash(%Apache::lonhomework::history); - $result.="\n".''; + #FIXME FORM conflcit with the 'show queue',1 + $result.=$head_tag_start.$body_tag_start; + $result.='
Review'.&show_queue('reviewqueue'); + $result.='
Before'.&show_queue('gradingqueue'); + } + if (defined($env{'form.reviewasubmission'})) { + $result.=&show_queue('reviewqueue',1); + my $bodytext=&Apache::lonxml::get_all_text("/task",$parser); } else { - if ($target eq 'webgrade') { - $result.="\n". - '
No user to be graded.
'; + my ($todo,$status_code)=&get_key_todo($target); + if ($todo) { + &setup_env_for_other_user($todo,$safeeval); + my ($symb,$uname,$udom)=&decode_queue_key($todo); + $result.="\n".'
Found '. + &Apache::lonnet::gettitle($symb).' for '.$uname.' at '.$udom.'
'; + $result.=''; + $Apache::bridgetask::queue_key=$todo; + &Apache::structuretags::initialize_storage(); + &Apache::lonhomework::showhash(%Apache::lonhomework::history); + if ($target eq 'webgrade') { + $result.='
After'.&show_queue('gradingqueue'); + $result.="\n".''; + } + } else { + if ($target eq 'webgrade') { + $result.="\n".'
'; + if ($status_code eq 'stop') { + $result.=&mt("Stopped grading."); + } elsif ($status_code eq 'lock_failed') { + $result.=&mt("Failed to lock the request record."); + } elsif ($status_code eq 'unlock') { + $result.=&mt("Unlocked the requested user."); + } else { + $result.=&mt("No user to be graded."); + } + $result.='
'; + } + $webgrade='no'; + my $bodytext=&Apache::lonxml::get_all_text("/task",$parser); } - my $bodytext=&Apache::lonxml::get_all_text("/task",$parser); + } + if ($target eq 'webgrade' && defined($env{'form.queue'})) { + $result.=$form_tag_start; + $result.=''; + $result.=''; } } else { # page_start returned a starting result, delete it if we don't need it @@ -257,11 +330,46 @@ sub start_Task { return $result; } +sub get_key_todo { + my ($target)=@_; + my $todo; + my $queue=$env{'form.queue'}; + if (!defined($queue)) { + $env{'form.queue'}=$queue='gradingqueue'; + } + my $gradingkey=&Apache::lonnet::unescape($env{'form.gradingkey'}); + if (defined($env{'form.queue'}) && defined($env{'form.gradingkey'}) + && !defined($env{'form.action'})) { + #FIXME probably need to do some cheking here for more validity + &Apache::lonnet::logthis("Found a key was given to me"); + return ($gradingkey); + } + if ($env{'form.action'} eq 'resume') { + &Apache::lonnet::logthis("Resuming a key"); + return ($gradingkey); + } elsif ($env{'form.action'} eq 'unlock') { + &Apache::lonnet::logthis("Unlocking a key ". + &check_queue_unlock($queue,$gradingkey,1)); + return (undef,'unlock'); + } elsif ($env{'form.action'} eq 'select') { + if (&lock_key($queue,$gradingkey)) { + return ($gradingkey); + } + return (undef,'lock_failed'); + } + # don't get something new from the queue if they hit the stop button + if (!($env{'form.stop'} && $target eq 'webgrade')) { + return (&get_from_queue($queue)); + } else { + return (undef,'stop'); + } +} + sub end_Task { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $result=''; my $status=$Apache::inputtags::status['-1']; - my $version=&get_version(); + my ($version,$previous)=&get_version(); if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || $target eq 'tex') { if ( @@ -269,9 +377,9 @@ sub end_Task { ($target eq 'answer') || ($target eq 'tex') ) { if ($target eq 'web') { - if ($status eq 'CAN_ANSWER') { + if ($status eq 'CAN_ANSWER' && !$previous) { $result.="\n".''. - &Apache::inputtags::file_selector($version, + &Apache::inputtags::file_selector("$version.0", "bridgetask","*", 'portfolioonly'). "
"; @@ -282,23 +390,27 @@ sub end_Task { $result.=&Apache::lonxml::xmlend().''; } } - if ($target eq 'grade' && !$env{'form.webgrade'}) { + if ($target eq 'grade' && !$env{'form.webgrade'} && !$previous) { my $award='SUBMITTED'; - &Apache::essayresponse::file_submission('0','bridgetask', + &Apache::essayresponse::file_submission("$version.0",'bridgetask', 'portfiles',\$award); if ($award eq 'SUBMITTED' && - $Apache::lonhomework::results{"resource.$version.bridgetask.portfiles"}) { - $Apache::lonhomework::results{"resource.$version.tries"}= - 1+$Apache::lonhomework::history{"resource.$version.tries"}; + $Apache::lonhomework::results{"resource.$version.0.bridgetask.portfiles"}) { + $Apache::lonhomework::results{"resource.0.tries"}= + $Apache::lonhomework::results{"resource.$version.0.tries"}= + 1+$Apache::lonhomework::history{"resource.$version.0.tries"}; + + $Apache::lonhomework::results{"resource.0.award"}= + $Apache::lonhomework::results{"resource.$version.0.award"}= + $award; } - $Apache::lonhomework::results{"resource.$version.award"}=$award; &Apache::lonhomework::showhash(%Apache::lonhomework::results); &Apache::structuretags::finalize_storage(); if ($award eq 'SUBMITTED') { - &add_to_queue(); + &add_to_queue('gradingqueue',$Apache::inputtags::slot_name); } } - if ($target eq 'grade' && $env{'form.webgrade'}) { + if ($target eq 'grade' && $env{'form.webgrade'} eq 'yes') { my $optional_required= &Apache::lonxml::get_param('OptionalRequired',$parstack, $safeeval); @@ -330,26 +442,28 @@ sub end_Task { $env{'user.name'}.'@'.$env{'user.domain'}; if ($review) { $Apache::lonhomework::results{"resource.$version.status"}='review'; - &move_to_review_queue(); + # FIXME won't work well when already in review queues + &move_between_queues('gradingqueue','reviewqueue'); } elsif ($ungraded) { $Apache::lonhomework::results{"resource.$version.status"}='ungraded'; - &check_queue_unlock(); + # FIXME if in review queue need to move back to grading queue + &check_queue_unlock($env{'form.queue'}); } 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($env{'form.queue'}); } else { $Apache::lonhomework::results{"resource.$version.status"}='pass'; $Apache::lonhomework::results{"resource.$version.0.solved"}='correct_by_override'; $Apache::lonhomework::results{"resource.$version.0.award"}='EXACT_ANS'; $Apache::lonhomework::results{"resource.$version.0.awarded"}='1'; - &remove_from_queue(); + &remove_from_queue($env{'form.queue'}); } $Apache::lonhomework::results{"resource.status"}= $Apache::lonhomework::results{"resource.$version.status"}; - if (defined($Apache::lonhomework::results{"resource.$version.awarded"})) { + if (defined($Apache::lonhomework::results{"resource.$version.0.awarded"})) { $Apache::lonhomework::results{"resource.0.award"}= $Apache::lonhomework::results{"resource.$version.award"}; $Apache::lonhomework::results{"resource.0.awarded"}= @@ -379,21 +493,51 @@ sub end_Task { return $result; } -sub move_to_review_queue { - &Apache::lonxml::debug("Want to move"); +sub move_between_queues { + my ($src_queue,$dest_queue)=@_; + my $cur_data=&get_queue_data($src_queue); + if (!$cur_data) { return 'not_exist'; } + my $result=&add_to_queue($dest_queue,$cur_data->[0]); + if ($result ne 'ok') { + return $result; + } + &check_queue_unlock($src_queue); + return &remove_from_queue($src_queue); } sub check_queue_unlock { - &Apache::lonxml::debug("Want to unlock?"); + my ($queue,$key,$allow_not_me)=@_; + my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser(); + if (!defined($key)) { + $key="$symb\0queue\0$uname\@$udom"; + } + my $cnum=$env{'course.'.$cid.'.num'}; + my $cdom=$env{'course.'.$cid.'.domain'}; + my $me=$env{'user.name'}.'@'.$env{'user.domain'}; + my $who=&queue_key_locked($queue,$key,$cdom,$cnum); + if ($who eq $me) { + return &Apache::lonnet::del($queue,["$key\0locked"],$cdom,$cnum); + } elsif ($allow_not_me) { + &Apache::lonnet::logthis("unlocking $who by $me"); + return &Apache::lonnet::del($queue,["$key\0locked"],$cdom,$cnum); + } + return 'not_owner'; } sub remove_from_queue { - &Apache::lonxml::debug("Want to remove. Done?"); + 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"); + return &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; @@ -401,43 +545,87 @@ sub setup_env_for_other_user { &Apache::lonxml::initialize_rndseed($safeeval); } +sub get_queue_data { + my ($queue)=@_; + my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser(); + my $cnum=$env{'course.'.$cid.'.num'}; + my $cdom=$env{'course.'.$cid.'.domain'}; + my $todo="$symb\0queue\0$uname\@$udom"; + my ($key,$value)=&Apache::lonnet::get($queue,[$todo],$cdom,$cnum); + if ($key eq $todo && ref($value)) { + return $value; + } + return undef; +} + sub add_to_queue { + my ($queue,$slot_name)=@_; 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); + $data{"$symb\0queue\0$uname\@$udom"}=[$slot_name]; + return &Apache::lonnet::put($queue,\%data,$cdom,$cnum); } sub show_queue { + my ($queue,$with_selects)=@_; 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); - $result.="\n

Current Queue

". - ""; + my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp); + my ($tmp)=%queue; + if ($tmp=~/^error: 2 /) { + return "\n

Current Queue

resourceusertypedata
Empty
"; + } + $result.="\n

Current Queue

"; + if ($with_selects) { $result.=""; } + $result.=""; foreach my $key (sort(keys(%queue))) { - if ($key=~/locked$/) { + if ($key=~/locked$/ && !$with_selects) { my ($symb,$uname,$udom) = &decode_queue_key($key); my $title=&Apache::lonnet::gettitle($symb); - $result.=""; $result.=''; - } elsif ($key=~/timestamp$/) { + } elsif ($key=~/timestamp$/ && !$with_selects) { my ($symb,undef) = split("\0",$key); my $title=&Apache::lonnet::gettitle($symb); - $result.=""; $result.='"; - } else { + } elsif ($key!~/(timestamp|locked)$/) { my ($symb,$uname,$udom) = &decode_queue_key($key); my $title=&Apache::lonnet::gettitle($symb); - $result.=""; + if ($with_selects) { + my $ekey=&Apache::lonnet::escape($key); + my ($action,$description)=('select',&mt('Select')); + if (exists($queue{"$key\0locked"})) { + my $me=$env{'user.name'}.'@'.$env{'user.domain'}; + if ($me eq $queue{"$key\0locked"}) { + ($action,$description)=('resume',&mt('Resume')); + } else { + ($action,$description)=('unlock',&mt('Unlock')); + } + } + $result.=(< +
+ + + + + + + +FORM + } + $result.=""; my $slot=$queue{$key}->[0]; my %slot_data=&Apache::lonnet::get_slot($slot); - $result.='"; } @@ -454,9 +642,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; } @@ -464,8 +652,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); @@ -474,13 +662,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; } @@ -490,15 +678,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) { @@ -510,50 +698,59 @@ sub find_mid_grade { return undef; } +sub lock_key { + my ($queue,$todo)=@_; + my $me=$env{'user.name'}.'@'.$env{'user.domain'}; + my (undef,$cid)=&Apache::lonxml::whichuser(); + my $cnum=$env{'course.'.$cid.'.num'}; + my $cdom=$env{'course.'.$cid.'.domain'}; + my $success=&Apache::lonnet::newput($queue,{"$todo\0locked"=> $me}, + $cdom,$cnum); + &Apache::lonnet::logthis("success $success $todo"); + if ($success eq 'ok') { + return 1; + } + return 0; +} + 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); + my $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 if (!$todo) { &Apache::lonnet::logthis("no 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("no sce $todo"); } # no user to grade if (!$todo) { last; } &Apache::lonnet::logthis("got $todo"); # otherwise found someone so lets try to lock them - my $success=&Apache::lonnet::newput('gradingqueue', - {"$todo\0locked"=> - $env{'user.name'}.'@'.$env{'user.domain'}}, - $cdom,$cnum); - # someone else already picked them - &Apache::lonnet::logthis("success $todo"); - if ($success ne 'ok') { next; } + # unless someone else already picked them + if (!&lock_key($queue,$todo)) { 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, @@ -562,12 +759,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; @@ -620,12 +817,12 @@ sub start_Dimension { } sub get_instance { - #FIXME just grabbing the first one for now, need - #to randomly pick one until all have been seen - #then start repicking &Apache::response::pushrandomnumber(); my @order=&Math::Random::random_permutation(@{$dimension{'instances'}}); - return $order[0]; + my $num=@order; + my $version=&get_version(); + my $which=($version-1)%$num; + return $order[$which]; } { @@ -673,16 +870,18 @@ sub get_instance { ''. ''. ''. ''; $result.='
resourceusertypedata
$title$uname"; + $result.="
$title$unamelock'.$queue{$key}.'
$title"; + $result.="
$titlelast queue modification time'. &Apache::lonlocal::locallocaltime($queue{$key})."
$title$uname"; + $result.="
$title$unamequeue entryEnd time: '. + $result.='queue entrySlot: '.$slot.' End time: '. &Apache::lonlocal::locallocaltime($slot_data{'endtime'}). "
'. - '
'. - '
'. - '
'. - '
'. + '
'. + '
'. + '
'. + '
'. '		'. 'Prev
'. 'Next


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