Diff for /loncom/homework/caparesponse/caparesponse.pm between versions 1.23 and 1.44

version 1.23, 2001/01/03 00:14:47 version 1.44, 2001/10/01 20:18:31
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','formularesponse'));
 }  }
   
 sub start_caparesponse {  sub start_caparesponse {
   my ($target,$token,$parstack,$parser,$safeeval)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   my $id = &Apache::response::start_response($parstack,$safeeval);    my $id = &Apache::response::start_response($parstack,$safeeval);
   return '';    return '';
 }  }
   
 sub end_caparesponse {  sub end_caparesponse {
   my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $result = '';    my $result = '';
   if ( $target eq 'grade' ) {    if ( $target eq 'grade' ) {
     if ( defined $ENV{'form.submit'}) {      if ( defined $ENV{'form.submitted'}) {
       $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 $response = $ENV{'form.HWVAL'.$Apache::inputtags::response['-1']};
       if ( $response =~ /[^\s]/) {        if ( $response =~ /[^\s]/) {
Line 28  sub end_caparesponse { Line 28  sub end_caparesponse {
  if ( $previous ) {    if ( $previous ) { 
   $result = 'PREVIOUSLY_USED';    $result = 'PREVIOUSLY_USED';
  } else {   } else {
   $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$Apache::inputtags::response['-1'].submission"}=$response;    $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.submission"}=$response;
   &Apache::lonxml::debug("submitted a $response<br>\n");    &Apache::lonxml::debug("submitted a $response<br>\n");
   &Apache::lonxml::debug($$parstack[$#$parstack] . "\n<br>");    &Apache::lonxml::debug($$parstack[$#$parstack] . "\n<br>");
   my $expression="&caparesponse_check('".$response."','".    my $expression="&caparesponse_check('".$response."','".
Line 38  sub end_caparesponse { Line 38  sub end_caparesponse {
   "');";    "');";
   $result = &Apache::run::run($expression,$safeeval);    $result = &Apache::run::run($expression,$safeeval);
   my ($ad) = split /:/ , $result;    my ($ad) = split /:/ , $result;
   $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$Apache::inputtags::response['-1'].awarddetail"}=$ad;    $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}=$ad;
   &Apache::lonxml::debug("$expression");    &Apache::lonxml::debug("$expression");
   &Apache::lonxml::debug("\n<br>result:$result:$Apache::lonxml::curdepth<br>\n");    &Apache::lonxml::debug("\n<br>result:$result:$Apache::lonxml::curdepth<br>\n");
  }   }
       }        }
     }      }
   } else {    } elsif ($target eq 'web') {
     #$result .= "The correct answer is ".&Apache::run::run("{$$parstack['-1'];".'return $answer}',$safeeval)."\n";      #$result .= "The correct answer is ".&Apache::run::run("{$$parstack['-1'];".'return $answer}',$safeeval)."\n";
   }    }
   #Apache::lonxml::debug("\n<br>\nreal end caparesponse<br>\n");    #Apache::lonxml::debug("\n<br>\nreal end caparesponse<br>\n");
   &Apache::response::end_response;    &Apache::response::end_response;
   return $result;    return '';
 }  }
   
 sub start_numericalresponse {  sub start_numericalresponse {
   my ($target,$token,$parstack,$parser,$safeeval)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   my $id = &Apache::response::start_response($parstack,$safeeval);    my $id = &Apache::response::start_response($parstack,$safeeval);
   return '';    my $result;
     if ($target eq 'edit') {
       $result.=&Apache::edit::tag_start($target,$token,&Apache::lonxml::description($token));
       $result.=&Apache::edit::text_arg('Answer:','answer',$token);
       if ($token->[1] eq 'numericalresponse') {
         $result.=&Apache::edit::text_arg('Unit:','unit',$token,5);
         $result.=&Apache::edit::text_arg('Format:','format',$token,4);
       } elsif ($token->[1] eq 'stringresponse') {
         $result.=&Apache::edit::select_arg('Type:','type',
    ['cs','ci','mc'],$token)
       } elsif ($token->[1] eq 'formularesponse') {
         $result.=&Apache::edit::text_arg('Sample Points:','points',$token,40);
       }
       $result.='</td></tr><tr><td colspan="3">';
     } elsif ($target eq 'modified') {
       my $constructtag;
       if ($token->[1] eq 'numericalresponse') {
         $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
    'answer','unit','format');
       } elsif ($token->[1] eq 'stringresponse') {
         $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
    'answer','type');
       } elsif ($token->[1] eq 'formularesponse') {
         $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
    'answer','points');
       }
       if ($constructtag) {
         $result = &Apache::edit::rebuild_tag($token);
         $result.=&Apache::edit::handle_insert();
       }
     } elsif ($target eq 'meta') {
       $result=&Apache::response::meta_package_write('numericalresponse');
     }
     return $result;
 }  }
   
 sub end_numericalresponse {  sub end_numericalresponse {
   my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $result = '';    my $result = '';
   if ( $target eq 'grade' ) {    if ( $target eq 'grade' ) {
     if ( defined $ENV{'form.submit'}) {      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>");
    $response =~ s/\\/\\\\/g;
    $response =~ s/\'/\\\'/g;
    &Apache::lonxml::debug("current $response");
    my $expression="&caparesponse_check_list('".$response."','".
     $$parstack[$#$parstack];
    foreach my $key (keys(%Apache::inputtags::params)) {
     $expression.= ';my $'. #'
       $key.'="'.$Apache::inputtags::params{$key}.'"';
    }
    $expression.="');";
    $result = &Apache::run::run($expression,$safeeval);
    my ($awards) = split /:/ , $result;
    my ($ad) = &Apache::inputtags::finalizeawards(split /,/ , $awards);
    if ( $previous{'used'} && ($previous{'award'} eq $ad) ) {
     if ($previous{'last'}) {
       push(@Apache::inputtags::previous,'PREVIOUSLY_LAST');
     } else {
       push(@Apache::inputtags::previous,'PREVIOUSLY_USED');
     }
    }
    $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') {
       my $award = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"};
       my $status = $Apache::inputtags::status['-1'];
       if ($award =~ /^correct/ || $status eq "SHOW_ANSWER" ) {
         my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,
      $safeeval);
         my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,
      $safeeval);
         my $unit=&Apache::lonxml::get_param_var('unit',$parstack,$safeeval);
   
         $result="<br></br>The computer got ";
   
         for (my $i=0; $i <= $#answers; $i++) {
    my $answer=$answers[$i];
    my $format;
    if ($#formats > 0) {
     $format=$formats[$i];
  } else {   } else {
   $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$Apache::inputtags::response['-1'].submission"}=$response;    $format=$formats[0];
   &Apache::lonxml::debug("submitted a $response<br>\n");   }
   &Apache::lonxml::debug($$parstack[$#$parstack] . "\n<br>");   if ((defined($format)) && ($format ne '')) {
   my $expression="&caparesponse_check_list('".$response."','".    &Apache::lonxml::debug("formatting with :$format: answer :$answer:");
     $$parstack[$#$parstack].    $result.=sprintf('%.'.$format,$answer).',';
       ';my $tol="'.$Apache::inputtags::params{'tol'}.'"'.   } else {
       ';my $sig="'.$Apache::inputtags::params{'sig'}.'"'.    &Apache::lonxml::debug("no format answer :$answer:");
  "');";    $result.="$answer,";
   $result = &Apache::run::run($expression,$safeeval);   }
   my ($awards) = split /:/ , $result;        }
   my ($ad) = &Apache::inputtags::finalizeawards(split /,/ , $awards);        chop $result;
   $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$Apache::inputtags::response['-1'].awarddetail"}=$ad;        $result.=" $unit.<br></br>";
   &Apache::lonxml::debug("$expression");      }
   &Apache::lonxml::debug("\n<br>result:$Apache::caparesponse::result:$result:$Apache::lonxml::curdepth<br>\n");    } elsif ($target eq 'edit') {
       $result.='</td></tr>'.&Apache::edit::end_table;
     } elsif ($target eq 'answer') {
   
       my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);
       my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,$safeeval);
       my $unit=&Apache::lonxml::get_param_var('unit',$parstack,$safeeval);
       my $type=&Apache::lonxml::get_param('type',$parstack,$safeeval);
   
       $result.=&Apache::response::answer_header('numericalresponse');
       for(my $i=0;$i<=$#answers;$i++) {
         my $ans=$answers[$i];
         my $fmt;
         if (@formats) {
    if ($#formats) {
     $fmt=$formats[$i];
    } else {
     $fmt=$formats[0];
  }   }
       }        }
         if ($fmt) { $ans = sprintf('%.'.$fmt,$ans); }
         $result.=&Apache::response::answer_part('numericalresponse',$ans);
     }      }
       if ($unit) {
         $result.=&Apache::response::answer_part('numericalresponse',
         '<b>'.$unit.'</b>');
       }
       if ($type || $token->[1] eq 'stringresponse') {
         my $string='Case Insensitive';
         if ($type eq 'mc') {
    $string='Multiple Choice';
         } elsif ($type eq 'cs') {
    $string='Case Sensitive';
         } elsif ($type eq 'ci') {
    $string='Case Insensitive';
         }
         $result.=&Apache::response::answer_part('numericalresponse',
         '<b>'.$string.'</b>');
       }
       $result.=&Apache::response::answer_footer('numericalresponse');
   }    }
   &Apache::response::end_response;    &Apache::response::end_response;
   return $result;    return $result;
 }  }
   
   sub start_stringresponse {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;
     if ($target eq 'meta') {
       $result=&Apache::response::meta_package_write('stringresponse');
     } else {
       $result.=&start_numericalresponse(@_);
     }
     return $result;
   }
   
   sub end_stringresponse {
     return end_numericalresponse(@_);
   }
   
   sub start_formularesponse {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;
     if ($target eq 'meta') {
       $result=&Apache::response::meta_package_write('formularesponse');
     } else {
       $result.=&start_numericalresponse(@_);
     }
     return $result;
   }
   
   sub end_formularesponse {
     return end_numericalresponse(@_);
   }
   
 1;  1;
 __END__  __END__
     

Removed from v.1.23  
changed lines
  Added in v.1.44


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