--- loncom/interface/loncoursedata.pm	2003/12/11 22:18:04	1.110
+++ loncom/interface/loncoursedata.pm	2004/04/30 20:09:18	1.112.2.2
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: loncoursedata.pm,v 1.110 2003/12/11 22:18:04 matthew Exp $
+# $Id: loncoursedata.pm,v 1.112.2.2 2004/04/30 20:09:18 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -581,7 +581,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)'],
@@ -596,10 +596,10 @@ sub init_dbs {
                       restrictions => 'NOT NULL',
                       auto_inc     => 'yes', },
                     { name => 'student',
-                      type => 'VARCHAR(100)',
+                      type => 'VARCHAR(100) BINARY',
                       restrictions => 'NOT NULL'},
                     { name => 'classification',
-                      type => 'varchar(100)', },
+                      type => 'varchar(100) BINARY', },
                     ],
         'PRIMARY KEY' => ['student (100)'],
         'KEY' => [{ columns => ['student_id']},],
@@ -616,9 +616,9 @@ sub init_dbs {
                     { name => 'fullupdatetime',
                       type => 'INT UNSIGNED'},
                     { name => 'section',
-                      type => 'VARCHAR(100)'},
+                      type => 'VARCHAR(100) BINARY'},
                     { name => 'classification',
-                      type => 'VARCHAR(100)', },
+                      type => 'VARCHAR(100) BINARY', },
                     ],
         'PRIMARY KEY' => ['student_id'],
     };
@@ -636,7 +636,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' },
@@ -716,7 +716,7 @@ sub init_dbs {
                     { name => 'awarddetail',
                       type => 'TINYTEXT' },
 #                    { name => 'message',
-#                      type => 'CHAR' },
+#                      type => 'CHAR BINARY' },
                     { name => 'response_specific',
                       type => 'TINYTEXT' },
                     { name => 'response_specific_value',
@@ -1225,11 +1225,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/\\$/\\\\/;
-                    }
+                    $value = $dbh->quote($value);
                 }
                 if ($field eq 'submissiongrading' || 
                     $field eq 'molecule') {
@@ -1278,13 +1274,21 @@ sub update_full_student_data {
         while (my ($part_id,$hash2) = each (%$hash1)) {
             while (my ($resp_id,$hash3) = each (%$hash2)) {
                 while (my ($transaction,$data) = each (%$hash3)) {
-                    $store_command .= "('".join("','",$symb_id,$part_id,
-                                                $resp_id,$student_id,
-                                                $transaction,
-                                                $data->{'awarddetail'},
-                                                $data->{'response_specific'},
-                                                $data->{'response_specific_value'},
-                                                $data->{'submission'})."'),";
+                    my $submission = $data->{'submission'};
+                    # We have to be careful with user supplied input.
+                    # most of the time we are okay because it is escaped.
+                    # However, there is one wrinkle: submissions which end in
+                    # and odd number of '\' cause insert errors to occur.  
+                    # Best trap this somehow...
+                    $submission = $dbh->quote($submission);
+                    $store_command .= "('".
+                        join("','",$symb_id,$part_id,
+                             $resp_id,$student_id,
+                             $transaction,
+                             $data->{'awarddetail'},
+                             $data->{'response_specific'},
+                             $data->{'response_specific_value'}).
+                             "',".$submission."),";
                     $store_rows++;
                 }
             }
@@ -2067,6 +2071,10 @@ sub get_response_data {
     }
     my $dataset = $sth->fetchall_arrayref();
     if (ref($dataset) eq 'ARRAY' && scalar(@$dataset)>0) {
+        # Clear the \'s from around the submission
+        for (my $i =0;$i<scalar(@$dataset);$i++) {
+            $dataset->[$i]->[3] =~ s/(\'$|^\')//g;
+        }
         return $dataset;
     }
 }
@@ -2219,7 +2227,7 @@ $ENV{'course.'.$cid.'.domain'}, and $ENV
 
 Returns a reference to a hash which contains:
  keys    '$sname:$sdom'
- values  [$sdom,$sname,$end,$start,$id,$section,$fullname,$status]
+ values  [$sdom,$sname,$end,$start,$id,$section,$fullname,$status,$type]
 
 The constant values CL_SDOM, CL_SNAME, CL_END, etc. can be used
 as indices into the returned list to future-proof clients against
@@ -2238,6 +2246,7 @@ sub CL_ID       { return 4; }
 sub CL_SECTION  { return 5; }
 sub CL_FULLNAME { return 6; }
 sub CL_STATUS   { return 7; }
+sub CL_TYPE     { return 8; }
 
 sub get_classlist {
     my ($cid,$cdom,$cnum) = @_;
@@ -2254,9 +2263,9 @@ sub get_classlist {
         }
         my ($sname,$sdom) = split(/:/,$student);
         my @Values = split(/:/,$info);
-        my ($end,$start,$id,$section,$fullname);
+        my ($end,$start,$id,$section,$fullname,$type);
         if (@Values > 2) {
-            ($end,$start,$id,$section,$fullname) = @Values;
+            ($end,$start,$id,$section,$fullname,$type) = @Values;
         } else { # We have to get the data ourselves
             ($end,$start) = @Values;
             $section = &Apache::lonnet::getsection($sdom,$sname,$cid);
@@ -2293,11 +2302,11 @@ sub get_classlist {
             $status='Active';
         }
         $classlist{$student} = 
-            [$sdom,$sname,$end,$start,$id,$section,$fullname,$status];
+            [$sdom,$sname,$end,$start,$id,$section,$fullname,$status,$type];
     }
     if (wantarray()) {
         return (\%classlist,['domain','username','end','start','id',
-                             'section','fullname','status']);
+                             'section','fullname','status','type']);
     } else {
         return \%classlist;
     }