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

Diff for /loncom/homework/bridgetask.pm between versions 1.173 and 1.179

version 1.173, 2006/06/16 09:27:38 version 1.179, 2006/06/24 01:28:17
Line 50  my %dimension; Line 50  my %dimension;
 sub initialize_bridgetask {  sub initialize_bridgetask {
     # id of current Dimension, 0 means that no dimension is current       # id of current Dimension, 0 means that no dimension is current 
     # (inside <Task> only)      # (inside <Task> only)
     %Apache::bridgetask::dimension=();      @Apache::bridgetask::dimension=();
     # list of all Dimension ids seen      # list of all Dimension ids seen
     %Apache::bridgetask::top_dimensionlist=();      %Apache::bridgetask::top_dimensionlist=();
     # list of all current Instance ids      # list of all current Instance ids
Line 83  sub proctor_check_auth { Line 83  sub proctor_check_auth {
  }   }
     }      }
     if ($authenticated) {      if ($authenticated) {
  &create_new_version($type,$user,$domain,$slot_name);   &check_in($type,$user,$domain,$slot_name);
  return 1;   return 1;
     }      }
  }   }
Line 91  sub proctor_check_auth { Line 91  sub proctor_check_auth {
     return 0;      return 0;
 }  }
   
   sub check_in {
       my ($type,$user,$domain,$slot_name) = @_;
       my $useslots = &Apache::lonnet::EXT("resource.0.useslots");
       if ( $useslots eq 'map_map') {
    &check_in_sequence($user,$domain,$slot_name);
       } else {
    &create_new_version($type,$user,$domain,$slot_name);
       }
       return 1;
   }
   
   sub check_in_sequence {
       my ($user,$domain,$slot_name) = @_;
       my $navmap = Apache::lonnavmaps::navmap->new();
       my ($symb) = &Apache::lonxml::whichuser();
       my ($map)  = &Apache::lonnet::decode_symb($symb);
       my @resources = 
    $navmap->retrieveResources($map, sub { $_[0]->is_problem() },0,0);
       my %old_history = %Apache::lonhomework::history;
       my %old_results = %Apache::lonhomework::results;
   
       foreach my $res (@resources) {
    &Apache::lonxml::debug("doing ".$res->src);
    &Apache::structuretags::initialize_storage($res->symb);
    my $type = ($res->is_task()) ? 'Task' : 'problem';
    &create_new_version($type,$user,$domain,$slot_name);
    &Apache::structuretags::finalize_storage($res->symb);
       }
       
       %Apache::lonhomework::history = %old_history;
       %Apache::lonhomework::results = %old_results;
   }
   
 sub create_new_version {  sub create_new_version {
     my ($type,$user,$domain,$slot_name) = @_;      my ($type,$user,$domain,$slot_name) = @_;
       
       my $id = '0';
     if ($type eq 'Task') {      if ($type eq 'Task') {
  # increment version   # increment version
  my $version=   my $version=
Line 107  sub create_new_version { Line 142  sub create_new_version {
  }   }
   
  #setup new version and who did it   #setup new version and who did it
  $Apache::lonhomework::results{'resource.0.version'}=$version;          $Apache::lonhomework::results{'resource.0.version'}=$version;
  if (defined($user) && defined($domain)) {   $id = "$version.0";
     $Apache::lonhomework::results{"resource.$version.0.checkedin"}=   if (!defined($user) || !defined($domain)) {
  $user.':'.$domain;      $user = $env{'user.name'};
  } else {      $domain = $env{'user.domain'};
     $Apache::lonhomework::results{"resource.$version.0.checkedin"}=  
  $env{'user.name'}.':'.$env{'user.domain'};  
  }  
  if (defined($slot_name)) {  
     $Apache::lonhomework::results{"resource.$version.0.checkedin.slot"}=  
  $slot_name;  
  }   }
   
     } elsif ($type eq 'problem') {      } elsif ($type eq 'problem') {
  &Apache::lonxml::debug("authed $slot_name");   &Apache::lonxml::debug("authed $slot_name");
  if (defined($user) && defined($domain)) {      }
     $Apache::lonhomework::results{"resource.0.checkedin"}=  
  $user.':'.$domain;      if (defined($user) && defined($domain)) {
  }   $Apache::lonhomework::results{"resource.$id.checkedin"}=
  if (defined($slot_name)) {      $user.':'.$domain;
     $Apache::lonhomework::results{"resource.0.checkedin.slot"}=      }
  $slot_name;      if (defined($slot_name)) {
  }   $Apache::lonhomework::results{"resource.$id.checkedin.slot"}=
       $slot_name;
     }      }
 }  }
   
Line 499  sub start_Task { Line 530  sub start_Task {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   
     my ($status,$accessmsg,$slot);      my ($status,$accessmsg,$slot);
       &Apache::structuretags::init_problem_globals('Task');
     if ($target ne 'webgrade') {      if ($target ne 'webgrade') {
  &Apache::structuretags::init_problem_globals('Task');  
  &Apache::structuretags::initialize_storage();   &Apache::structuretags::initialize_storage();
  &Apache::lonhomework::showhash(%Apache::lonhomework::history);   &Apache::lonhomework::showhash(%Apache::lonhomework::history);
  if ($env{'request.state'} eq 'construct') {   if ($env{'request.state'} eq 'construct') {
Line 563  sub start_Task { Line 594  sub start_Task {
  ($status,$accessmsg,my $slot_name,$slot) =    ($status,$accessmsg,my $slot_name,$slot) = 
     &Apache::lonhomework::check_slot_access('0','Task');      &Apache::lonhomework::check_slot_access('0','Task');
  if ($status eq 'CAN_ANSWER' && $version eq '') {   if ($status eq 'CAN_ANSWER' && $version eq '') {
     &create_new_version('Task',undef,undef,$slot_name);      # CAN_ANSWER mode, and no current version, unproctored access
       # thus self-checkedin
       &check_in('Task',undef,undef,$slot_name);
     &add_to_queue('gradingqueue',{'type' => 'Task',      &add_to_queue('gradingqueue',{'type' => 'Task',
   'time' => time,    'time' => time,
   'slot' => $slot_name});    'slot' => $slot_name});
Line 1188  DONEBUTTON Line 1221  DONEBUTTON
  $result.=&Apache::response::meta_stores_write('status','string',   $result.=&Apache::response::meta_stores_write('status','string',
       'Bridge Task Status');        'Bridge Task Status');
     }      }
       &Apache::structuretags::reset_problem_globals('Task');
     undef($Apache::lonhomework::parsing_a_task);      undef($Apache::lonhomework::parsing_a_task);
     return $result;      return $result;
 }  }
Removed from v.1.173  
changed lines
  Added in v.1.179

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