version 1.95, 2005/07/15 12:29:07
|
version 1.97, 2005/11/09 11:39:57
|
Line 41 use Safe;
|
Line 41 use Safe;
|
use Safe::Hole; |
use Safe::Hole; |
use Opcode; |
use Opcode; |
use Apache::lonenc; |
use Apache::lonenc; |
|
use Fcntl qw(:flock); |
|
|
# ---------------------------------------------------- Globals for this package |
# ---------------------------------------------------- Globals for this package |
|
|
Line 164 sub loadmap {
|
Line 165 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 'ign') |
|
|| ($embstyle eq 'unk')) { |
$turi='/adm/wrapper'.$turi; |
$turi='/adm/wrapper'.$turi; |
} elsif ($embstyle eq 'ssi') { |
} elsif ($embstyle eq 'ssi') { |
#do nothing with these |
#do nothing with these |
Line 549 sub readmap {
|
Line 553 sub readmap {
|
return 'No course data available.'; |
return 'No course data available.'; |
} |
} |
@cond=('true:normal'); |
@cond=('true:normal'); |
#unlink($fn.'.db'); |
|
#unlink($fn.'_symb.db'); |
open(LOCKFILE,">$fn.db.lock"); |
unlink($fn.'.state'); |
my $lock=0; |
unlink($fn.'parms.db'); |
if (flock(LOCKFILE,LOCK_EX|LOCK_NB)) { |
|
$lock=1; |
|
unlink($fn.'.db'); |
|
unlink($fn.'_symb.db'); |
|
unlink($fn.'.state'); |
|
unlink($fn.'parms.db'); |
|
} |
undef %randompick; |
undef %randompick; |
undef %hiddenurl; |
undef %hiddenurl; |
undef %encurl; |
undef %encurl; |
$retfurl=''; |
$retfurl=''; |
if ((tie(%hash,'GDBM_File',"$fn.db",&GDBM_WRCREAT(),0640)) && |
if ($lock && (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))) { |
%hash=(); |
%hash=(); |
%parmhash=(); |
%parmhash=(); |
Line 605 sub readmap {
|
Line 615 sub readmap {
|
&Apache::lonnet::logthis("<font color=blue>WARNING: ". |
&Apache::lonnet::logthis("<font color=blue>WARNING: ". |
"Could not write statemap $fn for $uri.</font>"); |
"Could not write statemap $fn for $uri.</font>"); |
} |
} |
} |
} |
|
flock(LOCKFILE,LOCK_UN); |
|
close(LOCKFILE); |
} else { |
} else { |
# if we are here it is likely because we are already trying to |
# if we are here it is likely because we are already trying to |
# initialize the course in another child, busy wait trying to |
# initialize the course in another child, busy wait trying to |
# tie the hashes for the next 90 seconds, if we succeed forward |
# tie the hashes for the next 90 seconds, if we succeed forward |
# them on to navmaps, if we fail, throw up the Could not init |
# them on to navmaps, if we fail, throw up the Could not init |
# course screen |
# course screen |
|
if ($lock) { |
|
# Got the lock but not the DB files |
|
flock(LOCKFILE,LOCK_UN); |
|
} |
untie(%hash); |
untie(%hash); |
untie(%parmhash); |
untie(%parmhash); |
&Apache::lonnet::logthis("<font color=blue>WARNING: ". |
&Apache::lonnet::logthis("<font color=blue>WARNING: ". |
Line 620 sub readmap {
|
Line 636 sub readmap {
|
while($i<90) { |
while($i<90) { |
$i++; |
$i++; |
sleep(1); |
sleep(1); |
if ((tie(%hash,'GDBM_File',"$fn.db",&GDBM_READER(),0640))) { |
if (flock(LOCKFILE,LOCK_EX|LOCK_NB) && |
|
(tie(%hash,'GDBM_File',"$fn.db",&GDBM_READER(),0640))) { |
if (tie(%parmhash,'GDBM_File',$fn.'_parms.db',&GDBM_READER(),0640)) { |
if (tie(%parmhash,'GDBM_File',$fn.'_parms.db',&GDBM_READER(),0640)) { |
$retfurl='/adm/navmaps'; |
$retfurl='/adm/navmaps'; |
&Apache::lonnet::appenv("request.course.id" => $short, |
&Apache::lonnet::appenv("request.course.id" => $short, |
Line 634 sub readmap {
|
Line 651 sub readmap {
|
untie(%hash); |
untie(%hash); |
untie(%parmhash); |
untie(%parmhash); |
} |
} |
|
flock(LOCKFILE,LOCK_UN); |
|
close(LOCKFILE); |
} |
} |
&Apache::lonmsg::author_res_msg($env{'request.course.uri'},$errtext); |
&Apache::lonmsg::author_res_msg($env{'request.course.uri'},$errtext); |
# ------------------------------------------------- Check for critical messages |
# ------------------------------------------------- Check for critical messages |