[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.64 and 1.87

version 1.64, 2002/10/04 06:35:28 version 1.87, 2003/04/07 22:44:32
Line 46  sub end_caparesponse { Line 46  sub end_caparesponse {
   if ( $target eq 'grade' ) {    if ( $target eq 'grade' ) {
     if ( defined $ENV{'form.submitted'}) {      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]/) {
  my $id = $Apache::inputtags::response['-1'];   my $id = $Apache::inputtags::response['-1'];
  my $previous= &Apache::response::check_for_previous($response,$id,$response);   my $previous= &Apache::response::check_for_previous($response,$id,$response);
Line 85  sub start_numericalresponse { Line 85  sub start_numericalresponse {
     $result.=&Apache::edit::tag_start($target,$token);      $result.=&Apache::edit::tag_start($target,$token);
     $result.=&Apache::edit::text_arg('Answer:','answer',$token);      $result.=&Apache::edit::text_arg('Answer:','answer',$token);
     if ($token->[1] eq 'numericalresponse') {      if ($token->[1] eq 'numericalresponse') {
       $result.=&Apache::edit::text_arg('Unit:','unit',$token,5);        $result.=&Apache::edit::text_arg('Unit:','unit',$token,5).
       $result.=&Apache::edit::text_arg('Format:','format',$token,4);                           &Apache::loncommon::help_open_topic('Physical_Units');
         $result.=&Apache::edit::text_arg('Format:','format',$token,4).
                 &Apache::loncommon::help_open_topic('Numerical_Response_Format');
     } elsif ($token->[1] eq 'stringresponse') {      } elsif ($token->[1] eq 'stringresponse') {
       $result.=&Apache::edit::select_arg('Type:','type',        $result.=&Apache::edit::select_arg('Type:','type',
  ['cs','ci','mc'],$token);   [['cs','Case Sensitive'],['ci','Case Insensitive'],
     ['mc','Case Insensitive, Any Order']],$token);
     } elsif ($token->[1] eq 'formularesponse') {      } elsif ($token->[1] eq 'formularesponse') {
       $result.=&Apache::edit::text_arg('Sample Points:','samples',$token,40);        $result.=&Apache::edit::text_arg('Sample Points:','samples',$token,40).
                &Apache::loncommon::help_open_topic('Formula_Response_Sampling');
     }      }
     $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') {
Line 112  sub start_numericalresponse { Line 116  sub start_numericalresponse {
     }      }
   } elsif ($target eq 'meta') {    } elsif ($target eq 'meta') {
     $result=&Apache::response::meta_package_write('numericalresponse');      $result=&Apache::response::meta_package_write('numericalresponse');
     } elsif ($target eq 'answer' || $target eq 'grade') {
         &Apache::response::reset_params();
   }    }
   return $result;    return $result;
 }  }
Line 119  sub start_numericalresponse { Line 125  sub start_numericalresponse {
 sub end_numericalresponse {  sub end_numericalresponse {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $result = '';    my $result = '';
     if (!$Apache::lonxml::default_homework_loaded) {
         &Apache::lonxml::default_homework_load($safeeval);
     }
   if ( $target eq 'grade' ) {    if ( $target eq 'grade' ) {
     if ( defined $ENV{'form.submitted'}) {      if ( defined $ENV{'form.submitted'}) {
       &Apache::response::setup_params($$tagstack[-1]);        &Apache::response::setup_params($$tagstack[-1]);
       $safeeval->share_from('capa',['&caparesponse_capa_check_answer']);        $safeeval->share_from('capa',['&caparesponse_capa_check_answer']);
       my $partid = $Apache::inputtags::part;        my $partid = $Apache::inputtags::part;
       my $id = $Apache::inputtags::response['-1'];        my $response = &Apache::response::getresponse();
       my $response = $ENV{'form.HWVAL'.$id};  
       if ( $response =~ /[^\s]/) {        if ( $response =~ /[^\s]/) {
  my %previous = &Apache::response::check_for_previous($response,$partid,$id);   my %previous = &Apache::response::check_for_previous($response,$partid,$id);
  $Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response;   $Apache::lonhomework::results{"resource.$partid.$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>");
  $response =~ s/\\/\\\\/g;   if ($Apache::lonhomework::type eq 'exam') {
  $response =~ s/\'/\\\'/g;      
  &Apache::lonxml::debug("current $response");   } else {
  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[-1];
  }      foreach my $key (keys(%Apache::inputtags::params)) {
  if ($$tagstack[-1] eq 'formularesponse') {   $expression.= ';my $'. #'
   $expression.=';my $type="fml";';      $key.'="'.$Apache::inputtags::params{$key}.'"';
  } elsif ($$tagstack[-1] eq 'numericalresponse') {      }
   $expression.=';my $type="float";';      if ($$tagstack[-1] eq 'formularesponse') {
    $expression.=';my $type="fml";';
       } elsif ($$tagstack[-1] eq 'numericalresponse') {
    $expression.=';my $type="float";';
       }
       $expression.="');";
       $result = &Apache::run::run($expression,$safeeval);
       my ($awards) = split /:/ , $result;
       my ($ad) = &Apache::inputtags::finalizeawards(split /,/ , $awards);
  }   }
  $expression.="');";  
  $result = &Apache::run::run($expression,$safeeval);  
  my ($awards) = split /:/ , $result;  
  my ($ad) = &Apache::inputtags::finalizeawards(split /,/ , $awards);  
  &Apache::response::handle_previous(\%previous,$ad);   &Apache::response::handle_previous(\%previous,$ad);
  $Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad;   $Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad;
  &Apache::lonxml::debug("$expression");   &Apache::lonxml::debug("$expression");
Line 157  sub end_numericalresponse { Line 169  sub end_numericalresponse {
       }        }
     }      }
   } elsif ($target eq 'web' || $target eq 'tex') {    } elsif ($target eq 'web' || $target eq 'tex') {
     if ($Apache::lonhomework::type ne 'exam') {  
       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" ) {
Line 170  sub end_numericalresponse { Line 181  sub end_numericalresponse {
  if ($target eq 'web') {   if ($target eq 'web') {
   $result="<br />The correct answer is ";    $result="<br />The correct answer is ";
         } elsif ($target eq 'tex') {          } elsif ($target eq 'tex') {
   $result='\vskip 0 mm The correct answer is \\texttt{';    #$result='\vskip 0 mm The correct answer is \\texttt{';
         }          }
  for (my $i=0; $i <= $#answers; $i++) {   for (my $i=0; $i <= $#answers; $i++) {
    my $answer=$answers[$i];     my $answer=$answers[$i];
Line 188  sub end_numericalresponse { Line 199  sub end_numericalresponse {
      &Apache::lonxml::debug("no format answer :$answer:");       &Apache::lonxml::debug("no format answer :$answer:");
      $formatted="$answer,";       $formatted="$answer,";
    }     }
    if ($target eq 'tex') {$formatted=&Apache::lonxml::latex_special_symbols($formatted);}  
      $result.=$formatted;     if ($target eq 'tex') {
            }         $formatted='';
          #$formatted=&Apache::lonxml::latex_special_symbols($formatted);
      }
      $result.=$formatted;
          }
    chop $result;     chop $result;
    if ($target eq 'web') {     if ($target eq 'web') {
      $result.=" $unit.<br />";       $result.=" $unit.<br />";
    } elsif ($target eq 'tex') {     } elsif ($target eq 'tex') {
      $result.=&Apache::lonxml::latex_special_symbols($unit);       #$result.=&Apache::lonxml::latex_special_symbols($unit);
      $result.="}. \\vskip 0 mm ";       #$result.="}. \\vskip 0 mm ";
    }     }
        }         }
     } else {        if ($Apache::lonhomework::type eq 'exam') {
       my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);        my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);
  my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,$safeeval);   my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,$safeeval);
  my $unit=&Apache::lonxml::get_param_var('unit',$parstack,$safeeval);   my $unit=&Apache::lonxml::get_param_var('unit',$parstack,$safeeval);
Line 209  sub end_numericalresponse { Line 224  sub end_numericalresponse {
  my @powers = (1.0,2.0,3.0,4.0,5.0,6.0,7.0,8.0); #default values for powers   my @powers = (1.0,2.0,3.0,4.0,5.0,6.0,7.0,8.0); #default values for powers
  my $factors_number = 5; #default values for number of factors   my $factors_number = 5; #default values for number of factors
  my $powers_number = 8; #default values for number of powers   my $powers_number = 8; #default values for number of powers
  my $symb;  
  if ($ENV{'form.symb'}=~/___\d+___/) {$symb=$ENV{'form.symb'};} else {$symb=$ENV{'request.symb'};}   &Apache::response::setrandomnumber();
  my $randomseed = srand(&Apache::lonnet::rndseed($symb,$ENV{'request.course.id'},   my $ind=&Math::Random::random_uniform_integer(1,0,$#powers);
                                                               $ENV{'user.domain'},$ENV{'user.name'}));  
  my $ind=1+int(rand()*($factors_number-1));  
  my $factor = $factors[$ind];  
  $ind=1+int(rand()*($powers_number-1));  
  my $power = $powers[$ind];   my $power = $powers[$ind];
    $ind=&Math::Random::random_uniform_integer(1,0,$#factors);
    my $factor = $factors[$ind];
  for ($ind=0;$ind<$number_of_bubbles;$ind++) {   for ($ind=0;$ind<$number_of_bubbles;$ind++) {
     $bubbles_values[$ind] = $answers[0]*$factor**($power-$powers[$powers_number-$ind-1]);      $bubbles_values[$ind] = $answers[0]*($factor**($power-$powers[$#powers-$ind]));
  }       }
  my @alphabet = ('A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P',   my @alphabet=('A'..'Z');
  'Q','R','S','T','U','V','W','X','Y','Z');  
         if ($target eq 'web') {          if ($target eq 'web') {
     if ($$tagstack[-1] eq 'numericalresponse') {
       my $id=$Apache::inputtags::response[-1];
       if ($unit=~/\S/) {$result.=' (in '.$unit.')<br /><br />';}
     $result.= '<table border="1"><tr>';      $result.= '<table border="1"><tr>';
     for ($ind=0;$ind<$number_of_bubbles;$ind++) {      for ($ind=0;$ind<$number_of_bubbles;$ind++) {
  my $ans;   my $ans;
Line 241  sub end_numericalresponse { Line 256  sub end_numericalresponse {
     }      }
     $ans = sprintf('%.'.$format,$bubbles_values[$ind]);      $ans = sprintf('%.'.$format,$bubbles_values[$ind]);
  }   }
     $result.='<td>'.$alphabet[$ind].': '.$ans.'</td>';      $result.='<td><input type="radio" name="HWVAL_'.$id.'" value="'.$ans.'"><b>'.$alphabet[$ind].'</b>: '.$ans.'</td>';
     }      }
     $result.='</tr></table>';      $result.='</tr></table>';
     } elsif ($$tagstack[-1] eq 'formularesponse') {
       $result.= '<br /><br /><font color="red"><textarea name="formulainput" rows="4" cols="50"> </textarea></font> <br /><br />';
     }
  } elsif ($target eq 'tex') {   } elsif ($target eq 'tex') {
     my $max_val = 0;   if (defined $unit and $Apache::lonhomework::type eq 'exam') {
     if ($formats[0]=~m/^(\d+)E([^\d]*)(\d*)$/) {     $result.=' \textit{(in} \verb|'.$unit.'|\textit{)} ';
  $max_val=$1+$2+4;           }
     } else {   if ($$tagstack[-1] eq 'numericalresponse') {
  $max_val=5;       my $max_val = 0;
     }       if ($formats[0]=~m/^(\d+)E([^\d]*)(\d*)$/) {
     $max_val = int(90/(($max_val+6)*2));   $max_val=$1+$2+4;
             my $celllength = 90/$max_val-12;       } else {
     my @table_range = ();   $max_val=4;
     my $number_of_tables = int($number_of_bubbles/$max_val);       }
     for (my $i=0;$i<$number_of_tables;$i++) {push @table_range,$max_val;}       $max_val = int(0.9*$ENV{'form.textwidth'}/(($max_val+6)*2));
     if ($number_of_bubbles % $max_val != 0) {   my $celllength = 0.9*$ENV{'form.textwidth'}/$max_val-10;
  $number_of_tables++;       my @table_range = ();
  push @table_range,($number_of_bubbles % $max_val);       my $number_of_tables = int($number_of_bubbles/$max_val);
     }   for (my $i=0;$i<$number_of_tables;$i++) {push @table_range,$max_val;}
     my $j=0;       if ($number_of_bubbles % $max_val != 0) {
     my $cou=0;      $number_of_tables++;
     $result.='\vskip 2 mm \noindent ';      push @table_range,($number_of_bubbles % $max_val);
     for (my $i=0;$i<$number_of_tables;$i++) {  
  $result.='\vskip 0 mm \noindent \begin{tabular}{|';  
  for ($ind=0;$ind<$table_range[$j];$ind++) {  
     $result.='lp{'.$celllength.' mm}|';  
  }   }
  $result.='}\hline';       my $j=0;
  for ($ind=$cou;$ind<$cou+$table_range[$j];$ind++) {       my $cou=0;
     my $ans;       $result.='\vskip -1 mm \noindent \begin{enumerate}\item[\textbf{'.$Apache::lonxml::counter.'}.]';
     if ($formats[0] ne '') {       for (my $i=0;$i<$number_of_tables;$i++) {
  $ans = sprintf('%.'.$formats[0],$bubbles_values[$ind]);   $result.='\vskip -1 mm \noindent \begin{tabular}{';
     } else {   for ($ind=0;$ind<$table_range[$j];$ind++) {
  my $badans = $bubbles_values[$ind];       $result.='lp{'.$celllength.' mm}';
  my $format = '';    }
  #What is the number? (integer,decimal,floating point)   $result.='}';
  if ($badans=~/^(\d*\.?\d*)(E|e)(\d*)$/) {   for ($ind=$cou;$ind<$cou+$table_range[$j];$ind++) {
     $format = 'e'.$2;       my $ans;
  } elsif ($badans=~/^(\d*)\.(\d*)$/) {       if ($formats[0] ne '') {
     $format = '4f';   $ans = sprintf('%.'.$formats[0],$bubbles_values[$ind]);
  } elsif ($badans=~/^(\d*)$/) {   if ($ans =~ m/([0-9\.\-\+]+)E([0-9\-\+]+)/ ) {
     $format = 'd';       my $number = $1;
  }       my $power = $2;
  $ans = sprintf('%.'.$format,$bubbles_values[$ind]);       $power=~s/^\+//;
     }       $power=~s/^(-?)0+(\d+)//;
     $result.=' '.$alphabet[$ind].': & '.$ans.' ';       $ans=$number.'$\times 10^{'.$1.$2.'}$'; #'stupidemacs
     if ($ind != $cou+$table_range[$j]-1) {$result.=' & ';}   } 
  }       } else {
  $cou += $table_range[$j];   my $badans = $bubbles_values[$ind];
  $j++;   my $format = ''; 
  $result.='\\\\\hline\end{tabular}\vskip 0 mm ';   #What is the number? (integer,decimal,floating point)
     }       if ($badans=~/^(\d*\.?\d*)(E|e)(\d*)$/) {
        $format = 'e'.$2;
    } elsif ($badans=~/^(\d*)\.(\d*)$/) {
        $format = '4f';
    } elsif ($badans=~/^(\d*)$/) {
        $format = 'd';
    }
    $ans = sprintf('%.'.$format,$bubbles_values[$ind]);
    if ($ans =~ m/([0-9\.\-\+]+)E([0-9\-\+]+)/ ) {
        my $number = $1;
        my $power = $2;
        $power=~s/^\+//;
        $power=~s/^(-?)0+(\d+)//;
        $ans=$number.'$\times 10^{'.$1.$2.'}$'; #'stupidemacs
    } 
        }
        $result.='\hskip -3 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$\hskip -2 mm & {\small '.$ans.'} ';
        if ($ind != $cou+$table_range[$j]-1) {$result.=' & ';}
    }
    $cou += $table_range[$j];
    $j++;
    $result.='\\\\\end{tabular}\vskip 0 mm ';    
        }
        $result.='\end{enumerate}';
        &Apache::lonxml::increment_counter();
            } else {
        $result.='\fbox{\fbox{\parbox{\textwidth-5mm}{\strut\\\\\strut\\\\\strut\\\\\strut\\\\}}}';
       my $id = $Apache::inputtags::part;
       my $weight = &Apache::lonnet::EXT("resource.$id.weight");
               my $repetition = int $weight/9;
       if ($weight % 9 != 0) {$repetition++;} 
         $result.='\begin{enumerate}';
         for (my $i=0;$i<$repetition;$i++) {
    $result.='\item[\textbf{'.$Apache::lonxml::counter.'}.]\textit{Leave blank on scoring form}\vskip 0 mm';
    &Apache::lonxml::increment_counter();
         }
         $result.= '\end{enumerate}';
       }
  }   }
     }      }
   } elsif ($target eq 'edit') {    } elsif ($target eq 'edit') {
     $result.='</td></tr>'.&Apache::edit::end_table;      $result.='</td></tr>'.&Apache::edit::end_table;
   } elsif ($target eq 'answer') {    } elsif ($target eq 'answer' || $target eq 'analyze') {
   
     &Apache::response::setup_params($$tagstack[-1]);        my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
     my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);        if ($target eq 'analyze') {
     my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,$safeeval);    push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id);
     my $unit=&Apache::lonxml::get_param_var('unit',$parstack,$safeeval);    $Apache::lonhomework::analyze{"$part_id.type"} = $$tagstack[-1];
     my $type=&Apache::lonxml::get_param('type',$parstack,$safeeval);        }
         &Apache::response::setup_params($$tagstack[-1]);
         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($$tagstack[-1]);        if ($target eq 'answer') {
     for(my $i=0;$i<=$#answers;$i++) {    $result.=&Apache::response::answer_header($$tagstack[-1]);
       my $ans=$answers[$i];  
       my $fmt;  
       if (@formats) {  
  if ($#formats) {  
   $fmt=$formats[$i];  
  } else {  
   $fmt=$formats[0];  
  }  
       }        }
       my ($high,$low);        for(my $i=0;$i<=$#answers;$i++) {
       if ($Apache::inputtags::params{'tol'}) {    my $ans=$answers[$i];
  ($high,$low)=&get_tolrange($ans,$Apache::inputtags::params{'tol'});    my $fmt;
       }    if (@formats) {
       my ($sighigh,$siglow);        if ($#formats) {
       if ($Apache::inputtags::params{'sig'}) {    $fmt=$formats[$i];
  ($sighigh,$siglow)=&get_sigrange($Apache::inputtags::params{'sig'});        } else {
     $fmt=$formats[0];
         }
     }
     my ($high,$low);
     if ($Apache::inputtags::params{'tol'}) {
         ($high,$low)=&get_tolrange($ans,$Apache::inputtags::params{'tol'});
     }
     my ($sighigh,$siglow);
     if ($Apache::inputtags::params{'sig'}) {
         ($sighigh,$siglow)=&get_sigrange($Apache::inputtags::params{'sig'});
     }
     if ($fmt) {
         $ans = sprintf('%.'.$fmt,$ans);
         if ($high) {
     $high = sprintf('%.'.$fmt,$high); $low = sprintf('%.'.$fmt,$low);
         }
     }
     if ($target eq 'answer') {
         if ($high) { $ans.=' ['.$low.','.$high.']'; }
         if ($sighigh) { $ans.= " Sig <i>$siglow - $sighigh</i>"; }
         $result.=&Apache::response::answer_part($$tagstack[-1],$ans);
     } elsif ($target eq 'analyze') {
         push (@{ $Apache::lonhomework::analyze{"$part_id.answer"} },
       $ans);
         if ($high) {
     push (@{ $Apache::lonhomework::analyze{"$part_id.ans_high"} }, $high);
     push (@{ $Apache::lonhomework::analyze{"$part_id.ans_low"} }, $low);
         }
     }
       }        }
       if ($fmt) {        if ($unit) {
  $ans = sprintf('%.'.$fmt,$ans);    if ($target eq 'answer') {
  if ($high) {        $result.=&Apache::response::answer_part($$tagstack[-1],
   $high = sprintf('%.'.$fmt,$high); $low = sprintf('%.'.$fmt,$low);        "Unit: <b>$unit</b>");
  }    } elsif ($target eq 'analyze') {
         push (@{ $Apache::lonhomework::analyze{"$part_id.unit"} },
       $unit);
     }
       }        }
       if ($high) { $ans.=' ['.$low.','.$high.'] '; }        if ($type || $token->[1] eq 'stringresponse') {
       if ($sighigh) { $ans.= "Sig <i>$siglow - $sighigh</i>"; }    my $string='Case Insensitive';
       $result.=&Apache::response::answer_part($$tagstack[-1],$ans);    if ($type eq 'mc') {
     }        $string='Multiple Choice';
     if ($unit) {    } elsif ($type eq 'cs') {
       $result.=&Apache::response::answer_part($$tagstack[-1],"Unit: <b>$unit</b>");        $string='Case Sensitive';
     }    } elsif ($type eq 'ci') {
     if ($type || $token->[1] eq 'stringresponse') {        $string='Case Insensitive';
       my $string='Case Insensitive';    } elsif ($type eq 'fml') {
       if ($type eq 'mc') {        $string='Formula';
  $string='Multiple Choice';    }
       } elsif ($type eq 'cs') {    if ($target eq 'answer') {
  $string='Case Sensitive';        $result.=&Apache::response::answer_part($$tagstack[-1],
       } elsif ($type eq 'ci') {        '<b>'.$string.'</b>');
  $string='Case Insensitive';    } elsif ($target eq 'analyze') {
       } elsif ($type eq 'fml') {        push (@{ $Apache::lonhomework::analyze{"$part_id.type"} },
  $string='Formula';      $type);
     }
         }
         if ($$tagstack[-1] eq 'formularesponse' && $target eq 'answer') {
     my $samples=&Apache::lonxml::get_param('samples',$parstack,$safeeval);
     $result.=&Apache::response::answer_part($$tagstack[-1],$samples);
         }
         if ($target eq 'answer') {
     $result.=&Apache::response::answer_footer($$tagstack[-1]);
       }        }
       $result.=&Apache::response::answer_part($$tagstack[-1],  
       '<b>'.$string.'</b>');  
     }  
     if ($$tagstack[-1] eq 'formularesponse') {  
       my $samples=&Apache::lonxml::get_param('samples',$parstack,$safeeval);  
       $result.=&Apache::response::answer_part($$tagstack[-1],$samples);  
     }  
     $result.=&Apache::response::answer_footer($$tagstack[-1]);  
   }    }
   &Apache::response::end_response;    &Apache::response::end_response;
   return $result;    return $result;
Removed from v.1.64  
changed lines
  Added in v.1.87

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