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

Diff for /loncom/homework/caparesponse/caparesponse.pm between versions 1.33 and 1.41

version 1.33, 2001/07/10 22:06:42 version 1.41, 2001/08/09 15:35:47
Line 6  use strict; Line 6  use strict;
 use capa;  use capa;
   
 sub BEGIN {  sub BEGIN {
   &Apache::lonxml::register('Apache::caparesponse',('caparesponse','numericalresponse'));    &Apache::lonxml::register('Apache::caparesponse',('caparesponse','numericalresponse','stringresponse'));
 }  }
   
 sub start_caparesponse {  sub start_caparesponse {
Line 58  sub start_numericalresponse { Line 58  sub start_numericalresponse {
   my $result;    my $result;
   if ($target eq 'edit') {    if ($target eq 'edit') {
     $result.=&Apache::edit::tag_start($target,$token,&Apache::lonxml::description($token));      $result.=&Apache::edit::tag_start($target,$token,&Apache::lonxml::description($token));
     $result.=&Apache::edit::text_arg('Answer:','answer',$token).      $result.=&Apache::edit::text_arg('Answer:','answer',$token);
       &Apache::edit::text_arg('Unit:','unit',$token).'</td></tr><tr><td colspan="3">';      if ($token->[1] eq 'numericalresponse') {
         $result.=&Apache::edit::text_arg('Unit:','unit',$token,5);
         $result.=&Apache::edit::text_arg('Format:','format',$token,4);
       } else {
         $result.=&Apache::edit::select_arg('Type:','type',
    ['cs','ci','mc'],$token)
       }
       $result.='</td></tr><tr><td colspan="3">';
   } elsif ($target eq 'modified') {    } elsif ($target eq 'modified') {
     my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,      my $constructtag;
  'answer','unit');      if ($token->[1] eq 'numericalresponse') {
         $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
    'answer','unit','format');
       } else {
         $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
    'answer','type');
       }
     if ($constructtag) {      if ($constructtag) {
       $result = &Apache::edit::rebuild_tag($token);        $result = &Apache::edit::rebuild_tag($token);
       $result.=&Apache::edit::handle_insert();        $result.=&Apache::edit::handle_insert();
     }      }
     } elsif ($target eq 'meta') {
       $result=&Apache::response::meta_package_write('numericalresponse');
   }    }
   return $result;    return $result;
 }  }
Line 76  sub end_numericalresponse { Line 91  sub end_numericalresponse {
   my $result = '';    my $result = '';
   if ( $target eq 'grade' ) {    if ( $target eq 'grade' ) {
     if ( defined $ENV{'form.submitted'}) {      if ( defined $ENV{'form.submitted'}) {
         &Apache::response::setup_params('numericalresponse');
       $safeeval->share_from('capa',['&caparesponse_capa_check_answer']);        $safeeval->share_from('capa',['&caparesponse_capa_check_answer']);
       my $response = $ENV{'form.HWVAL'.$Apache::inputtags::response['-1']};        my $partid = $Apache::inputtags::part;
         my $id = $Apache::inputtags::response['-1'];
         my $response = $ENV{'form.HWVAL'.$id};
       if ( $response =~ /[^\s]/) {        if ( $response =~ /[^\s]/) {
  my $id = $Apache::inputtags::response['-1'];   my %previous = &Apache::response::check_for_previous($response,$partid,$id);
  my $previous= &Apache::response::check_for_previous($response,$id,$response);   $Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response;
  if ( $previous ) {    &Apache::lonxml::debug("submitted a $response<br>\n");
   $result = 'PREVIOUSLY_USED';   &Apache::lonxml::debug($$parstack[$#$parstack] . "\n<br>");
  } else {   $response =~ s/\\/\\\\/g;
   $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.submission"}=$response;   $response =~ s/\'/\\\'/g;
   &Apache::lonxml::debug("submitted a $response<br>\n");   &Apache::lonxml::debug("current $response");
   &Apache::lonxml::debug($$parstack[$#$parstack] . "\n<br>");   my $expression="&caparesponse_check_list('".$response."','".
   $response =~ s/\\/\\\\/g;    $$parstack[$#$parstack];
   $response =~ s/\'/\\\'/g;   foreach my $key (keys(%Apache::inputtags::params)) {
   &Apache::lonxml::debug("current $response");    $expression.= ';my $'. #'
   my $expression="&caparesponse_check_list('".$response."','".      $key.'="'.$Apache::inputtags::params{$key}.'"';
     $$parstack[$#$parstack].   }
       ';my $tol="'.$Apache::inputtags::params{'tol'}.'"'.   $expression.="');";
       ';my $sig="'.$Apache::inputtags::params{'sig'}.'"'.   $result = &Apache::run::run($expression,$safeeval);
  "');";   my ($awards) = split /:/ , $result;
   $result = &Apache::run::run($expression,$safeeval);   my ($ad) = &Apache::inputtags::finalizeawards(split /,/ , $awards);
   my ($awards) = split /:/ , $result;   if ( $previous{'used'} && ($previous{'award'} eq $ad) ) {
   my ($ad) = &Apache::inputtags::finalizeawards(split /,/ , $awards);    if ($previous{'last'}) {
   $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}=$ad;      push(@Apache::inputtags::previous,'PREVIOUSLY_LAST');
   &Apache::lonxml::debug("$expression");    } else {
   &Apache::lonxml::debug("\n<br>result:$result:$Apache::lonxml::curdepth<br>\n");      push(@Apache::inputtags::previous,'PREVIOUSLY_USED');
   $result='';    }
  }   }
    $Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad;
    &Apache::lonxml::debug("$expression");
    &Apache::lonxml::debug("\n<br>result:$result:$Apache::lonxml::curdepth<br>\n");
    $result='';
       }        }
     }      }
   } elsif ($target eq 'web') {    } elsif ($target eq 'web') {
     my $award = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"};      my $award = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"};
     my $status = $Apache::inputtags::status['-1'];      my $status = $Apache::inputtags::status['-1'];
     if ($award =~ /^correct/ || $status eq "SHOW_ANSWER" ) {      if ($award =~ /^correct/ || $status eq "SHOW_ANSWER" ) {
       my $answervar=&Apache::run::run("{$$parstack['-1'];".'return $answer}',$safeeval);        my $answervar=&Apache::lonxml::get_param('answer',$parstack,$safeeval);
       my (@answers)=&Apache::run::run("$answervar",$safeeval);        my (@answers)=&Apache::run::run("return $answervar",$safeeval,1);
       my $unit=&Apache::run::run("{$$parstack['-1'];".'return $unit}',$safeeval);        if (!defined($answers[0])) { $answers[0]=$answervar; } else {
          &Apache::lonxml::debug("answers is $#answers :$answers[0]:");
         }
         my $formatvar=&Apache::lonxml::get_param('format',$parstack,$safeeval);
         my (@formats)=&Apache::run::run("return $formatvar",$safeeval,1);
         if (!defined($formats[0])) { $formats[0]=$formatvar; }
   
         my $unit=&Apache::lonxml::get_param('unit',$parstack,$safeeval);
   
       $result="<br></br>The computer got ";        $result="<br></br>The computer got ";
       my $answer;  
       foreach $answer (@answers) { $result.="$answer,"; }        for (my $i=0; $i <= $#answers; $i++) {
    my $answer=$answers[$i];
    my $format;
    if ($#formats > 0) {
     $format=$formats[$i];
    } else {
     $format=$formats[0];
    }
    if ((defined($format)) && ($format ne '')) {
     &Apache::lonxml::debug("formatting with :$format: answer :$answer:");
     $result.=sprintf('%.'.$format,$answer).',';
    } else {
     &Apache::lonxml::debug("no format answer :$answer:");
     $result.="$answer,";
    }
         }
       chop $result;        chop $result;
       $result.=" $unit.<br></br>";        $result.=" $unit.<br></br>";
     }      }
Line 126  sub end_numericalresponse { Line 170  sub end_numericalresponse {
   return $result;    return $result;
 }  }
   
   sub start_stringresponse {
     return start_numericalresponse(@_);
   }
   
   sub end_stringresponse {
     return end_numericalresponse(@_);
   }
   
 1;  1;
 __END__  __END__
     
Removed from v.1.33  
changed lines
  Added in v.1.41

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