--- loncom/homework/matchresponse.pm 2003/03/26 18:43:15 1.14 +++ loncom/homework/matchresponse.pm 2004/01/06 20:16:17 1.32 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Full matching style response # -# $Id: matchresponse.pm,v 1.14 2003/03/26 18:43:15 sakharuk Exp $ +# $Id: matchresponse.pm,v 1.32 2004/01/06 20:16:17 sakharuk Exp $ # # Copyright Michigan State University Board of Trustees # @@ -25,7 +25,6 @@ # # http://www.lon-capa.org/ # -# 2/21 Guy package Apache::matchresponse; use strict; @@ -33,9 +32,6 @@ use HTML::Entities(); use Math::Random(); use Apache::optionresponse; -my $flag_for_exam_printing = 1; -my @Items = (); - BEGIN { &Apache::lonxml::register('Apache::matchresponse',('matchresponse')); } @@ -69,6 +65,9 @@ sub start_matchresponse { $safeeval,'max', 'randomize'); 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; } @@ -90,6 +89,7 @@ sub start_itemgroup { my $result; %Apache::response::itemgroup=(); %Apache::matchresponse::itemtable=(); + if ($target eq 'edit') { $result=&Apache::edit::tag_start($target,$token); $result.=&Apache::edit::select_arg('Randomize Order:','randomize', @@ -104,7 +104,7 @@ sub start_itemgroup { $safeeval,'randomize', 'location'); if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } - } elsif ($target eq 'web') { + } elsif ($target eq 'web' or $target eq 'tex') { $Apache::matchresponse::itemtable{'location'}= &Apache::lonxml::get_param('location',$parstack,$safeeval); } @@ -115,12 +115,17 @@ sub end_itemgroup { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result; + if ($target eq 'edit') { $result=&Apache::edit::end_table(); } if (!defined(@{ $Apache::response::itemgroup{'names'} })) { return; } my @names=@{ $Apache::response::itemgroup{'names'} }; my $randomize =&Apache::lonxml::get_param('randomize',$parstack,$safeeval); if ($randomize ne 'no' ) { - @names=&whichorder($#names+1,$randomize,0, - \%Apache::response::itemgroup) + @names=&Apache::response::whichorder($#names+1,$randomize,0, + \%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 %name_letter_map; @@ -129,10 +134,9 @@ sub end_itemgroup { foreach my $name (@names) { $letter_name_map{$alphabet[$i]}=$name; $name_letter_map{$name}=$alphabet[$i]; - $Items[$i] = $alphabet[$i]; $i++; } - $Apache::response::itemgroup{'letter_name_map'}=\%letter_name_map; + $Apache::response::itemgroup{'letter_name_map'}=\%letter_name_map; $Apache::response::itemgroup{'name_letter_map'}=\%name_letter_map; if ($target eq 'web') { my $table=''; @@ -146,25 +150,24 @@ sub end_itemgroup { $table.='
'; $Apache::matchresponse::itemtable{'display'}=$table; } elsif ($target eq 'tex') { - my $table=' \\\\\\\\ \begin{tabular}{ll} '; + my $table=' \begin{description} '; my $i=0; foreach my $name (@names) { $Apache::response::itemgroup{$name.'.text'}=~s/\$\$/\$/g; - $table.=' '.$alphabet[$i].' & '. - $Apache::response::itemgroup{$name.'.text'}. - ' \\\\ '; + $table.='\item['.$alphabet[$i].'] '. + $Apache::response::itemgroup{$name.'.text'}; $i++; } - $table.=' \end{tabular} \\\\ '; + $table.=' \end{description} \strut '; $Apache::matchresponse::itemtable{'display'}=$table; - } elsif ($target eq 'edit') { $result=&Apache::edit::end_table(); } + } return $result; } sub start_item { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result=''; - if ($target eq 'web' || $target eq 'tex') { + if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') { &Apache::lonxml::startredirection; } elsif ($target eq 'edit') { my $randomize=&Apache::lonxml::get_param('randomize',$parstack, @@ -190,11 +193,11 @@ sub end_item { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $text =''; my $result = ''; - if ($target eq 'web' || $target eq 'tex') { + if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') { $text=&Apache::lonxml::endredirection; } 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 $location=&Apache::lonxml::get_param('location',$parstack, $safeeval); @@ -239,7 +242,7 @@ sub start_foilgroup { sub end_foilgroup { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; 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 $randomize = &Apache::lonxml::get_param('randomize',$parstack, $safeeval,'-2'); @@ -249,20 +252,35 @@ sub end_foilgroup { $result=&displayanswers($max,$randomize); } elsif ( $target eq 'grade') { &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)); } elsif ($target eq 'edit') { $result=&Apache::edit::end_table(); } return $result; } +sub whichfoils { + my ($max,$randomize)=@_; + return &Apache::response::whichorder(&getfoilcounts($max), + $randomize, + &Apache::response::showallfoils(), + \%Apache::response::foilgroup); +} + sub displayanswers { my ($max,$randomize,@opt)=@_; if (!defined(@{ $Apache::response::foilgroup{'names'} })) { return; } my @names = @{ $Apache::response::foilgroup{'names'} }; - my @whichfoils = &whichorder(&getfoilcounts($max),$randomize, - &Apache::response::showallfoils(), - \%Apache::response::foilgroup); + my @whichfoils = &Apache::response::whichorder(&getfoilcounts($max), + $randomize, + &Apache::response::showallfoils(), + \%Apache::response::foilgroup); my $result=&Apache::response::answer_header('matchresponse'); my %name_letter_map; if (defined(%{ $Apache::response::itemgroup{'name_letter_map'} })) { @@ -281,9 +299,10 @@ sub displayanswers { sub grade_response { my ($max,$randomize)=@_; - my (@whichfoils)=&whichorder(&getfoilcounts($max),$randomize, - &Apache::response::showallfoils(), - \%Apache::response::foilgroup); + my (@whichfoils)=&Apache::response::whichorder(&getfoilcounts($max), + $randomize, + &Apache::response::showallfoils(), + \%Apache::response::foilgroup); if (!defined($ENV{'form.submitted'})) { return; } my %responsehash; my %grade; @@ -293,12 +312,14 @@ sub grade_response { %letter_name_map= %{ $Apache::response::itemgroup{'letter_name_map'} }; } + my @items; 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}; - $responsehash{$name}=$responsename; my $value=$Apache::response::foilgroup{$name.'.value'}; if ( $response =~ /[^\s]/) { + $responsehash{$name}=$responsename; &Apache::lonxml::debug("submitted a $response for $value
\n"); if ($value eq $responsename) { $grade{$name}='1'; $right++; @@ -313,9 +334,9 @@ sub grade_response { my $part=$Apache::inputtags::part; my $id = $Apache::inputtags::response['-1']; my $responsestr=&Apache::lonnet::hash2str(%responsehash); + my $itemstr =&Apache::lonnet::array2str(@items); my $gradestr =&Apache::lonnet::hash2str(%grade); - my %previous =&Apache::response::check_for_previous($responsestr, - $part,$id); + my %previous=&Apache::response::check_for_previous($responsestr,$part,$id); &Apache::lonxml::debug("Got $right right and $wrong wrong, and $ignored were ignored "); my $ad; if ($wrong==0 && $ignored==0) { @@ -331,6 +352,8 @@ sub grade_response { } $Apache::lonhomework::results{"resource.$part.$id.submission"}= $responsestr; + $Apache::lonhomework::results{"resource.$part.$id.submissionitems"}= + $itemstr; $Apache::lonhomework::results{"resource.$part.$id.submissiongrading"}= $gradestr; $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$ad; @@ -352,12 +375,12 @@ sub displayfoils { my ($target,$max,$randomize)=@_; my $result; my $question; - my (@whichfoils)=&whichorder(&getfoilcounts($max),$randomize, - &Apache::response::showallfoils(), - \%Apache::response::foilgroup); + my (@whichfoils)=&Apache::response::whichorder(&getfoilcounts($max), + $randomize, + &Apache::response::showallfoils(), + \%Apache::response::foilgroup); my $part=$Apache::inputtags::part; my $solved=$Apache::lonhomework::history{"resource.$part.solved"}; - my $status=$Apache::inputtags::status[-1]; my %letter_name_map; if (defined(%{ $Apache::response::itemgroup{'letter_name_map'} })) { %letter_name_map= @@ -368,7 +391,7 @@ sub displayfoils { %name_letter_map= %{ $Apache::response::itemgroup{'name_letter_map'} }; } - if (($solved =~ /^correct/) || ($status eq 'SHOW_ANSWER')) { + if ( &Apache::response::show_answer() && ($target ne 'tex')) { foreach my $name (@whichfoils) { my $text=$Apache::response::foilgroup{$name.'.text'}; my $value=$Apache::response::foilgroup{$name.'.value'}; @@ -387,7 +410,8 @@ sub displayfoils { my $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"}; my %lastresponse=&Apache::lonnet::str2hash($lastresponse); my @alphabet=('A'..'Z'); - my @Items_letter = splice @alphabet, 0, $#Items + 1; + my @used_letters=sort(keys(%letter_name_map)); + my $internal_counter=$Apache::lonxml::counter; foreach my $name (@whichfoils) { my $lastopt=$lastresponse{$name}; my $last_letter=$name_letter_map{$lastopt}; @@ -400,32 +424,37 @@ sub displayfoils { } } my $option; - foreach $option (sort(keys(%letter_name_map))) { + foreach $option (@used_letters) { if ($option eq $last_letter) { if ($target ne 'tex') {$optionlist.="\n";} } else { if ($target ne 'tex') {$optionlist.="\n";} } } - if ($target ne 'tex') { + if ($target ne 'tex' && $Apache::lonhomework::type ne 'exam') { $optionlist='\n"; } my $text=$Apache::response::foilgroup{$name.'.text'}; if ($target ne 'tex') { - $question.='
'.$optionlist.$text."\n"; + if ($Apache::lonhomework::type ne 'exam') { + $question.='
'.$optionlist.$text."\n"; + } else { + $question.='
'.$text."\n"; + } if ($Apache::lonhomework::type eq 'exam') { - $question.=&Apache::optionresponse::webbubbles(\@Items_letter,\@Items); + $question.=&Apache::optionresponse::webbubbles(\@used_letters,\@used_letters,$temp,$last_letter); } } else { if ($Apache::lonhomework::type eq 'exam') { $question.=' '.$optionlist.$text."\n"; my @emptyItems = (); - for (my $i=0;$i<=$#Items;$i++) {push @emptyItems, ' ';} - $question.='\vskip -2 mm\parbox{\textwidth}{\begin{enumerate}\item[\textbf{'.$Apache::lonxml::counter.'}.]\parbox{\textwidth - 5 mm}{'.&Apache::optionresponse::bubbles(\@Items_letter,\@emptyItems).'}\end{enumerate}} \vskip -10 mm \strut '; + for (my $i=0;$i<=$#used_letters;$i++) {push @emptyItems, ' ';} + $question.='\vskip -2 mm\parbox{\textwidth}{\begin{enumerate}\item[\textbf{'.$internal_counter.'}.]\parbox{\textwidth - 5 mm}{'.&Apache::optionresponse::bubbles(\@used_letters,\@emptyItems).'}\end{enumerate}} \vskip -10 mm \strut '; + $internal_counter++; } else { - $question.=' \\\\ '.$optionlist.$text."\n"; + $question.=' '.$optionlist.$text.'\strut\\\\\strut '."\n"; } } $temp++; @@ -436,11 +465,19 @@ sub displayfoils { } elsif ($result=&itemdisplay('bottom')) { $result=$question.$result; } elsif ($result=&itemdisplay('right')) { - $result='
'.$question.''.$result. - '
'; + if ($target ne 'tex') { + $result='
'.$question.''.$result. + '
'; + } else { + $result='\begin{tabular}{p{\textwidth/2}p{\textwidth/2}}\begin{minipage}{\textwidth/2}'.$question.'\end{minipage}&\begin{minipage}{\textwidth/2}'.$result.'\end{minipage}\end{tabular}'; + } } elsif ($result=&itemdisplay('left')) { - $result='
'.$result.''.$question. - '
'; + if ($target ne 'tex') { + $result='
'.$result.''.$question. + '
'; + } else { + $result='\begin{tabular}{p{\textwidth/2}p{\textwidth/2}}\begin{minipage}{\textwidth/2}'.$result.'\end{minipage}&\begin{minipage}{\textwidth/2}'.$question.'\end{minipage}\end{tabular}'; + } } if ($target ne 'tex') {$result.="
";} else {$result.=' \\\\ ';} return $result; @@ -456,52 +493,6 @@ sub getfoilcounts { return $count; } -sub whichorder { - my ($max,$randomize,$showall,$hash)=@_; - #&Apache::lonxml::debug("man $max randomize $randomize"); - if (!defined(@{ $$hash{'names'} })) { return; } - my @names = @{ $$hash{'names'} }; - my @whichopt =(); - my (%top,@toplist,%bottom,@bottomlist); - if (!($showall || ($randomize eq 'no'))) { - my $current=0; - foreach my $name (@names) { - $current++; - if ($$hash{"$name.location"} eq 'top') { - $top{$name}=$current; - } elsif ($$hash{"$name.location"} eq 'bottom') { - $bottom{$name}=$current; - } - } - } - while ((($#whichopt+1) < $max) && ($#names > -1)) { - #&Apache::lonxml::debug("Have $#whichopt max is $max"); - my $aopt; - if ($showall || ($randomize eq 'no')) { - $aopt=0; - } else { - $aopt=int(&Math::Random::random_uniform() * ($#names+1)); - } - #&Apache::lonxml::debug("From $#whichopt $max $#names elms, picking $aopt"); - $aopt=splice(@names,$aopt,1); - #&Apache::lonxml::debug("Picked $aopt"); - if ($top{$aopt}) { - $toplist[$top{$aopt}]=$aopt; - } elsif ($bottom{$aopt}) { - $bottomlist[$bottom{$aopt}]=$aopt; - } else { - push (@whichopt,$aopt); - } - } - for (my $i=0;$i<=$#toplist;$i++) { - if ($toplist[$i]) { unshift(@whichopt,$toplist[$i]) } - } - for (my $i=0;$i<=$#bottomlist;$i++) { - if ($bottomlist[$i]) { push(@whichopt,$bottomlist[$i]) } - } - - return @whichopt; -} sub start_conceptgroup { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; @@ -526,31 +517,12 @@ sub end_conceptgroup { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; $Apache::matchresponse::conceptgroup=0; my $result=''; - if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ) { - #if not there aren't any foils to display and thus no question - if (defined(@{ $Apache::response::conceptgroup{'names'} })) { - my @names = @{ $Apache::response::conceptgroup{'names'} }; - my $pick=int(&Math::Random::random_uniform() * ($#names+1)); - my $name=$names[$pick]; - 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'}; - } - } + if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || + $target eq 'tex' || $target eq 'analyze') { + &Apache::response::pick_foil_for_concept($target, + ['value','text','location'], + \%Apache::hint::match, + $parstack,$safeeval); } elsif ($target eq 'edit') { $result=&Apache::edit::end_table(); } @@ -565,7 +537,7 @@ sub insert_conceptgroup { sub start_foil { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result=''; - if ($target eq 'web' || $target eq 'tex') { + if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') { &Apache::lonxml::startredirection; } elsif ($target eq 'edit') { $result=&Apache::edit::tag_start($target,$token,"Foil"); @@ -597,10 +569,11 @@ sub end_foil { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $text =''; my $result = ''; - if ($target eq 'web' || $target eq 'tex') { + if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') { $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); if ($value ne 'unused') { my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval); @@ -612,7 +585,7 @@ sub end_foil { && !&Apache::response::showallfoils() ) { push @{ $Apache::response::conceptgroup{'names'} }, $name; $Apache::response::conceptgroup{"$name.value"} = $value; - if ($target eq 'tex') { + if ($target eq 'tex' && $Apache::lonhomework::type eq 'exam') { $Apache::response::conceptgroup{"$name.text"} = ' $\triangleright$ '.$text; } else { $Apache::response::conceptgroup{"$name.text"} = $text; @@ -621,11 +594,15 @@ sub end_foil { } else { push @{ $Apache::response::foilgroup{'names'} }, $name; $Apache::response::foilgroup{"$name.value"} = $value; - if ($Apache::lonhomework::type eq 'exam' and $flag_for_exam_printing) { - $Apache::response::foilgroup{"$name.text"} = '\vskip 5 mm $\triangleright$ '.$text; + if ($Apache::lonhomework::type eq 'exam') { + if ($target eq 'tex') { + $Apache::response::foilgroup{"$name.text"} = '\vskip 5 mm $\triangleright$ '.$text; + } else { + $Apache::response::foilgroup{"$name.text"} = $text; + } } else { if ($target eq 'tex') { - $Apache::response::foilgroup{"$name.text"} = ' $\triangleright$ '.$text; + $Apache::response::foilgroup{"$name.text"} = $text; } else { $Apache::response::foilgroup{"$name.text"} = $text; }