--- loncom/interface/loncoursedata.pm	2004/04/06 15:45:13	1.130
+++ loncom/interface/loncoursedata.pm	2004/06/15 14:12:56	1.135
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: loncoursedata.pm,v 1.130 2004/04/06 15:45:13 matthew Exp $
+# $Id: loncoursedata.pm,v 1.135 2004/06/15 14:12:56 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -199,6 +199,7 @@ sub get_sequence_assessment_data {
             my @Ids       = $curRes->responseIds($part);
             $partdata{$part}->{'ResponseTypes'}= \@Responses;
             $partdata{$part}->{'ResponseIds'}  = \@Ids;
+            $partdata{$part}->{'Survey'}       = $curRes->is_survey($part);
             # Count how many responses of each type there are in this part
             foreach (@Responses) {
                 $partdata{$part}->{$_}++;
@@ -547,12 +548,14 @@ store student data.
 ################################################
 ################################################
 sub init_dbs {
-    my $courseid = shift;
+    my ($courseid,$drop) = @_;
     &setup_table_names($courseid);
     #
     # Drop any of the existing tables
-    foreach my $table (@Tables) {
-        &Apache::lonmysql::drop_table($table);
+    if ($drop) {
+        foreach my $table (@Tables) {
+            &Apache::lonmysql::drop_table($table);
+        }
     }
     #
     # Note - changes to this table must be reflected in the code that 
@@ -580,7 +583,7 @@ sub init_dbs {
                       restrictions => 'NOT NULL',
                       auto_inc     => 'yes', },
                     { name => 'part',
-                      type => 'VARCHAR(100)',
+                      type => 'VARCHAR(100) BINARY',
                       restrictions => 'NOT NULL'},
                     ],
         'PRIMARY KEY' => ['part (100)'],
@@ -595,16 +598,16 @@ sub init_dbs {
                       restrictions => 'NOT NULL',
                       auto_inc     => 'yes', },
                     { name => 'student',
-                      type => 'VARCHAR(100)',
+                      type => 'VARCHAR(100) BINARY',
                       restrictions => 'NOT NULL UNIQUE'},
                     { name => 'section',
-                      type => 'VARCHAR(100)',
+                      type => 'VARCHAR(100) BINARY',
                       restrictions => 'NOT NULL'},
                     { name => 'status',
-                      type => 'VARCHAR(15)',
+                      type => 'VARCHAR(15) BINARY',
                       restrictions => 'NOT NULL'},
                     { name => 'classification',
-                      type => 'varchar(100)', },
+                      type => 'VARCHAR(100) BINARY', },
                     { name => 'updatetime',
                       type => 'INT UNSIGNED'},
                     { name => 'fullupdatetime',
@@ -629,7 +632,7 @@ sub init_dbs {
                       type => 'MEDIUMINT UNSIGNED',
                       restrictions => 'NOT NULL' },
                     { name => 'part',
-                      type => 'VARCHAR(100)',
+                      type => 'VARCHAR(100) BINARY',
                       restrictions => 'NOT NULL'},                    
                     { name => 'solved',
                       type => 'TINYTEXT' },
@@ -709,7 +712,7 @@ sub init_dbs {
                     { name => 'awarddetail',
                       type => 'TINYTEXT' },
 #                    { name => 'message',
-#                      type => 'CHAR' },
+#                      type => 'CHAR BINARY'},
                     { name => 'response_specific',
                       type => 'TINYTEXT' },
                     { name => 'response_specific_value',
@@ -1081,6 +1084,7 @@ sub populate_student_table {
     }
     #
     &setup_table_names($courseid);
+    &init_dbs($courseid,0);
     my $dbh = &Apache::lonmysql::get_dbh();
     my $request = 'INSERT IGNORE INTO '.$student_table.
         "(student,section,status) VALUES ";
@@ -1594,7 +1598,7 @@ sub ensure_tables_are_set_up {
         !$found_performance   || !$found_parameters        ||
         !$found_fulldump_part || !$found_fulldump_response ||
         !$found_fulldump_timestamp || !$found_weight ) {
-        if (&init_dbs($courseid)) {
+        if (&init_dbs($courseid,1)) {
             return 'error';
         }
     }
@@ -2030,12 +2034,14 @@ sub get_problem_statistics {
     }
     my ($solved) = &execute_SQL_request($dbh,$request);
     #
+    $Solved -= $solved;
+    #
     $num    = 0 if (! defined($num));
     $tries  = 0 if (! defined($tries));
     $max    = 0 if (! defined($max));
     $min    = 0 if (! defined($min));
     $STD    = 0 if (! defined($STD));
-    $Solved = 0 if (! defined($Solved));
+    $Solved = 0 if (! defined($Solved) || $Solved < 0);
     $solved = 0 if (! defined($solved));
     #
     # Compute the more complicated statistics
@@ -2456,14 +2462,14 @@ sub count_stats {
         $request .= ' AND '.$enrollment_limits;
     }
     $request .= ' GROUP BY a.student_id';
-    &Apache::lonnet::logthis('request = '.$/.$request);
+#    &Apache::lonnet::logthis('request = '.$/.$request);
     my $sth = $dbh->prepare($request);
     $sth->execute();
     $request = 
         'SELECT AVG(count),STD(count),MAX(count),MIN(count),COUNT(count) '.
         'FROM '.$stats_table;
     my ($ave,$std,$max,$min,$count) = &execute_SQL_request($dbh,$request);
-    &Apache::lonnet::logthis('request = '.$/.$request);
+#    &Apache::lonnet::logthis('request = '.$/.$request);
     return($min,$max,$ave,$std,$count);
 }