--- loncom/interface/statistics/lonproblemanalysis.pm 2002/08/05 20:53:38 1.4 +++ loncom/interface/statistics/lonproblemanalysis.pm 2002/08/13 00:37:18 1.5 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # (Publication Handler # -# $Id: lonproblemanalysis.pm,v 1.4 2002/08/05 20:53:38 stredwic Exp $ +# $Id: lonproblemanalysis.pm,v 1.5 2002/08/13 00:37:18 stredwic Exp $ # # Copyright Michigan State University Board of Trustees # @@ -41,7 +41,7 @@ use strict; use Apache::lonnet(); use GDBM_File; -#my $jr; +my $jr; sub BuildProblemAnalysisPage { my ($cacheDB, $r)=@_; @@ -64,42 +64,24 @@ sub BuildProblemAnalysisPage { sub BuildAnalyzePage { my ($cacheDB, $students, $courseID,$r)=@_; -# $jr = $r; + $jr = $r; my $c = $r->connection; my $Str = ''; my %cache; - &Create_PrgWin($r); - my $count=0; - foreach (@$students) { - &Update_PrgWin(scalar(@$students),$count,$_,$r); - if($c->aborted) { - return $Str; - } - my $downloadTime=''; - if(tie(%cache,'GDBM_File',$cacheDB,&GDBM_READER(),0640)) { - $downloadTime = $cache{$_.':lastDownloadTime'}; - untie(%cache); - } - if($downloadTime eq 'Not downloaded') { - my $courseData = - &Apache::loncoursedata::DownloadCourseInformation($_, - $courseID); - if(tie(%cache,'GDBM_File',$cacheDB,&GDBM_WRCREAT(),0640)) { - &Apache::loncoursedata::ProcessStudentData(\%cache, - $courseData, $_); - untie(%cache); - } else { - next; - } - } - $count++; + if(&Apache::loncoursedata::DownloadStudentCourseDataSeparate($students, 'true', + $cacheDB, 'true', + 'true', $courseID, + $r, $c) ne 'OK') { + $r->print($Str); + return; } - &Close_PrgWin($r); + unless(tie(%cache,'GDBM_File',$cacheDB,&GDBM_READER(),0640)) { $Str .= 'Unable to tie database.'; - return $Str; + $r->print($Str); + return; } my ($problemId, $part, $responseId)=split(':',$cache{'AnalyzeInfo'}); @@ -115,11 +97,14 @@ sub BuildAnalyzePage { my ($analyzeData) = &InitAnalysis($uri, $part, $responseId, $problem, $students->[0], $courseID); if(defined($analyzeData->{'error'})) { - $Str .= 'Incorrect part requested.
'; - return $Str; + $Str .= $analyzeData->{'error'}.'
Incorrect part requested.
'; + $r->print($Str); + return; } - if($c->aborted()) { untie(%cache); return $Str; } + $r->print($Str); + $Str = ''; + if($c->aborted()) { untie(%cache); return; } #compute the intervals &Interval($part, $problem, $interval, $analyzeData->{'concepts'}, @@ -128,37 +113,39 @@ sub BuildAnalyzePage { $title =~ s/\ /"_"/eg; $Str .= '
'.$uri.''; - if($c->aborted()) { untie(%cache); return $Str; } + $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++) { - if($c->aborted()) { untie(%cache); return $Str; } -# &Update_PrgWin($index); -# &OpStatus($problem, $students->[$index], $courseID, \%ConceptData, -# $analyzeData->{'foil_to_concept'}, $analyzeData, \%cache); - &OpStatus($problem, $students->[$index], \%ConceptData, + 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++ ) { 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 $Str.''; + return; } #---- Problem Analysis Web Page ---------------------------------------------- @@ -230,76 +217,29 @@ sub OptionResponseTable { return $Str; } -# Create progress -sub Create_PrgWin { - my ($r)=@_; - $r->print(< - popwin=open('','popwin','width=400,height=100'); - popwin.document.writeln(''+ - 'LON-CAPA Statistics'+ - '

Computation Progress

'+ - ''+ - ''+ - ''); - popwin.document.close(); - -ENDPOP - - $r->rflush(); -} - -# update progress -sub Update_PrgWin { - my ($totalStudents,$index,$name,$r)=@_; - $r->print(''); - $r->rflush(); -} - -# close Progress Line -sub Close_PrgWin { - my ($r)=@_; - $r->print(''); - $r->rflush(); -} - #---- END Problem Analysis Web Page ------------------------------------------ #---- Analyze Web Page ------------------------------------------------------- #restore the student submissions and finding the result sub OpStatus { - my ($problem, $student, $ConceptData, $foil_to_concept, + my ($problemID, $student, $ConceptData, $foil_to_concept, $analyzeData, $cache)=@_; my $ids = $analyzeData->{'parts'}; my @True = (); my @False = (); my $flag=0; - my $latestVersion = $cache->{$student.':version:'.$problem}; - if(!$latestVersion) { - return; - } my $tries=0; - for(my $version=1; $version<=$latestVersion; $version++) { - my $time=$cache->{$student.':'.$version.':'.$problem.':timestamp'}; - foreach my $id (@$ids) { - my ($currentPart, undef) = split(/\./, $id); - #check if this is a repeat submission, if so skip it - next if($cache->{$student.':'.$version.':'.$problem. - ':resource.'.$currentPart.'.previous'}); - #if no solved this wasn't a real submission, ignore it - if(!defined($cache->{"$student:$version:$problem". - ":resource.$currentPart.solved"})) { - &Apache::lonxml::debug("skipping "); - next; - } - my $Resp = $cache->{$student.':'.$version.':'.$problem. - ':resource.'.$id.'.submission'}; + 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{$_}) { @@ -441,14 +381,17 @@ sub InitAnalysis { 'grade_domain' => $domain, 'grade_courseid' => $courseID, 'grade_symb' => $problem)); - - my %Answer=(); - %Answer=&Apache::lonnet::str2hash($Answ); + 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'}}) { + foreach (@{$Answer->{'parts'}}) { if($_ eq $part.'.'.$responseId) { push(@parts, $_); $found = 1; @@ -456,7 +399,7 @@ sub InitAnalysis { } } } else { - foreach (@{$Answer{'parts'}}) { + foreach (@{$Answer->{'parts'}}) { if($_ =~ /$part/) { push(@parts, $_); $found = 1; @@ -473,23 +416,23 @@ sub InitAnalysis { my @Concepts=(); my %foil_to_concept; foreach my $currentPart (@parts) { - if(defined($Answer{$currentPart.'.concepts'})) { - foreach my $concept (@{$Answer{$currentPart.'.concepts'}}) { + if(defined($Answer->{$currentPart.'.concepts'})) { + foreach my $concept (@{$Answer->{$currentPart.'.concepts'}}) { push(@Concepts, $concept); - foreach my $foil (@{$Answer{$currentPart.'.concept.'. + foreach my $foil (@{$Answer->{$currentPart.'.concept.'. $concept}}) { $analyzeData{$currentPart.'.foil.value.'.$foil} = - $Answer{$currentPart.'.foil.value.'.$foil}; + $Answer->{$currentPart.'.foil.value.'.$foil}; $foil_to_concept{$foil} = $concept; } } } else { - foreach (keys(%Answer)) { + 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}; + $Answer->{$currentPart.'.foil.value.'.$1}; } } }