--- loncom/interface/statistics/lonproblemanalysis.pm 2002/07/24 14:52:32 1.1 +++ loncom/interface/statistics/lonproblemanalysis.pm 2002/08/13 14:44:33 1.6 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # (Publication Handler # -# $Id: lonproblemanalysis.pm,v 1.1 2002/07/24 14:52:32 stredwic Exp $ +# $Id: lonproblemanalysis.pm,v 1.6 2002/08/13 14:44:33 stredwic Exp $ # # Copyright Michigan State University Board of Trustees # @@ -41,80 +41,111 @@ use strict; use Apache::lonnet(); use GDBM_File; +my $jr; + sub BuildProblemAnalysisPage { - my ($cacheDB)=@_; + my ($cacheDB, $r)=@_; my %cache; - my $Str = ''; - unless(tie(%cache,'GDBM_File',$cacheDB,&GDBM_READER,0640)) { - $Str .= 'Unable to tie database.'; - return $Str; + unless(tie(%cache,'GDBM_File',$cacheDB,&GDBM_READER(),0640)) { + $r->print('Unable to tie database.'); + return; } - $Str .= &IntervalOptions($cache{'Interval'}); - $Str .= &OptionResponseTable($cache{'OptionResponses'}); + $r->print(&IntervalOptions($cache{'Interval'})); + $r->rflush(); + $r->print(&OptionResponseTable($cache{'OptionResponses'}, \%cache)); untie(%cache); - return $Str; + return; } sub BuildAnalyzePage { - my ($cacheDB, $students, $courseID)=@_; + my ($cacheDB, $students, $courseID,$r)=@_; - my $Str = ''; + $jr = $r; + my $c = $r->connection; + + my $Str = ''; my %cache; - unless(tie(%cache,'GDBM_File',$cacheDB,&GDBM_READER,0640)) { + 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.'; - return $Str; + $r->print($Str); + return; } - my $uri = $cache{'AnalyzeURI'}, - my $part = $cache{'AnalyzePart'}, - my $problem = $cache{'AnalyzeProblem'}, - my $title = $cache{'AnalyzeTitle'}, - my $interval = $cache{'Interval'}, + 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 ($Concepts, $foil_to_concept, $answer) = &InitAnalysis($uri, $part, - $problem, - $students->[0], - $courseID); + 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, $Concepts, \%ConceptData); + &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 - &Create_PrgWin(); - &Update_PrgWin("Starting-to-analyze-problem"); - for (my $index=0;$index<(scalar @$students);$index++) { - &Update_PrgWin($index); - &OpStatus($problem, $students->[$index], $courseID, $answer); + 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); } - &Close_PrgWin(); $Str .= '
'; for (my $k=0; $k<$interval; $k++ ) { - $Str .= &DrawGraph($k, $title, $Concepts, \%ConceptData); + 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++ ) { - $Str .= &DrawTable($k, $Concepts, \%ConceptData); + if($c->aborted()) { untie(%cache); return $Str; } + $Str .= &DrawTable($k, $analyzeData->{'concepts'}, \%ConceptData); + $r->print($Str); + $Str = ''; } -#$Apache::lonxml::debug=1; -#&Apache::lonhomework::showhash(%ConceptData); -#$Apache::lonxml::debug=0; my $Answ=&Apache::lonnet::ssi($uri); $Str .= '
Here you can see the Problem:
'.$Answ; + $Str .= '
'; + $r->print($Str); untie(%cache); - return $Str; + return; } #---- Problem Analysis Web Page ---------------------------------------------- @@ -144,7 +175,7 @@ sub IntervalOptions { } sub OptionResponseTable { - my ($optionResponses)=@_; + my ($optionResponses,$cache)=@_; my $Str = ''; $Str .= '
Option Response Problems in this course:'."\n"; $Str .= '

'."\n"; @@ -152,16 +183,33 @@ sub OptionResponseTable { $Str .= ' Resource Analysis '."\n"; my $number=1; - foreach (split(':::', $optionResponses)) { - my ($uri,$title,$part,$problem)=split('::',$_); + 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 .= ' '.$number.' '; - $Str .= ' '.$Temp.' '; - $Str .= ' '.$uri.' '; - $Str .= ''."\n"; + $Str .= ''.$Temp.''; + $Str .= ''.$uri.''; + if($partCount{$problemId.':'.$part} < 2) { + $Str .= ''."\n"; + } else { + $Str .= ''."\n"; + } $number++; } $Str .= ''."\n"; @@ -175,48 +223,40 @@ sub OptionResponseTable { #restore the student submissions and finding the result sub OpStatus { - my ($problem, $student, $courseID, $ConceptData, $foil_to_concept, - $Answer)=@_; - my ($username,$userdomain)=split(/':'/,$student); - my $code='U'; - my %reshash=&Apache::lonnet::restore($problem, $courseID, $userdomain, - $username); + my ($problemID, $student, $ConceptData, $foil_to_concept, + $analyzeData, $cache)=@_; + + my $ids = $analyzeData->{'parts'}; my @True = (); my @False = (); my $flag=0; - if ($reshash{'version'}) { - my $tries=0; - &Apache::lonhomework::showhash(%$Answer); - for (my $version=1;$version<=$reshash{'version'};$version++) { - my $time=$reshash{"$version:timestamp"}; - - foreach my $key (sort(split(/\:/,$reshash{$version.':keys'}))) { - if (($key=~/\.(\w+)\.(\w+)\.submission$/)) { - my $Id1 = $1; my $Id2 = $2; - #check if this is a repeat submission, if so skip it - if ($reshash{"$version:resource.$Id1.previous"}) { next; } - #if no solved this wasn't a real submission, ignore it - if (!defined($reshash{"$version:resource.$Id1.solved"})) { - &Apache::lonxml::debug("skipping "); - next; - } - my $Resp = $reshash{"$version:$key"}; - my %submission=&Apache::lonnet::str2hash($Resp); - foreach (keys %submission) { - my $Ansr = $Answer->{"$Id1.$Id2.foil.value.$_"}; - if ($submission{$_}) { - if ($submission{$_} eq $Ansr) { - &Decide("true", $foil_to_concept->{$_}, - $time, $ConceptData); - } else { - &Decide("false", $foil_to_concept->{$_}, - $time, $ConceptData);} - } - } - } - } + + 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); + } else { + &Decide("false", $foil_to_concept->{$_}, + $time, $ConceptData); + } + } + } } } + + return; } sub DrawGraph { @@ -296,7 +336,8 @@ sub DrawTable { for(my $n=0; $n<(scalar @$Concepts); $n++ ) { $Str .= ''."\n"; $Str .= ''.($n+1).''."\n"; - $Str .= ''.$Concepts->[$n]; + my ($currentConcept) = split('::',$Concepts->[$n]); + $Str .= ''.$currentConcept; $Str .= ''."\n"; $Str .= ''.$data1[$n].''."\n"; $Str .= ''.$data2[$n].''."\n"; @@ -319,17 +360,20 @@ 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++;} + while($time > $ConceptData->{'Int.'.($k+1)} && + $k < $ConceptData->{'Interval'}) { + $k++; + } $ConceptData->{$concept.'.'.$k.'.'.$type}++; return; } sub InitAnalysis { - my ($uri,$part,$problem,$student,$courseID)=@_; + 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', @@ -337,32 +381,63 @@ sub InitAnalysis { 'grade_domain' => $domain, 'grade_courseid' => $courseID, 'grade_symb' => $problem)); -# my $Answ=&Apache::lonnet::ssi($URI,('grade_target' => 'analyze')); + my ($Answer)=&Apache::lonnet::str2hashref($Answ); -# (my $garbage,$Answ)=split(/_HASH_REF__/,$Answ,2); - my %Answer=(); - %Answer=&Apache::lonnet::str2hash($Answ); - - my $parts=''; - foreach my $elm (@{$Answer{'parts'}}) { - $parts.= $elm.','; + 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; + } + } } - $parts =~ s/,$//; - my @Concepts=(); - foreach my $elm (@{$Answer{$parts.'.concepts'}}) { - push(@Concepts, $elm); + if($found == 0) { + $analyzeData{'error'} = 'No parts matching selected values'; + return \%analyzeData; } + my @Concepts=(); my %foil_to_concept; - foreach my $concept (@Concepts) { - foreach my $foil (@{$Answer{$parts.'.concept.'.$concept}}) { - $foil_to_concept{$foil} = $concept; - #$ConceptData{$foil} = $Answer{$parts.'.foil.value.'.$foil}; - } + 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; + } + } + } 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}; + } + } + } } - return (\@Concepts, \%foil_to_concept, \%Answer); + $analyzeData{'parts'} = \@parts; + $analyzeData{'concepts'} = \@Concepts; + $analyzeData{'foil_to_concept'} = \%foil_to_concept; + + return \%analyzeData; } sub Interval { @@ -372,12 +447,12 @@ sub Interval { 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++) { + 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++ ) { + 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;