version 1.198, 2005/06/02 13:15:05
|
version 1.199, 2005/06/02 13:34:14
|
Line 66 use Apache::lonnavmaps;
|
Line 66 use Apache::lonnavmaps;
|
|
|
# --- Caches local to lonparmset |
# --- Caches local to lonparmset |
|
|
my $courseoptid=''; |
my $courseoptid; |
my %courseopt=(); |
my %courseopt; |
my $useroptid=''; |
my $useroptid; |
my %useropt=(); |
my %useropt; |
my $parmhashid=''; |
my $parmhashid; |
my %parmhash=(); |
my %parmhash; |
|
|
# --- end local caches |
# --- end local caches |
|
|
Line 121 sub parmval {
|
Line 121 sub parmval {
|
my ($what,$id,$def,$uname,$udom,$csec)=@_; |
my ($what,$id,$def,$uname,$udom,$csec)=@_; |
# load caches |
# load caches |
&cacheparmhash(); |
&cacheparmhash(); |
|
&cacheuseropt($uname,$udom); |
|
&cachecourseopt(); |
|
|
my $result=''; |
my $result=''; |
my @outpar=(); |
my @outpar=(); |
Line 218 sub cacheparmhash {
|
Line 220 sub cacheparmhash {
|
} |
} |
} |
} |
|
|
|
sub resetuseropt { |
|
$useroptid=''; |
|
} |
|
|
sub cacheuseropt { |
sub cacheuseropt { |
my ($uname,$udom)=@_; |
my ($uname,$udom)=@_; |
|
unless ($uname) { return; } |
|
if ($useroptid eq $uname.'@'.$udom) { return; } |
|
%useropt=&Apache::lonnet::dump('resourcedata',$udom,$uname); |
|
$useroptid=$uname.'@'.$udom; |
|
} |
|
|
|
sub resetcourseopt { |
|
$courseoptid=''; |
} |
} |
|
|
sub cachecourseopt { |
sub cachecourseopt { |
|
if ($courseoptid eq $env{'request.course.id'}) { return; }; |
|
%courseopt = &Apache::lonnet::dump |
|
('resourcedata', |
|
$env{'course.'.$env{'request.course.id'}.'.domain'}, |
|
$env{'course.'.$env{'request.course.id'}.'.num'}); |
|
$courseoptid=$env{'request.course.id'}; |
} |
} |
|
|
################################################## |
################################################## |
Line 305 sub storeparm_by_symb {
|
Line 325 sub storeparm_by_symb {
|
} else { |
} else { |
&Apache::lonnet::expirespread('','','assesscalc'); |
&Apache::lonnet::expirespread('','','assesscalc'); |
} |
} |
|
&resetcourseopt(); |
# Store parameter |
# Store parameter |
if ($delete) { |
if ($delete) { |
$reply=&Apache::lonnet::del |
$reply=&Apache::lonnet::del |
Line 331 sub storeparm_by_symb {
|
Line 352 sub storeparm_by_symb {
|
} else { |
} else { |
&Apache::lonnet::expirespread($uname,$udom,'assesscalc'); |
&Apache::lonnet::expirespread($uname,$udom,'assesscalc'); |
} |
} |
|
&resetuseropt(); |
# Store parameter |
# Store parameter |
if ($delete) { |
if ($delete) { |
$reply=&Apache::lonnet::del |
$reply=&Apache::lonnet::del |
Line 859 sub assessparms {
|
Line 881 sub assessparms {
|
my %allparts; |
my %allparts; |
|
|
my %defp; |
my %defp; |
%courseopt=(); |
|
%useropt=(); |
|
|
|
@ids=(); |
@ids=(); |
%symbp=(); |
%symbp=(); |
Line 982 sub assessparms {
|
Line 1002 sub assessparms {
|
$env{'course.'.$env{'request.course.id'}.'.num'}, |
$env{'course.'.$env{'request.course.id'}.'.num'}, |
$env{'course.'.$env{'request.course.id'}.'.domain'}); |
$env{'course.'.$env{'request.course.id'}.'.domain'}); |
#&Apache::lonnet::clear_EXT_cache_status(); |
#&Apache::lonnet::clear_EXT_cache_status(); |
# -------------------------------------------------------------- Get coursedata |
|
%courseopt = &Apache::lonnet::dump |
|
('resourcedata', |
|
$env{'course.'.$env{'request.course.id'}.'.domain'}, |
|
$env{'course.'.$env{'request.course.id'}.'.num'}); |
|
# --------------------------------------------------- Get userdata (if present) |
|
if ($uname) { |
|
%useropt=&Apache::lonnet::dump('resourcedata',$udom,$uname); |
|
} |
|
|
|
# ------------------------------------------------------------------- Sort this |
# ------------------------------------------------------------------- Sort this |
|
|
Line 2207 sub handler {
|
Line 2218 sub handler {
|
|
|
# ----------------------------------------------------------- Clear out garbage |
# ----------------------------------------------------------- Clear out garbage |
|
|
%courseopt=(); |
|
%useropt=(); |
|
%parmhash=(); |
|
|
|
@ids=(); |
@ids=(); |
%symbp=(); |
%symbp=(); |