version 1.76, 2004/04/23 23:01:35
|
version 1.79, 2004/10/26 15:10:42
|
Line 162 sub loadmap {
|
Line 162 sub loadmap {
|
} elsif ($turi=~/^\/*uploaded\//) { # uploaded |
} elsif ($turi=~/^\/*uploaded\//) { # uploaded |
if (($embstyle eq 'img') || ($embstyle eq 'emb')) { |
if (($embstyle eq 'img') || ($embstyle eq 'emb')) { |
$turi='/adm/wrapper'.$turi; |
$turi='/adm/wrapper'.$turi; |
} elsif ($turi!~/\.(sequence|page)$/) { |
} elsif ($embstyle eq 'ssi') { |
|
#do nothing with these |
|
} elsif ($turi!~/\.(sequence|page)$/) { |
$turi='/adm/coursedocs/showdoc'.$turi; |
$turi='/adm/coursedocs/showdoc'.$turi; |
} |
} |
} elsif ($turi=~/\S/) { # normal non-empty internal resource |
} elsif ($turi=~/\S/) { # normal non-empty internal resource |
Line 329 sub simplify {
|
Line 331 sub simplify {
|
# -------------------------------------------------------- Build condition hash |
# -------------------------------------------------------- Build condition hash |
|
|
sub traceroute { |
sub traceroute { |
my ($sofar,$rid,$beenhere)=@_; |
my ($sofar,$rid,$beenhere,$encflag,$hdnflag)=@_; |
$sofar=simplify($sofar); |
$sofar=simplify($sofar); |
unless ($beenhere=~/\&$rid\&/) { |
unless ($beenhere=~/\&$rid\&/) { |
$beenhere.=$rid.'&'; |
$beenhere.=$rid.'&'; |
|
my ($mapid,$resid)=split(/\./,$rid); |
|
my $symb=&Apache::lonnet::encode_symb($hash{'map_id_'.$mapid},$resid,$hash{'src_'.$rid}); |
|
my $encrypt=&Apache::lonnet::EXT('resource.0.hiddenresource',$symb); |
|
if ($hdnflag || lc($encrypt) eq 'yes') { $hiddenurl{$rid}=1; } |
|
my $encrypt=&Apache::lonnet::EXT('resource.0.encrypturl',$symb); |
|
if ($encflag || lc($encrypt) eq 'yes') { $encurl{$rid}=1; } |
if (($retfurl eq '') && ($hash{'src_'.$rid}) |
if (($retfurl eq '') && ($hash{'src_'.$rid}) |
&& ($hash{'src_'.$rid}!~/\.sequence$/)) { |
&& ($hash{'src_'.$rid}!~/\.sequence$/)) { |
my ($mapid,$resid)=split(/\./,$rid); |
$retfurl=$hash{'src_'.$rid}.(($hash{'src_'.$rid}=~/\?/)?'&':'?'). |
$retfurl=$hash{'src_'.$rid}. |
'symb='.$symb; |
(($hash{'src_'.$rid}=~/\?/)?'&':'?').'symb='. |
|
&Apache::lonnet::symbclean( |
|
&Apache::lonnet::declutter($hash{'map_id_'.$mapid}). |
|
'___'.$resid.'___'. |
|
&Apache::lonnet::declutter($hash{'src_'.$rid})); |
|
} |
} |
if (defined($hash{'conditions_'.$rid})) { |
if (defined($hash{'conditions_'.$rid})) { |
$hash{'conditions_'.$rid}=simplify( |
$hash{'conditions_'.$rid}=simplify( |
Line 351 sub traceroute {
|
Line 354 sub traceroute {
|
} |
} |
if (defined($hash{'is_map_'.$rid})) { |
if (defined($hash{'is_map_'.$rid})) { |
if (defined($hash{'map_start_'.$hash{'src_'.$rid}})) { |
if (defined($hash{'map_start_'.$hash{'src_'.$rid}})) { |
&traceroute($sofar,$hash{'map_start_'.$hash{'src_'.$rid}},'&'); |
&traceroute($sofar,$hash{'map_start_'.$hash{'src_'.$rid}},'&', |
|
$encflag || $encurl{$rid}, |
|
$hdnflag || $hiddenurl{$rid}); |
if (defined($hash{'map_finish_'.$hash{'src_'.$rid}})) { |
if (defined($hash{'map_finish_'.$hash{'src_'.$rid}})) { |
$sofar= |
$sofar= |
$hash{'conditions_'.$hash{'map_finish_'.$hash{'src_'.$rid}}}; |
$hash{'conditions_'.$hash{'map_finish_'.$hash{'src_'.$rid}}}; |
Line 370 sub traceroute {
|
Line 375 sub traceroute {
|
.$hash{'undercond_'.$_}.'. '; |
.$hash{'undercond_'.$_}.'. '; |
} |
} |
} |
} |
&traceroute($further,$hash{'goesto_'.$_},$beenhere); |
&traceroute($further,$hash{'goesto_'.$_},$beenhere,$encflag,$hdnflag); |
} |
} |
} |
} |
} |
} |
Line 439 sub accinit {
|
Line 444 sub accinit {
|
/(\&\Q$urifile\E\:[^\&]*)/) { |
/(\&\Q$urifile\E\:[^\&]*)/) { |
my $replace=$1; |
my $replace=$1; |
my $regexp=$replace; |
my $regexp=$replace; |
$regexp=~s/\|/\\\|/g; |
#$regexp=~s/\|/\\\|/g; |
$acchash{'acc.res.'.$short.'.'.$uripath} |
$acchash{'acc.res.'.$short.'.'.$uripath} |
=~s/$regexp/$replace\|$uricond/; |
=~s/\Q$regexp\E/$replace\|$uricond/; |
} else { |
} else { |
$acchash{'acc.res.'.$short.'.'.$uripath}.= |
$acchash{'acc.res.'.$short.'.'.$uripath}.= |
$urifile.':'.$uricond.'&'; |
$urifile.':'.$uricond.'&'; |
Line 458 sub accinit {
|
Line 463 sub accinit {
|
my $courseuri=$uri; |
my $courseuri=$uri; |
$courseuri=~s/^\/res\///; |
$courseuri=~s/^\/res\///; |
&Apache::lonnet::delenv('(acc\.|httpref\.)'); |
&Apache::lonnet::delenv('(acc\.|httpref\.)'); |
&Apache::lonnet::appenv(%acchash, |
&Apache::lonnet::appenv(%acchash); |
"request.course.id" => $short, |
|
"request.course.fn" => $fn, |
|
"request.course.uri" => $courseuri); |
|
} |
} |
|
|
# ---------------- Selectively delete from randompick maps and hidden url parms |
# ---------------- Selectively delete from randompick maps and hidden url parms |
Line 562 sub readmap {
|
Line 564 sub readmap {
|
$hash{'is_map_0.0'}=1; |
$hash{'is_map_0.0'}=1; |
loadmap($uri); |
loadmap($uri); |
if (defined($hash{'map_start_'.$uri})) { |
if (defined($hash{'map_start_'.$uri})) { |
|
&Apache::lonnet::appenv("request.course.id" => $short, |
|
"request.course.fn" => $fn, |
|
"request.course.uri" => $uri); |
&traceroute('0',$hash{'map_start_'.$uri},'&'); |
&traceroute('0',$hash{'map_start_'.$uri},'&'); |
&accinit($uri,$short,$fn); |
&accinit($uri,$short,$fn); |
&hiddenurls(); |
&hiddenurls(); |