--- loncom/lonnet/perl/lonnet.pm 2000/11/14 02:39:30 1.60 +++ loncom/lonnet/perl/lonnet.pm 2000/11/14 18:41:40 1.63 @@ -43,7 +43,6 @@ # state string # condval(index) : value of condition index based on state # EXT(name) : value of a variable -# refreshstate() : refresh the state information string # symblist(map,hash) : Updates symbolic storage links # symbread([filename]) : returns the data handle (filename optional) # rndseed() : returns a random seed @@ -971,11 +970,6 @@ sub allowed { return 'F'; } -# ---------------------------------------------------------- Refresh State Info - -sub refreshstate { -} - # ----------------------------------------------------------------- Define Role sub definerole { @@ -1270,11 +1264,12 @@ sub EXT { $ENV{'request.course.id'}.'.'.$spacequalifierrest; # ----------------------------------------------------------- first, check user - my %resourcedata=get('resourcedata',($reslevel,$seclevel,$courselevel)); + my %resourcedata=get('resourcedata',($reslevel,$seclevel,$courselevel)); + if ($resourcedata{$reslevel}!~/^error\:/) { if ($resourcedata{$reslevel}) { return $resourcedata{$reslevel}; } if ($resourcedata{$seclevel}) { return $resourcedata{$seclevel}; } if ($resourcedata{$courselevel}) { return $resourcedata{$courselevel}; } - + } # -------------------------------------------------------- second, check course my $section=''; if ($ENV{'request.course.sec'}) { @@ -1286,13 +1281,15 @@ sub EXT { ':resourcedata:'. escape($reslevel).':'.escape($seclevel).':'.escape($courselevel), $ENV{'course.'.$ENV{'request.course.id'}.$section.'.home'}); + if ($reply!~/^error\:/) { map { my ($name,$value)=split(/\=/,$_); $resourcedata{unescape($name)}=unescape($value); } split(/\&/,$reply); if ($resourcedata{$reslevel}) { return $resourcedata{$reslevel}; } - if ($resourcedata{$seclevel}) { return $resourcedata{$seclevel}; } + if ($resourcedata{$seclevel}) { return $resourcedata{$seclevel}; } if ($resourcedata{$courselevel}) { return $resourcedata{$courselevel}; } + } # ------------------------------------------------------ third, check map parms @@ -1328,6 +1325,21 @@ sub EXT { return ''; } +# ---------------------------------------- Append resource parms to environment + +sub appendparms { + my ($symb,$parms)=@_; + my %storehash=(); + my $prefix='resource.parms.'.$ENV{'request.course.id'}.'.'.$symb; + map { + my ($typename,$value)=split(/\=/,$_); + my ($type,$name)=split(/\:/,$typename); + $storehash{$prefix.'.'.unescape($name)}=unescape($value); + $storehash{$prefix.'.'.unescape($name).'.type'}=unescape($type); + } split(/\&/,$parms); + &appenv(%storehash); +} + # ------------------------------------------------- Update symbolic store links sub symblist { @@ -1359,6 +1371,7 @@ sub symbread { my %hash; my %bighash; my $syval=''; + my $parms=''; if (($ENV{'request.course.fn'}) && ($thisfn)) { if (tie(%hash,'GDBM_File',$ENV{'request.course.fn'}.'_symb.db', &GDBM_READER,0640)) { @@ -1386,6 +1399,7 @@ sub symbread { if ($#possibilities==0) { # ----------------------------------------------- There is only one possibility my ($mapid,$resid)=split(/\./,$ids); + $parms=$bighash{'param_'.$ids}; $syval=declutter($bighash{'map_id_'.$mapid}).'___'.$resid; } else { # ------------------------------------------ There is more than one possibility @@ -1396,6 +1410,7 @@ sub symbread { my ($mapid,$resid)=split(/\./,$_); if ($bighash{'map_type_'.$mapid} ne 'page') { $realpossible++; + $parms=$bighash{'param_'.$_}; $syval=declutter($bighash{'map_id_'.$mapid}). '___'.$resid; } @@ -1407,7 +1422,12 @@ sub symbread { untie(%bighash) } } - if ($syval) { return $syval.'___'.$thisfn; } + if ($syval) { + if ($parms) { + &appendparms($syval.'___'.$thisfn,$parms); + } + return $syval.'___'.$thisfn; + } } &appenv('request.ambiguous' => $thisfn); return '';