--- loncom/homework/bridgetask.pm 2006/03/28 22:03:47 1.126 +++ loncom/homework/bridgetask.pm 2006/04/10 07:37:39 1.138 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: bridgetask.pm,v 1.126 2006/03/28 22:03:47 albertel Exp $ +# $Id: bridgetask.pm,v 1.138 2006/04/10 07:37:39 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -66,7 +66,7 @@ sub proctor_check_auth { my @allowed=split(",",$slot->{'proctor'}); foreach my $possible (@allowed) { - my ($puser,$pdom)=(split('@',$possible)); + my ($puser,$pdom)=(split(':',$possible)); if ($puser eq $user && $pdom eq $domain) { my $authenticated=0; if ( $slot->{'secret'} =~ /\S/ && @@ -95,7 +95,7 @@ sub proctor_check_auth { #setup new version and who did it $Apache::lonhomework::results{'resource.0.version'}=$version; $Apache::lonhomework::results{"resource.$version.0.checkedin"}= - $user.'@'.$domain; + $user.':'.$domain; $Apache::lonhomework::results{"resource.$version.0.checkedin.slot"}= $slot_name; @@ -103,7 +103,7 @@ sub proctor_check_auth { } elsif ($authenticated && $type eq 'problem') { &Apache::lonxml::debug("authed $slot_name"); $Apache::lonhomework::results{"resource.0.checkedin"}= - $user.'@'.$domain; + $user.':'.$domain; $Apache::lonhomework::results{"resource.0.checkedin.slot"}= $slot_name; } @@ -632,7 +632,7 @@ sub get_key_todo { } - my $me=$env{'user.name'}.'@'.$env{'user.domain'}; + my $me=$env{'user.name'}.':'.$env{'user.domain'}; #need to try both queues.. if (defined($env{'form.regradeaspecificsubmission'}) && @@ -678,7 +678,7 @@ sub get_key_todo { #otherwise (defined($who) && $who ne $me) some else has it... return (undef,'not_allowed', &mt('Another user ([_1]) currently has the record for [_2] locked.', - $who,$env{'form.gradinguser'}.'@'.$env{'form.gradingdomain'})); + $who,$env{'form.gradinguser'}.':'.$env{'form.gradingdomain'})); } @@ -906,7 +906,7 @@ DONEBUTTON } &Apache::lonxml::debug("all dim ".join(':',@Apache::bridgetask::dimensionlist)."results -> m_f $mandatory_failed o_p $optional_passed u $ungraded r $review"); $Apache::lonhomework::results{'resource.0.regrader'}= - $env{'user.name'}.'@'.$env{'user.domain'}; + $env{'user.name'}.':'.$env{'user.domain'}; if ($review) { $Apache::lonhomework::results{"resource.$version.0.status"}='review'; if ($env{'form.queue'} eq 'reviewqueue') { @@ -974,7 +974,7 @@ DONEBUTTON &Apache::structuretags::finalize_storage(); } } elsif ($target eq 'webgrade') { - $result.="\n
"; + $result.=""; #$result.=' '; #$result.='[_1]',$queue{"$key\0locked"}); if ($me eq $queue{"$key\0locked"}) { ($action,$description)=('resume',&mt('Resume')); @@ -1218,7 +1218,7 @@ FORM } } $result.= "".$fullname->{$uname.':'.$udom}. - " ($uname\@$udom) "; + " ($uname:$udom) "; $result.='Slot: '.$slot.' End time: '. &Apache::lonlocal::locallocaltime($slot_data{'endtime'}). ""; @@ -1265,13 +1265,13 @@ sub get_queue_counts { sub encode_queue_key { my ($symb,$udom,$uname)=@_; - return "$symb\0queue\0$uname\@$udom"; + return "$symb\0queue\0$uname:$udom"; } sub decode_queue_key { my ($key)=@_; my ($symb,undef,$user) = split("\0",$key); - my ($uname,$udom) = split('@',$user); + my ($uname,$udom) = split(':',$user); return ($symb,$uname,$udom); } @@ -1319,8 +1319,13 @@ sub pick_from_queue_data { if (@possible) { # sort entries in order by slot end time @possible = sort { $a->[1] <=> $b->[1] } @possible; - # pick one of the first ten entries - my $max=($#possible < 10) ? $#possible : 10; + # pick one of the entries in the top 10% in small queues and one + # of the first ten entries in large queues + my $ten_percent = int($#possible * 0.1); + if ($ten_percent < 1 ) { $ten_percent = 1; } + if ($ten_percent > 10) { $ten_percent = 10; } + my $max=($#possible < $ten_percent) ? $#possible : $ten_percent; + return $possible[int(rand($max))][0]; } return undef; @@ -1329,7 +1334,7 @@ sub pick_from_queue_data { sub find_mid_grade { my ($queue,$symb,$cdom,$cnum)=@_; my $todo=&Apache::lonnet::unescape($env{'form.gradingkey'}); - my $me=$env{'user.name'}.'@'.$env{'user.domain'}; + my $me=$env{'user.name'}.':'.$env{'user.domain'}; if ($todo) { my $who=&queue_key_locked($queue,$todo,$cdom,$cnum); if ($who eq $me) { return $todo; } @@ -1349,7 +1354,7 @@ sub find_mid_grade { sub lock_key { my ($queue,$todo)=@_; - my $me=$env{'user.name'}.'@'.$env{'user.domain'}; + 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'}; @@ -1764,9 +1769,7 @@ sub get_instance { my $link=&link($instance,$id); my $status=$Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.status"}; $result.='
'."\n". - ''."\n". - ''."\n". - '
'."\n"; + '
'."\n"; @Apache::scripttag::parser_env = @_; $result.=&Apache::scripttag::xmlparse($dimension{$instance.'.criteria.'.$id}); $result.='
'."\n". @@ -1845,7 +1848,7 @@ sub grading_history { foreach my $t (1..$Apache::lonhomework::history{'version'}) { if (exists($Apache::lonhomework::history{$t.':resource.0.regrader'})) { my ($gname,$gdom) = - split('@',$Apache::lonhomework::history{$t.':resource.0.regrader'}); + split(':',$Apache::lonhomework::history{$t.':resource.0.regrader'}); my $fullname = &Apache::loncommon::plainname($gname,$gdom); $grader = &Apache::loncommon::aboutmewrapper($fullname, $gname,$gdom); @@ -1874,8 +1877,8 @@ sub start_IntroParagraph { if ($tagstack->[-2] eq 'Dimension') { $dimension{'intro'}=&Apache::lonxml::get_all_text('/introparagraph',$parser,$style); - } elsif ($target eq 'webgrade') { - &Apache::lonxml::get_all_text('/introparagraph',$parser,$style); + } elsif ($tagstack->[-2] eq 'Task' && $target eq 'webgrade') { + &Apache::lonxml::startredirection(); } } @@ -1883,6 +1886,10 @@ sub start_IntroParagraph { } sub end_IntroParagraph { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + if ($tagstack->[-2] eq 'Task' && $target eq 'webgrade') { + my $result = &Apache::lonxml::endredirection(); + } } sub start_Instance { @@ -1965,7 +1972,7 @@ sub proctor_validation_screen { Student who should be logged in is: Name:$name Student ID:$env{'environment.id'} - Usename$user\@$domain + Usename$user:$domain 500 Internal Server Error

Internal Server Error

The server encountered an internal error or misconfiguration and was unable to complete your request.

Please contact the server administrator at root@localhost to inform them of the time this error occurred, and the actions you performed just before this error.

More information about this error may be available in the server error log.