--- loncom/interface/statistics/lonproblemanalysis.pm 2002/08/13 00:37:18 1.5 +++ loncom/interface/statistics/lonproblemanalysis.pm 2003/10/09 22:10:02 1.28 @@ -1,7 +1,6 @@ # The LearningOnline Network with CAPA -# (Publication Handler # -# $Id: lonproblemanalysis.pm,v 1.5 2002/08/13 00:37:18 stredwic Exp $ +# $Id: lonproblemanalysis.pm,v 1.28 2003/10/09 22:10:02 matthew Exp $ # # Copyright Michigan State University Board of Trustees # @@ -25,444 +24,427 @@ # # http://www.lon-capa.org/ # -# (Navigate problems for statistical reports -# YEAR=2001 -# 5/5,7/9,7/25/1,8/11,9/13,9/26,10/5,10/9,10/22,10/26 Behrouz Minaei -# 11/1,11/4,11/16,12/14,12/16,12/18,12/20,12/31 Behrouz Minaei -# YEAR=2002 -# 1/22,2/1,2/6,2/25,3/2,3/6,3/17,3/21,3/22,3/26,4/7,5/6 Behrouz Minaei -# 5/12,5/14,5/15,5/19,5/26,7/16 Behrouz Minaei -# -### -package Apache::lonproblemanalysis; +package Apache::lonproblemanalysis; use strict; use Apache::lonnet(); -use GDBM_File; - -my $jr; +use Apache::loncommon(); +use Apache::lonhtmlcommon(); +use Apache::loncoursedata(); +use Apache::lonstatistics; +use Apache::lonlocal; sub BuildProblemAnalysisPage { - my ($cacheDB, $r)=@_; - - my %cache; - unless(tie(%cache,'GDBM_File',$cacheDB,&GDBM_READER(),0640)) { - $r->print('Unable to tie database.'); - return; + my ($r,$c)=@_; + $r->print('

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

'); + $r->print(&CreateInterface()); + # + my @Students = @Apache::lonstatistics::Students; + # + if (exists($ENV{'form.problemchoice'})) { + $r->print('
'); + &Apache::lonstatistics::Gather_Full_Student_Data($r); + # + my ($symb,$part,$resid) = &get_problem_symb( + &Apache::lonnet::unescape($ENV{'form.problemchoice'}) + ); + # +# my ($firsttime,$lasttime) = +# &Apache::loncoursedata::get_timestamp_data($symb,$resid); + # + my $resource = &get_resource_from_symb($symb); + if (defined($resource)) { + my %Data = &get_problem_data($resource->{'src'}); + my $ORdata = $Data{$part.'.'.$resid}; + ## + ## 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/
/<\/nop>/g; + $r->print('
'. + ''. + $rendered_problem. + '
'); + ## + ## Analyze the problem + my $PerformanceData = + &Apache::loncoursedata::get_optionresponse_data + (\@Students,$symb,$resid); + if (defined($PerformanceData) && + ref($PerformanceData) eq 'ARRAY') { + if ($ENV{'form.AnalyzeBy'} eq 'Tries') { + my $analysis_html = &DoTriesAnalysis($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('

'. + &mt('The analysis you have selected is '. + 'not supported at this time'). + '

'); + } + } else { + $r->print('

'. + &mt('There is no student data for this problem.'). + '

'); + } + } else { + $r->print('resource is undefined'); + } + $r->print('
'); + } else { + $r->print('

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

'); } - - $r->print(&IntervalOptions($cache{'Interval'})); - $r->rflush(); - $r->print(&OptionResponseTable($cache{'OptionResponses'}, \%cache)); - - untie(%cache); - - return; -} - -sub BuildAnalyzePage { - my ($cacheDB, $students, $courseID,$r)=@_; - - $jr = $r; - my $c = $r->connection; - - my $Str = '
'; - my %cache; - if(&Apache::loncoursedata::DownloadStudentCourseDataSeparate($students, 'true', - $cacheDB, 'true', - 'true', $courseID, - $r, $c) ne 'OK') { - $r->print($Str); - return; - } - - - unless(tie(%cache,'GDBM_File',$cacheDB,&GDBM_READER(),0640)) { - $Str .= 'Unable to tie database.'; - $r->print($Str); - return; - } - - my ($problemId, $part, $responseId)=split(':',$cache{'AnalyzeInfo'}); - my $uri = $cache{$problemId.':source'}; - my $problem = $cache{$problemId.':problem'}; - my $title = $cache{$problemId.':title'}; - my $interval = $cache{'Interval'}; - - my %ConceptData; - $ConceptData{"Interval"} = $interval; - - #Initialize the option response true answers - my ($analyzeData) = &InitAnalysis($uri, $part, $responseId, $problem, - $students->[0], $courseID); - if(defined($analyzeData->{'error'})) { - $Str .= $analyzeData->{'error'}.'
Incorrect part requested.
'; - $r->print($Str); - return; - } - - $r->print($Str); - $Str = ''; - if($c->aborted()) { untie(%cache); return; } - - #compute the intervals - &Interval($part, $problem, $interval, $analyzeData->{'concepts'}, - \%ConceptData); - - $title =~ s/\ /"_"/eg; - $Str .= '
'.$uri.''; - - $r->print($Str); - $Str = ''; - if($c->aborted()) { untie(%cache); return; } - - #Java script Progress window - for(my $index=0; $index<(scalar @$students); $index++) { - if($c->aborted()) { untie(%cache); return; } - &OpStatus($problemId, $students->[$index], \%ConceptData, - $analyzeData->{'foil_to_concept'}, $analyzeData, \%cache); - } - - $Str .= '
'; - for (my $k=0; $k<$interval; $k++ ) { - if($c->aborted()) { untie(%cache); return $Str; } - $Str .= &DrawGraph($k, $title, $analyzeData->{'concepts'}, - \%ConceptData); - $r->print($Str); - $Str = ''; - } - for (my $k=0; $k<$interval; $k++ ) { - if($c->aborted()) { untie(%cache); return $Str; } - $Str .= &DrawTable($k, $analyzeData->{'concepts'}, \%ConceptData); - $r->print($Str); - $Str = ''; - } - my $Answ=&Apache::lonnet::ssi($uri); - $Str .= '
Here you can see the Problem:
'.$Answ; - $Str .= '
'; - $r->print($Str); - - untie(%cache); - - return; + # Okay, they asked for data, so make sure we get the latest data. + $r->print(&OptionResponseProblemSelector()); } -#---- Problem Analysis Web Page ---------------------------------------------- -sub IntervalOptions { - my ($selectedInterval)=@_; - - my $interval = 1; - for(my $n=1; $n<=7; $n++) { - if($selectedInterval == $n) { - $interval = $n; +sub DoTriesAnalysis { + my ($PerformanceData,$ORdata) = @_; + my $mintries = 1; + my $maxtries = 10; + my %ResponseData = &analyze_option_data_by_tries($PerformanceData, + $mintries,$maxtries); + my @Foils = sort(keys(%ResponseData)); + my %Row_Label; + foreach my $foilid (@Foils) { + my $value = $ORdata->{'Foiltext'}->{$foilid}; +# &Apache::lonnet::logthis('row label '.$foilid.' = '.$value); + $Row_Label{$foilid} = $ORdata->{'Foiltext'}->{$foilid}; + } + my @Rows; + $Rows[0] = [' ']; + for (my $i=$mintries;$i<=$maxtries;$i++) { + push (@{$Rows[0]}, + ''.&mt('Attempt').' '.$i.''); + } + $Rows[1] = [''.&mt('Foil').'']; + for (my $i=$mintries;$i<=$maxtries;$i++) { + push (@{$Rows[1]},(''.&mt('Correct').'', + ''.&mt('Incorrect').'', + ''.&mt('Percent Correct').'', + )); + } + my @PlotData; + my @CumulativePlotData; + my $index = 1; + foreach my $foilid (@Foils) { + my @Data = (''.$index.' '.$Row_Label{$foilid}.''); + for (my $i=$mintries;$i<=$maxtries;$i++) { + push(@Data, + (''.$ResponseData{$foilid}->[$i]->{'correct'}.'', + ''.$ResponseData{$foilid}->[$i]->{'incorrect'}. + '', + ''. + sprintf("%4.2f", + $ResponseData{$foilid}->[$i]->{'percent_corr'}). + '')); + # + # Gather the per-attempt data + push (@{$PlotData[$i]->{'good'}}, + $ResponseData{$foilid}->[$i]->{'percent_corr'}); + push (@{$PlotData[$i]->{'bad'}}, + 100-$ResponseData{$foilid}->[$i]->{'percent_corr'}); } - } - - my $Ptr = '
Select number of intervals'."\n". - ''."\n"; - - return $Ptr; -} - -sub OptionResponseTable { - my ($optionResponses,$cache)=@_; - my $Str = ''; - $Str .= '
Option Response Problems in this course:'."\n"; - $Str .= '

'."\n"; - $Str .= ""; - $Str .= ''."\n"; - - my $number=1; - my @optionResponses=split(':::', $optionResponses); - my %partCount; - foreach (@optionResponses) { - my ($problemId, $part, undef)=split(':',$_); - $partCount{$problemId.':'.$part}++; - } - - foreach (@optionResponses) { - my ($problemId, $part, $response)=split(':',$_); - my $uri = $cache->{$problemId.':source'}; - my $title = $cache->{$problemId.':title'}; - - my $Temp = ''.$title.''; - $Str .= ''; - $Str .= ''; - $Str .= ''; - $Str .= ''; - if($partCount{$problemId.':'.$part} < 2) { - $Str .= ''."\n"; + push(@Rows,\@Data); + } continue { + $index++; + } + my @Data = (''); + 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'}; + } + if ($maxstu < $ResponseData{$foilid}->[$i]->{'total'}) { + $maxstu = $ResponseData{$foilid}->[$i]->{'total'}; + } + } + $maxstu = 0 if (! $maxstu); + $minstu = 0 if (! $minstu); + my $graphlink; + if ($maxstu == $minstu) { + $graphlink = &Apache::loncommon::DrawGraph + ('Attempt '.$i.', '.$maxstu.' students', + 'Foil Number', + 'Percent Correct', + 100, + $PlotData[$i]->{'good'}, + $PlotData[$i]->{'bad'}); } else { - $Str .= ''."\n"; + $graphlink = &Apache::loncomon::DrawGraph + ('Attempt '.$i.', '.$minstu.'-'.$maxstu. + ' students', + 'Foil Number', + 'Percent Correct', + 100, + $PlotData[$i]->{'good'}, + $PlotData[$i]->{'bad'}); } - $number++; + push(@Data,''); } - $Str .= '
\# Problem Title Resource Analysis
'.$number.' '.$Temp.''.$uri.'
'.$graphlink.'
'."\n"; - - return $Str; + push (@Rows,\@Data); + my $table = ''."\n"; + for (my $i=0; $i <=$#Rows;$i++) { + $table .= ''.join('',@{$Rows[$i]})."\n"; + } + $table .= '
'; + return ($table); } -#---- END Problem Analysis Web Page ------------------------------------------ - -#---- Analyze Web Page ------------------------------------------------------- - -#restore the student submissions and finding the result -sub OpStatus { - my ($problemID, $student, $ConceptData, $foil_to_concept, - $analyzeData, $cache)=@_; - - my $ids = $analyzeData->{'parts'}; - my @True = (); - my @False = (); - my $flag=0; - - my $tries=0; - - foreach my $id (@$ids) { - my ($part, $response) = split(/\./, $id); - my $time=$cache->{$student.':'.$problemID.':'.$part.':timestamp'}; - my @submissions = split(':::', $cache->{$student.':'.$problemID.':'. - $part.':'.$response. - ':submission'}); - foreach my $Resp (@submissions) { - my %submission=&Apache::lonnet::str2hash($Resp); - foreach (keys(%submission)) { - if($submission{$_}) { - my $answer = $analyzeData->{$id.'.foil.value.'.$_}; - if($submission{$_} eq $answer) { - &Decide("true", $foil_to_concept->{$_}, - $time, $ConceptData); +sub analyze_option_data_by_tries { + my ($PerformanceData,$mintries,$maxtries) = @_; + my %Trydata; + $mintries = 1 if (! defined($mintries) || $mintries < 1); + $maxtries = $mintries if (! defined($maxtries) || $maxtries < $mintries); + foreach my $row (@$PerformanceData) { + next if (! defined($row)); + my ($grading,$submission,$time,$tries) = @$row; + my @Foilgrades = split('&',$grading); + my @Foilsubs = split('&',$submission); + for (my $numtries = 1; $numtries <= $maxtries; $numtries++) { + if ($tries == $numtries) { + foreach my $foilgrade (@Foilgrades) { + my ($foilid,$correct) = split('=',$foilgrade); + if ($correct) { + $Trydata{$foilid}->[$numtries]->{'correct'}++; } else { - &Decide("false", $foil_to_concept->{$_}, - $time, $ConceptData); - } + $Trydata{$foilid}->[$numtries]->{'incorrect'}++; + } } } } } - - return; -} - -sub DrawGraph { - my ($k,$Src,$Concepts,$ConceptData)=@_; - my $Max=0; - my @data1; - my @data2; - - # Adjust Data and find the Max - for (my $n=0; $n<(scalar @$Concepts); $n++ ) { - my $tmp=$Concepts->[$n]; - $data1[$n]=$ConceptData->{$tmp.'.'.$k.'.true'}; - $data2[$n]=$ConceptData->{$tmp.'.'.$k.'.false'}; - my $Sum=$data1[$n]+$data2[$n]; - if($Max < $Sum) { - $Max=$Sum; - } - } - for (my $n=0; $n<(scalar @$Concepts); $n++ ) { - if ($data1[$n]+$data2[$n]<$Max) { - $data2[$n]+=$Max-($data1[$n]+$data2[$n]); - } - } - my $P_No = (scalar @data1); - - if($Max > 1) { - $Max += (10 - $Max % 10); - $Max = int($Max); - } else { - $Max = 1; + foreach my $foilid (keys(%Trydata)) { + foreach my $tryhash (@{$Trydata{$foilid}}) { + next if ((! exists($tryhash->{'correct'}) && + ! exists($tryhash->{'incorrect'})) || + ($tryhash->{'correct'} < 1 && + $tryhash->{'incorrect'} < 1)); + $tryhash->{'total'} = $tryhash->{'correct'} + + $tryhash->{'incorrect'}; + $tryhash->{'percent_corr'} = 100 * + ($tryhash->{'correct'} / + ($tryhash->{'correct'} + $tryhash->{'incorrect'}) + ); + } } + return %Trydata; +} - my $Titr=($ConceptData->{'Interval'}>1) ? $Src.'_interval_'.($k+1) : $Src; -# $GData=$Titr.'&Concepts'.'&'.'Answers'.'&'.$Max.'&'.$P_No.'&'.$data1.'&'.$data2; - my $GData = ''; - $GData = $Titr.'&Concepts&Answers&'.$Max.'&'.$P_No.'&'; - $GData .= (join(',',@data1)).'&'.(join(',',@data2)); - - return ''; +sub get_problem_symb { + my $problemstring = shift(); + my ($symb,$partid,$resid) = ($problemstring=~ /^(.*):([^:]*):([^:]*)$/); + return ($symb,$partid,$resid); } -sub DrawTable { - my ($k,$Concepts,$ConceptData)=@_; - my $Max=0; - my @data1; - my @data2; - my $Correct=0; - my $Wrong=0; - for(my $n=0; $n<(scalar @$Concepts); $n++ ) { - my $tmp=$Concepts->[$n]; - $data1[$n]=$ConceptData->{$tmp.'.'.$k.'.true'}; - $Correct+=$data1[$n]; - $data2[$n]=$ConceptData->{$tmp.'.'.$k.'.false'}; - $Wrong+=$data2[$n]; - my $Sum=$data1[$n]+$data2[$n]; - if($Max < $Sum) { - $Max=$Sum; - } - } - for(my $n=0; $n<(scalar @$Concepts); $n++ ) { - if ($data1[$n]+$data2[$n]<$Max) { - $data2[$n]+=$Max-($data1[$n]+$data2[$n]); - } +sub CreateInterface { + ## + ## Environment variable initialization + if (! exists$ENV{'form.AnalyzeBy'}) { + $ENV{'form.AnalyzeBy'} = 'Tries'; } - my $P_No = (scalar @data1); + ## + ## Build the menu my $Str = ''; -# $Str .= '
From: ['.localtime($ConceptData->{'Int.'.($k-1)}); -# $Str .= '] To: ['.localtime($ConceptData->{"Int.$k"}).']'; - $Str .= "\n".''. - "\n".''. - "\n".''. - "\n".''. - "\n".''. - "\n".''. - "\n".''; - - for(my $n=0; $n<(scalar @$Concepts); $n++ ) { - $Str .= ''."\n"; - $Str .= ''."\n"; - my ($currentConcept) = split('::',$Concepts->[$n]); - $Str .= ''."\n"; - $Str .= ''."\n"; - $Str .= ''."\n"; - $Str .= ''."\n"; - } - $Str .= ''; + $Str .= '
# Concept Correct Wrong
'.($n+1).''.$currentConcept; - $Str .= ''.$data1[$n].''.$data2[$n].'
From:['.localtime($ConceptData->{'Int.'.$k}); - $Str .= '] To: ['.localtime($ConceptData->{'Int.'.($k+1)}-1); - $Str .= ']'.$Correct.''.$Wrong.'
'."\n"; + $Str .= ''; + $Str .= ''; + $Str .= ''; + $Str .= ''; + $Str .= ''; + $Str .= ''."\n"; + # + $Str .= ''; + # + $Str .= ''; + # + $Str .= ''; + # + $Str .= ''; + # + $Str .= ''."\n"; $Str .= '
'.&mt('Sections').''.&mt('Enrollment Status').''.&mt('Sequences and Folders').''.&mt('Analyze By').'
'."\n"; + $Str .= &Apache::lonstatistics::SectionSelect('Section','multiple',5); + $Str .= ''; + $Str .= &Apache::lonhtmlcommon::StatusOptions(undef,undef,5); + $Str .= ''; + my $only_seq_with_assessments = sub { + my $s=shift; + if ($s->{'num_assess'} < 1) { + return 0; + } else { + return 1; + } + }; + $Str .= &Apache::lonstatistics::MapSelect('Maps','multiple,all',5, + $only_seq_with_assessments); + $Str .= ''; + $Str .=''; + $Str .=''; + $Str .= '
'."\n"; - - return $Str; -#$Apache::lonxml::debug=1; -#&Apache::lonhomework::showhash(%ConceptData); -#$Apache::lonxml::debug=0; + $Str .= ''; + $Str .= ' 'x5; + $Str .= ''; + $Str .= ' 'x5; + return ($Str); } -#---- END Analyze Web Page ---------------------------------------------- - -sub Decide { - #deciding the true or false answer belongs to each interval - my ($type,$concept,$time,$ConceptData)=@_; - my $k=0; - while($time > $ConceptData->{'Int.'.($k+1)} && - $k < $ConceptData->{'Interval'}) { - $k++; +sub OptionResponseProblemSelector { + 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'}}) { +# &Apache::lonnet::logthis('checking '.$res->{'title'}); + next if ($res->{'type'} ne 'assessment'); + foreach my $part (@{$res->{'parts'}}) { + my $partdata = $res->{'partdata'}->{$part}; + if (! exists($partdata->{'option'}) || + $partdata->{'option'} == 0) { + next; + } + for (my $i=0;$i{'ResponseTypes'}});$i++){ + my $respid = $partdata->{'ResponseIds'}->[$i]; + my $resptype = $partdata->{'ResponseTypes'}->[$i]; + if ($resptype eq 'option') { + my $value = &Apache::lonnet::escape($res->{'symb'}.':'.$part.':'.$respid); + my $checked = ''; + if ($ENV{'form.problemchoice'} eq $value) { + $checked = 'checked '; + } + $seq_str .= '\n"; + } + } + } + } + if ($seq_str ne '') { + $Str .= ''. + "\n".$seq_str; + } } - $ConceptData->{$concept.'.'.$k.'.'.$type}++; - - return; + $Str .= "
'. + ''. + ''. + ''.$res->{'title'}.' '; + if ($partdata->{'option'} > 1) { + $seq_str .= &mt('response').' '.$respid; + } + $seq_str .= "
 '.$seq->{'title'}.'
\n"; + return $Str; } -sub InitAnalysis { - my ($uri,$part,$responseId,$problem,$student,$courseID)=@_; - my ($name,$domain)=split(/\:/,$student); - - my %analyzeData; - # Render the student's view of the problem. $Answ is the problem - # Stringafied - my $Answ=&Apache::lonnet::ssi($uri,('grade_target' => 'analyze', - 'grade_username' => $name, - 'grade_domain' => $domain, - 'grade_courseid' => $courseID, - 'grade_symb' => $problem)); - my ($a)=&Apache::lonnet::str2hashref($Answ); - my %b; - foreach (keys(%$a)) { - $b{&Apache::lonnet::unescape($_)} = $a->{$_}; - } - my $Answer=\%b; - - my $found = 0; - my @parts=(); - if(defined($responseId)) { - foreach (@{$Answer->{'parts'}}) { - if($_ eq $part.'.'.$responseId) { - push(@parts, $_); - $found = 1; - last; - } - } - } else { - foreach (@{$Answer->{'parts'}}) { - if($_ =~ /$part/) { - push(@parts, $_); - $found = 1; - last; +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; +} - if($found == 0) { - $analyzeData{'error'} = 'No parts matching selected values'; - return \%analyzeData; - } - - my @Concepts=(); - my %foil_to_concept; - foreach my $currentPart (@parts) { - if(defined($Answer->{$currentPart.'.concepts'})) { - foreach my $concept (@{$Answer->{$currentPart.'.concepts'}}) { - push(@Concepts, $concept); - foreach my $foil (@{$Answer->{$currentPart.'.concept.'. - $concept}}) { - $analyzeData{$currentPart.'.foil.value.'.$foil} = - $Answer->{$currentPart.'.foil.value.'.$foil}; - $foil_to_concept{$foil} = $concept; +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)) { + next if ($key !~ /^$part/); + $key =~ s/^$part\.//; + if (ref($value) eq 'ARRAY') { + if ($key eq 'options') { + $Partdata{$part}->{'Options'}=$value; + } elsif ($key eq 'concepts') { + $Partdata{$part}->{'Concepts'}=$value; + } elsif ($key =~ /^concept\.(.*)$/) { + my $concept = $1; + foreach my $foil (@$value) { + $Partdata{$part}->{$foil}->{'Concept'}=$concept; + } } - } - } else { - foreach (keys(%$Answer)) { - if(/$currentPart.foil\.value\.(.*)$/) { - push(@Concepts, $1); - $foil_to_concept{$1} = $1; - $analyzeData{$currentPart.'.foil.value.'.$1} = - $Answer->{$currentPart.'.foil.value.'.$1}; + # &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; + } elsif ($key =~ /^foil\.value\.(.*)$/) { + my $foil = $1; + $Partdata{$part}->{'FoilValues'}->{$foil}=$value; } +# &Apache::lonnet::logthis($part.' '.$key.' = '.$value); } } } - $analyzeData{'parts'} = \@parts; - $analyzeData{'concepts'} = \@Concepts; - $analyzeData{'foil_to_concept'} = \%foil_to_concept; - - return \%analyzeData; +# 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; } -sub Interval { - my ($part,$symb,$interval,$Concepts,$ConceptData)=@_; - my $Int=$interval; - my $due = &Apache::lonnet::EXT('resource.'.$part.'.duedate',$symb); - my $opn = &Apache::lonnet::EXT('resource.'.$part.'.opendate',$symb); - my $add=int(($due-$opn)/$Int); - $ConceptData->{'Int.0'}=$opn; - for(my $i=1; $i<$Int; $i++) { - $ConceptData->{'Int.'.$i}=$opn+$i*$add; - } - $ConceptData->{'Int.'.$Int}=$due; - for(my $i=0; $i<$Int; $i++) { - for(my $n=0; $n<(scalar @$Concepts); $n++ ) { - my $tmp=$Concepts->[$n]; - $ConceptData->{$tmp.'.'.$i.'.true'}=0; - $ConceptData->{$tmp.'.'.$i.'.false'}=0; - } - } -} 1; + __END__