'.
&mt('Multiple use of sequence/page [_1]! The course will not function properly.',''.$uri.'').
@@ -117,6 +126,15 @@ sub loadmap {
my $lpc=$pc;
$hash{'map_pc_'.$uri}=$lpc;
$hash{'map_id_'.$lpc}=$uri;
+ if ($parent_rid =~ /^(\d+)\.\d+$/) {
+ my $parent_pc = $1;
+ if (defined($hash{'map_hierarchy_'.$parent_pc})) {
+ $hash{'map_hierarchy_'.$lpc}=$hash{'map_hierarchy_'.$parent_pc}.','.
+ $parent_pc;
+ } else {
+ $hash{'map_hierarchy_'.$lpc}=$parent_pc;
+ }
+ }
# Determine and check filename
my $fn=&Apache::lonnet::filelocation('',&putinversion($uri));
@@ -131,196 +149,85 @@ sub loadmap {
my $instr=&Apache::lonnet::getfile($fn);
- unless ($instr eq -1) {
+ if ($instr eq -1) {
+ $errtext.=&mt('
Map not loaded: The file [_1] does not exist.',$fn);
+ return;
+ }
# Successfully got file, parse it
- my $parser = HTML::TokeParser->new(\$instr);
- $parser->attr_encoded(1);
- my $token;
-
- my $linkpc=0;
-
- $fn=~/\.(\w+)$/;
-
- $hash{'map_type_'.$lpc}=$1;
-
- while ($token = $parser->get_token) {
- if ($token->[0] eq 'S') {
- if ($token->[1] eq 'resource') {
-# -------------------------------------------------------------------- Resource
- if ($token->[2]->{'type'} eq 'zombie') { next; }
- my $rid=$lpc.'.'.$token->[2]->{'id'};
-
- $hash{'kind_'.$rid}='res';
- $hash{'title_'.$rid}=$token->[2]->{'title'};
- my $turi=&versiontrack($token->[2]->{'src'});
- if ($token->[2]->{'version'}) {
- unless ($hash{'version_'.$turi}) {
- $hash{'version_'.$turi}=$1;
- }
- }
- my $title=$token->[2]->{'title'};
- $title=~s/\&colon\;/\:/gs;
-# my $symb=&Apache::lonnet::encode_symb($uri,
-# $token->[2]->{'id'},
-# $turi);
-# &Apache::lonnet::do_cache_new('title',$symb,$title);
- unless ($ispage) {
- $turi=~/\.(\w+)$/;
- my $embstyle=&Apache::loncommon::fileembstyle($1);
- if ($token->[2]->{'external'} eq 'true') { # external
- $turi=~s/^http\:\/\//\/adm\/wrapper\/ext\//;
- } elsif ($turi=~/^\/*uploaded\//) { # uploaded
- if (($embstyle eq 'img')
- || ($embstyle eq 'emb')
- || ($embstyle eq 'wrp')) {
- $turi='/adm/wrapper'.$turi;
- } elsif ($embstyle eq 'ssi') {
- #do nothing with these
- } elsif ($turi!~/\.(sequence|page)$/) {
- $turi='/adm/coursedocs/showdoc'.$turi;
- }
- } elsif ($turi=~/\S/) { # normal non-empty internal resource
- my $mapdir=$uri;
- $mapdir=~s/[^\/]+$//;
- $turi=&Apache::lonnet::hreflocation($mapdir,$turi);
- if (($embstyle eq 'img')
- || ($embstyle eq 'emb')
- || ($embstyle eq 'wrp')) {
- $turi='/adm/wrapper'.$turi;
- }
- }
- }
-# Store reverse lookup, remove query string
- my $idsuri=$turi;
- $idsuri=~s/\?.+$//;
- if (defined($hash{'ids_'.$idsuri})) {
- $hash{'ids_'.$idsuri}.=','.$rid;
- } else {
- $hash{'ids_'.$idsuri}=''.$rid;
- }
-
- if ($turi=~/\/(syllabus|aboutme|navmaps|smppg|bulletinboard)$/) {
- $turi.='?register=1';
- }
-
- $hash{'src_'.$rid}=$turi;
+ my $parser = HTML::TokeParser->new(\$instr);
+ $parser->attr_encoded(1);
+ # first get all parameters
+ while (my $token = $parser->get_token) {
+ next if ($token->[0] ne 'S');
+ if ($token->[1] eq 'param') {
+ &parse_param($token,$lpc);
+ }
+ }
+ #reset parser
+ $parser = HTML::TokeParser->new(\$instr);
+ $parser->attr_encoded(1);
- if ($token->[2]->{'external'} eq 'true') {
- $hash{'ext_'.$rid}='true:';
- } else {
- $hash{'ext_'.$rid}='false:';
- }
- if ($token->[2]->{'type'}) {
- $hash{'type_'.$rid}=$token->[2]->{'type'};
- if ($token->[2]->{'type'} eq 'start') {
- $hash{'map_start_'.$uri}="$rid";
- }
- if ($token->[2]->{'type'} eq 'finish') {
- $hash{'map_finish_'.$uri}="$rid";
- }
- } else {
- $hash{'type_'.$rid}='normal';
- }
+ my $linkpc=0;
- if (($turi=~/\.sequence$/) ||
- ($turi=~/\.page$/)) {
- $hash{'is_map_'.$rid}=1;
- &loadmap($turi);
- }
-
- } elsif ($token->[1] eq 'condition') {
-# ------------------------------------------------------------------- Condition
+ $fn=~/\.(\w+)$/;
- my $rid=$lpc.'.'.$token->[2]->{'id'};
+ $hash{'map_type_'.$lpc}=$1;
- $hash{'kind_'.$rid}='cond';
- my $condition = $token->[2]->{'value'};
- $condition =~ s/[\n\r]+/ /gs;
- push(@cond, $condition);
- $hash{'condid_'.$rid}=$#cond;
- if ($token->[2]->{'type'}) {
- $cond[$#cond].=':'.$token->[2]->{'type'};
- } else {
- $cond[$#cond].=':normal';
- }
+ my $randomize = ($randomorder{$parent_rid} =~ /^yes$/i);
- } elsif ($token->[1] eq 'link') {
+ my @map_ids;
+ while (my $token = $parser->get_token) {
+ next if ($token->[0] ne 'S');
+ if ($token->[1] eq 'resource') {
+ push(@map_ids,&parse_resource($token,$lpc,$ispage,$uri));
+ } elsif ($token->[1] eq 'link' && !$randomize) {
# ----------------------------------------------------------------------- Links
+ &make_link(++$linkpc,$lpc,$token->[2]->{'to'},
+ $token->[2]->{'from'},
+ $token->[2]->{'condition'});
+ } elsif ($token->[1] eq 'condition' && !$randomize) {
+ &parse_condition($token,$lpc);
+ }
+ }
- $linkpc++;
- my $linkid=$lpc.'.'.$linkpc;
-
- my $goesto=$lpc.'.'.$token->[2]->{'to'};
- my $comesfrom=$lpc.'.'.$token->[2]->{'from'};
- my $undercond=0;
-
- if ($token->[2]->{'condition'}) {
- $undercond=$lpc.'.'.$token->[2]->{'condition'};
- }
-
- $hash{'goesto_'.$linkid}=$goesto;
- $hash{'comesfrom_'.$linkid}=$comesfrom;
- $hash{'undercond_'.$linkid}=$undercond;
-
- if (defined($hash{'to_'.$comesfrom})) {
- $hash{'to_'.$comesfrom}.=','.$linkid;
- } else {
- $hash{'to_'.$comesfrom}=''.$linkid;
- }
- if (defined($hash{'from_'.$goesto})) {
- $hash{'from_'.$goesto}.=','.$linkid;
- } else {
- $hash{'from_'.$goesto}=''.$linkid;
- }
- } elsif ($token->[1] eq 'param') {
-# ------------------------------------------------------------------- Parameter
-
- my $referid=$lpc.'.'.$token->[2]->{'to'};
- my $name=$token->[2]->{'name'};
- my $part;
- if ($name=~/^parameter_(.*)_/) {
- $part=$1;
- } else {
- $part=0;
- }
- $name=~s/^.*_([^_]*)$/$1/;
- my $newparam=
- &escape($token->[2]->{'type'}).':'.
- &escape($part.'.'.$name).'='.
- &escape($token->[2]->{'value'});
- if (defined($hash{'param_'.$referid})) {
- $hash{'param_'.$referid}.='&'.$newparam;
- } else {
- $hash{'param_'.$referid}=''.$newparam;
- }
- if ($token->[2]->{'name'}=~/^parameter_(0_)*randompick$/) {
- $randompick{$referid}=$token->[2]->{'value'};
- }
- if ($token->[2]->{'name'}=~/^parameter_(0_)*randompickseed$/) {
- $randompickseed{$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;
- }
- }
- }
+ if ($randomize) {
+ if (!$env{'request.role.adv'}) {
+ my $seed;
+ if (defined($randompickseed{$parent_rid})) {
+ $seed = $randompickseed{$parent_rid};
+ } else {
+ my ($mapid,$resid)=split(/\./,$parent_rid);
+ my $symb=
+ &Apache::lonnet::encode_symb($hash{'map_id_'.$mapid},
+ $resid,$hash{'src_'.$parent_rid});
- }
- }
+ $seed = $symb;
+ }
+
+ my $rndseed=&Apache::lonnet::rndseed($seed);
+ &Apache::lonnet::setup_random_from_rndseed($rndseed);
+ @map_ids=&Math::Random::random_permutation(@map_ids);
+ }
+ my $from = shift(@map_ids);
+ my $from_rid = $lpc.'.'.$from;
+ $hash{'map_start_'.$uri} = $from_rid;
+ $hash{'type_'.$from_rid}='start';
+
+ while (my $to = shift(@map_ids)) {
+ &make_link(++$linkpc,$lpc,$to,$from);
+ my $to_rid = $lpc.'.'.$to;
+ $hash{'type_'.$to_rid}='normal';
+ $from = $to;
+ $from_rid = $to_rid;
+ }
- } else {
- $errtext.=&mt('
Map not loaded: The file [_1] does not exist.',$fn);
+ $hash{'map_finish_'.$uri}= $from_rid;
+ $hash{'type_'.$from_rid}='finish';
}
- my $parser = HTML::TokeParser->new(\$instr);
+ $parser = HTML::TokeParser->new(\$instr);
$parser->attr_encoded(1);
# last parse out the mapalias params so as to ignore anything
# refering to non-existant resources
@@ -332,6 +239,182 @@ sub loadmap {
}
}
+
+# -------------------------------------------------------------------- Resource
+sub parse_resource {
+ my ($token,$lpc,$ispage,$uri) = @_;
+ if ($token->[2]->{'type'} eq 'zombie') { next; }
+ my $rid=$lpc.'.'.$token->[2]->{'id'};
+
+ $hash{'kind_'.$rid}='res';
+ $hash{'title_'.$rid}=$token->[2]->{'title'};
+ my $turi=&versiontrack($token->[2]->{'src'});
+ if ($token->[2]->{'version'}) {
+ unless ($hash{'version_'.$turi}) {
+ $hash{'version_'.$turi}=$1;
+ }
+ }
+ my $title=$token->[2]->{'title'};
+ $title=~s/\&colon\;/\:/gs;
+# my $symb=&Apache::lonnet::encode_symb($uri,
+# $token->[2]->{'id'},
+# $turi);
+# &Apache::lonnet::do_cache_new('title',$symb,$title);
+ unless ($ispage) {
+ $turi=~/\.(\w+)$/;
+ my $embstyle=&Apache::loncommon::fileembstyle($1);
+ if ($token->[2]->{'external'} eq 'true') { # external
+ $turi=~s/^https?\:\/\//\/adm\/wrapper\/ext\//;
+ } elsif ($turi=~/^\/*uploaded\//) { # uploaded
+ if (($embstyle eq 'img')
+ || ($embstyle eq 'emb')
+ || ($embstyle eq 'wrp')) {
+ $turi='/adm/wrapper'.$turi;
+ } elsif ($embstyle eq 'ssi') {
+ #do nothing with these
+ } elsif ($turi!~/\.(sequence|page)$/) {
+ $turi='/adm/coursedocs/showdoc'.$turi;
+ }
+ } elsif ($turi=~/\S/) { # normal non-empty internal resource
+ my $mapdir=$uri;
+ $mapdir=~s/[^\/]+$//;
+ $turi=&Apache::lonnet::hreflocation($mapdir,$turi);
+ if (($embstyle eq 'img')
+ || ($embstyle eq 'emb')
+ || ($embstyle eq 'wrp')) {
+ $turi='/adm/wrapper'.$turi;
+ }
+ }
+ }
+# Store reverse lookup, remove query string
+ my $idsuri=$turi;
+ $idsuri=~s/\?.+$//;
+ if (defined($hash{'ids_'.$idsuri})) {
+ $hash{'ids_'.$idsuri}.=','.$rid;
+ } else {
+ $hash{'ids_'.$idsuri}=''.$rid;
+ }
+
+ if ($turi=~/\/(syllabus|aboutme|navmaps|smppg|bulletinboard|viewclasslist)$/) {
+ $turi.='?register=1';
+ }
+
+ $hash{'src_'.$rid}=$turi;
+
+ if ($token->[2]->{'external'} eq 'true') {
+ $hash{'ext_'.$rid}='true:';
+ } else {
+ $hash{'ext_'.$rid}='false:';
+ }
+ if ($token->[2]->{'type'}) {
+ $hash{'type_'.$rid}=$token->[2]->{'type'};
+ if ($token->[2]->{'type'} eq 'start') {
+ $hash{'map_start_'.$uri}="$rid";
+ }
+ if ($token->[2]->{'type'} eq 'finish') {
+ $hash{'map_finish_'.$uri}="$rid";
+ }
+ } else {
+ $hash{'type_'.$rid}='normal';
+ }
+
+ if (($turi=~/\.sequence$/) ||
+ ($turi=~/\.page$/)) {
+ $hash{'is_map_'.$rid}=1;
+ &loadmap($turi,$rid);
+ }
+ return $token->[2]->{'id'};
+}
+
+sub make_link {
+ my ($linkpc,$lpc,$to,$from,$condition) = @_;
+
+ my $linkid=$lpc.'.'.$linkpc;
+ my $goesto=$lpc.'.'.$to;
+ my $comesfrom=$lpc.'.'.$from;
+ my $undercond=0;
+
+ if ($condition) {
+ $undercond=$lpc.'.'.$condition;
+ }
+
+ $hash{'goesto_'.$linkid}=$goesto;
+ $hash{'comesfrom_'.$linkid}=$comesfrom;
+ $hash{'undercond_'.$linkid}=$undercond;
+
+ if (defined($hash{'to_'.$comesfrom})) {
+ $hash{'to_'.$comesfrom}.=','.$linkid;
+ } else {
+ $hash{'to_'.$comesfrom}=''.$linkid;
+ }
+ if (defined($hash{'from_'.$goesto})) {
+ $hash{'from_'.$goesto}.=','.$linkid;
+ } else {
+ $hash{'from_'.$goesto}=''.$linkid;
+ }
+}
+
+# ------------------------------------------------------------------- Condition
+sub parse_condition {
+ my ($token,$lpc) = @_;
+ my $rid=$lpc.'.'.$token->[2]->{'id'};
+
+ $hash{'kind_'.$rid}='cond';
+
+ my $condition = $token->[2]->{'value'};
+ $condition =~ s/[\n\r]+/ /gs;
+ push(@cond, $condition);
+ $hash{'condid_'.$rid}=$#cond;
+ if ($token->[2]->{'type'}) {
+ $cond[$#cond].=':'.$token->[2]->{'type'};
+ } else {
+ $cond[$#cond].=':normal';
+ }
+}
+
+# ------------------------------------------------------------------- Parameter
+
+sub parse_param {
+ my ($token,$lpc) = @_;
+ my $referid=$lpc.'.'.$token->[2]->{'to'};
+ my $name=$token->[2]->{'name'};
+ my $part;
+ if ($name=~/^parameter_(.*)_/) {
+ $part=$1;
+ } else {
+ $part=0;
+ }
+ $name=~s/^.*_([^_]*)$/$1/;
+ my $newparam=
+ &escape($token->[2]->{'type'}).':'.
+ &escape($part.'.'.$name).'='.
+ &escape($token->[2]->{'value'});
+ if (defined($hash{'param_'.$referid})) {
+ $hash{'param_'.$referid}.='&'.$newparam;
+ } else {
+ $hash{'param_'.$referid}=''.$newparam;
+ }
+ if ($token->[2]->{'name'}=~/^parameter_(0_)*randompick$/) {
+ $randompick{$referid}=$token->[2]->{'value'};
+ }
+ if ($token->[2]->{'name'}=~/^parameter_(0_)*randompickseed$/) {
+ $randompickseed{$referid}=$token->[2]->{'value'};
+ }
+ if ($token->[2]->{'name'}=~/^parameter_(0_)*randomorder$/) {
+ $randomorder{$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;
+ }
+ }
+}
+
sub parse_mapalias_param {
my ($token,$lpc) = @_;
my $referid=$lpc.'.'.$token->[2]->{'to'};
@@ -405,7 +488,8 @@ sub traceroute {
if (defined($hash{'map_start_'.$hash{'src_'.$rid}})) {
$sofar=$newsofar=
&traceroute($sofar,
- $hash{'map_start_'.$hash{'src_'.$rid}},'&',
+ $hash{'map_start_'.$hash{'src_'.$rid}},
+ $beenhere,
$encflag || $encurl{$rid},
$hdnflag || $hiddenurl{$rid});
}
@@ -506,8 +590,9 @@ sub accinit {
$acchash{'acc.res.'.$short.'.'}='&:0&';
my $courseuri=$uri;
$courseuri=~s/^\/res\///;
- &Apache::lonnet::delenv('(acc\.|httpref\.)');
- &Apache::lonnet::appenv(%acchash);
+ my $regexp = 1;
+ &Apache::lonnet::delenv('(acc\.|httpref\.)',$regexp);
+ &Apache::lonnet::appenv(\%acchash);
}
# ---------------- Selectively delete from randompick maps and hidden url parms
@@ -563,7 +648,7 @@ sub hiddenurls {
}
# --------------------------------------- append randomout entry to environment
if ($randomoutentry) {
- &Apache::lonnet::appenv('acc.randomout' => $randomoutentry);
+ &Apache::lonnet::appenv({'acc.randomout' => $randomoutentry});
}
}
@@ -577,92 +662,52 @@ sub readmap {
my $uri;
$short=~s/\//\_/g;
unless ($uri=$cenv{'url'}) {
- &Apache::lonnet::logthis("WARNING: ".
+ &Apache::lonnet::logthis('WARNING: '.
"Could not load course $short.");
return ('',&mt('No course data available.'));;
}
@cond=('true:normal');
- open(LOCKFILE,">$fn.db.lock");
+ unless (open(LOCKFILE,">$fn.db.lock")) {
+ $errtext.='
'.&mt('Map not loaded - Lock file could not be opened when reading map:').' '.$fn.'.';
+ $retfurl = '';
+ return ($retfurl,$errtext);
+ }
my $lock=0;
+ my $gotstate=0;
if (flock(LOCKFILE,LOCK_EX|LOCK_NB)) {
$lock=1;
- unlink($fn.'.db');
- unlink($fn.'_symb.db');
- unlink($fn.'.state');
- unlink($fn.'parms.db');
+ &unlink_tmpfiles($fn);
}
undef %randompick;
undef %hiddenurl;
undef %encurl;
$retfrid='';
- if ($lock && (tie(%hash,'GDBM_File',"$fn.db",&GDBM_WRCREAT(),0640)) &&
- (tie(%parmhash,'GDBM_File',$fn.'_parms.db',&GDBM_WRCREAT(),0640))) {
- %hash=();
- %parmhash=();
- $errtext='';
- $pc=0;
- &clear_mapalias_count();
- &processversionfile(%cenv);
- my $furi=&Apache::lonnet::clutter($uri);
- $hash{'src_0.0'}=&versiontrack($furi);
- $hash{'title_0.0'}=&Apache::lonnet::metadata($uri,'title');
- $hash{'ids_'.$furi}='0.0';
- $hash{'is_map_0.0'}=1;
- loadmap($uri);
- if (defined($hash{'map_start_'.$uri})) {
- &Apache::lonnet::appenv("request.course.id" => $short,
- "request.course.fn" => $fn,
- "request.course.uri" => $uri);
- $env{'request.course.id'}=$short;
- &traceroute('0',$hash{'map_start_'.$uri},'&');
- &accinit($uri,$short,$fn);
- &hiddenurls();
- }
- $errtext .= &get_mapalias_errors();
-# ------------------------------------------------------- Put versions into src
- foreach my $key (keys(%hash)) {
- if ($key=~/^src_/) {
- $hash{$key}=&putinversion($hash{$key});
- } elsif ($key =~ /^(map_(?:start|finish|pc)_)(.*)/) {
- my ($type, $url) = ($1,$2);
- my $value = $hash{$key};
- $hash{$type.&putinversion($url)}=$value;
- }
- }
-# ---------------------------------------------------------------- Encrypt URLs
- foreach my $id (keys(%encurl)) {
-# $hash{'src_'.$id}=&Apache::lonenc::encrypted($hash{'src_'.$id});
- $hash{'encrypted_'.$id}=1;
- }
-# ----------------------------------------------- Close hashes to finally store
-# --------------------------------- Routine must pass this point, no early outs
- $hash{'first_rid'}=$retfrid;
- my ($mapid,$resid)=split(/\./,$retfrid);
- $hash{'first_mapurl'}=$hash{'map_id_'.$mapid};
- my $symb=&Apache::lonnet::encode_symb($hash{'map_id_'.$mapid},$resid,$hash{'src_'.$retfrid});
- $retfurl=&add_get_param($hash{'src_'.$retfrid},{ 'symb' => $symb });
- if ($hash{'encrypted_'.$retfrid}) {
- $retfurl=&Apache::lonenc::encrypted($retfurl,(&Apache::lonnet::allowed('adv') ne 'F'));
- }
- $hash{'first_url'}=$retfurl;
- unless ((untie(%hash)) && (untie(%parmhash))) {
- &Apache::lonnet::logthis("WARNING: ".
- "Could not untie coursemap $fn for $uri.");
- }
-# ---------------------------------------------------- Store away initial state
- {
- my $cfh;
- if (open($cfh,">$fn.state")) {
- print $cfh join("\n",@cond);
- } else {
- &Apache::lonnet::logthis("WARNING: ".
- "Could not write statemap $fn for $uri.");
- }
- }
+ my ($untiedhash,$untiedparmhash,$tiedhash,$tiedparmhash);
+ if ($lock) {
+ if (tie(%hash,'GDBM_File',"$fn.db",&GDBM_WRCREAT(),0640)) {
+ $tiedhash = 1;
+ if (tie(%parmhash,'GDBM_File',$fn.'_parms.db',&GDBM_WRCREAT(),0640)) {
+ $tiedparmhash = 1;
+ $gotstate = &build_tmp_hashes($uri,$fn,$short,\%cenv);
+ unless ($gotstate) {
+ &Apache::lonnet::logthis('Failed to write statemap at first attempt '.$fn.' for '.$uri.'.');
+ }
+ $untiedparmhash = untie(%parmhash);
+ unless ($untiedparmhash) {
+ &Apache::lonnet::logthis('WARNING: '.
+ 'Could not untie coursemap parmhash '.$fn.' for '.$uri.'.');
+ }
+ }
+ $untiedhash = untie(%hash);
+ unless ($untiedhash) {
+ &Apache::lonnet::logthis('WARNING: '.
+ 'Could not untie coursemap hash '.$fn.' for '.$uri.'.');
+ }
+ }
flock(LOCKFILE,LOCK_UN);
- close(LOCKFILE);
- } else {
+ }
+ unless ($lock && $tiedhash && $tiedparmhash) {
# if we are here it is likely because we are already trying to
# initialize the course in another child, busy wait trying to
# tie the hashes for the next 90 seconds, if we succeed forward
@@ -671,34 +716,113 @@ sub readmap {
if ($lock) {
# Got the lock but not the DB files
flock(LOCKFILE,LOCK_UN);
+ $lock = 0;
}
- untie(%hash);
- untie(%parmhash);
- &Apache::lonnet::logthis("WARNING: ".
- "Could not tie coursemap $fn for $uri.");
+ if ($tiedhash) {
+ unless($untiedhash) {
+ untie(%hash);
+ }
+ }
+ if ($tiedparmhash) {
+ unless($untiedparmhash) {
+ untie(%parmhash);
+ }
+ }
+ &Apache::lonnet::logthis('WARNING: '.
+ "Could not tie coursemap $fn for $uri.");
+ $tiedhash = '';
+ $tiedparmhash = '';
my $i=0;
while($i<90) {
$i++;
sleep(1);
- 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)) {
- $retfurl='/adm/navmaps';
- &Apache::lonnet::appenv("request.course.id" => $short,
- "request.course.fn" => $fn,
- "request.course.uri" => $uri);
- untie(%hash);
- untie(%parmhash);
- last;
- }
- }
- untie(%hash);
- untie(%parmhash);
+ if (flock(LOCKFILE,LOCK_EX|LOCK_NB)) {
+ $lock = 1;
+ if (tie(%hash,'GDBM_File',"$fn.db",&GDBM_READER(),0640)) {
+ $tiedhash = 1;
+ if (tie(%parmhash,'GDBM_File',$fn.'_parms.db',&GDBM_READER(),0640)) {
+ $tiedparmhash = 1;
+ if (-e "$fn.state") {
+ $retfurl='/adm/navmaps';
+ &Apache::lonnet::appenv({"request.course.id" => $short,
+ "request.course.fn" => $fn,
+ "request.course.uri" => $uri});
+ $untiedhash = untie(%hash);
+ $untiedparmhash = untie(%parmhash);
+ $gotstate = 1;
+ last;
+ }
+ $untiedparmhash = untie(%parmhash);
+ }
+ $untiedhash = untie(%hash);
+ }
+ }
}
- flock(LOCKFILE,LOCK_UN);
- close(LOCKFILE);
+ if ($lock) {
+ flock(LOCKFILE,LOCK_UN);
+ $lock = 0;
+ if ($tiedparmhash) {
+ unless ($untiedparmhash) {
+ &Apache::lonnet::logthis('WARNING: '.
+ 'Could not untie coursemap parmhash '.$fn.' for '.$uri.'.');
+ }
+ }
+ if ($tiedparmhash) {
+ unless ($untiedhash) {
+ &Apache::lonnet::logthis('WARNING: '.
+ 'Could not untie coursemap hash '.$fn.' for '.$uri.'.');
+ }
+ }
+ }
+ }
+ unless ($gotstate) {
+ $lock = 0;
+ &Apache::lonnet::logthis('WARNING: '.
+ 'Could not read statemap '.$fn.' for '.$uri.'.');
+ &unlink_tmpfiles($fn);
+ if (flock(LOCKFILE,LOCK_EX|LOCK_NB)) {
+ $lock=1;
+ }
+ undef %randompick;
+ undef %hiddenurl;
+ undef %encurl;
+ $retfrid='';
+ if ($lock) {
+ if (tie(%hash,'GDBM_File',"$fn.db",&GDBM_WRCREAT(),0640)) {
+ if (tie(%parmhash,'GDBM_File',$fn.'_parms.db',&GDBM_WRCREAT(),0640)) {
+ $gotstate = &build_tmp_hashes($uri,$fn,$short,\%cenv);
+ unless ($gotstate) {
+ &Apache::lonnet::logthis('WARNING: '.
+ 'Failed to write statemap at second attempt '.$fn.' for '.$uri.'.');
+ }
+ unless (untie(%parmhash)) {
+ &Apache::lonnet::logthis('WARNING: '.
+ 'Could not untie coursemap parmhash '.$fn.'.db for '.$uri.'.');
+ }
+ } else {
+ &Apache::lonnet::logthis('WARNING: '.
+ 'Could not tie coursemap '.$fn.'__parms.db for '.$uri.'.');
+ }
+ unless (untie(%hash)) {
+ &Apache::lonnet::logthis('WARNING: '.
+ 'Could not untie coursemap hash '.$fn.'.db for '.$uri.'.');
+ }
+ } else {
+ &Apache::lonnet::logthis('WARNING: '.
+ 'Could not tie coursemap '.$fn.'.db for '.$uri.'.');
+ }
+ flock(LOCKFILE,LOCK_UN);
+ $lock = 0;
+ } else {
+ &Apache::lonnet::logthis('WARNING: '.
+ 'Could not obtain lock to tie coursemap hash '.$fn.'.db for '.$uri.'.');
+ }
+ }
+ close(LOCKFILE);
+ unless (($errtext eq '') || ($env{'request.course.uri'} =~ m{^/uploaded/})) {
+ &Apache::lonmsg::author_res_msg($env{'request.course.uri'},
+ $errtext);
}
- &Apache::lonmsg::author_res_msg($env{'request.course.uri'},$errtext);
# ------------------------------------------------- Check for critical messages
my @what=&Apache::lonnet::dump('critical',$env{'user.domain'},
@@ -711,6 +835,91 @@ sub readmap {
return ($retfurl,$errtext);
}
+sub build_tmp_hashes {
+ my ($uri,$fn,$short,$cenvref) = @_;
+ unless(ref($cenvref) eq 'HASH') {
+ return;
+ }
+ my %cenv = %{$cenvref};
+ my $gotstate = 0;
+ %hash=();
+ %parmhash=();
+ $errtext='';
+ $pc=0;
+ &clear_mapalias_count();
+ &processversionfile(%cenv);
+ my $furi=&Apache::lonnet::clutter($uri);
+ $hash{'src_0.0'}=&versiontrack($furi);
+ $hash{'title_0.0'}=&Apache::lonnet::metadata($uri,'title');
+ $hash{'ids_'.$furi}='0.0';
+ $hash{'is_map_0.0'}=1;
+ &loadmap($uri,'0.0');
+ if (defined($hash{'map_start_'.$uri})) {
+ &Apache::lonnet::appenv({"request.course.id" => $short,
+ "request.course.fn" => $fn,
+ "request.course.uri" => $uri});
+ $env{'request.course.id'}=$short;
+ &traceroute('0',$hash{'map_start_'.$uri},'&');
+ &accinit($uri,$short,$fn);
+ &hiddenurls();
+ }
+ $errtext .= &get_mapalias_errors();
+# ------------------------------------------------------- Put versions into src
+ foreach my $key (keys(%hash)) {
+ if ($key=~/^src_/) {
+ $hash{$key}=&putinversion($hash{$key});
+ } elsif ($key =~ /^(map_(?:start|finish|pc)_)(.*)/) {
+ my ($type, $url) = ($1,$2);
+ my $value = $hash{$key};
+ $hash{$type.&putinversion($url)}=$value;
+ }
+ }
+# ---------------------------------------------------------------- Encrypt URLs
+ foreach my $id (keys(%encurl)) {
+# $hash{'src_'.$id}=&Apache::lonenc::encrypted($hash{'src_'.$id});
+ $hash{'encrypted_'.$id}=1;
+ }
+# ----------------------------------------------- Close hashes to finally store
+# --------------------------------- Routine must pass this point, no early outs
+ $hash{'first_rid'}=$retfrid;
+ my ($mapid,$resid)=split(/\./,$retfrid);
+ $hash{'first_mapurl'}=$hash{'map_id_'.$mapid};
+ my $symb=&Apache::lonnet::encode_symb($hash{'map_id_'.$mapid},$resid,$hash{'src_'.$retfrid});
+ $retfurl=&add_get_param($hash{'src_'.$retfrid},{ 'symb' => $symb });
+ if ($hash{'encrypted_'.$retfrid}) {
+ $retfurl=&Apache::lonenc::encrypted($retfurl,(&Apache::lonnet::allowed('adv') ne 'F'));
+ }
+ $hash{'first_url'}=$retfurl;
+# ---------------------------------------------------- Store away initial state
+ {
+ my $cfh;
+ if (open($cfh,">$fn.state")) {
+ print $cfh join("\n",@cond);
+ $gotstate = 1;
+ } else {
+ &Apache::lonnet::logthis("WARNING: ".
+ "Could not write statemap $fn for $uri.");
+ }
+ }
+ return $gotstate;
+}
+
+sub unlink_tmpfiles {
+ my ($fn) = @_;
+ if ($fn =~ m{^\Q$Apache::lonnet::perlvar{'lonDaemons'}\E/tmp/}) {
+ my @files = qw (.db _symb.db .state _parms.db);
+ foreach my $file (@files) {
+ if (-e $fn.$file) {
+ unless (unlink($fn.$file)) {
+ &Apache::lonnet::logthis("WARNING: ".
+ "Could not unlink ".$fn.$file."");
+ }
+ }
+ }
+ }
+ return;
+}
+
# ------------------------------------------------------- Evaluate state string
sub evalstate {
@@ -747,7 +956,7 @@ sub evalstate {
}
}
}
- &Apache::lonnet::appenv('user.state.'.$env{'request.course.id'} => $state);
+ &Apache::lonnet::appenv({'user.state.'.$env{'request.course.id'} => $state});
return $state;
}
@@ -771,8 +980,8 @@ sub evalstate {
$count++;
}
my ($mapid) = split(/\./,$id);
- &mt('[_1] in [_2]', $hash{'title_'.$id},
-
+ &mt('Resource "[_1]"
in Map "[_2]"',
+ $hash{'title_'.$id},
$hash{'title_'.$hash{'ids_'.$hash{'map_id_'.$mapid}}});
} (@{ $mapalias_cache{$mapalias} }));
next if ($count < 2);
@@ -810,37 +1019,33 @@ of course for user.
This is part of the LearningOnline Network with CAPA project
described at http://www.lon-capa.org.
-=head1 HANDLER SUBROUTINE
-
-There is no handler subroutine.
-
-=head1 OTHER SUBROUTINES
+=head1 SUBROUTINES
-=over 4
+=over
-=item *
+=item loadmap()
-loadmap() : Loads map from disk
+Loads map from disk
-=item *
+=item simplify()
-simplify() : Simplify expression
+Simplify expression
-=item *
+=item traceroute()
-traceroute() : Build condition hash
+Build condition hash
-=item *
+=item accinit()
-accinit() : Cascading conditions, quick access, parameters
+Cascading conditions, quick access, parameters
-=item *
+=item readmap()
-readmap() : Read map and all submaps
+Read map and all submaps
-=item *
+=item evalstate()
-evalstate() : Evaluate state string
+Evaluate state string
=back