--- loncom/interface/loncoursedata.pm	2003/03/26 16:25:06	1.62
+++ loncom/interface/loncoursedata.pm	2003/03/28 15:19:35	1.64
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: loncoursedata.pm,v 1.62 2003/03/26 16:25:06 matthew Exp $
+# $Id: loncoursedata.pm,v 1.64 2003/03/28 15:19:35 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -506,8 +506,6 @@ sub init_dbs {
                       type => 'TINYTEXT' },
                     { name => 'timestamp',
                       type => 'INT UNSIGNED'},
-                    { name => 'weight',
-                      type => 'INT UNSIGNED'},
                     ],
         'PRIMARY KEY' => ['symb_id','student_id','part_id'],
         'KEY' => [{ columns=>['student_id'] },
@@ -859,10 +857,9 @@ sub update_student_data {
         my $symb_id = &get_symb_id($current_symb);
         #
         # Load data into the tables
-        foreach my $parameter (keys(%$param_hash)) {
-            my $value = $param_hash->{$parameter};
+        while (my ($parameter,$value) = each(%$param_hash)) {
             my $newstring;
-            if ($parameter !~ /(timestamp|resource\.(.*)\.(solved|tries|awarded|award|awarddetail|previous|weight))/) {
+            if ($parameter !~ /(timestamp|resource\.(.*)\.(solved|tries|awarded|award|awarddetail|previous))/) {
                 $newstring = "('".join("','",
                                        $symb_id,$student_id,
                                        $parameter,$value)."'),\n";
@@ -883,11 +880,6 @@ sub update_student_data {
             my $award   = $param_hash->{'resource.'.$part.'.award'};
             my $awarddetail = $param_hash->{'resource.'.$part.'.awarddetail'};
             my $timestamp = $param_hash->{'timestamp'};
-            # use EXT to get the weight
-            my $weight  = &Apache::lonnet::EXT('resource.'.$part.'.weight',
-                                               $current_symb,$sdom,$sname);
-            # Give the weight back to the user
-            $param_hash->{'resource.'.$part.'.weight'}=$weight;
             #
             $solved      = '' if (! defined($awarded));
             $tries       = '' if (! defined($tries));
@@ -896,7 +888,7 @@ sub update_student_data {
             $awarddetail = '' if (! defined($awarddetail));
             $newstring = "('".join("','",$symb_id,$student_id,$part_id,
                                    $solved,$tries,$awarded,$award,
-                                   $awarddetail,$timestamp,$weight)."'),\n";
+                                   $awarddetail,$timestamp)."'),\n";
             $store_performance_command .= $newstring;
             $rows_stored++;
         }
@@ -1039,7 +1031,7 @@ sub get_student_data_from_performance_ca
     my $dbh = &Apache::lonmysql::get_dbh();
     my $request = "SELECT ".
         "d.symb,c.part,a.solved,a.tries,a.awarded,a.award,a.awarddetail,".
-            "a.timestamp,a.weight ";
+            "a.timestamp ";
     if (defined($student)) {
         $request .= "FROM $student_table AS b ".
             "LEFT JOIN $performance_table AS a ON b.student_id=a.student_id ".
@@ -1068,7 +1060,7 @@ sub get_student_data_from_performance_ca
     }
     foreach my $row (@{$sth->fetchall_arrayref}) {
         $rows_retrieved++;
-        my ($symb,$part,$solved,$tries,$awarded,$award,$awarddetail,$time,$weight) = 
+        my ($symb,$part,$solved,$tries,$awarded,$award,$awarddetail,$time) = 
             (@$row);
         my $base = 'resource.'.$part;
         $studentdata->{$symb}->{$base.'.solved'}  = $solved;
@@ -1077,7 +1069,6 @@ sub get_student_data_from_performance_ca
         $studentdata->{$symb}->{$base.'.award'}   = $award;
         $studentdata->{$symb}->{$base.'.awarddetail'} = $awarddetail;
         $studentdata->{$symb}->{'timestamp'} = $time if (defined($time) && $time ne '');
-        $studentdata->{$symb}->{'resource.'.$part.'.weight'}=$weight;
     }
     return $studentdata;
 }
@@ -1159,6 +1150,43 @@ the students you are concerned with prio
 
 Inputs: $students, $symb, $part, $courseid
 
+=over 4
+
+=item $students is an array of hash references.  
+Each hash must contain at least the 'username' and 'domain' of a student.
+
+=item $symb is the symb for the problem.
+
+=item $part is the part id you need statistics for
+
+=item $courseid is the course id, of course!
+
+=back
+
+Outputs: See the code for up to date information.
+
+=over 4
+
+=item $num The number of students attempting the problem
+
+=item $tries The total number of tries for the students
+
+=item $mod The maximum number of tries taken
+
+=item $mean The average number of tries
+
+=item $Solved The number of students able to solve the problem
+
+=item $solved The number of students whose answer is 'correct_by_override'
+
+=item $DegOfDiff The degree of difficulty of the problem
+
+=item $STD The standard deviation of the number of tries
+
+=item $SKEW The skew of the number of tries
+
+=back
+
 =cut
 
 ################################################
@@ -1191,6 +1219,14 @@ sub get_problem_statistics {
         'CREATE TEMPORARY TABLE '.$stats_table.
             ' SELECT student_id,solved,award,tries FROM '.$performance_table.
                 ' WHERE symb_id='.$symb_id.' AND part_id='.$part_id;
+    if (defined($students)) {
+        $request .= ' AND ('.
+            join(' OR ', map {'student_id='.
+                                  &get_student_id($_->{'username'},
+                                                  $_->{'domain'})
+                                  } @$students
+                 ).')';
+    }
 #    &Apache::lonnet::logthis($request);
     $dbh->do($request);
     my ($num,$tries,$mod,$mean,$STD) = &execute_SQL_request