--- loncom/interface/statistics/lonproblemanalysis.pm 2004/01/16 20:19:33 1.56 +++ loncom/interface/statistics/lonproblemanalysis.pm 2004/02/16 20:50:03 1.68 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonproblemanalysis.pm,v 1.56 2004/01/16 20:19:33 matthew Exp $ +# $Id: lonproblemanalysis.pm,v 1.68 2004/02/16 20:50:03 matthew Exp $ # # Copyright Michigan State University Board of Trustees # @@ -33,6 +33,7 @@ use Apache::lonhtmlcommon(); use Apache::loncoursedata(); use Apache::lonstatistics; use Apache::lonlocal; +use Apache::lonstathelpers; use HTML::Entities(); use Time::Local(); use Spreadsheet::WriteExcel(); @@ -58,22 +59,6 @@ my @SubmitButtons = ({ name => 'PrevProb { name => 'ExcelOutput', text => 'Produce Excel Output' }); -sub render_resource { - my ($resource) = @_; - ## - ## Render the problem - my $base; - ($base,undef) = ($resource->{'src'} =~ m|(.*/)[^/]*$|); - $base = "http://".$ENV{'SERVER_NAME'}.$base; - my $rendered_problem = - &Apache::lonnet::ssi_body($resource->{'src'}); - $rendered_problem =~ s/<\s*form\s*/)|<\/nop>|g; - return '
'. - ''. - $rendered_problem. - '
'; -} sub BuildProblemAnalysisPage { my ($r,$c)=@_; @@ -91,7 +76,7 @@ sub BuildProblemAnalysisPage { # &Apache::lonstatistics::PrepareClasslist(); # - $r->print('

'.&mt('Option Response Problem Analysis').'

'); + $r->print('

'.&mt('Detailed Problem Analysis').'

'); $r->print(&CreateInterface()); # my @Students = @Apache::lonstatistics::Students; @@ -114,6 +99,7 @@ sub BuildProblemAnalysisPage { } $r->rflush(); # + my $problem_types = '(option|radiobutton|numerical)'; if (exists($ENV{'form.problemchoice'}) && ! exists($ENV{'form.SelectAnother'})) { foreach my $button (@SubmitButtons) { @@ -130,9 +116,14 @@ sub BuildProblemAnalysisPage { $r->rflush(); # # Determine which problem we are to analyze - my $current_problem = &get_target_from_id($ENV{'form.problemchoice'}); + my $current_problem = &Apache::lonstathelpers::get_target_from_id + ($ENV{'form.problemchoice'}); # - my ($prev,$curr,$next) = &get_prev_curr_next($current_problem); + my ($prev,$curr,$next) = + &Apache::lonstathelpers::get_prev_curr_next($current_problem, + $problem_types, + 'response', + ); if (exists($ENV{'form.PrevProblemAnalysis'}) && defined($prev)) { $current_problem = $prev; } elsif (exists($ENV{'form.NextProblemAnalysis'}) && defined($next)) { @@ -142,7 +133,8 @@ sub BuildProblemAnalysisPage { } # # Store the current problem choice and send it out in the form - $ENV{'form.problemchoice'} = &make_target_id($current_problem); + $ENV{'form.problemchoice'} = + &Apache::lonstathelpers::make_target_id($current_problem); $r->print(''); # @@ -152,7 +144,7 @@ sub BuildProblemAnalysisPage { my $resource = $current_problem->{'resource'}; $r->print('

'.$resource->{'title'}.'

'); $r->print('

'.$resource->{'src'}.'

'); - $r->print(&render_resource($resource)); + $r->print(&Apache::lonstathelpers::render_resource($resource)); $r->rflush(); my %Data = &get_problem_data($resource->{'src'}); my $ProblemData = $Data{$current_problem->{'part'}. @@ -166,6 +158,9 @@ sub BuildProblemAnalysisPage { &RadioResponseAnalysis($r,$current_problem, $ProblemData, \@Students); + } elsif ($current_problem->{'resptype'} eq 'numerical') { + &NumericalResponseAnalysis($r,$current_problem, + $ProblemData,\@Students); } else { $r->print('

This analysis is not supported

'); } @@ -176,10 +171,136 @@ sub BuildProblemAnalysisPage { &mt('Analyze Problem').'" />'); $r->print(' 'x5); $r->print('

'.&mt('Please select a problem to analyze').'

'); - $r->print(&ProblemSelector()); + $r->print(&Apache::lonstathelpers::ProblemSelector + ($problem_types)); + } +} + +######################################################### +######################################################### +## +## Numerical Response Routines +## +######################################################### +######################################################### +sub NumericalResponseAnalysis { + my ($r,$problem,$ProblemData,$Students) = @_; + $r->print('

This analysis is not yet supported

'); + my ($resource,$respid) = ($problem->{'resource'}, + $problem->{'respid'}); + my $analysis_html; + my $PerformanceData = + &Apache::loncoursedata::get_response_data + ($Students,$resource->{'symb'},$respid); + if (! defined($PerformanceData) || + ref($PerformanceData) ne 'ARRAY' ) { + $analysis_html = '

'. + &mt('There is no submission data for this resource'). + '

'; + $r->print($analysis_html); + return; + } + my ($max,$min) = &GetStudentAnswers($r,$problem,$Students); + $r->print('Maximum = '.$max.' Minimum = '.$min); + my $max_students = 0; + my %Data; + foreach my $student (@$Students) { + my $answer = $student->{'answer'}; + $Data{$answer}++; + if ($max_students < $Data{$answer}) { + $max_students = $Data{$answer}; + } + } + foreach (5,10,20,25,50,75,100,150,200,250,500,1000,1500,2000,2500,5000) { + if ($max_students < $_) { + $max_students = $_; + last; + } + } + my @Labels = sort {$a <=> $b } keys(%Data); + $r->print('number of labels = '.scalar(@Labels)); + my @PlotData = @Data{@Labels}; + $r->print('number of PlotData = '.scalar(@PlotData)); + my $graph = + &Apache::loncommon::DrawXYGraph('Correct Answer Distribution', + 'Correct Answer', + 'Number of students', + $max_students, + undef, + \@Labels, + [\@PlotData], + (xskip=>10)); + $r->print($graph); + return; +} + +sub GetStudentAnswers { + my ($r,$problem,$Students) = @_; + my %Answers; + my ($resource,$partid,$respid) = ($problem->{'resource'}, + $problem->{'part'}, + $problem->{'respid'}); + # Open progress window + my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin + ($r,'Student Answer Compilation Status', + 'Student Answer Compilation Progress', scalar(@$Students)); + $r->print("\n"); + $r->rflush(); + my ($min,$max); + foreach my $student (@$Students) { + my $sname = $student->{'username'}; + my $sdom = $student->{'domain'}; + my $answer = analyze_problem_as_student($resource, + $sname,$sdom, + $partid,$respid); + if (! defined($min) || $min > $answer) { + $min = $answer; + } + if (! defined($max) || $max < $answer) { + $max = $answer; + } +# $r->print(''. +# ''. +# ''. +# ''. +# ''."\n"); + &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state, + &mt('last student')); + $student->{'answer'} = $answer; } + $r->print("
'.$sname.''.$sdom.''.$answer.'
\n"); + $r->rflush(); + &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); + # close progress window + return ($max,$min); } +sub build_student_data_worksheet { + my ($workbook,$format) = @_; + my $rows_output = 3; + my $cols_output = 0; + my $worksheet = $workbook->addworksheet('Student Data'); + $worksheet->write($rows_output++,0,'Student Data',$format->{'h3'}); + my @Headers = ('full name','username','domain','section', + "student\nnumber",'identifier'); + $worksheet->write_row($rows_output++,0,\@Headers,$format->{'header'}); + my @Students = @Apache::lonstatistics::Students; + my $studentrows = &Apache::loncoursedata::get_student_data(\@Students); + my %ids; + foreach my $row (@$studentrows) { + my ($mysqlid,$student) = @$row; + $ids{$student}=$mysqlid; + } + foreach my $student (@Students) { + my $name_domain = $student->{'username'}.':'.$student->{'domain'}; + $worksheet->write_row($rows_output++,0, + [$student->{'fullname'}, + $student->{'username'},$student->{'domain'}, + $student->{'section'},$student->{'id'}, + $ids{$name_domain}]); + } + return $worksheet; +} ######################################################### ######################################################### @@ -191,7 +312,7 @@ sub BuildProblemAnalysisPage { sub RadioResponseAnalysis { my ($r,$problem,$ProblemData,$Students) = @_; my ($resource,$respid) = ($problem->{'resource'}, - $problem->{'respid'}); + $problem->{'respid'}); my $analysis_html; my $PerformanceData = &Apache::loncoursedata::get_response_data @@ -232,7 +353,8 @@ sub RR_Tries_Analysis { my $mintries = 1; my $maxtries = $ENV{'form.NumPlots'}; my ($table,$Foils,$Concepts) = &build_foil_index($ProblemData); - if ((@$Concepts < 2) && ($ENV{'form.AnalyzeAs'} ne 'Foils')) { + if ((! defined($Concepts)) || ((@$Concepts < 2) && + ($ENV{'form.AnalyzeAs'} ne 'Foils'))) { $table = '

'. &mt('Not enough data for concept analysis. '. 'Performing Foil Analysis'). @@ -308,6 +430,7 @@ sub RR_Tries_Foil_Analysis { 'Percent Choosing', 100, ['#33ff00','#ff3300'], + undef, \@PlotData_Correct, \@PlotData_Incorrect); } @@ -387,20 +510,20 @@ sub OptionResponseAnalysis { } else { $r->rflush(); if (exists($ENV{'form.ExcelOutput'})) { - my $result = &prepare_optionresponse_excel_sheet($r,$resource, - $PerformanceData, - $ProblemData); + my $result = &OR_excel_sheet($r,$resource, + $PerformanceData, + $ProblemData); $r->print($result); $r->rflush(); } else { if ($ENV{'form.AnalyzeOver'} eq 'Tries') { - my $analysis_html = &tries_analysis($r, + my $analysis_html = &OR_tries_analysis($r, $PerformanceData, $ProblemData); $r->print($analysis_html); $r->rflush(); } elsif ($ENV{'form.AnalyzeOver'} eq 'Time') { - my $analysis_html = &time_analysis($PerformanceData, + my $analysis_html = &OR_time_analysis($PerformanceData, $ProblemData); $r->print($analysis_html); $r->rflush(); @@ -419,7 +542,7 @@ sub OptionResponseAnalysis { # Option Response: Tries Analysis # ######################################################### -sub tries_analysis { +sub OR_tries_analysis { my ($r,$PerformanceData,$ORdata) = @_; my $mintries = 1; my $maxtries = $ENV{'form.NumPlots'}; @@ -431,21 +554,21 @@ sub tries_analysis { '

'.$table; $ENV{'form.AnalyzeAs'} = 'Foils'; } - my %ResponseData = &analyze_option_data_by_tries($r,$PerformanceData, + my %ResponseData = &OR_analyze_by_tries($r,$PerformanceData, $mintries,$maxtries); my $analysis = ''; if ($ENV{'form.AnalyzeAs'} eq 'Foils') { - $analysis = &Tries_Foil_Analysis($mintries,$maxtries,$Foils, + $analysis = &OR_Tries_Foil_Analysis($mintries,$maxtries,$Foils, \%ResponseData,$ORdata); } else { - $analysis = &Tries_Concept_Analysis($mintries,$maxtries, + $analysis = &OR_Tries_Concept_Analysis($mintries,$maxtries, $Concepts,\%ResponseData,$ORdata); } $table .= $analysis; return $table; } -sub Tries_Foil_Analysis { +sub OR_Tries_Foil_Analysis { my ($mintries,$maxtries,$Foils,$respdat,$ORdata) = @_; my %ResponseData = %$respdat; # @@ -500,10 +623,11 @@ sub Tries_Foil_Analysis { } my $correctgraph = &Apache::loncommon::DrawBarGraph ($title,'Foil Number','Percent Correct', - 100,$plotcolors,$Datasets[0]); + 100,$plotcolors,undef,$Datasets[0]); $analysis_html.= ''.$correctgraph.''; ## ## + next if (! defined($Datasets[0])); for (my $i=0; $i< scalar(@{$Datasets[0]});$i++) { $Datasets[0]->[$i]=0; } @@ -518,7 +642,7 @@ sub Tries_Foil_Analysis { $title = 'Attempt '.$i.', '.$count; my $incorrectgraph = &Apache::loncommon::DrawBarGraph ($title,'Foil Number','% Option Chosen Incorrectly', - 100,$plotcolors,@Datasets); + 100,$plotcolors,undef,@Datasets); $analysis_html.= ''.$incorrectgraph.''; $analysis_html.= ''.$foilkey."\n"; } @@ -526,7 +650,7 @@ sub Tries_Foil_Analysis { return $analysis_html; } -sub Tries_Concept_Analysis { +sub OR_Tries_Concept_Analysis { my ($mintries,$maxtries,$Concepts,$respdat,$ORdata) = @_; my %ResponseData = %$respdat; my $analysis_html = "\n"; @@ -585,14 +709,14 @@ sub Tries_Concept_Analysis { $title = 'Attempt '.$i.', '.$count; my $graphlink = &Apache::loncommon::DrawBarGraph ($title,'Concept Number','Percent Correct', - 100,$plotcolors,$PlotData[$i]->{'_correct'}); + 100,$plotcolors,undef,$PlotData[$i]->{'_correct'}); $analysis_html.= '\n"; } $analysis_html .= "
'.$graphlink."
\n"; return $analysis_html; } -sub analyze_option_data_by_tries { +sub OR_analyze_by_tries { my ($r,$PerformanceData,$mintries,$maxtries) = @_; my %Trydata; $mintries = 1 if (! defined($mintries) || $mintries < 1); @@ -620,7 +744,7 @@ sub analyze_option_data_by_tries { # Option Response: Time Analysis # ######################################################### -sub time_analysis { +sub OR_time_analysis { my ($PerformanceData,$ORdata) = @_; my ($table,$Foils,$Concepts) = &build_foil_index($ORdata); if ((@$Concepts < 2) && ($ENV{'form.AnalyzeAs'} ne 'Foils')) { @@ -678,10 +802,10 @@ sub time_analysis { enddateform => $enddateform, }; if ($ENV{'form.AnalyzeAs'} eq 'Foils') { - $table .= &Foil_Time_Analysis($PerformanceData,$ORdata,$Foils, + $table .= &OR_Foil_Time_Analysis($PerformanceData,$ORdata,$Foils, $interval); } else { - $table .= &Concept_Time_Analysis($PerformanceData,$ORdata, + $table .= &OR_Concept_Time_Analysis($PerformanceData,$ORdata, $Concepts,$interval); } } @@ -689,7 +813,7 @@ sub time_analysis { return $table; } -sub Foil_Time_Analysis { +sub OR_Foil_Time_Analysis { my ($PerformanceData,$ORdata,$Foils,$interval) = @_; my $analysis_html; my $foilkey = &build_option_index($ORdata); @@ -750,6 +874,7 @@ sub Foil_Time_Analysis { 'Percent Correct', 100, $plotcolors, + undef, $Plotdata[0]); for (my $j=0; $j< scalar(@{$Plotdata[0]});$j++) { $Plotdata[0]->[$j]=0; @@ -767,6 +892,7 @@ sub Foil_Time_Analysis { 'Incorrect Option Choice', 100, $plotcolors, + undef, @Plotdata); $analysis_html.=''. ''.$correctplot.''. @@ -784,7 +910,7 @@ sub Foil_Time_Analysis { return $analysis_html; } -sub Concept_Time_Analysis { +sub OR_Concept_Time_Analysis { my ($PerformanceData,$ORdata,$Concepts,$interval) = @_; my $analysis_html; ## @@ -831,6 +957,7 @@ sub Concept_Time_Analysis { 'Percent Correct', 100, $plotcolors, + undef, \@Plotdata); $analysis_html.=''. ''.$correctplot.''. @@ -852,7 +979,7 @@ sub Concept_Time_Analysis { ## ######################################################### ######################################################### -sub prepare_optionresponse_excel_sheet { +sub OR_excel_sheet { my ($r,$resource,$PerformanceData,$ORdata) = @_; my $response = ''; my (undef,$Foils,$Concepts) = &build_foil_index($ORdata); @@ -896,16 +1023,16 @@ sub prepare_optionresponse_excel_sheet { } # my $result; - $result = &build_problem_data_worksheet($problem_data_sheet,$format, + $result = &OR_build_problem_data_worksheet($problem_data_sheet,$format, $Concepts,$ORdata); if ($result ne 'okay') { # Do something useful } - $result = &build_student_data_worksheet($student_data_sheet,$format); + $result = &OR_build_student_data_worksheet($student_data_sheet,$format); if ($result ne 'okay') { # Do something useful } - $result = &build_response_data_worksheet($response_data_sheet,$format, + $result = &OR_build_response_data_worksheet($response_data_sheet,$format, $PerformanceData,$Foils, $ORdata); if ($result ne 'okay') { @@ -924,7 +1051,7 @@ sub prepare_optionresponse_excel_sheet { return $result; } -sub build_problem_data_worksheet { +sub OR_build_problem_data_worksheet { my ($worksheet,$format,$Concepts,$ORdata) = @_; my $rows_output = 3; my $cols_output = 0; @@ -993,7 +1120,7 @@ sub build_problem_data_worksheet { return 'okay'; } -sub build_student_data_worksheet { +sub OR_build_student_data_worksheet { my ($worksheet,$format) = @_; my $rows_output = 3; my $cols_output = 0; @@ -1019,7 +1146,7 @@ sub build_student_data_worksheet { return; } -sub build_response_data_worksheet { +sub OR_build_response_data_worksheet { my ($worksheet,$format,$PerformanceData,$Foils,$ORdata)=@_; my $rows_output = 3; my $cols_output = 0; @@ -1269,16 +1396,24 @@ sub build_foil_index { ten => 10,); my $a1 = lc($a); my $b1 = lc($b); - if (exists($Numbers{$a})) { - $a1 = $Numbers{$a}; + if (exists($Numbers{$a1})) { + $a1 = $Numbers{$a1}; } - if (exists($Numbers{$b})) { - $b1 = $Numbers{$b}; + if (exists($Numbers{$b1})) { + $b1 = $Numbers{$b1}; + } + if (($a1 =~/^\d+$/) && ($b1 =~/^\d+$/)) { + return $a1 <=> $b1; + } else { + return $a1 cmp $b1; } - $a1 cmp $b1; }; my @Concepts; foreach my $concept (sort $sortfunction (keys(%Concepts))) { + if (! defined($Concepts{$concept})) { + $Concepts{$concept}=[]; +# next; + } push(@Concepts,{ name => $concept, foils => [@{$Concepts{$concept}}]}); push(@Foils,(@{$Concepts{$concept}})); @@ -1311,18 +1446,18 @@ sub build_foil_index { if (@Concepts > 1) { $table .= ''. ''.$conceptindex.''. - ''.$concept->{'name'}.''. + ''.&HTML::Entities::encode($concept->{'name'}).''. ''.$foilindex++.''. - ''.$Foildata{$firstfoil}->{'name'}.''. + ''.&HTML::Entities::encode($Foildata{$firstfoil}->{'name'}).''. ''.$Foildata{$firstfoil}->{'text'}.''. - ''.$Foildata{$firstfoil}->{'value'}.''. + ''.&HTML::Entities::encode($Foildata{$firstfoil}->{'value'}).''. "\n"; } else { $table .= ''. ''.$foilindex++.''. - ''.$Foildata{$firstfoil}->{'name'}.''. + ''.&HTML::Entities::encode($Foildata{$firstfoil}->{'name'}).''. ''.$Foildata{$firstfoil}->{'text'}.''. - ''.$Foildata{$firstfoil}->{'value'}.''. + ''.&HTML::Entities::encode($Foildata{$firstfoil}->{'value'}).''. "\n"; } foreach my $foilid (@FoilsInConcept) { @@ -1331,16 +1466,16 @@ sub build_foil_index { ''. ''. ''.$foilindex.''. - ''.$Foildata{$foilid}->{'name'}.''. + ''.&HTML::Entities::encode($Foildata{$foilid}->{'name'}).''. ''.$Foildata{$foilid}->{'text'}.''. - ''.$Foildata{$foilid}->{'value'}.''. + ''.&HTML::Entities::encode($Foildata{$foilid}->{'value'}).''. "\n"; } else { $table .= ''. ''.$foilindex.''. - ''.$Foildata{$foilid}->{'name'}.''. + ''.&HTML::Entities::encode($Foildata{$foilid}->{'name'}).''. ''.$Foildata{$foilid}->{'text'}.''. - ''.$Foildata{$foilid}->{'value'}.''. + ''.&HTML::Entities::encode($Foildata{$foilid}->{'value'}).''. "\n"; } } continue { @@ -1365,7 +1500,7 @@ sub build_option_index { ''. ''. (' 'x4).''. - ''.$option.''. + ''.&HTML::Entities::encode($option).''. "\n"); } shift(@Rows); # Throw away 'correct option chosen' color @@ -1482,180 +1617,6 @@ sub CreateInterface { return $Str; } -sub ProblemSelector { - my $Str; - $Str = "\n\n"; - foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) { - next if ($seq->{'num_assess'}<1); - my $seq_str = ''; - foreach my $res (@{$seq->{'contents'}}) { - next if ($res->{'type'} ne 'assessment'); - foreach my $part (@{$res->{'parts'}}) { - my $partdata = $res->{'partdata'}->{$part}; -# &Apache::lonnet::logthis('----------------'); -# while (my ($k,$v)=each(%$partdata)) { -# if (ref($v) eq 'ARRAY') { -# &Apache::lonnet::logthis($k.' = '.join(',',@$v)); -# } else { -# &Apache::lonnet::logthis($k.' = '.$v); -# } -# } - if ((! exists($partdata->{'option'}) || - $partdata->{'option'} == 0 ) && - (! exists($partdata->{'radiobutton'}) || - $partdata->{'radiobutton'} == 0)) { - next; - } - for (my $i=0;$i{'ResponseTypes'}});$i++){ - my $respid = $partdata->{'ResponseIds'}->[$i]; - my $resptype = $partdata->{'ResponseTypes'}->[$i]; -# if ($resptype eq 'option' ){ - if ($resptype eq 'option' || $resptype eq 'radiobutton') { - my $value = &make_target_id({symb=>$res->{'symb'}, - part=>$part, - respid=>$respid, - resptype=>$resptype}); - my $checked = ''; - if ($ENV{'form.problemchoice'} eq $value) { - $checked = 'checked '; - } - my $title = $res->{'title'}; - if (! defined($title) || $title eq '') { - ($title) = ($res->{'src'} =~ m:/([^/]*)$:); - } - $seq_str .= '\n"; - } - } - } - } - if ($seq_str ne '') { - $Str .= ''. - "\n".$seq_str; - } - } - $Str .= "
'. - ''. - ''. -#.$resptype.''. - ''.$title.' '; -# ''.$resptype.' '.$res->{'title'}.' '; - if ($partdata->{'option'} > 1) { - $seq_str .= &mt('response').' '.$respid; - } - $seq_str .= "
 '.$seq->{'title'}.'
\n"; - return $Str; -} - -######################################################### -######################################################### -## -## Misc functions -## -######################################################### -######################################################### -sub get_problem_symb { - my $problemstring = shift(); - my ($symb,$partid,$respid,$resptype) = split(':',$problemstring); - return ({ symb => $symb, - part => $partid, - respid => $respid, - type => $resptype } ); -} - -sub get_resource_from_symb { - my ($symb) = @_; - foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) { - foreach my $res (@{$seq->{'contents'}}) { - if ($res->{'symb'} eq $symb) { - return $res; - } - } - } - return undef; -} - -sub get_prev_curr_next { - my ($target) = @_; - # - # Build an array with the data we need to search through - my @Resource; - foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) { - foreach my $res (@{$seq->{'contents'}}) { - next if ($res->{'type'} ne 'assessment'); - foreach my $part (@{$res->{'parts'}}) { - my $partdata = $res->{'partdata'}->{$part}; - for (my $i=0;$i{'ResponseTypes'}});$i++){ - my $respid = $partdata->{'ResponseIds'}->[$i]; - my $resptype = $partdata->{'ResponseTypes'}->[$i]; - next if ($resptype ne 'option' && - $resptype ne 'radiobutton'); - push (@Resource, - { symb => $res->{symb}, - part => $part, - respid => $partdata->{'ResponseIds'}->[$i], - resource => $res, - resptype => $resptype - } ); - } - } - } - } - # - # - # Get the index of the current situation - my $curr_idx; - for ($curr_idx=0;$curr_idx<$#Resource;$curr_idx++) { - my $curr_item = $Resource[$curr_idx]; - last if ($curr_item->{'symb'} eq $target->{'symb'} && - $curr_item->{'part'} eq $target->{'part'} && - $curr_item->{'respid'} eq $target->{'respid'} && - $curr_item->{'resptype'} eq $target->{'resptype'}); - } - my $curr_item = $Resource[$curr_idx]; - if ($curr_item->{'symb'} ne $target->{'symb'} || - $curr_item->{'part'} ne $target->{'part'} || - $curr_item->{'respid'} ne $target->{'respid'} || - $curr_item->{'resptype'} ne $target->{'resptype'}){ - # bogus symb - return nothing - return (undef,undef,undef); - } - # - # Now just pick up the data we need - my ($prev,$curr,$next); - if ($curr_idx == 0) { - $prev = undef; - $curr = $Resource[$curr_idx ]; - $next = $Resource[$curr_idx+1]; - } elsif ($curr_idx == $#Resource) { - $prev = $Resource[$curr_idx-1]; - $curr = $Resource[$curr_idx ]; - $next = undef; - } else { - $prev = $Resource[$curr_idx-1]; - $curr = $Resource[$curr_idx ]; - $next = $Resource[$curr_idx+1]; - } - return ($prev,$curr,$next); -} - -sub make_target_id { - my ($target) = @_; - my $id = &Apache::lonnet::escape($target->{'symb'}).':'. - &Apache::lonnet::escape($target->{'part'}).':'. - &Apache::lonnet::escape($target->{'respid'}).':'. - &Apache::lonnet::escape($target->{'resptype'}); - return $id; -} - -sub get_target_from_id { - my ($id) = @_; - my ($symb,$part,$respid,$resptype) = split(':',$id); - return ({ symb =>&Apache::lonnet::unescape($symb), - part =>&Apache::lonnet::unescape($part), - respid =>&Apache::lonnet::unescape($respid), - resptype =>&Apache::lonnet::unescape($resptype)}); -} - ######################################################### ######################################################### ## @@ -1707,6 +1668,7 @@ sub Process_OR_Row { my @Foilsubs = split('&',$submission); for (my $j=0;$j<=$#Foilgrades;$j++) { my ($foilid,$correct) = split('=',$Foilgrades[$j]); + $foilid = &Apache::lonnet::unescape($foilid); my (undef,$submission) = split('=',$Foilsubs[$j]); if ($correct) { $RowData{$foilid}->{'_correct'}++; @@ -1719,6 +1681,27 @@ sub Process_OR_Row { return %RowData; } + +sub analyze_problem_as_student { + my ($resource,$sname,$sdom,$partid,$respid) = @_; + my $url = $resource->{'src'}; + my $symb = $resource->{'symb'}; + my $courseid = $ENV{'request.course.id'}; + my $Answ=&Apache::lonnet::ssi($url,('grade_target' => 'analyze', + 'grade_domain' => $sdom, + 'grade_username' => $sname, + 'grade_symb' => $symb, + 'grade_courseid' => $courseid)); + (my $garbage,$Answ)=split(/_HASH_REF__/,$Answ,2); + my %Answer=&Apache::lonnet::str2hash($Answ); + my $key = $partid.'.'.$respid.'.answer'; + my $student_answer = $Answer{$key}->[0]; + if (! defined($student_answer)) { + $student_answer = $Answer{$key}->[1]; + } + return ($student_answer); +} + ## ## get problem data and put it into a useful data structure. ## note: we must force each foil and option to not begin or end with @@ -1733,6 +1716,17 @@ sub get_problem_data { my %Partdata; foreach my $part (@{$Answer{'parts'}}) { while (my($key,$value) = each(%Answer)) { + # + # Logging code: + if (0) { + &Apache::lonnet::logthis($part.' got key "'.$key.'"'); + if (ref($value) eq 'ARRAY') { + &Apache::lonnet::logthis(' '.join(',',@$value)); + } else { + &Apache::lonnet::logthis(' '.$value); + } + } + # End of logging code next if ($key !~ /^$part/); $key =~ s/^$part\.//; if (ref($value) eq 'ARRAY') { @@ -1746,6 +1740,8 @@ sub get_problem_data { $Partdata{$part}->{'_Foils'}->{$foil}->{'_Concept'}= $concept; } + } elsif ($key =~ /^(incorrect|answer|ans_low|ans_high)$/) { + $Partdata{$part}->{$key}=$value; } } else { if ($key=~ /^foil\.text\.(.*)$/) { @@ -1766,11 +1762,3 @@ sub get_problem_data { 1; __END__ - -##### -# partdata{part}->{_Foils}->{foilid}->{'name'} = $ -# ->{'text'} = $ -# ->{'value'} = $ -# ->{'_Concept'} = $ -# partdata{part}->{_Options} = @ -# partdata{part}->{_Concepts} = @