[BACK]Return to bridgetask.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/bridgetask.pm between versions 1.32 and 1.33

version 1.32, 2005/05/27 17:08:03 version 1.33, 2005/05/27 21:13:46
Line 148  sub add_grading_button { Line 148  sub add_grading_button {
  #need a permissions for limitng this to 'powerful users'   #need a permissions for limitng this to 'powerful users'
  #check if review queue has items   #check if review queue has items
  $result.=' <input type="submit" name="reviewasubmission" value="'.   $result.=' <input type="submit" name="reviewasubmission" value="'.
     &mt("Select an entry from the review queue").'" />';      &mt("Select an entry from the review queue").'" />'."\n";
    $result.=' <input type="submit" name="reviewagrading" value="'.
       &mt("Select an entry from the grading queue").'" />'."\n";
     }      }
     return $result;      return $result;
 }  }
Line 274  sub start_Task { Line 276  sub start_Task {
       $target eq 'webgrade') {        $target eq 'webgrade') {
  my $webgrade='yes';   my $webgrade='yes';
  if ($target eq 'webgrade') {   if ($target eq 'webgrade') {
     #FIXME FORM conflcit with the 'show queue',1   
     $result.=$head_tag_start.$body_tag_start;      $result.=$head_tag_start.$body_tag_start;
     $result.='<br />Review'.&show_queue('reviewqueue');      $result.='<br />Review'.&show_queue('reviewqueue');
     $result.='<br />Before'.&show_queue('gradingqueue');      $result.='<br />Grade'.&show_queue('gradingqueue');
  }   }
  if (defined($env{'form.reviewasubmission'})) {   # FIXME Blast! still need to reorg this, need to reshow the
     $result.=&show_queue('reviewqueue',1);          #       queue being reviewed once done with the grade pass...
     my $bodytext=&Apache::lonxml::get_all_text("/task",$parser);          #       Hrrm, vaildation pass should perhaps say 'not_locked'
  } else {          #       perhaps do a search if there is a key that is mine and if
     my ($todo,$status_code)=&get_key_todo($target);          #       there isn't reshow the queue....
     if ($todo) {   my ($todo,$status_code)=&get_key_todo($target);
  &setup_env_for_other_user($todo,$safeeval);  
  my ($symb,$uname,$udom)=&decode_queue_key($todo);   &Apache::lonnet::logthis("got todo -$todo- stat -$status_code-");
  $result.="\n".'<table><tr><td>Found '.   if ($todo) {
     &Apache::lonnet::gettitle($symb).' for '.$uname.' at '.$udom.'</td></tr></table>';      &setup_env_for_other_user($todo,$safeeval);
  $result.='<input type="hidden" name="gradingkey" value="'.      my ($symb,$uname,$udom)=&decode_queue_key($todo);
     &Apache::lonnet::escape($todo).'" />';      $result.="\n".'<table><tr><td>Found '.
  $Apache::bridgetask::queue_key=$todo;   &Apache::lonnet::gettitle($symb).' for '.$uname.' at '.$udom.'</td></tr></table>';
  &Apache::structuretags::initialize_storage();      $form_tag_start.=
  &Apache::lonhomework::showhash(%Apache::lonhomework::history);   '<input type="hidden" name="gradingkey" value="'.
  if ($target eq 'webgrade') {   &Apache::lonnet::escape($todo).'" />';
     $result.='<br />After'.&show_queue('gradingqueue');      $Apache::bridgetask::queue_key=$todo;
     $result.="\n".'<table width="100%" style="width:100%" border="1">';      &Apache::structuretags::initialize_storage();
       &Apache::lonhomework::showhash(%Apache::lonhomework::history);
       if ($target eq 'webgrade') {
    $result.='<br />After -'.&show_queue($env{'form.queue'});
    $result.="\n".'<table width="100%" style="width:100%" border="1">';
    if ($status_code eq 'selected') {
       $form_tag_start.=
    '<input type="hidden" name="queuemode" value="selected" />';
  }   }
     } else {      }
  if ($target eq 'webgrade') {   } else {
     $result.="\n".'<table><tr><td><b>';      if ($target eq 'webgrade') {
     if      ($status_code eq 'stop') {   $result.="\n";
  $result.=&mt("Stopped grading.");   if      ($status_code eq 'stop') {
     } elsif ($status_code eq 'lock_failed') {      $result.='<b>'.&mt("Stopped grading.").'</b>';
  $result.=&mt("Failed to lock the request record.");   } elsif ($status_code eq 'lock_failed') {
     } elsif ($status_code eq 'unlock') {      $result.='<b>'.&mt("Failed to lock the request record.").'</b>';
  $result.=&mt("Unlocked the requested user.");   } elsif ($status_code eq 'unlock') {
     } else {      $result.='<b>'.&mt("Unlocked the requested record.").'</b>';
  $result.=&mt("No user to be graded.");      $result.=&show_queue($env{'form.queue'},1);
     }   } elsif ($status_code eq 'show_list') {
     $result.='</b></td></tr></table>';      $result.=&show_queue($env{'form.queue'},1);
    } else {
       $result.='<b>'.&mt("No user to be graded.").'</b>';
  }   }
  $webgrade='no';  
  my $bodytext=&Apache::lonxml::get_all_text("/task",$parser);  
     }      }
       $webgrade='no';
       my $bodytext=&Apache::lonxml::get_all_text("/task",$parser);
  }   }
  if ($target eq 'webgrade' && defined($env{'form.queue'})) {   if ($target eq 'webgrade' && defined($env{'form.queue'})) {
     $result.=$form_tag_start;      $result.=$form_tag_start;
Line 333  sub start_Task { Line 343  sub start_Task {
 sub get_key_todo {  sub get_key_todo {
     my ($target)=@_;      my ($target)=@_;
     my $todo;      my $todo;
   
       if (defined($env{'form.reviewasubmission'})) {
    &Apache::lonnet::logthis("review a submission....");
    $env{'form.queue'}='reviewqueue';
    return (undef,'show_list');
       }
   
       if (defined($env{'form.reviewagrading'})) {
    &Apache::lonxml::debug("review a grading....");
    $env{'form.queue'}='gradingqueue';
    return (undef,'show_list');
       }
   
     my $queue=$env{'form.queue'};      my $queue=$env{'form.queue'};
   
     if (!defined($queue)) {      if (!defined($queue)) {
  $env{'form.queue'}=$queue='gradingqueue';   $env{'form.queue'}=$queue='gradingqueue';
     }      }
   
     my $gradingkey=&Apache::lonnet::unescape($env{'form.gradingkey'});      my $gradingkey=&Apache::lonnet::unescape($env{'form.gradingkey'});
   
     if (defined($env{'form.queue'}) && defined($env{'form.gradingkey'})      if (defined($env{'form.queue'}) && defined($env{'form.gradingkey'})
  && !defined($env{'form.action'})) {   && !defined($env{'form.gradingaction'}) 
  #FIXME probably need to do some cheking here for more validity   && $env{'form.queuemode'} eq 'selected') {
  &Apache::lonnet::logthis("Found a key was given to me");  
  return ($gradingkey);   my $who=&queue_key_locked($queue,$gradingkey);
     }   my $me=$env{'user.name'}.'@'.$env{'user.domain'};
     if ($env{'form.action'} eq 'resume') {   if ($who eq $me) {
  &Apache::lonnet::logthis("Resuming a key");      &Apache::lonxml::debug("Found a key was given to me");
  return ($gradingkey);      return ($gradingkey,'selected');
     } elsif ($env{'form.action'} eq 'unlock') {   } else {
  &Apache::lonnet::logthis("Unlocking a key ".      return (undef,'show_list');
  &check_queue_unlock($queue,$gradingkey,1));   }
  return (undef,'unlock');  
     } elsif ($env{'form.action'} eq 'select') {      }
  if (&lock_key($queue,$gradingkey)) {  
       if ($target eq 'webgrade' && $env{'form.queuemode'} eq 'selected') {
    if ($env{'form.gradingaction'} eq 'resume') {
       delete($env{'form.gradingaction'});
       &Apache::lonxml::debug("Resuming a key");
     return ($gradingkey);      return ($gradingkey);
    } elsif ($env{'form.gradingaction'} eq 'unlock') {
       &Apache::lonxml::debug("Unlocking a key ".
        &check_queue_unlock($queue,$gradingkey,1));
       return (undef,'unlock');
    } elsif ($env{'form.gradingaction'} eq 'select') {
       &Apache::lonxml::debug("Locking a key");
       if (&lock_key($queue,$gradingkey)) {
    &Apache::lonxml::debug("Success $queue");
    return ($gradingkey);
       }
       &Apache::lonxml::debug("Failed $queue");
       return (undef,'lock_failed');
  }   }
  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')) {      if ($env{'form.queuemode'} ne 'selected') {
  return (&get_from_queue($queue));   # don't get something new from the queue if they hit the stop button
     } else {      if (!($env{'form.stop'} && $target eq 'webgrade') 
  return (undef,'stop');      && !$env{'form.gradingaction'}) {
       &Apache::lonxml::debug("Getting anew $queue");
       return (&get_from_queue($queue));
    } else {
       return (undef,'stop');
    }
     }      }
       return (undef,undef)
 }  }
   
 sub end_Task {  sub end_Task {
Line 442  sub end_Task { Line 489  sub end_Task {
  $env{'user.name'}.'@'.$env{'user.domain'};   $env{'user.name'}.'@'.$env{'user.domain'};
     if ($review) {      if ($review) {
  $Apache::lonhomework::results{"resource.$version.status"}='review';   $Apache::lonhomework::results{"resource.$version.status"}='review';
  # FIXME won't work well when already in review queues   if ($env{'form.queue'} eq 'reviewqueue') {
  &move_between_queues('gradingqueue','reviewqueue');      &check_queue_unlock($env{'form.queue'});
       &Apache::lonxml::debug(" still needs review not changing status.");
    } else {
       &move_between_queues('gradingqueue','reviewqueue');
    }
     } elsif ($ungraded) {      } elsif ($ungraded) {
  $Apache::lonhomework::results{"resource.$version.status"}='ungraded';   $Apache::lonhomework::results{"resource.$version.status"}='ungraded';
  # FIXME if in review queue need to move back to grading queue   # FIXME if in review queue need to move back to grading queue
  &check_queue_unlock($env{'form.queue'});   if ($env{'form.queue'} eq 'reviewqueue') {
       &Apache::lonxml::debug("moving back.");
       &move_between_queues('reviewqueue','gradingqueue');
    } else {
       &check_queue_unlock($env{'form.queue'});
    }
     } elsif ($mandatory_failed) {      } elsif ($mandatory_failed) {
  $Apache::lonhomework::results{"resource.$version.status"}='fail';   $Apache::lonhomework::results{"resource.$version.status"}='fail';
  $Apache::lonhomework::results{"resource.$version.0.solved"}='incorrect_by_override';   $Apache::lonhomework::results{"resource.$version.0.solved"}='incorrect_by_override';
Line 518  sub check_queue_unlock { Line 574  sub check_queue_unlock {
     if  ($who eq $me) {      if  ($who eq $me) {
  return &Apache::lonnet::del($queue,["$key\0locked"],$cdom,$cnum);   return &Apache::lonnet::del($queue,["$key\0locked"],$cdom,$cnum);
     } elsif ($allow_not_me) {      } elsif ($allow_not_me) {
  &Apache::lonnet::logthis("unlocking $who by $me");   &Apache::lonxml::debug("unlocking $who by $me");
  return &Apache::lonnet::del($queue,["$key\0locked"],$cdom,$cnum);   return &Apache::lonnet::del($queue,["$key\0locked"],$cdom,$cnum);
     }      }
     return 'not_owner';      return 'not_owner';
Line 578  sub show_queue { Line 634  sub show_queue {
     my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp);      my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp);
     my ($tmp)=%queue;      my ($tmp)=%queue;
     if ($tmp=~/^error: 2 /) {      if ($tmp=~/^error: 2 /) {
  return "\n<h3>Current Queue</h3><table border='1'><tr><td>Empty</td></tr></table>";   return "\n<h3>Current Queue - $queue</h3><table border='1'><tr><td>Empty</td></tr></table>";
     }      }
     $result.="\n<h3>Current Queue</h3><table border='1'><tr>";      $result.="\n<h3>Current Queue - $queue </h3><table border='1'><tr>";
     if ($with_selects) { $result.="<th></th>"; }      if ($with_selects) { $result.="<th></th>"; }
     $result.="<th>resource</th><th>user</th><th>type</th><th>data</th></tr>";      $result.="<th>resource</th><th>user</th><th>type</th><th>data</th></tr>";
     foreach my $key (sort(keys(%queue))) {      foreach my $key (sort(keys(%queue))) {
Line 617  sub show_queue { Line 673  sub show_queue {
  <input type="hidden" name="queue" value="$queue" />   <input type="hidden" name="queue" value="$queue" />
  <input type="hidden" name="gradingaction" value="$action" />   <input type="hidden" name="gradingaction" value="$action" />
  <input type="hidden" name="webgrade" value="no" />   <input type="hidden" name="webgrade" value="no" />
    <input type="hidden" name="queuemode" value="selected" />
  <input type="submit" name="submit" value="$description" />   <input type="submit" name="submit" value="$description" />
 </form>  </form>
 </td>  </td>
Line 643  sub decode_queue_key { Line 700  sub decode_queue_key {
   
 sub queue_key_locked {  sub queue_key_locked {
     my ($queue,$key,$cdom,$cnum)=@_;      my ($queue,$key,$cdom,$cnum)=@_;
       if (!defined($cdom) || !defined($cnum)) {
    my (undef,$cid)=&Apache::lonxml::whichuser();
    $cnum=$env{'course.'.$cid.'.num'};
    $cdom=$env{'course.'.$cid.'.domain'};
       }
     my ($key_locked,$value)=      my ($key_locked,$value)=
  &Apache::lonnet::get($queue,["$key\0locked"],$cdom,$cnum);   &Apache::lonnet::get($queue,["$key\0locked"],$cdom,$cnum);
     if ($key_locked eq "$key\0locked") {      if ($key_locked eq "$key\0locked") {
Line 658  sub pick_from_queue_data { Line 720  sub pick_from_queue_data {
  if ($check_section) {   if ($check_section) {
     my $section=&Apache::lonnet::getsection($uname,$udom);      my $section=&Apache::lonnet::getsection($uname,$udom);
     if ($section eq $check_section) {      if ($section eq $check_section) {
  &Apache::lonnet::logthis("my sec");   &Apache::lonxml::debug("my sec");
  next;   next;
     }      }
  }   }
  my $slot=$queuedata->{$key}[0];   my $slot=$queuedata->{$key}[0];
  my %slot_data=&Apache::lonnet::get_slot($slot);   my %slot_data=&Apache::lonnet::get_slot($slot);
  if ($slot_data{'endtime'} > time) {    if ($slot_data{'endtime'} > time) { 
     &Apache::lonnet::logthis("not time");      &Apache::lonxml::debug("not time");
     next;      next;
  }   }
  if (&queue_key_locked($queue,$key,$cdom,$cnum)) {   if (&queue_key_locked($queue,$key,$cdom,$cnum)) {
     &Apache::lonnet::logthis("someone already has um.");      &Apache::lonxml::debug("someone already has um.");
     next;      next;
  }   }
  return $key;   return $key;
Line 706  sub lock_key { Line 768  sub lock_key {
     my $cdom=$env{'course.'.$cid.'.domain'};      my $cdom=$env{'course.'.$cid.'.domain'};
     my $success=&Apache::lonnet::newput($queue,{"$todo\0locked"=> $me},      my $success=&Apache::lonnet::newput($queue,{"$todo\0locked"=> $me},
  $cdom,$cnum);   $cdom,$cnum);
     &Apache::lonnet::logthis("success $success $todo");      &Apache::lonxml::debug("success $success $todo");
     if ($success eq 'ok') {      if ($success eq 'ok') {
  return 1;   return 1;
     }      }
Line 720  sub get_from_queue { Line 782  sub get_from_queue {
     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 $todo=&find_mid_grade($queue,$symb,$cdom,$cnum);      my $todo=&find_mid_grade($queue,$symb,$cdom,$cnum);
     &Apache::lonnet::logthis("found ".join(':',&decode_queue_key($todo)));      &Apache::lonxml::debug("found ".join(':',&decode_queue_key($todo)));
     if ($todo) { return $todo; }      if ($todo) { return $todo; }
     while (1) {      while (1) {
  my $starttime=time;   my $starttime=time;
  &Apache::lonnet::put($queue,{"$symb\0timestamp"=>$starttime},   &Apache::lonnet::put($queue,{"$symb\0timestamp"=>$starttime},
      $cdom,$cnum);       $cdom,$cnum);
  &Apache::lonnet::logthis("$starttime");   &Apache::lonxml::debug("$starttime");
  my $regexp="^$symb\0queue\0";   my $regexp="^$symb\0queue\0";
  my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp);   my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp);
  #make a pass looking for a user in my section   #make a pass looking for a user _not_ in my section
  if ($env{'request.course.sec'}) {   if ($env{'request.course.sec'}) {
     &Apache::lonnet::logthis("sce");      &Apache::lonxml::debug("sce");
     $todo=&pick_from_queue_data($queue,$env{'request.course.sec'},      $todo=&pick_from_queue_data($queue,$env{'request.course.sec'},
  \%queue,$cdom,$cnum);   \%queue,$cdom,$cnum);
     &Apache::lonnet::logthis("sce $todo");      &Apache::lonxml::debug("sce $todo");
  }   }
  # no one in our section so look for any user that is ready for grading   # no one _not_ in our section so look for any user that is
    # ready for grading
  if (!$todo) {   if (!$todo) {
     &Apache::lonnet::logthis("no sce");      &Apache::lonxml::debug("no sce");
     $todo=&pick_from_queue_data($queue,$env{'request.course.sec'},      $todo=&pick_from_queue_data($queue,$env{'request.course.sec'},
  \%queue,$cdom,$cnum);   \%queue,$cdom,$cnum);
     &Apache::lonnet::logthis("no sce $todo");      &Apache::lonxml::debug("no sce $todo");
  }   }
  # no user to grade    # no user to grade 
  if (!$todo) { last; }   if (!$todo) { last; }
  &Apache::lonnet::logthis("got $todo");   &Apache::lonxml::debug("got $todo");
  # otherwise found someone so lets try to lock them   # otherwise found someone so lets try to lock them
  # unless someone else already picked them   # unless someone else already picked them
  if (!&lock_key($queue,$todo)) { next; }   if (!&lock_key($queue,$todo)) { next; }
  my (undef,$endtime)=   my (undef,$endtime)=
     &Apache::lonnet::get($queue,["$symb\0timestamp"],      &Apache::lonnet::get($queue,["$symb\0timestamp"],
  $cdom,$cnum);   $cdom,$cnum);
  &Apache::lonnet::logthis("emd  $endtime");   &Apache::lonxml::debug("emd  $endtime");
  # someone else already modified the queue,    # someone else already modified the queue, 
  # perhaps our picked user wass already fully graded between   # perhaps our picked user wass already fully graded between
  # when we picked him and when we locked his record? so lets   # when we picked him and when we locked his record? so lets
Line 761  sub get_from_queue { Line 824  sub get_from_queue {
     my ($key,$value)=      my ($key,$value)=
  &Apache::lonnet::get($queue,["$todo"],   &Apache::lonnet::get($queue,["$todo"],
      $cdom,$cnum);       $cdom,$cnum);
     &Apache::lonnet::logthis("check  $key .. $value");      &Apache::lonxml::debug("check  $key .. $value");
     if ($key eq $todo && ref($value)) {      if ($key eq $todo && ref($value)) {
     } else {      } else {
  &Apache::lonnet::del($queue,["$todo\0locked"],   &Apache::lonnet::del($queue,["$todo\0locked"],
      $cdom,$cnum);       $cdom,$cnum);
  &Apache::lonnet::logthis("del");   &Apache::lonxml::debug("del");
  next;   next;
     }      }
  }   }
  &Apache::lonnet::logthis("last $todo");   &Apache::lonxml::debug("last $todo");
  last;   last;
     }      }
     return $todo;      return $todo;
Removed from v.1.32  
changed lines
  Added in v.1.33

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