version 1.118.2.1, 2007/06/08 19:33:06
|
version 1.122, 2007/08/28 01:13:19
|
Line 108 sub processversionfile {
|
Line 108 sub processversionfile {
|
sub loadmap { |
sub loadmap { |
my $uri=shift; |
my $uri=shift; |
if ($hash{'map_pc_'.$uri}) { |
if ($hash{'map_pc_'.$uri}) { |
$errtext.=&mt('<br />Multiple use of sequence/page <tt>[_1]</tt>! The course will not function properly.',$uri); |
$errtext.='<p class="LC_error">'. |
|
&mt('Multiple use of sequence/page [_1]! The course will not function properly.','<tt>'.$uri.'</tt>'). |
|
'</p>'; |
return; |
return; |
} |
} |
$pc++; |
$pc++; |
Line 129 sub loadmap {
|
Line 131 sub loadmap {
|
|
|
my $instr=&Apache::lonnet::getfile($fn); |
my $instr=&Apache::lonnet::getfile($fn); |
|
|
if ($instr eq -1) { |
unless ($instr eq -1) { |
$errtext.=&mt('<br />Map not loaded: The file <tt>[_1]</tt> does not exist.',$fn); |
|
return; |
|
} |
|
|
|
# Successfully got file, parse it |
# Successfully got file, parse it |
|
|
my $parser = HTML::TokeParser->new(\$instr); |
my $parser = HTML::TokeParser->new(\$instr); |
$parser->attr_encoded(1); |
$parser->attr_encoded(1); |
|
my $token; |
|
|
my $linkpc=0; |
my $linkpc=0; |
|
|
$fn=~/\.(\w+)$/; |
$fn=~/\.(\w+)$/; |
|
|
$hash{'map_type_'.$lpc}=$1; |
$hash{'map_type_'.$lpc}=$1; |
|
|
my $randomize=1; |
while ($token = $parser->get_token) { |
my @map_ids; |
if ($token->[0] eq 'S') { |
while (my $token = $parser->get_token) { |
if ($token->[1] eq 'resource') { |
next if ($token->[0] ne 'S'); |
# -------------------------------------------------------------------- Resource |
if ($token->[1] eq 'resource') { |
if ($token->[2]->{'type'} eq 'zombie') { next; } |
push(@map_ids,&parse_resource($token,$lpc,$ispage,$uri)); |
my $rid=$lpc.'.'.$token->[2]->{'id'}; |
} 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); |
|
} elsif ($token->[1] eq 'param') { |
|
&parse_param($token,$lpc); |
|
} |
|
} |
|
|
|
if ($randomize) { |
$hash{'kind_'.$rid}='res'; |
my @map_ids=&Math::Random::random_permutation(@map_ids); |
$hash{'title_'.$rid}=$token->[2]->{'title'}; |
my $from = shift(@map_ids); |
my $turi=&versiontrack($token->[2]->{'src'}); |
my $from_rid = $lpc.'.'.$from; |
if ($token->[2]->{'version'}) { |
$hash{'map_start_'.$uri} = $from_rid; |
unless ($hash{'version_'.$turi}) { |
$hash{'type_'.$from_rid}='start'; |
$hash{'version_'.$turi}=$1; |
|
} |
while (my $to = shift(@map_ids)) { |
} |
&make_link(++$linkpc,$lpc,$to,$from); |
my $title=$token->[2]->{'title'}; |
my $to_rid = $lpc.'.'.$to; |
$title=~s/\&colon\;/\:/gs; |
$hash{'type_'.$to_rid}='normal'; |
# my $symb=&Apache::lonnet::encode_symb($uri, |
$from = $to; |
# $token->[2]->{'id'}, |
$from_rid = $to_rid; |
# $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{'map_finish_'.$uri}= $from_rid; |
$hash{'src_'.$rid}=$turi; |
$hash{'type_'.$from_rid}='finish'; |
|
} |
|
} |
|
|
|
|
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); |
|
} |
|
|
|
} elsif ($token->[1] eq 'condition') { |
|
# ------------------------------------------------------------------- Condition |
|
|
# -------------------------------------------------------------------- Resource |
my $rid=$lpc.'.'.$token->[2]->{'id'}; |
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/^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; |
|
|
|
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); |
|
} |
|
return $token->[2]->{'id'}; |
|
} |
|
|
|
sub make_link { |
$hash{'kind_'.$rid}='cond'; |
my ($linkpc,$lpc,$to,$from,$condition) = @_; |
$cond[$#cond+1]=$token->[2]->{'value'}; |
|
$hash{'condid_'.$rid}=$#cond; |
my $linkid=$lpc.'.'.$linkpc; |
if ($token->[2]->{'type'}) { |
my $goesto=$lpc.'.'.$to; |
$cond[$#cond].=':'.$token->[2]->{'type'}; |
my $comesfrom=$lpc.'.'.$from; |
} else { |
my $undercond=0; |
$cond[$#cond].=':normal'; |
|
} |
if ($condition) { |
|
$undercond=$lpc.'.'.$condition; |
} elsif ($token->[1] eq 'link') { |
} |
# ----------------------------------------------------------------------- Links |
|
|
$hash{'goesto_'.$linkid}=$goesto; |
$linkpc++; |
$hash{'comesfrom_'.$linkid}=$comesfrom; |
my $linkid=$lpc.'.'.$linkpc; |
$hash{'undercond_'.$linkid}=$undercond; |
|
|
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 (defined($hash{'to_'.$comesfrom})) { |
|
$hash{'to_'.$comesfrom}.=','.$linkid; |
|
} else { |
|
$hash{'to_'.$comesfrom}=''.$linkid; |
|
} |
|
if (defined($hash{'from_'.$goesto})) { |
|
$hash{'from_'.$goesto}.=','.$linkid; |
|
} else { |
} else { |
$hash{'from_'.$goesto}=''.$linkid; |
$errtext.=&mt('<br />Map not loaded: The file <tt>[_1]</tt> does not exist.',$fn); |
} |
} |
} |
|
|
|
# ------------------------------------------------------------------- Condition |
my $parser = HTML::TokeParser->new(\$instr); |
sub parse_condition { |
$parser->attr_encoded(1); |
my ($token,$lpc) = @_; |
# last parse out the mapalias params so as to ignore anything |
my $rid=$lpc.'.'.$token->[2]->{'id'}; |
# refering to non-existant resources |
|
while (my $token = $parser->get_token) { |
$hash{'kind_'.$rid}='cond'; |
next if ($token->[0] ne 'S'); |
$cond[$#cond+1]=$token->[2]->{'value'}; |
if ($token->[1] eq 'param') { |
$hash{'condid_'.$rid}=$#cond; |
&parse_mapalias_param($token,$lpc); |
if ($token->[2]->{'type'}) { |
} |
$cond[$#cond].=':'.$token->[2]->{'type'}; |
|
} else { |
|
$cond[$#cond].=':normal'; |
|
} |
} |
} |
} |
|
|
# ------------------------------------------------------------------- Parameter |
sub parse_mapalias_param { |
|
|
sub parse_param { |
|
my ($token,$lpc) = @_; |
my ($token,$lpc) = @_; |
my $referid=$lpc.'.'.$token->[2]->{'to'}; |
my $referid=$lpc.'.'.$token->[2]->{'to'}; |
my $name=$token->[2]->{'name'}; |
return if (!exists($hash{'src_'.$referid})); |
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_)*mapalias$/) { |
if ($token->[2]->{'name'}=~/^parameter_(0_)*mapalias$/) { |
|
&count_mapalias($token->[2]->{'value'},$referid); |
$hash{'mapalias_'.$token->[2]->{'value'}}=$referid; |
$hash{'mapalias_'.$token->[2]->{'value'}}=$referid; |
} |
} |
if ($token->[2]->{'name'}=~/^parameter_(0_)*randompick$/) { |
|
$randompick{$referid}=$token->[2]->{'value'}; |
|
} |
|
if ($token->[2]->{'name'}=~/^parameter_(0_)*randompickseed$/) { |
|
$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; |
|
} |
|
} |
|
} |
} |
|
|
# --------------------------------------------------------- Simplify expression |
# --------------------------------------------------------- Simplify expression |
Line 384 sub simplify {
|
Line 369 sub simplify {
|
sub traceroute { |
sub traceroute { |
my ($sofar,$rid,$beenhere,$encflag,$hdnflag)=@_; |
my ($sofar,$rid,$beenhere,$encflag,$hdnflag)=@_; |
my $newsofar=$sofar=simplify($sofar); |
my $newsofar=$sofar=simplify($sofar); |
unless ($beenhere=~/\&$rid\&/) { |
unless ($beenhere=~/\&\Q$rid\E\&/) { |
$beenhere.=$rid.'&'; |
$beenhere.=$rid.'&'; |
my ($mapid,$resid)=split(/\./,$rid); |
my ($mapid,$resid)=split(/\./,$rid); |
my $symb=&Apache::lonnet::encode_symb($hash{'map_id_'.$mapid},$resid,$hash{'src_'.$rid}); |
my $symb=&Apache::lonnet::encode_symb($hash{'map_id_'.$mapid},$resid,$hash{'src_'.$rid}); |
Line 615 sub readmap {
|
Line 600 sub readmap {
|
%parmhash=(); |
%parmhash=(); |
$errtext=''; |
$errtext=''; |
$pc=0; |
$pc=0; |
|
&clear_mapalias_count(); |
&processversionfile(%cenv); |
&processversionfile(%cenv); |
my $furi=&Apache::lonnet::clutter($uri); |
my $furi=&Apache::lonnet::clutter($uri); |
$hash{'src_0.0'}=&versiontrack($furi); |
$hash{'src_0.0'}=&versiontrack($furi); |
Line 631 sub readmap {
|
Line 617 sub readmap {
|
&accinit($uri,$short,$fn); |
&accinit($uri,$short,$fn); |
&hiddenurls(); |
&hiddenurls(); |
} |
} |
|
$errtext .= &get_mapalias_errors(); |
# ------------------------------------------------------- Put versions into src |
# ------------------------------------------------------- Put versions into src |
foreach my $key (keys(%hash)) { |
foreach my $key (keys(%hash)) { |
if ($key=~/^src_/) { |
if ($key=~/^src_/) { |
Line 762 sub evalstate {
|
Line 749 sub evalstate {
|
return $state; |
return $state; |
} |
} |
|
|
|
{ |
|
my %mapalias_cache; |
|
sub count_mapalias { |
|
my ($value,$resid) = @_; |
|
push(@{ $mapalias_cache{$value} }, $resid); |
|
} |
|
|
|
sub get_mapalias_errors { |
|
my $error_text; |
|
foreach my $mapalias (sort(keys(%mapalias_cache))) { |
|
next if (scalar(@{ $mapalias_cache{$mapalias} } ) == 1); |
|
my $count; |
|
my $which = |
|
join('</li><li>', |
|
map { |
|
my $id = $_; |
|
if (exists($hash{'src_'.$id})) { |
|
$count++; |
|
} |
|
my ($mapid) = split(/\./,$id); |
|
&mt('[_1] in [_2]', $hash{'title_'.$id}, |
|
|
|
$hash{'title_'.$hash{'ids_'.$hash{'map_id_'.$mapid}}}); |
|
} (@{ $mapalias_cache{$mapalias} })); |
|
next if ($count < 2); |
|
$error_text .= '<div class="LC_error">'. |
|
&mt('Error: Found the mapalias "[_1]" defined multiple times.', |
|
$mapalias). |
|
'</div><ul><li>'.$which.'</li></ul>'; |
|
} |
|
&clear_mapalias_count(); |
|
return $error_text; |
|
} |
|
sub clear_mapalias_count { |
|
undef(%mapalias_cache); |
|
} |
|
} |
1; |
1; |
__END__ |
__END__ |
|
|