[LON-CAPA-cvs] cvs: loncom /interface loncoursedata.pm

[albertel]

albertel		Fri Nov 11 18:23:25 2005 EDT

  Modified files:              
    /loncom/interface	loncoursedata.pm 
  Log:
  - BUG#4448 
  
  
Index: loncom/interface/loncoursedata.pm
diff -u loncom/interface/loncoursedata.pm:1.150 loncom/interface/loncoursedata.pm:1.151
--- loncom/interface/loncoursedata.pm:1.150	Tue Oct  4 14:27:32 2005
+++ loncom/interface/loncoursedata.pm	Fri Nov 11 18:23:24 2005
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: loncoursedata.pm,v 1.150 2005/10/04 18:27:32 albertel Exp $
+# $Id: loncoursedata.pm,v 1.151 2005/11/11 23:23:24 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1291,6 +1291,7 @@
         while (my ($parameter,$value) = each(%$param_hash)) {
             next if ($parameter !~ /^resource\.(.*)\.(solved|awarded)$/);
             my $part = $1;
+	    next if ($part =~ /\./);
             next if (exists($stored{$part}));
             $stored{$part}++;
             #
@@ -2260,11 +2261,10 @@
     $request = 
         'CREATE TEMPORARY TABLE '.$stats_table.' '.
         'SELECT a.student_id,'.
-        'COUNT(a.award) AS count FROM '.
+        'SUM(a.awarded) AS count FROM '.
         $performance_table.' AS a '.
         'LEFT JOIN '.$student_table.' AS b ON a.student_id=b.student_id '.
-        'WHERE ('.$symb_restriction.')'.
-        " AND a.award!='INCORRECT_ATTEMPTED'";
+        'WHERE ('.$symb_restriction.')';
     if ($time_limits) {
         $request .= ' AND '.$time_limits;
     }