[BACK]Return to loncoursedata.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/loncoursedata.pm between versions 1.167 and 1.169

version 1.167, 2006/05/05 20:03:54 version 1.169, 2006/05/09 14:38:09
Line 965  sub populate_groupnames_table { Line 965  sub populate_groupnames_table {
     my $dbh = &Apache::lonmysql::get_dbh();      my $dbh = &Apache::lonmysql::get_dbh();
     my $cdom = $env{'course.'.$courseid.'.domain'};      my $cdom = $env{'course.'.$courseid.'.domain'};
     my $cnum = $env{'course.'.$courseid.'.num'};      my $cnum = $env{'course.'.$courseid.'.num'};
     my %curr_groups;      my %curr_groups = &Apache::loncommon::coursegroups($cdom,$cnum);
     my $numgrps = &Apache::loncommon::coursegroups(\%curr_groups,$cdom,$cnum);      return if (!%curr_groups);
     return if (!$numgrps);  
     my $request = 'INSERT IGNORE INTO '.$groupnames_table.      my $request = 'INSERT IGNORE INTO '.$groupnames_table.
                   '(groupname) VALUES ';                    '(groupname) VALUES ';
     foreach my $groupname (sort(keys(%curr_groups)),'none') {      foreach my $groupname (sort(keys(%curr_groups)),'none') {
Line 2599  sub count_stats { Line 2598  sub count_stats {
         $limit .= ' AND '.$enrollment_limits;          $limit .= ' AND '.$enrollment_limits;
     }      }
     if ($group_limits) {      if ($group_limits) {
         $limit .= $group_limits;          $limit .= ' AND '.$group_limits;
     }      }
     $request .= $limit.' GROUP BY a.student_id';      $request .= $limit.' GROUP BY a.student_id';
 #    &Apache::lonnet::logthis('request = '.$/.$request);  #    &Apache::lonnet::logthis('request = '.$/.$request);
Line 2711  sub get_response_data { Line 2710  sub get_response_data {
         $limit .= ' AND '.$enrollment_requirements;          $limit .= ' AND '.$enrollment_requirements;
     }      }
     if (defined($group_limits)) {      if (defined($group_limits)) {
         $limit .= $group_limits;          $limit .= ' AND '.$group_limits;
     }      }
     $request .= $limit.' ORDER BY b.timestamp';      $request .= $limit.' ORDER BY b.timestamp';
 #    &Apache::lonnet::logthis("request =\n".$request);  #    &Apache::lonnet::logthis("request =\n".$request);
Line 3152  sub get_group_memberships { Line 3151  sub get_group_memberships {
     my (%classgroups,%studentgroups);      my (%classgroups,%studentgroups);
     my $now = time;      my $now = time;
     my $access_end = $env{'course.'.$cid.'.default_enrollment_end_date'};      my $access_end = $env{'course.'.$cid.'.default_enrollment_end_date'};
     my (%curr_groups,%groupmemberhash);      my %curr_groups =&Apache::loncommon::coursegroups($cdom,$cnum);
     my $numgroups = &Apache::loncommon::coursegroups(\%curr_groups,$cdom,      if (%curr_groups) {
                                                      $cnum);          my %groupmemberhash = 
     if ($numgroups) {      &Apache::lonnet::get_group_membership($cdom,$cnum);
         %groupmemberhash = &Apache::lonnet::get_group_membership($cdom,$cnum);  
         foreach my $student (keys(%{$classlist})) {          foreach my $student (keys(%{$classlist})) {
             %{$classgroups{$student}} = ();              %{$classgroups{$student}} = ();
             my $hasgroup = 0;              my $hasgroup = 0;
Removed from v.1.167  
changed lines
  Added in v.1.169

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>