--- loncom/interface/loncoursedata.pm	2003/09/30 12:09:48	1.92
+++ loncom/interface/loncoursedata.pm	2003/10/02 14:11:36	1.98
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: loncoursedata.pm,v 1.92 2003/09/30 12:09:48 matthew Exp $
+# $Id: loncoursedata.pm,v 1.98 2003/10/02 14:11:36 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -460,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.
 
@@ -716,8 +716,6 @@ sub init_dbs {
                       restrictions => 'NOT NULL' },
                     { name => 'awarddetail',
                       type => 'TINYTEXT' },
-                    { name => 'awarded',
-                      type => 'TINYTEXT' },
 #                    { name => 'message',
 #                      type => 'CHAR' },
                     { name => 'response_specific',
@@ -1151,7 +1149,7 @@ sub update_full_student_data {
             # We can deal with 'timestamp' right away
             my @timestamp_storage = ($symb_id,$student_id,
                                      $transaction,$value);
-            my $store_command = 'INSERT INTO '.$fulldump_timestamp_table.
+            my $store_command = 'INSERT IGNORE INTO '.$fulldump_timestamp_table.
                 " VALUES ('".join("','",@timestamp_storage)."');";
             $dbh->do($store_command);
             if ($dbh->err()) {
@@ -1189,7 +1187,6 @@ sub update_full_student_data {
             if (defined($resp_id) &&
                 $field =~ /^(tries|
                              awarddetail|
-                             awarded|
                              submission|
                              submissiongrading|
                              molecule)$/x) {
@@ -1216,7 +1213,7 @@ sub update_full_student_data {
     }
     ##
     ## Store the part data
-    my $store_command = 'INSERT INTO '.$fulldump_part_table.
+    my $store_command = 'INSERT IGNORE INTO '.$fulldump_part_table.
         ' VALUES '."\n";
     my $store_rows = 0;
     while (my ($symb_id,$hash1) = each (%$partdata)) {
@@ -1244,7 +1241,7 @@ sub update_full_student_data {
     }
     ##
     ## Store the response data
-    $store_command = 'INSERT INTO '.$fulldump_response_table.
+    $store_command = 'INSERT IGNORE INTO '.$fulldump_response_table.
         ' VALUES '."\n";
     $store_rows = 0;
     while (my ($symb_id,$hash1) = each (%$respdata)) {
@@ -1256,7 +1253,6 @@ sub update_full_student_data {
                                                 $transaction,
                                                 $data->{'tries'},
                                                 $data->{'awarddetail'},
-                                                $data->{'awarded'},
                                                 $data->{'response_specific'},
                                                 $data->{'response_specific_value'},
                                                 $data->{'submission'})."'),";
@@ -1357,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] eq 'okay') {
+        &Apache::lonmysql::replace_row($studentdata_table,
                          [$student_id,$time_of_retrieval,undef,undef,undef]);
+    }
     #
     return @Results;
 }
@@ -1383,10 +1381,10 @@ sub store_student_data {
     my $starttime = Time::HiRes::time;
     my $elapsed = 0;
     my $rows_stored;
-    my $store_parameters_command  = 'INSERT INTO '.$parameters_table.
+    my $store_parameters_command  = 'INSERT IGNORE INTO '.$parameters_table.
         ' VALUES '."\n";
     my $num_parameters = 0;
-    my $store_performance_command = 'INSERT INTO '.$performance_table.
+    my $store_performance_command = 'INSERT IGNORE INTO '.$performance_table.
         ' VALUES '."\n";
     return ('error',undef) if (! defined($dbh));
     while (my ($current_symb,$param_hash) = each(%{$student_data})) {
@@ -1437,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());
@@ -1446,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);
 }
@@ -1682,6 +1680,33 @@ sub get_student_data_from_performance_ca
         $studentdata->{$symb}->{$base.'.awarddetail'} = $awarddetail;
         $studentdata->{$symb}->{'timestamp'} = $time if (defined($time) && $time ne '');
     }
+    ## Get misc parameters
+    $request = 'SELECT c.symb,a.parameter,a.value '.
+        "FROM $student_table AS b ".
+        "LEFT JOIN $parameters_table AS a ON b.student_id=a.student_id ".
+        "LEFT JOIN $symb_table AS c ON c.symb_id = a.symb_id ".
+        "WHERE student='$student'";
+    if (defined($symb) && $symb ne '') {
+        $request .= " AND c.symb=".$dbh->quote($symb);
+    }
+    $sth = $dbh->prepare($request);
+    $sth->execute();
+    if ($sth->err()) {
+        &Apache::lonnet::logthis("Unable to execute MySQL request:");
+        &Apache::lonnet::logthis("\n".$request."\n");
+        &Apache::lonnet::logthis("error is:".$sth->errstr());
+        if (defined($symb) && $symb ne '') {
+            $studentdata = $studentdata->{$symb};
+        }
+        return $studentdata;
+    }
+    #
+    foreach my $row (@{$sth->fetchall_arrayref}) {
+        $rows_retrieved++;
+        my ($symb,$parameter,$value) = (@$row);
+        $studentdata->{$symb}->{$parameter}  = $value;
+    }
+    #
     if (defined($symb) && $symb ne '') {
         $studentdata = $studentdata->{$symb};
     }