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

Diff for /loncom/homework/bridgetask.pm between versions 1.149 and 1.150

version 1.149, 2006/05/12 05:18:34 version 1.150, 2006/05/12 06:55:46
Line 79  sub proctor_check_auth { Line 79  sub proctor_check_auth {
     $authenticated=1;      $authenticated=1;
  }   }
     }      }
     if ($authenticated && $type eq 'Task') {      if ($authenticated) {
  # increment version   &create_new_version($type,$user,$domain,$slot_name);
  my $version=  
     $Apache::lonhomework::history{'resource.0.version'};  
  $version++;  
   
  #clean out all current results  
  foreach my $key (keys(%Apache::lonhomework::history)) {  
     if ($key=~/^resource\.0\./) {  
  $Apache::lonhomework::results{$key}='';  
     }  
  }  
   
  #setup new version and who did it  
  $Apache::lonhomework::results{'resource.0.version'}=$version;  
  $Apache::lonhomework::results{"resource.$version.0.checkedin"}=  
     $user.':'.$domain;  
  $Apache::lonhomework::results{"resource.$version.0.checkedin.slot"}=  
     $slot_name;  
   
  return 1;   return 1;
     } elsif ($authenticated && $type eq 'problem') {  
  &Apache::lonxml::debug("authed $slot_name");  
  $Apache::lonhomework::results{"resource.0.checkedin"}=  
     $user.':'.$domain;  
  $Apache::lonhomework::results{"resource.0.checkedin.slot"}=  
     $slot_name;  
     }      }
  }   }
     }      }
     return 0;      return 0;
 }  }
   
   sub create_new_version {
       my ($type,$user,$domain,$slot_name) = @_;
       if ($type eq 'Task') {
    # increment version
    my $version=
       $Apache::lonhomework::history{'resource.0.version'};
    $version++;
   
    #clean out all current results
    foreach my $key (keys(%Apache::lonhomework::history)) {
       if ($key=~/^resource\.0\./) {
    $Apache::lonhomework::results{$key}='';
       }
    }
   
    #setup new version and who did it
    $Apache::lonhomework::results{'resource.0.version'}=$version;
    if (defined($user) && defined($domain)) {
       $Apache::lonhomework::results{"resource.$version.0.checkedin"}=
    $user.':'.$domain;
    }
    if (defined($slot_name)) {
       $Apache::lonhomework::results{"resource.$version.0.checkedin.slot"}=
    $slot_name;
    }
       } elsif ($type eq 'problem') {
    &Apache::lonxml::debug("authed $slot_name");
    if (defined($user) && defined($domain)) {
       $Apache::lonhomework::results{"resource.0.checkedin"}=
    $user.':'.$domain;
    }
    if (defined($slot_name)) {
       $Apache::lonhomework::results{"resource.0.checkedin.slot"}=
    $slot_name;
    }
       }
   }
   
 sub get_version {  sub get_version {
     my ($version,$previous);      my ($version,$previous);
     if ($env{'form.previousversion'} &&       if ($env{'form.previousversion'} && 
Line 120  sub get_version { Line 134  sub get_version {
  $version=$env{'form.previousversion'};   $version=$env{'form.previousversion'};
  $previous=1;   $previous=1;
     } else {      } else {
  $version=$Apache::lonhomework::history{'resource.0.version'};   if (defined($Apache::lonhomework::results{'resource.0.version'})) {
       $version=$Apache::lonhomework::results{'resource.0.version'};
    } elsif (defined($Apache::lonhomework::history{'resource.0.version'})) {
       $version=$Apache::lonhomework::history{'resource.0.version'};
    }
  $previous=0;   $previous=0;
     }      }
     if (wantarray) {      if (wantarray) {
Line 284  sub show_task { Line 302  sub show_task {
        ( $status eq 'NOT_IN_A_SLOT') ||         ( $status eq 'NOT_IN_A_SLOT') ||
        ( $status eq 'NEEDS_CHECKIN') ||         ( $status eq 'NEEDS_CHECKIN') ||
        ( $status eq 'WAITING_FOR_GRADE') ||         ( $status eq 'WAITING_FOR_GRADE') ||
        ( $status eq 'INVALID_ACCESS') )) {         ( $status eq 'INVALID_ACCESS') ||
          ( &get_version() eq ''))) {
  return 0;   return 0;
     }      }
     if ($env{'form.donescreen'}) { return 0; }      if ($env{'form.donescreen'}) { return 0; }
Line 435  sub start_Task { Line 454  sub start_Task {
  my ($version,$previous)=&get_version();   my ($version,$previous)=&get_version();
  ($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 '' && $slot_name eq '') {
       &create_new_version('Task');
       ($version,$previous)=&get_version();
    }
   
  push(@Apache::inputtags::status,$status);   push(@Apache::inputtags::status,$status);
  $Apache::inputtags::slot_name=$slot_name;   $Apache::inputtags::slot_name=$slot_name;
  my $expression='$external::datestatus="'.$status.'";';   my $expression='$external::datestatus="'.$status.'";';
Line 1727  sub get_instance { Line 1751  sub get_instance {
  }   }
  @instances = &Math::Random::random_permutation(@instances);   @instances = &Math::Random::random_permutation(@instances);
  $instance  = $instances[($version-1)%scalar(@instances)];   $instance  = $instances[($version-1)%scalar(@instances)];
  $Apache::lonhomework::results{"resource.$version.0.$dim.instance"} =    if ($version =~ /^\d$/) {
     $instance;      $Apache::lonhomework::results{"resource.$version.0.$dim.instance"} = 
  $Apache::lonhomework::results{'INTERNAL_store'} = 1;    $instance;
       $Apache::lonhomework::results{'INTERNAL_store'} = 1; 
    }
  &Apache::response::poprandomnumber();   &Apache::response::poprandomnumber();
  return $instance;   return $instance;
     }      }
Removed from v.1.149  
changed lines
  Added in v.1.150

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