Diff for /loncom/homework/response.pm between versions 1.120 and 1.192

version 1.120, 2005/04/07 06:56:22 version 1.192, 2008/06/14 16:34:54
Line 30  package Apache::response; Line 30  package Apache::response;
 use strict;  use strict;
 use Apache::lonlocal;  use Apache::lonlocal;
 use Apache::lonnet;  use Apache::lonnet;
   use Apache::lonmaxima();
   
 BEGIN {  BEGIN {
     &Apache::lonxml::register('Apache::response',('responseparam','parameter','dataresponse'));      &Apache::lonxml::register('Apache::response',('responseparam','parameter','dataresponse','customresponse','mathresponse'));
 }  }
   
 sub start_response {  sub start_response {
     my ($parstack,$safeeval)=@_;      my ($parstack,$safeeval)=@_;
     my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);      my $id = &Apache::lonxml::get_id($parstack,$safeeval);
     if ($id eq '') { $id = $Apache::lonxml::curdepth; }  
     if ($#Apache::inputtags::import > -1) {      if ($#Apache::inputtags::import > -1) {
  &Apache::lonxml::debug("Turning :$id: into");   &Apache::lonxml::debug("Turning :$id: into");
  $id = join('_',@Apache::inputtags::import).'_'.$id;   $id = join('_',@Apache::inputtags::import).'_'.$id;
Line 69  sub end_response { Line 69  sub end_response {
   
 sub start_hintresponse {  sub start_hintresponse {
     my ($parstack,$safeeval)=@_;      my ($parstack,$safeeval)=@_;
     my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);      my $id = &Apache::lonxml::get_id($parstack,$safeeval);
     if ($id eq '') { $id = $Apache::lonxml::curdepth; }      push (@Apache::inputtags::hint,$id);
     push (@Apache::inputtags::response,$id);      push (@Apache::inputtags::hintlist,$id);
     push (@Apache::inputtags::responselist,$id);  
     push (@Apache::inputtags::paramstack,[%Apache::inputtags::params]);      push (@Apache::inputtags::paramstack,[%Apache::inputtags::params]);
     return $id;      return $id;
 }  }
   
 sub end_hintresponse {  sub end_hintresponse {
     pop @Apache::inputtags::response;      pop @Apache::inputtags::hint;
     if (defined($Apache::inputtags::paramstack[-1])) {      if (defined($Apache::inputtags::paramstack[-1])) {
  %Apache::inputtags::params=   %Apache::inputtags::params=
     @{ pop(@Apache::inputtags::paramstack) };      @{ pop(@Apache::inputtags::paramstack) };
Line 94  sub pushrandomnumber { Line 93  sub pushrandomnumber {
  # do nothing   # do nothing
     } else {      } else {
  my @seed=&Math::Random::random_get_seed();   my @seed=&Math::Random::random_get_seed();
  push (@randomseeds,\@seed);   push(@randomseeds,\@seed);
     }      }
     &Apache::response::setrandomnumber();      &Apache::response::setrandomnumber(@_);
 }  }
 sub poprandomnumber {  sub poprandomnumber {
     my $rand_alg=&Apache::lonnet::get_rand_alg();      my $rand_alg=&Apache::lonnet::get_rand_alg();
Line 113  sub poprandomnumber { Line 112  sub poprandomnumber {
 }  }
   
 sub setrandomnumber {  sub setrandomnumber {
       my ($ignore_id2) = @_;
     my $rndseed;      my $rndseed;
     $rndseed=&Apache::structuretags::setup_rndseed();      $rndseed=&Apache::structuretags::setup_rndseed();
     if (!defined($rndseed)) { $rndseed=&Apache::lonnet::rndseed(); }      if (!defined($rndseed)) { $rndseed=&Apache::lonnet::rndseed(); }
     &Apache::lonxml::debug("randseed $rndseed");      &Apache::lonxml::debug("randseed $rndseed");
     #  $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,$rndmod2);
   
     my ($id1,$id2,$shift_amt);      my ($id1,$id2,$shift_amt);
     if ($Apache::lonhomework::parsing_a_problem) {      if ($Apache::lonhomework::parsing_a_problem) {
Line 129  sub setrandomnumber { Line 129  sub setrandomnumber {
  }   }
  $shift_amt=scalar(@Apache::inputtags::responselist);   $shift_amt=scalar(@Apache::inputtags::responselist);
     } elsif ($Apache::lonhomework::parsing_a_task) {      } elsif ($Apache::lonhomework::parsing_a_task) {
  $id1=$Apache::bridgetask::dimension;   $id1=&Apache::bridgetask::get_dim_id();
  if (defined($Apache::bridgetask::instance[-1])) {   if (!$ignore_id2 && ref($Apache::bridgetask::instance{$id1})) {
     $id2=$Apache::bridgetask::instance[-1];      $id2=$Apache::bridgetask::instance{$id1}[-1];
       $shift_amt=scalar(@{$Apache::bridgetask::instance{$id1}});
    } else {
       $shift_amt=0;
  }   }
  $shift_amt=scalar(@Apache::bridgetask::instance);  
     }       } 
     &Apache::lonxml::debug("id1: $id1, id2: $id2, shift_amt: $shift_amt");      &Apache::lonxml::debug("id1: $id1, id2: $id2, shift_amt: $shift_amt");
     if (!$rand_alg || $rand_alg eq '32bit' || $rand_alg eq '64bit' ||      if (!$rand_alg || $rand_alg eq '32bit' || $rand_alg eq '64bit' ||
Line 143  sub setrandomnumber { Line 145  sub setrandomnumber {
     } elsif ($rand_alg eq '64bit3') {      } elsif ($rand_alg eq '64bit3') {
  $rndmod=(&Apache::lonnet::numval2($id1) << 10);   $rndmod=(&Apache::lonnet::numval2($id1) << 10);
  if (defined($id2)) { $rndmod+=&Apache::lonnet::numval2($id2); }   if (defined($id2)) { $rndmod+=&Apache::lonnet::numval2($id2); }
     } else {      } elsif ($rand_alg eq '64bit4') {
  my $shift=(4*$shift_amt)%30;   my $shift=(4*$shift_amt)%30;
  $rndmod=(&Apache::lonnet::numval3($id1) << (($shift+15)%30));   $rndmod=(&Apache::lonnet::numval3($id1) << (($shift+15)%30));
  if (defined($id2)) {   if (defined($id2)) {
     $rndmod+=(&Apache::lonnet::numval3($id2) << $shift );      $rndmod+=(&Apache::lonnet::numval3($id2) << $shift );
  }   }
       } else {
    ($rndmod,$rndmod2)=&Apache::lonnet::digest("$id1,$id2");
     }      }
   
     if ($rndseed =~/([,:])/) {      if ($rndseed =~/([,:])/) {
  my $char=$1;   my $char=$1;
  use integer;   use integer;
  my ($num1,$num2)=split(/\Q$char\E/,$rndseed);   my ($num1,$num2)=split(/\Q$char\E/,$rndseed);
  $num1+=$rndmod;   $num1+=$rndmod;
  $num2+=$rndmod;   $num2+= ((defined($rndmod2)) ? $rndmod2 : $rndmod);
  if($Apache::lonnet::_64bit) { $num1=(($num1<<32)>>32); $num2=(($num2<<32)>>32); }   if($Apache::lonnet::_64bit) { $num1=(($num1<<32)>>32); $num2=(($num2<<32)>>32); }
  $rndseed=$num1.$char.$num2;   $rndseed=$num1.$char.$num2;
     } else {      } else {
Line 260  sub meta_response_order { Line 265  sub meta_response_order {
 }  }
   
 sub check_for_previous {  sub check_for_previous {
     my ($curresponse,$partid,$id) = @_;      my ($curresponse,$partid,$id,$last) = @_;
     my %previous;      my %previous;
     $previous{'used'} = 0;      $previous{'used'} = 0;
     foreach my $key (sort(keys(%Apache::lonhomework::history))) {      foreach my $key (sort(keys(%Apache::lonhomework::history))) {
  if ($key =~ /resource\.$partid\.$id\.submission$/) {   if ($key =~ /resource\.$partid\.$id\.submission$/) {
       if ( $last && $key =~ /^(\d+):/ ) {
    next if ($1 >= $last);
       }
     &Apache::lonxml::debug("Trying $key");      &Apache::lonxml::debug("Trying $key");
     my $pastresponse=$Apache::lonhomework::history{$key};      my $pastresponse=$Apache::lonhomework::history{$key};
     if ($pastresponse eq $curresponse) {      if ($pastresponse eq $curresponse) {
Line 302  sub handle_previous { Line 310  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::lonnet::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;
Line 336  sub end_dataresponse { Line 344  sub end_dataresponse {
     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::lonnet::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);
Line 358  sub end_dataresponse { Line 366  sub end_dataresponse {
     return $result;      return $result;
 }  }
   
   sub start_customresponse {
       my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
       my $id = &Apache::response::start_response($parstack,$safeeval);
       push(@Apache::lonxml::namespace,'customresponse');
       my $result;
       @Apache::response::custom_answer=();
       @Apache::response::custom_answer_type=();
       &Apache::lonxml::register('Apache::response',('answer'));
       if ($target eq 'web') {
     if (  &Apache::response::show_answer() ) {
       my $answer = &Apache::lonxml::get_param('answerdisplay',$parstack,
      $safeeval);
       $Apache::inputtags::answertxt{$id}=[$answer];
    }
       } elsif ($target eq 'edit') {
    $result.=&Apache::edit::tag_start($target,$token);
    $result.=&Apache::edit::text_arg('String to display for answer:',
    'answerdisplay',$token);
    $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
       } elsif ($target eq 'modified') {
    my $constructtag;
    $constructtag=&Apache::edit::get_new_args($token,$parstack,
     $safeeval,'answerdisplay');
    if ($constructtag) {
       $result = &Apache::edit::rebuild_tag($token);
    }
       } elsif ($target eq 'answer' || $target eq 'grade') {
    &Apache::response::reset_params();
       } elsif ($target eq 'meta') {
    $result .= &Apache::response::meta_package_write('customresponse');
       }
       return $result;
   }
   
   sub end_customresponse {
       my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
       my $result;
       my $part=$Apache::inputtags::part;
       my $id=$Apache::inputtags::response[-1];
       if ( $target eq 'grade' && &Apache::response::submitted() ) {
    my $response = &Apache::response::getresponse();
    if ($Apache::lonhomework::type eq 'exam' ||
       &Apache::response::submitted('scantron')) {
       &Apache::response::scored_response($part,$id);
    } elsif ( $response =~ /[^\s]/ && 
     $Apache::response::custom_answer_type[-1] eq 'loncapa/perl') {
       if (!$Apache::lonxml::default_homework_loaded) {
    &Apache::lonxml::default_homework_load($safeeval);
       }
       my %previous = &Apache::response::check_for_previous($response,
    $part,$id);
       $Apache::lonhomework::results{"resource.$part.$id.submission"}=
    $response;
       my $error;
       ${$safeeval->varglob('LONCAPA::customresponse_submission')}=
    $response;
       
       my $award = &Apache::run::run('{ my $submission=$LONCAPA::customresponse_submission;'.$Apache::response::custom_answer[-1].'}',$safeeval);
       if (!&Apache::inputtags::valid_award($award)) {
    $error = $award;
    $award = 'ERROR';
       }
       &Apache::response::handle_previous(\%previous,$award);
       $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=
    $award;
       if ($error) {
    $Apache::lonhomework::results{"resource.$part.$id.awardmsg"}=
       $error;
       }
    }
       } elsif ( $target eq 'answer') {
    $result  = &Apache::response::answer_header('customresponse');
    my $answer = &Apache::lonxml::get_param('answerdisplay',$parstack,
    $safeeval);
    if ($env{'form.answer_output_mode'} ne 'tex') {
       $answer = '<b>'.$answer.'</b>';
    }
    $result .= &Apache::response::answer_part('customresponse',$answer);
    $result .= &Apache::response::answer_footer('customresponse');
       }
       if ($target eq 'web') {
    &setup_prior_tries_hash(\&format_prior_response_math);
       }
       if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || 
    $target eq 'tex' || $target eq 'analyze') {
    &Apache::lonxml::increment_counter(&Apache::response::repetition(),
      "$part.$id");
    if ($target eq 'analyze') {
               $Apache::lonhomework::analyze{"$part.$id.type"} = 'customresponse';
       &Apache::lonhomework::set_bubble_lines();
    }
       }
       pop(@Apache::lonxml::namespace);
       pop(@Apache::response::custom_answer);
       pop(@Apache::response::custom_answer_type);
       &Apache::lonxml::deregister('Apache::response',('answer'));
       &Apache::response::end_response();
       return $result;
   }
   
   sub format_prior_response_custom {
       my ($mode,$answer) =@_;
       return '<span class="LC_prior_custom">'.
       &HTML::Entities::encode($answer,'"<>&').'</span>';
   }
   
   sub start_mathresponse {
       my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
       my $id = &Apache::response::start_response($parstack,$safeeval);
       push(@Apache::lonxml::namespace,'mathresponse');
       my $result;
       @Apache::response::custom_answer=();
       @Apache::response::custom_answer_type=();
       &Apache::lonxml::register('Apache::response',('answer'));
       if ($target eq 'web') {
     if (  &Apache::response::show_answer() ) {
       my $answer = &Apache::lonxml::get_param('answerdisplay',$parstack,
      $safeeval);
       $Apache::inputtags::answertxt{$id}=[$answer];
    }
           if ($Apache::inputtags::status['-1'] eq 'CAN_ANSWER') {
               $result.=&edit_mathresponse_button($id,"HWVAL_$id");
           }
   
       } elsif ($target eq 'edit') {
    $result.=&Apache::edit::tag_start($target,$token);
    $result.=&Apache::edit::text_arg('String to display for answer:',
    'answerdisplay',$token);
    $result.=&Apache::edit::select_arg('Algebra System:',
      'cas',
      ['maxima'],
      $token);
    $result.=&Apache::edit::text_arg('Argument Array:',
    'args',$token);
           $result.=&Apache::edit::text_arg('Libraries:',
                                            'libraries',$token);
    $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
       } elsif ($target eq 'modified') {
    my $constructtag;
    $constructtag=&Apache::edit::get_new_args($token,$parstack,
     $safeeval,'answerdisplay','cas','args','libraries');
    if ($constructtag) {
       $result = &Apache::edit::rebuild_tag($token);
    }
       } elsif ($target eq 'answer' || $target eq 'grade') {
    &Apache::response::reset_params();
       } elsif ($target eq 'meta') {
    $result .= &Apache::response::meta_package_write('mathresponse');
       }
       return $result;
   }
   
   sub edit_mathresponse_button {
       my ($id,$field)=@_;
       my $button=&mt('Edit Answer');
       return(<<ENDFORMULABUTTON);
   <script language="JavaScript">
   function edit_${id}_${field} (textarea) {
       thenumber = textarea;
       thedata = document.forms['lonhomework'].elements[textarea].value;
       newwin = window.open("/adm/dragmath/applet/MaximaPopup.html","","width=565,height=400,resizable");
   }
   </script>
   <input type='button' value='$button' onclick="javascript:edit_${id}_${field}('${field}');void(0);" />
   ENDFORMULABUTTON
   }
   
   sub end_mathresponse {
       my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
       my $result;
       my $part=$Apache::inputtags::part;
       my $id=$Apache::inputtags::response[-1];
       if ( $target eq 'grade' && &Apache::response::submitted() ) {
    my $response = &Apache::response::getresponse();
    if ( $response =~ /[^\s]/ ) {
       if (!$Apache::lonxml::default_homework_loaded) {
    &Apache::lonxml::default_homework_load($safeeval);
       }
       my %previous = &Apache::response::check_for_previous($response,
    $part,$id);
       $Apache::lonhomework::results{"resource.$part.$id.submission"}=
    $response;
       my $error;
       my $award;
       my $cas = &Apache::lonxml::get_param('cas',$parstack,$safeeval);
               if ($cas eq 'maxima') {
                   my $args = [&Apache::lonxml::get_param_var('args',$parstack,$safeeval)];
                   $award=&Apache::lonmaxima::maxima_run($Apache::response::custom_answer[-1],$response,$args,
                                                         &Apache::lonxml::get_param('libraries',$parstack,$safeeval));
               }
       if (!&Apache::inputtags::valid_award($award)) {
    $error = $award;
    $award = 'ERROR';
       }
       &Apache::response::handle_previous(\%previous,$award);
       $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=
    $award;
       if ($error) {
    $Apache::lonhomework::results{"resource.$part.$id.awardmsg"}=
       $error;
       }
    }
       }
       if ($target eq 'web') {
    &setup_prior_tries_hash(\&format_prior_response_math);
       }
   
       pop(@Apache::lonxml::namespace);
       pop(@Apache::response::custom_answer);
       pop(@Apache::response::custom_answer_type);
       &Apache::lonxml::deregister('Apache::response',('answer'));
       &Apache::response::end_response();
       return $result;
   }
   
   sub format_prior_response_math {
       my ($mode,$answer) =@_;
       return '<span class="LC_prior_math">'.
       &HTML::Entities::encode($answer,'"<>&').'</span>';
   }
   
   sub implicit_multiplication {
       my ($expression)=@_;
   # Escape scientific notation, so 3e8 does not become 3*e*8
   # 3e8 -> 3&8; 3e-8 -> 3&-8; 3E+8 -> e&+8
       $expression=~s/(\d+)e([\+\-]*\d+)/$1\&\($2\)/gsi;
   # 3x10^8 -> 3&8; 3*10^-8 -> 3&-8
       $expression=~s/(\d+)(?:x|\*)10(?:\^|\*\*)([\+\-]*\d+)/$1\&\($2\)/gsi;
   # Fill in multiplication signs
   # a b -> a*b;3 b -> 3*b;3 4 -> 3*4
       $expression=~s/([A-Za-z0-9])\s+(?=[A-Za-z0-9])/$1\*/gs;
   # )( -> )*(; ) ( -> )*(
       $expression=~s/\)\s*\(/\)\*\(/gs;
   # 3a -> 3*a; 3( -> 3*(; 3 ( -> 3*(; 3A -> 3*A
       $expression=~s/(\d)\s*([a-zA-Z\(])/$1\*$2/gs;
   # a ( -> a*(
       $expression=~s/([A-Za-z0-9])\s+\(/$1\*\(/gs;
   # )a -> )*a; )3 -> )*3; ) 3 -> )*3
       $expression=~s/\)\s*([A-Za-z0-9])/\)\*$1/gs;
   # 3&8 -> 3e8; 3&-4 -> 3e-4
       $expression=~s/(\d+)\&\(([\+\-]*\d+)\)/$1e$2/gs;
       return $expression;
   }
   
   sub start_answer {
       my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
       my $result;
       push(@Apache::response::custom_answer,
    &Apache::lonxml::get_all_text_unbalanced("/answer",$parser));
       push(@Apache::response::custom_answer_type,
    lc(&Apache::lonxml::get_param('type',$parstack,$safeeval)));
       $Apache::response::custom_answer_type[-1] =~ s/\s+//g;
       if ($target eq "edit" ) {
    $result=&Apache::edit::tag_start($target,$token,'Answer algorithm');
    $result.=&Apache::edit::editfield($token->[1],
     $Apache::response::custom_answer[-1],
     '',80,4);
       } elsif ( $target eq "modified" ) {
    $result=$token->[4].&Apache::edit::modifiedfield('/answer',$parser);
       }
       return $result;
   }
   
   sub end_answer {
       my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
       if ($target eq 'edit' ) {
    return &Apache::edit::end_table();
       }
   }
   
 sub decide_package {  sub decide_package {
     my ($tagstack)=@_;      my ($tagstack)=@_;
     my $package;      my $package;
Line 420  sub start_responseparam { Line 698  sub start_responseparam {
  $Apache::lonnet::packagetab{"$tag&$name&display"};   $Apache::lonnet::packagetab{"$tag&$name&display"};
     $token->[2]->{'default'}=      $token->[2]->{'default'}=
  $Apache::lonnet::packagetab{"$tag&$name&default"};   $Apache::lonnet::packagetab{"$tag&$name&default"};
               $token->[3] = ['name','type','description','default'];
     $constructtag=1;      $constructtag=1;
  }   }
  if ($constructtag) {   if ($constructtag) {
     $result = &Apache::edit::rebuild_tag($token);      $result = &Apache::edit::rebuild_tag($token);
     $result.=&Apache::edit::handle_insert();  
  }   }
     } 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' ) {
Line 462  sub setup_params { Line 740  sub setup_params {
     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 =~ /^\Q$tag\E/) {
     my ($package,$name) = split(/&/,$key);      my ($package,$name) = split(/&/,$key);
     $paramlist{$name}=1;      $paramlist{$name}=1;
  }   }
Line 488  sub setup_params { Line 766  sub setup_params {
     }      }
 }  }
   
   {
       my @answer_bits;
       my $need_row_start;
   
 sub answer_header {  sub answer_header {
       my ($type,$increment,$rows) = @_;
       my $result;
       if ($env{'form.answer_output_mode'} eq 'tex') {
    undef(@answer_bits);
    my $bit;
    if ($Apache::lonhomework::type eq 'exam') {
       $bit = ($Apache::lonxml::counter+$increment).') ';
    } else {
       $bit .= ' Answer for Part: \verb|'.
    $Apache::inputtags::part.'| ';
    }
    push(@answer_bits,$bit);
       } else {
    my $td = '<td '.(defined($rows)?'rowspan="'.$rows.'"':'').'>';
    $result  = '<table border="1"><tr>';
    if ($Apache::lonhomework::type eq 'exam') {
       $result .= $td.($Apache::lonxml::counter+$increment). ')</td>';
    } else {
       $result .= $td.&mt('Answer for Part: [_1]',
          $Apache::inputtags::part).'</td>';
    }
    $result .= "\n";
    $need_row_start = 0;
       }
       return $result;
   }
   
   sub next_answer {
     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|'.   # FIXME ... need to do something with tex mode
                   $Apache::inputtags::part.'| \\\\ \hline ';  
     } else {      } else {
  $result = '<table border="1"><tr><td>Answer for Part:'.   $result .= "</tr>";
     $Apache::inputtags::part. '</td>'."\n";   $need_row_start = 1;
     }      }
     return $result;      return $result;
 }  }
   
 sub answer_part {  sub answer_part {
     my ($type,$answer) = @_;      my ($type,$answer,$args) = @_;
     my $result;      my $result;
     if ($env{'form.answer_output_mode'} eq 'tex') {      if ($env{'form.answer_output_mode'} eq 'tex') {
  $result = ' \verb|'.$answer.'|\\\\ \hline ';   if (!$args->{'no_verbatim'}) {
       my $to_use='|';
       foreach my $value (32..126) {
    my $char=pack('c',$value);
    if ($answer !~ /\Q$char\E/) {
       $to_use=$char;
       last;
    }
       }
               my $fullanswer=$answer;
               $answer='';
               foreach my $element (split(/[\;]/,$fullanswer)) {
          if ($element ne '') {
     $answer.= '\verb'.$to_use.$element.$to_use.' \newline';
          }
               }
    }
    if ($answer ne '') {
       push(@answer_bits,$answer);
    }
     } else {      } else {
  $result = '<td>'.$answer.'</td>';   if ($need_row_start) {
       $result .= '<tr>';
       $need_row_start = 0;
    }
    $result .= '<td>'.$answer.'</td>';
     }      }
     return $result;      return $result;
 }  }
Line 516  sub answer_footer { Line 848  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  = ' \vskip 0 mm \noindent \begin{tabular}{|p{1.5cm}|p{6.8cm}|}\hline ';
    $result .= $answer_bits[0].'&\vspace*{-4mm}\begin{itemize}';
           for (my $i=1;$i<=$#answer_bits;$i++) {
               $result.='\item '.$answer_bits[$i].'\vspace*{-7mm}';
           }
    $result .= ' \end{itemize} \\\\ \hline \end{tabular} \vskip 0 mm ';
     } else {      } else {
  $result = '</tr></table>';   if (!$need_row_start) {
       $result .= '</tr>';
    }
    $result .= '</table>';
     }      }
     return $result;      return $result;
 }  }
   
   }
   
 sub showallfoils {  sub showallfoils {
     if (defined($env{'form.showallfoils'})) {      if (defined($env{'form.showallfoils'})) {
  my ($symb)=&Apache::lonxml::whichuser();   my ($symb)=&Apache::lonnet::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) ) {              ($Apache::lonhomework::viewgrades) ) {
Line 536  sub showallfoils { Line 878  sub showallfoils {
     return 0;      return 0;
 }  }
   
   =pod
   
   =item &getresponse($offset,$resulttype);
   
   Retreives the current submitted response, helps out in the case of
   scantron mode.
   
   Returns either the exact text of the submission, or a bubbled response
   converted to something usable.
   
   Optional Arguments:
     $offset - (defaults to 1) if a problem has more than one bubble
               response, pass in the number of the bubble wanted, (the
               first bubble associated with a problem has an offset of 1,
               the second bubble is 2
   
     $resulttype - undef    -> a number between 0 and 25
                   'A is 1' -> a number between 1 and 26
                   'letter' -> a letter between 'A' and 'Z'
     $lines  - undef problem only needs a single line of bubbles.
               nonzero  Problem wants the first nonempty response in 
                         $lines lines of bubbles.
     $bubbles_per_line - Must be provided if lines is defined.. number of
                         bubbles on a line.
   
   =cut
   
 sub getresponse {  sub getresponse {
     my ($temp,$resulttype)=@_;      my ($offset,$resulttype, $lines, $bubbles_per_line)=@_;
     my $formparm='form.HWVAL_'.$Apache::inputtags::response['-1'];      my $formparm='form.HWVAL_'.$Apache::inputtags::response['-1'];
     my $response;      my $response;
     if (!defined($temp)) {      if (!defined($offset)) {
  $temp=1;   $offset=1;
     } else {      } else {
  $formparm.=":$temp";   $formparm.=":$offset";
       }
       if (!defined($lines)) {
    $lines = 1;
     }      }
     my %let_to_num=('A'=>0,'B'=>1,'C'=>2,'D'=>3,'E'=>4,'F'=>5,'G'=>6,'H'=>7,      my %let_to_num=('A'=>0,'B'=>1,'C'=>2,'D'=>3,'E'=>4,'F'=>5,'G'=>6,'H'=>7,
     '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,
Line 552  sub getresponse { Line 924  sub getresponse {
     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).  
  '.answer'};   my $line;
    for ($line = 0; $line < $lines; $line++) {
       my $theline = $Apache::lonxml::counter+$offset-1+$line;
       $response = $env{"scantron.$theline.answer"};
       if ((defined($response)) && ($response ne "") && ($response ne " ")) {
    last;
       }
       
    }
   
  # save bubbled letter for later   # save bubbled letter for later
  $Apache::lonhomework::results{"resource.$part.$id.scantron"}.=   $Apache::lonhomework::results{"resource.$part.$id.scantron"}.=
     $response;      $response;
Line 563  sub getresponse { Line 944  sub getresponse {
     } else {      } else {
  $response = $let_to_num{$response};   $response = $let_to_num{$response};
     }      }
       if ($response ne "") {
    $response += $line * $bubbles_per_line;
       }
    } else {
       if ($response ne "") {
    $response = chr(ord($response) + $line * $bubbles_per_line);
       }
  }   }
   
     } else {      } else {
  $response = $env{$formparm};   $response = $env{$formparm};
     }      }
       # 
       #  If we have a nonempty answer, correct the numeric value
       #  of the answer for the line on which it was found.
       #
   
     return $response;      return $response;
 }  }
   
   =pod
   
   =item &repetition();
   
   Returns the number of lines that are required to encode the weight.
   (Currently expects that there are 10 bubbles per line)
   
   =cut
   
 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");
     my $repetition = int $weight/9;      if (!defined($weight) || ($weight eq '')) { $weight=1; }
     if ($weight % 9 != 0) {$repetition++;}       my $repetition = int($weight/10);
       if ($weight % 10 != 0) { $repetition++; } 
     return $repetition;      return $repetition;
 }  }
   
   =pod
   
   =item &scored_response($part_id,$response_id);
   
   Sets the results hash elements
   
      resource.$part_id.$response_id.awarded - to the floating point
        number between 0 and 1 that was awarded on the bubbled input
   
      resource.$part_id.$response_id.awarddetail - to 'ASSIGNED_SCORE'
   
   Returns
   
      the number of bubble sheet lines that were used (and likely need to
        be passed to &Apache::lonxml::increment_counter()
   
   Arguments
   
      $part_id - id of the part to grade
      $response_id - id of the response to grade
     
   
   =cut
   
 sub scored_response {  sub scored_response {
     my ($part,$id)=@_;      my ($part,$id)=@_;
     my $repetition=&repetition();      my $repetition=&repetition();
     my $score=0;      my $score=0;
     for (my $i=0;$i<$repetition;$i++) {      for (my $i=0;$i<$repetition;$i++) {
    # A is 1, B is 2, etc. (get response return 0-9 and then we add 1)
  my $increase=&Apache::response::getresponse($i+1);   my $increase=&Apache::response::getresponse($i+1);
  if ($increase ne '') { $score+=$increase+1; }   if ($increase ne '') { $score+=$increase+1; }
     }      }
Line 651  sub show_answer { Line 1080  sub show_answer {
     my $award  = $Apache::lonhomework::history{"resource.$part.solved"};      my $award  = $Apache::lonhomework::history{"resource.$part.solved"};
     my $status = $Apache::inputtags::status[-1];      my $status = $Apache::inputtags::status[-1];
     return  ( ($award =~ /^correct/      return  ( ($award =~ /^correct/
        && lc($Apache::lonhomework::problemstatus) ne 'no')         && &Apache::lonhomework::show_problem_status())
       || $status eq "SHOW_ANSWER");        || $status eq "SHOW_ANSWER");
 }  }
   
Line 712  sub pick_foil_for_concept { Line 1141  sub pick_foil_for_concept {
  $Apache::response::conceptgroup{'names'};   $Apache::response::conceptgroup{'names'};
   
 }  }
   #------------------------------------------------------------
   #
   #  Get a parameter associated with a problem.
   # Parameters:
   #  $id        - the id of the paramater, either a part id, 
   #               or a partid and responspe id joined by _
   #  $name      - Name of the parameter to fetch
   #  $default   - Default value for the paramter.
   #
   #  
   #
 sub get_response_param {  sub get_response_param {
     my ($id,$name,$default)=@_;      my ($id,$name,$default)=@_;
     my $parameter;      my $parameter;
Line 737  sub submitted { Line 1176  sub submitted {
     if ($who eq 'scantron') { return 0; }      if ($who eq 'scantron') { return 0; }
     # if the Submit Answer button for this particular part was pressed      # if the Submit Answer button for this particular part was pressed
     my $partid=$Apache::inputtags::part;      my $partid=$Apache::inputtags::part;
     if (defined($env{'form.submit_'.$partid})) { return 1; }      if ($env{'form.submitted'} eq "part_$partid") {
    return 1;
       }
       if ($env{'form.submitted'} eq "yes"
    && defined($env{'form.submit_'.$partid})) {
    return 1;
       }
       # Submit All button on a .page was pressed
       if (defined($env{'form.all_submit'})) { return 1; }
     # otherwise no submission occured      # otherwise no submission occured
     return 0;      return 0;
 }  }
   
   sub add_to_gradingqueue {
       my ($symb,$courseid,$domain,$name) = &Apache::lonnet::whichuser();
       if (   $courseid eq ''
    || $symb eq ''
    || $env{'request.state'} eq 'construct'
    || $Apache::lonhomework::type ne 'problem') {
    return;
       }
   
       my %queue_info = ( 'type' => 'problem',
          'time' => time);
   
       if (exists($Apache::lonhomework::history{"resource.0.checkedin.slot"})) {
    $queue_info{'slot'}=
        $Apache::lonhomework::history{"resource.0.checkedin.slot"};
       }
   
       my $result=&Apache::bridgetask::add_to_queue('gradingqueue',\%queue_info);
       if ($result ne 'ok') {
    &Apache::lonxml::error("add_to_queue said $result");
       }
   }
   
 # basically undef and 0 (both false) mean that they still have work to do  # 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  # and all true values mean that they can't do any more work
 #  #
Line 752  sub submitted { Line 1222  sub submitted {
 # a return of 3 means it after the answer date  # a return of 3 means it after the answer date
 sub check_status {  sub check_status {
     my ($id)=@_;      my ($id)=@_;
     if (!$id) { $id=$Apache::linputtags::part; }      if (!defined($id)) { $id=$Apache::inputtags::part; }
     my $curtime=&Apache::lonnet::EXT('system.time');      my $curtime=&Apache::lonnet::EXT('system.time');
     my $opendate=&Apache::lonnet::EXT("resource.$id.opendate");      my $opendate=&Apache::lonnet::EXT("resource.$id.opendate");
     my $duedate=&Apache::lonnet::EXT("resource.$id.duedate");      my $duedate=&Apache::lonnet::EXT("resource.$id.duedate");
Line 772  sub check_status { Line 1242  sub check_status {
     return 2;      return 2;
 }  }
   
   =pod
   
   =item setup_prior_tries_hash($func,$data)
   
     Foreach each past .submission $func is called with 3 arguments
        - the mode to set things up for (currently always 'grade')
        - the stored .submission string
        - The expansion of $data
   
     $data is an array ref containing elements that are either
       - scalars that are other elements of the history hash to pass to $func
       - ref to data to be passed untouched to $func
   
   =cut
   
   sub setup_prior_tries_hash {
       my ($func,$data) = @_;
       my $part = $Apache::inputtags::part;
       my $id   = $Apache::inputtags::response[-1];
       foreach my $i (1..$Apache::lonhomework::history{'version'}) {
    my $sub_key   = "$i:resource.$part.$id.submission";
    next if (!exists($Apache::lonhomework::history{$sub_key}));
    my @other_data;
    foreach my $datum (@{ $data }) {
       if (ref($datum)) {
    push(@other_data,$datum);
       } else {
    my $info_key = "$i:resource.$part.$id.$datum";
    push(@other_data,$Apache::lonhomework::history{$info_key});
       }
    }
   
    my $output =
       &$func('grade',
      $Apache::lonhomework::history{$sub_key},
      \@other_data);
    if (defined($output)) {
       $Apache::inputtags::submission_display{$sub_key} = $output;
    }
       }
   }
   
 1;  1;
 __END__  __END__
     

Removed from v.1.120  
changed lines
  Added in v.1.192


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