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

Diff for /loncom/homework/hint.pm between versions 1.55 and 1.62

version 1.55, 2004/08/24 15:56:13 version 1.62, 2006/03/07 22:42:47
Line 29 Line 29
 package Apache::hinttags;   package Apache::hinttags; 
   
 use strict;  use strict;
 use Apache::lonnet();  use Apache::lonnet;
 use capa;  use capa;
 use Apache::lonlocal;  use Apache::lonlocal;
   
Line 54  sub start_hintgroup { Line 54  sub start_hintgroup {
     $Apache::lonhomework::history{"resource.$id.solved"};      $Apache::lonhomework::history{"resource.$id.solved"};
  my $showoncorrect=lc(&Apache::lonxml::get_param('showoncorrect',$parstack,$safeeval));   my $showoncorrect=lc(&Apache::lonxml::get_param('showoncorrect',$parstack,$safeeval));
  &Apache::lonxml::debug("onc orrect $showoncorrect, $gradestatus");   &Apache::lonxml::debug("onc orrect $showoncorrect, $gradestatus");
  if ( ($showoncorrect ne 'yes' && $gradestatus =~ /^correct/) ||   if ( ($showoncorrect ne 'yes' && &Apache::response::show_answer()) ||
      ( $numtries < $hinttries) ) {       ( $numtries < $hinttries) ) {
     &Apache::lonxml::debug("Grabbin all");      &Apache::lonxml::debug("Grabbin all");
     &Apache::lonxml::get_all_text("/hintgroup",$parser);      &Apache::lonxml::get_all_text("/hintgroup",$parser,$style);
  }   }
  &Apache::lonxml::startredirection;   &Apache::lonxml::startredirection;
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  $result .= '\keephidden{';   $result .= '\keephidden{';
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  $result.=&Apache::edit::tag_start($target,$token);   $result.=&Apache::edit::tag_start($target,$token);
  $result.=&Apache::edit::select_arg('Show hint even if problem Correct:','showoncorrect',[['no',&mt('No')],['yes',&mt('Yes')]]);   $result.=&Apache::edit::select_arg('Show hint even if problem Correct:','showoncorrect',[['no',&mt('No')],['yes',&mt('Yes')]],$token);
  $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row();   $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
     } elsif ($target eq 'modified') {      } elsif ($target eq 'modified') {
  my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'showoncorrect');   my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'showoncorrect');
Line 94  sub end_hintgroup { Line 94  sub end_hintgroup {
  $hinttext.'</td></tr></table>';   $hinttext.'</td></tr></table>';
  }   }
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  $result.=&Apache::edit::end_table();   $result.=&Apache::edit::end_row().&Apache::edit::end_table();
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  $result .= '}';   $result .= '}';
     }      }
Line 161  sub end_numericalhint { Line 161  sub end_numericalhint {
  my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval);   my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval);
  &Apache::response::setup_params('numericalhint',$safeeval);   &Apache::response::setup_params('numericalhint',$safeeval);
  my $partid=$Apache::inputtags::part;   my $partid=$Apache::inputtags::part;
  my $id=$Apache::inputtags::response['-1'];   my $id=$Apache::inputtags::hint[-1];
  #id submissions occured under   #id submissions occured under
  my $submitid=$Apache::inputtags::response['-2'];   my $submitid=$Apache::inputtags::response[-1];
  my $response = $Apache::lonhomework::history{   my $response = $Apache::lonhomework::history{
     "resource.$partid.$submitid.submission"};      "resource.$partid.$submitid.submission"};
  &Apache::lonxml::debug("hintgroup is using $response<br />\n");   &Apache::lonxml::debug("hintgroup is using $response<br />\n");
Line 201  sub end_numericalhint { Line 201  sub end_numericalhint {
     } elsif ($target eq 'meta') {      } elsif ($target eq 'meta') {
  $result=&Apache::response::meta_package_write($token->[1]);   $result=&Apache::response::meta_package_write($token->[1]);
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  $result.='</td></tr>'.&Apache::edit::end_table;   $result.=&Apache::edit::end_row().&Apache::edit::end_table();
     }      }
     &Apache::response::end_hintresponse();      &Apache::response::end_hintresponse();
     return $result;      return $result;
Line 255  sub end_stringhint { Line 255  sub end_stringhint {
  my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval);   my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval);
  &Apache::response::setup_params('stringhint',$safeeval);   &Apache::response::setup_params('stringhint',$safeeval);
  my $partid=$Apache::inputtags::part;   my $partid=$Apache::inputtags::part;
  my $id=$Apache::inputtags::response['-1'];   my $id=$Apache::inputtags::hint[-1];
  #id submissions occured under   #id submissions occured under
  my $submitid=$Apache::inputtags::response['-2'];   my $submitid=$Apache::inputtags::response[-1];
  my $response = $Apache::lonhomework::history{   my $response = $Apache::lonhomework::history{
     "resource.$partid.$submitid.submission"};      "resource.$partid.$submitid.submission"};
  &Apache::lonxml::debug("hintgroup is using $response<br />\n");   &Apache::lonxml::debug("hintgroup is using $response<br />\n");
Line 267  sub end_stringhint { Line 267  sub end_stringhint {
  my ($ad,$msg);   my ($ad,$msg);
  if ($type eq 're' ) {   if ($type eq 're' ) {
     ${$safeeval->varglob('LONCAPA::response')}=$response;      ${$safeeval->varglob('LONCAPA::response')}=$response;
     $result = &Apache::run::run('return $LONCAPA::response=~m'.$answer,$safeeval);      my $compare='=';
       if ($answer=~/^\s*NOT\s*/) {
    $answer=~s/^\s*NOT\s*//;
    $compare='!';
       }
       my $test='$LONCAPA::response'.$compare.'~m'.$answer;
       &Apache::lonxml::debug("test $test");
       $result = &Apache::run::run("return $test",$safeeval);
     &Apache::lonxml::debug("current $response");      &Apache::lonxml::debug("current $response");
     &Apache::lonxml::debug("current $answer");      &Apache::lonxml::debug("current $answer");
     $ad = ($result) ? 'APPROX_ANS' : 'INCORRECT';      $ad = ($result) ? 'APPROX_ANS' : 'INCORRECT';
Line 293  sub end_stringhint { Line 300  sub end_stringhint {
     } elsif ($target eq 'meta') {      } elsif ($target eq 'meta') {
  $result=&Apache::response::meta_package_write($token->[1]);   $result=&Apache::response::meta_package_write($token->[1]);
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  $result.='</td></tr>'.&Apache::edit::end_table;   $result.=&Apache::edit::end_row().&Apache::edit::end_table();
     }      }
     &Apache::response::end_hintresponse();      &Apache::response::end_hintresponse();
     return $result;      return $result;
Line 315  sub start_hintpart { Line 322  sub start_hintpart {
     foreach $which (@Apache::hint::which) { if ($which eq $on) { $show = 1; last } }      foreach $which (@Apache::hint::which) { if ($which eq $on) { $show = 1; last } }
  }   }
  if (!$show) {   if (!$show) {
     &Apache::lonxml::get_all_text("/hintpart",$parser);      &Apache::lonxml::get_all_text("/hintpart",$parser,$style);
  }   }
     } elsif ($target eq 'grade') {      } elsif ($target eq 'grade') {
  &Apache::lonxml::get_all_text("/hintpart",$parser);   &Apache::lonxml::get_all_text("/hintpart",$parser,$style);
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  $result.= &Apache::edit::tag_start($target,$token);   $result.= &Apache::edit::tag_start($target,$token);
  $result.= &Apache::edit::text_arg('On:','on',$token);   $result.= &Apache::edit::text_arg('On:','on',$token);
Line 338  sub start_hintpart { Line 345  sub start_hintpart {
 sub end_hintpart {  sub end_hintpart {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result;      my $result;
     if ($target eq 'edit') { $result.=&Apache::edit::end_table; }      if ($target eq 'edit') {
    $result.=&Apache::edit::end_row().&Apache::edit::end_table();
       }
     return $result;      return $result;
 }  }
   
Line 373  sub end_optionhint { Line 382  sub end_optionhint {
  my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval);   my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval);
  my $partid=$Apache::inputtags::part;   my $partid=$Apache::inputtags::part;
  #id submissions occured under   #id submissions occured under
  my $submitid=$Apache::inputtags::response['-2'];   my $submitid=$Apache::inputtags::response[-1];
  my $part_id="$partid.$submitid";   my $part_id="$partid.$submitid";
  my %answer;   my %answer;
  my $answer=&Apache::lonxml::get_param('answer',$parstack,$safeeval);   my $answer=&Apache::lonxml::get_param('answer',$parstack,$safeeval);
  if ($answer) {   if ($answer) {
     eval('%answer ='.$answer);      eval('%answer ='.$answer);
       &Apache::lonxml::debug("answwer hash");
     &Apache::lonhomework::showhash(%answer);      &Apache::lonhomework::showhash(%answer);
     my $response = $Apache::lonhomework::history{      my $response = $Apache::lonhomework::history{
             "resource.$part_id.submission"};              "resource.$part_id.submission"};
Line 414  sub end_optionhint { Line 424  sub end_optionhint {
      ($foilmatch    eq '-1' || $foilmatch    eq '1') ) {       ($foilmatch    eq '-1' || $foilmatch    eq '1') ) {
     push(@Apache::hint::which,$name);      push(@Apache::hint::which,$name);
  }   }
     } elsif ($target eq 'edit') { $result.=&Apache::edit::end_table; }      } elsif ($target eq 'edit') {
     if ($target eq 'edit') { $result.=&Apache::edit::end_table; }   $result.=&Apache::edit::end_row().&Apache::edit::end_table();
       }
     &Apache::response::end_hintresponse();      &Apache::response::end_hintresponse();
     return $result;      return $result;
 }  }
Line 452  sub end_radiobuttonhint { Line 463  sub end_radiobuttonhint {
  eval('@answer ='.$answer);   eval('@answer ='.$answer);
  my $partid=$Apache::inputtags::part;   my $partid=$Apache::inputtags::part;
  #id submissions occured under   #id submissions occured under
  my $submitid=$Apache::inputtags::response['-2'];   my $submitid=$Apache::inputtags::response[-1];
  my $part_id="$partid.$submitid";   my $part_id="$partid.$submitid";
  my $response = $Apache::lonhomework::history{   my $response = $Apache::lonhomework::history{
     "resource.$part_id.submission"};      "resource.$part_id.submission"};
Line 479  sub end_radiobuttonhint { Line 490  sub end_radiobuttonhint {
  }   }
     }      }
  }   }
     } elsif ($target eq 'edit') { $result.=&Apache::edit::end_table; }      } elsif ($target eq 'edit') {
    $result.=&Apache::edit::end_row().&Apache::edit::end_table();
       }
     &Apache::response::end_hintresponse();      &Apache::response::end_hintresponse();
     return $result;      return $result;
 }  }
Removed from v.1.55  
changed lines
  Added in v.1.62

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