--- loncom/interface/loncoursedata.pm 2008/11/20 21:22:21 1.190 +++ loncom/interface/loncoursedata.pm 2013/12/09 21:33:32 1.195 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: loncoursedata.pm,v 1.190 2008/11/20 21:22:21 jms Exp $ +# $Id: loncoursedata.pm,v 1.195 2013/12/09 21:33:32 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -56,6 +56,17 @@ use Apache::lonmysql(); use LONCAPA; use Digest::MD5(); +=pod + +=head2 make_into_hash + +Turn a colon separated string into a hash and return a reference +to it. Numbering from 0 even elements are keys and odd elements +are values e.g. a:b:c:d creates a hash like + a => b, c =>d + +=cut + sub make_into_hash { my $values = shift; my %tmp = map { &unescape($_); } split(':',$values); @@ -436,8 +447,17 @@ sub init_dbs { return 0; } +=pod + +=head2 delete_caches +Drops all of the tables in the local mysql cache associated with the +specified course id. +TODO: The drops should be pushed into lonmysql to further isolate +mysql code from other modules. + +=cut sub delete_caches { my $courseid = shift; $courseid = $env{'request.course.id'} if (! defined($courseid)); @@ -2271,12 +2291,15 @@ 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 CL_CREDITS { return 10; } +sub CL_GROUP { return 11; } +sub CL_PERMANENTEMAIL { return 12; } +sub CL_ROLE { return 13; } +sub CL_EXTENT { return 14; } +sub CL_PHOTO { return 15; } +sub CL_THUMBNAIL { return 16; } +sub CL_AUTHORQUOTA { return 17; } +sub CL_AUTHORUSAGE { return 18; } sub get_classlist { my ($cdom,$cnum) = @_; @@ -2296,9 +2319,9 @@ sub get_classlist { } my ($sname,$sdom) = split(/:/,$student); my @Values = split(/:/,$info); - my ($end,$start,$id,$section,$fullname,$type,$lockedtype); + my ($end,$start,$id,$section,$fullname,$type,$lockedtype,$credits); if (@Values > 2) { - ($end,$start,$id,$section,$fullname,$type,$lockedtype) = @Values; + ($end,$start,$id,$section,$fullname,$type,$lockedtype,$credits) = @Values; } else { # We have to get the data ourselves ($end,$start) = @Values; $section = &Apache::lonnet::getsection($sdom,$sname,$cid); @@ -2337,11 +2360,13 @@ sub get_classlist { $status='Future'; } $classlist{$student} = - [$sdom,$sname,$end,$start,$id,$section,$fullname,$status,$type,$lockedtype]; + [$sdom,$sname,$end,$start,$id,$section,$fullname,$status,$type, + $lockedtype,$credits]; } if (wantarray()) { return (\%classlist,['domain','username','end','start','id', - 'section','fullname','status','type','lockedtype']); + 'section','fullname','status','type', + 'lockedtype','credits']); } else { return \%classlist; } @@ -3071,7 +3096,8 @@ $env{'course.'.$cid.'.domain'}, and $env Returns a reference to a hash which contains: keys '$sname:$sdom' - values [$sdom,$sname,$end,$start,$id,$section,$fullname,$status,$type,$lockedtype] + values [$sdom,$sname,$end,$start,$id,$section,$fullname,$status,$type, + $lockedtype,$credits] The constant values CL_SDOM, CL_SNAME, CL_END, etc. can be used as indices into the returned list to future-proof clients against