Diff for /loncom/homework/bridgetask.pm between versions 1.87 and 1.88

version 1.87, 2005/12/01 18:46:31 version 1.88, 2005/12/06 10:13:15
Line 955  sub check_queue_unlock { Line 955  sub check_queue_unlock {
     return 'not_owner';      return 'not_owner';
 }  }
   
   sub in_queue {
       my ($queue,$symb,$cdom,$cnum,$udom,$uname)=@_;
       if ($queue eq 'none') { return 0; }
       if (!defined($symb) || !defined($cdom) || !defined($cnum)
    || !defined($udom) || !defined($uname)) {
    ($symb,my $cid,$udom,$uname)=&Apache::lonxml::whichuser();
    $cnum=$env{'course.'.$cid.'.num'};
    $cdom=$env{'course.'.$cid.'.domain'};
       }
   
       my $key=&encode_queue_key($symb,$udom,$uname);
       my %results = &Apache::lonnet::get($queue,[$key],$cdom,$cnum);
   
       if (defined($results{$key})) {
    return 1;
       }
       return 0;
   }
   
 sub remove_from_queue {  sub remove_from_queue {
     my ($queue,$symb,$cdom,$cnum,$udom,$uname)=@_;      my ($queue,$symb,$cdom,$cnum,$udom,$uname)=@_;
     if ($queue eq 'none') { return 'ok'; }      if ($queue eq 'none') { return 'ok'; }
Line 964  sub remove_from_queue { Line 983  sub remove_from_queue {
  $cnum=$env{'course.'.$cid.'.num'};   $cnum=$env{'course.'.$cid.'.num'};
  $cdom=$env{'course.'.$cid.'.domain'};   $cdom=$env{'course.'.$cid.'.domain'};
     }      }
       if (!&in_queue($queue,$symb,$cdom,$cnum,$udom,$uname)) {
    return 'ok';
       }
     my $key=&encode_queue_key($symb,$udom,$uname);      my $key=&encode_queue_key($symb,$udom,$uname);
     my @keys=($key,"$key\0locked");      my @keys=($key,"$key\0locked");
     &Apache::lonnet::logthis("removing @keys");  
     return &Apache::lonnet::del($queue,\@keys,$cdom,$cnum);      return &Apache::lonnet::del($queue,\@keys,$cdom,$cnum);
 }  }
   
Line 1353  sub select_user { Line 1374  sub select_user {
   
  my $cnum=$env{'course.'.$cid.'.num'};   my $cnum=$env{'course.'.$cid.'.num'};
  my $cdom=$env{'course.'.$cid.'.domain'};   my $cdom=$env{'course.'.$cid.'.domain'};
  my %status = &get_student_status($symb,$cdom,$cnum,$udom,$uname);   my %status = &get_student_status($symb,$cdom,$cnum,$udom,$uname,
    'Task');
  my $queue = 'none';   my $queue = 'none';
  my $cannot_grade;   my $cannot_grade;
  if ($status{'reviewqueue'} =~ /^(in_progress|enqueue)$/) {   if ($status{'reviewqueue'} =~ /^(in_progress|enqueue)$/) {

Removed from v.1.87  
changed lines
  Added in v.1.88


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>