--- loncom/interface/statistics/lonproblemanalysis.pm	2002/11/22 04:04:10	1.13
+++ loncom/interface/statistics/lonproblemanalysis.pm	2003/10/10 13:35:43	1.29
@@ -1,7 +1,6 @@
 # The LearningOnline Network with CAPA
-# (Publication Handler
 #
-# $Id: lonproblemanalysis.pm,v 1.13 2002/11/22 04:04:10 minaeibi Exp $
+# $Id: lonproblemanalysis.pm,v 1.29 2003/10/10 13:35:43 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -25,635 +24,427 @@
 #
 # http://www.lon-capa.org/
 #
-# (Navigate problems for statistical reports
-# YEAR=2002
-# 5/12,7/26,9/7,11/22 Behrouz Minaei
-#
-###
 
 package Apache::lonproblemanalysis;
 
 use strict;
 use Apache::lonnet();
+use Apache::loncommon();
 use Apache::lonhtmlcommon();
-use GDBM_File;
-
-my $jr;
+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 $Ptr = '';
-    $Ptr .= '<table border="0"><tbody>';
-    $Ptr .= '<tr><td align="right"><b>Select Sections</b>';
-    $Ptr .= '</td>'."\n";
-    $Ptr .= '<td align="left">'."\n";
-    my @sectionsSelected = split(':',$cache{'sectionsSelected'});
-    my @sections = split(':',$cache{'sectionList'});
-    $Ptr .= &Apache::lonhtmlcommon::MultipleSectionSelect(\@sections,
-                                                          \@sectionsSelected,
-                                                          'Statistics');
-    $Ptr .= '</td></tr>'."\n";
-    $Ptr .= '<tr><td align="right"><b>Intervals</b></td>'."\n";
-    $Ptr .= '<td align="left">';
-    $Ptr .= &IntervalOptions($cache{'Interval'});
-    $Ptr .= '</td></tr></table><br>';
-    $r->print($Ptr);
-    $r->rflush();
-    $r->print(&OptionResponseTable($cache{'OptionResponses'}, \%cache, $r));
-
-    untie(%cache);
-
-    return;
-}
-
-sub BuildAnalyzePage {
-    my ($cacheDB, $students, $courseID,$r)=@_;
-
-    $jr = $r;
-    my $c = $r->connection;
-
-    my $Str = '</form>';
-    my %cache;
-
-    unless(tie(%cache,'GDBM_File',$cacheDB,&GDBM_READER(),0640)) {
-        $Str .= 'Unable to tie database.';
-        $r->print($Str);
-        return;
-    }
-
-    # Remove students who don't have the proper section.
-    my @sectionsSelected = split(':',$cache{'sectionsSelected'});
-    for(my $studentIndex=((scalar @$students)-1); $studentIndex>=0;
-        $studentIndex--) {
-        my $value = $cache{$students->[$studentIndex].':section'};
-        my $found = 0;
-        foreach (@sectionsSelected) {
-            if($_ eq 'none') {
-                if($value eq '' || !defined($value) || $value eq ' ') {
-                    $found = 1;
-                    last;
+    my ($r,$c)=@_;
+    $r->print('<h2>'.&mt('Option Response Problem Analysis').'</h2>');
+    $r->print(&CreateInterface());
+    #
+    my @Students = @Apache::lonstatistics::Students;
+    #
+    if (exists($ENV{'form.problemchoice'})) {
+        $r->print('<hr />');
+        &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/<form /<nop /g;
+            $rendered_problem =~ s/<\s*\/form\s>/<\/nop>/g;
+            $r->print('<table bgcolor="ffffff"><tr><td>'.
+                      '<base href="'.$base.'" />'.
+                      $rendered_problem.
+                      '</td></tr></table>');
+            ##
+            ## 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('<h2>'.
+                              &mt('The analysis you have selected is '.
+                                         'not supported at this time').
+                              '</h2>');
                 }
             } else {
-                if($value eq $_) {
-                    $found = 1;
-                    last;
-                }
+                $r->print('<h2>'.
+                          &mt('There is no student data for this problem.').
+                          '</h2>');
             }
-        }
-        if($found == 0) {
-            splice(@$students, $studentIndex, 1);
-        }
-    }
-    unless(untie(%cache)) {
-        $r->print('Can not untie hash.');
-        $r->rflush();
-    }
-
-#    my $error =
-#        &Apache::loncoursedata::DownloadStudentCourseDataSeparate($students,
-#                                                                  'true',
-#                                                                  $cacheDB,
-#                                                                  'true',
-#                                                                  'true',
-#                                                                  $courseID,
-#                                                                  $r, $c);
-#    if($error ne 'OK') {
-#        $r->print($error.'<br>Error downloading course data<br>');
-#        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'}.'<br>Incorrect part requested.<br>';
-        $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 .= '<br><b>'.$uri.'</b>';
-
-    $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, $courseID);
-    }
-
-    $Str .= '<br>';
-    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 .= '<br><b>Here you can see the Problem:</b><br>'.$Answ;
-    $Str .= '<form>';
-    $r->print($Str);
-
-    untie(%cache);
-
-    return;
-}
-
-#---- Problem Analysis Web Page ----------------------------------------------
-
-sub IntervalOptions {
-    my ($selectedInterval)=@_;
-
-    my $interval = 1;
-    for(my $n=1; $n<=7; $n++) {
-        if($selectedInterval == $n) {
-            $interval = $n;
-        }
-    }
-
-    my $Ptr = '<select name="Interval">'."\n";
-    for(my $n=1; $n<=7;$ n++) {
-	$Ptr .= '<option';
-        if($interval == $n) {
-            $Ptr .= ' selected';
-        }
-	$Ptr .= '>'.$n."</option>"."\n";
-    }
-    $Ptr .= '</select>'."\n";
-
-    return $Ptr;
-}
-
-sub OptionResponseTable {
-    my ($optionResponses,$cache,$r)=@_;
-
-    my @optionResponses=split(':::', $optionResponses);
-    my %partCount;
-    my %sequences;
-    my @orderedSequences=();
-    foreach(@optionResponses) {
-        my ($sequence, $problemId, $part, undef)=split(':',$_);
-        $partCount{$problemId.':'.$part}++;
-        if(!defined($sequences{$sequence})) {
-            push(@orderedSequences, $sequence);
-            $sequences{$sequence} = $_;
         } else {
-            $sequences{$sequence} .= ':::'.$_;
+            $r->print('resource is undefined');
         }
+        $r->print('<hr />');
+    } else {
+        $r->print('<h3>'.&mt('Please select a problem to analyze').'</h3>');
     }
+    # Okay, they asked for data, so make sure we get the latest data.
+    $r->print(&OptionResponseProblemSelector());
+}
 
-    my $Str = '';
-
-    foreach my $sequence (@orderedSequences) {
-        my @optionProblems = split(':::', $sequences{$sequence});
 
-        $Str .= '<b>'.$cache->{$sequence.':title'}.'</b>'."\n";
-        $Str .= "<table border=2><tr><th> \# </th><th> Problem Title </th>";
-        $Str .= '<th> Resource </th><th> Analysis  </th></tr>'."\n";
-
-        my $count = 1;
-        foreach(@optionProblems) {
-            my (undef, $problemId, $part, $response)=
-                split(':',$optionProblems[$count-1]);
-#                split(':',$sequences{$sequence});
-            my $uri = $cache->{$problemId.':source'};
-            my $title = $cache->{$problemId.':title'};
-
-            my $Temp = '<a href="'.$uri.'" target="_blank">'.$title.'</a>';
-            $Str .= '<tr>';
-            $Str .= '<td> '.$count.' </td>';
-            $Str .= '<td bgcolor="#DDFFDD">'.$Temp.'</td>';
-            $Str .= '<td bgcolor="#EEFFCC">'.$uri.'</td>';
-            if($partCount{$problemId.':'.$part} < 2) {
-                $Str .= '<td><input type="submit" name="Analyze:::';
-                $Str .= $problemId.':'.$part.'" value="';
-                $Str .= 'Part '.$part;
-                $Str .= '" /></td></tr>'."\n";
-            } else {
-                my $value = $problemId.':'.$part.':'.$response;
-                $Str .= '<td><input type="submit" name="Analyze:::'.$value;
-                $Str .= '" value="';
-                $Str .= 'Part '.$part.' Response '.$response;
-                $Str .= '" /></td></tr>'."\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] = ['<td>&nbsp;</td>'];
+    for (my $i=$mintries;$i<=$maxtries;$i++) {
+        push (@{$Rows[0]},
+              '<th colspan="3">'.&mt('Attempt').' '.$i.'</th>');
+    }
+    $Rows[1] = ['<th>'.&mt('Foil').'</th>'];
+    for (my $i=$mintries;$i<=$maxtries;$i++) {
+        push (@{$Rows[1]},('<th>'.&mt('Correct').'</th>',
+                           '<th>'.&mt('Incorrect').'</th>',
+                           '<th>'.&mt('Percent Correct').'</th>',
+                           ));
+    }
+    my @PlotData;
+    my @CumulativePlotData;
+    my $index = 1;
+    foreach my $foilid (@Foils) {
+        my @Data = ('<td>'.$index.' '.$Row_Label{$foilid}.'</td>');
+        for (my $i=$mintries;$i<=$maxtries;$i++) {
+            push(@Data,
+                 ('<td>'.$ResponseData{$foilid}->[$i]->{'correct'}.'</td>',
+                  '<td>'.$ResponseData{$foilid}->[$i]->{'incorrect'}.
+                  '</td>',
+                  '<td>'.
+                  sprintf("%4.2f",
+                          $ResponseData{$foilid}->[$i]->{'percent_corr'}).
+                  '</td>'));
+            #
+            # Gather the per-attempt data
+            push (@{$PlotData[$i]->{'good'}},
+                  $ResponseData{$foilid}->[$i]->{'percent_corr'});
+            push (@{$PlotData[$i]->{'bad'}},
+                  100-$ResponseData{$foilid}->[$i]->{'percent_corr'});
+        }
+        for (my $i=0;$i<=$maxtries;$i++) {
+            push (@{$CumulativePlotData[$i]->{'good'}},
+                  $CumulativePlotData[-1]->{'good'}+
+                  $ResponseData{$foilid}->[$i]->{'correct'});
+            push (@{$CumulativePlotData[$i]->{'bad'}},
+                  $CumulativePlotData[-1]->{'bad'}+
+                  $ResponseData{$foilid}->[$i]->{'incorrect'});
+        }
+        push(@Rows,\@Data);
+    } continue {
+        $index++;
+    }
+    my @Data = ('<td></td>');
+    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'};
             }
-            $count++;
         }
-        $Str .= '</table><br>'."\n";
-    }
-
-    return $Str;
-}
-
-#---- END Problem Analysis Web Page ------------------------------------------
-
-#---- Analyze Web Page -------------------------------------------------------
-
-#restore the student submissions and finding the result
-=pod
-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);
+        $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 {
+            $graphlink = &Apache::loncommon::DrawGraph
+                ('Attempt '.$i.', '.$minstu.'-'.$maxstu.
+                 ' students',
+                 'Foil Number',
+                 'Percent Correct',
+                 100,
+                 $PlotData[$i]->{'good'},
+                 $PlotData[$i]->{'bad'});
+        }
+        push(@Data,'<td colspan="3">'.$graphlink.'</td>');
+    }
+    push (@Rows,\@Data);
+    my $table = '<table border="1" >'."\n";
+    for (my $i=0; $i <=$#Rows;$i++) {
+        $table .= '<tr>'.join('',@{$Rows[$i]})."</tr>\n";
+    }
+    $table .= '</table>';
+    return ($table);
+}
+
+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;
-}
-=cut
-
-sub OpStatus {
-    my ($problemID, $student, $ConceptData, $foil_to_concept,
-        $analyzeData, $cache, $courseID)=@_;
-
-    my $ids = $analyzeData->{'parts'};
-    my ($uname,$udom)=split(/\:/,$student);
-    my $symb  = $cache->{$problemID.':problem'};
-
-    my @True = ();
-    my @False = ();
-    my $flag=0;
-    my $tries=0;
-
-#    $jr->print("<br> ID= $problemID <br> student= $student<br> prob= $symb<br>");
-
-    foreach my $id (@$ids) {
-	my ($part, $response) = split(/\./, $id);
-#=pod
-    my %reshash=&Apache::lonnet::restore($symb,$courseID,$udom,$uname);
-    if ($reshash{'version'}) {
-        my $tries=0;
-	#&Apache::lonhomework::showhash(%$analyzeData);
-	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 = $analyzeData->{"$Id1.$Id2.foil.value.$_"};
-                    	if($submission{$_} eq $Ansr) {
-                        	&Decide("true", $foil_to_concept->{$_},
-                                	$time, $ConceptData);
-                    	} else {
-                        	&Decide("false", $foil_to_concept->{$_},
-					$time, $ConceptData);
-                    	}
-		    }
-	        }
-	    }
-        }
-    }
-#=cut
-=pod
-        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);
+    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;
+}
+
+sub get_problem_symb {
+    my $problemstring = shift();
+    my ($symb,$partid,$resid) = ($problemstring=~ /^(.*):([^:]*):([^:]*)$/);
+    return ($symb,$partid,$resid);
+}
+
+sub CreateInterface {
+    ##
+    ## Environment variable initialization
+    if (! exists$ENV{'form.AnalyzeBy'}) {
+        $ENV{'form.AnalyzeBy'} = 'Tries';
+    }
+    ##
+    ## Build the menu
+    my $Str = '';
+    $Str .= '<table cellspacing="5">'."\n";
+    $Str .= '<tr>';
+    $Str .= '<td align="center"><b>'.&mt('Sections').'</b></td>';
+    $Str .= '<td align="center"><b>'.&mt('Enrollment Status').'</b></td>';
+    $Str .= '<td align="center"><b>'.&mt('Sequences and Folders').'</b></td>';
+    $Str .= '<td align="center"><b>'.&mt('Analyze By').'</b></td>';
+    $Str .= '</tr>'."\n";
+    #
+    $Str .= '<tr><td align="center">'."\n";
+    $Str .= &Apache::lonstatistics::SectionSelect('Section','multiple',5);
+    $Str .= '</td>';
+    #
+    $Str .= '<td align="center">';
+    $Str .= &Apache::lonhtmlcommon::StatusOptions(undef,undef,5);
+    $Str .= '</td>';
+    #
+    $Str .= '<td align="center">';
+    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 .= '</td>';
+    #
+    $Str .= '<td>';
+    $Str .='<input type="radio" name="AnalyzeBy" value="Tries" ';
+    if ($ENV{'form.AnalyzeBy'} eq 'Tries') {
+        $Str .= 'checked ';
+    }
+    $Str .= '>'.&mt('Tries').'<br />';
+    $Str .='<input type="radio" name="AnalyzeBy" value="Time" ';
+    if ($ENV{'form.AnalyzeBy'} eq 'Time') {
+        $Str .= 'checked ';
+    }
+    $Str .= '>'.&mt('Time').'<br />';
+    $Str .= '</td>';
+    #
+    $Str .= '</tr>'."\n";
+    $Str .= '</table>'."\n";
+    $Str .= '<input type="submit" name="ProblemAnalysis" value="'.
+        &mt('Analyze Problem').'" />';
+    $Str .= '&nbsp;'x5;
+    $Str .= '<input type="submit" name="ClearCache" value="'.
+        &mt('Clear Caches').'" />';
+    $Str .= '&nbsp;'x5;
+    return ($Str);
+}
+
+sub OptionResponseProblemSelector {
+    my $Str;
+    $Str = "\n<table>\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<scalar(@{$partdata->{'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 .= '<tr><td>'.
+  '<input type="radio" name="problemchoice" value="'.$value.'" '.$checked.'/>'.
+  '</td><td>'.
+  '<a href="'.$res->{'src'}.'">'.$res->{'title'}.'</a> ';
+                        if ($partdata->{'option'} > 1) {
+                            $seq_str .= &mt('response').' '.$respid;
+                        }
+                        $seq_str .= "</td></tr>\n";
                     }
                 }
             }
         }
-=cut
-    }
-
-    return;
-}
-
-=pod
-sub OpStatus {
-    my ($rid,$student,$ConceptData,$foil_to_concept,$analyzeData,$cache)=@_;
-    my ($uname,$udom)=split(/\:/,$student);
-    my $code='U';
-    $rid=~/(\d+)\.(\d+)/;
-    my $symb=&Apache::lonnet::declutter($hash{'map_id_'.$1}).'___'.$2.'___'.
-	     &Apache::lonnet::declutter($hash{'src_'.$rid});
-    my %reshash=&Apache::lonnet::restore($symb,$cid,$udom,$uname);
-    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",$_,$time );
-			    }
-			    else {&Decide("false",$_,$time );}
-			}
-		    }
-	        }
-	    }
+        if ($seq_str ne '') {
+            $Str .= '<tr><td>&nbsp</td><td><b>'.$seq->{'title'}.'</b></td>'.
+                "</tr>\n".$seq_str;
         }
     }
-}
-=cut
-
-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;
-    }
-
-    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 '<IMG src="/cgi-bin/graph.gif?'.$GData.'" border=1/>';
-}
-
-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]);
-	}
-    }
-    my $P_No = (scalar @data1);
-    my $Str = '';
-#    $Str .= '<br><b>From: ['.localtime($ConceptData->{'Int.'.($k-1)});
-#    $Str .= '] To: ['.localtime($ConceptData->{"Int.$k"}).']</b>';
-    $Str .= "\n".'<table border=2>'.
-            "\n".'<tr>'.
-            "\n".'<th> # </th>'.
-            "\n".'<th> Concept </th>'.
-            "\n".'<th> Correct </th>'.
-            "\n".'<th> Wrong </th>'.
-            "\n".'</tr>';
-
-    for(my $n=0; $n<(scalar @$Concepts); $n++ ) {
-	$Str .= '<tr>'."\n";
-        $Str .= '<td>'.($n+1).'</td>'."\n";
-        my ($currentConcept) = split('::',$Concepts->[$n]);
-        $Str .= '<td bgcolor="EEFFCC">'.$currentConcept;
-        $Str .= '</td>'."\n";
-        $Str .= '<td bgcolor="DDFFDD">'.$data1[$n].'</td>'."\n";
-        $Str .= '<td bgcolor="FFDDDD">'.$data2[$n].'</td>'."\n";
-        $Str .= '</tr>'."\n";
-    }
-    $Str .= '<td></td><td><b>From:['.localtime($ConceptData->{'Int.'.$k});
-    $Str .= '] To: ['.localtime($ConceptData->{'Int.'.($k+1)}-1);
-    $Str .= ']</b></td><td>'.$Correct.'</td><td>'.$Wrong.'</td>';
-    $Str .= '</table>'."\n";
-
+    $Str .= "</table>\n";
     return $Str;
-#$Apache::lonxml::debug=1;
-#&Apache::lonhomework::showhash(%ConceptData);
-#$Apache::lonxml::debug=0;
-}
-
-#---- 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++;
-    }
-    $ConceptData->{$concept.'.'.$k.'.'.$type}++;
-
-    return;
 }
 
-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 ($Answer)=&Apache::lonnet::str2hashref($Answ);
-
-    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__