--- loncom/interface/statistics/lonproblemanalysis.pm 2003/10/10 21:45:34 1.31 +++ loncom/interface/statistics/lonproblemanalysis.pm 2003/10/14 21:58:25 1.37 @@ -1,6 +1,7 @@ # The LearningOnline Network with CAPA # -# $Id: lonproblemanalysis.pm,v 1.31 2003/10/10 21:45:34 matthew Exp $ + +# $Id: lonproblemanalysis.pm,v 1.37 2003/10/14 21:58:25 matthew Exp $ # # Copyright Michigan State University Board of Trustees # @@ -34,6 +35,7 @@ use Apache::lonhtmlcommon(); use Apache::loncoursedata(); use Apache::lonstatistics; use Apache::lonlocal; +use HTML::Entities(); sub BuildProblemAnalysisPage { my ($r,$c)=@_; @@ -42,13 +44,27 @@ sub BuildProblemAnalysisPage { # my @Students = @Apache::lonstatistics::Students; # - if (exists($ENV{'form.problemchoice'}) && !exists($ENV{'SelectAnother'})) { + if (exists($ENV{'form.updatecaches'}) || + (exists($ENV{'form.firstanalysis'}) && + $ENV{'form.firstanalysis'} ne 'no')) { + &Apache::lonstatistics::Gather_Full_Student_Data($r); + } + if (! exists($ENV{'form.firstanalysis'})) { + $r->print('<input type="hidden" name="firstanalysis" value="yes" />'); + } else { + $r->print('<input type="hidden" name="firstanalysis" value="no" />'); + } + if (exists($ENV{'form.problemchoice'}) && + ! exists($ENV{'form.SelectAnother'})) { $r->print('<input type="submit" name="ProblemAnalysis" value="'. &mt('Analyze Problem Again').'" />'); $r->print(' 'x5); $r->print('<input type="submit" name="ClearCache" value="'. &mt('Clear Caches').'" />'); $r->print(' 'x5); + $r->print('<input type="submit" name="updatecaches" value="'. + &mt('Update Student Data').'" />'); + $r->print(' 'x5); $r->print('<input type="hidden" name="problemchoice" value="'. $ENV{'form.problemchoice'}.'" />'); $r->print('<input type="submit" name="SelectAnother" value="'. @@ -56,7 +72,6 @@ sub BuildProblemAnalysisPage { $r->print(' 'x5); # $r->print('<hr />'); - &Apache::lonstatistics::Gather_Full_Student_Data($r); # my ($symb,$part,$resid) = &get_problem_symb( &Apache::lonnet::unescape($ENV{'form.problemchoice'}) @@ -86,14 +101,14 @@ sub BuildProblemAnalysisPage { (\@Students,$symb,$resid); if (defined($PerformanceData) && ref($PerformanceData) eq 'ARRAY') { - if ($ENV{'form.AnalyzeBy'} eq 'Tries') { - my $analysis_html = &DoTriesAnalysis($PerformanceData, + if ($ENV{'form.AnalyzeOver'} eq 'Tries') { + my $analysis_html = &tries_analysis($PerformanceData, + $ORdata); + $r->print($analysis_html); + } elsif ($ENV{'form.AnalyzeOver'} eq 'Time') { + my $analysis_html = &time_analysis($PerformanceData, $ORdata); $r->print($analysis_html); -# } elsif ($ENV{'form.AnalyzeBy'} eq 'Time') { -# my $analysis_html = &DoTimeAnalysis($PerformanceData, -# $ORdata); -# $r->print($analysis_html); } else { $r->print('<h2>'. &mt('The analysis you have selected is '. @@ -119,53 +134,158 @@ sub BuildProblemAnalysisPage { } -sub DoTriesAnalysis { - my ($PerformanceData,$ORdata) = @_; - my $mintries = 1; - my $maxtries = $ENV{'form.NumPlots'}; - my %ResponseData = &analyze_option_data_by_tries($PerformanceData, - $mintries,$maxtries); - my @Foils = sort(keys(%ResponseData)); - my %Row_Label; +######################################################### +######################################################### +## +## Misc interface routines use by analysis code +## +######################################################### +######################################################### +sub build_foil_index { + my ($ORdata) = @_; + my %Foildata = %{$ORdata->{'Foils'}}; + my @Foils = sort(keys(%Foildata)); + my %Concepts; foreach my $foilid (@Foils) { - my $value = $ORdata->{'Foiltext'}->{$foilid}; - $Row_Label{$foilid} = $ORdata->{'Foiltext'}->{$foilid}; + push(@{$Concepts{$Foildata{$foilid}->{'Concept'}}}, + $foilid); + } + undef(@Foils); + # Having gathered the concept information in a hash, we now translate it + # into an array because we need to be consistent about order. + # Also put the foils in order, too. + my $sortfunction = sub { + my %Numbers = (one => 1, + two => 2, + three => 3, + four => 4, + five => 5, + six => 6, + seven => 7, + eight => 8, + nine => 9, + ten => 10,); + my $a1 = $a; + my $b1 = $b; + if (exists($Numbers{$a})) { + $a1 = $Numbers{$a}; + } + if (exists($Numbers{$b})) { + $b1 = $Numbers{$b}; + } + $a1 cmp $b1; + }; + my @Concepts; + foreach my $concept (sort $sortfunction (keys(%Concepts))) { + push(@Concepts,{name => $concept, + foils => [@{$Concepts{$concept}}]}); + push(@Foils,(@{$Concepts{$concept}})); } # # Build up the table of row labels. - my @Rows; - $Rows[0]= [ '<th>'.&mt('Foil Number').'</th>', - '<th>'.&mt('Foil Text').'</td>']; my $table = '<table border="1" >'."\n"; - my $index = 1; - foreach my $foilid (@Foils) { - $table .= '<tr><td>'.$index.'</td>'. - '<td>'.$Row_Label{$foilid}."</td></tr>\n"; + $table .= '<tr>'. + '<th>'.&mt('Concept Number').'</th>'. + '<th>'.&mt('Concept').'</th>'. + '<th>'.&mt('Foil Number').'</th>'. + '<th>'.&mt('Foil Name').'</th>'. + '<th>'.&mt('Foil Text').'</th>'. + '<th>'.&mt('Correct Value').'</th>'. + "</tr>\n"; + my $conceptindex = 1; + my $foilindex = 1; + foreach my $concept (@Concepts) { + my @FoilsInConcept = @{$concept->{'foils'}}; + my $firstfoil = shift(@FoilsInConcept); + $table .= '<tr>'. + '<td>'.$conceptindex.'</td>'. + '<td>'.$concept->{'name'}.'</td>'. + '<td>'.$foilindex++.'</td>'. + '<td>'.$Foildata{$firstfoil}->{'name'}.'</td>'. + '<td>'.$Foildata{$firstfoil}->{'text'}.'</td>'. + '<td>'.$Foildata{$firstfoil}->{'value'}.'</td>'. + "</tr>\n"; + foreach my $foilid (@FoilsInConcept) { + $table .= '<tr>'. + '<td></td>'. + '<td></td>'. + '<td>'.$foilindex.'</td>'. + '<td>'.$Foildata{$foilid}->{'name'}.'</td>'. + '<td>'.$Foildata{$foilid}->{'text'}.'</td>'. + '<td>'.$Foildata{$foilid}->{'value'}.'</td>'. + "</tr>\n"; + } continue { + $foilindex++; + } } continue { - $index++; + $conceptindex++; } $table .= "</table>\n"; + return ($table,\@Foils,\@Concepts); +} + +######################################################### +######################################################### +## +## Tries Analysis +## +######################################################### +######################################################### +sub tries_analysis { + my ($PerformanceData,$ORdata) = @_; + my $mintries = 1; + my $maxtries = $ENV{'form.NumPlots'}; + my %ResponseData = &analyze_option_data_by_tries($PerformanceData, + $mintries,$maxtries); + my ($table,$Foils,$Concepts) = &build_foil_index($ORdata); # # Compute the data neccessary to make the plots my @PlotData; - my @CumulativePlotData; - foreach my $foilid (@Foils) { - for (my $i=$mintries;$i<=$maxtries;$i++) { - # - # Gather the per-attempt data - push (@{$PlotData[$i]->{'good'}}, - $ResponseData{$foilid}->[$i]->{'percent_corr'}); - push (@{$PlotData[$i]->{'bad'}}, - 100-$ResponseData{$foilid}->[$i]->{'percent_corr'}); - # - # Someday we may need the cumulative data and I think - # this is a neat way of computing it as we go along. - push (@{$CumulativePlotData[$i]->{'good'}}, - $CumulativePlotData[-1]->{'good'}+ - $ResponseData{$foilid}->[$i]->{'correct'}); - push (@{$CumulativePlotData[$i]->{'bad'}}, - $CumulativePlotData[-1]->{'bad'}+ - $ResponseData{$foilid}->[$i]->{'incorrect'}); + my $xlabel; + if ($ENV{'form.AnalyzeAs'} eq 'Foils') { + $xlabel = 'Foil Number'; + foreach my $foilid (@$Foils) { + for (my $i=$mintries;$i<=$maxtries;$i++) { + # + # Gather the per-attempt data + my $percent; + if ($ResponseData{$foilid}->[$i]->{'total'} == 0) { + $percent = 0; + } else { + $percent = $ResponseData{$foilid}->[$i]->{'correct'} / + $ResponseData{$foilid}->[$i]->{'total'}; + } + push (@{$PlotData[$i]->{'total'}}, + $ResponseData{$foilid}->[$i]->{'total'}); + push (@{$PlotData[$i]->{'good'}},100 * $percent); + push (@{$PlotData[$i]->{'bad'}}, 100 *(1-$percent)); + } + } + } else { + # Concept analysis + $xlabel = 'Concept Number'; + foreach my $concept (@$Concepts) { + for (my $i=$mintries;$i<=$maxtries;$i++) { + # + # Gather the per-attempt data + my ($correct,$incorrect,$total); + foreach my $foil (@{$concept->{'foils'}}) { + $correct += $ResponseData{$foil}->[$i]->{'correct'}; + $incorrect += $ResponseData{$foil}->[$i]->{'incorrect'}; + $total += $ResponseData{$foil}->[$i]->{'total'}; + } + push (@{$PlotData[$i]->{'correct'}}, $correct); + push (@{$PlotData[$i]->{'incorrect'}},$incorrect); + push (@{$PlotData[$i]->{'total'}}, $total); + my $percent; + if ($total == 0) { + $percent = 0; + } else { + $percent = $correct/$total; + } + push (@{$PlotData[$i]->{'good'}},100*$percent); + push (@{$PlotData[$i]->{'bad'}},100*(1-$percent)); + } } } # @@ -173,37 +293,30 @@ sub DoTriesAnalysis { $table .= "<table>\n"; my @Plots; for (my $i=$mintries;$i<=$maxtries;$i++) { - my $minstu = $ResponseData{$Foils[0]}->[$i]->{'total'}; - my $maxstu = $ResponseData{$Foils[0]}->[$i]->{'total'}; - foreach my $foilid (@Foils) { - if ($minstu > $ResponseData{$foilid}->[$i]->{'total'}) { - $minstu = $ResponseData{$foilid}->[$i]->{'total'}; + my $minstu = $PlotData[$i]->{'total'}->[0]; + my $maxstu = $PlotData[$i]->{'total'}->[0]; + foreach my $count (@{$PlotData[$i]->{'total'}}) { + if ($minstu > $count) { + $minstu = $count; } - if ($maxstu < $ResponseData{$foilid}->[$i]->{'total'}) { - $maxstu = $ResponseData{$foilid}->[$i]->{'total'}; + if ($maxstu < $count) { + $maxstu = $count; } } $maxstu = 0 if (! $maxstu); $minstu = 0 if (! $minstu); - my $graphlink; + my $title; if ($maxstu == $minstu) { - $graphlink = &Apache::loncommon::DrawGraph - ('Attempt '.$i.', '.$maxstu.' students', - 'Foil Number', - 'Percent Correct', - 100, - $PlotData[$i]->{'good'}, - $PlotData[$i]->{'bad'}); + $title = 'Attempt '.$i.', '.$maxstu.' students'; } else { - $graphlink = &Apache::loncommon::DrawGraph - ('Attempt '.$i.', '.$minstu.'-'.$maxstu. - ' students', - 'Foil Number', - 'Percent Correct', - 100, - $PlotData[$i]->{'good'}, - $PlotData[$i]->{'bad'}); + $title = 'Attempt '.$i.', '.$minstu.'-'.$maxstu.' students'; } + my $graphlink = &Apache::loncommon::DrawGraph($title, + $xlabel, + 'Percent Correct', + 100, + $PlotData[$i]->{'good'}, + $PlotData[$i]->{'bad'}); push(@Plots,$graphlink); } # @@ -254,27 +367,170 @@ sub analyze_option_data_by_tries { ($tryhash->{'correct'} < 1 && $tryhash->{'incorrect'} < 1)); $tryhash->{'total'} = $tryhash->{'correct'} + - $tryhash->{'incorrect'}; - $tryhash->{'percent_corr'} = 100 * - ($tryhash->{'correct'} / - ($tryhash->{'correct'} + $tryhash->{'incorrect'}) - ); + $tryhash->{'incorrect'}; } } return %Trydata; } -sub get_problem_symb { - my $problemstring = shift(); - my ($symb,$partid,$resid) = ($problemstring=~ /^(.*):([^:]*):([^:]*)$/); - return ($symb,$partid,$resid); +######################################################### +######################################################### +## +## Time Analysis +## +######################################################### +######################################################### +sub time_analysis { + my ($PerformanceData,$ORdata) = @_; + my $num_plots = $ENV{'form.NumPlots'}; + my ($table,$Foils,$Concepts) = &build_foil_index($ORdata); + my $num_data = scalar(@$PerformanceData)-1; + my $percent = sprintf('%2f',100/$num_plots); + $table .= "<table>\n"; + for (my $i=0;$i<$num_plots;$i++) { + my $starttime = &Apache::lonhtmlcommon::get_date_from_form + ('startdate_'.$i); + my $endtime = &Apache::lonhtmlcommon::get_date_from_form + ('enddate_'.$i); + my ($begin_index,$end_index,$plottitle,$plothtml,$data); + if (! defined($starttime) || ! defined($endtime)) { + $begin_index = $i*int($num_data/$num_plots); + $end_index = ($i+1)*int($num_data/$num_plots); + my $lownum = sprintf('%2.1f',$i*$percent); + $lownum =~ s/(\.0)$//; + my $highnum = sprintf('%2.1f',($i+1)*$percent); + $highnum =~ s/(\.0)$//; + $plottitle = $lownum.'% to '.$highnum.'% of submissions'; + } else { + my $j; + while (++$j < scalar(@$PerformanceData)) { + last if ($PerformanceData->[$j]->[2] > $starttime); + } + $begin_index = $j; + while (++$j < scalar(@$PerformanceData)) { + last if ($PerformanceData->[$j]->[2] > $endtime); + } + $end_index = $j; + $plottitle = $ENV{'form.plottitle_'.$i}; + } + ($plothtml,$starttime,$endtime,$data) = + &analyze_option_data_by_time($PerformanceData, + $begin_index,$end_index, + $plottitle, + @$Concepts); + my $startdateform = &Apache::lonhtmlcommon::date_setter + ('Statistics','startdate_'.$i,$starttime); + my $enddateform = &Apache::lonhtmlcommon::date_setter + ('Statistics','enddate_'.$i,$endtime); + $table.="<tr><td>".$plothtml.'</td><td align="left" valign="top">'. + "<b>Start Time</b>: ".$startdateform."<br />". + "<b>End Time</b> : "." ".$enddateform."<br />". + '<b>Plot Title</b> :'. + '<input type="text" size="30" name="plottitle_'.$i.'" value="'. + &HTML::Entities::encode($plottitle).'" /><br />'. + "</td></tr>\n"; + } + $table .="</table>\n"; + return $table; } +sub analyze_option_data_by_time { + my ($PerformanceData,$begin_index,$end_index,$description,@Concepts) = @_; + my %TimeData; + # + # Get the start and end times for this segment of the plot + my $starttime = $PerformanceData->[$begin_index]->[2]; + my $endtime = $PerformanceData->[$end_index ]->[2]; + # + # Compute the number getting the foils correct or incorrects + for (my $i=$begin_index;$i<=$end_index;$i++) { + my $row = $PerformanceData->[$i]; + next if (! defined($row)); + my ($grading,$submission,$time,$tries) = @$row; + my @Foilgrades = split('&',$grading); + my @Foilsubs = split('&',$submission); + foreach my $foilgrade (@Foilgrades) { + my ($foilid,$correct) = split('=',$foilgrade); + if ($correct) { + $TimeData{$foilid}->{'correct'}++; + } else { + $TimeData{$foilid}->{'incorrect'}++; + } + } + } + # + # Compute the total and percent correct + my @Plotdata1; + my @Plotdata2; + foreach my $concept (@Concepts) { + my ($correct,$incorrect,$total); + foreach my $foilid (@{$concept->{'foils'}}) { + if (! exists($TimeData{$foilid}->{'correct'})) { + $TimeData{$foilid}->{'correct'} = 0; + } + if (! exists($TimeData{$foilid}->{'incorrect'})) { + $incorrect = 0; + $TimeData{$foilid}->{'incorrect'} = 0; + } + $correct += $TimeData{$foilid}->{'correct'}; + $incorrect += $TimeData{$foilid}->{'incorrect'}; + $total += $TimeData{$foilid}->{'correct'}+ + $TimeData{$foilid}->{'incorrect'}; + $TimeData{$foilid}->{'total'} = $TimeData{$foilid}->{'correct'} + + $TimeData{$foilid}->{'incorrect'}; + my $percent; + if ($TimeData{$foilid}->{'total'} == 0) { + $percent = 0; + } else { + $percent = $TimeData{$foilid}->{'correct'} / + $TimeData{$foilid}->{'total'}; + } + $TimeData{$foilid}->{'percent_corr'} = 100 * $percent; + if ($ENV{'form.AnalyzeAs'} eq 'Foils') { + push (@Plotdata1, $TimeData{$foilid}->{'percent_corr'}); + push (@Plotdata2,100-$TimeData{$foilid}->{'percent_corr'}); + } + } + if ($ENV{'form.AnalyzeAs'} ne 'Foils') { + if ($total == 0) { + push (@Plotdata1,0); + push (@Plotdata2,100); + } else { + push (@Plotdata1,100 * $correct / $total); + push (@Plotdata2,100 * (1-$correct / $total)); + } + } + } + # + # Create the plot + my $xlabel; + if ($ENV{'form.AnalyzeAs'} eq 'Foils') { + $xlabel = 'Foil Number'; + } else { + $xlabel = 'Concept Number'; + } + my $graphlink = &Apache::loncommon::DrawGraph + ($description,#'Time Interval Analysis', + $xlabel, + 'Percent Correct / Incorrect', + 100, + \@Plotdata1,\@Plotdata2); + # + return ($graphlink,$starttime,$endtime,\%TimeData); +} + +######################################################### +######################################################### +## +## Interface +## +######################################################### +######################################################### sub CreateInterface { ## ## Environment variable initialization - if (! exists$ENV{'form.AnalyzeBy'}) { - $ENV{'form.AnalyzeBy'} = 'Tries'; + if (! exists$ENV{'form.AnalyzeOver'}) { + $ENV{'form.AnalyzeOver'} = 'Tries'; } ## ## Build the menu @@ -307,39 +563,59 @@ sub CreateInterface { }; &Apache::lonstatistics::MapSelect('Maps','multiple,all',5, $only_seq_with_assessments); -# $Str .= '</td>'; - # + ## + ## $Str .= '<td>'; - $Str .= '<nobr>'.&mt('Analyze By '); - $Str .='<select name="AnalyzeBy" >'; - # - $Str .= '<option value="Tries" '; - if (! exists($ENV{'form.AnalyzeBy'}) || $ENV{'form.AnalyzeBy'} eq 'Tries'){ - # Default to Tries - $Str .= ' selected '; - } - $Str .= '>'.&mt('Tries').'</option>'; - # - $Str .= '<option value="Time" '; - $Str .= ' selected ' if ($ENV{'form.AnalyzeBy'} eq 'Time'); - $Str .= '>'.&mt('Time').'</option>'; - $Str .= '</select></nobr><br />'; - # - $Str .= '<br /><nobr>'.&mt('Number of Plots:'); - $Str .= '<select name="NumPlots">'; - if (! exists($ENV{'form.NumPlots'}) - || $ENV{'form.NumPlots'} < 1 - || $ENV{'form.NumPlots'} > 20) { - $ENV{'form.NumPlots'} = 7; - } - foreach my $i (1,2,3,4,5,6,7,8,10,15,20) { - $Str .= '<option value="'.$i.'" '; - if ($ENV{'form.NumPlots'} == $i) { $Str.=' selected '; } - $Str .= '>'.$i.'</option>'; + { # These braces are here to organize the code, not scope it. + { + $Str .= '<nobr>'.&mt('Analyze Over '); + $Str .='<select name="AnalyzeOver" >'; + $Str .= '<option value="Tries" '; + if (! exists($ENV{'form.AnalyzeOver'}) || + $ENV{'form.AnalyzeOver'} eq 'Tries'){ + # Default to Tries + $Str .= ' selected '; + } + $Str .= '>'.&mt('Tries').'</option>'; + $Str .= '<option value="Time" '; + $Str .= ' selected ' if ($ENV{'form.AnalyzeOver'} eq 'Time'); + $Str .= '>'.&mt('Time').'</option>'; + $Str .= '</select></nobr><br />'; + } + { + $Str .= '<nobr>'.&mt('Analyze as '); + $Str .='<select name="AnalyzeAs" >'; + $Str .= '<option value="Concepts" '; + if (! exists($ENV{'form.AnalyzeAs'}) || + $ENV{'form.AnalyzeAs'} eq 'Concepts'){ + # Default to Concepts + $Str .= ' selected '; + } + $Str .= '>'.&mt('Concepts').'</option>'; + $Str .= '<option value="Foils" '; + $Str .= ' selected ' if ($ENV{'form.AnalyzeAs'} eq 'Foils'); + $Str .= '>'.&mt('Foils').'</option>'; + $Str .= '</select></nobr><br />'; + } + { + $Str .= '<br /><nobr>'.&mt('Number of Plots:'); + $Str .= '<select name="NumPlots">'; + if (! exists($ENV{'form.NumPlots'}) + || $ENV{'form.NumPlots'} < 1 + || $ENV{'form.NumPlots'} > 20) { + $ENV{'form.NumPlots'} = 5; + } + foreach my $i (1,2,3,4,5,6,7,8,10,15,20) { + $Str .= '<option value="'.$i.'" '; + if ($ENV{'form.NumPlots'} == $i) { $Str.=' selected '; } + $Str .= '>'.$i.'</option>'; + } + $Str .= '</select></nobr>'; + } } - $Str .= '</select></nobr>'; $Str .= '</td>'; - # + ## + ## $Str .= '</tr>'."\n"; $Str .= '</table>'."\n"; return ($Str); @@ -352,7 +628,6 @@ sub OptionResponseProblemSelector { next if ($seq->{'num_assess'}<1); my $seq_str = ''; foreach my $res (@{$seq->{'contents'}}) { -# &Apache::lonnet::logthis('checking '.$res->{'title'}); next if ($res->{'type'} ne 'assessment'); foreach my $part (@{$res->{'parts'}}) { my $partdata = $res->{'partdata'}->{$part}; @@ -390,6 +665,19 @@ sub OptionResponseProblemSelector { return $Str; } +######################################################### +######################################################### +## +## Misc functions +## +######################################################### +######################################################### +sub get_problem_symb { + my $problemstring = shift(); + my ($symb,$partid,$resid) = ($problemstring=~ /^(.*):([^:]*):([^:]*)$/); + return ($symb,$partid,$resid); +} + sub get_resource_from_symb { my ($symb) = @_; foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) { @@ -404,18 +692,10 @@ sub get_resource_from_symb { sub get_problem_data { my ($url) = @_; -# my $Answ=&Apache::lonnet::ssi($URI,('grade_target' => 'analyze', -# 'grade_username' => $sname, -# 'grade_domain' => $sdom, -# 'grade_courseid' => $cid, -# 'grade_symb' => $symb)); my $Answ=&Apache::lonnet::ssi($url,('grade_target' => 'analyze')); (my $garbage,$Answ)=split(/_HASH_REF__/,$Answ,2); my %Answer; %Answer=&Apache::lonnet::str2hash($Answ); -# &Apache::lonnet::logthis('keys of %Answer = '.join(', ',(keys(%Answer)))); -# &Apache::lonnet::logthis('$Answer{parts} = '. -# join(', ',@{$Answer{'parts'}})); my %Partdata; foreach my $part (@{$Answer{'parts'}}) { while (my($key,$value) = each(%Answer)) { @@ -429,45 +709,24 @@ sub get_problem_data { } elsif ($key =~ /^concept\.(.*)$/) { my $concept = $1; foreach my $foil (@$value) { - $Partdata{$part}->{$foil}->{'Concept'}=$concept; + $Partdata{$part}->{'Foils'}->{$foil}->{'Concept'}= + $concept; } } - # &Apache::lonnet::logthis($part.' '.$key.' (array) = '. - # join(', ',@$value)); } else { $value =~ s/^\s*//g; $value =~ s/\s*$//g; if ($key=~ /^foil\.text\.(.*)$/) { my $foil = $1; - $Partdata{$part}->{'Foiltext'}->{$foil}=$value; + $Partdata{$part}->{'Foils'}->{$foil}->{'name'}=$foil; + $Partdata{$part}->{'Foils'}->{$foil}->{'text'}=$value; } elsif ($key =~ /^foil\.value\.(.*)$/) { my $foil = $1; - $Partdata{$part}->{'FoilValues'}->{$foil}=$value; + $Partdata{$part}->{'Foils'}->{$foil}->{'value'}=$value; } -# &Apache::lonnet::logthis($part.' '.$key.' = '.$value); } } } - -# my $parts=''; -# foreach my $elm (@{$Answer{"parts"}}) { -# $parts.="$elm,"; -# } -# chop($parts); -# my $conc=''; -# foreach my $elm (@{$Answer{"$parts.concepts"}}) { -# $conc.="$elm@"; -# } -# chop($conc); -# -# @Concepts=split(/\@/,$conc); -# foreach my $concept (@{$Answer{"$parts.concepts"}}) { -# foreach my $foil (@{$Answer{"$parts.concept.$concept"}}) { -# $foil_to_concept{$foil} = $concept; -# #$ConceptData{$foil} = $Answer{"$parts.foil.value.$foil"}; -# } -# } -# return $symb; return %Partdata; }