version 1.51, 2003/02/25 15:58:51
|
version 1.62, 2003/10/22 16:52:14
|
Line 68 my $errtext; # variable with all errors
|
Line 68 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 %actualversion; # version of resource as loaded now |
|
my %setversion; # forced version of resource |
# ----------------------------------- Remove version from URL and store in hash |
my %lastversion; # version when CC came in last |
|
my $versionmode; # how versioning is handled in this course |
sub versiontrack { |
|
my $uri=shift; |
|
if ($uri=~/\.(\d+)\.\w+$/) { |
|
my $version=$1; |
|
$uri=~s/\.\d+\.(\w+)$/\.$1/; |
|
unless ($hash{'version_'.$uri}) { |
|
$hash{'version_'.$uri}=$version; |
|
} |
|
} |
|
return $uri; |
|
} |
|
|
|
# -------------------------------------------------------------- Put in version |
|
|
|
sub putinversion { |
|
my $uri=shift; |
|
if ($hash{'version_'.$uri}) { |
|
my $version=$hash{'version_'.$uri}; |
|
if ($version eq 'current') { return $uri; } |
|
$uri=~s/\.(\w+)$/\.$version\.$1/; |
|
} |
|
return $uri; |
|
} |
|
|
|
# ----------------------------------------- Processing versions file for course |
|
|
|
sub processversionfile { |
|
my %cenv=shift; |
|
my %versions=&Apache::lonnet::dump('resourceversions', |
|
$cenv{'domain'}, |
|
$cenv{'num'}); |
|
foreach (keys %versions) { |
|
if ($_=~/^error\:/) { return; } |
|
$hash{'version_'.$_}=$versions{$_}; |
|
} |
|
} |
|
|
# --------------------------------------------------------- Loads map from disk |
# --------------------------------------------------------- Loads map from disk |
|
|
Line 85 sub loadmap {
|
Line 120 sub loadmap {
|
$hash{'map_id_'.$lpc}=$uri; |
$hash{'map_id_'.$lpc}=$uri; |
|
|
# Determine and check filename |
# Determine and check filename |
my $fn=&Apache::lonnet::filelocation('',$uri); |
my $fn=&Apache::lonnet::filelocation('',&putinversion($uri)); |
|
|
my $ispage=($fn=~/\.page$/); |
my $ispage=($fn=~/\.page$/); |
|
|
Line 97 sub loadmap {
|
Line 132 sub loadmap {
|
|
|
my $instr=&Apache::lonnet::getfile($fn); |
my $instr=&Apache::lonnet::getfile($fn); |
|
|
unless ($instr == -1) { |
unless ($instr eq -1) { |
|
|
# Successfully got file, parse it |
# Successfully got file, parse it |
|
|
Line 119 sub loadmap {
|
Line 154 sub loadmap {
|
|
|
$hash{'kind_'.$rid}='res'; |
$hash{'kind_'.$rid}='res'; |
$hash{'title_'.$rid}=$token->[2]->{'title'}; |
$hash{'title_'.$rid}=$token->[2]->{'title'}; |
my $turi=$token->[2]->{'src'}; |
my $turi=&versiontrack($token->[2]->{'src'}); |
$Apache::lonnet::titlecache{ |
if ($token->[2]->{'version'}) { |
&Apache::lonnet::symbclean( |
unless ($hash{'version_'.$turi}) { |
&Apache::lonnet::declutter($uri).'___'. |
$hash{'version_'.$turi}=$1; |
$token->[2]->{'id'}.'___'. |
} |
&Apache::lonnet::declutter($turi))}= |
} |
$token->[2]->{'title'}; |
&Apache::lonnet::do_cache(\%Apache::lonnet::titlecache, |
|
&Apache::lonnet::symbclean( |
|
&Apache::lonnet::declutter($uri).'___'. |
|
$token->[2]->{'id'}.'___'. |
|
&Apache::lonnet::declutter($turi)), |
|
$token->[2]->{'title'}); |
unless ($ispage) { |
unless ($ispage) { |
$turi=~/\.(\w+)$/; |
$turi=~/\.(\w+)$/; |
my $embstyle=&Apache::loncommon::fileembstyle($1); |
my $embstyle=&Apache::loncommon::fileembstyle($1); |
Line 139 sub loadmap {
|
Line 179 sub loadmap {
|
$turi='/adm/coursedocs/showdoc'.$turi; |
$turi='/adm/coursedocs/showdoc'.$turi; |
} |
} |
} else { # normal internal resource |
} else { # normal internal resource |
if (($embstyle eq 'img') || ($embstyle eq 'emb') |
if (($embstyle eq 'img') || ($embstyle eq 'emb')) { |
|| ($turi=~/\/(syllabus|aboutme|navmaps|smppg|bulletinboard)$/)) { |
|
$turi='/adm/wrapper'.$turi; |
$turi='/adm/wrapper'.$turi; |
} |
} |
} |
} |
} |
} |
$hash{'src_'.$rid}=$turi; |
|
|
|
if (defined($hash{'ids_'.$turi})) { |
if (defined($hash{'ids_'.$turi})) { |
$hash{'ids_'.$turi}.=','.$rid; |
$hash{'ids_'.$turi}.=','.$rid; |
} else { |
} else { |
$hash{'ids_'.$turi}=''.$rid; |
$hash{'ids_'.$turi}=''.$rid; |
} |
} |
|
|
|
if |
|
($turi=~/\/(syllabus|aboutme|navmaps|smppg|bulletinboard)$/) { |
|
$turi.='?register=1'; |
|
} |
|
|
|
$hash{'src_'.$rid}=$turi; |
|
|
if ($token->[2]->{'external'} eq 'true') { |
if ($token->[2]->{'external'} eq 'true') { |
$hash{'ext_'.$rid}='true:'; |
$hash{'ext_'.$rid}='true:'; |
Line 372 sub accinit {
|
Line 417 sub accinit {
|
my $resid=$_; |
my $resid=$_; |
my $uri=$hash{'src_'.$resid}; |
my $uri=$hash{'src_'.$resid}; |
$uri=~s/^\/adm\/wrapper//; |
$uri=~s/^\/adm\/wrapper//; |
|
$uri=&Apache::lonnet::declutter($uri); |
my @uriparts=split(/\//,$uri); |
my @uriparts=split(/\//,$uri); |
my $urifile=$uriparts[$#uriparts]; |
my $urifile=$uriparts[$#uriparts]; |
$#uriparts--; |
$#uriparts--; |
my $uripath=join('/',@uriparts); |
my $uripath=join('/',@uriparts); |
$uripath=~s/^\/res\///; |
|
if ($uripath) { |
if ($uripath) { |
my $uricond='0'; |
my $uricond='0'; |
if (defined($hash{'conditions_'.$resid})) { |
if (defined($hash{'conditions_'.$resid})) { |
Line 384 sub accinit {
|
Line 429 sub accinit {
|
} |
} |
if (defined($acchash{'acc.res.'.$short.'.'.$uripath})) { |
if (defined($acchash{'acc.res.'.$short.'.'.$uripath})) { |
if ($acchash{'acc.res.'.$short.'.'.$uripath}=~ |
if ($acchash{'acc.res.'.$short.'.'.$uripath}=~ |
/(\&$urifile\:[^\&]*)/) { |
/(\&\Q$urifile\E\:[^\&]*)/) { |
my $replace=$1; |
my $replace=$1; |
my $regexp=$replace; |
my $regexp=$replace; |
$regexp=~s/\|/\\\|/g; |
$regexp=~s/\|/\\\|/g; |
Line 438 sub pickrandom {
|
Line 483 sub pickrandom {
|
my (undef,$id)=split(/\./,$rid); |
my (undef,$id)=split(/\./,$rid); |
if ($randompickseed{$rid}) { $id=$randompickseed{$rid}; } |
if ($randompickseed{$rid}) { $id=$randompickseed{$rid}; } |
my $rndseed=&Apache::lonnet::rndseed($id); # use id instead of symb |
my $rndseed=&Apache::lonnet::rndseed($id); # use id instead of symb |
&Math::Random::random_set_seed_from_phrase($rndseed); |
&Apache::lonnet::setup_random_from_rndseed($rndseed); |
my @whichids=&Math::Random::random_permuted_index($#currentrids+1); |
my @whichids=&Math::Random::random_permuted_index($#currentrids+1); |
for (my $i=1;$i<=$rndpick;$i++) { $currentrids[$whichids[$i]]=''; } |
for (my $i=1;$i<=$rndpick;$i++) { $currentrids[$whichids[$i]]=''; } |
#&Apache::lonnet::logthis("$id,$rndseed,".join(':',@whichids)); |
#&Apache::lonnet::logthis("$id,$rndseed,".join(':',@whichids)); |
Line 488 sub readmap {
|
Line 533 sub readmap {
|
%parmhash=(); |
%parmhash=(); |
$errtext=''; |
$errtext=''; |
$pc=0; |
$pc=0; |
|
&processversionfile(%cenv); |
my $furi=&Apache::lonnet::clutter($uri); |
my $furi=&Apache::lonnet::clutter($uri); |
$hash{'src_0.0'}=$furi; |
$hash{'src_0.0'}=&versiontrack($furi); |
$hash{'title_0.0'}=&Apache::lonnet::metadata($uri,'title'); |
$hash{'title_0.0'}=&Apache::lonnet::metadata($uri,'title'); |
$hash{'ids_'.$furi}='0.0'; |
$hash{'ids_'.$furi}='0.0'; |
$hash{'is_map_0.0'}=1; |
$hash{'is_map_0.0'}=1; |
Line 499 sub readmap {
|
Line 545 sub readmap {
|
&accinit($uri,$short,$fn); |
&accinit($uri,$short,$fn); |
&pickrandom(); |
&pickrandom(); |
} |
} |
# ------------------------------------------------------------ Version tracking |
# ------------------------------------------------------- Put versions into src |
# if (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) { |
foreach (keys %hash) { |
# &Apache::lonnet::logthis('Will be version tracking'); |
if ($_=~/^src\_/) { |
# } |
$hash{$_}=&putinversion($hash{$_}); |
|
} |
|
} |
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>"); |