--- loncom/interface/loncoursedata.pm	2003/12/09 21:14:23	1.109
+++ loncom/interface/loncoursedata.pm	2004/01/19 16:31:25	1.112
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: loncoursedata.pm,v 1.109 2003/12/09 21:14:23 matthew Exp $
+# $Id: loncoursedata.pm,v 1.112 2004/01/19 16:31:25 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -188,6 +188,10 @@ sub get_sequence_assessment_data {
         $title =~ s/\:/\&\#058;/g;
         $symb  = $curRes->symb();
         $src   = $curRes->src();
+        # Grab the filename if there is not title available
+        if (! defined($title) || $title eq '') {
+            ($title) = ($src=~ m:/([^/]*)$:);
+        }
         my $parts = $curRes->parts();
         my %partdata;
         foreach my $part (@$parts) {
@@ -1274,13 +1278,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++;
                 }
             }
@@ -2215,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
@@ -2234,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) = @_;
@@ -2250,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);
@@ -2289,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;
     }