Diff for /loncom/homework/hint.pm between versions 1.75 and 1.76

version 1.75, 2009/04/17 01:00:15 version 1.76, 2009/06/28 19:40:41
Line 36  use capa; Line 36  use capa;
 use Apache::caparesponse();  use Apache::caparesponse();
 use Apache::lonmaxima();  use Apache::lonmaxima();
 use Apache::lonr();  use Apache::lonr();
   use Apache::chemresponse();
 use Apache::response();  use Apache::response();
 use Apache::lonlocal;  use Apache::lonlocal;
 use Storable qw(dclone);  use Storable qw(dclone);
   
 BEGIN {  BEGIN {
     &Apache::lonxml::register('Apache::hinttags',('hintgroup','hintpart','numericalhint','stringhint','formulahint','optionhint','radiobuttonhint','mathhint','customhint'));      &Apache::lonxml::register('Apache::hinttags',('hintgroup','hintpart','numericalhint','stringhint','formulahint','optionhint','radiobuttonhint','mathhint','customhint','reactionhint','organichint'));
 }  }
   
   
Line 467  sub end_stringhint { Line 468  sub end_stringhint {
     return $result;      return $result;
 }  }
   
   # reactionhint
   
   sub start_reactionhint {
       my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
       #do everything in end, so intervening <responseparams> work
       &Apache::response::start_hintresponse($parstack,$safeeval);
       my $result;
       if ($target eq 'edit') {
           $result.=&Apache::edit::tag_start($target,$token);
           $result.=&Apache::edit::text_arg('Name:','name',$token);
           $result.=&Apache::edit::text_arg('Answer:','answer',$token);
           $result.=&Apache::edit::end_row();
           $result.=&Apache::edit::start_spanning_row();
       } elsif ($target eq 'modified') {
           my $constructtag;
           $constructtag=&Apache::edit::get_new_args($token,$parstack,
                                                     $safeeval,'name','answer',
                                                     );
           $result  = &Apache::edit::rebuild_tag($token);
       } elsif ($target eq 'web') {
           &Apache::response::reset_params();
       }
       return $result;
   }
   
   sub end_reactionhint {
       my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
       my $result;
       if ($target eq 'web') {
           if (!$Apache::lonxml::default_homework_loaded) {
               &Apache::lonxml::default_homework_load($safeeval);
           }
           my $hint_name= &Apache::lonxml::get_param('name',$parstack,$safeeval);
           &Apache::response::setup_params('reactionhint',$safeeval);
           my $partid=$Apache::inputtags::part;
           my $id=$Apache::inputtags::hint[-1];
           #id submissions occurred under
           my $submitid=$Apache::inputtags::response[-1];
           my $response = $Apache::lonhomework::history{
                               "resource.$partid.$submitid.submission"};
           &Apache::lonxml::debug("hintgroup is using $response<br />\n");
           my $answer=&Apache::lonxml::get_param('answer',$parstack,
                                                     $safeeval);
           &Apache::lonxml::debug("current $response");
           &Apache::lonxml::debug("current $answer");
           if (&Apache::chemresponse::chem_standard_order($response) eq 
               &Apache::chemresponse::chem_standard_order($answer)) {
               push(@Apache::hint::which,$hint_name);
           }
           $result='';
       } elsif ($target eq 'meta') {
           $result=&Apache::response::meta_package_write($token->[1]);
       } elsif ($target eq 'edit') {
           $result.=&Apache::edit::end_row().&Apache::edit::end_table();
       }
       &Apache::response::end_hintresponse();
       return $result;
   }
   
   # organichint
   
   sub start_organichint {
       my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
       #do everything in end, so intervening <responseparams> work
       &Apache::response::start_hintresponse($parstack,$safeeval);
       my $result;
       if ($target eq 'edit') {
           $result.=&Apache::edit::tag_start($target,$token);
           $result.=&Apache::edit::text_arg('Name:','name',$token);
           $result.=&Apache::edit::text_arg('Answer:','answer',$token);
           $result.=&Apache::edit::end_row();
           $result.=&Apache::edit::start_spanning_row();
       } elsif ($target eq 'modified') {
           my $constructtag;
           $constructtag=&Apache::edit::get_new_args($token,$parstack,
                                                     $safeeval,'name','answer',
                                                     );
           $result  = &Apache::edit::rebuild_tag($token);
       } elsif ($target eq 'web') {
           &Apache::response::reset_params();
       }
       return $result;
   }
   
   sub end_organichint {
       my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
       my $result;
       if ($target eq 'web') {
           if (!$Apache::lonxml::default_homework_loaded) {
               &Apache::lonxml::default_homework_load($safeeval);
           }
           my $hint_name= &Apache::lonxml::get_param('name',$parstack,$safeeval);
           &Apache::response::setup_params('organichint',$safeeval);
           my $partid=$Apache::inputtags::part;
           my $id=$Apache::inputtags::hint[-1];
           #id submissions occurred under
           my $submitid=$Apache::inputtags::response[-1];
           my $response = $Apache::lonhomework::history{
                               "resource.$partid.$submitid.submission"};
           &Apache::lonxml::debug("hintgroup is using $response<br />\n");
           my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);
           my %previous = &Apache::response::check_for_previous($response,$partid,$id);
           foreach my $answer (@answers) {
               &Apache::lonxml::debug("submitted a $response for $answer<br \>\n");
               if ($response eq $answer) {
                  push(@Apache::hint::which,$hint_name);
                  last;
               }
           }
           $result='';
       } elsif ($target eq 'meta') {
           $result=&Apache::response::meta_package_write($token->[1]);
       } elsif ($target eq 'edit') {
           $result.=&Apache::edit::end_row().&Apache::edit::end_table();
       }
       &Apache::response::end_hintresponse();
       return $result;
   }
   
   
 # a part shows if it is on, if no specific parts are on, then default shows  # a part shows if it is on, if no specific parts are on, then default shows
 sub start_hintpart {  sub start_hintpart {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;

Removed from v.1.75  
changed lines
  Added in v.1.76


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