--- loncom/interface/loncoursedata.pm	2003/09/26 19:23:14	1.90
+++ loncom/interface/loncoursedata.pm	2003/09/30 15:45:57	1.95
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: loncoursedata.pm,v 1.90 2003/09/26 19:23:14 matthew Exp $
+# $Id: loncoursedata.pm,v 1.95 2003/09/30 15:45:57 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -197,6 +197,10 @@ sub get_sequence_assessment_data {
             my @Ids       = $curRes->responseIds($part);
             $partdata{$part}->{'ResponseTypes'}= \@Responses;
             $partdata{$part}->{'ResponseIds'}  = \@Ids;
+            # Count how many responses of each type there are in this part
+            foreach (@Responses) {
+                $partdata{$part}->{$_}++;
+            }
         }
         my $assessment = { title => $title,
                            src   => $src,
@@ -456,7 +460,7 @@ The response table holds data (documente
 associated with a particular response id which is stored when a student 
 attempts a problem.  The following are the columns of the table, in order:
 'symb_id','part_id','response_id','student_id','transaction','tries',
-'awarddetail', 'awarded','response_specific' (data particular to the response
+'awarddetail', 'response_specific' (data particular to the response
 type), 'response_specific_value', and 'submission (the text of the students
 submission).  The primary key is based on the first five columns listed above.
 
@@ -712,8 +716,6 @@ sub init_dbs {
                       restrictions => 'NOT NULL' },
                     { name => 'awarddetail',
                       type => 'TINYTEXT' },
-                    { name => 'awarded',
-                      type => 'TINYTEXT' },
 #                    { name => 'message',
 #                      type => 'CHAR' },
                     { name => 'response_specific',
@@ -1185,7 +1187,6 @@ sub update_full_student_data {
             if (defined($resp_id) &&
                 $field =~ /^(tries|
                              awarddetail|
-                             awarded|
                              submission|
                              submissiongrading|
                              molecule)$/x) {
@@ -1252,7 +1253,6 @@ sub update_full_student_data {
                                                 $transaction,
                                                 $data->{'tries'},
                                                 $data->{'awarddetail'},
-                                                $data->{'awarded'},
                                                 $data->{'response_specific'},
                                                 $data->{'response_specific_value'},
                                                 $data->{'submission'})."'),";
@@ -1353,8 +1353,10 @@ sub update_student_data {
     my @Results = &store_student_data($sname,$sdom,$courseid,\%student_data);
     #
     # Set the students update time
-    &Apache::lonmysql::replace_row($studentdata_table,
+    if ($Results[0] !~ /^error/) {
+        &Apache::lonmysql::replace_row($studentdata_table,
                          [$student_id,$time_of_retrieval,undef,undef,undef]);
+    }
     #
     return @Results;
 }
@@ -1433,6 +1435,13 @@ sub store_student_data {
     chop $store_performance_command;
     chop $store_performance_command;
     my $start = Time::HiRes::time;
+    $dbh->do($store_performance_command);
+    if ($dbh->err()) {
+        &Apache::lonnet::logthis(' bigass insert error:'.$dbh->errstr());
+        &Apache::lonnet::logthis('command = '.$store_performance_command);
+        $returnstatus = 'error: unable to insert performance into database';
+        return ($returnstatus,$student_data);
+    }
     $dbh->do($store_parameters_command) if ($num_parameters>0);
     if ($dbh->err()) {
         &Apache::lonnet::logthis(' bigass insert error:'.$dbh->errstr());
@@ -1442,13 +1451,6 @@ sub store_student_data {
         $returnstatus = 'error: unable to insert parameters into database';
         return ($returnstatus,$student_data);
     }
-    $dbh->do($store_performance_command);
-    if ($dbh->err()) {
-        &Apache::lonnet::logthis(' bigass insert error:'.$dbh->errstr());
-        &Apache::lonnet::logthis('command = '.$store_performance_command);
-        $returnstatus = 'error: unable to insert performance into database';
-        return ($returnstatus,$student_data);
-    }
     $elapsed += Time::HiRes::time - $start;
     return ($returnstatus,$student_data);
 }
@@ -1864,7 +1866,7 @@ sub get_problem_statistics {
          $stats_table);
     my ($Solved) = &execute_SQL_request($dbh,'SELECT COUNT(tries) FROM '.
                                         $stats_table.
-                                        " WHERE solved='correct_by_student'");
+         " WHERE solved='correct_by_student' OR solved='correct_by_scantron'");
     my ($solved) = &execute_SQL_request($dbh,'SELECT COUNT(tries) FROM '.
                                         $stats_table.
                                         " WHERE solved='correct_by_override'");