version 1.72, 2004/04/05 18:25:08
|
version 1.78, 2004/05/11 06:28:23
|
Line 41 use Apache::lonmsg;
|
Line 41 use Apache::lonmsg;
|
use Safe; |
use Safe; |
use Safe::Hole; |
use Safe::Hole; |
use Opcode; |
use Opcode; |
|
use Apache::lonenc; |
|
|
# ---------------------------------------------------- Globals for this package |
# ---------------------------------------------------- Globals for this package |
|
|
Line 52 my $errtext; # variable with all errors
|
Line 53 my $errtext; # variable with all errors
|
my $retfurl; # variable with the very first URL in the course |
my $retfurl; # variable with the very first URL in the course |
my %randompick; # randomly picked resources |
my %randompick; # randomly picked resources |
my %randompickseed; # optional seed for randomly picking resources |
my %randompickseed; # optional seed for randomly picking resources |
|
my %encurl; # URLs in this folder are supposed to be encrypted |
|
my %hiddenurl; # this URL (or complete folder) is supposed to be hidden |
|
|
# ----------------------------------- Remove version from URL and store in hash |
# ----------------------------------- Remove version from URL and store in hash |
|
|
Line 157 sub loadmap {
|
Line 160 sub loadmap {
|
if ($token->[2]->{'external'} eq 'true') { # external |
if ($token->[2]->{'external'} eq 'true') { # external |
$turi=~s/^http\:\/\//\/adm\/wrapper\/ext\//; |
$turi=~s/^http\:\/\//\/adm\/wrapper\/ext\//; |
} elsif ($turi=~/^\/*uploaded\//) { # uploaded |
} elsif ($turi=~/^\/*uploaded\//) { # uploaded |
if (($embstyle eq 'img') || ($embstyle eq 'emb') |
if (($embstyle eq 'img') || ($embstyle eq 'emb')) { |
|| ($embstyle eq 'ssi')) { |
$turi='/adm/wrapper'.$turi; |
unless ($turi =~/\.page$/) { |
} elsif ($embstyle eq 'ssi') { |
$turi='/adm/wrapper'.$turi; |
#do nothing with these |
} |
} elsif ($turi!~/\.(sequence|page)$/) { |
} 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 276 sub loadmap {
|
Line 278 sub loadmap {
|
} else { |
} else { |
$hash{'param_'.$referid}=''.$newparam; |
$hash{'param_'.$referid}=''.$newparam; |
} |
} |
if ($token->[2]->{'name'} eq 'parameter_mapalias') { |
if ($token->[2]->{'name'}=~/^parameter_(0_)*mapalias$/) { |
$hash{'mapalias_'.$token->[2]->{'value'}}=$referid; |
$hash{'mapalias_'.$token->[2]->{'value'}}=$referid; |
} |
} |
if ($token->[2]->{'name'} eq 'parameter_randompick') { |
if ($token->[2]->{'name'}=~/^parameter_(0_)*randompick$/) { |
$randompick{$referid}=$token->[2]->{'value'}; |
$randompick{$referid}=$token->[2]->{'value'}; |
} |
} |
if ($token->[2]->{'name'} eq 'parameter_randompickseed') { |
if ($token->[2]->{'name'}=~/^parameter_(0_)*randompickseed$/) { |
$randompick{$referid}=$token->[2]->{'value'}; |
$randompick{$referid}=$token->[2]->{'value'}; |
} |
} |
|
if ($token->[2]->{'name'}=~/^parameter_(0_)*encrypturl$/) { |
|
if ($token->[2]->{'value'}=~/^yes$/i) { |
|
$encurl{$referid}=1; |
|
} |
|
} |
|
if ($token->[2]->{'name'}=~/^parameter_(0_)*hiddenresource$/) { |
|
if ($token->[2]->{'value'}=~/^yes$/i) { |
|
$hiddenurl{$referid}=1; |
|
} |
|
} |
} |
} |
|
|
} |
} |
Line 319 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.'&'; |
|
if ($hdnflag) { |
|
$hiddenurl{$rid}=1; |
|
} |
|
if ($encflag) { |
|
$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); |
my ($mapid,$resid)=split(/\./,$rid); |
Line 341 sub traceroute {
|
Line 359 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 360 sub traceroute {
|
Line 380 sub traceroute {
|
.$hash{'undercond_'.$_}.'. '; |
.$hash{'undercond_'.$_}.'. '; |
} |
} |
} |
} |
&traceroute($further,$hash{'goesto_'.$_},$beenhere); |
&traceroute($further,$hash{'goesto_'.$_},$beenhere,$encflag,$hdnflag); |
} |
} |
} |
} |
} |
} |
Line 429 sub accinit {
|
Line 449 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 454 sub accinit {
|
Line 474 sub accinit {
|
"request.course.uri" => $courseuri); |
"request.course.uri" => $courseuri); |
} |
} |
|
|
# ------------------------------------- Selectively delete from randompick maps |
# ---------------- Selectively delete from randompick maps and hidden url parms |
|
|
sub pickrandom { |
sub hiddenurls { |
my $randomoutentry=''; |
my $randomoutentry=''; |
foreach my $rid (keys %randompick) { |
foreach my $rid (keys %randompick) { |
my $rndpick=$randompick{$rid}; |
my $rndpick=$randompick{$rid}; |
Line 498 sub pickrandom {
|
Line 518 sub pickrandom {
|
} |
} |
} |
} |
} |
} |
|
# ------------------------------ take care of explicitly hidden urls or folders |
|
foreach my $rid (keys %hiddenurl) { |
|
$hash{'randomout_'.$rid}=1; |
|
my ($mapid,$resid)=split(/\./,$rid); |
|
$randomoutentry.='&'. |
|
&Apache::lonnet::symbclean( |
|
&Apache::lonnet::declutter($hash{'map_id_'.$mapid}). |
|
'___'.$resid.'___'. |
|
&Apache::lonnet::declutter($hash{'src_'.$rid}) |
|
).'&'; |
|
} |
|
# --------------------------------------- append randomout entry to environment |
if ($randomoutentry) { |
if ($randomoutentry) { |
&Apache::lonnet::appenv('acc.randomout' => $randomoutentry); |
&Apache::lonnet::appenv('acc.randomout' => $randomoutentry); |
} |
} |
Line 523 sub readmap {
|
Line 555 sub readmap {
|
unlink($fn.'.state'); |
unlink($fn.'.state'); |
unlink($fn.'parms.db'); |
unlink($fn.'parms.db'); |
undef %randompick; |
undef %randompick; |
|
undef %hiddenurl; |
|
undef %encurl; |
$retfurl=''; |
$retfurl=''; |
if ((tie(%hash,'GDBM_File',"$fn.db",&GDBM_WRCREAT(),0640)) && |
if ((tie(%hash,'GDBM_File',"$fn.db",&GDBM_WRCREAT(),0640)) && |
(tie(%parmhash,'GDBM_File',$fn.'_parms.db',&GDBM_WRCREAT(),0640))) { |
(tie(%parmhash,'GDBM_File',$fn.'_parms.db',&GDBM_WRCREAT(),0640))) { |
Line 540 sub readmap {
|
Line 574 sub readmap {
|
if (defined($hash{'map_start_'.$uri})) { |
if (defined($hash{'map_start_'.$uri})) { |
&traceroute('0',$hash{'map_start_'.$uri},'&'); |
&traceroute('0',$hash{'map_start_'.$uri},'&'); |
&accinit($uri,$short,$fn); |
&accinit($uri,$short,$fn); |
&pickrandom(); |
&hiddenurls(); |
} |
} |
# ------------------------------------------------------- Put versions into src |
# ------------------------------------------------------- Put versions into src |
foreach (keys %hash) { |
foreach (keys %hash) { |
Line 548 sub readmap {
|
Line 582 sub readmap {
|
$hash{$_}=&putinversion($hash{$_}); |
$hash{$_}=&putinversion($hash{$_}); |
} |
} |
} |
} |
|
# ---------------------------------------------------------------- Encrypt URLs |
|
foreach (keys %encurl) { |
|
$hash{'src_'.$_}=&Apache::lonenc::encrypted($hash{'src_'.$_}); |
|
} |
|
# ----------------------------------------------- Close hashes to finally store |
|
# --------------------------------- Routine must pass this point, no early outs |
unless ((untie(%hash)) && (untie(%parmhash))) { |
unless ((untie(%hash)) && (untie(%parmhash))) { |
&Apache::lonnet::logthis("<font color=blue>WARNING: ". |
&Apache::lonnet::logthis("<font color=blue>WARNING: ". |
"Could not untie coursemap $fn for $uri.</font>"); |
"Could not untie coursemap $fn for $uri.</font>"); |
} |
} |
|
# ---------------------------------------------------- Store away initial state |
{ |
{ |
my $cfh; |
my $cfh; |
if ($cfh=Apache::File->new(">$fn.state")) { |
if ($cfh=Apache::File->new(">$fn.state")) { |