Diff for /loncom/homework/bridgetask.pm between versions 1.245 and 1.246

version 1.245, 2009/03/20 10:05:00 version 1.246, 2009/03/27 00:20:39
Line 82  sub proctor_check_auth { Line 82  sub proctor_check_auth {
  }   }
     }      }
     if ($authenticated) {      if ($authenticated) {
  &check_in($type,$user,$domain,$slot_name);   my $check = &check_in($type,$user,$domain,$slot_name);
                   if ($check =~ /^error:/) {
                       return 0;
                   }
  return 1;   return 1;
     }      }
  }   }
Line 94  sub check_in { Line 97  sub check_in {
     my ($type,$user,$domain,$slot_name) = @_;      my ($type,$user,$domain,$slot_name) = @_;
     my $useslots = &Apache::lonnet::EXT("resource.0.useslots");      my $useslots = &Apache::lonnet::EXT("resource.0.useslots");
     if ( $useslots eq 'map_map') {      if ( $useslots eq 'map_map') {
  &check_in_sequence($user,$domain,$slot_name);   my $result = &check_in_sequence($user,$domain,$slot_name);
           if ($result =~ /^error: /) {
               return $result;
           }
     } else {      } else {
  &create_new_version($type,$user,$domain,$slot_name);   &create_new_version($type,$user,$domain,$slot_name);
  &Apache::structuretags::finalize_storage();   &Apache::structuretags::finalize_storage();
Line 105  sub check_in { Line 111  sub check_in {
 sub check_in_sequence {  sub check_in_sequence {
     my ($user,$domain,$slot_name) = @_;      my ($user,$domain,$slot_name) = @_;
     my $navmap = Apache::lonnavmaps::navmap->new();      my $navmap = Apache::lonnavmaps::navmap->new();
       if (!defined($navmap)) {
           return 'error: ';
       }
     my ($symb) = &Apache::lonnet::whichuser();      my ($symb) = &Apache::lonnet::whichuser();
     my ($map)  = &Apache::lonnet::decode_symb($symb);      my ($map)  = &Apache::lonnet::decode_symb($symb);
     my @resources =       my @resources = 
Line 655  sub start_Task { Line 664  sub start_Task {
  if ($status eq 'CAN_ANSWER' && $version eq '') {   if ($status eq 'CAN_ANSWER' && $version eq '') {
     # CAN_ANSWER mode, and no current version, unproctored access      # CAN_ANSWER mode, and no current version, unproctored access
     # thus self-checkedin      # thus self-checkedin
     &check_in('Task',undef,undef,$slot_name);      my $check = &check_in('Task',undef,undef,$slot_name);
               if ($check =~ /^error: /) {
                   my $symb=&Apache::lonnet::symbread();
                   &Apache::lonnet::logthis("Error during self-checkin of version $version of Task (symb: $symb) using slot: $slot_name");   
               }
     &add_to_queue('gradingqueue',{'type' => 'Task',      &add_to_queue('gradingqueue',{'type' => 'Task',
   'time' => time,    'time' => time,
   'slot' => $slot_name});    'slot' => $slot_name});

Removed from v.1.245  
changed lines
  Added in v.1.246


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