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

Diff for /loncom/homework/response.pm between versions 1.110 and 1.121

version 1.110, 2004/12/07 16:19:37 version 1.121, 2005/06/17 20:17:02
Line 29 Line 29
 package Apache::response;  package Apache::response;
 use strict;  use strict;
 use Apache::lonlocal;  use Apache::lonlocal;
   use Apache::lonnet;
   
 BEGIN {  BEGIN {
     &Apache::lonxml::register('Apache::response',('responseparam','parameter','dataresponse'));      &Apache::lonxml::register('Apache::response',('responseparam','parameter','dataresponse'));
Line 110  sub poprandomnumber { Line 111  sub poprandomnumber {
  &Apache::lonxml::error("Unable to restore random algorithm.");   &Apache::lonxml::error("Unable to restore random algorithm.");
     }      }
 }  }
   
 sub setrandomnumber {  sub setrandomnumber {
     my $rndseed;      my $rndseed;
     $rndseed=&Apache::structuretags::setup_rndseed();      $rndseed=&Apache::structuretags::setup_rndseed();
Line 118  sub setrandomnumber { Line 120  sub setrandomnumber {
     #  $rndseed=unpack("%32i",$rndseed);      #  $rndseed=unpack("%32i",$rndseed);
     my $rand_alg=&Apache::lonnet::get_rand_alg();      my $rand_alg=&Apache::lonnet::get_rand_alg();
     my $rndmod;      my $rndmod;
     if (!$rand_alg || $rand_alg eq '32bit' || $rand_alg eq '64bit' ||  
  $rand_alg eq '64bit2') {      my ($id1,$id2,$shift_amt);
  $rndmod=(&Apache::lonnet::numval($Apache::inputtags::part) << 10);      if ($Apache::lonhomework::parsing_a_problem) {
    $id1=$Apache::inputtags::part;
  if (defined($Apache::inputtags::response[-1])) {   if (defined($Apache::inputtags::response[-1])) {
     $rndmod+=&Apache::lonnet::numval($Apache::inputtags::response[-1]);      $id2=$Apache::inputtags::response[-1];
  }   }
    $shift_amt=scalar(@Apache::inputtags::responselist);
       } elsif ($Apache::lonhomework::parsing_a_task) {
    $id1=$Apache::bridgetask::dimension;
    if (defined($Apache::bridgetask::instance[-1])) {
       $id2=$Apache::bridgetask::instance[-1];
    }
    $shift_amt=scalar(@Apache::bridgetask::instance);
       } 
       &Apache::lonxml::debug("id1: $id1, id2: $id2, shift_amt: $shift_amt");
       if (!$rand_alg || $rand_alg eq '32bit' || $rand_alg eq '64bit' ||
    $rand_alg eq '64bit2') {
    $rndmod=(&Apache::lonnet::numval($id1) << 10);
    if (defined($id2)) { $rndmod+=&Apache::lonnet::numval($id2); }
     } elsif ($rand_alg eq '64bit3') {      } elsif ($rand_alg eq '64bit3') {
  $rndmod=(&Apache::lonnet::numval2($Apache::inputtags::part) << 10);   $rndmod=(&Apache::lonnet::numval2($id1) << 10);
  if (defined($Apache::inputtags::response[-1])) {   if (defined($id2)) { $rndmod+=&Apache::lonnet::numval2($id2); }
     $rndmod+=&Apache::lonnet::numval2($Apache::inputtags::response[-1]);  
  }  
     } else {      } else {
  $rndmod=(&Apache::lonnet::numval3($Apache::inputtags::part) << 10);   my $shift=(4*$shift_amt)%30;
  if (defined($Apache::inputtags::response[-1])) {   $rndmod=(&Apache::lonnet::numval3($id1) << (($shift+15)%30));
     $rndmod+=&Apache::lonnet::numval3($Apache::inputtags::response[-1]);   if (defined($id2)) {
       $rndmod+=(&Apache::lonnet::numval3($id2) << $shift );
  }   }
     }      }
     if ($rndseed =~/([,:])/) {      if ($rndseed =~/([,:])/) {
Line 150  sub setrandomnumber { Line 165  sub setrandomnumber {
     $rndseed=(($rndseed<<32)>>32);      $rndseed=(($rndseed<<32)>>32);
  }   }
     }      }
     &Apache::lonxml::debug("randseed $rndseed");      &Apache::lonxml::debug("randseed $rndmod $rndseed");
     &Apache::lonnet::setup_random_from_rndseed($rndseed);      &Apache::lonnet::setup_random_from_rndseed($rndseed);
     return '';      return '';
 }  }
Line 289  sub handle_previous { Line 304  sub handle_previous {
 sub view_or_modify {  sub view_or_modify {
     my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();      my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
     my $myself=0;      my $myself=0;
     if ( ($name eq $ENV{'user.name'}) && ($domain eq $ENV{'user.domain'}) ) {      if ( ($name eq $env{'user.name'}) && ($domain eq $env{'user.domain'}) ) {
  $myself=1;   $myself=1;
     }      }
     my $vgr=&Apache::lonnet::allowed('vgr',$courseid);      my $vgr=&Apache::lonnet::allowed('vgr',$courseid);
Line 320  sub end_dataresponse { Line 335  sub end_dataresponse {
     my $result;      my $result;
     if ( $target eq 'web' ) {      if ( $target eq 'web' ) {
     } elsif ($target eq 'grade' ) {      } elsif ($target eq 'grade' ) {
  if ( defined $ENV{'form.submitted'}) {   if ( defined $env{'form.submitted'}) {
     my ($symb,$courseid,$domain,$name)=&Apache::lonxml::whichuser();      my ($symb,$courseid,$domain,$name)=&Apache::lonxml::whichuser();
     my $allowed=&Apache::lonnet::allowed('mgr',$courseid);      my $allowed=&Apache::lonnet::allowed('mgr',$courseid);
     if ($allowed) {      if ($allowed) {
  &Apache::response::setup_params('dataresponse',$safeeval);   &Apache::response::setup_params('dataresponse',$safeeval);
  my $partid = $Apache::inputtags::part;   my $partid = $Apache::inputtags::part;
  my $id = $Apache::inputtags::response['-1'];   my $id = $Apache::inputtags::response['-1'];
  my $response = $ENV{'form.HWVAL_'.$id};   my $response = $env{'form.HWVAL_'.$id};
  my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);   my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
  if ( $response =~ /[^\s]/) {   if ( $response =~ /[^\s]/) {
     $Apache::lonhomework::results{"resource.$partid.$id.$name"}=$response;      $Apache::lonhomework::results{"resource.$partid.$id.$name"}=$response;
Line 395  sub start_responseparam { Line 410  sub start_responseparam {
      $safeeval,'name','type',       $safeeval,'name','type',
      'description','default');       'description','default');
  my $element=&Apache::edit::html_element_name('parameter_package');   my $element=&Apache::edit::html_element_name('parameter_package');
  if (defined($ENV{"form.$element"}) && $ENV{"form.$element"} ne '') {   if (defined($env{"form.$element"}) && $env{"form.$element"} ne '') {
     my $name=$ENV{"form.$element"};      my $name=$env{"form.$element"};
     my $tag=&decide_package($tagstack);      my $tag=&decide_package($tagstack);
     $token->[2]->{'name'}=$name;      $token->[2]->{'name'}=$name;
     $token->[2]->{'type'}=      $token->[2]->{'type'}=
Line 413  sub start_responseparam { Line 428  sub start_responseparam {
  }   }
     } elsif ($target eq 'grade' || $target eq 'answer' || $target eq 'web' ||      } elsif ($target eq 'grade' || $target eq 'answer' || $target eq 'web' ||
      $target eq 'tex' || $target eq 'analyze' ) {       $target eq 'tex' || $target eq 'analyze' ) {
  if ($ENV{'request.state'} eq 'construct') {   if ($env{'request.state'} eq 'construct') {
     my $name   =&Apache::lonxml::get_param('name',$parstack,$safeeval);      my $name   =&Apache::lonxml::get_param('name',$parstack,$safeeval);
     my $default=&Apache::lonxml::get_param('default',$parstack,      my $default=&Apache::lonxml::get_param('default',$parstack,
      $safeeval);       $safeeval);
Line 430  sub end_responseparam { Line 445  sub end_responseparam {
 }  }
   
 sub start_parameter {  sub start_parameter {
     my $result = &start_responseparam(@_);      return &start_responseparam(@_);
     return $result;  
 }  }
   
 sub end_parameter {  sub end_parameter {
     my $result = &end_responseparam(@_);      return &end_responseparam(@_);
     return $result;  
 }  }
   
 sub reset_params {  sub reset_params {
Line 446  sub reset_params { Line 459  sub reset_params {
 sub setup_params {  sub setup_params {
     my ($tag,$safeeval) = @_;      my ($tag,$safeeval) = @_;
   
     if ($ENV{'request.state'} eq 'construct') { return; }      if ($env{'request.state'} eq 'construct') { return; }
     my %paramlist=();      my %paramlist=();
     foreach my $key (keys(%Apache::lonnet::packagetab)) {      foreach my $key (keys(%Apache::lonnet::packagetab)) {
  if ($key =~ /^$tag/) {   if ($key =~ /^$tag/) {
Line 478  sub setup_params { Line 491  sub setup_params {
 sub answer_header {  sub answer_header {
     my ($type) = @_;      my ($type) = @_;
     my $result;      my $result;
     if ($ENV{'form.answer_output_mode'} eq 'tex') {      if ($env{'form.answer_output_mode'} eq 'tex') {
  $result = ' \vskip 0 mm \begin{tabular}{|c|}\hline Answer for Part: \verb|'.   $result = ' \vskip 0 mm \begin{tabular}{|c|}\hline Answer for Part: \verb|'.
                   $Apache::inputtags::part.'| \\\\ \hline ';                    $Apache::inputtags::part.'| \\\\ \hline ';
     } else {      } else {
Line 491  sub answer_header { Line 504  sub answer_header {
 sub answer_part {  sub answer_part {
     my ($type,$answer) = @_;      my ($type,$answer) = @_;
     my $result;      my $result;
     if ($ENV{'form.answer_output_mode'} eq 'tex') {      if ($env{'form.answer_output_mode'} eq 'tex') {
  $result = ' \verb|'.$answer.'|\\\\ \hline ';   $result = ' \verb|'.$answer.'|\\\\ \hline ';
     } else {      } else {
  $result = '<td>'.$answer.'</td>';   $result = '<td>'.$answer.'</td>';
Line 502  sub answer_part { Line 515  sub answer_part {
 sub answer_footer {  sub answer_footer {
     my ($type) = @_;      my ($type) = @_;
     my $result;      my $result;
     if ($ENV{'form.answer_output_mode'} eq 'tex') {      if ($env{'form.answer_output_mode'} eq 'tex') {
  $result = ' \end{tabular} \vskip 0 mm ';   $result = ' \end{tabular} \vskip 0 mm ';
     } else {      } else {
  $result = '</tr></table>';   $result = '</tr></table>';
Line 511  sub answer_footer { Line 524  sub answer_footer {
 }  }
   
 sub showallfoils {  sub showallfoils {
     if (defined($ENV{'form.showallfoils'})) {      if (defined($env{'form.showallfoils'})) {
  my ($symb)=&Apache::lonxml::whichuser();   my ($symb)=&Apache::lonxml::whichuser();
  if ($ENV{'request.state'} eq 'construct' ||    if (($env{'request.state'} eq 'construct') || 
     ($ENV{'user.adv'} && $symb eq '')) {      ($env{'user.adv'} && $symb eq '')      ||
               ($Apache::lonhomework::viewgrades) ) {
     return 1;      return 1;
  }   }
     }      }
Line 535  sub getresponse { Line 549  sub getresponse {
     'I'=>8,'J'=>9,'K'=>10,'L'=>11,'M'=>12,'N'=>13,'O'=>14,      'I'=>8,'J'=>9,'K'=>10,'L'=>11,'M'=>12,'N'=>13,'O'=>14,
     'P'=>15,'Q'=>16,'R'=>17,'S'=>18,'T'=>19,'U'=>20,'V'=>21,      'P'=>15,'Q'=>16,'R'=>17,'S'=>18,'T'=>19,'U'=>20,'V'=>21,
     'W'=>22,'X'=>23,'Y'=>24,'Z'=>25);      'W'=>22,'X'=>23,'Y'=>24,'Z'=>25);
     if ($ENV{'form.submitted'} eq 'scantron') {      if ($env{'form.submitted'} eq 'scantron') {
  my $part  = $Apache::inputtags::part;   my $part  = $Apache::inputtags::part;
  my $id    = $Apache::inputtags::response[-1];   my $id    = $Apache::inputtags::response[-1];
  $response = $ENV{'scantron.'.($Apache::lonxml::counter+$temp-1).   $response = $env{'scantron.'.($Apache::lonxml::counter+$temp-1).
  '.answer'};   '.answer'};
  # save bubbled letter for later   # save bubbled letter for later
  $Apache::lonhomework::results{"resource.$part.$id.scantron"}.=   $Apache::lonhomework::results{"resource.$part.$id.scantron"}.=
Line 551  sub getresponse { Line 565  sub getresponse {
     }      }
  }   }
     } else {      } else {
  $response = $ENV{$formparm};   $response = $env{$formparm};
     }      }
     return $response;      return $response;
 }  }
Line 559  sub getresponse { Line 573  sub getresponse {
 sub repetition {  sub repetition {
     my $id = $Apache::inputtags::part;      my $id = $Apache::inputtags::part;
     my $weight = &Apache::lonnet::EXT("resource.$id.weight");      my $weight = &Apache::lonnet::EXT("resource.$id.weight");
       if (!defined($weight) || ($weight eq '')) { $weight=1; }
     my $repetition = int $weight/9;      my $repetition = int $weight/9;
     if ($weight % 9 != 0) {$repetition++;}       if ($weight % 9 != 0) {$repetition++;} 
     return $repetition;      return $repetition;
Line 702  sub pick_foil_for_concept { Line 717  sub pick_foil_for_concept {
 sub get_response_param {  sub get_response_param {
     my ($id,$name,$default)=@_;      my ($id,$name,$default)=@_;
     my $parameter;      my $parameter;
     if ($ENV{'request.state'} eq 'construct' &&      if ($env{'request.state'} eq 'construct' &&
  defined($Apache::inputtags::params{$name})) {   defined($Apache::inputtags::params{$name})) {
  $parameter=$Apache::inputtags::params{$name};   $parameter=$Apache::inputtags::params{$name};
     } else {      } else {
Line 714  sub get_response_param { Line 729  sub get_response_param {
     return $parameter;      return $parameter;
 }  }
   
   sub submitted {
       my ($who)=@_;
       
       # when scatron grading any submission is a submission
       if ($env{'form.submitted'} eq 'scantron') { return 1; }
       # if the caller only cared if this was a scantron submission
       if ($who eq 'scantron') { return 0; }
       # if the Submit Answer button for this particular part was pressed
       my $partid=$Apache::inputtags::part;
       if (defined($env{'form.submit_'.$partid})) { return 1; }
       # otherwise no submission occured
       return 0;
   }
   
   # basically undef and 0 (both false) mean that they still have work to do
   # and all true values mean that they can't do any more work
   #
   # a return of undef means it is unattempted
   # a return of 0 means it is attmpted and wrong but still has tries
   # a return of 1 means it is marked correct
   # a return of 2 means they have exceed maximum number of tries
   # a return of 3 means it after the answer date
   sub check_status {
       my ($id)=@_;
       if (!$id) { $id=$Apache::linputtags::part; }
       my $curtime=&Apache::lonnet::EXT('system.time');
       my $opendate=&Apache::lonnet::EXT("resource.$id.opendate");
       my $duedate=&Apache::lonnet::EXT("resource.$id.duedate");
       my $answerdate=&Apache::lonnet::EXT("resource.$id.answerdate");
       if ( $opendate && $curtime > $opendate &&
            $duedate && $curtime > $duedate &&
            $answerdate && $curtime > $answerdate) {
           return 3;
       }
       my $status=&Apache::lonnet::EXT("user.resource.resource.$id.solved");
       if ($status =~ /^correct/) { return 1; }
       if (!$status) { return undef; }
       my $maxtries=&Apache::lonnet::EXT("resource.$id.maxtries");
       if ($maxtries eq '') { $maxtries=2; }
       my $curtries=&Apache::lonnet::EXT("user.resource.resource.$id.tries");
       if ($curtries < $maxtries) { return 0; }
       return 2;
   }
   
 1;  1;
 __END__  __END__
     
Removed from v.1.110  
changed lines
  Added in v.1.121

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