--- loncom/interface/loncoursedata.pm	2003/10/27 21:07:22	1.107
+++ 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.107 2003/10/27 21:07:22 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.
 
@@ -1889,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 ('.
@@ -1915,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));
@@ -1944,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
     #
@@ -2018,7 +2011,15 @@ sub get_student_data {
     }
 }
 
-sub get_optionresponse_data {
+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));
@@ -2032,7 +2033,7 @@ sub get_optionresponse_data {
     return undef if (! defined($dbh));
     my $request = 'SELECT '.
         'a.student_id, a.awarddetail, a.response_specific_value, '.
-        'a.submission, b.timestamp, c.tries '.
+        '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 '.
@@ -2040,6 +2041,8 @@ sub get_optionresponse_data {
         '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)) {
@@ -2064,6 +2067,11 @@ sub get_optionresponse_data {
     }
 }
 
+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) ||