version 1.124, 2007/08/29 00:50:50
|
version 1.128, 2008/03/12 02:45:50
|
Line 210 sub loadmap {
|
Line 210 sub loadmap {
|
$hash{'type_'.$from_rid}='finish'; |
$hash{'type_'.$from_rid}='finish'; |
} |
} |
|
|
my $parser = HTML::TokeParser->new(\$instr); |
$parser = HTML::TokeParser->new(\$instr); |
$parser->attr_encoded(1); |
$parser->attr_encoded(1); |
# last parse out the mapalias params so as to ignore anything |
# last parse out the mapalias params so as to ignore anything |
# refering to non-existant resources |
# refering to non-existant resources |
Line 471 sub traceroute {
|
Line 471 sub traceroute {
|
if (defined($hash{'map_start_'.$hash{'src_'.$rid}})) { |
if (defined($hash{'map_start_'.$hash{'src_'.$rid}})) { |
$sofar=$newsofar= |
$sofar=$newsofar= |
&traceroute($sofar, |
&traceroute($sofar, |
$hash{'map_start_'.$hash{'src_'.$rid}},'&', |
$hash{'map_start_'.$hash{'src_'.$rid}}, |
|
$beenhere, |
$encflag || $encurl{$rid}, |
$encflag || $encurl{$rid}, |
$hdnflag || $hiddenurl{$rid}); |
$hdnflag || $hiddenurl{$rid}); |
} |
} |
Line 573 sub accinit {
|
Line 574 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); |
} |
} |
|
|
# ---------------- Selectively delete from randompick maps and hidden url parms |
# ---------------- Selectively delete from randompick maps and hidden url parms |
Line 629 sub hiddenurls {
|
Line 630 sub hiddenurls {
|
} |
} |
# --------------------------------------- append randomout entry to environment |
# --------------------------------------- append randomout entry to environment |
if ($randomoutentry) { |
if ($randomoutentry) { |
&Apache::lonnet::appenv('acc.randomout' => $randomoutentry); |
&Apache::lonnet::appenv({'acc.randomout' => $randomoutentry}); |
} |
} |
} |
} |
|
|
Line 677 sub readmap {
|
Line 678 sub readmap {
|
$hash{'is_map_0.0'}=1; |
$hash{'is_map_0.0'}=1; |
loadmap($uri,'0.0'); |
loadmap($uri,'0.0'); |
if (defined($hash{'map_start_'.$uri})) { |
if (defined($hash{'map_start_'.$uri})) { |
&Apache::lonnet::appenv("request.course.id" => $short, |
&Apache::lonnet::appenv({"request.course.id" => $short, |
"request.course.fn" => $fn, |
"request.course.fn" => $fn, |
"request.course.uri" => $uri); |
"request.course.uri" => $uri}); |
$env{'request.course.id'}=$short; |
$env{'request.course.id'}=$short; |
&traceroute('0',$hash{'map_start_'.$uri},'&'); |
&traceroute('0',$hash{'map_start_'.$uri},'&'); |
&accinit($uri,$short,$fn); |
&accinit($uri,$short,$fn); |
Line 750 sub readmap {
|
Line 751 sub readmap {
|
(tie(%hash,'GDBM_File',"$fn.db",&GDBM_READER(),0640))) { |
(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, |
"request.course.fn" => $fn, |
"request.course.fn" => $fn, |
"request.course.uri" => $uri); |
"request.course.uri" => $uri}); |
untie(%hash); |
untie(%hash); |
untie(%parmhash); |
untie(%parmhash); |
last; |
last; |
Line 813 sub evalstate {
|
Line 814 sub evalstate {
|
} |
} |
} |
} |
} |
} |
&Apache::lonnet::appenv('user.state.'.$env{'request.course.id'} => $state); |
&Apache::lonnet::appenv({'user.state.'.$env{'request.course.id'} => $state}); |
return $state; |
return $state; |
} |
} |
|
|
Line 837 sub evalstate {
|
Line 838 sub evalstate {
|
$count++; |
$count++; |
} |
} |
my ($mapid) = split(/\./,$id); |
my ($mapid) = split(/\./,$id); |
&mt('[_1] in [_2]', $hash{'title_'.$id}, |
&mt('Resource "[_1]" <br /> in Map "[_2]"', |
|
$hash{'title_'.$id}, |
$hash{'title_'.$hash{'ids_'.$hash{'map_id_'.$mapid}}}); |
$hash{'title_'.$hash{'ids_'.$hash{'map_id_'.$mapid}}}); |
} (@{ $mapalias_cache{$mapalias} })); |
} (@{ $mapalias_cache{$mapalias} })); |
next if ($count < 2); |
next if ($count < 2); |