--- loncom/interface/loncoursedata.pm	2004/02/02 19:50:33	1.113
+++ loncom/interface/loncoursedata.pm	2004/03/07 20:53:40	1.121
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: loncoursedata.pm,v 1.113 2004/02/02 19:50:33 matthew Exp $
+# $Id: loncoursedata.pm,v 1.121 2004/03/07 20:53:40 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -182,7 +182,7 @@ sub get_sequence_assessment_data {
             next;
         }
         next if (! ref($curRes));
-        next if (! $curRes->is_problem());# && !$curRes->randomout);
+        next if (! $curRes->is_problem() && $curRes->src() !~ /\.survey$/);
         # Okay, from here on out we only deal with assessments
         $title = $curRes->title();
         $title =~ s/\:/\&\#058;/g;
@@ -1235,11 +1235,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') {
@@ -1919,7 +1915,7 @@ able to answer it correctly.
 ################################################
 ################################################
 sub get_problem_statistics {
-    my ($students,$symb,$part,$courseid) = @_;
+    my ($Sections,$status,$symb,$part,$courseid) = @_;
     return if (! defined($symb) || ! defined($part));
     $courseid = $ENV{'request.course.id'} if (! defined($courseid));
     #
@@ -1933,18 +1929,22 @@ sub get_problem_statistics {
     #
     $dbh->do('DROP TABLE '.$stats_table);  # May return an error
     my $request = 
-        'CREATE TEMPORARY TABLE '.$stats_table.
-            ' SELECT student_id,solved,award,awarded,tries FROM '.$performance_table.
-                ' WHERE symb_id='.$symb_id.' AND part_id='.$part_id;
-    if (defined($students)) {
+        'CREATE TEMPORARY TABLE '.$stats_table.' '.
+        'SELECT a.student_id,a.solved,a.award,a.awarded,a.tries '.
+        'FROM '.$performance_table.' AS a ';
+    if ((defined($Sections) && lc($Sections->[0]) ne 'all') || 
+        (defined($status)   && lc($status)        ne 'any')) {
+        $request .= 'NATURAL LEFT JOIN '.$student_table.' AS b ';
+    }
+    $request .= ' WHERE a.symb_id='.$symb_id.' AND a.part_id='.$part_id;
+    if (defined($Sections) && lc($Sections->[0]) ne 'all') {
         $request .= ' AND ('.
-            join(' OR ', map {'student_id='.
-                                  &get_student_id($_->{'username'},
-                                                  $_->{'domain'})
-                                  } @$students
+            join(' OR ', map { "b.section='".$_."'" } @$Sections
                  ).')';
     }
-#    &Apache::lonnet::logthis($request);
+    if (defined($status) && lc($status) ne 'any') {
+        $request .= " AND b.status='".$status."'";
+    }
     $dbh->do($request);
 #    &Apache::lonnet::logthis('request = '.$/.$request);
     $request = 'SELECT COUNT(*),SUM(tries),MAX(tries),AVG(tries),STD(tries) '.
@@ -2107,10 +2107,71 @@ 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;
     }
 }
 
+
+sub RDs_awarddetail   { return 3; }
+sub RDs_submission    { return 2; }
+sub RDs_timestamp     { return 1; }
+sub RDs_tries         { return 0; }
+sub RDs_awarded       { return 4; }
+
+sub get_response_data_by_student {
+    my ($student,$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 $student_id = &get_student_id($student->{'username'},
+                                     $student->{'domain'});
+    #
+    my $dbh = &Apache::lonmysql::get_dbh();
+    return undef if (! defined($dbh));
+    my $request = 'SELECT '.
+        'c.tries, b.timestamp, a.submission, a.awarddetail, e.awarded '.
+        '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 '.
+        'LEFT JOIN '.$student_table.' AS d '.
+        'ON a.student_id=d.student_id '.
+        'LEFT JOIN '.$performance_table.' AS e '.
+        'ON a.symb_id=e.symb_id AND a.part_id=e.part_id AND '.
+        'a.student_id=e.student_id AND c.tries=e.tries '.
+        'WHERE '.
+        'a.symb_id='.$symb_id.' AND a.response_id='.$response_id.
+        ' AND a.student_id='.$student_id.' ORDER BY b.timestamp';
+    # &Apache::lonnet::logthis("request =\n".$request);
+    my $sth = $dbh->prepare($request);
+    $sth->execute();
+    if ($dbh->err) {
+        &Apache::lonnet::logthis('error = '.$dbh->errstr());
+        return undef;
+    }
+    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]->[2] =~ s/(\'$|^\')//g;
+        }
+        return $dataset;
+    }
+    return undef; # error occurred
+}
+
 sub RT_student_id { return 0; }
 sub RT_awarded    { return 1; }
 sub RT_tries      { return 2; }
@@ -2164,50 +2225,78 @@ sub get_response_time_data {
 
 =pod
 
-=item &get_student_scores($Students,$Symbs,$courseid)
+=item &get_student_scores($Sections,$Symbs,$enrollment,$courseid)
 
 =cut
 
 ################################################
 ################################################
 sub get_student_scores {
-    my ($Students,$Symbs,$courseid) = @_;
+    my ($Sections,$Symbs,$enrollment,$courseid,$starttime,$endtime) = @_;
     $courseid = $ENV{'request.course.id'} if (! defined($courseid));
     &setup_table_names($courseid);
     my $dbh = &Apache::lonmysql::get_dbh();
     return (undef) if (! defined($dbh));
     my $tmptable = $courseid.'_temp_'.time;
-    my ($symb_requirements,$student_requirements);
+    #
+    my $symb_requirements;
     if (defined($Symbs)  && @$Symbs) {
         $symb_requirements = '('.
-            join(' OR ', map{ "(symb_id='".&get_symb_id($_->{'symb'}).
-                                  "' AND part_id='".&get_part_id($_->{'part'}).
-                                  "')"
+            join(' OR ', map{ "(a.symb_id='".&get_symb_id($_->{'symb'}).
+                              "' AND a.part_id='".&get_part_id($_->{'part'}).
+                              "')"
                               } @$Symbs).')';
     }
-    if (defined($Students)) {
+    #
+    my $student_requirements;
+    if ( (defined($Sections) && $Sections->[0] ne 'all')) {
         $student_requirements = '('.
-            join(' OR ', map {'student_id='.
-                                  &get_student_id($_->{'username'},
-                                                  $_->{'domain'})
-                              } @$Students
+            join(' OR ', map { "b.section='".$_."'" } @$Sections
                  ).')';
     }
+    #
+    my $enrollment_requirements=undef;
+    if (defined($enrollment) && $enrollment ne 'Any') {
+        $enrollment_requirements = "b.status='".$enrollment."'";
+    }
+    #
+    my $time_requirements = undef;
+    if (defined($starttime)) {
+        $time_requirements .= "a.timestamp>='".$starttime."'";
+        if (defined($endtime)) {
+            $time_requirements .= " AND a.timestamp<='".$endtime."'";
+        }
+    } elsif (defined($endtime)) {
+        $time_requirements .= "a.timestamp<='".$endtime."'";
+    }
+    ##
+    ##
     my $request = 'CREATE TEMPORARY TABLE IF NOT EXISTS '.$tmptable.
-        ' SELECT student_id,SUM(awarded) AS score FROM '.$performance_table;
-    if (defined($symb_requirements) || defined($student_requirements)) {
+        ' SELECT a.student_id,SUM(a.awarded) AS score FROM '.
+        $performance_table.' AS a ';
+    if (defined($student_requirements) || defined($enrollment_requirements)) {
+        $request .= ' NATURAL LEFT JOIN '.$student_table.' AS b ';
+    }
+    if (defined($symb_requirements)      || 
+        defined($student_requirements)   ||
+        defined($enrollment_requirements) ) {
         $request .= ' WHERE ';
-        if (defined($symb_requirements)) {
-            $request .= $symb_requirements;
-            if (defined($student_requirements)) {
-                $request .= ' AND '.$student_requirements;
-            }
-        } elsif (defined($student_requirements)) {
-            $request .= $student_requirements;
-        }
     }
-    $request .= ' GROUP BY student_id';
-    &Apache::lonnet::logthis("request = \n".$request);
+    if (defined($symb_requirements)) {
+        $request .= $symb_requirements.' AND ';
+    }
+    if (defined($student_requirements)) {
+        $request .= $student_requirements.' AND ';
+    }
+    if (defined($enrollment_requirements)) {
+        $request .= $enrollment_requirements.' AND ';
+    }
+    if (defined($time_requirements)) {
+        $request .= $time_requirements.' AND ';
+    }
+    $request =~ s/ AND $//; # Strip of the trailing ' AND '.
+    $request .= ' GROUP BY a.student_id';
+#    &Apache::lonnet::logthis("request = \n".$request);
     my $sth = $dbh->prepare($request);
     $sth->execute();
     if ($dbh->err) {