--- loncom/interface/loncoursedata.pm	2003/09/29 19:48:17	1.91
+++ loncom/interface/loncoursedata.pm	2003/10/17 21:36:10	1.104
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: loncoursedata.pm,v 1.91 2003/09/29 19:48:17 matthew Exp $
+# $Id: loncoursedata.pm,v 1.104 2003/10/17 21:36:10 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.
 
@@ -711,13 +711,8 @@ sub init_dbs {
                     { name => 'transaction',
                       type => 'MEDIUMINT UNSIGNED',
                       restrictions => 'NOT NULL' },
-                    { name => 'tries',
-                      type => 'SMALLINT UNSIGNED',
-                      restrictions => 'NOT NULL' },
                     { name => 'awarddetail',
                       type => 'TINYTEXT' },
-                    { name => 'awarded',
-                      type => 'TINYTEXT' },
 #                    { name => 'message',
 #                      type => 'CHAR' },
                     { name => 'response_specific',
@@ -1074,6 +1069,36 @@ sub get_student {
 
 =pod
 
+=item &clear_internal_caches()
+
+Causes the internal caches used in get_student_id, get_student,
+get_symb_id, get_symb, get_part_id, and get_part to be undef'd.
+
+Needs to be called before the first operation with the MySQL database
+for a given Apache request.
+
+=cut
+
+################################################
+################################################
+sub clear_internal_caches {
+    $have_read_part_table = 0;
+    undef(%ids_by_part);
+    undef(%parts_by_id);
+    $have_read_symb_table = 0;
+    undef(%ids_by_symb);
+    undef(%symbs_by_id);
+    $have_read_student_table = 0;
+    undef(%ids_by_student);
+    undef(%students_by_id);
+}
+
+
+################################################
+################################################
+
+=pod
+
 =item &update_full_student_data($sname,$sdom,$courseid)
 
 Does a lonnet::dump on a student to populate the courses tables.
@@ -1151,7 +1176,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()) {
@@ -1187,9 +1212,7 @@ sub update_full_student_data {
             }
             # deal with response specific data
             if (defined($resp_id) &&
-                $field =~ /^(tries|
-                             awarddetail|
-                             awarded|
+                $field =~ /^(awarddetail|
                              submission|
                              submissiongrading|
                              molecule)$/x) {
@@ -1199,6 +1222,7 @@ sub update_full_student_data {
                     # However, there is one wrinkle: submissions which end in
                     # and odd number of '\' cause insert errors to occur.  
                     # Best trap this somehow...
+                    $value =~ s/\'/\\\'/g;
                     my ($offensive_string) = ($value =~ /(\\+)$/);
                     if (length($offensive_string) % 2) {
                         $value =~ s/\\$/\\\\/;
@@ -1216,7 +1240,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 +1268,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)) {
@@ -1254,9 +1278,7 @@ sub update_full_student_data {
                     $store_command .= "('".join("','",$symb_id,$part_id,
                                                 $resp_id,$student_id,
                                                 $transaction,
-                                                $data->{'tries'},
                                                 $data->{'awarddetail'},
-                                                $data->{'awarded'},
                                                 $data->{'response_specific'},
                                                 $data->{'response_specific_value'},
                                                 $data->{'submission'})."'),";
@@ -1357,8 +1379,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 +1407,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 +1461,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 +1477,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 +1706,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};
     }
@@ -1829,6 +1880,7 @@ sub get_problem_statistics {
     return if (! defined($symb) || ! defined($part));
     $courseid = $ENV{'request.course.id'} if (! defined($courseid));
     #
+    &setup_table_names($courseid);
     my $symb_id = &get_symb_id($symb);
     my $part_id = &get_part_id($part);
     my $stats_table = $courseid.'_problem_stats';
@@ -1868,7 +1920,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'");
@@ -1935,6 +1987,49 @@ sub execute_SQL_request {
     return ();
 }
 
+#sub get_timestamp_data {
+#    my ($students,$symb,
+sub get_optionresponse_data {
+    my ($students,$symb,$response,$courseid) = @_;
+    return undef if (! defined($symb) || 
+               ! defined($response));
+    $courseid = $ENV{'request.course.id'} if (! defined($courseid));
+    #
+    &setup_table_names($courseid);
+    my $symb_id = &get_symb_id($symb);
+    my $response_id = &get_part_id($response);
+    #
+    my $dbh = &Apache::lonmysql::get_dbh();
+    return undef if (! defined($dbh));
+    my $request = 'SELECT '.
+        'a.awarddetail, a.response_specific_value, a.submission, '.
+        'b.timestamp, c.tries '.
+        'FROM '.$fulldump_response_table.' AS a '.
+        'LEFT JOIN '.$fulldump_timestamp_table.' AS b '.
+        'ON a.symb_id=b.symb_id AND a.student_id=b.student_id AND '.
+        'a.transaction = b.transaction '.
+        'LEFT JOIN '.$fulldump_part_table.' AS c '.
+        'ON a.symb_id=c.symb_id AND a.student_id=c.student_id AND '.        
+        'a.part_id=c.part_id AND a.transaction = c.transaction '.
+        'WHERE '.
+        'a.symb_id='.$symb_id.' AND a.response_id='.$response_id;
+    if (defined($students)) {
+        $request .= ' AND ('.
+            join(' OR ', map {'a.student_id='.
+                                  &get_student_id($_->{'username'},
+                                                  $_->{'domain'})
+                              } @$students
+                 ).')';
+    }
+    $request .= ' ORDER BY b.timestamp';
+#    &Apache::lonnet::logthis("request =\n".$request);
+    my $sth = $dbh->prepare($request);
+    $sth->execute();
+    my $dataset = $sth->fetchall_arrayref();
+    if (ref($dataset) eq 'ARRAY' && scalar(@$dataset)>0) {
+        return $dataset;
+    }
+}
 
 ################################################
 ################################################