--- loncom/interface/loncoursedata.pm	2007/05/02 01:33:48	1.182
+++ loncom/interface/loncoursedata.pm	2008/04/17 14:51:43	1.187
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: loncoursedata.pm,v 1.182 2007/05/02 01:33:48 albertel Exp $
+# $Id: loncoursedata.pm,v 1.187 2008/04/17 14:51:43 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1669,9 +1669,9 @@ sub ensure_current_data {
     #
     # Get the update time for the user
     my $updatetime = 0;
+    my $getuserdir = 1;
     my $modifiedtime = &Apache::lonnet::GetFileTimestamp
-        ($sdom,$sname,$courseid.'.db',
-         $Apache::lonnet::perlvar{'lonUsersDir'});
+        ($sdom,$sname,$courseid.'.db',$getuserdir);
     #
     if ($modifiedtime == -1) {
 	return ('no data',undef);
@@ -1721,9 +1721,9 @@ sub ensure_current_full_data {
     &ensure_tables_are_set_up($courseid);
     #
     # Get the update time for the user
+    my $getuserdir = 1;
     my $modifiedtime = &Apache::lonnet::GetFileTimestamp
-        ($sdom,$sname,$courseid.'.db',
-         $Apache::lonnet::perlvar{'lonUsersDir'});
+        ($sdom,$sname,$courseid.'.db',$getuserdir);
     #
     my $student_id = &get_student_id($sname,$sdom);
     my @Result = &Apache::lonmysql::get_rows($student_table,
@@ -3099,6 +3099,12 @@ sub CL_FULLNAME { return 6; }
 sub CL_STATUS   { return 7; }
 sub CL_TYPE     { return 8; }
 sub CL_LOCKEDTYPE   { return 9; }
+sub CL_GROUP    { return 10; }
+sub CL_PERMANENTEMAIL { return 11; }
+sub CL_ROLE     { return 12; }
+sub CL_EXTENT   { return 13; }
+sub CL_PHOTO   { return 14; }
+sub CL_THUMBNAIL { return 15; }
 
 sub get_classlist {
     my ($cdom,$cnum) = @_;
@@ -3185,7 +3191,7 @@ sub get_group_memberships {
     my $access_end = $env{'course.'.$cid.'.default_enrollment_end_date'};
     my %curr_groups =&Apache::longroup::coursegroups($cdom,$cnum);
     if (%curr_groups) {
-        my $grpindex = scalar(@{$keylist});
+        my $grpindex = &CL_GROUP();
         my %groupmemberhash = 
 	    &Apache::lonnet::get_group_membership($cdom,$cnum);
         foreach my $student (keys(%{$classlist})) {