version 1.25, 2003/10/10 16:47:25
|
version 1.31, 2003/11/15 06:28:02
|
Line 25
|
Line 25
|
# |
# |
# http://www.lon-capa.org/ |
# http://www.lon-capa.org/ |
# |
# |
# 2/21 Guy |
|
|
|
package Apache::matchresponse; |
package Apache::matchresponse; |
use strict; |
use strict; |
Line 66 sub start_matchresponse {
|
Line 65 sub start_matchresponse {
|
$safeeval,'max', |
$safeeval,'max', |
'randomize'); |
'randomize'); |
if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } |
if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } |
|
} elsif ($target eq 'analyze') { |
|
my $part_id="$Apache::inputtags::part.$id"; |
|
push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id); |
} |
} |
return $result; |
return $result; |
} |
} |
Line 121 sub end_itemgroup {
|
Line 123 sub end_itemgroup {
|
@names=&Apache::response::whichorder($#names+1,$randomize,0, |
@names=&Apache::response::whichorder($#names+1,$randomize,0, |
\%Apache::response::itemgroup); |
\%Apache::response::itemgroup); |
} |
} |
|
if ($target eq 'analyze') { |
|
my $partid="$Apache::inputtags::part.$Apache::inputtags::response[-1]"; |
|
push (@{ $Apache::lonhomework::analyze{"$partid.items"} }, @names); |
|
} |
my %letter_name_map; |
my %letter_name_map; |
my %name_letter_map; |
my %name_letter_map; |
my @alphabet=('A'..'Z'); |
my @alphabet=('A'..'Z'); |
Line 161 sub end_itemgroup {
|
Line 167 sub end_itemgroup {
|
sub start_item { |
sub start_item { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my $result=''; |
my $result=''; |
if ($target eq 'web' || $target eq 'tex') { |
if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') { |
&Apache::lonxml::startredirection; |
&Apache::lonxml::startredirection; |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
my $randomize=&Apache::lonxml::get_param('randomize',$parstack, |
my $randomize=&Apache::lonxml::get_param('randomize',$parstack, |
Line 187 sub end_item {
|
Line 193 sub end_item {
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my $text =''; |
my $text =''; |
my $result = ''; |
my $result = ''; |
if ($target eq 'web' || $target eq 'tex') { |
if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') { |
$text=&Apache::lonxml::endredirection; |
$text=&Apache::lonxml::endredirection; |
} |
} |
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || |
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || |
$target eq 'edit' || $target eq 'tex') { |
$target eq 'edit' || $target eq 'tex' || $target eq 'analyze') { |
my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval); |
my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval); |
my $location=&Apache::lonxml::get_param('location',$parstack, |
my $location=&Apache::lonxml::get_param('location',$parstack, |
$safeeval); |
$safeeval); |
Line 236 sub start_foilgroup {
|
Line 242 sub start_foilgroup {
|
sub end_foilgroup { |
sub end_foilgroup { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my $result; |
my $result; |
if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || $target eq 'tex') { |
if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || $target eq 'tex' || $target eq 'analyze') { |
my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2'); |
my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2'); |
my $randomize = &Apache::lonxml::get_param('randomize',$parstack, |
my $randomize = &Apache::lonxml::get_param('randomize',$parstack, |
$safeeval,'-2'); |
$safeeval,'-2'); |
Line 246 sub end_foilgroup {
|
Line 252 sub end_foilgroup {
|
$result=&displayanswers($max,$randomize); |
$result=&displayanswers($max,$randomize); |
} elsif ( $target eq 'grade') { |
} elsif ( $target eq 'grade') { |
&grade_response($max,$randomize); |
&grade_response($max,$randomize); |
|
} elsif ( $target eq 'analyze') { |
|
my @shown=&whichfoils($max,$randomize); |
|
&Apache::response::analyze_store_foilgroup(\@shown, |
|
['text','value','location']); |
|
#FIXME need to store options in some way |
} |
} |
&Apache::lonxml::increment_counter(&getfoilcounts($max)); |
&Apache::lonxml::increment_counter(&getfoilcounts($max)); |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
Line 254 sub end_foilgroup {
|
Line 265 sub end_foilgroup {
|
return $result; |
return $result; |
} |
} |
|
|
|
sub whichfoils { |
|
my ($max,$randomize)=@_; |
|
return &Apache::response::whichorder(&getfoilcounts($max), |
|
$randomize, |
|
&Apache::response::showallfoils(), |
|
\%Apache::response::foilgroup); |
|
} |
|
|
sub displayanswers { |
sub displayanswers { |
my ($max,$randomize,@opt)=@_; |
my ($max,$randomize,@opt)=@_; |
if (!defined(@{ $Apache::response::foilgroup{'names'} })) { return; } |
if (!defined(@{ $Apache::response::foilgroup{'names'} })) { return; } |
Line 293 sub grade_response {
|
Line 312 sub grade_response {
|
%letter_name_map= |
%letter_name_map= |
%{ $Apache::response::itemgroup{'letter_name_map'} }; |
%{ $Apache::response::itemgroup{'letter_name_map'} }; |
} |
} |
|
my @items; |
foreach my $name (@whichfoils) { |
foreach my $name (@whichfoils) { |
my $response = $ENV{'form.HWVAL_'.$Apache::inputtags::response['-1'].":$temp"}; |
my $response = &Apache::response::getresponse($temp); |
|
push(@items,$response); |
my $responsename = $letter_name_map{$response}; |
my $responsename = $letter_name_map{$response}; |
$responsehash{$name}=$responsename; |
|
my $value=$Apache::response::foilgroup{$name.'.value'}; |
my $value=$Apache::response::foilgroup{$name.'.value'}; |
if ( $response =~ /[^\s]/) { |
if ( $response =~ /[^\s]/) { |
|
$responsehash{$name}=$responsename; |
&Apache::lonxml::debug("submitted a $response for $value<br />\n"); |
&Apache::lonxml::debug("submitted a $response for $value<br />\n"); |
if ($value eq $responsename) { |
if ($value eq $responsename) { |
$grade{$name}='1'; $right++; |
$grade{$name}='1'; $right++; |
Line 313 sub grade_response {
|
Line 334 sub grade_response {
|
my $part=$Apache::inputtags::part; |
my $part=$Apache::inputtags::part; |
my $id = $Apache::inputtags::response['-1']; |
my $id = $Apache::inputtags::response['-1']; |
my $responsestr=&Apache::lonnet::hash2str(%responsehash); |
my $responsestr=&Apache::lonnet::hash2str(%responsehash); |
|
my $itemstr =&Apache::lonnet::array2str(@items); |
my $gradestr =&Apache::lonnet::hash2str(%grade); |
my $gradestr =&Apache::lonnet::hash2str(%grade); |
my %previous =&Apache::response::check_for_previous($responsestr, |
my %previous=&Apache::response::check_for_previous($responsestr,$part,$id); |
$part,$id); |
|
&Apache::lonxml::debug("Got $right right and $wrong wrong, and $ignored were ignored "); |
&Apache::lonxml::debug("Got $right right and $wrong wrong, and $ignored were ignored "); |
my $ad; |
my $ad; |
if ($wrong==0 && $ignored==0) { |
if ($wrong==0 && $ignored==0) { |
Line 331 sub grade_response {
|
Line 352 sub grade_response {
|
} |
} |
$Apache::lonhomework::results{"resource.$part.$id.submission"}= |
$Apache::lonhomework::results{"resource.$part.$id.submission"}= |
$responsestr; |
$responsestr; |
|
$Apache::lonhomework::results{"resource.$part.$id.submissionitems"}= |
|
$itemstr; |
$Apache::lonhomework::results{"resource.$part.$id.submissiongrading"}= |
$Apache::lonhomework::results{"resource.$part.$id.submissiongrading"}= |
$gradestr; |
$gradestr; |
$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$ad; |
$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$ad; |
Line 358 sub displayfoils {
|
Line 381 sub displayfoils {
|
\%Apache::response::foilgroup); |
\%Apache::response::foilgroup); |
my $part=$Apache::inputtags::part; |
my $part=$Apache::inputtags::part; |
my $solved=$Apache::lonhomework::history{"resource.$part.solved"}; |
my $solved=$Apache::lonhomework::history{"resource.$part.solved"}; |
my $status=$Apache::inputtags::status[-1]; |
|
my %letter_name_map; |
my %letter_name_map; |
if (defined(%{ $Apache::response::itemgroup{'letter_name_map'} })) { |
if (defined(%{ $Apache::response::itemgroup{'letter_name_map'} })) { |
%letter_name_map= |
%letter_name_map= |
Line 422 sub displayfoils {
|
Line 444 sub displayfoils {
|
$question.='<br />'.$text."\n"; |
$question.='<br />'.$text."\n"; |
} |
} |
if ($Apache::lonhomework::type eq 'exam') { |
if ($Apache::lonhomework::type eq 'exam') { |
$question.=&Apache::optionresponse::webbubbles(\@used_letters,\@used_letters,$temp); |
$question.=&Apache::optionresponse::webbubbles(\@used_letters,\@used_letters,$temp,$last_letter); |
} |
} |
} else { |
} else { |
if ($Apache::lonhomework::type eq 'exam') { |
if ($Apache::lonhomework::type eq 'exam') { |
Line 487 sub end_conceptgroup {
|
Line 509 sub end_conceptgroup {
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
$Apache::matchresponse::conceptgroup=0; |
$Apache::matchresponse::conceptgroup=0; |
my $result=''; |
my $result=''; |
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') { |
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || |
#if not there aren't any foils to display and thus no question |
$target eq 'tex' || $target eq 'analyze') { |
if (defined(@{ $Apache::response::conceptgroup{'names'} })) { |
&Apache::response::pick_foil_for_concept($target, |
my @names = @{ $Apache::response::conceptgroup{'names'} }; |
['value','text','location'], |
my $pick=int(&Math::Random::random_uniform() * ($#names+1)); |
\%Apache::hint::match, |
my $name=$names[$pick]; |
$parstack,$safeeval); |
push @{ $Apache::response::foilgroup{'names'} }, $name; |
|
$Apache::response::foilgroup{"$name.value"} = |
|
$Apache::response::conceptgroup{"$name.value"}; |
|
$Apache::response::foilgroup{"$name.text"} = |
|
$Apache::response::conceptgroup{"$name.text"}; |
|
$Apache::response::foilgroup{"$name.location"} = |
|
$Apache::response::conceptgroup{"$name.location"}; |
|
my $concept = &Apache::lonxml::get_param('concept',$parstack, |
|
$safeeval); |
|
$Apache::response::foilgroup{"$name.concept"} = $concept; |
|
&Apache::lonxml::debug("Selecting $name in $concept"); |
|
if ($target eq 'web') { |
|
my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]"; |
|
push(@{ $Apache::hint::match{"$part_id.concepts"} }, |
|
$concept); |
|
$Apache::hint::match{"$part_id.concept.$concept"}= |
|
$Apache::response::conceptgroup{'names'}; |
|
} |
|
} |
|
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result=&Apache::edit::end_table(); |
$result=&Apache::edit::end_table(); |
} |
} |
Line 526 sub insert_conceptgroup {
|
Line 529 sub insert_conceptgroup {
|
sub start_foil { |
sub start_foil { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my $result=''; |
my $result=''; |
if ($target eq 'web' || $target eq 'tex') { |
if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') { |
&Apache::lonxml::startredirection; |
&Apache::lonxml::startredirection; |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result=&Apache::edit::tag_start($target,$token,"Foil"); |
$result=&Apache::edit::tag_start($target,$token,"Foil"); |
Line 558 sub end_foil {
|
Line 561 sub end_foil {
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my $text =''; |
my $text =''; |
my $result = ''; |
my $result = ''; |
if ($target eq 'web' || $target eq 'tex') { |
if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') { |
$text=&Apache::lonxml::endredirection; |
$text=&Apache::lonxml::endredirection; |
} |
} |
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') { |
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || |
|
$target eq 'tex' || $target eq 'analyze') { |
my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval); |
my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval); |
if ($value ne 'unused') { |
if ($value ne 'unused') { |
my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval); |
my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval); |