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

[raeburn]

raeburn		Fri May  5 17:35:34 2006 EDT

  Modified files:              
    /loncom/interface	loncoursedata.pm 
  Log:
  A couple of ANDs missing from the SQL WHERE conditions for group limits.
  
  
Index: loncom/interface/loncoursedata.pm
diff -u loncom/interface/loncoursedata.pm:1.167 loncom/interface/loncoursedata.pm:1.168
--- loncom/interface/loncoursedata.pm:1.167	Fri May  5 16:03:54 2006
+++ loncom/interface/loncoursedata.pm	Fri May  5 17:35:31 2006
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: loncoursedata.pm,v 1.167 2006/05/05 20:03:54 raeburn Exp $
+# $Id: loncoursedata.pm,v 1.168 2006/05/05 21:35:31 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2599,7 +2599,7 @@
         $limit .= ' AND '.$enrollment_limits;
     }
     if ($group_limits) {
-        $limit .= $group_limits;
+        $limit .= ' AND '.$group_limits;
     }
     $request .= $limit.' GROUP BY a.student_id';
 #    &Apache::lonnet::logthis('request = '.$/.$request);
@@ -2711,7 +2711,7 @@
         $limit .= ' AND '.$enrollment_requirements;
     }
     if (defined($group_limits)) {
-        $limit .= $group_limits;
+        $limit .= ' AND '.$group_limits;
     }
     $request .= $limit.' ORDER BY b.timestamp';
 #    &Apache::lonnet::logthis("request =\n".$request);