--- loncom/interface/loncoursedata.pm	2003/09/30 15:34:34	1.93
+++ loncom/interface/loncoursedata.pm	2003/10/01 20:50:13	1.97
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: loncoursedata.pm,v 1.93 2003/09/30 15:34:34 matthew Exp $
+# $Id: loncoursedata.pm,v 1.97 2003/10/01 20:50:13 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -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] eq 'okay') {
+        &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);
 }
@@ -1678,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};
     }