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

Diff for /loncom/interface/loncoursedata.pm between versions 1.170 and 1.172

version 1.170, 2006/05/11 20:05:03 version 1.172, 2006/05/18 18:37:23
Line 51  package Apache::loncoursedata; Line 51  package Apache::loncoursedata;
 use strict;  use strict;
 use Apache::lonnet;  use Apache::lonnet;
 use Apache::lonhtmlcommon;  use Apache::lonhtmlcommon;
   use Apache::longroup;
 use Time::HiRes;  use Time::HiRes;
 use Apache::lonmysql;  use Apache::lonmysql;
 use HTML::TokeParser;  use HTML::TokeParser;
Line 965  sub populate_groupnames_table { Line 966  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 = &Apache::loncommon::coursegroups($cdom,$cnum);      my %curr_groups = &Apache::longroup::coursegroups($cdom,$cnum);
     return if (!%curr_groups);      return if (!%curr_groups);
     my $request = 'INSERT IGNORE INTO '.$groupnames_table.      my $request = 'INSERT IGNORE INTO '.$groupnames_table.
                   '(groupname) VALUES ';                    '(groupname) VALUES ';
Line 3143  sub get_classlist { Line 3144  sub get_classlist {
   
 sub get_group_memberships {  sub get_group_memberships {
     my ($classlist,$keylist,$cdom,$cnum) = @_;      my ($classlist,$keylist,$cdom,$cnum) = @_;
   
       return ({},{}) if (!ref($classlist) || !ref($keylist));
   
     my $cid = $cdom.'_'.$cnum;      my $cid = $cdom.'_'.$cnum;
     if (!defined($cdom) || !defined($cnum)) {      if (!defined($cdom) || !defined($cnum)) {
         $cid =  $env{'request.course.id'};          $cid =  $env{'request.course.id'};
Line 3152  sub get_group_memberships { Line 3156  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 =&Apache::loncommon::coursegroups($cdom,$cnum);      my %curr_groups =&Apache::longroup::coursegroups($cdom,$cnum);
     if (%curr_groups) {      if (%curr_groups) {
         my $grpindex = scalar(@{$keylist});          my $grpindex = scalar(@{$keylist});
         my %groupmemberhash =           my %groupmemberhash = 
Removed from v.1.170  
changed lines
  Added in v.1.172

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