--- loncom/interface/loncoursedata.pm	2002/08/13 00:37:18	1.13
+++ loncom/interface/loncoursedata.pm	2002/08/14 16:18:55	1.16
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # (Publication Handler
 #
-# $Id: loncoursedata.pm,v 1.13 2002/08/13 00:37:18 stredwic Exp $
+# $Id: loncoursedata.pm,v 1.16 2002/08/14 16:18:55 stredwic Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -396,11 +396,12 @@ sub ProcessTopResourceMap {
                         $beenHere{'o:'.$partId.$currentResourceID}++;
                         if(defined($cache->{'OptionResponses'})) {
                             $cache->{'OptionResponses'}.= ':::'.
-                                $currentResourceID.':'.
+                                $currentSequence.':'.$currentResourceID.':'.
                                 $partId.':'.$responseId;
                         } else {
-                            $cache->{'OptionResponses'}= $currentResourceID.
-                                ':'.$partId.':'.$responseId;
+                            $cache->{'OptionResponses'}= $currentSequence.':'.
+                                $currentResourceID.':'.
+                                $partId.':'.$responseId;
                         }
                     }
                 }
@@ -680,6 +681,7 @@ sub ExtractStudentData {
     my $totalProblems   = 0;
     my $problemsSolved  = 0;
     my $numberOfParts   = 0;
+    my $totalAwarded    = 0;
     foreach my $sequence (split(':', $data->{'orderedSequences'})) {
         foreach my $problemID (split(':', $data->{$sequence.':problems'})) {
             my $problem = $data->{$problemID.':problem'};
@@ -691,6 +693,9 @@ sub ExtractStudentData {
                 foreach my $part (split(/\:/,$data->{$sequence.':'.
                                                       $problemID.
                                                       ':parts'})) {
+                    $output->{$name.':'.$problemID.':'.$part.':tries'} = 0;
+                    $output->{$name.':'.$problemID.':'.$part.':awarded'} = 0;
+                    $output->{$name.':'.$problemID.':'.$part.':code'} = ' ';
                     $totalProblems++;
                 }
                 $output->{$name.':'.$problemID.':NoVersion'} = 'true';
@@ -791,6 +796,7 @@ sub ExtractStudentData {
                     $partData{$part.':code'};
                 $output->{$name.':'.$problemID.':'.$part.':awarded'} =
                     $partData{$part.':awarded'};
+                $totalAwarded += $partData{$part.':awarded'};
                 $output->{$name.':'.$problemID.':'.$part.':timestamp'} =
                     $partData{$part.':timestamp'};
                 foreach my $response (split(':', $data->{$sequence.':'.
@@ -813,6 +819,7 @@ sub ExtractStudentData {
 
     $output->{$name.':problemsSolved'} = $problemsSolved;
     $output->{$name.':totalProblems'} = $totalProblems;
+    $output->{$name.':totalAwarded'} = $totalAwarded;
 
     return;
 }