--- loncom/interface/loncoursedata.pm	2003/10/02 17:07:41	1.99
+++ loncom/interface/loncoursedata.pm	2003/12/09 21:14:23	1.109
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: loncoursedata.pm,v 1.99 2003/10/02 17:07:41 matthew Exp $
+# $Id: loncoursedata.pm,v 1.109 2003/12/09 21:14:23 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -73,8 +73,6 @@ and/or itself.
 
 =item &get_sequence_assessment_data()
 
-AT THIS TIME THE USE OF THIS FUNCTION IS *NOT* RECOMMENDED
-
 Use lonnavmaps to build a data structure describing the order and 
 assessment contents of each sequence in the current course.
 
@@ -711,9 +709,6 @@ sub init_dbs {
                     { name => 'transaction',
                       type => 'MEDIUMINT UNSIGNED',
                       restrictions => 'NOT NULL' },
-                    { name => 'tries',
-                      type => 'SMALLINT UNSIGNED',
-                      restrictions => 'NOT NULL' },
                     { name => 'awarddetail',
                       type => 'TINYTEXT' },
 #                    { name => 'message',
@@ -1042,7 +1037,8 @@ sub get_student_id {
         $have_read_student_table = 1;
     }
     if (! exists($ids_by_student{$student})) {
-        &Apache::lonmysql::store_row($student_table,[undef,$student,undef]);
+        &Apache::lonmysql::store_row($student_table,
+                                     [undef,$student,undef]);
         undef(%ids_by_student);
         my @Result = &Apache::lonmysql::get_rows($student_table);
         foreach (@Result) {
@@ -1215,8 +1211,7 @@ sub update_full_student_data {
             }
             # deal with response specific data
             if (defined($resp_id) &&
-                $field =~ /^(tries|
-                             awarddetail|
+                $field =~ /^(awarddetail|
                              submission|
                              submissiongrading|
                              molecule)$/x) {
@@ -1226,6 +1221,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/\\$/\\\\/;
@@ -1281,7 +1277,6 @@ sub update_full_student_data {
                     $store_command .= "('".join("','",$symb_id,$part_id,
                                                 $resp_id,$student_id,
                                                 $transaction,
-                                                $data->{'tries'},
                                                 $data->{'awarddetail'},
                                                 $data->{'response_specific'},
                                                 $data->{'response_specific_value'},
@@ -1884,6 +1879,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';
@@ -1891,21 +1887,10 @@ sub get_problem_statistics {
     my $dbh = &Apache::lonmysql::get_dbh();
     return undef if (! defined($dbh));
     #
-    # A) Number of Students attempting problem
-    # B) Total number of tries of students attempting problem
-    # C) Mod (largest number of tries for solving the problem)
-    # D) Mean (average number of tries for solving the problem)
-    # E) Number of students to solve the problem
-    # F) Number of students to solve the problem by override
-    # G) Number of students unable to solve the problem
-    # H) Degree of difficulty : 1-(E+F)/B
-    # I) Standard deviation of number of tries
-    # J) Skew of tries: sqrt(sum(Xi-D)^3)/A
-    #
     $dbh->do('DROP TABLE '.$stats_table);  # May return an error
     my $request = 
         'CREATE TEMPORARY TABLE '.$stats_table.
-            ' SELECT student_id,solved,award,tries FROM '.$performance_table.
+            ' SELECT student_id,solved,award,awarded,tries FROM '.$performance_table.
                 ' WHERE symb_id='.$symb_id.' AND part_id='.$part_id;
     if (defined($students)) {
         $request .= ' AND ('.
@@ -1917,16 +1902,22 @@ sub get_problem_statistics {
     }
 #    &Apache::lonnet::logthis($request);
     $dbh->do($request);
+#    &Apache::lonnet::logthis('request = '.$/.$request);
+    $request = 'SELECT COUNT(*),SUM(tries),MAX(tries),AVG(tries),STD(tries) '.
+        'FROM '.$stats_table;
     my ($num,$tries,$mod,$mean,$STD) = &execute_SQL_request
-        ($dbh,
-         'SELECT COUNT(*),SUM(tries),MAX(tries),AVG(tries),STD(tries) FROM '.
-         $stats_table);
-    my ($Solved) = &execute_SQL_request($dbh,'SELECT COUNT(tries) FROM '.
-                                        $stats_table.
-         " 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'");
+        ($dbh,$request);
+#    &Apache::lonnet::logthis('request = '.$/.$request);
+    $request = 'SELECT SUM(awarded) FROM '.$stats_table;
+    my ($Solved) = &execute_SQL_request($dbh,$request);
+#    &Apache::lonnet::logthis('request = '.$/.$request);
+    $request = 'SELECT SUM(awarded) FROM '.$stats_table.
+        " WHERE solved='correct_by_override'";
+#    &Apache::lonnet::logthis('request = '.$/.$request);
+    my ($solved) = &execute_SQL_request($dbh,$request);
+#    $Solved = int($Solved);
+#    $solved = int($solved);
+    #
     $num    = 0 if (! defined($num));
     $tries  = 0 if (! defined($tries));
     $mod    = 0 if (! defined($mod));
@@ -1946,7 +1937,7 @@ sub get_problem_statistics {
         $wrongpercent=int(10*100*($num-$Solved+$solved)/$num)/10;
     }
     #
-    $dbh->do('DROP TABLE '.$stats_table);  # May return an error
+#    $dbh->do('DROP TABLE '.$stats_table);  # May return an error
     #
     # Store in metadata
     #
@@ -1990,6 +1981,139 @@ sub execute_SQL_request {
     return ();
 }
 
+sub get_student_data {
+    my ($students,$courseid) = @_;
+    $courseid = $ENV{'request.course.id'} if (! defined($courseid));
+    &setup_table_names($courseid);
+    my $dbh = &Apache::lonmysql::get_dbh();
+    return undef if (! defined($dbh));
+    my $request = 'SELECT '.
+        'student_id, student '.
+        'FROM '.$student_table;
+    if (defined($students)) {
+        $request .= ' WHERE ('.
+            join(' OR ', map {'student_id='.
+                                  &get_student_id($_->{'username'},
+                                                  $_->{'domain'})
+                              } @$students
+                 ).')';
+    }
+    $request.= ' ORDER BY student_id';
+    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) {
+        return $dataset;
+    }
+}
+
+sub RD_student_id    { return 0; }
+sub RD_awarddetail   { return 1; }
+sub RD_response_eval { return 2; }
+sub RD_submission    { return 3; }
+sub RD_timestamp     { return 4; }
+sub RD_tries         { return 5; }
+sub RD_sname         { return 6; }
+
+sub get_response_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.student_id, a.awarddetail, a.response_specific_value, '.
+        'a.submission, b.timestamp, c.tries, d.student '.
+        '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 '.
+        '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();
+    if ($dbh->err) {
+        &Apache::lonnet::logthis('error = '.$dbh->errstr());
+        return undef;
+    }
+    my $dataset = $sth->fetchall_arrayref();
+    if (ref($dataset) eq 'ARRAY' && scalar(@$dataset)>0) {
+        return $dataset;
+    }
+}
+
+sub RT_student_id { return 0; }
+sub RT_awarded    { return 1; }
+sub RT_tries      { return 2; }
+sub RT_timestamp  { return 3; }
+
+sub get_response_time_data {
+    my ($students,$symb,$part,$courseid) = @_;
+    return undef 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 $dbh = &Apache::lonmysql::get_dbh();
+    return undef if (! defined($dbh));
+    my $request = 'SELECT '.
+        'a.student_id, a.awarded, a.tries, b.timestamp '.
+        'FROM '.$fulldump_part_table.' AS a '.
+        'NATURAL 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 '.
+        'WHERE '.
+        'a.symb_id='.$symb_id.' AND a.part_id='.$part_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();
+    if ($dbh->err) {
+        &Apache::lonnet::logthis('error = '.$dbh->errstr());
+        return undef;
+    }
+    my $dataset = $sth->fetchall_arrayref();
+    if (ref($dataset) eq 'ARRAY' && scalar(@$dataset)>0) {
+        return $dataset;
+    }
+
+}
 
 ################################################
 ################################################