--- loncom/interface/statistics/lonproblemanalysis.pm	2002/07/24 14:52:32	1.1
+++ loncom/interface/statistics/lonproblemanalysis.pm	2003/06/18 17:34:02	1.22
@@ -1,7 +1,6 @@
 # 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.22 2003/06/18 17:34:02 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -26,95 +25,191 @@
 # 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
+# 5/12,7/26,9/7,11/22 Behrouz Minaei
 #
 ###
 
-package Apache::lonproblemanalysis; 
+package Apache::lonproblemanalysis;
 
 use strict;
 use Apache::lonnet();
+use Apache::lonhtmlcommon();
 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 .= '<html><body>Unable to tie database.</body></html>';
-        return $Str;
-    }
-
-    $Str .= &IntervalOptions($cache{'Interval'});
-    $Str .= &OptionResponseTable($cache{'OptionResponses'});
+    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::lonstatistics::SectionSelect('Section','multiple',5);
+    $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($cache{'OptionResponses'}.'<br>');
+    $r->print(&OptionResponseTable($cache{'OptionResponses'}, \%cache, $r));
 
     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 = '</form>';
     my %cache;
-    unless(tie(%cache,'GDBM_File',$cacheDB,&GDBM_READER,0640)) {
-        $Str .= '<html><body>Unable to tie database.</body></html>';
-        return $Str;
-    }
 
-    my $uri      = $cache{'AnalyzeURI'}, 
-    my $part     = $cache{'AnalyzePart'}, 
-    my $problem  = $cache{'AnalyzeProblem'}, 
-    my $title    = $cache{'AnalyzeTitle'},
-    my $interval = $cache{'Interval'}, 
+    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'});
+
+    my $studentCount = scalar @$students;
+    for(my $studentIndex=$studentCount-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;
+                }
+            } else {
+                if($value eq $_) {
+                    $found = 1;
+                    last;
+                }
+            }
+        }
+        if($found == 0) {
+            splice(@$students, $studentIndex, 1);
+        }
+    }
+    unless(untie(%cache)) {
+        $r->print('Can not untie hash.');
+        $r->rflush();
+    }
+
+    &Apache::lonhtmlcommon::Close_PrgWin($r);
+
+### jason code for checing is there data in cache
+#    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 $heading = 'Restore this particular Option Response Problem '.
+                  'Results, Please wait...';
 
     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'}.'<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, $Concepts, \%ConceptData);
+    &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; }
+
+
+    my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r, $title,
+						      $heading,$#$students+1);
+
     #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; }
+	&Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
+					 'last student '.$students->[$index]);
+	&OpStatus($problemId, $students->[$index], \%ConceptData,
+                  $analyzeData->{'foil_to_concept'}, $analyzeData,
+		  \%cache, $courseID);
     }
-    &Close_PrgWin();
+    &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
 
     $Str .= '<br>';
     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);
+    my $Answ=&Apache::lonnet::ssi_body($uri);
     $Str .= '<br><b>Here you can see the Problem:</b><br>'.$Answ;
+    $Str .= '<form>';
+    $r->print($Str);
 
     untie(%cache);
 
-    return $Str;
+    return;
 }
 
 #---- Problem Analysis Web Page ----------------------------------------------
@@ -129,8 +224,7 @@ sub IntervalOptions {
         }
     }
 
-    my $Ptr = '<br><b>Select number of intervals</b>'."\n".
-       	      '<select name="Interval">'."\n";
+    my $Ptr = '<select name="Interval">'."\n";
     for(my $n=1; $n<=7;$ n++) {
 	$Ptr .= '<option';
         if($interval == $n) {
@@ -144,27 +238,61 @@ sub IntervalOptions {
 }
 
 sub OptionResponseTable {
-    my ($optionResponses)=@_;
+    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} .= ':::'.$_;
+        }
+    }
+
     my $Str = '';
-    $Str .= '<br><b> Option Response Problems in this course:</b>'."\n";
-    $Str .= '<br><br>'."\n";
-    $Str .= "<table border=2><tr><th> \# </th><th> Problem Title </th>";
-    $Str .= '<th> Resource </th><th> Analysis  </th></tr>'."\n";
-
-    my $number=1;
-    foreach (split(':::', $optionResponses)) {
-        my ($uri,$title,$part,$problem)=split('::',$_);
-        my $Temp = '<a href="'.$uri.'" target="_blank">'.$title.'</a>';
-        $Str .= '<tr>';
-        $Str .= '<td> '.$number.' </td>';
-        $Str .= '<td bgcolor="#DDFFDD"> '.$Temp.' </td>';
-        $Str .= '<td bgcolor="#EEFFCC"> '.$uri.' </td>';
-        $Str .= '<td><input type="submit" name="Analyze:::'.$uri.':::';
-        $Str .= $title.':::'.$part.':::'.$problem.'" value="';
-        $Str .= 'Analyze" /></td></tr>'."\n";
-        $number++;
+
+    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";
+            }
+            $count++;
+        }
+        $Str .= '</table><br>'."\n";
     }
-    $Str .= '</table>'."\n";
 
     return $Str;
 }
@@ -173,59 +301,109 @@ sub OptionResponseTable {
 
 #---- Analyze Web Page -------------------------------------------------------
 
+# Joson code for reading data from cache
+=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);
+                    } else {
+                        &Decide("false", $foil_to_concept->{$_},
+                                $time, $ConceptData);
+                    }
+                }
+            }
+        }
+    }
+
+    return;
+}
+=cut
+
+
 #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, $courseID)=@_;
+
+    my $ids = $analyzeData->{'parts'};
+    my ($uname,$udom)=split(/\:/,$student);
+    my $symb  = $cache->{$problemID.':problem'};
+
     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 %reshash=&Apache::lonnet::restore($symb,$courseID,$udom,$uname);
+    	if ($reshash{'version'}) {
+            my $tries=0;
+            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);
+                    	    }
+		        }
+	            }
+	        }
+            }
         }
     }
+
+    return;
 }
 
+
 sub DrawGraph {
     my ($k,$Src,$Concepts,$ConceptData)=@_;
     my $Max=0;
     my @data1;
     my @data2;
 
-    # Adjust Data and find the Max 
+    # Adjust Data and find the Max
     for (my $n=0; $n<(scalar @$Concepts); $n++ ) {
 	my $tmp=$Concepts->[$n];
 	$data1[$n]=$ConceptData->{$tmp.'.'.$k.'.true'};
@@ -255,7 +433,7 @@ sub DrawGraph {
     $GData  = $Titr.'&Concepts&Answers&'.$Max.'&'.$P_No.'&';
     $GData .= (join(',',@data1)).'&'.(join(',',@data2));
 
-    return '<IMG src="/cgi-bin/graph.gif?'.$GData.'" border=1/>';
+    return '<IMG src="/cgi-bin/graph.png?'.$GData.'" border=1/>';
 }
 
 sub DrawTable {
@@ -284,7 +462,7 @@ sub DrawTable {
     my $P_No = (scalar @data1);
     my $Str = '';
 #    $Str .= '<br><b>From: ['.localtime($ConceptData->{'Int.'.($k-1)});
-#    $Str .= '] To: ['.localtime($ConceptData->{"Int.$k"}).']</b>'; 
+#    $Str .= '] To: ['.localtime($ConceptData->{"Int.$k"}).']</b>';
     $Str .= "\n".'<table border=2>'.
             "\n".'<tr>'.
             "\n".'<th> # </th>'.
@@ -296,7 +474,8 @@ sub DrawTable {
     for(my $n=0; $n<(scalar @$Concepts); $n++ ) {
 	$Str .= '<tr>'."\n";
         $Str .= '<td>'.($n+1).'</td>'."\n";
-        $Str .= '<td bgcolor="EEFFCC">'.$Concepts->[$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";
@@ -319,17 +498,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 +519,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 +585,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++ ) {
+    $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;